Modified: subversion/branches/addremove/subversion/po/de.po
URL: 
http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/po/de.po?rev=1878061&r1=1878060&r2=1878061&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/po/de.po [UTF-8] (original)
+++ subversion/branches/addremove/subversion/po/de.po [UTF-8] Sat May 23 
14:16:56 2020
@@ -96,7 +96,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.9\n"
 "Report-Msgid-Bugs-To: d...@subversion.apache.org\n"
-"POT-Creation-Date: 2015-04-10 18:54+0200\n"
+"POT-Creation-Date: 2018-03-11 16:08+0100\n"
 "PO-Revision-Date: 2015-04-10 18:52+0100\n"
 "Last-Translator: Subversion Developers <d...@subversion.apache.org>\n"
 "Language-Team: German <d...@subversion.apache.org>\n"
@@ -225,7 +225,7 @@ msgstr "Pfad ist kein direktes Kind des
 msgid "Bogus UUID"
 msgstr "Ungültige UUID"
 
-#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1026
+#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1041
 msgid "Invalid configuration value"
 msgstr "Ungültiger Konfigurationswert"
 
@@ -257,1253 +257,1314 @@ msgstr "Ungültiges »atomic«"
 msgid "Invalid compression method"
 msgstr "Ungültige Komprimierungsmethode"
 
-#: ../include/svn_error_codes.h:247
+#: ../include/svn_error_codes.h:246
+#, fuzzy
+msgid "Unexpected line ending in the property value"
+msgstr "Unerwartete oder unbekannte Eigenschaftsart"
+
+#: ../include/svn_error_codes.h:252
 msgid "No such XML tag attribute"
 msgstr "Ein solches Attribut des XML-Tags existiert nicht"
 
-#: ../include/svn_error_codes.h:251
+#: ../include/svn_error_codes.h:256
 msgid "<delta-pkg> is missing ancestry"
 msgstr "<delta-pkg> fehlt die Herkunft"
 
-#: ../include/svn_error_codes.h:255
+#: ../include/svn_error_codes.h:260
 msgid "Unrecognized binary data encoding; can't decode"
 msgstr "Unbekannte binäre Datenkodierung, kann nicht entschlüsseln"
 
-#: ../include/svn_error_codes.h:259
+#: ../include/svn_error_codes.h:264
 msgid "XML data was not well-formed"
 msgstr "XML Daten nicht wohlgeformt"
 
-#: ../include/svn_error_codes.h:263
+#: ../include/svn_error_codes.h:268
 msgid "Data cannot be safely XML-escaped"
 msgstr "Daten können nicht sicher in XML eingebettet werden"
 
-#: ../include/svn_error_codes.h:268
+#: ../include/svn_error_codes.h:273
 msgid "Unexpected XML element found"
 msgstr "Unerwartetes XML-Element gefunden"
 
-#: ../include/svn_error_codes.h:274
+#: ../include/svn_error_codes.h:279
 msgid "Inconsistent line ending style"
 msgstr "Stil für Zeilenende ist inkonsistent"
 
-#: ../include/svn_error_codes.h:278
+#: ../include/svn_error_codes.h:283
 msgid "Unrecognized line ending style"
 msgstr "Stil für Zeilenende nicht erkannt"
 
-#: ../include/svn_error_codes.h:283
+#: ../include/svn_error_codes.h:288
 msgid "Line endings other than expected"
 msgstr "Zeilenende anders als erwartet"
 
-#: ../include/svn_error_codes.h:287
+#: ../include/svn_error_codes.h:292
 msgid "Ran out of unique names"
 msgstr "Eindeutige Namen ausgegangen"
 
-#: ../include/svn_error_codes.h:292
+#: ../include/svn_error_codes.h:297
 msgid "Framing error in pipe protocol"
 msgstr "Rahmenfehler im »Pipe«-Protokoll"
 
-#: ../include/svn_error_codes.h:297
+#: ../include/svn_error_codes.h:302
 msgid "Read error in pipe"
 msgstr "Lesefehler in »Pipe«"
 
 #. is errno on POSIX
-#: ../include/svn_error_codes.h:301 ../libsvn_subr/cmdline.c:417
-#: ../libsvn_subr/cmdline.c:448 ../libsvn_subr/cmdline.c:471 ../svn/util.c:571
-#: ../svnlook/svnlook.c:2025
+#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:435
+#: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:571
+#: ../svnlook/svnlook.c:2034
 #, c-format
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: ../include/svn_error_codes.h:306
+#: ../include/svn_error_codes.h:311
 msgid "Write error in pipe"
 msgstr "Schreibfehler in »Pipe«"
 
-#: ../include/svn_error_codes.h:312
+#: ../include/svn_error_codes.h:317
 msgid "Unexpected EOF on stream"
 msgstr "Unerwartetes EOF im Datenstrom"
 
-#: ../include/svn_error_codes.h:316
+#: ../include/svn_error_codes.h:321
 msgid "Malformed stream data"
 msgstr "Fehlerhafter Datenstrom"
 
-#: ../include/svn_error_codes.h:320
+#: ../include/svn_error_codes.h:325
 msgid "Unrecognized stream data"
 msgstr "Unbekannter Datenstrom"
 
-#: ../include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:330
 msgid "Stream doesn't support seeking"
 msgstr "Datenstrom unterstützt das Setzen der Position nicht"
 
-#: ../include/svn_error_codes.h:330
+#: ../include/svn_error_codes.h:335
 msgid "Stream doesn't support this capability"
 msgstr "Datenstrom unterstützt diese Funktion nicht"
 
-#: ../include/svn_error_codes.h:336
+#: ../include/svn_error_codes.h:341
 msgid "Unknown svn_node_kind"
 msgstr "Unbekannter svn_node_kind"
 
-#: ../include/svn_error_codes.h:340
+#: ../include/svn_error_codes.h:345
 msgid "Unexpected node kind found"
 msgstr "Unerwarteter Knotentyp gefunden"
 
-#: ../include/svn_error_codes.h:346
+#: ../include/svn_error_codes.h:351
 msgid "Can't find an entry"
 msgstr "Kann keinen Eintrag finden"
 
-#: ../include/svn_error_codes.h:352
+#: ../include/svn_error_codes.h:357
 msgid "Entry already exists"
 msgstr "Eintrag existiert bereits"
 
-#: ../include/svn_error_codes.h:356
+#: ../include/svn_error_codes.h:361
 msgid "Entry has no revision"
 msgstr "Eintrag hat keine Revision"
 
-#: ../include/svn_error_codes.h:360
+#: ../include/svn_error_codes.h:365
 msgid "Entry has no URL"
 msgstr "Eintrag hat keine URL"
 
-#: ../include/svn_error_codes.h:364
+#: ../include/svn_error_codes.h:369
 msgid "Entry has an invalid attribute"
 msgstr "Eintrag hat ein ungültiges Attribut"
 
-#: ../include/svn_error_codes.h:368
+#: ../include/svn_error_codes.h:373
 msgid "Can't create an entry for a forbidden name"
 msgstr "Kann keinen Eintrag für einen verbotenen Namen erzeugen"
 
-#: ../include/svn_error_codes.h:374
+#: ../include/svn_error_codes.h:379
 msgid "Obstructed update"
 msgstr "Aktualisierung behindert"
 
-#: ../include/svn_error_codes.h:379
+#: ../include/svn_error_codes.h:384
 msgid "Mismatch popping the WC unwind stack"
 msgstr "Fehler beim Abrufen des Abwicklungsstapels der Arbeitskopie"
 
-#: ../include/svn_error_codes.h:384
+#: ../include/svn_error_codes.h:389
 msgid "Attempt to pop empty WC unwind stack"
 msgstr "Versuch, leeren Abwicklungsstapel abzurufen"
 
-#: ../include/svn_error_codes.h:389
+#: ../include/svn_error_codes.h:394
 msgid "Attempt to unlock with non-empty unwind stack"
 msgstr "Versuch, mit nicht leerem Abwicklungsstapel zu entsperren"
 
-#: ../include/svn_error_codes.h:393
+#: ../include/svn_error_codes.h:398
 msgid "Attempted to lock an already-locked dir"
 msgstr "Versuch, ein bereits gesperrtes Verzeichnis erneut zu sperren"
 
-#: ../include/svn_error_codes.h:397
+#: ../include/svn_error_codes.h:402
 msgid "Working copy not locked; this is probably a bug, please report"
 msgstr "Arbeitskopie nicht gesperrt. Dies ist wahrscheinlich ein Fehler. Bitte 
melden."
 
-#: ../include/svn_error_codes.h:402
+#: ../include/svn_error_codes.h:407
 msgid "Invalid lock"
 msgstr "Ungültige Sperre"
 
-#: ../include/svn_error_codes.h:408 ../include/svn_error_codes.h:414
+#: ../include/svn_error_codes.h:413 ../include/svn_error_codes.h:419
 msgid "Path is not a working copy directory"
 msgstr "Pfad ist kein Verzeichnis in einer Arbeitskopie"
 
-#: ../include/svn_error_codes.h:418
+#: ../include/svn_error_codes.h:423
 msgid "Path is not a working copy file"
 msgstr "Pfad ist keine Datei in einer Arbeitskopie"
 
-#: ../include/svn_error_codes.h:422
+#: ../include/svn_error_codes.h:427
 msgid "Problem running log"
 msgstr "Problem während der Ausführung des Logs"
 
-#: ../include/svn_error_codes.h:426
+#: ../include/svn_error_codes.h:431
 msgid "Can't find a working copy path"
 msgstr "Kann keinen Arbeitskopiepfad finden"
 
-#: ../include/svn_error_codes.h:430
+#: ../include/svn_error_codes.h:435
 msgid "Working copy is not up-to-date"
 msgstr "Arbeitskopie ist nicht aktuell"
 
-#: ../include/svn_error_codes.h:434
+#: ../include/svn_error_codes.h:439
 msgid "Left locally modified or unversioned files"
 msgstr "Lokal veränderte oder nicht versionierte Dateien zurück gelassen"
 
-#: ../include/svn_error_codes.h:438
+#: ../include/svn_error_codes.h:443
 msgid "Unmergeable scheduling requested on an entry"
 msgstr "Nicht zusammenführbare Planungsanforderung für einen Eintrag"
 
-#: ../include/svn_error_codes.h:442
+#: ../include/svn_error_codes.h:447
 msgid "Found a working copy path"
 msgstr "Arbeitskopiepfad gefunden"
 
-#: ../include/svn_error_codes.h:446
+#: ../include/svn_error_codes.h:451
 msgid "A conflict in the working copy obstructs the current operation"
 msgstr "Ein Konflikt in der Arbeitskopie behindert die aktuelle Operation"
 
-#: ../include/svn_error_codes.h:450
+#: ../include/svn_error_codes.h:455
 msgid "Working copy is corrupt"
 msgstr "Arbeitskopie ist beschädigt"
 
-#: ../include/svn_error_codes.h:454
+#: ../include/svn_error_codes.h:459
 msgid "Working copy text base is corrupt"
 msgstr "Textbasis der Arbeitskopie ist beschädigt"
 
-#: ../include/svn_error_codes.h:458
+#: ../include/svn_error_codes.h:463
 msgid "Cannot change node kind"
 msgstr "Kann Knotentyp nicht ändern"
 
-#: ../include/svn_error_codes.h:462
+#: ../include/svn_error_codes.h:467
 msgid "Invalid operation on the current working directory"
 msgstr "Ungültige Operation auf dem aktuellen Arbeitsverzeichnis"
 
-#: ../include/svn_error_codes.h:466
+#: ../include/svn_error_codes.h:471
 msgid "Problem on first log entry in a working copy"
 msgstr "Problem mit dem ersten Log-Eintrag in einer Arbeitskopie"
 
-#: ../include/svn_error_codes.h:470
+#: ../include/svn_error_codes.h:475
 msgid "Unsupported working copy format"
 msgstr "Nicht unterstütztes Format der Arbeitskopie"
 
-#: ../include/svn_error_codes.h:474
+#: ../include/svn_error_codes.h:479
 msgid "Path syntax not supported in this context"
 msgstr "Pfadsyntax wird in diesem Zusammenhang nicht unterstützt"
 
-#: ../include/svn_error_codes.h:479
+#: ../include/svn_error_codes.h:484
 msgid "Invalid schedule"
 msgstr "Ungültiger Plan"
 
-#: ../include/svn_error_codes.h:484
+#: ../include/svn_error_codes.h:489
 msgid "Invalid relocation"
 msgstr "Ungültiges Umplatzieren"
 
-#: ../include/svn_error_codes.h:489
+#: ../include/svn_error_codes.h:494
 msgid "Invalid switch"
 msgstr "Ungültiges Wechseln"
 
-#: ../include/svn_error_codes.h:494
+#: ../include/svn_error_codes.h:499
 msgid "Changelist doesn't match"
 msgstr "Änderungsliste passt nicht"
 
-#: ../include/svn_error_codes.h:499
+#: ../include/svn_error_codes.h:504
 msgid "Conflict resolution failed"
 msgstr "Konfliktauflösung schlug fehl"
 
-#: ../include/svn_error_codes.h:503
+#: ../include/svn_error_codes.h:508
 msgid "Failed to locate 'copyfrom' path in working copy"
 msgstr "Pfad von »copyfrom« konnte in der Arbeitskopie nicht gefunden werden"
 
-#: ../include/svn_error_codes.h:511
+#: ../include/svn_error_codes.h:516
 msgid "Moving a path from one changelist to another"
 msgstr "Verschieben eines Pfades von einer Änderungsliste in eine andere"
 
-#: ../include/svn_error_codes.h:516
+#: ../include/svn_error_codes.h:521
 msgid "Cannot delete a file external"
 msgstr "Kann externen Dateiverweis nicht löschen"
 
-#: ../include/svn_error_codes.h:521
+#: ../include/svn_error_codes.h:526
 msgid "Cannot move a file external"
 msgstr "Kann externen Dateiverweis nicht verschieben"
 
-#: ../include/svn_error_codes.h:526
+#: ../include/svn_error_codes.h:531
 msgid "Something's amiss with the wc sqlite database"
 msgstr "Irgendetwas ist mit der sqlite-Datenbank der Arbeitskopie falsch"
 
-#: ../include/svn_error_codes.h:531
+#: ../include/svn_error_codes.h:536
 msgid "The working copy is missing"
 msgstr "Die Arbeitskopie fehlt"
 
-#: ../include/svn_error_codes.h:536
+#: ../include/svn_error_codes.h:541
 msgid "The specified node is not a symlink"
 msgstr "Der spezifizierte Knoten ist kein symbolischer Link"
 
-#: ../include/svn_error_codes.h:541
+#: ../include/svn_error_codes.h:546
 msgid "The specified path has an unexpected status"
 msgstr "Der angegebene Pfad hat einen unerwarteten Status"
 
-#: ../include/svn_error_codes.h:546
+#: ../include/svn_error_codes.h:551
 msgid "The working copy needs to be upgraded"
 msgstr "Die Arbeitskopie muss in ein neueres Format gebracht werden"
 
-#: ../include/svn_error_codes.h:551
+#: ../include/svn_error_codes.h:556
 msgid "Previous operation has not finished; run 'cleanup' if it was 
interrupted"
 msgstr "Die vorhergehende Operation wurde nicht abgeschlossen; Starten Sie 
»svn cleanup« falls sie unterbrochen wurde"
 
-#: ../include/svn_error_codes.h:557
+#: ../include/svn_error_codes.h:562
 msgid "The operation cannot be performed with the specified depth"
 msgstr "Diese Operation kann nicht mit der angegebenen Tiefe durch geführt 
werden."
 
-#: ../include/svn_error_codes.h:562
+#: ../include/svn_error_codes.h:567
 msgid "Couldn't open a working copy file because access was denied"
 msgstr "Konnte eine Datei der Arbeitskopie nicht öffnen, da der Zugriff 
verweigert wurde"
 
-#: ../include/svn_error_codes.h:567
+#: ../include/svn_error_codes.h:572
 msgid "Mixed-revision working copy was found but not expected"
 msgstr "Arbeitskopie mit verschiedenen Revisionen gefunden aber nicht erwartet"
 
-#: ../include/svn_error_codes.h:572
+#: ../include/svn_error_codes.h:577
 msgid "Duplicate targets in svn:externals property"
 msgstr "Doppelte Zielangaben in svn:externals Eigenschaft"
 
-#: ../include/svn_error_codes.h:578
+#: ../include/svn_error_codes.h:583
 msgid "General filesystem error"
 msgstr "Allgemeiner Dateisystemfehler"
 
-#: ../include/svn_error_codes.h:582
+#: ../include/svn_error_codes.h:587
 msgid "Error closing filesystem"
 msgstr "Fehler beim Schließen des Dateisystems"
 
-#: ../include/svn_error_codes.h:586
+#: ../include/svn_error_codes.h:591
 msgid "Filesystem is already open"
 msgstr "Dateisystem ist bereits geöffnet"
 
-#: ../include/svn_error_codes.h:590
+#: ../include/svn_error_codes.h:595
 msgid "Filesystem is not open"
 msgstr "Dateisystem ist nicht geöffnet"
 
-#: ../include/svn_error_codes.h:594
+#: ../include/svn_error_codes.h:599
 msgid "Filesystem is corrupt"
 msgstr "Dateisystem ist beschädigt"
 
-#: ../include/svn_error_codes.h:598
+#: ../include/svn_error_codes.h:603
 msgid "Invalid filesystem path syntax"
 msgstr "Ungültige Pfadsyntax des Dateisystems"
 
-#: ../include/svn_error_codes.h:602
+#: ../include/svn_error_codes.h:607
 msgid "Invalid filesystem revision number"
 msgstr "Ungültige Revisionsnummer des Dateisystems"
 
-#: ../include/svn_error_codes.h:606
+#: ../include/svn_error_codes.h:611
 msgid "Invalid filesystem transaction name"
 msgstr "Ungültiger Transaktionsname des Dateisystems"
 
-#: ../include/svn_error_codes.h:610
+#: ../include/svn_error_codes.h:615
 msgid "Filesystem directory has no such entry"
 msgstr "Verzeichnis des Dateisystems hat keinen solchen Eintrag"
 
-#: ../include/svn_error_codes.h:614
+#: ../include/svn_error_codes.h:619
 msgid "Filesystem has no such representation"
 msgstr "Dateisystem hat keine solche Darstellung"
 
-#: ../include/svn_error_codes.h:618
+#: ../include/svn_error_codes.h:623
 msgid "Filesystem has no such string"
 msgstr "Dateisystem hat keinen solchen String"
 
-#: ../include/svn_error_codes.h:622
+#: ../include/svn_error_codes.h:627
 msgid "Filesystem has no such copy"
 msgstr "Dateisystem hat keine solche Kopie"
 
-#: ../include/svn_error_codes.h:626
+#: ../include/svn_error_codes.h:631
 msgid "The specified transaction is not mutable"
 msgstr "Die spezifizierte Transaktion ist nicht veränderlich"
 
-#: ../include/svn_error_codes.h:630
+#: ../include/svn_error_codes.h:635
 msgid "Filesystem has no item"
 msgstr "Dateisystem hat keinen Eintrag"
 
-#: ../include/svn_error_codes.h:634
+#: ../include/svn_error_codes.h:639
 msgid "Filesystem has no such node-rev-id"
 msgstr "Dateisystem hat keine solche Knotenrevisions-Id"
 
-#: ../include/svn_error_codes.h:638
+#: ../include/svn_error_codes.h:643
 msgid "String does not represent a node or node-rev-id"
 msgstr "Zeichenkette stellt keinen Knoten oder keine Knotenrevisions-Id dar"
 
-#: ../include/svn_error_codes.h:642
+#: ../include/svn_error_codes.h:647
 msgid "Name does not refer to a filesystem directory"
 msgstr "Name bezeichnet kein Verzeichnis des Dateisystems"
 
-#: ../include/svn_error_codes.h:646
+#: ../include/svn_error_codes.h:651
 msgid "Name does not refer to a filesystem file"
 msgstr "Name bezeichnet keine Datei des Dateisystems"
 
-#: ../include/svn_error_codes.h:650
+#: ../include/svn_error_codes.h:655
 msgid "Name is not a single path component"
 msgstr "Name ist keine einzelne Pfadkomponente"
 
-#: ../include/svn_error_codes.h:654
+#: ../include/svn_error_codes.h:659
 msgid "Attempt to change immutable filesystem node"
 msgstr "Versuch, einen nicht-veränderlichen Knoten des Dateisystems zu ändern"
 
-#: ../include/svn_error_codes.h:658
+#: ../include/svn_error_codes.h:663
 msgid "Item already exists in filesystem"
 msgstr "Objekt existiert bereits im Dateisystem"
 
-#: ../include/svn_error_codes.h:662
+#: ../include/svn_error_codes.h:667
 msgid "Attempt to remove or recreate fs root dir"
 msgstr "Versuch, Basisverzeichnis des Dateisystems zu entfernen oder neu zu 
erstellen"
 
-#: ../include/svn_error_codes.h:666
+#: ../include/svn_error_codes.h:671
 msgid "Object is not a transaction root"
 msgstr "Objekt ist keine Transaktionsbasis"
 
-#: ../include/svn_error_codes.h:670
+#: ../include/svn_error_codes.h:675
 msgid "Object is not a revision root"
 msgstr "Objekt ist keine Revisionsbasis"
 
-#: ../include/svn_error_codes.h:674
+#: ../include/svn_error_codes.h:679
 msgid "Merge conflict during commit"
 msgstr "Konflikt beim Zusammenführen während der Übertragung"
 
-#: ../include/svn_error_codes.h:678
+#: ../include/svn_error_codes.h:683
 msgid "A representation vanished or changed between reads"
 msgstr "Eine Darstellung ist zwischen Lesezugriffen verschwunden oder hat sich 
verändert"
 
-#: ../include/svn_error_codes.h:682
+#: ../include/svn_error_codes.h:687
 msgid "Tried to change an immutable representation"
 msgstr "Versuchte, eine nicht-veränderliche Darstellung zu ändern"
 
-#: ../include/svn_error_codes.h:686
+#: ../include/svn_error_codes.h:691
 msgid "Malformed skeleton data"
 msgstr "Fehlerhafte Skeletondaten"
 
-#: ../include/svn_error_codes.h:690
+#: ../include/svn_error_codes.h:695
 msgid "Transaction is out of date"
 msgstr "Transaktion ist veraltet"
 
-#: ../include/svn_error_codes.h:694
+#: ../include/svn_error_codes.h:699
 msgid "Berkeley DB error"
 msgstr "Berkeley-DB-Fehler"
 
-#: ../include/svn_error_codes.h:698
+#: ../include/svn_error_codes.h:703
 msgid "Berkeley DB deadlock error"
 msgstr "Deadlock-Fehler der Berkeley Datenbank"
 
-#: ../include/svn_error_codes.h:702
+#: ../include/svn_error_codes.h:707
 msgid "Transaction is dead"
 msgstr "Transaktion ist tot"
 
-#: ../include/svn_error_codes.h:706
+#: ../include/svn_error_codes.h:711
 msgid "Transaction is not dead"
 msgstr "Transaktion ist nicht tot"
 
-#: ../include/svn_error_codes.h:711
+#: ../include/svn_error_codes.h:716
 msgid "Unknown FS type"
 msgstr "Unbekannter Dateisystemtyp"
 
-#: ../include/svn_error_codes.h:716
+#: ../include/svn_error_codes.h:721
 msgid "No user associated with filesystem"
 msgstr "Kein Benutzer mit dem Dateisystem verbunden"
 
-#: ../include/svn_error_codes.h:721
+#: ../include/svn_error_codes.h:726
 msgid "Path is already locked"
 msgstr "Pfad ist bereits gesperrt"
 
-#: ../include/svn_error_codes.h:726 ../include/svn_error_codes.h:963
+#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:978
 msgid "Path is not locked"
 msgstr "Pfad ist nicht gesperrt"
 
-#: ../include/svn_error_codes.h:731
+#: ../include/svn_error_codes.h:736
 msgid "Lock token is incorrect"
 msgstr "Sperrmarke ist fehlerhaft"
 
-#: ../include/svn_error_codes.h:736
+#: ../include/svn_error_codes.h:741
 msgid "No lock token provided"
 msgstr "Keine Sperrmarke angegeben"
 
-#: ../include/svn_error_codes.h:741
+#: ../include/svn_error_codes.h:746
 msgid "Username does not match lock owner"
 msgstr "Benutzername und Sperreigner stimmen nicht überein"
 
-#: ../include/svn_error_codes.h:746
+#: ../include/svn_error_codes.h:751
 msgid "Filesystem has no such lock"
 msgstr "Dateisystem hat keine solche Sperre"
 
-#: ../include/svn_error_codes.h:751
+#: ../include/svn_error_codes.h:756
 msgid "Lock has expired"
 msgstr "Sperre ist abgelaufen"
 
-#: ../include/svn_error_codes.h:756 ../include/svn_error_codes.h:950
+#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:965
 msgid "Item is out of date"
 msgstr "Eintrag ist veraltet"
 
-#: ../include/svn_error_codes.h:768
+#: ../include/svn_error_codes.h:773
 msgid "Unsupported FS format"
 msgstr "Nicht unterstütztes Dateisystemformat"
 
-#: ../include/svn_error_codes.h:773
+#: ../include/svn_error_codes.h:778
 msgid "Representation is being written"
 msgstr "Darstellung wird geschrieben"
 
-#: ../include/svn_error_codes.h:778
+#: ../include/svn_error_codes.h:783
 msgid "The generated transaction name is too long"
 msgstr "Der erzeugte Transaktionsname ist zu lang"
 
-#: ../include/svn_error_codes.h:783
+#: ../include/svn_error_codes.h:788
 msgid "Filesystem has no such node origin record"
 msgstr "Dateisystem hat keinen solchen Knotenursprungsdatensatz"
 
-#: ../include/svn_error_codes.h:788
+#: ../include/svn_error_codes.h:793
 msgid "Filesystem upgrade is not supported"
 msgstr "Dateisystemaktualisierung wird nicht unterstützt"
 
-#: ../include/svn_error_codes.h:793
+#: ../include/svn_error_codes.h:798
 msgid "Filesystem has no such checksum-representation index record"
 msgstr "Dateisystem hat keinen solchen Indexdatensatz zur 
Prüfsummen-Repräsentation"
 
-#: ../include/svn_error_codes.h:798
+#: ../include/svn_error_codes.h:803
 msgid "Property value in filesystem differs from the provided base value"
 msgstr "Eigenschaftswert im Dateisystem weicht von dem angegebenen Basiswert 
ab"
 
-#: ../include/svn_error_codes.h:804
+#: ../include/svn_error_codes.h:809
 msgid "The filesystem editor completion process was not followed"
 msgstr "Der Prozess für den Abschluss von Bearbeitungen des Dateisystems wurde 
nicht befolgt"
 
-#: ../include/svn_error_codes.h:809
+#: ../include/svn_error_codes.h:814
 msgid "A packed revprop could not be read"
 msgstr "Eine gepackte Revisionseigenschaft konnte nicht gelesen werden"
 
-#: ../include/svn_error_codes.h:814
+#: ../include/svn_error_codes.h:819
 msgid "Could not initialize the revprop caching infrastructure."
 msgstr "Konnte Zwischenspeicher für Revisionseigenschaften nicht 
initialisieren"
 
-#: ../include/svn_error_codes.h:819
+#: ../include/svn_error_codes.h:824
 msgid "Malformed transaction ID string."
 msgstr "Fehlerhafte Zeichenkette für Transaktions-ID."
 
-#: ../include/svn_error_codes.h:824
+#: ../include/svn_error_codes.h:829
 msgid "Corrupt index file."
 msgstr "Beschädigte Indexdatei."
 
-#: ../include/svn_error_codes.h:829
+#: ../include/svn_error_codes.h:834
 msgid "Revision not covered by index."
 msgstr "Revision ist nicht im Index enthalten."
 
-#: ../include/svn_error_codes.h:834
+#: ../include/svn_error_codes.h:839
 msgid "Item index too large for this revision."
 msgstr "Elementindex zu groß für diese Revision."
 
-#: ../include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:844
 msgid "Container index out of range."
 msgstr "Containerindex außerhalb des zulässigen Bereichs."
 
-#: ../include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:849
 msgid "Index files are inconsistent."
 msgstr "Indexdateien sind inkonsistent."
 
-#: ../include/svn_error_codes.h:849
+#: ../include/svn_error_codes.h:854
 msgid "Lock operation failed"
 msgstr "Sperrvorgang schlug fehl"
 
-#: ../include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:859
 msgid "Unsupported FS type"
 msgstr "Nicht unterstützter Dateisystemtyp"
 
-#: ../include/svn_error_codes.h:859
+#: ../include/svn_error_codes.h:864
 msgid "Container capacity exceeded."
 msgstr "Kapazität des Containerindex überschritten."
 
-#: ../include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:869
 msgid "Malformed node revision ID string."
 msgstr "Fehlerhafte Zeichenkette für Knotenrevisions-ID."
 
-#: ../include/svn_error_codes.h:869 ../libsvn_fs_x/revprops.c:291
+#: ../include/svn_error_codes.h:874
 msgid "Invalid generation number data."
 msgstr "Ungültige Daten für Generationsnummer."
 
-#: ../include/svn_error_codes.h:875
+#: ../include/svn_error_codes.h:879
+#, fuzzy
+msgid "Revprop manifest corrupt."
+msgstr "Projektarchiv ist beschädigt"
+
+#: ../include/svn_error_codes.h:884
+#, fuzzy
+msgid "Property list is corrupt."
+msgstr "Dateisystem ist beschädigt"
+
+#: ../include/svn_error_codes.h:889
+msgid "Content checksums supposedly match but content does not."
+msgstr ""
+
+#: ../include/svn_error_codes.h:895
 msgid "The repository is locked, perhaps for db recovery"
 msgstr "Das Projektarchiv ist gesperrt, möglicherweise zum Retten der 
Datenbank"
 
-#: ../include/svn_error_codes.h:879
+#: ../include/svn_error_codes.h:899
 msgid "A repository hook failed"
 msgstr "Eine Aktion im Projektarchiv schlug fehl"
 
-#: ../include/svn_error_codes.h:883
+#: ../include/svn_error_codes.h:903
 msgid "Incorrect arguments supplied"
 msgstr "Inkorrekte Parameter übergeben"
 
-#: ../include/svn_error_codes.h:887
+#: ../include/svn_error_codes.h:907
 msgid "A report cannot be generated because no data was supplied"
 msgstr "Es kann kein Report erzeugt werden, da keine Daten geliefert wurden"
 
-#: ../include/svn_error_codes.h:891
+#: ../include/svn_error_codes.h:911
 msgid "Bogus revision report"
 msgstr "Ungültiger Revisionsreport"
 
-#: ../include/svn_error_codes.h:900
+#: ../include/svn_error_codes.h:920
 msgid "Unsupported repository version"
 msgstr "Nicht unterstützte Version des Projektarchivs"
 
-#: ../include/svn_error_codes.h:904
+#: ../include/svn_error_codes.h:924
 msgid "Disabled repository feature"
 msgstr "Deaktiviertes Merkmal des Projektarchivs"
 
-#: ../include/svn_error_codes.h:908
+#: ../include/svn_error_codes.h:928
 msgid "Error running post-commit hook"
 msgstr "Fehler beim Ausführen der Aktion »post-commit«"
 
-#: ../include/svn_error_codes.h:913
+#: ../include/svn_error_codes.h:933
 msgid "Error running post-lock hook"
 msgstr "Fehler beim Ausführen der Aktion »post-lock«"
 
-#: ../include/svn_error_codes.h:918
+#: ../include/svn_error_codes.h:938
 msgid "Error running post-unlock hook"
 msgstr "Fehler beim Ausführen der Aktion »post-unlock«"
 
-#: ../include/svn_error_codes.h:923
+#: ../include/svn_error_codes.h:943
 msgid "Repository upgrade is not supported"
 msgstr "Projektarchivaktualisierung wird nicht unterstützt"
 
-#: ../include/svn_error_codes.h:928
-msgid "Repository is corrupt"
-msgstr "Projektarchiv ist beschädigt"
-
-#: ../include/svn_error_codes.h:934
+#: ../include/svn_error_codes.h:949
 msgid "Bad URL passed to RA layer"
 msgstr "Ungültige URL an die ZM-Schicht übergeben"
 
-#: ../include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:953
 msgid "Authorization failed"
 msgstr "Autorisierung schlug fehl"
 
-#: ../include/svn_error_codes.h:942
+#: ../include/svn_error_codes.h:957
 msgid "Unknown authorization method"
 msgstr "Unbekannte Autorisierungsmethode"
 
-#: ../include/svn_error_codes.h:946
+#: ../include/svn_error_codes.h:961
 msgid "Repository access method not implemented"
 msgstr "Zugriffsmethode zum Projektarchiv nicht implementiert"
 
-#: ../include/svn_error_codes.h:954
+#: ../include/svn_error_codes.h:969
 msgid "Repository has no UUID"
 msgstr "Projektarchiv hat keine UUID"
 
-#: ../include/svn_error_codes.h:958
+#: ../include/svn_error_codes.h:973
 msgid "Unsupported RA plugin ABI version"
 msgstr "Nicht unterstützte ABI-Version des ZM-Plugins"
 
-#: ../include/svn_error_codes.h:968
+#: ../include/svn_error_codes.h:983
 msgid "Server can only replay from the root of a repository"
 msgstr "Der Server kann nur von der Basis des Projektarchivs fortfahren"
 
-#: ../include/svn_error_codes.h:973
+#: ../include/svn_error_codes.h:988
 msgid "Repository UUID does not match expected UUID"
 msgstr "Die UUID des Projektarchivs entspricht nicht der erwarteten UUID"
 
-#: ../include/svn_error_codes.h:978
+#: ../include/svn_error_codes.h:993
 msgid "Repository root URL does not match expected root URL"
 msgstr "Die URL der Projektarchivwurzel entspricht nicht der erwarteten 
Wurzel-URL"
 
-#: ../include/svn_error_codes.h:983
+#: ../include/svn_error_codes.h:998
 msgid "Session URL does not match expected session URL"
 msgstr "Die Sitzungs-URL entspricht nicht der erwarteten Sitzungs-URL"
 
-#: ../include/svn_error_codes.h:988 ../libsvn_ra_svn/client.c:503
+#: ../include/svn_error_codes.h:1003 ../libsvn_ra_svn/client.c:506
 #, c-format
 msgid "Can't create tunnel"
 msgstr "Kann Tunnel nicht erzeugen"
 
-#: ../include/svn_error_codes.h:993
+#: ../include/svn_error_codes.h:1008
 msgid "Can't create session"
 msgstr "Kann Sitzung nicht erzeugen"
 
-#: ../include/svn_error_codes.h:999
+#: ../include/svn_error_codes.h:1014
 msgid "RA layer failed to init socket layer"
 msgstr "ZM-Schicht konnte die Verbindungsschicht nicht initialisieren"
 
-#: ../include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1018
 msgid "RA layer failed to create HTTP request"
 msgstr "ZM-Schicht konnte keine HTTP-Anforderung erzeugen"
 
-#: ../include/svn_error_codes.h:1007
+#: ../include/svn_error_codes.h:1022
 msgid "RA layer request failed"
 msgstr "ZM-Schicht Anforderung gescheitert"
 
-#: ../include/svn_error_codes.h:1011
+#: ../include/svn_error_codes.h:1026
 msgid "RA layer didn't receive requested OPTIONS info"
 msgstr "ZM-Schicht hat die angeforderte OPTIONS-Information nicht erhalten"
 
-#: ../include/svn_error_codes.h:1015
+#: ../include/svn_error_codes.h:1030
 msgid "RA layer failed to fetch properties"
 msgstr "ZM-Schicht konnte keine Eigenschaften bestimmen"
 
-#: ../include/svn_error_codes.h:1019
+#: ../include/svn_error_codes.h:1034
 msgid "RA layer file already exists"
 msgstr "ZM-Schichtdatei existiert bereits"
 
-#: ../include/svn_error_codes.h:1033
+#: ../include/svn_error_codes.h:1048
 msgid "HTTP Path Not Found"
 msgstr "HTTP Pfad nicht gefunden"
 
-#: ../include/svn_error_codes.h:1037
+#: ../include/svn_error_codes.h:1052
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "Konnte WebDAV PROPPATCH nicht ausführen"
 
 #. If condition COND is not met, return a "malformed network data" error.
 #.
-#: ../include/svn_error_codes.h:1042 ../include/svn_error_codes.h:1520
-#: ../libsvn_ra_svn/marshal.c:1129 ../libsvn_ra_svn/marshal.c:1381
-#: ../libsvn_ra_svn/marshal.c:1411 ../libsvn_ra_svn/marshal.c:2495
+#: ../include/svn_error_codes.h:1057 ../include/svn_error_codes.h:1560
+#: ../libsvn_ra_svn/marshal.c:1459 ../libsvn_ra_svn/marshal.c:1716
+#: ../libsvn_ra_svn/marshal.c:1745 ../libsvn_ra_svn/marshal.c:3000
 msgid "Malformed network data"
 msgstr "Fehlerhafte Netzwerkdaten"
 
-#: ../include/svn_error_codes.h:1047
+#: ../include/svn_error_codes.h:1062
 msgid "Unable to extract data from response header"
 msgstr "Kann keine Daten aus dem Antwortkopf extrahieren"
 
-#: ../include/svn_error_codes.h:1052
+#: ../include/svn_error_codes.h:1067
 msgid "Repository has been moved"
 msgstr "Projektarchiv wurde verschoben"
 
-#: ../include/svn_error_codes.h:1057 ../libsvn_ra_serf/util.c:893
+#: ../include/svn_error_codes.h:1072 ../libsvn_ra_serf/util.c:937
 msgid "Connection timed out"
 msgstr "Die Wartezeit für die Verbindung ist abgelaufen"
 
-#: ../include/svn_error_codes.h:1062
+#: ../include/svn_error_codes.h:1077
 msgid "URL access forbidden for unknown reason"
 msgstr "URL-Zugriff wegen unbekannter Ursache verboten"
 
-#: ../include/svn_error_codes.h:1067
+#: ../include/svn_error_codes.h:1082
 msgid "The server state conflicts with the requested preconditions"
 msgstr "Der Serverzustand steht im Konflikt mit den angeforderten 
Vorbedingungen"
 
-#: ../include/svn_error_codes.h:1072
+#: ../include/svn_error_codes.h:1087
 msgid "The URL doesn't allow the requested method"
 msgstr "Die URL erlaubt die angeforderte Methode nicht"
 
-#: ../include/svn_error_codes.h:1078 ../include/svn_error_codes.h:1524
+#: ../include/svn_error_codes.h:1093 ../include/svn_error_codes.h:1564
 msgid "Couldn't find a repository"
 msgstr "Konnte Projektarchiv nicht finden"
 
-#: ../include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1097
 msgid "Couldn't open a repository"
 msgstr "Konnte Projektarchiv nicht öffnen"
 
-#: ../include/svn_error_codes.h:1088
+#: ../include/svn_error_codes.h:1103
 msgid "Svndiff data has invalid header"
 msgstr "Svndiff-Daten enthalten ungültigen Kopf"
 
-#: ../include/svn_error_codes.h:1092
+#: ../include/svn_error_codes.h:1107
 msgid "Svndiff data contains corrupt window"
 msgstr "Svndiff-Daten enthalten defektes Fenster"
 
-#: ../include/svn_error_codes.h:1096
+#: ../include/svn_error_codes.h:1111
 msgid "Svndiff data contains backward-sliding source view"
 msgstr "Svndiff-Daten enthalten rückwärts gleitenden Blick auf Quellen"
 
-#: ../include/svn_error_codes.h:1100
+#: ../include/svn_error_codes.h:1115
 msgid "Svndiff data contains invalid instruction"
 msgstr "Svndiff-Daten enthalten ungültige Anweisung"
 
-#: ../include/svn_error_codes.h:1104
+#: ../include/svn_error_codes.h:1119
 msgid "Svndiff data ends unexpectedly"
 msgstr "Svndiff-Daten enden unerwartet"
 
-#: ../include/svn_error_codes.h:1108
+#: ../include/svn_error_codes.h:1123
 msgid "Svndiff compressed data is invalid"
 msgstr "Komprimierte svndiff-Daten sind ungültig"
 
-#: ../include/svn_error_codes.h:1114
+#: ../include/svn_error_codes.h:1129
 msgid "Apache has no path to an SVN filesystem"
 msgstr "Apache besitzt keinen Pfad zu einem SVN Dateisystem"
 
-#: ../include/svn_error_codes.h:1118
+#: ../include/svn_error_codes.h:1133
 msgid "Apache got a malformed URI"
 msgstr "Apache hat eine fehlerhafte URI erhalten"
 
-#: ../include/svn_error_codes.h:1122
+#: ../include/svn_error_codes.h:1137
 msgid "Activity not found"
 msgstr "Aktivität nicht gefunden"
 
-#: ../include/svn_error_codes.h:1126
+#: ../include/svn_error_codes.h:1141
 msgid "Baseline incorrect"
 msgstr "»Baseline« nicht korrekt"
 
-#: ../include/svn_error_codes.h:1130
+#: ../include/svn_error_codes.h:1145
 msgid "Input/output error"
 msgstr "Eingabe/Ausgabe Fehler"
 
-#: ../include/svn_error_codes.h:1136
+#: ../include/svn_error_codes.h:1151
 msgid "A path under version control is needed for this operation"
 msgstr "Für diese Operation wird ein Pfad unter Versionskontrolle benötigt"
 
-#: ../include/svn_error_codes.h:1140
+#: ../include/svn_error_codes.h:1155
 msgid "Repository access is needed for this operation"
 msgstr "Für diese Operation wird Zugang zum Projektarchiv benötigt"
 
-#: ../include/svn_error_codes.h:1144
+#: ../include/svn_error_codes.h:1159
 msgid "Bogus revision information given"
 msgstr "Falsche Revisionsinformation angegeben"
 
-#: ../include/svn_error_codes.h:1148
+#: ../include/svn_error_codes.h:1163
 msgid "Attempting to commit to a URL more than once"
 msgstr "Versuch, mehrfach zu einer URL zu übertragen"
 
-#: ../include/svn_error_codes.h:1152
+#: ../include/svn_error_codes.h:1167
 msgid "Operation does not apply to binary file"
 msgstr "Operation ist nicht auf einer Binärdatei ausführbar"
 
-#: ../include/svn_error_codes.h:1158
+#: ../include/svn_error_codes.h:1173
 msgid "Format of an svn:externals property was invalid"
 msgstr "Format einer svn:externals Eigenschaft war ungültig"
 
-#: ../include/svn_error_codes.h:1162
+#: ../include/svn_error_codes.h:1177
 msgid "Attempting restricted operation for modified resource"
 msgstr "Versuch, eine beschränkte Operation für veränderte Ressource 
auszuführen"
 
-#: ../include/svn_error_codes.h:1166
+#: ../include/svn_error_codes.h:1181
 msgid "Operation does not apply to directory"
 msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
 
-#: ../include/svn_error_codes.h:1170
+#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1810
+#, c-format
 msgid "Revision range is not allowed"
 msgstr "Revisionsbereich nicht erlaubt"
 
-#: ../include/svn_error_codes.h:1174
+#: ../include/svn_error_codes.h:1189
 msgid "Inter-repository relocation not allowed"
 msgstr "Umplatzieren innerhalb des Projektarchivs nicht erlaubt"
 
-#: ../include/svn_error_codes.h:1178
+#: ../include/svn_error_codes.h:1193
 msgid "Author name cannot contain a newline"
 msgstr "Autorenname darf keinen Zeilenumbruch enthalten"
 
-#: ../include/svn_error_codes.h:1182
+#: ../include/svn_error_codes.h:1197
 msgid "Bad property name"
 msgstr "Fehlerhafter Eigenschaftsname"
 
-#: ../include/svn_error_codes.h:1187
+#: ../include/svn_error_codes.h:1202
 msgid "Two versioned resources are unrelated"
 msgstr "Zwei versionierte Ressourcen sind nicht verwandt"
 
-#: ../include/svn_error_codes.h:1192
+#: ../include/svn_error_codes.h:1207
 msgid "Path has no lock token"
 msgstr "Pfad hat keine Sperrmarke"
 
-#: ../include/svn_error_codes.h:1197
+#: ../include/svn_error_codes.h:1212
 msgid "Operation does not support multiple sources"
 msgstr "Die Operation unterstützt nicht mehrere Quellen"
 
-#: ../include/svn_error_codes.h:1202
+#: ../include/svn_error_codes.h:1217
 msgid "No versioned parent directories"
 msgstr "Keine versionierten Elternverzeichnisse"
 
-#: ../include/svn_error_codes.h:1207 ../include/svn_error_codes.h:1227
+#: ../include/svn_error_codes.h:1222 ../include/svn_error_codes.h:1242
 msgid "Working copy and merge source not ready for reintegration"
 msgstr "Arbeitskopie und Zusammnführungsquelle sind für eine Reintegration 
nicht bereit"
 
-#: ../include/svn_error_codes.h:1212
+#: ../include/svn_error_codes.h:1227
 msgid "A file external cannot overwrite an existing versioned item"
 msgstr "Ein externer Dateiverweis kann kein existierendes versioniertes Objekt 
überschreiben"
 
-#: ../include/svn_error_codes.h:1217
+#: ../include/svn_error_codes.h:1232
 msgid "Invalid path component strip count specified"
 msgstr "Ungültige Anzahl der vom Pfad zu entfernenden Komponenten angegeben"
 
-#: ../include/svn_error_codes.h:1222
+#: ../include/svn_error_codes.h:1237
 msgid "Detected a cycle while processing the operation"
 msgstr "Endlosschleife während der Verarbeitung der Operation entdeckt"
 
-#: ../include/svn_error_codes.h:1232
+#: ../include/svn_error_codes.h:1247
 msgid "Invalid mergeinfo detected in merge target"
 msgstr "Ungültige Zusammenführungsinformationen in Zusammenführungsziel 
entdeckt"
 
-#: ../include/svn_error_codes.h:1237
+#: ../include/svn_error_codes.h:1252
 msgid "Can't perform this operation without a valid lock token"
 msgstr "Kann diese Operation nicht ohne eine gültige Sperrmarke ausführen"
 
-#: ../include/svn_error_codes.h:1242
+#: ../include/svn_error_codes.h:1257
 msgid "The operation is forbidden by the server"
 msgstr "Die Operation wurde durch den Server nicht zugelassen"
 
-#: ../include/svn_error_codes.h:1248
+#: ../include/svn_error_codes.h:1262
+#, fuzzy
+msgid "The conflict resolution option is not applicable"
+msgstr "Konfliktauflösung schlug fehl"
+
+#: ../include/svn_error_codes.h:1268
 msgid "A problem occurred; see other errors for details"
 msgstr "Ein Problem ist aufgetreten, für Details siehe andere Fehlermeldungen"
 
-#: ../include/svn_error_codes.h:1252
+#: ../include/svn_error_codes.h:1272
 msgid "Failure loading plugin"
 msgstr "Fehler beim Laden eines Plugins"
 
-#: ../include/svn_error_codes.h:1256
+#: ../include/svn_error_codes.h:1276
 msgid "Malformed file"
 msgstr "Fehlerhafte Datei"
 
-#: ../include/svn_error_codes.h:1260
+#: ../include/svn_error_codes.h:1280
 msgid "Incomplete data"
 msgstr "Unvollständige Daten"
 
-#: ../include/svn_error_codes.h:1264
+#: ../include/svn_error_codes.h:1284
 msgid "Incorrect parameters given"
 msgstr "Inkorrekte Parameter übergeben"
 
-#: ../include/svn_error_codes.h:1268
+#: ../include/svn_error_codes.h:1288
 msgid "Tried a versioning operation on an unversioned resource"
 msgstr "Versuchte, eine Versionsoperation auf nicht versionierter Ressource 
auszuführen"
 
-#: ../include/svn_error_codes.h:1272
+#: ../include/svn_error_codes.h:1292
 msgid "Test failed"
 msgstr "Test schlug fehl"
 
-#: ../include/svn_error_codes.h:1276
+#: ../include/svn_error_codes.h:1296
 msgid "Trying to use an unsupported feature"
 msgstr "Versuch, ein nicht unterstütztes Merkmal zu benutzen"
 
-#: ../include/svn_error_codes.h:1280
+#: ../include/svn_error_codes.h:1300
 msgid "Unexpected or unknown property kind"
 msgstr "Unerwartete oder unbekannte Eigenschaftsart"
 
-#: ../include/svn_error_codes.h:1284
+#: ../include/svn_error_codes.h:1304
 msgid "Illegal target for the requested operation"
 msgstr "Ungültiges Ziel für die angeforderte Operation"
 
-#: ../include/svn_error_codes.h:1288
+#: ../include/svn_error_codes.h:1308
 msgid "MD5 checksum is missing"
 msgstr "MD5 Prüfsumme fehlt"
 
-#: ../include/svn_error_codes.h:1292
+#: ../include/svn_error_codes.h:1312
 msgid "Directory needs to be empty but is not"
 msgstr "Das Verzeichnis muss leer sein, ist es aber nicht"
 
-#: ../include/svn_error_codes.h:1296
+#: ../include/svn_error_codes.h:1316
 msgid "Error calling external program"
 msgstr "Fehler beim Aufrufen eines externen Programmes"
 
-#: ../include/svn_error_codes.h:1300
+#: ../include/svn_error_codes.h:1320
 msgid "Python exception has been set with the error"
 msgstr "Eine Python-Ausnahme wurde mit dem Fehler gesetzt"
 
-#: ../include/svn_error_codes.h:1304
+#: ../include/svn_error_codes.h:1324
 msgid "A checksum mismatch occurred"
 msgstr "Ein Prüfsummenfehler ist aufgetreten"
 
-#: ../include/svn_error_codes.h:1308
+#: ../include/svn_error_codes.h:1328
 msgid "The operation was interrupted"
 msgstr "Die Operation wurde unterbrochen"
 
-#: ../include/svn_error_codes.h:1312
+#: ../include/svn_error_codes.h:1332
 msgid "The specified diff option is not supported"
 msgstr "Die angegebene Vergleichsoption wird nicht unterstützt"
 
-#: ../include/svn_error_codes.h:1316
+#: ../include/svn_error_codes.h:1336
 msgid "Property not found"
 msgstr "Eigenschaft nicht gefunden"
 
-#: ../include/svn_error_codes.h:1320
+#: ../include/svn_error_codes.h:1340
 msgid "No auth file path available"
 msgstr "Kein Pfad für die Anmeldedatei verfügbar"
 
-#: ../include/svn_error_codes.h:1325
+#: ../include/svn_error_codes.h:1345
 msgid "Incompatible library version"
 msgstr "Inkompatible Bibliotheksversion"
 
-#: ../include/svn_error_codes.h:1330
+#: ../include/svn_error_codes.h:1350
 msgid "Mergeinfo parse error"
 msgstr "Einlesefehler für Zusammenführungsinformationen"
 
-#: ../include/svn_error_codes.h:1335
+#: ../include/svn_error_codes.h:1355
 msgid "Cease invocation of this API"
 msgstr "Einstellen der Benutzung dieser API"
 
-#: ../include/svn_error_codes.h:1340
+#: ../include/svn_error_codes.h:1360
 msgid "Error parsing revision number"
 msgstr "Fehler beim Einlesen der Revisionsnummer"
 
-#: ../include/svn_error_codes.h:1345
+#: ../include/svn_error_codes.h:1365
 msgid "Iteration terminated before completion"
 msgstr "Iteration brach vor der Fertigstellung ab"
 
-#: ../include/svn_error_codes.h:1350
+#: ../include/svn_error_codes.h:1370
 msgid "Unknown changelist"
 msgstr "Unbekannte Änderungsliste"
 
-#: ../include/svn_error_codes.h:1355
+#: ../include/svn_error_codes.h:1375
 msgid "Reserved directory name in command line arguments"
 msgstr "Kommandozeilenparameter enthalten reservierten Verzeichnisnamen"
 
-#: ../include/svn_error_codes.h:1360
+#: ../include/svn_error_codes.h:1380
 msgid "Inquiry about unknown capability"
 msgstr "Nachfrage nach unbekannter Eigenschaft"
 
-#: ../include/svn_error_codes.h:1365
+#: ../include/svn_error_codes.h:1385
 msgid "Test skipped"
 msgstr "Test übersprungen"
 
-#: ../include/svn_error_codes.h:1370
+#: ../include/svn_error_codes.h:1390
 msgid "APR memcache library not available"
 msgstr "Die APR-memcache-Bibliothek ist nicht verfügbar"
 
-#: ../include/svn_error_codes.h:1375
+#: ../include/svn_error_codes.h:1395
 msgid "Couldn't perform atomic initialization"
 msgstr "Eine atomare Initialisierung konnte nicht durchgeführt werden"
 
-#: ../include/svn_error_codes.h:1380
+#: ../include/svn_error_codes.h:1400
 msgid "SQLite error"
 msgstr "SQLite-Fehler"
 
-#: ../include/svn_error_codes.h:1385
+#: ../include/svn_error_codes.h:1405
 msgid "Attempted to write to readonly SQLite db"
 msgstr "Versuch, in eine nur lesbare SQLite-Datenbank zu schreiben"
 
-#: ../include/svn_error_codes.h:1392
+#: ../include/svn_error_codes.h:1412
 msgid "Unsupported schema found in SQLite db"
 msgstr "Nicht unterstütztes Schema in SQLite-Datenbank gefunden"
 
-#: ../include/svn_error_codes.h:1397
+#: ../include/svn_error_codes.h:1417
 msgid "The SQLite db is busy"
 msgstr "Die SQLite-Datenbank ist beschäftigt"
 
-#: ../include/svn_error_codes.h:1402
+#: ../include/svn_error_codes.h:1422
 msgid "SQLite busy at transaction rollback; resetting all busy SQLite 
statements to allow rollback"
 msgstr "SQLite ist mit dem Rollback einer Transaktion beschäftigt; Alle 
SQLite-Anweisungen werden für Rollback zurückgesetzt"
 
-#: ../include/svn_error_codes.h:1408
+#: ../include/svn_error_codes.h:1428
 msgid "Constraint error in SQLite db"
 msgstr "Constraint-Fehler in SQLite-Datenbank"
 
-#: ../include/svn_error_codes.h:1413
+#: ../include/svn_error_codes.h:1433
 msgid "Too many memcached servers configured"
 msgstr "Zu viele memcached-Server konfiguriert"
 
-#: ../include/svn_error_codes.h:1418
+#: ../include/svn_error_codes.h:1438
 msgid "Failed to parse version number string"
 msgstr "Konnte Zeichenkette mit Versionsnummer nicht verarbeiten"
 
-#: ../include/svn_error_codes.h:1423
+#: ../include/svn_error_codes.h:1443
 msgid "Atomic data storage is corrupt"
 msgstr "Speicherbereich für »atomic« ist beschädigt"
 
-#: ../include/svn_error_codes.h:1428
+#: ../include/svn_error_codes.h:1448
 msgid "utf8proc library error"
 msgstr "Fehler in utf8proc-Bibliothek"
 
-#: ../include/svn_error_codes.h:1433
+#: ../include/svn_error_codes.h:1453
 msgid "Bad arguments to SQL operators GLOB or LIKE"
 msgstr "Fehlerhafte Parameter für SQL-Operatoren GLOB oder LIKE"
 
-#: ../include/svn_error_codes.h:1438
+#: ../include/svn_error_codes.h:1458
 msgid "Packed data stream is corrupt"
 msgstr "Komprimierter Datenstrom ist beschädigt"
 
-#: ../include/svn_error_codes.h:1443
+#: ../include/svn_error_codes.h:1463
 msgid "Additional errors:"
 msgstr "Zusätzliche Fehler:"
 
-#: ../include/svn_error_codes.h:1448
+#: ../include/svn_error_codes.h:1468
 msgid "Parser error: invalid input"
 msgstr "Formatfehler: ungültige Eingabe"
 
-#: ../include/svn_error_codes.h:1454
+#: ../include/svn_error_codes.h:1473
+#, fuzzy
+msgid "SQLite transaction rollback failed"
+msgstr "Aufräumen der Transaktion »%s« schlug fehl"
+
+#: ../include/svn_error_codes.h:1478
+#, fuzzy
+msgid "LZ4 compression failed"
+msgstr "XML-Parser schlug fehl"
+
+#: ../include/svn_error_codes.h:1483
+#, fuzzy
+msgid "LZ4 decompression failed"
+msgstr "Sperrvorgang schlug fehl"
+
+#: ../include/svn_error_codes.h:1489
 msgid "Error parsing arguments"
 msgstr "Fehler beim Einlesen der Parameter"
 
-#: ../include/svn_error_codes.h:1458
+#: ../include/svn_error_codes.h:1493
 msgid "Not enough arguments provided"
 msgstr "Nicht genügend Parameter angegeben"
 
-#: ../include/svn_error_codes.h:1462
+#: ../include/svn_error_codes.h:1497
 msgid "Mutually exclusive arguments specified"
 msgstr "Die Parameter schließen sich gegenseitig aus"
 
-#: ../include/svn_error_codes.h:1466
+#: ../include/svn_error_codes.h:1501
 msgid "Attempted command in administrative dir"
 msgstr "Ausführen einer Operation in einem Verwaltungsverzeichnis versucht"
 
-#: ../include/svn_error_codes.h:1470
+#: ../include/svn_error_codes.h:1505
 msgid "The log message file is under version control"
 msgstr "Die Datei für die Logmeldung ist unter Versionskontrolle"
 
-#: ../include/svn_error_codes.h:1474
+#: ../include/svn_error_codes.h:1509
 msgid "The log message is a pathname"
 msgstr "Die Logmeldung ist ein Pfadname"
 
-#: ../include/svn_error_codes.h:1478
+#: ../include/svn_error_codes.h:1513
 msgid "Committing in directory scheduled for addition"
 msgstr "Übertragung in einem Verzeichnis, das zum Hinzufügen vorgesehen ist"
 
-#: ../include/svn_error_codes.h:1482
+#: ../include/svn_error_codes.h:1517
 msgid "No external editor available"
 msgstr "Kein externer Editor verfügbar"
 
-#: ../include/svn_error_codes.h:1486
+#: ../include/svn_error_codes.h:1521
 msgid "Something is wrong with the log message's contents"
 msgstr "Mit dem Inhalt der Logmeldung stimmt etwas nicht"
 
-#: ../include/svn_error_codes.h:1490
+#: ../include/svn_error_codes.h:1525
 msgid "A log message was given where none was necessary"
 msgstr "Eine Logmeldung wurde angegeben wo keine nötig ist"
 
-#: ../include/svn_error_codes.h:1494
+#: ../include/svn_error_codes.h:1529
 msgid "No external merge tool available"
 msgstr "Kein externes Werkzeug zum Zusammenführen verfügbar"
 
-#: ../include/svn_error_codes.h:1498
+#: ../include/svn_error_codes.h:1533
 msgid "Failed processing one or more externals definitions"
 msgstr "Verarbeitung einer oder mehrerer »svn:externals«-Definitionen 
fehlgeschlagen"
 
-#: ../include/svn_error_codes.h:1504
+#: ../include/svn_error_codes.h:1538
+#, fuzzy
+msgid "Repository verification failed"
+msgstr "Anlegen des Projektarchivs schlug fehl"
+
+#: ../include/svn_error_codes.h:1544
 msgid "Special code for wrapping server errors to report to client"
 msgstr "Spezieller Fehlerkode, um Serverfehler an den Client zu melden"
 
-#: ../include/svn_error_codes.h:1508
+#: ../include/svn_error_codes.h:1548
 msgid "Unknown svn protocol command"
 msgstr "Unbekanntes svn-Protokollkommando"
 
-#: ../include/svn_error_codes.h:1512
+#: ../include/svn_error_codes.h:1552
 msgid "Network connection closed unexpectedly"
 msgstr "Netzwerkverbindung wurde unerwartet geschlossen"
 
-#: ../include/svn_error_codes.h:1516
+#: ../include/svn_error_codes.h:1556
 msgid "Network read/write error"
 msgstr "Netzwerk-Lese-/-Schreibfehler"
 
-#: ../include/svn_error_codes.h:1528
+#: ../include/svn_error_codes.h:1568
 msgid "Client/server version mismatch"
 msgstr "Client- und Serverversion stimmen nicht überein"
 
-#: ../include/svn_error_codes.h:1533
+#: ../include/svn_error_codes.h:1573
 msgid "Cannot negotiate authentication mechanism"
 msgstr "Kann Anmeldungsmechanismus nicht aushandeln"
 
-#: ../include/svn_error_codes.h:1538
+#: ../include/svn_error_codes.h:1578
 msgid "Editor drive was aborted"
 msgstr "Editor-Steuerung wurde unterbrochen"
 
-#: ../include/svn_error_codes.h:1546
+#: ../include/svn_error_codes.h:1583
+#, fuzzy
+msgid "Client request too long"
+msgstr "Ganzzahldarstellung zu lang"
+
+#: ../include/svn_error_codes.h:1588
+#, fuzzy
+msgid "Server response too long"
+msgstr "Antwort auf Protokollschritt zu lang"
+
+#: ../include/svn_error_codes.h:1596
 msgid "Credential data unavailable"
 msgstr "Beglaubigungsdaten nicht verfügbar"
 
-#: ../include/svn_error_codes.h:1550
+#: ../include/svn_error_codes.h:1600
 msgid "No authentication provider available"
 msgstr "Kein Anbieter für Anmeldung verfügbar"
 
-#: ../include/svn_error_codes.h:1554
+#: ../include/svn_error_codes.h:1604
 msgid "All authentication providers exhausted"
 msgstr "Alle Anmeldemöglichkeiten erschöpft"
 
-#: ../include/svn_error_codes.h:1558
+#: ../include/svn_error_codes.h:1608
 msgid "Credentials not saved"
 msgstr "Beglaubigungsdaten nicht gespeichert"
 
-#: ../include/svn_error_codes.h:1563 ../libsvn_subr/gpg_agent.c:416
+#: ../include/svn_error_codes.h:1613 ../libsvn_subr/gpg_agent.c:512
 msgid "Authentication failed"
 msgstr "Authentifizierung schlug fehl"
 
-#: ../include/svn_error_codes.h:1569
+#: ../include/svn_error_codes.h:1619
 msgid "Read access denied for root of edit"
 msgstr "Lesezugriff verweigert für Basis dieser Änderung"
 
-#: ../include/svn_error_codes.h:1574
+#: ../include/svn_error_codes.h:1624
 msgid "Item is not readable"
 msgstr "Eintrag ist nicht lesbar"
 
-#: ../include/svn_error_codes.h:1579
+#: ../include/svn_error_codes.h:1629
 msgid "Item is partially readable"
 msgstr "Eintrag ist nur teilweise lesbar"
 
-#: ../include/svn_error_codes.h:1583
+#: ../include/svn_error_codes.h:1633
 msgid "Invalid authz configuration"
 msgstr "Ungültige authz Konfiguration"
 
-#: ../include/svn_error_codes.h:1588
+#: ../include/svn_error_codes.h:1638
 msgid "Item is not writable"
 msgstr "Eintrag ist nicht schreibbar"
 
-#: ../include/svn_error_codes.h:1595
+#: ../include/svn_error_codes.h:1645
 msgid "Diff data source modified unexpectedly"
 msgstr "Diff-Datenquellen wurden unerwarteterweise verändert"
 
-#: ../include/svn_error_codes.h:1602
+#: ../include/svn_error_codes.h:1650
+#, fuzzy
+msgid "Diff data unexpected"
+msgstr "Svndiff-Daten enden unerwartet"
+
+#: ../include/svn_error_codes.h:1657
 msgid "Initialization of SSPI library failed"
 msgstr "Initialisierung der SSPI-Bibliothek schlug fehl"
 
-#: ../include/svn_error_codes.h:1608
+#: ../include/svn_error_codes.h:1663
 msgid "Server SSL certificate untrusted"
 msgstr "Server-SSL-Zertifikat ist nicht vertrauenswürdig"
 
-#: ../include/svn_error_codes.h:1613
+#: ../include/svn_error_codes.h:1668
 msgid "Initialization of the GSSAPI context failed"
 msgstr "Initialisierung des GSSAPI-Kontextes schlug fehl"
 
-#: ../include/svn_error_codes.h:1618
+#: ../include/svn_error_codes.h:1673
 msgid "While handling serf response:"
 msgstr "Während der Abwicklung einer serf Antwort:"
 
-#: ../include/svn_error_codes.h:1624
+#: ../include/svn_error_codes.h:1678
+#, fuzzy
+msgid "Can't read from stream"
+msgstr "Kann nicht aus Datenstrom lesen"
+
+#: ../include/svn_error_codes.h:1684
 msgid "Assertion failure"
 msgstr "Assert-Anweisung schlug fehl"
 
-#: ../include/svn_error_codes.h:1628
+#: ../include/svn_error_codes.h:1688
 msgid "No non-tracing links found in the error chain"
 msgstr "Nur Nicht-Tracing-Einträge in Fehlerkette gefunden"
 
-#: ../include/svn_error_codes.h:1636
+#: ../include/svn_error_codes.h:1696
 msgid "Unexpected end of ASN1 data"
 msgstr "Unerwartetes Ende der ASN1-Daten"
 
-#: ../include/svn_error_codes.h:1640
+#: ../include/svn_error_codes.h:1700
 msgid "Unexpected ASN1 tag"
 msgstr "Unerwartetes ASN1-Tag"
 
-#: ../include/svn_error_codes.h:1644
+#: ../include/svn_error_codes.h:1704
 msgid "Invalid ASN1 length"
 msgstr "Ungültige ASN1-Länge"
 
-#: ../include/svn_error_codes.h:1648
+#: ../include/svn_error_codes.h:1708
 msgid "ASN1 length mismatch"
 msgstr "ASN1-Länge stimmt nicht überein"
 
-#: ../include/svn_error_codes.h:1652
+#: ../include/svn_error_codes.h:1712
 msgid "Invalid ASN1 data"
 msgstr "Ungültige ASN1-Daten"
 
-#: ../include/svn_error_codes.h:1656
+#: ../include/svn_error_codes.h:1716
 msgid "Unavailable X509 feature"
 msgstr "Nicht verfügbare X509-Funktion"
 
-#: ../include/svn_error_codes.h:1660
+#: ../include/svn_error_codes.h:1720
 msgid "Invalid PEM certificate"
 msgstr "Ungültiges PEM-Zertifikat"
 
-#: ../include/svn_error_codes.h:1664
+#: ../include/svn_error_codes.h:1724
 msgid "Invalid certificate format"
 msgstr "Ungültiges Format des Zertifikats"
 
-#: ../include/svn_error_codes.h:1668
+#: ../include/svn_error_codes.h:1728
 msgid "Invalid certificate version"
 msgstr "Ungültige Version des Zertifikats"
 
-#: ../include/svn_error_codes.h:1672
+#: ../include/svn_error_codes.h:1732
 msgid "Invalid certificate serial number"
 msgstr "Ungültige Seriennummer des Zertifikats"
 
-#: ../include/svn_error_codes.h:1676
+#: ../include/svn_error_codes.h:1736
 msgid "Found invalid algorithm in certificate"
 msgstr "Ungültiger Algorithmus im Zertifikat gefunden"
 
-#: ../include/svn_error_codes.h:1680
+#: ../include/svn_error_codes.h:1740
 msgid "Found invalid name in certificate"
 msgstr "Ungültiger Name im Zertifikat gefunden"
 
-#: ../include/svn_error_codes.h:1684
+#: ../include/svn_error_codes.h:1744
 msgid "Found invalid date in certificate"
 msgstr "Ungültiges Datum im Zertifikat gefunden"
 
-#: ../include/svn_error_codes.h:1688
+#: ../include/svn_error_codes.h:1748
 msgid "Found invalid public key in certificate"
 msgstr "Ungültiger öffentlicher Schlüssel im Zertifikat gefunden"
 
-#: ../include/svn_error_codes.h:1692
+#: ../include/svn_error_codes.h:1752
 msgid "Found invalid signature in certificate"
 msgstr "Ungültige Signatur im Zertifikat gefunden"
 
-#: ../include/svn_error_codes.h:1696
+#: ../include/svn_error_codes.h:1756
 msgid "Found invalid extensions in certificate"
 msgstr "Ungültige Erweiterungen im Zertifikat gefunden"
 
-#: ../include/svn_error_codes.h:1700
+#: ../include/svn_error_codes.h:1760
 msgid "Unknown certificate version"
 msgstr "Unbekannte Version im Zertifikat"
 
-#: ../include/svn_error_codes.h:1704
+#: ../include/svn_error_codes.h:1764
 msgid "Certificate uses unknown public key algorithm"
 msgstr "Zertifikat verwendet unbekannten asymmetrischen Algorithmus"
 
-#: ../include/svn_error_codes.h:1708
+#: ../include/svn_error_codes.h:1768
 msgid "Certificate signature mismatch"
 msgstr "Signatur des Zertifikats stimmt nicht überein"
 
-#: ../include/svn_error_codes.h:1712
-msgid "Certficate verification failed"
+#: ../include/svn_error_codes.h:1772
+msgid "Certificate verification failed"
 msgstr "Überprüfung des Zertifikats fehlgeschlagen"
 
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:290
 msgid "GNOME Keyring is locked and we are non-interactive"
 msgstr "GNOME-Schlüsselring ist gesperrt und wir sind nicht-interaktiv"
 
 #: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365
-#: ../libsvn_subr/opt.c:932
+#: ../libsvn_subr/opt.c:1234
 #, c-format
 msgid "'%s' ends in a reserved name"
 msgstr "»%s« endet mit einem reservierten Namen"
@@ -1519,7 +1580,7 @@ msgid "'%s' is an existing item in confl
 msgstr "»%s« ist ein vorhandenes Element mit Konflikt; Markieren Sie den 
Konflikt als aufgelöst bevor Sie hier ein neues Element hinzufügen"
 
 #: ../libsvn_client/add.c:869 ../libsvn_wc/adm_ops.c:400
-#: ../libsvn_wc/workqueue.c:873 ../libsvn_wc/workqueue.c:967
+#: ../libsvn_wc/workqueue.c:874 ../libsvn_wc/workqueue.c:968
 #, c-format
 msgid "'%s' not found"
 msgstr "»%s« nicht gefunden"
@@ -1531,13 +1592,14 @@ msgid "Unsupported node kind for path '%
 msgstr "Nicht unterstützter Knotentyp für Pfad »%s«"
 
 #: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65
-#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3078
-#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:831
-#: ../libsvn_client/patch.c:3242 ../libsvn_client/relocate.c:153
-#: ../libsvn_client/resolved.c:119 ../libsvn_client/revert.c:149
-#: ../libsvn_client/status.c:368 ../libsvn_client/switch.c:471
-#: ../libsvn_client/update.c:701 ../libsvn_client/upgrade.c:109
-#: ../svn/util.c:986 ../svnbench/util.c:76
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3197
+#: ../libsvn_client/export.c:1389 ../libsvn_client/import.c:861
+#: ../libsvn_client/patch.c:3745 ../libsvn_client/relocate.c:155
+#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:152
+#: ../libsvn_client/shelf.c:378 ../libsvn_client/status.c:368
+#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:701
+#: ../libsvn_client/upgrade.c:111 ../svn/shelf-cmd.c:1053 ../svn/util.c:990
+#: ../svnbench/util.c:76
 #, c-format
 msgid "'%s' is not a local path"
 msgstr "»%s« ist kein lokaler Pfad"
@@ -1560,11 +1622,11 @@ msgstr "Kann Binärdatei »%s« nicht an
 
 #: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:612
 #: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:817
-#: ../libsvn_client/prop_commands.c:1398 ../libsvn_client/revisions.c:105
+#: ../libsvn_client/prop_commands.c:1398 ../libsvn_client/revisions.c:107
 #: ../libsvn_wc/adm_ops.c:913 ../libsvn_wc/adm_ops.c:967
 #: ../libsvn_wc/copy.c:628 ../libsvn_wc/copy.c:689 ../libsvn_wc/entries.c:1407
 #: ../libsvn_wc/entries.c:2803 ../libsvn_wc/entries.c:2834
-#: ../svn/notify.c:1026 ../svnbench/notify.c:968
+#: ../svn/notify.c:1157 ../svnbench/notify.c:968
 #, c-format
 msgid "'%s' is not under version control"
 msgstr "»%s« ist nicht unter Versionskontrolle"
@@ -1592,23 +1654,23 @@ msgstr "URL »%s« verweist auf auf ein
 msgid "Target changelist name must not be empty"
 msgstr "Name der Ziel-Änderungsliste darf nicht leer sein"
 
-#: ../libsvn_client/checkout.c:131 ../libsvn_client/export.c:1447
-#: ../svnbench/null-export-cmd.c:275
+#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1446
+#: ../svnbench/null-export-cmd.c:293
 #, c-format
 msgid "URL '%s' doesn't exist"
 msgstr "Die URL »%s« existiert nicht"
 
-#: ../libsvn_client/checkout.c:135
+#: ../libsvn_client/checkout.c:137
 #, c-format
 msgid "URL '%s' refers to a file, not a directory"
 msgstr "Die URL »%s« verweist auf eine Datei, nicht auf ein Verzeichnis"
 
-#: ../libsvn_client/checkout.c:173
+#: ../libsvn_client/checkout.c:175
 #, c-format
 msgid "'%s' is already a working copy for a different URL"
 msgstr "»%s« ist bereits eine Arbeitskopie für eine andere URL"
 
-#: ../libsvn_client/checkout.c:181
+#: ../libsvn_client/checkout.c:183
 #, c-format
 msgid "'%s' already exists and is not a directory"
 msgstr "»%s« existiert bereits und ist kein Verzeichnis"
@@ -1627,7 +1689,7 @@ msgstr "»%s« ist nur eine Fix-Revision
 msgid "Resolving '^/': no repository root found in the target arguments or in 
the current directory"
 msgstr "Auflösen von »^/«: Keine Wurzel eines Projektarchivs in den 
Zielparametern oder im Arbeitsverzeichnis gefunden"
 
-#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2260
+#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2303
 msgid "Commit failed (details follow):"
 msgstr "Übertragen schlug fehl (Details folgen):"
 
@@ -1740,130 +1802,1891 @@ msgstr "Übertragenes Objekt »%s« ist
 msgid "Standard properties can't be set explicitly as revision properties"
 msgstr "Standardeigenschaften können nicht explizit als Revisionseigenschaften 
gesetzt werden"
 
+# FIXME: Grammar depends on usage!!!!!!! (prepanded by "bei")
+#: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1095
+#: ../libsvn_client/conflicts.c:1688 ../libsvn_client/conflicts.c:4625
+#: ../libsvn_client/conflicts.c:5124 ../libsvn_client/conflicts.c:5146
+#: ../libsvn_client/conflicts.c:5197 ../libsvn_client/conflicts.c:5674
+#, fuzzy
+msgid "unknown author"
+msgstr "Unbekannter Fehler"
+
+#: ../libsvn_client/conflicts.c:1126
+msgid "A file containing uncommitted changes was found in the working copy."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1129
+msgid "A file which differs from the corresponding file on the merge source 
branch was found in the working copy."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1134
+msgid "A file which already occupies this path was found in the working copy."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1138
+#, fuzzy
+msgid "An unversioned file was found in the working copy."
+msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten"
+
+#: ../libsvn_client/conflicts.c:1142
+#, fuzzy
+msgid "A deleted file was found in the working copy."
+msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten"
+
+#: ../libsvn_client/conflicts.c:1147
+#, fuzzy
+msgid "No such file was found in the working copy."
+msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten"
+
+#. ### display deleted revision
+#: ../libsvn_client/conflicts.c:1151
+msgid ""
+"No such file was found in the merge target working copy.\n"
+"Perhaps the file has been deleted or moved away in the repository's history?"
+msgstr ""
+
+#. ### show more details about copies or replacements?
+#: ../libsvn_client/conflicts.c:1161
+msgid "A file scheduled to be added to the repository in the next commit was 
found in the working copy."
+msgstr ""
+
+#. The move no longer exists.
+#. The move probably happened in branch history.
+#. * This case cannot happen until we detect incoming
+#. * moves, which we currently don't do.
+#. ### find deleted/moved revision?
+#: ../libsvn_client/conflicts.c:1192 ../libsvn_client/conflicts.c:1224
+msgid "The file in the working copy had been moved away at the time this 
conflict was recorded."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1207 ../libsvn_client/conflicts.c:1240
+#, fuzzy, c-format
+msgid ""
+"The file in the working copy was moved away to\n"
+"'%s'."
+msgstr "Der Pfad »%s« ist nicht in der Arbeitskopie »%s« "
+
+#. The move no longer exists.
+#. The move probably happened in branch history.
+#. * This case cannot happen until we detect incoming
+#. * moves, which we currently don't do.
+#. ### find deleted/moved revision?
+#: ../libsvn_client/conflicts.c:1266 ../libsvn_client/conflicts.c:1298
+msgid "A file had been moved here in the working copy at the time this 
conflict was recorded."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1281 ../libsvn_client/conflicts.c:1314
+#, fuzzy, c-format
+msgid ""
+"A file was moved here in the working copy from\n"
+"'%s'."
+msgstr "»%s« ist nicht die Basis des Projektarchivs »%s«"
+
+#: ../libsvn_client/conflicts.c:1350
+msgid "A directory containing uncommitted changes was found in the working 
copy."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1353
+msgid "A directory which differs from the corresponding directory on the merge 
source branch was found in the working copy."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1358
+msgid "A directory which already occupies this path was found in the working 
copy."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1362
+#, fuzzy
+msgid "An unversioned directory was found in the working copy."
+msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt"
+
+#: ../libsvn_client/conflicts.c:1366
+#, fuzzy
+msgid "A deleted directory was found in the working copy."
+msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt"
+
+#: ../libsvn_client/conflicts.c:1372
+#, fuzzy
+msgid "No such directory was found in the working copy."
+msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt"
+
+#. ### display deleted revision
+#: ../libsvn_client/conflicts.c:1376
+msgid ""
+"No such directory was found in the merge target working copy.\n"
+"Perhaps the directory has been deleted or moved away in the repository's 
history?"
+msgstr ""
+
+#. ### show more details about copies or replacements?
+#: ../libsvn_client/conflicts.c:1386
+msgid "A directory scheduled to be added to the repository in the next commit 
was found in the working copy."
+msgstr ""
+
+#. The move no longer exists.
+#: ../libsvn_client/conflicts.c:1418
+msgid "The directory in the working copy had been moved away at the time this 
conflict was recorded."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1433
+#, fuzzy, c-format
+msgid ""
+"The directory in the working copy was moved away to\n"
+"'%s'."
+msgstr "Der Pfad »%s« ist nicht in der Arbeitskopie »%s« "
+
+#. The move probably happened in branch history.
+#. * This case cannot happen until we detect incoming
+#. * moves, which we currently don't do.
+#. ### find deleted/moved revision?
+#: ../libsvn_client/conflicts.c:1450
+msgid "The directory had been moved away at the time this conflict was 
recorded."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1466
+#, fuzzy, c-format
+msgid ""
+"The directory was moved away to\n"
+"'%s'."
+msgstr "Das Projektarchiv wurde permanent nach »%s« verschoben"
+
+#. The move no longer exists.
+#. The move probably happened in branch history.
+#. * This case cannot happen until we detect incoming
+#. * moves, which we currently don't do.
+#. ### find deleted/moved revision?
+#: ../libsvn_client/conflicts.c:1492 ../libsvn_client/conflicts.c:1524
+msgid "A directory had been moved here at the time this conflict was recorded."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1507
+#, c-format
+msgid ""
+"A directory was moved here from\n"
+"'%s'."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:1540
+#, fuzzy, c-format
+msgid ""
+"A directory was moved here in the working copy from\n"
+"'%s'."
+msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt"
+
+#: ../libsvn_client/conflicts.c:2759
+msgid "An item containing uncommitted changes was found in the working copy."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2763
+msgid "An item which already occupies this path was found in the working copy."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2767
+#, fuzzy
+msgid "A deleted item was found in the working copy."
+msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten"
+
+#: ../libsvn_client/conflicts.c:2772
+#, fuzzy
+msgid "No such file or directory was found in the working copy."
+msgstr "Verzeichnis »%s« ist in einer Arbeitskopie gesperrt"
+
+#. ### display deleted revision
+#: ../libsvn_client/conflicts.c:2777
+msgid ""
+"No such file or directory was found in the merge target working copy.\n"
+"The item may have been deleted or moved away in the repository's history."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2784
+#, fuzzy
+msgid "An unversioned item was found in the working copy."
+msgstr "Pfad »%s« ist nicht in der Arbeitskopie enthalten"
+
+#: ../libsvn_client/conflicts.c:2789
+msgid "An item scheduled to be added to the repository in the next commit was 
found in the working copy."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2794
+msgid "The item in the working copy had been moved away at the time this 
conflict was recorded."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2798
+msgid "An item had been moved here in the working copy at the time this 
conflict was recorded."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2826
+#, c-format
+msgid ""
+"%s\n"
+"And then moved away to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2891
+msgid "No such file or directory was found in the merge target working copy.\n"
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2900
+#, c-format
+msgid "%sThe file was moved to '^/%s' in r%ld by %s."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2906
+#, c-format
+msgid "%sThe directory was moved to '^/%s' in r%ld by %s."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2913
+#, c-format
+msgid "%sThe item was moved to '^/%s' in r%ld by %s."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2929
+#, c-format
+msgid "%sThe file '^/%s' was moved to '^/%s' in r%ld by %s."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2937
+#, c-format
+msgid "%sThe directory '^/%s' was moved to '^/%s' in r%ld by %s."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2945
+#, c-format
+msgid "%sThe item '^/%s' was moved to '^/%s' in r%ld by %s."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2959
+#, c-format
+msgid ""
+"No such file or directory was found in the merge target working copy.\n"
+"'^/%s' was deleted in r%ld by %s."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2983
+msgid "An update operation tried to edit a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2985
+msgid "An update operation tried to add a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2987
+msgid "An update operation tried to delete or move a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2990
+msgid "An update operation tried to replace a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:2998
+msgid "A switch operation tried to edit a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3000
+msgid "A switch operation tried to add a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3002
+msgid "A switch operation tried to delete or move a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3005
+msgid "A switch operation tried to replace a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3013
+msgid "A merge operation tried to edit a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3015
+msgid "A merge operation tried to add a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3017
+msgid "A merge operation tried to delete or move a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3020
+msgid "A merge operation tried to replace a file."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3030
+#, fuzzy
+msgid "An update operation tried to change a directory."
+msgstr "Ungültige Operation auf dem aktuellen Arbeitsverzeichnis"
+
+#: ../libsvn_client/conflicts.c:3032
+#, fuzzy
+msgid "An update operation tried to add a directory."
+msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
+
+#: ../libsvn_client/conflicts.c:3034
+msgid "An update operation tried to delete or move a directory."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3037
+#, fuzzy
+msgid "An update operation tried to replace a directory."
+msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
+
+#: ../libsvn_client/conflicts.c:3045
+#, fuzzy
+msgid "A switch operation tried to edit a directory."
+msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
+
+#: ../libsvn_client/conflicts.c:3047
+#, fuzzy
+msgid "A switch operation tried to add a directory."
+msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
+
+#: ../libsvn_client/conflicts.c:3049
+msgid "A switch operation tried to delete or move a directory."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3052
+#, fuzzy
+msgid "A switch operation tried to replace a directory."
+msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
+
+#: ../libsvn_client/conflicts.c:3060
+#, fuzzy
+msgid "A merge operation tried to edit a directory."
+msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
+
+#: ../libsvn_client/conflicts.c:3062
+#, fuzzy
+msgid "A merge operation tried to add a directory."
+msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
+
+#: ../libsvn_client/conflicts.c:3064
+msgid "A merge operation tried to delete or move a directory."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3067
+#, fuzzy
+msgid "A merge operation tried to replace a directory."
+msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
+
+#: ../libsvn_client/conflicts.c:3078
+msgid "An update operation tried to edit an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3080
+msgid "An update operation tried to add an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3082
+msgid "An update operation tried to delete or move an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3085
+msgid "An update operation tried to replace an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3093
+msgid "A switch operation tried to edit an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3095
+msgid "A switch operation tried to add an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3097
+msgid "A switch operation tried to delete or move an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3100
+msgid "A switch operation tried to replace an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3108
+msgid "A merge operation tried to edit an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3110
+msgid "A merge operation tried to add an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3112
+msgid "A merge operation tried to delete or move an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3115
+msgid "A merge operation tried to replace an item."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3131 ../svn/cl-conflicts.c:212
+msgid "upon update"
+msgstr "bei Aktualisierung"
+
+#: ../libsvn_client/conflicts.c:3132 ../svn/cl-conflicts.c:213
+msgid "upon switch"
+msgstr "bei Umstellung"
+
+#: ../libsvn_client/conflicts.c:3133 ../svn/cl-conflicts.c:214
+msgid "upon merge"
+msgstr "bei Zusammenführung"
+
+#: ../libsvn_client/conflicts.c:3134 ../svn/cl-conflicts.c:215
+msgid "upon none"
+msgstr "ohne Operation"
+
+#: ../libsvn_client/conflicts.c:3153 ../svn/cl-conflicts.c:127
+#: ../svn/cl-conflicts.c:234
+msgid "local edit"
+msgstr "lokale geändert"
+
+#: ../libsvn_client/conflicts.c:3156 ../svn/cl-conflicts.c:140
+#: ../svn/cl-conflicts.c:237
+msgid "local add"
+msgstr "lokal hinzugefügt"
+
+#: ../libsvn_client/conflicts.c:3159 ../svn/cl-conflicts.c:131
+#: ../svn/cl-conflicts.c:240
+msgid "local delete"
+msgstr "lokal gelöscht"
+
+#: ../libsvn_client/conflicts.c:3162 ../svn/cl-conflicts.c:129
+#: ../svn/cl-conflicts.c:243
+msgid "local obstruction"
+msgstr "lokal blockiert"
+
+#: ../libsvn_client/conflicts.c:3166 ../svn/cl-conflicts.c:247
+#, c-format
+msgid "local %s"
+msgstr "lokal %s"
+
+#: ../libsvn_client/conflicts.c:3175 ../svn/cl-conflicts.c:192
+#: ../svn/cl-conflicts.c:256
+msgid "incoming edit"
+msgstr "eingehende Änderung"
+
+#: ../libsvn_client/conflicts.c:3178 ../svn/cl-conflicts.c:194
+#: ../svn/cl-conflicts.c:259
+msgid "incoming add"
+msgstr "eingehendes Hinzufügen"
+
+#: ../libsvn_client/conflicts.c:3181 ../svn/cl-conflicts.c:262
+msgid "incoming delete"
+msgstr "eingehendes Löschen"
+
+#: ../libsvn_client/conflicts.c:3185 ../svn/cl-conflicts.c:266
+#, c-format
+msgid "incoming %s"
+msgstr "eingehendes %s"
+
+#: ../libsvn_client/conflicts.c:3193 ../svn/cl-conflicts.c:273
+#: ../svn/cl-conflicts.c:326
+#, c-format
+msgid "%s, %s %s"
+msgstr "%s, %s %s"
+
+#: ../libsvn_client/conflicts.c:3252
+#, fuzzy, c-format
+msgid "incoming %s %s"
+msgstr "eingehendes %s"
+
+#: ../libsvn_client/conflicts.c:3355
+#, c-format
+msgid "Directory updated from r%ld to r%ld was replaced with a file by %s in 
r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3366 ../libsvn_client/conflicts.c:3446
+#: ../libsvn_client/conflicts.c:3700 ../libsvn_client/conflicts.c:3787
+#: ../libsvn_client/conflicts.c:4087 ../libsvn_client/conflicts.c:4155
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"The replaced directory was moved to '^/%s'."
+msgstr "Löschen schlug fehl: Verzeichnis hat keinen Eintrag »%s«"
+
+#: ../libsvn_client/conflicts.c:3381
+#, c-format
+msgid "File updated from r%ld to r%ld was replaced with a file from another 
line of history by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3393 ../libsvn_client/conflicts.c:3472
+#: ../libsvn_client/conflicts.c:3729 ../libsvn_client/conflicts.c:3815
+#: ../libsvn_client/conflicts.c:4116 ../libsvn_client/conflicts.c:4183
+#, c-format
+msgid ""
+"%s\n"
+"The replaced file was moved to '^/%s'."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3407
+#, c-format
+msgid "Item updated from r%ld to r%ld was replaced with a file by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3417 ../libsvn_client/conflicts.c:3496
+#: ../libsvn_client/conflicts.c:3756 ../libsvn_client/conflicts.c:3842
+#: ../libsvn_client/conflicts.c:4210
+#, c-format
+msgid ""
+"%s\n"
+"The replaced item was moved to '^/%s'."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3434
+#, c-format
+msgid "Directory updated from r%ld to r%ld was replaced with a directory from 
another line of history by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3461
+#, c-format
+msgid "File updated from r%ld to r%ld was replaced with a directory by %s in 
r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3486
+#, c-format
+msgid "Item updated from r%ld to r%ld was replaced by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3519
+#, c-format
+msgid "Directory updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3531
+#, c-format
+msgid "Directory updated from r%ld to r%ld was deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3547
+#, c-format
+msgid "File updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3558
+#, c-format
+msgid "File updated from r%ld to r%ld was deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3572
+#, c-format
+msgid "Item updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3583
+#, c-format
+msgid "Item updated from r%ld to r%ld was deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3603
+#, c-format
+msgid "Directory updated backwards from r%ld to r%ld was a file before the 
replacement made by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3610
+#, c-format
+msgid "File updated backwards from r%ld to r%ld was a file from another line 
of history before the replacement made by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3617
+#, c-format
+msgid "Item updated backwards from r%ld to r%ld was replaced with a file by %s 
in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3626
+#, c-format
+msgid "Directory updated backwards from r%ld to r%ld was a directory from 
another line of history before the replacement made by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3634
+#, c-format
+msgid "File updated backwards from r%ld to r%ld was a directory before the 
replacement made by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3640
+#, c-format
+msgid "Item updated backwards from r%ld to r%ld was replaced with a directory 
by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3649
+#, c-format
+msgid "Directory updated backwards from r%ld to r%ld did not exist before it 
was added by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3656
+#, c-format
+msgid "File updated backwards from r%ld to r%ld did not exist before it was 
added by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3662
+#, c-format
+msgid "Item updated backwards from r%ld to r%ld did not exist before it was 
added by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3687
+#, c-format
+msgid ""
+"Directory switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a file by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3715
+#, c-format
+msgid ""
+"File switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a file from another line of history by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3743 ../libsvn_client/conflicts.c:3986
+#, c-format
+msgid ""
+"Item switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a file by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3773
+#, c-format
+msgid ""
+"Directory switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a directory from another line of history by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3802
+#, c-format
+msgid ""
+"File switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a directory by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3829 ../libsvn_client/conflicts.c:4016
+#, c-format
+msgid ""
+"Item switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a directory by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3865
+#, c-format
+msgid ""
+"Directory switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was moved to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3879
+#, c-format
+msgid ""
+"Directory switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3897
+#, c-format
+msgid ""
+"File switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was moved to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3911
+#, c-format
+msgid ""
+"File switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3928
+#, c-format
+msgid ""
+"Item switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was moved to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3942
+#, c-format
+msgid ""
+"Item switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3967 ../libsvn_client/conflicts.c:4007
+#, c-format
+msgid ""
+"Directory switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was a file before the replacement made by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3977
+#, c-format
+msgid ""
+"File switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was a file from another line of history before the replacement made by %s in 
r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:3997
+#, c-format
+msgid ""
+"Directory switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was a directory from another line of history before the replacement made by 
%s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4027
+#, c-format
+msgid ""
+"Directory switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"did not exist before it was added by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4037
+#, c-format
+msgid ""
+"File switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"did not exist before it was added by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4046
+#, c-format
+msgid ""
+"Item switched from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"did not exist before it was added by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4074
+#, c-format
+msgid ""
+"Directory merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a file by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4102
+#, c-format
+msgid ""
+"File merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a file from another line of history by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4128
+#, c-format
+msgid ""
+"Item merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a file by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4141
+#, c-format
+msgid ""
+"Directory merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a directory from another line of history by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4170
+#, c-format
+msgid ""
+"File merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a directory by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4197
+#, c-format
+msgid ""
+"Item merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a directory by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4233
+#, c-format
+msgid ""
+"Directory merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was moved to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4247
+#, c-format
+msgid ""
+"Directory merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4265
+#, c-format
+msgid ""
+"File merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was moved to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4279
+#, c-format
+msgid ""
+"File merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4296
+#, c-format
+msgid ""
+"Item merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was moved to '^/%s' by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4310
+#, c-format
+msgid ""
+"Item merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4335 ../libsvn_client/conflicts.c:4374
+#, c-format
+msgid ""
+"Directory reverse-merged from\n"
+"'^/%s@%ld'\n"
+"to ^/%s@%ld was a file before the replacement made by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4344
+#, c-format
+msgid ""
+"File reverse-merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was a file from another line of history before the replacement made by %s in 
r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4353
+#, c-format
+msgid ""
+"Item reverse-merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a file by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4364
+#, c-format
+msgid ""
+"Directory reverse-merged from\n"
+"'^/%s@%ld'\n"
+"to ^/%s@%ld was a directory from another line of history before the 
replacement made by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4382
+#, c-format
+msgid ""
+"Item reverse-merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"was replaced with a directory by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4393
+#, c-format
+msgid ""
+"Directory reverse-merged from\n"
+"'^/%s@%ld'\n"
+"to ^/%s@%ld did not exist before it was added by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4402
+#, c-format
+msgid ""
+"File reverse-merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"did not exist before it was added by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:4411
+#, c-format
+msgid ""
+"Item reverse-merged from\n"
+"'^/%s@%ld'\n"
+"to\n"
+"'^/%s@%ld'\n"
+"did not exist before it was added by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:5263
+#, c-format
+msgid "A new directory appeared during update to r%ld; it was added by %s in 
r%ld and later deleted by %s in r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:5270
+#, c-format
+msgid "A new directory appeared during update to r%ld; it was added by %s in 
r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:5275
+#, c-format
+msgid "A new directory appeared during update to r%ld; it was deleted by %s in 
r%ld."
+msgstr ""
+
+#: ../libsvn_client/conflicts.c:5285
+#, c-format
+msgid "A new file appeared during update to r%ld; it was added by %s in r%ld 
and later deleted by %s in r%ld."
+msgstr ""
+

[... 20849 lines stripped ...]

Reply via email to