Update Simplified Chinese translation to r24473
zh_CN.po | 1030
+++++++++++++++++++++++----------------------------------------
1 file changed, 380 insertions(+), 650 deletions(-)
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@864548 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/po/de.po b/subversion/po/de.po
index 8b00049..320f2e8 100644
--- a/subversion/po/de.po
+++ b/subversion/po/de.po
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: subversion 1.4.x\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-01-22 11:09+0800\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2006-11-25 17:26+0100\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: German <dev@subversion.tigris.org>\n"
@@ -156,8 +156,8 @@
msgid "Read error in pipe"
msgstr "Lesefehler in »Pipe«"
-#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:291
-#: libsvn_subr/cmdline.c:308 svn/util.c:742
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
+#: libsvn_subr/cmdline.c:316 svn/util.c:758
#, c-format
msgid "Write error"
msgstr "Schreibfehler"
@@ -308,611 +308,629 @@
msgid "Invalid switch"
msgstr "Ungültiges Wechseln"
-#: include/svn_error_codes.h:398
+#: include/svn_error_codes.h:397
+#, fuzzy
+msgid "Changelist doesn't match"
+msgstr "Änderungsliste: %s\n"
+
+#: include/svn_error_codes.h:403
msgid "General filesystem error"
msgstr "Allgemeiner Dateisystemfehler"
-#: include/svn_error_codes.h:402
+#: include/svn_error_codes.h:407
msgid "Error closing filesystem"
msgstr "Fehler beim Schließen des Dateisystems"
-#: include/svn_error_codes.h:406
+#: include/svn_error_codes.h:411
msgid "Filesystem is already open"
msgstr "Dateisystem ist bereits geöffnet"
-#: include/svn_error_codes.h:410
+#: include/svn_error_codes.h:415
msgid "Filesystem is not open"
msgstr "Dateisystem ist nicht geöffnet"
-#: include/svn_error_codes.h:414
+#: include/svn_error_codes.h:419
msgid "Filesystem is corrupt"
msgstr "Dateisystem ist beschädigt"
-#: include/svn_error_codes.h:418
+#: include/svn_error_codes.h:423
msgid "Invalid filesystem path syntax"
msgstr "Ungültige Pfadsyntax des Dateisystems"
-#: include/svn_error_codes.h:422
+#: include/svn_error_codes.h:427
msgid "Invalid filesystem revision number"
msgstr "Ungültige Revisionsnummer des Dateisystems"
-#: include/svn_error_codes.h:426
+#: include/svn_error_codes.h:431
msgid "Invalid filesystem transaction name"
msgstr "Ungültiger Transaktionsname des Dateisystems"
-#: include/svn_error_codes.h:430
+#: include/svn_error_codes.h:435
msgid "Filesystem directory has no such entry"
msgstr "Verzeichnis des Dateisystems hat keinen solchen Eintrag"
-#: include/svn_error_codes.h:434
+#: include/svn_error_codes.h:439
msgid "Filesystem has no such representation"
msgstr "Dateisystem hat keine solche Darstellung"
-#: include/svn_error_codes.h:438
+#: include/svn_error_codes.h:443
msgid "Filesystem has no such string"
msgstr "Dateisystem hat keinen solchen String"
-#: include/svn_error_codes.h:442
+#: include/svn_error_codes.h:447
msgid "Filesystem has no such copy"
msgstr "Dateisystem hat keine solche Kopie"
-#: include/svn_error_codes.h:446
+#: include/svn_error_codes.h:451
msgid "The specified transaction is not mutable"
msgstr "Die spezifizierte Transaktion ist nicht veränderlich"
-#: include/svn_error_codes.h:450
+#: include/svn_error_codes.h:455
msgid "Filesystem has no item"
msgstr "Dateisystem hat keinen Eintrag"
-#: include/svn_error_codes.h:454
+#: include/svn_error_codes.h:459
msgid "Filesystem has no such node-rev-id"
msgstr "Dateisystem hat keine solche Knotenrevisions-Id"
-#: include/svn_error_codes.h:458
+#: include/svn_error_codes.h:463
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:462
+#: include/svn_error_codes.h:467
msgid "Name does not refer to a filesystem directory"
msgstr "Name bezeichnet kein Verzeichnis des Dateisystems"
-#: include/svn_error_codes.h:466
+#: include/svn_error_codes.h:471
msgid "Name does not refer to a filesystem file"
msgstr "Name bezeichnet keine Datei des Dateisystems"
-#: include/svn_error_codes.h:470
+#: include/svn_error_codes.h:475
msgid "Name is not a single path component"
msgstr "Name ist keine einzelne Pfadkomponente"
-#: include/svn_error_codes.h:474
+#: include/svn_error_codes.h:479
msgid "Attempt to change immutable filesystem node"
msgstr "Versuch, einen nicht-veränderlichen Knoten des Dateisystems zu ändern"
-#: include/svn_error_codes.h:478
+#: include/svn_error_codes.h:483
msgid "Item already exists in filesystem"
msgstr "Objekt existiert bereits im Dateisystem"
-#: include/svn_error_codes.h:482
+#: include/svn_error_codes.h:487
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:486
+#: include/svn_error_codes.h:491
msgid "Object is not a transaction root"
msgstr "Objekt ist keine Transaktionsbasis"
-#: include/svn_error_codes.h:490
+#: include/svn_error_codes.h:495
msgid "Object is not a revision root"
msgstr "Objekt ist keine Revisionsbasis"
-#: include/svn_error_codes.h:494
+#: include/svn_error_codes.h:499
msgid "Merge conflict during commit"
msgstr "Konflikt beim Zusammenführen während der Übertragung"
-#: include/svn_error_codes.h:498
+#: include/svn_error_codes.h:503
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:502
+#: include/svn_error_codes.h:507
msgid "Tried to change an immutable representation"
msgstr "Versuchte, eine nicht-veränderliche Darstellung zu ändern"
-#: include/svn_error_codes.h:506
+#: include/svn_error_codes.h:511
msgid "Malformed skeleton data"
msgstr "Fehlerhafte Schablonendaten"
-#: include/svn_error_codes.h:510
+#: include/svn_error_codes.h:515
msgid "Transaction is out of date"
msgstr "Transaktion ist veraltet"
-#: include/svn_error_codes.h:514
+#: include/svn_error_codes.h:519
msgid "Berkeley DB error"
msgstr "Berkeley-DB-Fehler"
-#: include/svn_error_codes.h:518
+#: include/svn_error_codes.h:523
msgid "Berkeley DB deadlock error"
msgstr "Deadlock-Fehler der Berkeley Datenbank"
-#: include/svn_error_codes.h:522
+#: include/svn_error_codes.h:527
msgid "Transaction is dead"
msgstr "Transaktion ist tot"
-#: include/svn_error_codes.h:526
+#: include/svn_error_codes.h:531
msgid "Transaction is not dead"
msgstr "Transaktion ist nicht tot"
-#: include/svn_error_codes.h:531
+#: include/svn_error_codes.h:536
msgid "Unknown FS type"
msgstr "Unbekannter Dateisystemtyp"
-#: include/svn_error_codes.h:536
+#: include/svn_error_codes.h:541
msgid "No user associated with filesystem"
msgstr "Kein Benutzer mit dem Dateisystem verbunden"
-#: include/svn_error_codes.h:541
+#: include/svn_error_codes.h:546
msgid "Path is already locked"
msgstr "Pfad ist bereits gesperrt"
-#: include/svn_error_codes.h:546 include/svn_error_codes.h:678
+#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
msgid "Path is not locked"
msgstr "Pfad ist nicht gesperrt"
-#: include/svn_error_codes.h:551
+#: include/svn_error_codes.h:556
msgid "Lock token is incorrect"
msgstr "Sperrmarke ist fehlerhaft"
-#: include/svn_error_codes.h:556
+#: include/svn_error_codes.h:561
msgid "No lock token provided"
msgstr "Keine Sperrmarke angegeben"
-#: include/svn_error_codes.h:561
+#: include/svn_error_codes.h:566
msgid "Username does not match lock owner"
msgstr "Benutzername und Sperreigner stimmen nicht überein"
-#: include/svn_error_codes.h:566
+#: include/svn_error_codes.h:571
msgid "Filesystem has no such lock"
msgstr "Dateisystem hat keine solche Sperre"
-#: include/svn_error_codes.h:571
+#: include/svn_error_codes.h:576
msgid "Lock has expired"
msgstr "Sperre ist abgelaufen"
-#: include/svn_error_codes.h:576
+#: include/svn_error_codes.h:581
msgid "Item is out of date"
msgstr "Eintrag ist veraltet"
-#: include/svn_error_codes.h:588
+#: include/svn_error_codes.h:586
+#, fuzzy
+msgid "SQLite error"
+msgstr "Schreibfehler"
+
+#: include/svn_error_codes.h:598
msgid "Unsupported FS format"
msgstr "Nicht unterstütztes Dateisystemformat"
-#: include/svn_error_codes.h:593
+#: include/svn_error_codes.h:603
msgid "Representation is being written"
msgstr "Darstellung wird geschrieben"
-#: include/svn_error_codes.h:599
+#: include/svn_error_codes.h:609
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:603
+#: include/svn_error_codes.h:613
msgid "A repository hook failed"
msgstr "Eine Aktion im Projektarchiv schlug fehl"
-#: include/svn_error_codes.h:607
+#: include/svn_error_codes.h:617
msgid "Incorrect arguments supplied"
msgstr "Inkorrekte Parameter übergeben"
-#: include/svn_error_codes.h:611
+#: include/svn_error_codes.h:621
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:615
+#: include/svn_error_codes.h:625
msgid "Bogus revision report"
msgstr "Ungültiger Revisionsreport"
-#: include/svn_error_codes.h:624
+#: include/svn_error_codes.h:634
msgid "Unsupported repository version"
msgstr "Nicht unterstützte Version des Projektarchivs"
-#: include/svn_error_codes.h:628
+#: include/svn_error_codes.h:638
msgid "Disabled repository feature"
msgstr "Deaktiviertes Merkmal des Projektarchivs"
-#: include/svn_error_codes.h:632
+#: include/svn_error_codes.h:642
msgid "Error running post-commit hook"
msgstr "Fehler beim Ausführen der »post-commit« Aktion"
-#: include/svn_error_codes.h:637
+#: include/svn_error_codes.h:647
msgid "Error running post-lock hook"
msgstr "Fehler beim Ausführen der »post-lock« Aktion"
-#: include/svn_error_codes.h:642
+#: include/svn_error_codes.h:652
msgid "Error running post-unlock hook"
msgstr "Fehler beim Ausführen der »post-unlock« Aktion"
-#: include/svn_error_codes.h:649
+#: include/svn_error_codes.h:659
msgid "Bad URL passed to RA layer"
msgstr "Ungültige URL an die ZM-Schicht übergeben"
-#: include/svn_error_codes.h:653
+#: include/svn_error_codes.h:663
msgid "Authorization failed"
msgstr "Autorisierung fehlgeschlagen"
-#: include/svn_error_codes.h:657
+#: include/svn_error_codes.h:667
msgid "Unknown authorization method"
msgstr "Unbekannte Autorisierungsmethode"
-#: include/svn_error_codes.h:661
+#: include/svn_error_codes.h:671
msgid "Repository access method not implemented"
msgstr "Zugriffsmethode zum Projektarchiv nicht implementiert"
-#: include/svn_error_codes.h:665
+#: include/svn_error_codes.h:675
msgid "Item is out-of-date"
msgstr "Eintrag ist veraltet"
-#: include/svn_error_codes.h:669
+#: include/svn_error_codes.h:679
msgid "Repository has no UUID"
msgstr "Projektarchiv hat keine UUID"
-#: include/svn_error_codes.h:673
+#: include/svn_error_codes.h:683
msgid "Unsupported RA plugin ABI version"
msgstr "Nicht unterstützte ABI-Version des ZM-Plugins"
-#: include/svn_error_codes.h:685
+#: include/svn_error_codes.h:695
msgid "RA layer failed to init socket layer"
msgstr "ZM-Schicht konnte die Verbindungsschicht nicht initialisieren"
-#: include/svn_error_codes.h:689
+#: include/svn_error_codes.h:699
msgid "RA layer failed to create HTTP request"
msgstr "ZM-Schicht konnte keine HTTP-Anforderung erzeugen"
-#: include/svn_error_codes.h:693
+#: include/svn_error_codes.h:703
msgid "RA layer request failed"
msgstr "ZM-Schicht Anforderung gescheitert"
-#: include/svn_error_codes.h:697
+#: include/svn_error_codes.h:707
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "ZM-Schicht hat die angeforderte OPTIONS-Information nicht erhalten"
-#: include/svn_error_codes.h:701
+#: include/svn_error_codes.h:711
msgid "RA layer failed to fetch properties"
msgstr "ZM-Schicht konnte keine Eigenschaften bestimmen"
-#: include/svn_error_codes.h:705
+#: include/svn_error_codes.h:715
msgid "RA layer file already exists"
msgstr "ZM-Schichtdatei existiert bereits"
-#: include/svn_error_codes.h:709
+#: include/svn_error_codes.h:719
msgid "Invalid configuration value"
msgstr "Ungültiger Konfigurationswert"
-#: include/svn_error_codes.h:713
+#: include/svn_error_codes.h:723
msgid "HTTP Path Not Found"
msgstr "HTTP Pfad nicht gefunden"
-#: include/svn_error_codes.h:717
+#: include/svn_error_codes.h:727
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Konnte WebDAV PROPPATCH nicht ausführen"
-#: include/svn_error_codes.h:722 include/svn_error_codes.h:763
-#: libsvn_ra_svn/marshal.c:612 libsvn_ra_svn/marshal.c:720
-#: libsvn_ra_svn/marshal.c:747
+#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
+#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
+#: libsvn_ra_svn/marshal.c:774
msgid "Malformed network data"
msgstr "Fehlerhafte Netzwerkdaten"
-#: include/svn_error_codes.h:727
+#: include/svn_error_codes.h:737
msgid "Unable to extract data from response header"
msgstr "Kann keine Daten aus dem Antwortkopf extrahieren"
-#: include/svn_error_codes.h:732
+#: include/svn_error_codes.h:742
msgid "Repository has been moved"
msgstr "Projektarchiv wurde verschoben"
-#: include/svn_error_codes.h:738 include/svn_error_codes.h:767
+#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
msgid "Couldn't find a repository"
msgstr "Konnte Projektarchiv nicht finden"
-#: include/svn_error_codes.h:742
+#: include/svn_error_codes.h:752
msgid "Couldn't open a repository"
msgstr "Konnte Projektarchiv nicht öffnen"
-#: include/svn_error_codes.h:747
+#: include/svn_error_codes.h:757
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:751
+#: include/svn_error_codes.h:761
msgid "Unknown svn protocol command"
msgstr "Unbekanntes svn Protokollkommando"
-#: include/svn_error_codes.h:755
+#: include/svn_error_codes.h:765
msgid "Network connection closed unexpectedly"
msgstr "Netzwerkverbindung wurde unerwartet geschlossen"
-#: include/svn_error_codes.h:759
+#: include/svn_error_codes.h:769
msgid "Network read/write error"
msgstr "Netzwerk-Lese-/-Schreibfehler"
-#: include/svn_error_codes.h:771
+#: include/svn_error_codes.h:781
msgid "Client/server version mismatch"
msgstr "Client- und Serverversion stimmen nicht überein"
-#: include/svn_error_codes.h:779
+#: include/svn_error_codes.h:786
+msgid "Cannot negotiate authentication mechanism"
+msgstr "Kann Anmeldungsmechanismus nicht aushandeln"
+
+#: include/svn_error_codes.h:795
msgid "Credential data unavailable"
msgstr "Beglaubigungsdaten nicht verfügbar"
-#: include/svn_error_codes.h:783
+#: include/svn_error_codes.h:799
msgid "No authentication provider available"
msgstr "Kein Anbieter für Anmeldung verfügbar"
-#: include/svn_error_codes.h:787 include/svn_error_codes.h:791
+#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
msgid "All authentication providers exhausted"
msgstr "Alle Anmeldemöglichkeiten erschöpft"
-#: include/svn_error_codes.h:797
+#: include/svn_error_codes.h:813
msgid "Read access denied for root of edit"
msgstr "Lesezugriff verweigert für Basis dieser Änderung"
-#: include/svn_error_codes.h:802
+#: include/svn_error_codes.h:818
msgid "Item is not readable"
msgstr "Eintrag ist nicht lesbar"
-#: include/svn_error_codes.h:807
+#: include/svn_error_codes.h:823
msgid "Item is partially readable"
msgstr "Eintrag ist nur teilweise lesbar"
-#: include/svn_error_codes.h:811
+#: include/svn_error_codes.h:827
msgid "Invalid authz configuration"
msgstr "Ungültige authz Komfigturation"
-#: include/svn_error_codes.h:816
+#: include/svn_error_codes.h:832
msgid "Item is not writable"
msgstr "Eintrag ist nicht schreibbar"
-#: include/svn_error_codes.h:822
+#: include/svn_error_codes.h:838
msgid "Svndiff data has invalid header"
msgstr "Svndiff-Daten enthalten ungültigen Kopf"
-#: include/svn_error_codes.h:826
+#: include/svn_error_codes.h:842
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff-Daten enthalten defektes Fenster"
-#: include/svn_error_codes.h:830
+#: include/svn_error_codes.h:846
msgid "Svndiff data contains backward-sliding source view"
msgstr "Svndiff-Daten enthalten rückwärts gleitenden Blick auf Quellen"
-#: include/svn_error_codes.h:834
+#: include/svn_error_codes.h:850
msgid "Svndiff data contains invalid instruction"
msgstr "Svndiff-Daten enthalten ungültige Anweisung"
-#: include/svn_error_codes.h:838
+#: include/svn_error_codes.h:854
msgid "Svndiff data ends unexpectedly"
msgstr "Svndiff-Daten enden unerwartet"
-#: include/svn_error_codes.h:842
+#: include/svn_error_codes.h:858
msgid "Svndiff compressed data is invalid"
msgstr "Komprimierte svndiff-Daten sind ungültig"
-#: include/svn_error_codes.h:848
+#: include/svn_error_codes.h:864
msgid "Diff data source modified unexpectedly"
msgstr "Diff-Datenquellen wurden unerwarteterweise verändert"
-#: include/svn_error_codes.h:854
+#: include/svn_error_codes.h:870
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache besitzt keinen Pfad zu einem SVN Dateisystem"
-#: include/svn_error_codes.h:858
+#: include/svn_error_codes.h:874
msgid "Apache got a malformed URI"
msgstr "Apache hat eine fehlerhafte URI erhalten"
-#: include/svn_error_codes.h:862
+#: include/svn_error_codes.h:878
msgid "Activity not found"
msgstr "Aktivität nicht gefunden"
-#: include/svn_error_codes.h:866
+#: include/svn_error_codes.h:882
msgid "Baseline incorrect"
msgstr "»Baseline« nicht korrekt"
-#: include/svn_error_codes.h:870
+#: include/svn_error_codes.h:886
msgid "Input/output error"
msgstr "Eingabe/Ausgabe Fehler"
-#: include/svn_error_codes.h:876
+#: include/svn_error_codes.h:892
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:880
+#: include/svn_error_codes.h:896
msgid "Repository access is needed for this operation"
msgstr "Für diese Operation wird Zugang zum Projektarchiv benötigt"
-#: include/svn_error_codes.h:884
+#: include/svn_error_codes.h:900
msgid "Bogus revision information given"
msgstr "Falsche Revisionsinformation angegeben"
-#: include/svn_error_codes.h:888
+#: include/svn_error_codes.h:904
msgid "Attempting to commit to a URL more than once"
msgstr "Versuch, mehrfach zu einer URL zu übertragen"
-#: include/svn_error_codes.h:892
+#: include/svn_error_codes.h:908
msgid "Operation does not apply to binary file"
msgstr "Operation ist nicht auf einer Binärdatei ausführbar"
-#: include/svn_error_codes.h:898
+#: include/svn_error_codes.h:914
msgid "Format of an svn:externals property was invalid"
msgstr "Format einer svn:externals Eigenschaft war ungültig"
-#: include/svn_error_codes.h:902
+#: include/svn_error_codes.h:918
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:906
+#: include/svn_error_codes.h:922
msgid "Operation does not apply to directory"
msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
-#: include/svn_error_codes.h:910
+#: include/svn_error_codes.h:926
msgid "Revision range is not allowed"
msgstr "Revisionsbereich nicht erlaubt"
-#: include/svn_error_codes.h:914
+#: include/svn_error_codes.h:930
msgid "Inter-repository relocation not allowed"
msgstr "Umplatzieren innerhalb des Projektarchivs nicht erlaubt"
-#: include/svn_error_codes.h:918
+#: include/svn_error_codes.h:934
msgid "Author name cannot contain a newline"
msgstr "Autorenname darf keinen Zeilenumbruch enthalten"
-#: include/svn_error_codes.h:922
+#: include/svn_error_codes.h:938
msgid "Bad property name"
msgstr "Fehlerhafter Eigenschaftsname"
-#: include/svn_error_codes.h:927
+#: include/svn_error_codes.h:943
msgid "Two versioned resources are unrelated"
msgstr "Zwei versionierte Ressourcen sind nicht verwandt"
-#: include/svn_error_codes.h:932
+#: include/svn_error_codes.h:948
msgid "Path has no lock token"
msgstr "Pfad hat keine Sperrmarke"
-#: include/svn_error_codes.h:937
+#: include/svn_error_codes.h:953
#, fuzzy
msgid "Operation does not support multiple sources"
msgstr "Operation ist nicht auf einem Verzeichnis ausführbar"
-#: include/svn_error_codes.h:943
+#: include/svn_error_codes.h:959
msgid "A problem occurred; see later errors for details"
msgstr ""
"Ein Problem ist aufgetreten, für Details siehe folgende Fehlermeldungen"
-#: include/svn_error_codes.h:947
+#: include/svn_error_codes.h:963
msgid "Failure loading plugin"
msgstr "Fehler beim Laden eines Plugins"
-#: include/svn_error_codes.h:951
+#: include/svn_error_codes.h:967
msgid "Malformed file"
msgstr "Fehlerhafte Datei"
-#: include/svn_error_codes.h:955
+#: include/svn_error_codes.h:971
msgid "Incomplete data"
msgstr "Unvollständige Daten"
-#: include/svn_error_codes.h:959
+#: include/svn_error_codes.h:975
msgid "Incorrect parameters given"
msgstr "Inkorrekte Parameter übergeben"
-#: include/svn_error_codes.h:963
+#: include/svn_error_codes.h:979
msgid "Tried a versioning operation on an unversioned resource"
msgstr ""
"Versuchte, eine Versionsoperation auf nicht versionierter Ressource "
"auszuführen"
-#: include/svn_error_codes.h:967
+#: include/svn_error_codes.h:983
msgid "Test failed"
msgstr "Test fehlgeschlagen"
-#: include/svn_error_codes.h:971
+#: include/svn_error_codes.h:987
msgid "Trying to use an unsupported feature"
msgstr "Versuch, ein nicht unterstütztes Merkmal zu benutzen"
-#: include/svn_error_codes.h:975
+#: include/svn_error_codes.h:991
msgid "Unexpected or unknown property kind"
msgstr "Unerwartete oder unbekannte Eigenschaftsart"
-#: include/svn_error_codes.h:979
+#: include/svn_error_codes.h:995
msgid "Illegal target for the requested operation"
msgstr "Ungültiges Ziel für die angeforderte Operation"
-#: include/svn_error_codes.h:983
+#: include/svn_error_codes.h:999
msgid "MD5 checksum is missing"
msgstr "MD5 Prüfsumme fehlt"
-#: include/svn_error_codes.h:987
+#: include/svn_error_codes.h:1003
msgid "Directory needs to be empty but is not"
msgstr "Das Verzeichnis muss leer sein, ist es aber nicht"
-#: include/svn_error_codes.h:991
+#: include/svn_error_codes.h:1007
msgid "Error calling external program"
msgstr "Fehler beim Aufrufen eines externen Programmes"
-#: include/svn_error_codes.h:995
+#: include/svn_error_codes.h:1011
msgid "Python exception has been set with the error"
msgstr "Eine Python-Ausnahme wurde mit dem Fehler gesetzt"
-#: include/svn_error_codes.h:999
+#: include/svn_error_codes.h:1015
msgid "A checksum mismatch occurred"
msgstr "Ein Prüfsummenfehler ist aufgetreten"
-#: include/svn_error_codes.h:1003
+#: include/svn_error_codes.h:1019
msgid "The operation was interrupted"
msgstr "Die Operation wurde unterbrochen"
-#: include/svn_error_codes.h:1007
+#: include/svn_error_codes.h:1023
msgid "The specified diff option is not supported"
msgstr "Die angegebene Vergleichsoption wird nicht unterstützt"
-#: include/svn_error_codes.h:1011
+#: include/svn_error_codes.h:1027
msgid "Property not found"
msgstr "Eigenschaft nicht gefunden"
-#: include/svn_error_codes.h:1015
+#: include/svn_error_codes.h:1031
msgid "No auth file path available"
msgstr "Kein Pfad für die Anmeldedatei verfügbar"
-#: include/svn_error_codes.h:1020
+#: include/svn_error_codes.h:1035
+msgid "Merge info parse error"
+msgstr ""
+
+#: include/svn_error_codes.h:1040
msgid "Incompatible library version"
msgstr "Inkompatible Bibliotheksversion"
-#: include/svn_error_codes.h:1026
+#: include/svn_error_codes.h:1046
#, fuzzy
msgid "Error parsing arguments"
msgstr "Fehler des Client beim Einlesen der Parameter"
-#: include/svn_error_codes.h:1030
+#: include/svn_error_codes.h:1050
#, fuzzy
msgid "Not enough arguments provided"
msgstr ""
"Nicht genügend Parameter angegeben; versuchen Sie »svn help« für weitere "
"Informationen"
-#: include/svn_error_codes.h:1034
+#: include/svn_error_codes.h:1054
msgid "Mutually exclusive arguments specified"
msgstr "Die Parameter schließen sich gegenseitig aus"
-#: include/svn_error_codes.h:1038
+#: include/svn_error_codes.h:1058
msgid "Attempted command in administrative dir"
msgstr "Ausführen einer Operation in einem Verwaltungsverzeichnis versucht"
-#: include/svn_error_codes.h:1042
+#: include/svn_error_codes.h:1062
msgid "The log message file is under version control"
msgstr "Die Datei für die Logmeldung ist unter Versionskontrolle"
-#: include/svn_error_codes.h:1046
+#: include/svn_error_codes.h:1066
msgid "The log message is a pathname"
msgstr "Die Logmeldung ist ein Pfadname"
-#: include/svn_error_codes.h:1050
+#: include/svn_error_codes.h:1070
msgid "Committing in directory scheduled for addition"
msgstr "Übertragung in einem Verzeichnis, das zum Hinzufügen vorgesehen ist"
-#: include/svn_error_codes.h:1054
+#: include/svn_error_codes.h:1074
msgid "No external editor available"
msgstr "Kein externer Editor verfügbar"
-#: include/svn_error_codes.h:1058
+#: include/svn_error_codes.h:1078
msgid "Something is wrong with the log message's contents"
msgstr "Mit dem Inhalt der Logmeldung stimmt etwas nicht"
-#: include/svn_error_codes.h:1062
+#: include/svn_error_codes.h:1082
msgid "A log message was given where none was necessary"
msgstr "Eine Logmeldung wurde angegeben wo keine nötig ist"
-#: libsvn_client/add.c:344 libsvn_wc/copy.c:188
+#: libsvn_client/add.c:345 libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht schließen"
-#: libsvn_client/add.c:352
+#: libsvn_client/add.c:353
#, c-format
msgid "Error during recursive add of '%s'"
msgstr "Fehler beim rekursiven Hinzufügen von »%s«"
@@ -930,7 +948,7 @@
msgid "Start revision must precede end revision"
msgstr "Startrevision muss vor der Endrevision liegen"
-#: libsvn_client/blame.c:725 libsvn_client/cat.c:208
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL »%s« verweist auf auf ein Verzeichnis"
@@ -942,40 +960,35 @@
"Der Revisionsaktion »%c« für Revision %ld von »%s« fehlt eine "
"Vorgängerrevision"
-#: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "»%s« ist nicht unter Versionskontrolle oder existiert nicht"
-
-#: libsvn_client/cat.c:79
+#: libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "»%s« verweist auf ein Verzeichnis"
-#: libsvn_client/cat.c:131 libsvn_client/export.c:183
+#: libsvn_client/cat.c:126 libsvn_client/export.c:183
msgid "(local)"
msgstr "(lokal)"
-#: libsvn_client/checkout.c:92
+#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "Die URL »%s« existiert nicht"
-#: libsvn_client/checkout.c:96
+#: libsvn_client/checkout.c:95
#, 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:167
+#: libsvn_client/checkout.c:168
#, 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:171
+#: libsvn_client/checkout.c:172
msgid "; run 'svn update' to complete it"
msgstr "; vervollständigen Sie diese mit »svn update«."
-#: libsvn_client/checkout.c:181
+#: libsvn_client/checkout.c:182
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "»%s« existiert bereits und ist kein Verzeichnis"
@@ -989,123 +1002,103 @@
msgid "New entry name required when importing a file"
msgstr "Neuer Eintragsname erforderlich, wenn eine Datei importiert wird"
-#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:997 libsvn_wc/questions.c:91
+#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1016
+#: libsvn_wc/questions.c:92
#, c-format
msgid "'%s' does not exist"
msgstr "»%s« ist nicht vorhanden"
-#: libsvn_client/commit.c:606 libsvn_client/copy.c:283 svnlook/main.c:1204
+#: libsvn_client/commit.c:607 libsvn_client/copy.c:286 svnlook/main.c:1216
#, c-format
msgid "Path '%s' does not exist"
msgstr "Pfad »%s« existiert nicht"
-#: libsvn_client/commit.c:737 libsvn_client/copy.c:292
-#: libsvn_client/copy.c:617 libsvn_client/copy.c:868 libsvn_client/copy.c:1194
+#: libsvn_client/commit.c:741 libsvn_client/copy.c:295
+#: libsvn_client/copy.c:759 libsvn_client/copy.c:1025
+#: libsvn_client/copy.c:1417
#, c-format
msgid "Path '%s' already exists"
msgstr "Pfad »%s« existiert bereits"
-#: libsvn_client/commit.c:752
+#: libsvn_client/commit.c:756
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "»%s« ist ein reservierter Name und kann nicht importiert werden "
-#: libsvn_client/commit.c:868 libsvn_client/copy.c:760
+#: libsvn_client/commit.c:872 libsvn_client/copy.c:909
msgid "Commit failed (details follow):"
msgstr "Übertragen fehlgeschlagen (Details folgen):"
-#: libsvn_client/commit.c:876 libsvn_client/copy.c:768
+#: libsvn_client/commit.c:880 libsvn_client/copy.c:917
msgid "Commit succeeded, but other errors follow:"
msgstr "Übertragen erfolgreich, aber andere Fehler folgen:"
-#: libsvn_client/commit.c:883 libsvn_client/copy.c:775
+#: libsvn_client/commit.c:887 libsvn_client/copy.c:924
msgid "Error unlocking locked dirs (details follow):"
msgstr "Fehler beim Entsperren von Verzeichnissen (Details folgen):"
-#: libsvn_client/commit.c:894
+#: libsvn_client/commit.c:898
msgid "Error bumping revisions post-commit (details follow):"
msgstr ""
"Fehler beim Weiterschalten der Revisionen nach der Übertragung (Details "
"folgen):"
-#: libsvn_client/commit.c:905 libsvn_client/copy.c:786
+#: libsvn_client/commit.c:909 libsvn_client/copy.c:935
msgid "Error in post-commit clean-up (details follow):"
msgstr "Fehler beim Aufräumen nach der Übertragung (Details folgen):"
-#: libsvn_client/commit.c:1189
+#: libsvn_client/commit.c:1193
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "»%s« ist eine URL, aber URLs können nicht übertragen werden"
-#: libsvn_client/commit.c:1388
+#: libsvn_client/commit.c:1392
msgid "Are all the targets part of the same working copy?"
msgstr "Sind alle Ziele Teil derselben Arbeitskopie?"
-#: libsvn_client/commit.c:1403
+#: libsvn_client/commit.c:1407
msgid "Cannot non-recursively commit a directory deletion"
msgstr "Das Löschen eines Verzeichnis kann nur rekursiv übertragen werden"
-#: libsvn_client/commit_util.c:252 libsvn_client/commit_util.c:263
+#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "»%s« hat einen unbekannten Eintragstyp"
-#: libsvn_client/commit_util.c:280
+#: libsvn_client/commit_util.c:284
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "Der Spezialstatus von Eintrag »%s« hat sich unerwarteterweise geändert"
-#: libsvn_client/commit_util.c:331
+#: libsvn_client/commit_util.c:335
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "Übertragung abgebrochen: »%s« bleibt im Konflikt"
-#: libsvn_client/commit_util.c:397
+#: libsvn_client/commit_util.c:401
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "Erwartete nicht, dass »%s« Basis einer Arbeitskopie ist"
-#: libsvn_client/commit_util.c:415 libsvn_client/commit_util.c:1065
+#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr ""
"Übertragenes Objekt »%s« ist als Kopie markiert, besitzt aber keine Quell-URL"
-#: libsvn_client/commit_util.c:705 libsvn_client/commit_util.c:853
-#: libsvn_client/copy.c:1485 libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1468 libsvn_client/diff.c:2198
-#: libsvn_client/diff.c:2793 libsvn_client/diff.c:2921
-#: libsvn_client/locking_commands.c:259 libsvn_client/log.c:133
-#: libsvn_client/prop_commands.c:354 libsvn_client/prop_commands.c:608
-#: libsvn_client/prop_commands.c:772 libsvn_client/prop_commands.c:1131
-#: libsvn_client/ra.c:181 libsvn_client/revisions.c:89
-#: libsvn_client/status.c:256 libsvn_client/switch.c:107
-#: libsvn_wc/adm_crawler.c:453 libsvn_wc/adm_crawler.c:477
-#: libsvn_wc/adm_ops.c:1350 libsvn_wc/adm_ops.c:2638 libsvn_wc/adm_ops.c:2664
-#: libsvn_wc/adm_ops.c:2700 libsvn_wc/adm_ops.c:2759 libsvn_wc/copy.c:307
-#: libsvn_wc/copy.c:663 libsvn_wc/copy.c:785 libsvn_wc/copy.c:792
-#: libsvn_wc/diff.c:1793 libsvn_wc/entries.c:2276 libsvn_wc/entries.c:2872
-#: libsvn_wc/props.c:484 libsvn_wc/props.c:1092 libsvn_wc/props.c:1543
-#: libsvn_wc/questions.c:186 libsvn_wc/questions.c:300 libsvn_wc/status.c:729
-#: libsvn_wc/translate.c:269 libsvn_wc/update_editor.c:2299
-#: libsvn_wc/update_editor.c:3150
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "»%s« ist nicht unter Versionskontrolle"
-
-#: libsvn_client/commit_util.c:708
+#: libsvn_client/commit_util.c:709
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "Eintrag für »%s« hat keine URL"
-#: libsvn_client/commit_util.c:741
+#: libsvn_client/commit_util.c:742
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr ""
"»%s« ist zum Hinzufügen innerhalb einer nicht versionierten Struktur "
"vorgesehen"
-#: libsvn_client/commit_util.c:761
+#: libsvn_client/commit_util.c:762
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1117,7 +1110,7 @@
"sich in einem nicht versionierten (oder noch-nicht-versionierten)\n"
"Verzeichnis befindet?"
-#: libsvn_client/commit_util.c:802
+#: libsvn_client/commit_util.c:803
#, c-format
msgid ""
"'%s' is not under version control and is not part of the commit, yet its "
@@ -1126,26 +1119,30 @@
"»%s« ist weder unter Versionskontrolle noch Teil einer Übertragung, dennoch "
"ist sein Kind »%s« Teil einer Übertragung"
-#: libsvn_client/commit_util.c:920
+#: libsvn_client/commit_util.c:907
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr ""
"Kann »%s« und »%s« nicht übertragen, da beide auf dieselbe URL verweisen"
-#: libsvn_client/commit_util.c:1070
+#: libsvn_client/commit_util.c:1057
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr ""
"Übertragenes Objekt »%s« ist als Kopie markiert, hat aber eine ungültige "
"Revision"
-#: libsvn_client/copy.c:302 libsvn_client/copy.c:1204
-#: libsvn_client/update.c:78
+#: libsvn_client/commit_util.c:1822
+msgid "Standard properties can't be set explicitly as revision properties"
+msgstr ""
+
+#: libsvn_client/copy.c:305 libsvn_client/copy.c:1427
+#: libsvn_client/update.c:98
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Pfad »%s« ist kein Verzeichnis"
-#: libsvn_client/copy.c:516
+#: libsvn_client/copy.c:658
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
@@ -1154,66 +1151,67 @@
"Quelle und Ziel scheinen sich nicht im selben Projektarchiv zu befinden "
"(Quelle: »%s«; Ziel: »%s«)"
-#: libsvn_client/copy.c:598
+#: libsvn_client/copy.c:740
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Kann URL »%s« nicht auf sich selbst verschieben"
-#: libsvn_client/copy.c:607 libsvn_client/prop_commands.c:226
+#: libsvn_client/copy.c:749 libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Pfad »%s« existiert nicht in Revision %ld"
-#: libsvn_client/copy.c:1043
+#: libsvn_client/copy.c:1259
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr ""
"Quell URL »%s« ist aus einem fremden Projektarchiv; lasse sie als getrennte "
"Arbeitskopie"
-#: libsvn_client/copy.c:1181
+#: libsvn_client/copy.c:1404
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Pfad »%s« wurde in Revision %ld nicht gefunden"
-#: libsvn_client/copy.c:1186
+#: libsvn_client/copy.c:1409
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Pfad »%s« wurde in der HEAD-Revision nicht gefunden"
-#: libsvn_client/copy.c:1229
+#: libsvn_client/copy.c:1452
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "Eintrag für »%s« existiert (die Arbeitsdatei fehlt jedoch)"
-#: libsvn_client/copy.c:1323 libsvn_client/log.c:86
+#: libsvn_client/copy.c:1546 libsvn_client/log.c:87
msgid "Revision type requires a working copy path, not a URL"
msgstr "Revisionstyp erfordert einen Arbeitskopiepfad, keine URL"
-#: libsvn_client/copy.c:1357
-msgid "Cannot mix repository and working copy paths in source list"
-msgstr ""
+#: libsvn_client/copy.c:1581
+#, fuzzy
+msgid "Cannot mix repository and working copy sources"
+msgstr "Pfad ist keine Datei in einer Arbeitskopie"
-#: libsvn_client/copy.c:1398
+#: libsvn_client/copy.c:1623
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Kann Pfad »%s« nicht in sein eigenes Kind »%s« kopieren"
-#: libsvn_client/copy.c:1418
+#: libsvn_client/copy.c:1643
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Kann »%s« nicht auf sich selbst verschieben"
-#: libsvn_client/copy.c:1427
-msgid "No support for repos <--> working copy moves"
-msgstr "Verschieben von Arbeitskopie <--> Projektarchiv wird nicht unterstützt"
+#: libsvn_client/copy.c:1652
+msgid "Moves between the working copy and the repository are not supported"
+msgstr ""
-#: libsvn_client/copy.c:1491
+#: libsvn_client/copy.c:1710
#, c-format
msgid "'%s' does not seem to have a URL associated with it"
msgstr "»%s« scheint nicht mit einer URL verbunden zu sein"
-#: libsvn_client/copy.c:1817 svn/move-cmd.c:67
+#: libsvn_client/copy.c:2048 svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr ""
"Andere Revisionen (als HEAD) sind bei Verschiebeoperationen nicht zugelassen"
@@ -1224,95 +1222,81 @@
msgstr ""
"»%s« ist der Ressource, die sich unter Versionskontrolle befindet, im Weg"
+#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2781 libsvn_wc/entries.c:1256
+#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2969
+#: libsvn_wc/update_editor.c:2178
+#, c-format
+msgid "'%s' is not under version control"
+msgstr "»%s« ist nicht unter Versionskontrolle"
+
#: libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "»%s« hat lokale Änderungen"
-#: libsvn_client/diff.c:99
+#: libsvn_client/diff.c:135
+#, fuzzy, c-format
+msgid " Reverted %s:r%s%s"
+msgstr "Rückgängig gemacht: »%s«\n"
+
+#: libsvn_client/diff.c:153
+#, c-format
+msgid " Merged %s:r%s%s"
+msgstr ""
+
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sEigenschaftsänderungen: %s%s"
-#: libsvn_client/diff.c:127
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "Name: %s%s"
-#: libsvn_client/diff.c:203
-#, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr "Die URLs haben kein Schema (»%s« und »%s«)"
-
-#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
-#, c-format
-msgid "URL has no scheme: '%s'"
-msgstr "URL hat kein Schema: »%s«"
-
-#: libsvn_client/diff.c:222
-#, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr ""
-"Gemischte Zugriffsverfahren werden noch nicht unterstützt (»%s« and »%s«)"
-
-#: libsvn_client/diff.c:287
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(Revision %ld)"
-#: libsvn_client/diff.c:289
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(Arbeitskopie)"
-#: libsvn_client/diff.c:432
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Kann nicht anzeigen: Dateityp ist als binär angegeben.%s"
-# Lustig: .working wird nicht übersetzt, .merge-left aber schon
-# und das auch noch inkonsistent...
-#. 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/diff.c:887
-msgid ".working"
-msgstr ".working"
-
-#: libsvn_client/diff.c:889
-#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".merge-links.r%ld"
-
-#: libsvn_client/diff.c:892
-#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".merge-rechts.r%ld"
-
-#: libsvn_client/diff.c:1533 libsvn_client/diff.c:1737
+#. -----------------------------------------------------------------------
+#. ** Utilities. **
+#. Sanity check -- ensure that we have valid revisions to look at.
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "Es sind nicht alle erforderlichen Revisionen angegeben"
# Was soll eine 'pegged diff' sein?
# Gemeint ist, wenn bei einem svn diff ein @REV angegeben wurde (also die Revision, in der die Datei zuerst gesucht wird)
-#: libsvn_client/diff.c:1548
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr ""
"Wenn eine Basisrevision angegeben wurde, muss zumindest eine Revision auf "
"dem Server sein"
-#: libsvn_client/diff.c:1660 libsvn_client/diff.c:1672
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "»%s« wurde im Projektarchiv in Revision %ld nicht gefunden"
-#: libsvn_client/diff.c:2018
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+#: libsvn_client/diff.c:1025
+#, fuzzy
+msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr ""
"svn_client_diff3 wurde in einer Art aufgerufen, die derzeit nicht "
"unterstützt wird"
-#: libsvn_client/diff.c:2057
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1320,184 +1304,222 @@
"Derzeit werden nur Vergleiche zwischen der Textbasis und den Arbeitsdateien "
"eines Pfades unterstützt"
-#: libsvn_client/diff.c:2202 libsvn_client/switch.c:111
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Verzeichnis »%s« hat keine URL"
-#: libsvn_client/diff.c:2409
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr ""
"Zusammenfassender Vergleich kann nur ein Projektarchiv mit einem "
"Projektarchiv vergleichen"
-#: libsvn_client/diff.c:2766 libsvn_client/diff.c:2772
-#: libsvn_client/diff.c:2906 libsvn_client/locking_commands.c:263
-#: libsvn_client/ra.c:382 libsvn_client/ra.c:748 libsvn_client/ra.c:885
-#, c-format
-msgid "'%s' has no URL"
-msgstr "»%s« hat keine URL"
-
#: libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "»%s« ist kein gültiger EOL Wert"
-#: libsvn_client/export.c:271
+#: libsvn_client/export.c:260
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr ""
"Zielverzeichnis existiert und kann nur mittels »--force« überschrieben werden"
-#: libsvn_client/export.c:369 libsvn_client/export.c:512
+#: libsvn_client/export.c:358 libsvn_client/export.c:501
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "»%s« existiert und ist kein Verzeichnis"
-#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#: libsvn_client/export.c:362 libsvn_client/export.c:505
#, c-format
msgid "'%s' already exists"
msgstr "»%s« existiert bereits"
-#: libsvn_client/export.c:687 libsvn_wc/update_editor.c:1759
-#: libsvn_wc/update_editor.c:2429
+#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Prüfsummenfehler für »%s«; erwartet: »%s«, tatsächlich: »%s«"
-#: libsvn_client/info.c:244
-#, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "Kann Eintrag für »%s« nicht lesen"
-
-#: libsvn_client/info.c:380 libsvn_client/info.c:405 libsvn_client/info.c:415
+#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL »%s« existiert nicht in Revision %ld"
-#: libsvn_client/list.c:225
+#: libsvn_client/list.c:222
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL »%s« existiert nicht in dieser Revision"
-#: libsvn_client/locking_commands.c:198
+#: libsvn_client/locking_commands.c:199
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr ""
"Kein gemeinsamer Vorgänger gefunden. Kann nicht mit disjunkten Pfaden "
"arbeiten"
-#: libsvn_client/locking_commands.c:287
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
+#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
+#, c-format
+msgid "'%s' has no URL"
+msgstr "»%s« hat keine URL"
+
+#: libsvn_client/locking_commands.c:284
msgid "Unable to lock/unlock across multiple repositories"
msgstr "Unmöglich über mehrere Projektarchive zu (ent)sperren"
-#: libsvn_client/locking_commands.c:328
+#: libsvn_client/locking_commands.c:325
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "»%s« ist in dieser Arbeitskopie nicht gesperrt"
-#: libsvn_client/locking_commands.c:376
+#: libsvn_client/locking_commands.c:373
#, c-format
msgid "'%s' is not locked"
msgstr "»%s« ist nicht gesperrt"
-#: libsvn_client/locking_commands.c:409 libsvn_ra/ra_loader.c:625
-msgid "Lock comment has illegal characters"
+#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:932
+#: libsvn_ra/ra_loader.c:863
+#, fuzzy
+msgid "Lock comment contains illegal characters"
msgstr "Sperrkommentar enthält illegale Zeichen"
-#: libsvn_client/log.c:73
+#: libsvn_client/log.c:74
msgid "Missing required revision specification"
msgstr "Es wurde keine Revision angegeben"
-#: libsvn_client/log.c:139 libsvn_client/status.c:261
-#: libsvn_client/update.c:92
+#: libsvn_client/log.c:137 libsvn_client/status.c:271
+#: libsvn_client/update.c:112
#, c-format
msgid "Entry '%s' has no URL"
msgstr "Eintrag »%s« hat keine URL"
-#: libsvn_client/log.c:370
+#: libsvn_client/log.c:368
msgid "No commits in repository"
msgstr "Keine Übertragungen im Projektarchiv"
-#: libsvn_client/prop_commands.c:71
+#: libsvn_client/merge.c:87
+#, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
+msgstr "Die URLs haben kein Schema (»%s« und »%s«)"
+
+#: libsvn_client/merge.c:93 libsvn_client/merge.c:99
+#, c-format
+msgid "URL has no scheme: '%s'"
+msgstr "URL hat kein Schema: »%s«"
+
+#: libsvn_client/merge.c:106
+#, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr ""
+"Gemischte Zugriffsverfahren werden noch nicht unterstützt (»%s« and »%s«)"
+
+# Lustig: .working wird nicht übersetzt, .merge-left aber schon
+# und das auch noch inkonsistent...
+#. 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:328
+msgid ".working"
+msgstr ".working"
+
+#: libsvn_client/merge.c:330
+#, c-format
+msgid ".merge-left.r%ld"
+msgstr ".merge-links.r%ld"
+
+#: libsvn_client/merge.c:333
+#, c-format
+msgid ".merge-right.r%ld"
+msgstr ".merge-rechts.r%ld"
+
+#: libsvn_client/merge.c:1164
+#, c-format
+msgid ""
+"Path '%s' is in conflict, and must be resolved before the remainder of the "
+"requested merge can be applied"
+msgstr ""
+
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
+msgid "Use of two URLs is not compatible with merge info modification"
+msgstr ""
+
+#: libsvn_client/prop_commands.c:73
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "»%s« ist eine AK-Eigenschaft und damit den Clients nicht zugänglich"
-#: libsvn_client/prop_commands.c:213
+#: libsvn_client/prop_commands.c:216
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "Eigenschaft »%s« ist keine reguläre Eigenschaft"
-#: libsvn_client/prop_commands.c:315
+#: libsvn_client/prop_commands.c:320
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "Revisionseigenschaft »%s« ist in diesem Kontext nicht erlaubt"
-#: libsvn_client/prop_commands.c:323 libsvn_client/prop_commands.c:442
+#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
#, c-format
msgid "Bad property name: '%s'"
msgstr "Ungültiger Name für Eigenschaft: »%s«"
-#: libsvn_client/prop_commands.c:334
+#: libsvn_client/prop_commands.c:339
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr ""
"Das Setzen einer Eigenschaft für ein nicht lokales Ziel »%s« benötigt eine "
"Basisrevision"
-#: libsvn_client/prop_commands.c:340
+#: libsvn_client/prop_commands.c:345
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr ""
"Das rekursive Setzen einer Eigenschaft für ein nicht lokales Ziel »%s« wird "
"nicht unterstützt"
-#: libsvn_client/prop_commands.c:438
+#: libsvn_client/prop_commands.c:439
msgid "Value will not be set unless forced"
msgstr "Der Wert kann nur mittels »force« gesetzt werden"
-#: libsvn_client/prop_commands.c:661
+#: libsvn_client/prop_commands.c:659
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "»%s« existiert nicht in Revision %ld"
-#: libsvn_client/prop_commands.c:668 libsvn_client/prop_commands.c:936
+#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:948
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "»%s« hat einen unbekannten Knotentyp"
-#: libsvn_client/ra.c:132
+#: libsvn_client/ra.c:133
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr ""
"Versuch, die Eigenschaft »%s« der Arbeitskopie während einer\n"
"Nicht-Übertragungs-Operation auf »%s« zu setzen"
-#: libsvn_client/ra.c:359
-#, c-format
-msgid "Can't find entry for '%s'"
-msgstr "Kann Eintrag für »%s« nicht finden"
-
-#: libsvn_client/ra.c:503
+#: libsvn_client/ra.c:496
#, c-format
msgid "Missing changed-path information for '%s' in revision %ld"
msgstr "»%s« fehlt in der Liste der geänderten Pfade von Revision %ld"
-#: libsvn_client/ra.c:623
-#, c-format
-msgid "path '%s' doesn't exist in revision %ld"
+#: libsvn_client/ra.c:616
+#, fuzzy, c-format
+msgid "Path '%s' doesn't exist in revision %ld"
msgstr "Pfad »%s« existiert nicht in Revision %ld"
-#: libsvn_client/ra.c:670 libsvn_client/ra.c:833
+#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "Kann »%s« in Revision %ld nicht im Projektarchiv finden"
-#: libsvn_client/ra.c:681
+#: libsvn_client/ra.c:674
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "»%s« in Revision %ld hat keinen Bezug zur Arbeitskopie"
-#: libsvn_client/ra.c:838
+#: libsvn_client/ra.c:831
#, c-format
msgid ""
"The location for '%s' for revision %ld does not exist in the repository or "
@@ -1517,16 +1539,26 @@
msgstr ""
"Das Projektarchiv in »%s« hat die UUID »%s«, aber die Arbeitskopie hat »%s«"
-#: libsvn_client/revisions.c:99
+#: libsvn_client/revisions.c:93
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "Pfad »%s« hat keine übertragene Revision"
-#: libsvn_client/revisions.c:109
+#: libsvn_client/revisions.c:103
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "Unbekannter Revisionstyp für »%s« angefragt"
+#: libsvn_client/update.c:138 libsvn_wc/log.c:2573
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr "»%s« ist kein Verzeichnis einer Arbeitskopie"
+
+#: libsvn_client/update.c:146
+#, fuzzy, c-format
+msgid "'%s' is neither a file nor a directory"
+msgstr "»%s« ist weder ein Datei- noch ein Verzeichnisname"
+
#: libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
msgstr "Kompression der svndiff-Daten fehlgeschlagen"
@@ -1556,45 +1588,45 @@
msgid "Invalid diff stream: insn %d overflows the target view"
msgstr "Ungültiger Diff-Strom: insn %d läuft in die Zielansicht über"
-#: libsvn_delta/svndiff.c:501
+#: libsvn_delta/svndiff.c:500
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr "Ungültiger Diff-Strom: [Quelle] insn %d läuft in die Quellansicht über"
-#: libsvn_delta/svndiff.c:508
+#: libsvn_delta/svndiff.c:507
#, c-format
msgid ""
"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
msgstr "Ungültiger Diff-Strom: [Ziel] insn %d startet hinter der Zielposition"
-#: libsvn_delta/svndiff.c:515
+#: libsvn_delta/svndiff.c:514
#, c-format
msgid "Invalid diff stream: [new] insn %d overflows the new data section"
msgstr ""
"Ungültiger Diff-Strom: [Neu] insn %d läuft in die neue Datensektion über"
-#: libsvn_delta/svndiff.c:525
+#: libsvn_delta/svndiff.c:524
msgid "Delta does not fill the target window"
msgstr "Delta füllt das Zielfenster nicht"
-#: libsvn_delta/svndiff.c:528
+#: libsvn_delta/svndiff.c:527
msgid "Delta does not contain enough new data"
msgstr "Delta enthält nicht genügend neue Daten"
-#: libsvn_delta/svndiff.c:634
+#: libsvn_delta/svndiff.c:633
msgid "Svndiff has invalid header"
msgstr "Svndiff-Daten enthalten ungültigen Kopf"
-#: libsvn_delta/svndiff.c:689 libsvn_delta/svndiff.c:845
+#: libsvn_delta/svndiff.c:688 libsvn_delta/svndiff.c:844
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff-Daten enthalten defektes Fenster"
-#: libsvn_delta/svndiff.c:698
+#: libsvn_delta/svndiff.c:697
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff-Daten enthalten rückwärts gleitenden Blick auf Quellen"
-#: libsvn_delta/svndiff.c:747 libsvn_delta/svndiff.c:794
-#: libsvn_delta/svndiff.c:867
+#: libsvn_delta/svndiff.c:746 libsvn_delta/svndiff.c:793
+#: libsvn_delta/svndiff.c:866
msgid "Unexpected end of svndiff input"
msgstr "Unerwartetes Ende der Svndiff-Eingangsdaten"
@@ -1662,12 +1694,7 @@
msgid "Can't ungrab FS mutex"
msgstr "Kann FS Mutex nicht loslassen"
-#: libsvn_fs/fs-loader.c:901
-#, fuzzy
-msgid "Lock comment contains illegal characters"
-msgstr "Sperrkommentar enthält illegale Zeichen"
-
-#: libsvn_fs/fs-loader.c:907
+#: libsvn_fs/fs-loader.c:938
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Negatives Ablaufdatum an svn_fs_lock übergeben"
@@ -1684,16 +1711,16 @@
msgid "deleting changes"
msgstr "Lösche Änderungen"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2385
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "Für den Knoten fehlt eine erforderliche Revisions ID"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2395
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr ""
"Ungültige Reihenfolge bei Änderung: Neue Knoten Revisions ID ohne Löschen"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2406
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr ""
"Ungültige Reihenfolge bei Änderung: Nicht-hinzufügende Änderung auf "
@@ -1814,113 +1841,113 @@
msgid "set repository uuid"
msgstr "Setze UUID des Projektarchivs"
-#: libsvn_fs_base/dag.c:217
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr "DB beschädigt: Erste Transaktion ist nicht »0« in Dateisystem »%s«"
-#: libsvn_fs_base/dag.c:225
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "DB beschädigt: Erste Kopie ist nicht »0« in Dateisystem »%s«"
-#: libsvn_fs_base/dag.c:234
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr "DB beschädigt: Erste Revision ist nicht »0« in Dateisystem »%s«"
-#: libsvn_fs_base/dag.c:282 libsvn_fs_base/dag.c:458 libsvn_fs_fs/dag.c:334
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "Versuchte, Eintrag in einem *nicht* Verzeichnisknoten anzulegen"
-#: libsvn_fs_base/dag.c:452 libsvn_fs_fs/dag.c:328
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Versuchte, Knoten mit illegalem Namen »%s« anzulegen"
-#: libsvn_fs_base/dag.c:464 libsvn_fs_base/dag.c:698 libsvn_fs_fs/dag.c:340
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "Versuchte, Unterknoten eines nicht-veränderlichen Knotens zu klonen"
-#: libsvn_fs_base/dag.c:471
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Versuchte, Eintrag anzulegen, der bereits existiert"
-#: libsvn_fs_base/dag.c:522 libsvn_fs_fs/dag.c:402
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "Versuchte, Eintrag in einem *nicht* Verzeichnisknoten zu setzen"
-#: libsvn_fs_base/dag.c:528 libsvn_fs_fs/dag.c:408
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "Versuchte, Eintrag in einem nicht-veränderlichen Knoten zu setzen"
# FIXME: node-revision or node-rev (wie überall)?
-#: libsvn_fs_base/dag.c:592
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr ""
"Kann keine Eigenschaften für *nicht-veränderliche* Knotenrevision %s setzen."
-#: libsvn_fs_base/dag.c:704
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "Versuchte, Unterknoten mit illegalem Namen »%s« zu klonen"
-#: libsvn_fs_base/dag.c:830
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "Versuchte, Eintrag »%s« aus einem *nicht* Verzeichnisknoten zu löschen"
-#: libsvn_fs_base/dag.c:836
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr ""
"Versuchte, Eintrag »%s« aus einem nicht-veränderlichen Verzeichnisknoten zu "
"löschen"
-#: libsvn_fs_base/dag.c:843
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Versuchte, einen Knoten mit illegalem Namen »%s« zu löschen"
-#: libsvn_fs_base/dag.c:858 libsvn_fs_base/dag.c:891
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Löschen fehlgeschlagen: Verzeichnis hat keinen Eintrag »%s«"
-#: libsvn_fs_base/dag.c:940
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Versuchte, einen nicht-veränderlichen Knoten zu entfernen"
-#: libsvn_fs_base/dag.c:1060
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "Versuchte, den Textinhalt eines *nicht* Dateiknotens zu holen"
-#: libsvn_fs_base/dag.c:1095
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Versuchte, die Länge eines *nicht* Dateiknotens zu holen"
-#: libsvn_fs_base/dag.c:1121
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "Versuchte, die Prüfsumme eines *nicht* Dateiknotens zu holen"
-#: libsvn_fs_base/dag.c:1152 libsvn_fs_base/dag.c:1206
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "Versuchte, den Textinhalt eines *nicht* Dateiknotens zu setzen"
-#: libsvn_fs_base/dag.c:1158 libsvn_fs_base/dag.c:1212
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Versuchte, den Textinhalt eines nicht-veränderlichen Knotens zu setzen"
-#: libsvn_fs_base/dag.c:1235
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1931,12 +1958,12 @@
" Erwartet: %s\n"
" Tatsächlich: %s\n"
-#: libsvn_fs_base/dag.c:1290
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Versuchte, nicht existierenden Unterknoten »%s« zu öffnen"
-#: libsvn_fs_base/dag.c:1296
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Versuchte, einen Knoten mit illegalem Namen »%s« zu öffnen"
@@ -2045,41 +2072,41 @@
msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
msgstr "Pfad »%s« ist bereits durch Benutzer »%s« im Dateisystem »%s« gesperrt"
-#: libsvn_fs_base/fs.c:79
+#: libsvn_fs_base/fs.c:80
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr "Falsche Datenbankversion: %d.%d.%d, sollte mindestens %d.%d.%d sein"
-#: libsvn_fs_base/fs.c:90
+#: libsvn_fs_base/fs.c:91
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr "Falsche Datenbankversion: Übersetzt mit %d.%d.%d, läuft mit %d.%d.%d"
-#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:54
+#: libsvn_fs_base/fs.c:109 libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "Dateisystemobjekt ist bereits geöffnet"
-#: libsvn_fs_base/fs.c:189
+#: libsvn_fs_base/fs.c:190
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Schließen der Umgebung:\n"
-#: libsvn_fs_base/fs.c:539
+#: libsvn_fs_base/fs.c:540
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Erzeugen der Umgebung:\n"
-#: libsvn_fs_base/fs.c:545
+#: libsvn_fs_base/fs.c:546
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr "Berkeley-DB-Fehler für Dateisystem »%s« beim Öffnen der Umgebung:\n"
-#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:631
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Erwartetes Dateisystemformat »%d«; gefunden »%d«"
-#: libsvn_fs_base/fs.c:1094
+#: libsvn_fs_base/fs.c:1112
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
"may be interfering with the hotcopy algorithm. If \n"
@@ -2090,7 +2117,7 @@
"könnte den Hotcopy-Algorithmus stören. Wenn das Problem weiterhin\n"
"besteht, versuchen Sie diese Funktion in DB_CONFIG abzuschalten."
-#: libsvn_fs_base/fs.c:1113
+#: libsvn_fs_base/fs.c:1131
msgid ""
"Error running catastrophic recovery on hotcopy; the \n"
"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
@@ -2102,28 +2129,28 @@
"könnte den Hotcopy-Algorithmus stören. Wenn das Problem weiterhin\n"
"besteht, versuchen Sie diese Funktion in DB_CONFIG abzuschalten."
-#: libsvn_fs_base/fs.c:1222
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr "Modul zum Zugriff auf ein Berkeley-DB-Projektarchiv."
-#: libsvn_fs_base/fs.c:1255
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für bdb"
-#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr "Kann Sperre für Pfad »%s« nicht prüfen; keine Benutzername verfügbar"
-#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr ""
"Benutzer %s besitzt die Sperre für Pfad »%s« nicht (derzeit gesperrt durch %"
"s)"
-#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr ""
@@ -2208,17 +2235,17 @@
msgid "Failed to calculate MD5 digest for '%s'"
msgstr "Berechnung der MD5-Summe für »%s« fehlgeschlagen"
-#: libsvn_fs_base/revs-txns.c:65
+#: libsvn_fs_base/revs-txns.c:67
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "Transaktion ist nicht tot: »%s«"
-#: libsvn_fs_base/revs-txns.c:68
+#: libsvn_fs_base/revs-txns.c:70
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "Transaktion ist tot: »%s«"
-#: libsvn_fs_base/revs-txns.c:981
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "Transaktion abgebrochen, aber Aufräumen fehlgeschlagen"
@@ -2228,89 +2255,89 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:389 libsvn_fs_fs/tree.c:309
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "Datei nicht gefunden: Transaktion »%s«, Pfad »%s«"
-#: libsvn_fs_base/tree.c:394 libsvn_fs_fs/tree.c:314
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "Datei nicht gefunden: Revision %ld, Pfad »%s«"
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:404 libsvn_fs_fs/tree.c:329
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "Datei existiert bereits: Dateisystem »%s«, Transaktion »%s«, Pfad »%s«"
-#: libsvn_fs_base/tree.c:409 libsvn_fs_fs/tree.c:335
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "Datei existiert bereits: Dateisystem »%s«, Revision %ld, Pfad »%s«"
-#: libsvn_fs_base/tree.c:417 libsvn_fs_fs/tree.c:345
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "Basisobjekt muss eine Transaktionsbasis sein"
-#: libsvn_fs_base/tree.c:832 libsvn_fs_fs/tree.c:754
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "Fehler beim Öffnen von »%s«"
-#: libsvn_fs_base/tree.c:1402 libsvn_fs_fs/tree.c:1152
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr ""
"Kann Eigenschaftswert nicht zwischen verschiedenen Dateisystemen vergleichen"
-#: libsvn_fs_base/tree.c:1735
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "DB beschädigt: Fehlerhafte Vorgängeranzahl"
-#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1189
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Unerwarteter unveränderlicher Knoten bei »%s«"
-#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1212
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "Konflikt bei »%s«"
-#: libsvn_fs_base/tree.c:1861 libsvn_fs_base/tree.c:2566
-#: libsvn_fs_fs/tree.c:1261 libsvn_fs_fs/tree.c:1748
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr ""
"Fehlerhaftes Zusammenführen: Vorgänger, Quelle und Ziel nicht im gleichen "
"Dateisystem"
-#: libsvn_fs_base/tree.c:1877 libsvn_fs_fs/tree.c:1277
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr ""
"Fehlerhaftes Zusammenführen: Ziel »%s« hat die gleiche ID »%s« wie der "
"Vorgänger."
-#: libsvn_fs_base/tree.c:2373
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "Transaktion »%s« ist in Bezug auf Revision »%s« veraltet"
-#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1887
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "Das Basisverzeichnis kann nicht gelöscht werden"
-#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1959
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr ""
"Kann nicht zwischen zwei verschiedenen Dateisystemen (»%s« und »%s«) kopieren"
-#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1965
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "Kopieren eines veränderlichen Baumes wird derzeit nicht unterstützt"
-#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2389
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2321,23 +2348,23 @@
" Erwartet: %s\n"
" Tatsächlich: %s\n"
-#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2625
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr ""
"Kann Dateiinhalte nicht zwischen verschiedenen Dateisystemen vergleichen"
-#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
-#: libsvn_fs_fs/tree.c:2634 libsvn_fs_fs/tree.c:2639
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
msgstr "»%s« ist keine Datei"
-#: libsvn_fs_fs/dag.c:384
+#: libsvn_fs_fs/dag.c:383
msgid "Can't get entries of non-directory"
msgstr "Kann keine Einträge aus einem nicht-Verzeichnis lesen"
-#: libsvn_fs_fs/dag.c:931
+#: libsvn_fs_fs/dag.c:930
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2353,68 +2380,68 @@
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
msgstr "Beschädigte Sperrdatei für Pfad »%s« in Dateisystem »%s«"
-#: libsvn_fs_fs/fs.c:89
+#: libsvn_fs_fs/fs.c:88
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Kann gemeinsame FSFS-Daten nicht holen"
-#: libsvn_fs_fs/fs.c:105
+#: libsvn_fs_fs/fs.c:104
#, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "Kann FSFS Schreibschutz-Mutex nicht anlegen"
-#: libsvn_fs_fs/fs.c:113
+#: libsvn_fs_fs/fs.c:112
#, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "Kann FSFS Transaktions-Mutex nicht anlegen"
-#: libsvn_fs_fs/fs.c:119
+#: libsvn_fs_fs/fs.c:118
#, c-format
msgid "Can't store FSFS shared data"
msgstr "Kann gemeinsame FSFS-Daten nicht speichern"
-#: libsvn_fs_fs/fs.c:345
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr "Modul zum Zugriff auf ein dateibasiertes (FSFS) Projektarchiv."
-#: libsvn_fs_fs/fs.c:378
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Nicht unterstützte Dateisystem-Laderversion (%d) für fsfs"
-#: libsvn_fs_fs/fs_fs.c:340
+#: libsvn_fs_fs/fs_fs.c:352
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "Kann FSFS Transaktions-Mutex nicht greifen"
-#: libsvn_fs_fs/fs_fs.c:348
+#: libsvn_fs_fs/fs_fs.c:360
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "Kann FSFS Transaktions-Mutex nicht loslassen"
-#: libsvn_fs_fs/fs_fs.c:374
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Kann unbekannte Transaktion »%s« nicht freigeben"
-#: libsvn_fs_fs/fs_fs.c:378
+#: libsvn_fs_fs/fs_fs.c:390
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "Nicht gesperrte Transaktion »%s« kann nicht freigeben werden"
# FIXME: Dies ist aber nicht infinitisch übersetzt (siehe umliegenden Meldungen)
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
"Kann Prototyp-Revisionssperrdatei für Transaktion »%s« nicht entsperren"
-#: libsvn_fs_fs/fs_fs.c:391
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr "Kann Prototyp-Revisionssperrdatei für Transaktion »%s« nicht schließen"
-#: libsvn_fs_fs/fs_fs.c:453
+#: libsvn_fs_fs/fs_fs.c:465
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2423,7 +2450,7 @@
"Kann nicht in die Prototyp-Revisionsdatei der Transaktion »%s« schreiben, da "
"eine frühere Darstellung zurzeit von diesem Prozess geschrieben wird"
-#: libsvn_fs_fs/fs_fs.c:489
+#: libsvn_fs_fs/fs_fs.c:501
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2432,93 +2459,94 @@
"Kann nicht in die Prototyp-Revisionsdatei der Transaktion »%s« schreiben, da "
"eine frühere Darstellung zurzeit von einem anderen Prozess geschrieben wird"
-#: libsvn_fs_fs/fs_fs.c:496 libsvn_subr/io.c:1532
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Kann keinen exklusiven Zugriff auf Datei »%s« erlangen"
-#: libsvn_fs_fs/fs_fs.c:825 libsvn_fs_fs/fs_fs.c:839
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "Fehlerhafter Kopf in Revisionsdatei gefunden"
-#: libsvn_fs_fs/fs_fs.c:941 libsvn_fs_fs/fs_fs.c:955 libsvn_fs_fs/fs_fs.c:962
-#: libsvn_fs_fs/fs_fs.c:969 libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "Fehlerhafte »text rep offset« Zeile in Knotenrevision"
-#: libsvn_fs_fs/fs_fs.c:1054
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "Fehlendes Feld »kind« in Knotenrevision"
-#: libsvn_fs_fs/fs_fs.c:1085
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "Fehlender »cpath« in Knotenrevision"
-#: libsvn_fs_fs/fs_fs.c:1112 libsvn_fs_fs/fs_fs.c:1118
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "Fehlerhafte »copyroot«-Zeile in Knotenrevision"
-#: libsvn_fs_fs/fs_fs.c:1136 libsvn_fs_fs/fs_fs.c:1142
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "Fehlerhafte »copyfrom«-Zeile in Knotenrevision"
-#: libsvn_fs_fs/fs_fs.c:1251 libsvn_fs_fs/fs_fs.c:3613
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "Versuch, in eine Nicht-Transaktion zu schreiben"
-#: libsvn_fs_fs/fs_fs.c:1335
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "Fehlerhafter Darstellungskopf"
-#: libsvn_fs_fs/fs_fs.c:1359
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "Fehlende Knoten-Id in Knotenrevision"
-#: libsvn_fs_fs/fs_fs.c:1365
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "Beschädigter Knoten-Id in Knotenrevision"
-#: libsvn_fs_fs/fs_fs.c:1410
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "Revisionsdatei hat keinen abschließenden Zeilenumbruch"
-#: libsvn_fs_fs/fs_fs.c:1422
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "Letzte Zeile in der Revisionsdatei ist länger als 64 Zeichen"
-#: libsvn_fs_fs/fs_fs.c:1437
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "Letzte Zeile in der Revisionsdatei enthält kein Leerzeichen"
-#: libsvn_fs_fs/fs_fs.c:1466 libsvn_fs_fs/fs_fs.c:1524 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "Keine Revision %ld"
-#: libsvn_fs_fs/fs_fs.c:1584
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "Fehlerhafte svndiff-Daten in Darstellung"
-#: libsvn_fs_fs/fs_fs.c:1727 libsvn_fs_fs/fs_fs.c:1740
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "Lesen eines svndiff-Fensters las über Ende der Darstellung hinaus"
-#: libsvn_fs_fs/fs_fs.c:1876
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "svndiff-Daten verlangten nicht existierende Quelle"
-#: libsvn_fs_fs/fs_fs.c:1882
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "Von svndiff verlangte Position ist jenseits des Datenstromendes"
-#: libsvn_fs_fs/fs_fs.c:1905 libsvn_fs_fs/fs_fs.c:1922
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "Svndiff Fensterlänge ist beschädigt"
-#: libsvn_fs_fs/fs_fs.c:1970
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2529,108 +2557,127 @@
" Erwartet: %s\n"
" Tatsächlich: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2193 libsvn_fs_fs/fs_fs.c:2206
-#: libsvn_fs_fs/fs_fs.c:2212
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "Verzeichniseintrag beschädigt"
-#: libsvn_fs_fs/fs_fs.c:2551 libsvn_fs_fs/fs_fs.c:2559
-#: libsvn_fs_fs/fs_fs.c:2591 libsvn_fs_fs/fs_fs.c:2611
-#: libsvn_fs_fs/fs_fs.c:2645 libsvn_fs_fs/fs_fs.c:2650
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "Ungültige »changes« Zeile in Rev Datei"
-#: libsvn_fs_fs/fs_fs.c:2584
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "Ungültiger Änderungstyp in Rev Datei"
-#: libsvn_fs_fs/fs_fs.c:2604
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "Ungültiges »text-mod« Flag in Rev Datei"
-#: libsvn_fs_fs/fs_fs.c:2624
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "Ungültiges »prop-mod« Flag in Rev Datei"
-#: libsvn_fs_fs/fs_fs.c:2808
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "Kopieren aus Transaktionen ist nicht erlaubt."
-#: libsvn_fs_fs/fs_fs.c:2864
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Kann Transaktionsverzeichnis in »%s« in Revision %ld nicht anlegen"
-#: libsvn_fs_fs/fs_fs.c:3045 libsvn_fs_fs/fs_fs.c:3052
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "»next-id« Datei beschädigt"
-#: libsvn_fs_fs/fs_fs.c:3139
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "Aufräumen der Transaktion fehlgeschlagen"
-#: libsvn_fs_fs/fs_fs.c:3307
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "Ungültiger Änderungstyp"
-#: libsvn_fs_fs/fs_fs.c:3632
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "Kann Textinhalt im Verzeichnis nicht erzeugen"
-#: libsvn_fs_fs/fs_fs.c:3722 libsvn_fs_fs/fs_fs.c:3727
-#: libsvn_fs_fs/fs_fs.c:3734
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "Aktuelle Datei beschädigt"
-#: libsvn_fs_fs/fs_fs.c:4023 libsvn_subr/io.c:2663 svn/util.c:236
-#: svn/util.c:251 svn/util.c:275
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
+#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "Kann Status von »%s« nicht ermitteln"
-#: libsvn_fs_fs/fs_fs.c:4027
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "Kann »chmod '%s'« nicht durchführen"
-#: libsvn_fs_fs/fs_fs.c:4167
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "Kann FSFS Projektarchiv Mutex nicht greifen"
-#: libsvn_fs_fs/fs_fs.c:4181
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "Kann FSFS Projektarchiv Mutex nicht loslassen"
-#: libsvn_fs_fs/fs_fs.c:4299
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "Transaktion ist veraltet"
-#: libsvn_fs_fs/fs_fs.c:4599
+#: libsvn_fs_fs/fs_fs.c:4807
+#, fuzzy
+msgid "Recovery encountered a non-directory node"
+msgstr "Versuchte, Eintrag in einem *nicht* Verzeichnisknoten zu setzen"
+
+#: libsvn_fs_fs/fs_fs.c:4829
+msgid "Recovery encountered a deltified directory representation"
+msgstr ""
+
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "Keine solche Transaktion"
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "Kann »lock/entries« Hashdatei »%s« nicht schreiben"
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "Kann »lock/entries« Hashdatei »%s« nicht zerlegen"
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "Pfad »%s« existiert nicht in HEAD-Revision"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "Sperren fehlgeschlagen: eine neuere Version von »%s« existiert"
+#: libsvn_fs_util/merge-info-sqlite-index.c:102
+msgid "Merge Tracking schema format not set"
+msgstr ""
+
+#: libsvn_fs_util/merge-info-sqlite-index.c:107
+#, c-format
+msgid "Merge Tracking schema format %d not recognized"
+msgstr ""
+
#: libsvn_ra/ra_loader.c:213
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
@@ -2638,27 +2685,27 @@
"Version des ZM »%s« stimmt nicht überein: gefunden %d.%d.%d%s, erwartet %d.%"
"d.%d%s"
-#: libsvn_ra/ra_loader.c:285
+#: libsvn_ra/ra_loader.c:397
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Unbekanntes URL-Schema für »%s«"
-#: libsvn_ra/ra_loader.c:336
+#: libsvn_ra/ra_loader.c:448
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "»%s« ist nicht im selben Projektarchiv wie »%s«"
-#: libsvn_ra/ra_loader.c:707
+#: libsvn_ra/ra_loader.c:945
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - behandelt Schema »%s«\n"
-#: libsvn_ra/ra_loader.c:793
+#: libsvn_ra/ra_loader.c:1031
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Unbekanntes URL-Schema »%s«"
-#: libsvn_ra_dav/commit.c:225
+#: libsvn_ra_dav/commit.c:222
msgid ""
"Could not fetch the Version Resource URL (needed during an import or when it "
"is missing from the local, cached props)"
@@ -2667,22 +2714,22 @@
"oder, falls sie in den lokalen, zwischengespeicherten Eigenschaften fehlt, "
"benötigt)"
-#: libsvn_ra_dav/commit.c:462 libsvn_ra_serf/commit.c:374
+#: libsvn_ra_dav/commit.c:459 libsvn_ra_serf/commit.c:374
#: libsvn_ra_serf/commit.c:435
#, c-format
msgid "Your file or directory '%s' is probably out-of-date"
msgstr "Datei oder Verzeichnis »%s« ist wahrscheinlich veraltet"
-#: libsvn_ra_dav/commit.c:470
+#: libsvn_ra_dav/commit.c:467
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "Die CHECKOUT-Antwort enthielt keinen »Location:« Kopf"
-#: libsvn_ra_dav/commit.c:997 libsvn_ra_serf/commit.c:1403
+#: libsvn_ra_dav/commit.c:994 libsvn_ra_serf/commit.c:1427
#, c-format
msgid "File '%s' already exists"
msgstr "Datei »%s« existiert bereits"
-#: libsvn_ra_dav/commit.c:1115
+#: libsvn_ra_dav/commit.c:1112
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "Konnte svndiff nicht in Temporärdatei schreiben"
@@ -2699,7 +2746,7 @@
msgid "Could not save file"
msgstr "Konnte Datei nicht sichern"
-#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:909
+#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:920
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2763,7 +2810,7 @@
msgid "Unknown XML encoding: '%s'"
msgstr "Unbekannte XML Kodierung: »%s«"
-#: libsvn_ra_dav/fetch.c:2940
+#: libsvn_ra_dav/fetch.c:2952
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr ""
@@ -2974,23 +3021,23 @@
msgid "SSL is not supported"
msgstr "SSL wird nicht unterstützt"
-#: libsvn_ra_dav/session.c:819
+#: libsvn_ra_dav/session.c:825
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr ""
"Ungültige Konfiguration: Zertifikatsdatei »%s« kann nicht geladen werden"
-#: libsvn_ra_dav/session.c:928
+#: libsvn_ra_dav/session.c:934
msgid "The UUID property was not found on the resource or any of its parents"
msgstr ""
"Die UUID Eigenschaft wurde weder auf der Ressource noch ihren Eltern "
"gefunden."
-#: libsvn_ra_dav/session.c:936
+#: libsvn_ra_dav/session.c:942
msgid "Please upgrade the server to 0.19 or later"
msgstr "Bitte aktualisieren Sie den Server auf Version 0.19 oder neuer"
-#: libsvn_ra_dav/session.c:1002
+#: libsvn_ra_dav/session.c:1009
#, c-format
msgid "Unsupported RA loader version (%d) for ra_dav"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_dav"
@@ -3064,8 +3111,8 @@
msgid "%s request failed on '%s'"
msgstr "%s Anfrage fehlgeschlagen auf »%s«"
-#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:588
-#: libsvn_wc/update_editor.c:2603
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -3078,15 +3125,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "Modul zum Zugriff auf ein Projektarchiv auf der lokalen Festplatte"
-#: libsvn_ra_local/ra_plugin.c:285
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "Kann keine ra_local Verbindung zu einer URL aufbauen"
-#: libsvn_ra_local/ra_plugin.c:1392
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_local"
@@ -3112,7 +3159,7 @@
msgstr "Projektarchiv »%s« kann nicht geöffnet werden"
#: libsvn_ra_serf/commit.c:367 libsvn_ra_serf/commit.c:428
-#: libsvn_repos/commit.c:393
+#: libsvn_repos/commit.c:375
#, c-format
msgid "Path '%s' not present"
msgstr "Pfad »%s« existiert nicht"
@@ -3122,7 +3169,7 @@
msgid "Failed writing updated file"
msgstr "Fehler beim Schreiben der aktualisierten Datei"
-#: libsvn_ra_serf/commit.c:1216
+#: libsvn_ra_serf/commit.c:1240
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr ""
@@ -3196,204 +3243,227 @@
msgstr ""
"Auf ein Projektarchiv über das WebDAV-Protokoll mittels »serf« zugreifen."
-#: libsvn_ra_serf/serf.c:155
+#: libsvn_ra_serf/serf.c:161
#, c-format
msgid "Could not lookup hostname: %s://%s"
msgstr "Konnte Rechnernamen nicht nachschlagen: %s://%s"
-#: libsvn_ra_serf/serf.c:732
+#: libsvn_ra_serf/serf.c:737
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_serf"
-#: libsvn_ra_serf/update.c:2116
+#: libsvn_ra_serf/update.c:2155
#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "Fehler beim Holen des REPORT (%d)"
-#: libsvn_ra_serf/util.c:755
+#: libsvn_ra_serf/util.c:874
#, fuzzy
msgid "Unspecified error message"
msgstr "Verwende PAR als Logmeldung"
-#: libsvn_ra_serf/util.c:816
+#: libsvn_ra_serf/util.c:935
msgid "Premature EOF seen from server"
msgstr "Vorzeitiges EOF vom Server"
-#: libsvn_ra_svn/client.c:115
+#: libsvn_ra_svn/client.c:124
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Unbekannter Hostname »%s«"
-#: libsvn_ra_svn/client.c:127
+#: libsvn_ra_svn/client.c:136
#, c-format
msgid "Can't create socket"
msgstr "Kann Verbindung nicht erzeugen"
-#: libsvn_ra_svn/client.c:131
+#: libsvn_ra_svn/client.c:140
#, c-format
msgid "Can't connect to host '%s'"
msgstr "Kann nicht mit Host »%s« verbinden"
-#: libsvn_ra_svn/client.c:152
-msgid "Proplist element not a list"
-msgstr "Eigenschaftselement ist keine Liste"
-
-#: libsvn_ra_svn/client.c:176
+#: libsvn_ra_svn/client.c:163
msgid "Prop diffs element not a list"
msgstr "Eigenschafts-Diff Element ist keine Liste"
-#: libsvn_ra_svn/client.c:214
+#: libsvn_ra_svn/client.c:201
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "Unbekannter Knotentyp »%s« vom Server"
-#: libsvn_ra_svn/client.c:365
+#: libsvn_ra_svn/client.c:357
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Undefiniertes Tunnelschema »%s«"
-#: libsvn_ra_svn/client.c:382
+#: libsvn_ra_svn/client.c:374
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "Für Tunnelschema %s muss die Umgebungsvariable %s definiert sein"
-#: libsvn_ra_svn/client.c:393
+#: libsvn_ra_svn/client.c:385
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Kann Anweisung »%s« nicht zerlegen"
-#: libsvn_ra_svn/client.c:424
+#: libsvn_ra_svn/client.c:416
#, c-format
msgid "Error in child process: %s"
msgstr "Fehler in Kindprozess: %s"
-#: libsvn_ra_svn/client.c:448
+#: libsvn_ra_svn/client.c:440
#, c-format
msgid "Can't create tunnel"
msgstr "Kann Tunnel nicht erzeugen"
-#: libsvn_ra_svn/client.c:486
+#: libsvn_ra_svn/client.c:478
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "Illegale svn Projektarchiv URL »%s«"
-#: libsvn_ra_svn/client.c:543
+#: libsvn_ra_svn/client.c:535
#, c-format
msgid "Server requires minimum version %d"
msgstr "Server erfordert mindestens Version %d"
-#: libsvn_ra_svn/client.c:589
+#: libsvn_ra_svn/client.c:584
msgid "Impossibly long repository root from server"
msgstr "Unmöglich lange Projektarchivbasis vom Server"
-#: libsvn_ra_svn/client.c:600
+#: libsvn_ra_svn/client.c:595
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Modul zum Zugriff auf ein Projektarchiv über das svn-Netzwerkprotokoll"
-#: libsvn_ra_svn/client.c:748
+#: libsvn_ra_svn/client.c:743
msgid "Server did not send repository root"
msgstr "Server gab keine Projektarchivbasis zurück"
-#: libsvn_ra_svn/client.c:889
+#: libsvn_ra_svn/client.c:816
+msgid ""
+"Server doesn't support setting arbitrary revision properties during commit"
+msgstr ""
+
+#: libsvn_ra_svn/client.c:900
msgid "Non-string as part of file contents"
msgstr "Ein Teil des Dateiinhaltes ist keine Zeichenkette"
-#: libsvn_ra_svn/client.c:988
+#: libsvn_ra_svn/client.c:999
msgid "Dirlist element not a list"
msgstr "Verzeichniseintrag ist keine Liste"
-#: libsvn_ra_svn/client.c:1145
+#: libsvn_ra_svn/client.c:1060
+#, fuzzy
+msgid "Merge info element is not a list"
+msgstr "Eigenschafts-Diff Element ist keine Liste"
+
+#: libsvn_ra_svn/client.c:1219
msgid "Log entry not a list"
msgstr "Logeintrag ist keine Liste"
-#: libsvn_ra_svn/client.c:1158
+#: libsvn_ra_svn/client.c:1232
msgid "Changed-path entry not a list"
msgstr "Eintrag für geänderte Pfade ist keine Liste"
-#: libsvn_ra_svn/client.c:1234
+#: libsvn_ra_svn/client.c:1308
msgid "'stat' not implemented"
msgstr "»stat« nicht implementiert"
-#: libsvn_ra_svn/client.c:1291
+#: libsvn_ra_svn/client.c:1365
msgid "'get-locations' not implemented"
msgstr "»get-locations« nicht implementiert"
-#: libsvn_ra_svn/client.c:1303
+#: libsvn_ra_svn/client.c:1377
msgid "Location entry not a list"
msgstr "Ortseintrag ist keine Liste"
-#: libsvn_ra_svn/client.c:1353
+#: libsvn_ra_svn/client.c:1427
msgid "'get-file-revs' not implemented"
msgstr "»get-file-revs« nicht implementiert"
-#: libsvn_ra_svn/client.c:1366
+#: libsvn_ra_svn/client.c:1440
msgid "Revision entry not a list"
msgstr "Revisionseintrag ist keine Liste"
-#: libsvn_ra_svn/client.c:1379 libsvn_ra_svn/client.c:1404
+#: libsvn_ra_svn/client.c:1453 libsvn_ra_svn/client.c:1478
msgid "Text delta chunk not a string"
msgstr "Text-Deltastück ist kein String"
-#: libsvn_ra_svn/client.c:1416
+#: libsvn_ra_svn/client.c:1490
msgid "The get-file-revs command didn't return any revisions"
msgstr "Der »get-file-revs« Befehl gab keine Revisionen zurück"
-#: libsvn_ra_svn/client.c:1464
+#: libsvn_ra_svn/client.c:1538
msgid "Server doesn't support the lock command"
msgstr "Server unterstützt das Kommando »lock« nicht"
-#: libsvn_ra_svn/client.c:1528
+#: libsvn_ra_svn/client.c:1602
msgid "Server doesn't support the unlock command"
msgstr "Server unterstützt das Kommando »unlock« nicht"
-#: libsvn_ra_svn/client.c:1625
+#: libsvn_ra_svn/client.c:1699
msgid "Lock response not a list"
msgstr "Antwort beim Sperren ist keine Liste"
-#: libsvn_ra_svn/client.c:1639
+#: libsvn_ra_svn/client.c:1713
msgid "Unknown status for lock command"
msgstr "Unbekannter Status für Sperrbefehl"
-#: libsvn_ra_svn/client.c:1661
+#: libsvn_ra_svn/client.c:1735
msgid "Didn't receive end marker for lock responses"
msgstr "Keine Endemarke für Sperrantworten erhalten"
-#: libsvn_ra_svn/client.c:1748
+#: libsvn_ra_svn/client.c:1822
msgid "Unlock response not a list"
msgstr "Antwort beim Entsperren ist keine Liste"
-#: libsvn_ra_svn/client.c:1762
+#: libsvn_ra_svn/client.c:1836
msgid "Unknown status for unlock command"
msgstr "Unbekannter Status für Entsperrbefehl"
-#: libsvn_ra_svn/client.c:1783
+#: libsvn_ra_svn/client.c:1857
msgid "Didn't receive end marker for unlock responses"
msgstr "Keine Endemarke für Entsperrantworten erhalten"
-#: libsvn_ra_svn/client.c:1807 libsvn_ra_svn/client.c:1835
+#: libsvn_ra_svn/client.c:1881 libsvn_ra_svn/client.c:1909
msgid "Server doesn't support the get-lock command"
msgstr "Server unterstützt das Kommando »get-lock« nicht"
-#: libsvn_ra_svn/client.c:1848
+#: libsvn_ra_svn/client.c:1922
msgid "Lock element not a list"
msgstr "Sperrelement ist keine Liste"
-#: libsvn_ra_svn/client.c:1871
+#: libsvn_ra_svn/client.c:1945
msgid "Server doesn't support the replay command"
msgstr "Server unterstützt das Kommando »replay« nicht"
-#: libsvn_ra_svn/client.c:1935
+#: libsvn_ra_svn/client.c:2010
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Nicht unterstützte Zugriffsmodul-Laderversion (%d) für ra_svn"
#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/sasl_auth.c:389 libsvn_ra_svn/sasl_auth.c:444
-#: libsvn_ra_svn/simple_auth.c:61
+#: libsvn_ra_svn/cyrus_auth.c:437 libsvn_ra_svn/cyrus_auth.c:484
+#: libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "Unerwartete Serverantwort bei Anmeldung"
+#: libsvn_ra_svn/cyrus_auth.c:171 svnserve/cyrus_auth.c:104
+#: svnserve/cyrus_auth.c:114
+#, c-format
+msgid "Could not initialize the SASL library"
+msgstr "Konnte die SASL-Bibliothek nicht initialisieren"
+
+#: libsvn_ra_svn/cyrus_auth.c:824 libsvn_ra_svn/internal_auth.c:57
+#: libsvn_ra_svn/internal_auth.c:110
+#, c-format
+msgid "Authentication error from server: %s"
+msgstr "Anmeldefehler von Server: %s"
+
+#: libsvn_ra_svn/cyrus_auth.c:828
+#, fuzzy
+msgid "Can't get username or password"
+msgstr "Kein Passwort erhalten"
+
#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
msgstr "Ungültige Datei- oder Verzeichnismarke während der Bearbeitung"
@@ -3419,11 +3489,16 @@
msgid "Apply-textdelta not active"
msgstr "Text-Delta Anwendung nicht aktiv"
-#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:845
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:896
#, c-format
msgid "Unknown command '%s'"
msgstr "Unbekannter Befehl »%s«"
+#: libsvn_ra_svn/internal_auth.c:97 libsvn_subr/prompt.c:156
+#, c-format
+msgid "Can't get password"
+msgstr "Kein Passwort erhalten"
+
#: libsvn_ra_svn/marshal.c:86
msgid "Capability entry is not a word"
msgstr "Fähigkeitseintrag ist kein Wort"
@@ -3433,62 +3508,35 @@
msgid "Connection closed unexpectedly"
msgstr "Netzwerkverbindung wurde unerwartet geschlossen"
-#: libsvn_ra_svn/marshal.c:509
+#: libsvn_ra_svn/marshal.c:536
msgid "String length larger than maximum"
msgstr "Stringlänge größer als Maximum"
-#: libsvn_ra_svn/marshal.c:546
+#: libsvn_ra_svn/marshal.c:573
msgid "Too many nested items"
msgstr "Zu viele verschachtelte Objekte"
-#: libsvn_ra_svn/marshal.c:565
+#: libsvn_ra_svn/marshal.c:592
msgid "Number is larger than maximum"
msgstr "Zahl ist größer als Maximum"
-#: libsvn_ra_svn/marshal.c:768
+#: libsvn_ra_svn/marshal.c:796
+msgid "Proplist element not a list"
+msgstr "Eigenschaftselement ist keine Liste"
+
+#: libsvn_ra_svn/marshal.c:819
msgid "Empty error list"
msgstr "Leere Fehlerliste"
-#: libsvn_ra_svn/marshal.c:777
+#: libsvn_ra_svn/marshal.c:828
msgid "Malformed error list"
msgstr "Fehlerhafte Fehlerliste"
-#: libsvn_ra_svn/marshal.c:816
+#: libsvn_ra_svn/marshal.c:867
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "Unbekannter Status »%s« in Antwort auf Befehl"
-#: libsvn_ra_svn/sasl_auth.c:179 svnserve/sasl_auth.c:104
-#: svnserve/sasl_auth.c:114
-#, c-format
-msgid "Could not initialize the SASL library"
-msgstr "Konnte die SASL-Bibliothek nicht initialisieren"
-
-#: libsvn_ra_svn/sasl_auth.c:279
-#, fuzzy
-msgid "Can't get user name"
-msgstr "Kann keinen Dateinamen holen"
-
-#: libsvn_ra_svn/sasl_auth.c:286 libsvn_ra_svn/simple_auth.c:97
-#: libsvn_subr/prompt.c:156
-#, c-format
-msgid "Can't get password"
-msgstr "Kein Passwort erhalten"
-
-#: libsvn_ra_svn/sasl_auth.c:293
-msgid "Unhandled SASL interaction"
-msgstr "Nicht behandelte SASL-Interaktion"
-
-#: libsvn_ra_svn/sasl_auth.c:761 libsvn_ra_svn/simple_auth.c:58
-#: libsvn_ra_svn/simple_auth.c:110
-#, c-format
-msgid "Authentication error from server: %s"
-msgstr "Anmeldefehler von Server: %s"
-
-#: libsvn_ra_svn/simple_auth.c:117
-msgid "Cannot negotiate authentication mechanism"
-msgstr "Kann Anmeldungsmechanismus nicht aushandeln"
-
#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
@@ -3504,22 +3552,22 @@
msgid "Can't get socket timeout"
msgstr "Kann Verbindung nicht erzeugen"
-#: libsvn_repos/commit.c:128
+#: libsvn_repos/commit.c:125
#, c-format
msgid "Out of date: '%s' in transaction '%s'"
msgstr "Veraltet: »%s« in Transaktion »%s«"
-#: libsvn_repos/commit.c:292 libsvn_repos/commit.c:453
+#: libsvn_repos/commit.c:274 libsvn_repos/commit.c:435
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "Quellpfad, aber keine Quellrevision für »%s« erhalten"
-#: libsvn_repos/commit.c:324 libsvn_repos/commit.c:484
+#: libsvn_repos/commit.c:306 libsvn_repos/commit.c:466
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "Quell URL »%s« stammt aus einem fremden Projektarchiv"
-#: libsvn_repos/commit.c:609
+#: libsvn_repos/commit.c:591
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3583,7 +3631,7 @@
msgid "Commit succeeded, but post-commit hook failed"
msgstr "Übertragen erfolgreich, aber die »post-commit«-Aktion schlug fehl"
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_repos/fs-wrap.c:183
#, c-format
msgid ""
"Storage of non-regular property '%s' is disallowed through the repository "
@@ -3592,19 +3640,19 @@
"Das Speichern der speziellen Eigenschaft »%s« wird vom Projektarchiv "
"verhindert und könnte auf einen Bug in Ihrem Client hindeuten"
-#: libsvn_repos/fs-wrap.c:303
+#: libsvn_repos/fs-wrap.c:329
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr ""
"Schreiben abgelehnt: Keine Berechtigung, alles von Revision %ld einzulesen."
-#: libsvn_repos/fs-wrap.c:507
+#: libsvn_repos/fs-wrap.c:533
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr ""
"Kann Pfad »%s« nicht freigeben, kein angemeldeter Benutzername verfügbar"
-#: libsvn_repos/fs-wrap.c:521
+#: libsvn_repos/fs-wrap.c:547
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr "Entsperren erfolgreich, aber die »post-unlock« Aktion schlug fehl"
@@ -3785,7 +3833,7 @@
msgid " done.\n"
msgstr " erledigt.\n"
-#: libsvn_repos/load.c:1231
+#: libsvn_repos/load.c:1233
#, c-format
msgid ""
"\n"
@@ -3796,7 +3844,7 @@
"------- Übertrage Revision %ld >>>\n"
"\n"
-#: libsvn_repos/load.c:1237
+#: libsvn_repos/load.c:1239
#, c-format
msgid ""
"\n"
@@ -3812,36 +3860,46 @@
msgid "'%s' not found in filesystem"
msgstr "»%s« nicht im Dateisystem gefunden"
-#: libsvn_repos/replay.c:367
+#: libsvn_repos/replay.c:387
#, c-format
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "Pfad »%s« ist weder eine Datei noch ein Verzeichnis"
-#: libsvn_repos/reporter.c:602
+#: libsvn_repos/reporter.c:222
+#, fuzzy, c-format
+msgid "Invalid depth (%s) for path '%s'"
+msgstr "Ungültiger Quellpfad einer Kopie: »%s«"
+
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "Arbeitskopie Pfad »%s« existiert nicht im Projektarchiv"
-#: libsvn_repos/reporter.c:836
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "Keine Berechtigung die Basis der Änderung zu öffnen"
-#: libsvn_repos/reporter.c:855
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "Zielpfad existiert nicht"
-#: libsvn_repos/reporter.c:862
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "Kann ein Verzeichnis nicht innerhalb sich selbst ersetzen"
-#: libsvn_repos/reporter.c:905
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "Ungültiger Report für oberste Ebene der Arbeitskopie"
-#: libsvn_repos/reporter.c:920
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "Zwei oberste Reports ohne Zielangabe"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "Nicht unterstützter Knotentyp für Pfad »%s«"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -3887,35 +3945,35 @@
msgid "Creating conf directory"
msgstr "Erzeuge Konfigurationsverzeichnis"
-#: libsvn_repos/repos.c:1482
+#: libsvn_repos/repos.c:1484
msgid "Creating svnserve.conf file"
msgstr "Erzeuge Datei »svnserve.conf«"
-#: libsvn_repos/repos.c:1507
+#: libsvn_repos/repos.c:1509
msgid "Creating passwd file"
msgstr "Erzeuge Datei »passwd«"
-#: libsvn_repos/repos.c:1567
+#: libsvn_repos/repos.c:1579
msgid "Creating authz file"
msgstr "Erzeuge Datei »authz«"
-#: libsvn_repos/repos.c:1600
+#: libsvn_repos/repos.c:1612
msgid "Could not create top-level directory"
msgstr "Konnte oberstes Verzeichnis nicht erzeugen"
-#: libsvn_repos/repos.c:1604
+#: libsvn_repos/repos.c:1616
msgid "Creating DAV sandbox dir"
msgstr "Erzeuge Verzeichnis für DAV-Sandkasten"
-#: libsvn_repos/repos.c:1685
+#: libsvn_repos/repos.c:1697
msgid "Error opening db lockfile"
msgstr "Fehler beim Öffnen der Datenbank-Sperrdatei"
-#: libsvn_repos/repos.c:1722
+#: libsvn_repos/repos.c:1734
msgid "Repository creation failed"
msgstr "Anlegen des Projektarchivs fehlgeschlagen"
-#: libsvn_repos/repos.c:1803
+#: libsvn_repos/repos.c:1815
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "Erwartetes Format des Projektarchivs »%d« oder »%d«; gefunden »%d«"
@@ -3939,7 +3997,7 @@
msgid "Unreadable path encountered; access denied"
msgstr "Nichtlesbarer Pfad angetroffen; Zugriff verweigert"
-#: libsvn_subr/cmdline.c:481
+#: libsvn_subr/cmdline.c:493
#, c-format
msgid "Error initializing command line arguments"
msgstr "Fehler beim Initialisieren der Kommandozeilenparameter"
@@ -4016,189 +4074,200 @@
msgid "Can't check path '%s'"
msgstr "Kann Pfad »%s« nicht prüfen"
-#: libsvn_subr/io.c:377 libsvn_subr/io.c:508
+#: libsvn_subr/io.c:377
#, c-format
msgid "Can't open '%s'"
msgstr "Kann »%s« nicht öffnen"
-#: libsvn_subr/io.c:399 libsvn_subr/io.c:521
+#: libsvn_subr/io.c:399 libsvn_subr/io.c:522
#, c-format
msgid "Unable to make name for '%s'"
msgstr "Kann Namen für »%s« nicht erstellen"
-#: libsvn_subr/io.c:525 libsvn_subr/io.c:579 libsvn_subr/io.c:607
+#: libsvn_subr/io.c:509
+#, fuzzy, c-format
+msgid "Can't create symbolic link '%s'"
+msgstr "Kann Verzeichnis »%s« nicht anlegen"
+
+#: libsvn_subr/io.c:526 libsvn_subr/io.c:580 libsvn_subr/io.c:608
msgid "Symbolic links are not supported on this platform"
msgstr "Symbolische Verweise werden auf dieser Plattform nicht unterstützt"
-#: libsvn_subr/io.c:558
+#: libsvn_subr/io.c:559
#, c-format
msgid "Can't read contents of link"
msgstr "Kann Inhalt des Verweises nicht lesen"
-#: libsvn_subr/io.c:620
+#: libsvn_subr/io.c:621
#, c-format
msgid "Can't find a temporary directory"
msgstr "Kann temporäres Verzeichnis nicht finden"
-#: libsvn_subr/io.c:753
+#: libsvn_subr/io.c:715
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "Kann »%s« nicht nach »%s« kopieren"
-#: libsvn_subr/io.c:787
+#: libsvn_subr/io.c:767
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "Kann Berechtigungen auf »%s« nicht setzen"
-#: libsvn_subr/io.c:809
+#: libsvn_subr/io.c:789
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "Kann »%s« nicht an »%s« anhängen"
-#: libsvn_subr/io.c:843
+#: libsvn_subr/io.c:823
#, c-format
msgid "Source '%s' is not a directory"
msgstr "Quelle »%s« ist kein Verzeichnis"
-#: libsvn_subr/io.c:849
+#: libsvn_subr/io.c:829
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "Ziel »%s« ist kein Verzeichnis"
-#: libsvn_subr/io.c:855
+#: libsvn_subr/io.c:835
#, c-format
msgid "Destination '%s' already exists"
msgstr "Ziel »%s« existiert bereits"
-#: libsvn_subr/io.c:924 libsvn_subr/io.c:1821 libsvn_subr/io.c:1872
-#: libsvn_subr/io.c:1935
+#: libsvn_subr/io.c:904 libsvn_subr/io.c:1830 libsvn_subr/io.c:1881
+#: libsvn_subr/io.c:1944
#, c-format
msgid "Can't read directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht lesen"
-#: libsvn_subr/io.c:929 libsvn_subr/io.c:1826 libsvn_subr/io.c:1877
-#: libsvn_subr/io.c:1940 libsvn_subr/io.c:2987
+#: libsvn_subr/io.c:909 libsvn_subr/io.c:1835 libsvn_subr/io.c:1886
+#: libsvn_subr/io.c:1949 libsvn_subr/io.c:3114
#, c-format
msgid "Error closing directory '%s'"
msgstr "Fehler beim Schließen von Verzeichnis »%s«"
-#: libsvn_subr/io.c:955
+#: libsvn_subr/io.c:935
#, c-format
msgid "Can't make directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht anlegen"
-#: libsvn_subr/io.c:1042
+#: libsvn_subr/io.c:1022
#, c-format
msgid "Can't set access time of '%s'"
msgstr "Kann Zugriffszeit von »%s« nicht setzen"
-#: libsvn_subr/io.c:1182
+#: libsvn_subr/io.c:1162
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr ""
"Kann die Standardberechtigungen für Datei in »%s« nicht holen (Dateistatus)"
-#: libsvn_subr/io.c:1193
+#: libsvn_subr/io.c:1173
#, c-format
msgid "Can't open file at '%s'"
msgstr "Kann Datei in »%s« nicht öffnen"
-#: libsvn_subr/io.c:1197
+#: libsvn_subr/io.c:1177
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr "Kann die Berechtigungen für Datei in »%s« nicht holen (Dateistatus)"
-#: libsvn_subr/io.c:1236 libsvn_subr/io.c:1331
+#: libsvn_subr/io.c:1216 libsvn_subr/io.c:1311
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "Kann die Zugriffsrechte der Datei »%s« nicht ändern"
-#: libsvn_subr/io.c:1371
+#: libsvn_subr/io.c:1351
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "Kann den Schreibschutz der Datei »%s« nicht setzen"
-#: libsvn_subr/io.c:1403
+#: libsvn_subr/io.c:1383
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "Kann den Schreibschutz der Datei »%s« nicht aufheben"
-#: libsvn_subr/io.c:1447
+#: libsvn_subr/io.c:1427
#, c-format
msgid "Error getting UID of process"
msgstr "Fehler beim Ermitteln der Prozess-UID"
-#: libsvn_subr/io.c:1528
+#: libsvn_subr/io.c:1508
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "Kann keine gemeinsame Sperre für Datei »%s« erhalten"
-#: libsvn_subr/io.c:1563
+#: libsvn_subr/io.c:1543
#, c-format
msgid "Can't flush file '%s'"
msgstr "Kann Datei »%s« nicht leeren"
-#: libsvn_subr/io.c:1564
+#: libsvn_subr/io.c:1544
#, c-format
msgid "Can't flush stream"
msgstr "Kann Datenstrom nicht leeren"
-#: libsvn_subr/io.c:1576 libsvn_subr/io.c:1593
+#: libsvn_subr/io.c:1556 libsvn_subr/io.c:1573
#, c-format
msgid "Can't flush file to disk"
msgstr "Kann Datei nicht auf Festplatte leeren"
-#: libsvn_subr/io.c:1614
-msgid "Reading from stdin is currently broken, so disabled"
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#, c-format
+msgid "Can't open stdin"
+msgstr "Kann Standardeingabe nicht öffnen"
+
+#: libsvn_subr/io.c:1616
+#, fuzzy
+msgid "Reading from stdin is disallowed"
msgstr ""
"Lesen von der Standardeingabe ist derzeit defekt und deshalb deaktiviert"
-#: libsvn_subr/io.c:1635
+#: libsvn_subr/io.c:1630
#, c-format
msgid "Can't get file name"
msgstr "Kann keinen Dateinamen holen"
-#: libsvn_subr/io.c:1703
+#: libsvn_subr/io.c:1698
#, c-format
msgid "Can't remove file '%s'"
msgstr "Kann Datei »%s« nicht löschen"
-#: libsvn_subr/io.c:1757 libsvn_subr/io.c:2838 libsvn_subr/io.c:2924
+#: libsvn_subr/io.c:1765 libsvn_subr/io.c:2965 libsvn_subr/io.c:3051
#, c-format
msgid "Can't open directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht öffnen"
-#: libsvn_subr/io.c:1802 libsvn_subr/io.c:1832
+#: libsvn_subr/io.c:1811 libsvn_subr/io.c:1841
#, c-format
msgid "Can't remove '%s'"
msgstr "Kann »%s« nicht löschen"
-#: libsvn_subr/io.c:1812
+#: libsvn_subr/io.c:1821
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht zurückspulen"
-#: libsvn_subr/io.c:2004
+#: libsvn_subr/io.c:2013
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "Kann Attribute von Prozess »%s« nicht erzeugen"
-#: libsvn_subr/io.c:2010
+#: libsvn_subr/io.c:2019
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "Kann Kommandotyp von Prozess »%s« nicht setzen "
-#: libsvn_subr/io.c:2022
+#: libsvn_subr/io.c:2031
#, c-format
msgid "Can't set process '%s' directory"
msgstr "Kann Verzeichnis von Prozess »%s« nicht setzen"
-#: libsvn_subr/io.c:2035
+#: libsvn_subr/io.c:2044
#, c-format
msgid "Can't set process '%s' child input"
msgstr "Kann Eingabe des Kindprozesses »%s« nicht setzen"
-#: libsvn_subr/io.c:2042
+#: libsvn_subr/io.c:2051
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "Kann Ausgabe des Kindprozesses »%s« nicht setzen"
@@ -4206,48 +4275,48 @@
# FIXME: Laut Code ist %s der Kindprozess. Müsste es dann nicht
# "Can't set child process '%s' errfile" (oder ganz ohne child) heißen?
# (Es gibt kein child von %s)
-#: libsvn_subr/io.c:2049
+#: libsvn_subr/io.c:2058
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "Kann Fehlerausgabe des Kindprozesses »%s« nicht setzen"
-#: libsvn_subr/io.c:2056
+#: libsvn_subr/io.c:2065
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr ""
"Kann Datei für die Fehlerbehandlung des Kindprozesses »%s« nicht setzen"
-#: libsvn_subr/io.c:2062
+#: libsvn_subr/io.c:2071
#, c-format
msgid "Can't set process '%s' error handler"
msgstr "Kann die Fehlerbehandlung des Prozesses »%s« nicht setzen"
-#: libsvn_subr/io.c:2085
+#: libsvn_subr/io.c:2094
#, c-format
msgid "Can't start process '%s'"
msgstr "Kann Prozess »%s« nicht starten"
-#: libsvn_subr/io.c:2109
+#: libsvn_subr/io.c:2118
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Fehler beim Warten auf Prozess »%s«"
-#: libsvn_subr/io.c:2117
+#: libsvn_subr/io.c:2126
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "Prozess »%s« fehlgeschlagen (Grund %d)"
-#: libsvn_subr/io.c:2124
+#: libsvn_subr/io.c:2133
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "Prozess »%s« hat Fehlerwert %d zurückgegeben"
-#: libsvn_subr/io.c:2235
+#: libsvn_subr/io.c:2244
#, c-format
msgid "'%s' returned %d"
msgstr "»%s« hat %d zurückgegeben"
-#: libsvn_subr/io.c:2358
+#: libsvn_subr/io.c:2367
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4262,130 +4331,158 @@
"%s\n"
"%s"
-#: libsvn_subr/io.c:2411
+#: libsvn_subr/io.c:2494
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "Kann MIME Typ der nicht-Datei »%s« nicht ermitteln"
-#: libsvn_subr/io.c:2478
+#: libsvn_subr/io.c:2584
#, c-format
msgid "Can't open file '%s'"
msgstr "Kann Datei »%s« nicht öffnen"
-#: libsvn_subr/io.c:2514
+#: libsvn_subr/io.c:2620
#, c-format
msgid "Can't close file '%s'"
msgstr "Kann Datei »%s« nicht schließen"
-#: libsvn_subr/io.c:2515
+#: libsvn_subr/io.c:2621
#, c-format
msgid "Can't close stream"
msgstr "Kann Datenstrom nicht schließen"
-#: libsvn_subr/io.c:2525 libsvn_subr/io.c:2549 libsvn_subr/io.c:2562
+#: libsvn_subr/io.c:2631 libsvn_subr/io.c:2655 libsvn_subr/io.c:2668
#, c-format
msgid "Can't read file '%s'"
msgstr "Kann Datei »%s« nicht lesen"
-#: libsvn_subr/io.c:2526 libsvn_subr/io.c:2550 libsvn_subr/io.c:2563
+#: libsvn_subr/io.c:2632 libsvn_subr/io.c:2656 libsvn_subr/io.c:2669
#, c-format
msgid "Can't read stream"
msgstr "Kann nicht aus Datenstrom lesen"
-#: libsvn_subr/io.c:2537
+#: libsvn_subr/io.c:2643
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "Kann keine Attributinformationen aus Datei »%s« lesen"
-#: libsvn_subr/io.c:2538
+#: libsvn_subr/io.c:2644
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Kann keine Attributinformationen aus Datenstrom lesen"
-#: libsvn_subr/io.c:2574
+#: libsvn_subr/io.c:2680
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "Kann Positionszeiger in Datei »%s« nicht setzen"
-#: libsvn_subr/io.c:2575
+#: libsvn_subr/io.c:2681
#, c-format
msgid "Can't set position pointer in stream"
msgstr "Kann Positionszeiger in Datenstrom nicht setzen"
-#: libsvn_subr/io.c:2586 libsvn_subr/io.c:2599
+#: libsvn_subr/io.c:2692 libsvn_subr/io.c:2726
#, c-format
msgid "Can't write to file '%s'"
msgstr "Kann nicht in Datei »%s« schreiben"
-#: libsvn_subr/io.c:2587 libsvn_subr/io.c:2600
+#: libsvn_subr/io.c:2693 libsvn_subr/io.c:2727
#, c-format
msgid "Can't write to stream"
msgstr "Kann nicht in Datenstrom schreiben"
-#: libsvn_subr/io.c:2640
+#: libsvn_subr/io.c:2767
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "Kann Längenzeile nicht aus Datei »%s« lesen"
-#: libsvn_subr/io.c:2644
+#: libsvn_subr/io.c:2771
msgid "Can't read length line in stream"
msgstr "Kann Längenzeile nicht aus Datenstrom lesen"
-#: libsvn_subr/io.c:2691
+#: libsvn_subr/io.c:2818
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Kann »%s« nicht nach »%s« verschieben"
-#: libsvn_subr/io.c:2769
+#: libsvn_subr/io.c:2896
#, c-format
msgid "Can't create directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht anlegen"
-#: libsvn_subr/io.c:2780 libsvn_wc/copy.c:519
+#: libsvn_subr/io.c:2907 libsvn_wc/copy.c:509
#, c-format
msgid "Can't hide directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht verstecken"
-#: libsvn_subr/io.c:2792
+#: libsvn_subr/io.c:2919
#, c-format
msgid "Can't stat directory '%s'"
msgstr "Kann Status von Verzeichnis »%s« nicht ermitteln"
-#: libsvn_subr/io.c:2856
+#: libsvn_subr/io.c:2983
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht entfernen"
-#: libsvn_subr/io.c:2874
+#: libsvn_subr/io.c:3001
#, c-format
msgid "Can't read directory"
msgstr "Kann Verzeichnis nicht lesen"
-#: libsvn_subr/io.c:2943
+#: libsvn_subr/io.c:3070
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "Kann Verzeichniseintrag in »%s« nicht lesen"
-#: libsvn_subr/io.c:3068
+#: libsvn_subr/io.c:3195
#, c-format
msgid "Can't check directory '%s'"
msgstr "Kann Verzeichnis »%s« nicht prüfen"
-#: libsvn_subr/io.c:3090
+#: libsvn_subr/io.c:3217
#, c-format
msgid "Version %d is not non-negative"
msgstr "Version %d ist nicht positiv"
-#: libsvn_subr/io.c:3140
+#: libsvn_subr/io.c:3267
#, c-format
msgid "Reading '%s'"
msgstr "Lese »%s«"
-#: libsvn_subr/io.c:3156
+#: libsvn_subr/io.c:3283
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "Die erste Zeile von »%s« enthält eine Nicht-Ziffer"
+#: libsvn_subr/mergeinfo.c:67
+msgid "Invalid revision number"
+msgstr "Ungültige Revisionsnummer"
+
+#: libsvn_subr/mergeinfo.c:125
+#, fuzzy
+msgid "No revision list found "
+msgstr "Keine Revision %ld"
+
+#: libsvn_subr/mergeinfo.c:135 libsvn_subr/mergeinfo.c:163
+#, fuzzy
+msgid "Invalid character found in revision list"
+msgstr "Ungültige Endrevision %ld"
+
+#: libsvn_subr/mergeinfo.c:169
+#, fuzzy
+msgid "Revision list parsing ended before hitting newline"
+msgstr "Revisionsdatei hat keinen abschließenden Zeilenumbruch"
+
+#: libsvn_subr/mergeinfo.c:187
+msgid "Pathname not terminated by ':'"
+msgstr ""
+
+#: libsvn_subr/mergeinfo.c:195
+#, fuzzy
+msgid "Could not find end of line in revision line"
+msgstr "Konnte Zeit für Revision %ld nicht ermitteln"
+
#: libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
@@ -4409,8 +4506,8 @@
"Gültige Optionen:\n"
#: libsvn_subr/opt.c:424
-msgid " arg"
-msgstr " par"
+msgid " ARG"
+msgstr ""
#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
#, c-format
@@ -4421,28 +4518,28 @@
"»%s«: unbekannter Befehl.\n"
"\n"
-#: libsvn_subr/opt.c:760
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Syntaxfehler bei der Analyse der Revision »%s«"
-#: libsvn_subr/opt.c:837
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL »%s« ist nicht korrekt URI-kodiert"
-#: libsvn_subr/opt.c:843
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL »%s« enthält ein »..« Element"
-#: libsvn_subr/opt.c:872
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Fehler beim Ermitteln der Groß-/Kleinschreibung von »%s«"
# FIXME: Datum ist nicht übersetzbar (Aug 3 2006 statt 3. August 2006)
-#: libsvn_subr/opt.c:974
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4453,7 +4550,7 @@
" übersetzt %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:977
+#: libsvn_subr/opt.c:998
#, fuzzy
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
@@ -4468,36 +4565,31 @@
"entwickelt wurde.\n"
"\n"
-#: libsvn_subr/opt.c:1028 libsvn_subr/opt.c:1069
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Geben Sie »%s help« für weitere Hilfe ein.\n"
-#: libsvn_subr/path.c:1182
+#: libsvn_subr/path.c:1107
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "Konnte den absoluten Pfad von »%s« nicht ermitteln"
-#: libsvn_subr/path.c:1220
+#: libsvn_subr/path.c:1145
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "»%s« ist weder ein Datei- noch ein Verzeichnisname"
-#: libsvn_subr/path.c:1335
+#: libsvn_subr/path.c:1251
#, c-format
msgid "Can't determine the native path encoding"
msgstr "Kann die Zeichencodierung des Pfades nicht ermitteln"
-#: libsvn_subr/path.c:1389
+#: libsvn_subr/path.c:1305
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Ungültiges Steuerzeichen »0x%02x« in Pfad »%s«"
-#: libsvn_subr/prompt.c:97 svnserve/main.c:514
-#, c-format
-msgid "Can't open stdin"
-msgstr "Kann Standardeingabe nicht öffnen"
-
#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
@@ -4579,12 +4671,7 @@
msgid "Passphrase for '%s': "
msgstr "Passphrase für »%s«: "
-#: libsvn_subr/subst.c:1599
-#, c-format
-msgid "'%s' has unsupported special file type '%s'"
-msgstr "»%s« hat nicht unterstützten speziellen Dateityp »%s«"
-
-#: libsvn_subr/subst.c:1737 libsvn_wc/props.c:1499
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Datei »%s« hat inkonsistente Zeilenenden"
@@ -4618,28 +4705,28 @@
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "Kann keinen Zeichenkonverter von »%i« nach »%i« erzeugen"
-#: libsvn_subr/utf.c:515
+#: libsvn_subr/utf.c:522
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr ""
"Kann Zeichenkette nicht von der eigenen Codierung nach »%s« konvertieren:"
-#: libsvn_subr/utf.c:519
+#: libsvn_subr/utf.c:526
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "Kann Zeichenkette nicht von »%s« in die eigene Codierung konvertieren:"
-#: libsvn_subr/utf.c:523
+#: libsvn_subr/utf.c:530
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "Kann Zeichenkette nicht von »%s« nach »%s« konvertieren:"
-#: libsvn_subr/utf.c:529
+#: libsvn_subr/utf.c:536
#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "Kann Zeichenkette nicht von CCSID »%i« nach CCSID »%i« konvertieren"
-#: libsvn_subr/utf.c:574
+#: libsvn_subr/utf.c:581
#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
@@ -4648,7 +4735,7 @@
"Auf sichere Daten »%s« folgte ein nicht-ASCII Byte %d, das nicht von/nach "
"UTF-8 konvertiert werden konnte"
-#: libsvn_subr/utf.c:582
+#: libsvn_subr/utf.c:589
#, c-format
msgid ""
"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
@@ -4656,7 +4743,7 @@
"Ein Nicht-ASCII Zeichen (Kode %d) wurde gefunden, das nicht von/nach UTF-8 "
"konvertiert werden konnte"
-#: libsvn_subr/utf.c:624
+#: libsvn_subr/utf.c:631
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -4695,16 +4782,11 @@
msgid "Malformed XML: %s at line %d"
msgstr "Fehlerhaftes XML: %s in Zeile %d"
-#: libsvn_wc/adm_crawler.c:605
+#: libsvn_wc/adm_crawler.c:635
msgid "Error aborting report"
msgstr "Fehler beim Abbrechen des Berichts"
-#: libsvn_wc/adm_crawler.c:908
-#, c-format
-msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
-msgstr "Prüfsummenfehler für »%s«; erwartet: »%s«, tatsächlich: »%s«"
-
-#: libsvn_wc/adm_crawler.c:919
+#: libsvn_wc/adm_crawler.c:1059
#, c-format
msgid "While preparing '%s' for commit"
msgstr ""
@@ -4740,47 +4822,42 @@
msgid "No such thing as 'base' working copy properties!"
msgstr "Es gibt keine »base«-Eigenschaften der Arbeitskopie"
-#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:51
+#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:52
#, c-format
msgid "'%s' is not a directory"
msgstr "»%s« ist kein Verzeichnis"
-#: libsvn_wc/adm_files.c:1035
-#, c-format
-msgid "No entry for '%s'"
-msgstr "Kein Eintrag für »%s«"
-
-#: libsvn_wc/adm_files.c:1048
+#: libsvn_wc/adm_files.c:1044
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "Revision %ld passt nicht zur existierenden Revision %ld in »%s«"
-#: libsvn_wc/adm_files.c:1056
+#: libsvn_wc/adm_files.c:1052
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "URL »%s« stimmt nicht mit der existierenden URL »%s« in »%s« überein"
-#: libsvn_wc/adm_ops.c:259
+#: libsvn_wc/adm_ops.c:278
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "Unbekannter Knotentyp: »%s«"
-#: libsvn_wc/adm_ops.c:1388
+#: libsvn_wc/adm_ops.c:1403
#, c-format
msgid "'%s' not found"
msgstr "»%s« nicht gefunden"
-#: libsvn_wc/adm_ops.c:1392
+#: libsvn_wc/adm_ops.c:1407
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Nicht unterstützter Knotentyp für Pfad »%s«"
-#: libsvn_wc/adm_ops.c:1422
+#: libsvn_wc/adm_ops.c:1437
#, c-format
msgid "'%s' is already under version control"
msgstr "»%s« befindet sich bereits unter Versionskontrolle"
-#: libsvn_wc/adm_ops.c:1434
+#: libsvn_wc/adm_ops.c:1449
#, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
@@ -4790,7 +4867,7 @@
"Sie die Löschung, aktualisieren Sie das Elternverzeichnis und fügen Sie erst "
"dann »%s« hinzu"
-#: libsvn_wc/adm_ops.c:1451
+#: libsvn_wc/adm_ops.c:1466
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr ""
@@ -4798,7 +4875,7 @@
"nicht\n"
"finden"
-#: libsvn_wc/adm_ops.c:1456
+#: libsvn_wc/adm_ops.c:1471
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr ""
@@ -4806,33 +4883,28 @@
"Löschen\n"
"vorgesehen ist"
-#: libsvn_wc/adm_ops.c:1472
+#: libsvn_wc/adm_ops.c:1487
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr "Die URL »%s« hat eine andere Projektarchiv-Basis als ihr Vorgänger"
-#: libsvn_wc/adm_ops.c:1804
+#: libsvn_wc/adm_ops.c:1820
#, c-format
msgid "Error restoring text for '%s'"
msgstr "Fehler beim Wiederherstellen des Textes für »%s«"
-#: libsvn_wc/adm_ops.c:1935
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "Kann nicht zurücksetzen: »%s« ist nicht unter Versionskontrolle"
-
-#: libsvn_wc/adm_ops.c:1963
+#: libsvn_wc/adm_ops.c:1990
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr "Kann »%s« nicht zurücksetzen: nicht unterstützter Eintragsknotentyp"
-#: libsvn_wc/adm_ops.c:1974
+#: libsvn_wc/adm_ops.c:2001
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr ""
"Kann »%s« nicht zurücksetzen: nicht unterstützter Knotentyp in Arbeitskopie"
-#: libsvn_wc/adm_ops.c:2021
+#: libsvn_wc/adm_ops.c:2048
msgid ""
"Cannot revert addition of current directory; please try again from the "
"parent directory"
@@ -4841,39 +4913,37 @@
"versuchen\n"
"Sie es aus dem Elternverzeichnis erneut"
-#: libsvn_wc/adm_ops.c:2043
+#: libsvn_wc/adm_ops.c:2070
#, c-format
msgid "Unknown or unexpected kind for path '%s'"
msgstr "Unbekannte oder unerwartete Art für Pfad »%s«"
-#: libsvn_wc/adm_ops.c:2205
+#: libsvn_wc/adm_ops.c:2232
#, c-format
msgid "File '%s' has local modifications"
msgstr "Die Datei »%s« hat lokale Änderungen"
+#: libsvn_wc/adm_ops.c:2802
+#, fuzzy, c-format
+msgid "'%s' is not currently a member of changelist '%s'."
+msgstr "Pfad »%s« ist keine Datei"
+
#: libsvn_wc/copy.c:197
#, c-format
msgid "Error during recursive copy of '%s'"
msgstr "Fehler beim rekursiven Kopieren von »%s«"
-#: libsvn_wc/copy.c:362
+#: libsvn_wc/copy.c:356
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "»%s« existiert bereits und ist im Weg"
-#: libsvn_wc/copy.c:374
+#: libsvn_wc/copy.c:368
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "Es existiert bereits ein versioniertes Objekt »%s«"
-#: libsvn_wc/copy.c:384
-#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr ""
-"Kann »%s« nicht kopieren oder verschieben, da es sich nicht unter\n"
-"Versionskontrolle befindet"
-
-#: libsvn_wc/copy.c:393
+#: libsvn_wc/copy.c:383
#, c-format
msgid ""
"Cannot copy or move '%s': it's not in the repository yet; try committing "
@@ -4882,7 +4952,7 @@
"Kann »%s« nicht kopieren oder verschieben, da es sich noch nicht im\n"
"Projektarchiv befindet, versuchen Sie es zuerst zu übertragen"
-#: libsvn_wc/copy.c:672
+#: libsvn_wc/copy.c:658
#, c-format
msgid ""
"Cannot copy or move '%s': it is not in the repository yet; try committing "
@@ -4891,104 +4961,104 @@
"Kann »%s« nicht kopieren oder verschieben, da es sich noch nicht im\n"
"Projektarchiv befindet, versuchen Sie es zuerst zu übertragen"
-#: libsvn_wc/copy.c:799
+#: libsvn_wc/copy.c:776
#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
msgstr ""
"Kann »%s« nicht kopieren, da es nicht aus dem Projektarchiv »%s« stammt\n"
"sondern aus »%s«"
-#: libsvn_wc/copy.c:806
+#: libsvn_wc/copy.c:783
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr "Kann nach »%s« kopieren, da es zum Löschen vorgesehen ist"
-#: libsvn_wc/entries.c:91 libsvn_wc/entries.c:349 libsvn_wc/entries.c:561
-#: libsvn_wc/entries.c:822
+#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:352 libsvn_wc/entries.c:588
+#: libsvn_wc/entries.c:849
#, c-format
msgid "Entry '%s' has invalid '%s' value"
msgstr "Eintrag »%s« hat einen ungültigen »%s« Wert"
-#: libsvn_wc/entries.c:111
+#: libsvn_wc/entries.c:114
msgid "Invalid escape sequence"
msgstr "Ungültige Escape-Sequenz"
-#: libsvn_wc/entries.c:118
+#: libsvn_wc/entries.c:121
msgid "Invalid escaped character"
msgstr "Ungültiges geschütztes Zeichen"
-#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
-#: libsvn_wc/entries.c:203
+#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:194
+#: libsvn_wc/entries.c:206
msgid "Unexpected end of entry"
msgstr "Unerwartetes Ende des Eintrags"
-#: libsvn_wc/entries.c:225
+#: libsvn_wc/entries.c:228
#, c-format
msgid "Invalid value for field '%s'"
msgstr "Ungültiger Wert für Feld »%s«"
-#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:536
+#: libsvn_wc/entries.c:310 libsvn_wc/entries.c:563
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "Eintrag »%s« hat einen ungültigen Knotentyp"
-#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:513
+#: libsvn_wc/entries.c:331 libsvn_wc/entries.c:540
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "Eintrag »%s« hat eine ungültige Projektarchiv-Basis"
-#: libsvn_wc/entries.c:947
+#: libsvn_wc/entries.c:995
#, c-format
msgid "XML parser failed in '%s'"
msgstr "XML Parser in »%s« fehlgeschlagen"
-#: libsvn_wc/entries.c:1006
+#: libsvn_wc/entries.c:1054
msgid "Missing default entry"
msgstr "Fehlender Standardeintrag"
-#: libsvn_wc/entries.c:1011
+#: libsvn_wc/entries.c:1059
msgid "Default entry has no revision number"
msgstr "Standardeintrag hat keine Revisionsnummer"
-#: libsvn_wc/entries.c:1016
+#: libsvn_wc/entries.c:1064
msgid "Default entry is missing URL"
msgstr "Standardeintrag hat keine URL"
-#: libsvn_wc/entries.c:1092
+#: libsvn_wc/entries.c:1140
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "Ungültige Versionszeile in Eintragsdatei von »%s«"
-#: libsvn_wc/entries.c:1109
+#: libsvn_wc/entries.c:1157
msgid "Missing entry terminator"
msgstr "Fehlender Abschluss des Eintrags"
-#: libsvn_wc/entries.c:1112
+#: libsvn_wc/entries.c:1160
msgid "Invalid entry terminator"
msgstr "Ungültiger Abschluss des Eintrags"
-#: libsvn_wc/entries.c:1116
+#: libsvn_wc/entries.c:1164
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "Fehler bei Eintrag %d in Eintragsdatei für »%s«:"
-#: libsvn_wc/entries.c:1212
+#: libsvn_wc/entries.c:1287
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "Beschädigte Arbeitskopie: »%s« hat keinen Standardeintrag"
-#: libsvn_wc/entries.c:1229
+#: libsvn_wc/entries.c:1304
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
msgstr "Beschädigte Arbeitskopie: Verzeichnis »%s« hat einen ungültigen Plan"
-#: libsvn_wc/entries.c:1263
+#: libsvn_wc/entries.c:1338
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
msgstr ""
"Beschädigte Arbeitskopie: »%s« im Verzeichnis »%s« hat einen ungültigen Plan"
-#: libsvn_wc/entries.c:1272
+#: libsvn_wc/entries.c:1347
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4997,7 +5067,7 @@
"Beschädigte Arbeitskopie: »%s« im Verzeichnis »%s« (welches zum Hinzufügen\n"
"eingeplant ist) ist selbst nicht zum Hinzufügen vorgesehen"
-#: libsvn_wc/entries.c:1280
+#: libsvn_wc/entries.c:1355
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5006,7 +5076,7 @@
"Beschädigte Arbeitskopie: »%s« im Verzeichnis »%s« (welches zum Löschen\n"
"eingeplant ist) ist selbst nicht zum Löschen vorgesehen"
-#: libsvn_wc/entries.c:1288
+#: libsvn_wc/entries.c:1363
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -5015,17 +5085,17 @@
"Beschädigte Arbeitskopie: »%s« im Verzeichnis »%s« (welches zum Ersetzen\n"
"eingeplant ist) hat einen ungültigen Übertragungsplan"
-#: libsvn_wc/entries.c:1925
+#: libsvn_wc/entries.c:2010
#, c-format
msgid "No default entry in directory '%s'"
msgstr "Verzeichnis »%s« hat keinen Standardeintrag"
-#: libsvn_wc/entries.c:1980
+#: libsvn_wc/entries.c:2065
#, c-format
msgid "Error writing to '%s'"
msgstr "Fehler beim Schreiben in »%s«"
-#: libsvn_wc/entries.c:2303
+#: libsvn_wc/entries.c:2394
#, c-format
msgid ""
"Can't add '%s' to deleted directory; try undeleting its parent directory "
@@ -5034,7 +5104,7 @@
"Kann »%s« in gelöschtem Verzeichnis nicht hinzufügen; versuchen Sie zuerst,\n"
"das Löschen des Elternverzeichnisses rückgängig zu machen"
-#: libsvn_wc/entries.c:2309
+#: libsvn_wc/entries.c:2400
#, c-format
msgid ""
"Can't replace '%s' in deleted directory; try undeleting its parent directory "
@@ -5043,44 +5113,44 @@
"Kann »%s« in gelöschtem Verzeichnis nicht ersetzen; versuchen Sie zuerst,\n"
"das Löschen des Elternverzeichnisses rückgängig zu machen"
-#: libsvn_wc/entries.c:2318
+#: libsvn_wc/entries.c:2409
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr ""
"»%s« ist als abwesend markiert, es kann daher nicht für die Übertragung\n"
"eingeplant werden"
-#: libsvn_wc/entries.c:2347
+#: libsvn_wc/entries.c:2438
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "Eintrag »%s« ist bereits unter Versionskontrolle"
-#: libsvn_wc/entries.c:2444
+#: libsvn_wc/entries.c:2535
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "Eintrag »%s« hat einen ungültigen Plan"
-#: libsvn_wc/entries.c:2590
+#: libsvn_wc/entries.c:2681
#, c-format
msgid "No such entry: '%s'"
msgstr "Kein Eintrag: »%s«"
-#: libsvn_wc/entries.c:2717
+#: libsvn_wc/entries.c:2814
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "Fehler beim Schreiben der Eintragsdatei für »%s«"
-#: libsvn_wc/entries.c:2759
+#: libsvn_wc/entries.c:2856
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "Verzeichnis »%s« hat keinen »THIS_DIR« Eintrag"
-#: libsvn_wc/entries.c:2888
+#: libsvn_wc/entries.c:2985
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "»%s« hat einen nicht erkannten Knotentyp"
-#: libsvn_wc/entries.c:2925
+#: libsvn_wc/entries.c:3022
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "Unerwartetes »%s« gefunden: Pfad wird als »fehlend« markiert"
@@ -5145,7 +5215,7 @@
msgid "Lock file '%s' is not a regular file"
msgstr "Sperrdatei »%s« ist keine reguläre Datei"
-#: libsvn_wc/log.c:339
+#: libsvn_wc/log.c:355
msgid "Can't move source to dest"
msgstr "Kann Quelle nicht nach Ziel verschieben"
@@ -5153,146 +5223,146 @@
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:502
+#: libsvn_wc/log.c:518
#, c-format
msgid "In directory '%s'"
msgstr "In Verzeichnis »%s«"
-#: libsvn_wc/log.c:527
+#: libsvn_wc/log.c:543
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "Fehlendes »left« Attribut für »%s«"
-#: libsvn_wc/log.c:534
+#: libsvn_wc/log.c:550
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "Fehlendes »right« Attribut für »%s«"
-#: libsvn_wc/log.c:602
+#: libsvn_wc/log.c:618
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "Fehlendes »dest« Attribut für »%s«"
-#: libsvn_wc/log.c:683
+#: libsvn_wc/log.c:699
#, c-format
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "Fehlendes »timestamp« Attribut für »%s«"
-#: libsvn_wc/log.c:779 libsvn_wc/log.c:819
+#: libsvn_wc/log.c:795 libsvn_wc/log.c:835
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "Fehler beim Ermitteln der »letzten Änderungszeit« von »%s«"
-#: libsvn_wc/log.c:830
+#: libsvn_wc/log.c:868
+#, fuzzy, c-format
+msgid "Error getting file size on '%s'"
+msgstr "Fehler beim Ermitteln der »letzten Änderungszeit« von »%s«"
+
+#: libsvn_wc/log.c:886
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "Fehler beim Bearbeiten des Eintrags für »%s«"
-#: libsvn_wc/log.c:856
+#: libsvn_wc/log.c:912
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "Fehler beim Entfernen des Sperreintrags für »%s«"
-#: libsvn_wc/log.c:879
+#: libsvn_wc/log.c:935
#, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "Fehler beim Entfernen der Änderungsliste von Eintrag »%s«"
-#: libsvn_wc/log.c:1011
+#: libsvn_wc/log.c:1067
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "Fehlendes Revisions Attribut für »%s«"
-#: libsvn_wc/log.c:1035
+#: libsvn_wc/log.c:1091
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "Log-Kommando für Verzeichnis »%s« ist falsch platziert"
-#: libsvn_wc/log.c:1231
+#: libsvn_wc/log.c:1287
#, c-format
msgid "Error checking existence of '%s'"
msgstr "Fehler beim Prüfen auf Vorhandensein von »%s«"
-#: libsvn_wc/log.c:1288
+#: libsvn_wc/log.c:1353
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "Fehler beim Ersetzen der Textbasis von »%s«"
-#: libsvn_wc/log.c:1293
+#: libsvn_wc/log.c:1358
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "Fehler beim Ermitteln der »letzten Änderungszeit« von »%s«"
-#: libsvn_wc/log.c:1334
+#: libsvn_wc/log.c:1381
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "Fehler beim Ermitteln der »letzten Änderungszeit« von »%s«"
-#: libsvn_wc/log.c:1349
+#: libsvn_wc/log.c:1401
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "Fehler beim Vergleichen von »%s« und »%s«"
-#: libsvn_wc/log.c:1394 libsvn_wc/log.c:1461
+#: libsvn_wc/log.c:1450 libsvn_wc/log.c:1517
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "Fehler beim Bearbeiten des Eintrags von »%s«"
-#: libsvn_wc/log.c:1516
+#: libsvn_wc/log.c:1572
msgid "Invalid 'format' attribute"
msgstr "Ungültiges »format«-Attribut"
-#: libsvn_wc/log.c:1551
+#: libsvn_wc/log.c:1607
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr ""
"»name«-Attribut fehlt im Log-Eintrag (Eintrag »%s« für Verzeichnis »%s«)"
-#: libsvn_wc/log.c:1622
+#: libsvn_wc/log.c:1678
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "Unbekanntes Log-Datei Element »%s« in »%s«"
-#: libsvn_wc/log.c:1633
+#: libsvn_wc/log.c:1689
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "Fehler beim Bearbeiten des Befehls »%s« in »%s«"
-#: libsvn_wc/log.c:1815
+#: libsvn_wc/log.c:1871
msgid "Couldn't open log"
msgstr "Kann Log-Datei nicht öffnen"
-#: libsvn_wc/log.c:1826
+#: libsvn_wc/log.c:1882
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "Fehler beim Lesen der administrativen Log-Dateien in »%s«"
-#: libsvn_wc/log.c:2440
+#: libsvn_wc/log.c:2524
#, c-format
msgid "Error writing log for '%s'"
msgstr "Fehler beim Schreiben des Logs für »%s«"
-#: libsvn_wc/log.c:2489
-#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "»%s« ist kein Verzeichnis einer Arbeitskopie"
-
-#: libsvn_wc/props.c:92
+#: libsvn_wc/props.c:95
#, c-format
msgid "Can't parse '%s'"
msgstr "Kann »%s« nicht analysieren"
-#: libsvn_wc/props.c:123
+#: libsvn_wc/props.c:126
#, c-format
msgid "Can't write property hash to '%s'"
msgstr "Kann Eigenschafts-Hashwert nicht nach »%s« schreiben"
-#: libsvn_wc/props.c:218
+#: libsvn_wc/props.c:221
#, c-format
msgid "Can't find entry '%s' in '%s'"
msgstr "Kann Eintrag »%s« in »%s« nicht finden"
-#: libsvn_wc/props.c:633
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5301,7 +5371,7 @@
"Versuch, eine neue Eigenschaft »%s« mit dem Wert »%s« anzulegen,\n"
"aber die Eigenschaft existiert bereits mit dem Wert »%s«."
-#: libsvn_wc/props.c:656
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5310,7 +5380,7 @@
"Versuch, die Eigenschaft »%s« von »%s« in »%s« zu ändern,\n"
"aber die Eigenschaft existiert nicht."
-#: libsvn_wc/props.c:684
+#: libsvn_wc/props.c:808
#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
@@ -5318,7 +5388,7 @@
"Versuch, die Eigenschaft »%s« zu löschen, aber der Wert\n"
"wurde von »%s« in »%s« geändert."
-#: libsvn_wc/props.c:702
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5327,52 +5397,52 @@
"Versuch, die Eigenschaft »%s« von »%s« in »%s« zu ändern,\n"
"aber die Eigenschaft existiert bereits mit dem Wert »%s«."
-#: libsvn_wc/props.c:885
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Fehlendes Zeilenende in Datei »wcprops« für »%s«"
-#: libsvn_wc/props.c:1068 libsvn_wc/props.c:1104 libsvn_wc/props.c:1374
-#: libsvn_wc/props.c:1626
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "Konnte Eigenschaften nicht vom Datenträger laden"
-#: libsvn_wc/props.c:1132
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Kann Eigenschafts-Hashwert nicht nach »%s« schreiben"
-#: libsvn_wc/props.c:1366 libsvn_wc/props.c:1535
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "Eigenschaft »%s« ist eine Eintragseigenschaft"
-#: libsvn_wc/props.c:1413
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Kann »%s« nicht für ein Verzeichnis setzen (»%s«)"
-#: libsvn_wc/props.c:1421
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Kann »%s« nicht für eine Datei setzen (»%s«)"
-#: libsvn_wc/props.c:1427
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "»%s« ist weder eine Datei noch ein Verzeichnis"
-#: libsvn_wc/props.c:1508
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Datei »%s« hat die MIME-Typ Eigenschaft »binär«"
-#: libsvn_wc/props.c:2169
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Fehler beim Analysieren der %s Eigenschaft für »%s«: »%s«"
-#: libsvn_wc/props.c:2182
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
@@ -5381,7 +5451,7 @@
"Ungültige %s Eigenschaft auf %s: Ziel enthält ».« oder »..« oder ist ein\n"
"absoluter Pfad"
-#: libsvn_wc/questions.c:120
+#: libsvn_wc/questions.c:121
#, c-format
msgid ""
"Working copy format of '%s' is too old (%d); please check out your working "
@@ -5390,7 +5460,7 @@
"Format der Arbeitskopie »%s« ist zu alt (%d); bitte checken Sie die\n"
"Arbeitskopie erneut aus"
-#: libsvn_wc/questions.c:128
+#: libsvn_wc/questions.c:129
#, c-format
msgid ""
"This client is too old to work with working copy '%s'; please get a newer "
@@ -5399,7 +5469,7 @@
"Der Client ist zu alt, um mit der Arbeitskopie »%s« zusammen zu arbeiten;\n"
"bitte besorgen Sie einen neueren Subversion-Client"
-#: libsvn_wc/questions.c:346
+#: libsvn_wc/questions.c:336
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5410,26 +5480,26 @@
" Erwartet: %s\n"
" Tatsächlich: %s\n"
-#: libsvn_wc/relocate.c:69
+#: libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr "Relocate kann nur den Projektarchivteil der URL ändern"
-#: libsvn_wc/update_editor.c:399
+#: libsvn_wc/update_editor.c:440
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "Kein ».« Eintrag in: »%s«"
-#: libsvn_wc/update_editor.c:923
+#: libsvn_wc/update_editor.c:963
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "Werde lokal verändertes Verzeichnis »%s« nicht löschen"
-#: libsvn_wc/update_editor.c:997
+#: libsvn_wc/update_editor.c:1037
#, c-format
msgid "Error writing log file for '%s'"
msgstr "Fehler beim Schreiben der Logdatei für »%s«"
-#: libsvn_wc/update_editor.c:1101
+#: libsvn_wc/update_editor.c:1144
#, c-format
msgid ""
"Failed to add directory '%s': a non-directory object of the same name "
@@ -5438,7 +5508,7 @@
"Konnte Verzeichnis »%s« nicht hinzufügen: ein nicht-Verzeichnisobjekt mit "
"demselben Namen existiert bereits"
-#: libsvn_wc/update_editor.c:1134
+#: libsvn_wc/update_editor.c:1177
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': an unversioned directory of the same name "
@@ -5447,7 +5517,7 @@
"Konnte das Hinzufügen des Verzeichnisses »%s« nicht erzwingen: ein "
"versioniertes Verzeichnis mit demselben Namen existiert bereits"
-#: libsvn_wc/update_editor.c:1156
+#: libsvn_wc/update_editor.c:1199
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': a versioned directory of the same name already "
@@ -5456,7 +5526,7 @@
"Konnte das Hinzufügen des Verzeichnisses »%s« nicht erzwingen: ein "
"versioniertes Verzeichnis mit demselben Namen existiert bereits"
-#: libsvn_wc/update_editor.c:1167
+#: libsvn_wc/update_editor.c:1210
#, c-format
msgid ""
"Failed to add directory '%s': object of the same name as the administrative "
@@ -5465,7 +5535,7 @@
"Konnte Verzeichnis »%s« nicht hinzufügen, da es denselben Namen wie das\n"
"Administrationsverzeichnis trägt"
-#: libsvn_wc/update_editor.c:1181
+#: libsvn_wc/update_editor.c:1224
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr ""
@@ -5473,11 +5543,11 @@
"nicht\n"
"unterstützt"
-#: libsvn_wc/update_editor.c:1435
+#: libsvn_wc/update_editor.c:1521
msgid "Couldn't do property merge"
msgstr "Konnte Eigenschaften nicht zusammenführen"
-#: libsvn_wc/update_editor.c:1505
+#: libsvn_wc/update_editor.c:1590
#, c-format
msgid ""
"Failed to mark '%s' absent: item of the same name is already scheduled for "
@@ -5487,7 +5557,7 @@
"wurde\n"
"bereits zur Übertragung eingeplant"
-#: libsvn_wc/update_editor.c:1605
+#: libsvn_wc/update_editor.c:1690
#, fuzzy, c-format
msgid ""
"Failed to add file '%s': a file of the same name is already scheduled for "
@@ -5497,7 +5567,7 @@
"zur\n"
"Übertragung eingeplant"
-#: libsvn_wc/update_editor.c:1617
+#: libsvn_wc/update_editor.c:1702
#, c-format
msgid ""
"Failed to add file '%s': a non-file object of the same name already exists"
@@ -5505,62 +5575,70 @@
"Konnte die Datei »%s« nicht hinzufügen: ein nicht-Dateiobjekt mit demselben\n"
"Namen existiert bereits"
-#: libsvn_wc/update_editor.c:1632
+#: libsvn_wc/update_editor.c:1717
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr ""
"Konnte die Datei »%s« nicht hinzufügen: ein Objekt mit demselben Namen\n"
"existiert bereits"
-#: libsvn_wc/update_editor.c:1649
+#: libsvn_wc/update_editor.c:1734
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "Datei »%s« im Verzeichnis »%s« ist keine versionierte Ressource"
-#: libsvn_wc/update_editor.c:1767
+#: libsvn_wc/update_editor.c:1883
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Prüfsummenfehler für »%s«; erwartet: »%s«, tatsächlich: »%s«"
-#: libsvn_wc/update_editor.c:2995
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "»%s« hat keine Informationen über seine Vorgänger"
-#: libsvn_wc/update_editor.c:3158
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Die Quell-URL »%s« hat eine andere Projektarchiv-Basis als »%s«"
-#: libsvn_wc/util.c:83
+#: libsvn_wc/util.c:84
msgid "Unable to make any directories"
msgstr "Kann keinerlei Verzeichnisse erzeugen"
-#: svn/blame-cmd.c:234 svn/list-cmd.c:252
+#: svn/blame-cmd.c:206 svn/list-cmd.c:227
msgid "'verbose' option invalid in XML mode"
msgstr "Option »verbose« ist im XML-Modus ungültig"
-#: svn/blame-cmd.c:246 svn/info-cmd.c:507 svn/list-cmd.c:264
-#: svn/status-cmd.c:268
+#: svn/blame-cmd.c:218 svn/info-cmd.c:511 svn/list-cmd.c:239
+#: svn/status-cmd.c:249
msgid "'incremental' option only valid in XML mode"
msgstr "Option »incremental« ist nur im XML-Modus gültig"
-#: svn/blame-cmd.c:313
+#: svn/blame-cmd.c:280
#, c-format
msgid "Skipping binary file: '%s'\n"
msgstr "Überspringe Binärdatei: »%s«\n"
-#: svn/checkout-cmd.c:129 svn/switch-cmd.c:127
+#: svn/changelist-cmd.c:61 svn/info-cmd.c:477 svn/log-cmd.c:410
+#: svn/revert-cmd.c:58
+#, c-format
+msgid "no such changelist '%s'"
+msgstr "keine solche Änderungsliste »%s«"
+
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "»%s« scheint keine URL zu sein"
-#: svn/copy-cmd.c:126 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66
-#: svn/propedit-cmd.c:200
-msgid "Local, non-commit operations do not take a log message"
+#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66 svn/move-cmd.c:76
+#: svn/propedit-cmd.c:201
+#, fuzzy
+msgid ""
+"Local, non-commit operations do not take a log message or revision properties"
msgstr "Lokale Operationen ohne Übertragung benötigen keine Logmeldung"
-#: svn/diff-cmd.c:117 svnserve/main.c:523
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "Kann Standardausgabe nicht öffnen"
@@ -5581,7 +5659,7 @@
"Ziellisten für Vergleich dürfen nicht gleichzeitig Arbeitskopien und URLs "
"enthalten"
-#: svn/export-cmd.c:84
+#: svn/export-cmd.c:87
msgid ""
"Destination directory exists; please remove the directory or use --force to "
"overwrite"
@@ -5626,7 +5704,7 @@
"Subversion ist ein Programm zur Versionskontrolle.\n"
"Für weitere Informationen, siehe: http://subversion.tigris.org/\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1296
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -5647,158 +5725,179 @@
msgid "Invalid URL '%s'"
msgstr "Ungültige URL »%s«"
-#: svn/info-cmd.c:111
+#: svn/info-cmd.c:88
#, c-format
msgid "'%s' has invalid revision"
msgstr "»%s« hat eine ungültige Revision"
-#: svn/info-cmd.c:267 svnadmin/main.c:1116
+#: svn/info-cmd.c:250 svnadmin/main.c:1118
#, c-format
msgid "Path: %s\n"
msgstr "Pfad: %s\n"
-#: svn/info-cmd.c:273 svnlook/main.c:734
+#: svn/info-cmd.c:256 svnlook/main.c:738
#, c-format
msgid "Name: %s\n"
msgstr "Name: %s\n"
-#: svn/info-cmd.c:277
+#: svn/info-cmd.c:260
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: svn/info-cmd.c:280
+#: svn/info-cmd.c:263
#, c-format
msgid "Repository Root: %s\n"
msgstr "Basis des Projektarchivs: %s\n"
-#: svn/info-cmd.c:284
+#: svn/info-cmd.c:267
#, c-format
msgid "Repository UUID: %s\n"
msgstr "UUID des Projektarchivs: %s\n"
-#: svn/info-cmd.c:288
+#: svn/info-cmd.c:271
#, c-format
msgid "Revision: %ld\n"
msgstr "Revision: %ld\n"
-#: svn/info-cmd.c:293
+#: svn/info-cmd.c:276
#, c-format
msgid "Node Kind: file\n"
msgstr "Knotentyp: Datei\n"
-#: svn/info-cmd.c:297
+#: svn/info-cmd.c:280
#, c-format
msgid "Node Kind: directory\n"
msgstr "Knotentyp: Verzeichnis\n"
-#: svn/info-cmd.c:301
+#: svn/info-cmd.c:284
#, c-format
msgid "Node Kind: none\n"
msgstr "Knotentyp: keiner\n"
-#: svn/info-cmd.c:306
+#: svn/info-cmd.c:289
#, c-format
msgid "Node Kind: unknown\n"
msgstr "Knotentyp: unbekannt\n"
-#: svn/info-cmd.c:315
+#: svn/info-cmd.c:298
#, c-format
msgid "Schedule: normal\n"
msgstr "Plan: normal\n"
-#: svn/info-cmd.c:319
+#: svn/info-cmd.c:302
#, c-format
msgid "Schedule: add\n"
msgstr "Plan: hinzufügen\n"
-#: svn/info-cmd.c:323
+#: svn/info-cmd.c:306
#, c-format
msgid "Schedule: delete\n"
msgstr "Plan: löschen\n"
-#: svn/info-cmd.c:327
+#: svn/info-cmd.c:310
#, c-format
msgid "Schedule: replace\n"
msgstr "Plan: ersetzen\n"
-#: svn/info-cmd.c:335
+#: svn/info-cmd.c:326
+#, c-format
+msgid "Depth: empty\n"
+msgstr ""
+
+#: svn/info-cmd.c:330
+#, c-format
+msgid "Depth: files\n"
+msgstr ""
+
+#: svn/info-cmd.c:334
+#, c-format
+msgid "Depth: immediates\n"
+msgstr ""
+
+#. Other depths should never happen here.
+#: svn/info-cmd.c:345
+#, c-format
+msgid "Depth: INVALID\n"
+msgstr ""
+
+#: svn/info-cmd.c:349
#, c-format
msgid "Copied From URL: %s\n"
msgstr "Kopiert von URL: %s\n"
-#: svn/info-cmd.c:339
+#: svn/info-cmd.c:353
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "Kopiert von Rev: %ld\n"
-#: svn/info-cmd.c:344
+#: svn/info-cmd.c:358
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "Letzter Autor: %s\n"
-#: svn/info-cmd.c:348
+#: svn/info-cmd.c:362
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "Letzte geänderte Rev: %ld\n"
-#: svn/info-cmd.c:353
+#: svn/info-cmd.c:367
msgid "Last Changed Date"
msgstr "Letztes Änderungsdatum"
-#: svn/info-cmd.c:359
+#: svn/info-cmd.c:373
msgid "Text Last Updated"
msgstr "Text zuletzt geändert"
-#: svn/info-cmd.c:363
+#: svn/info-cmd.c:377
msgid "Properties Last Updated"
msgstr "Eigenschaften zuletzt geändert"
-#: svn/info-cmd.c:366
+#: svn/info-cmd.c:380
#, c-format
msgid "Checksum: %s\n"
msgstr "Prüfsumme: %s\n"
-#: svn/info-cmd.c:371
+#: svn/info-cmd.c:385
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "Konflikt: vorherige Ausgangsdatei: %s\n"
-#: svn/info-cmd.c:377
+#: svn/info-cmd.c:391
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "Konflikt: vorherige Arbeitsdatei: %s\n"
-#: svn/info-cmd.c:382
+#: svn/info-cmd.c:396
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "Konflikt: aktuelle Ausgangsdatei: %s\n"
# TODO: leicht inkonsistent zu obigen Strings (tritt in svn info-Ausgabe auf)
-#: svn/info-cmd.c:387
+#: svn/info-cmd.c:401
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "Konfliktdatei mit Eigenschaften: %s\n"
-#: svn/info-cmd.c:395
+#: svn/info-cmd.c:409
#, c-format
msgid "Lock Token: %s\n"
msgstr "Sperrmarke: %s\n"
-#: svn/info-cmd.c:399
+#: svn/info-cmd.c:413
#, c-format
msgid "Lock Owner: %s\n"
msgstr "Sperreigner: %s\n"
-#: svn/info-cmd.c:404
+#: svn/info-cmd.c:418
msgid "Lock Created"
msgstr "Sperre erzeugt"
-#: svn/info-cmd.c:408
+#: svn/info-cmd.c:422
msgid "Lock Expires"
msgstr "Sperre läuft ab"
-#: svn/info-cmd.c:417
+#: svn/info-cmd.c:431
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -5807,7 +5906,7 @@
"Sperrkommentar (%i Zeilen):\n"
"%s\n"
-#: svn/info-cmd.c:418
+#: svn/info-cmd.c:432
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -5816,17 +5915,12 @@
"Sperrkommentar (%i Zeile):\n"
"%s\n"
-#: svn/info-cmd.c:425
+#: svn/info-cmd.c:439
#, c-format
msgid "Changelist: %s\n"
msgstr "Änderungsliste: %s\n"
-#: svn/info-cmd.c:477 svn/revert-cmd.c:59
-#, c-format
-msgid "no such changelist '%s'"
-msgstr "keine solche Änderungsliste »%s«"
-
-#: svn/info-cmd.c:539
+#: svn/info-cmd.c:547
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
@@ -5835,7 +5929,7 @@
"%s: (Keine versionierte Ressource)\n"
"\n"
-#: svn/info-cmd.c:548
+#: svn/info-cmd.c:556
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -5866,12 +5960,12 @@
msgid " (from %s:%ld)"
msgstr " (von %s:%ld)"
-#: svn/log-cmd.c:450
+#: svn/log-cmd.c:475
msgid "When specifying working copy paths, only one target may be given"
msgstr ""
"Bei Pfaden innerhalb der Arbeitskopie darf nur ein Ziel angegeben werden"
-#: svn/log-cmd.c:462
+#: svn/log-cmd.c:487
msgid "Only relative paths can be specified after a URL"
msgstr "Nach einer URL können nur relative Pfade angegeben werden"
@@ -5885,7 +5979,7 @@
#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:230 svnadmin/main.c:233
#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
-#: svnlook/main.c:93 svnsync/main.c:104 svnsync/main.c:106
+#: svnlook/main.c:102 svnsync/main.c:135 svnsync/main.c:137
msgid "show help on a subcommand"
msgstr "Zeige Hilfe zu einem Unterbefehl"
@@ -5898,12 +5992,12 @@
msgstr "So wenig wie möglich ausgeben"
#: svn/main.c:67
-msgid "descend recursively"
-msgstr "Rekursiv hinabsteigen"
+msgid "descend recursively, same as --depth=infinity"
+msgstr ""
#: svn/main.c:68
-msgid "operate on single directory only"
-msgstr "Nicht rekursiv hinabsteigen"
+msgid "obsolete; try --depth=files or --depth=immediates"
+msgstr ""
#: svn/main.c:70
msgid ""
@@ -5950,7 +6044,7 @@
msgstr "Behandle Wert, als sei er in der Zeichenkodierung PAR"
#: svn/main.c:92 svnadmin/main.c:236 svndumpfilter/main.c:786
-#: svnlook/main.c:96 svnserve/main.c:150 svnsync/main.c:102
+#: svnlook/main.c:129 svnserve/main.c:151 svnsync/main.c:133
#: svnversion/main.c:125
msgid "show program version information"
msgstr "Zeige Versionsinformationen des Programms"
@@ -5963,11 +6057,11 @@
msgid "display update information"
msgstr "Aktualisierungsinformation ausgeben"
-#: svn/main.c:96 svnsync/main.c:96
+#: svn/main.c:96
msgid "specify a username ARG"
msgstr "Benutzername PAR angeben"
-#: svn/main.c:98 svnsync/main.c:98
+#: svn/main.c:98
msgid "specify a password ARG"
msgstr "Passwort PAR angeben"
@@ -6015,92 +6109,103 @@
msgid "pass contents of file ARG as additional args"
msgstr "Inhalt der Datei PAR als zusätzliche Parameter übergeben"
-#: svn/main.c:131
+#: svn/main.c:132
+msgid ""
+"pass depth ('empty', 'files', 'immediates', or\n"
+" 'infinity') as ARG"
+msgstr ""
+
+#: svn/main.c:135
msgid "output in XML"
msgstr "Ausgabe in XML"
-#: svn/main.c:132
+#: svn/main.c:136
msgid "use strict semantics"
msgstr "Strikte Semantik anwenden"
-#: svn/main.c:134
+#: svn/main.c:138
msgid "do not cross copies while traversing history"
msgstr "Log-Ausgabe endet bei Kopieroperationen"
-#: svn/main.c:136
+#: svn/main.c:140
msgid "disregard default and svn:ignore property ignores"
msgstr "Globale »ignore«- und »svn:ignore«-Einstellungen nicht beachten"
-#: svn/main.c:138 svnsync/main.c:94
+#: svn/main.c:142 svnsync/main.c:113
msgid "do not cache authentication tokens"
msgstr "Anmeldeinformationen nicht zwischenspeichern"
-#: svn/main.c:140 svnsync/main.c:92
+#: svn/main.c:144 svnsync/main.c:111
msgid "do no interactive prompting"
msgstr "Keine interaktiven Rückfragen ausgeben"
-#: svn/main.c:142
+#: svn/main.c:146
msgid "try operation but make no changes"
msgstr "Operation testen, aber keine Änderungen durchführen"
-#: svn/main.c:144 svnlook/main.c:111
+#: svn/main.c:148 svnlook/main.c:108
msgid "do not print differences for deleted files"
msgstr "Keine Unterschiede für gelöschte Dateien ausgeben"
-#: svn/main.c:146
+#: svn/main.c:150
msgid "notice ancestry when calculating differences"
msgstr "Beim Berechnen von Differenzen Vorgänger berücksichtigen"
-#: svn/main.c:148
+#: svn/main.c:152
msgid "ignore ancestry when calculating merges"
msgstr "Beim Zusammenführen Vorgänger ignorieren"
-#: svn/main.c:150
+#: svn/main.c:154
msgid "ignore externals definitions"
msgstr "ignoriere »svn:externals«-Definitionen"
-#: svn/main.c:153
+#: svn/main.c:157
msgid "use ARG as diff command"
msgstr "Verwende PAR als Vergleichsprogramm"
-#: svn/main.c:155
+#: svn/main.c:159
msgid "use ARG as merge command"
msgstr "Verwende PAR als Konflikteditor"
-#: svn/main.c:157
+#: svn/main.c:161
msgid "use ARG as external editor"
msgstr "Verwende PAR als externen Editor"
-#: svn/main.c:160
-msgid "use ARG as the older target"
-msgstr "Verwende PAR als älteres Ziel"
-
-#: svn/main.c:162
-msgid "use ARG as the newer target"
-msgstr "Verwende PAR als neueres Ziel"
-
#: svn/main.c:164
-msgid "operate on a revision property (use with -r)"
+#, fuzzy
+msgid "mark revisions as merged (use with -r)"
msgstr "Arbeite auf einer Revisionseigenschaft (mit -r verwenden)"
#: svn/main.c:166
+msgid "use ARG as the older target"
+msgstr "Verwende PAR als älteres Ziel"
+
+#: svn/main.c:168
+msgid "use ARG as the newer target"
+msgstr "Verwende PAR als neueres Ziel"
+
+#: svn/main.c:170
+msgid "operate on a revision property (use with -r)"
+msgstr "Arbeite auf einer Revisionseigenschaft (mit -r verwenden)"
+
+#: svn/main.c:172
msgid "relocate via URL-rewriting"
msgstr "durch Umschreiben der URL umplatzieren"
# FIXME: svn --help help gibt "--config-dir par" aus (par statt PAR)!
-#: svn/main.c:168 svnadmin/main.c:272 svnsync/main.c:100
+#: svn/main.c:174 svnadmin/main.c:272 svnsync/main.c:131
msgid "read user configuration files from directory ARG"
msgstr "Benutzerkonfigurationsdateien aus dem Verzeichnis PAR lesen"
-#: svn/main.c:170
+#: svn/main.c:176
msgid "enable automatic properties"
msgstr "automatische Eigenschaften einschalten"
-#: svn/main.c:172
+#: svn/main.c:178
msgid "disable automatic properties"
msgstr "automatische Eigenschaften ausschalten"
-#: svn/main.c:174
+#: svn/main.c:180
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -6112,37 +6217,43 @@
" Eigenschaft.\n"
" PAR kann »LF«, »CR« oder »CRLF« sein."
-#: svn/main.c:182
+#: svn/main.c:188
msgid "maximum number of log entries"
msgstr "Maximale Anzahl Logeinträge"
-#: svn/main.c:184
+#: svn/main.c:190
msgid "don't unlock the targets"
msgstr "Ziele nicht freigeben"
-#: svn/main.c:186
+#: svn/main.c:192
msgid "show a summary of the results"
msgstr "Zeige eine Zusammenfassung der Ergebnisse"
# CHECKME
-#: svn/main.c:188
+#: svn/main.c:194
msgid "remove changelist association"
msgstr "Bezug zur Änderungsliste entfernen"
-#: svn/main.c:190
+#: svn/main.c:196
msgid "operate only on members of changelist ARG"
msgstr "nur auf Elementen der Änderungsliste PAR operieren"
-#: svn/main.c:192
+#: svn/main.c:198
msgid "don't delete changelist after commit"
msgstr "Änderungsliste nach Übertragung nicht löschen"
-#: svn/main.c:194
+#: svn/main.c:200
#, fuzzy
msgid "keep path in working copy"
msgstr "Pfad ist keine Datei in einer Arbeitskopie"
-#: svn/main.c:233
+#: svn/main.c:202
+msgid ""
+"set revision property ARG in new revision\n"
+" using the name=value format"
+msgstr ""
+
+#: svn/main.c:244
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -6153,7 +6264,7 @@
"Das tatsächliche Hinzufügen findet erst beim nächsten Übertragen statt.\n"
"Aufruf: add PFAD...\n"
-#: svn/main.c:241
+#: svn/main.c:252
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -6169,7 +6280,7 @@
" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut "
"wird.\n"
-#: svn/main.c:251
+#: svn/main.c:262
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -6183,18 +6294,19 @@
" Falls angegeben, bestimmt REV, in welcher Revision zuerst nachgeschaut "
"wird.\n"
-#: svn/main.c:259
+#: svn/main.c:270
+#, fuzzy
msgid ""
"Associate (or deassociate) local paths with changelist CLNAME.\n"
"usage: 1. changelist CLNAME TARGET...\n"
-" 2. changelist --clear TARGET...\n"
+" 2. changelist --remove TARGET...\n"
msgstr ""
"Verknüpft lokale Pfade (oder löst diese Verknüpfung) mit Änderungsliste "
"CLNAME.\n"
"Verwendung: 1. changelist CLNAME ZIEL...\n"
" 2. changelist --clear ZIEL...\n"
-#: svn/main.c:265
+#: svn/main.c:277
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6239,7 +6351,7 @@
" Modifikationen in der Arbeitskopie behandelt. Sämtliche Eigenschaften\n"
" aus dem Projektarchiv werden auf den behindernden Pfad angewendet.\n"
-#: svn/main.c:290
+#: svn/main.c:302
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6249,7 +6361,7 @@
"nimmt unvollständige Operationen wieder auf, usw.\n"
"Aufruf: cleanup [PFAD...]\n"
-#: svn/main.c:297
+#: svn/main.c:309
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6269,7 +6381,7 @@
"diese\n"
" nach einer erfolgreichen Übertragung entsperrt.\n"
-#: svn/main.c:305
+#: svn/main.c:317
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6289,7 +6401,7 @@
" gesperrte Objekte enthalten, werden diese nach einer erfolgreichen\n"
" Übertragung entsperrt.\n"
-#: svn/main.c:320
+#: svn/main.c:332
#, fuzzy
msgid ""
"Duplicate something in working copy or repository, remembering history.\n"
@@ -6317,7 +6429,7 @@
" URL -> URL: Vollständig serverseitige Kopie. Wird zum Verzweigen\n"
" und Markieren (branch & tag) verwendet.\n"
-#: svn/main.c:336
+#: svn/main.c:348
#, fuzzy
msgid ""
"Remove files and directories from version control.\n"
@@ -6348,7 +6460,7 @@
" 2. Jede URL wird mittels einer sofortigen Übertragung aus dem\n"
" Projektarchiv entfernt.\n"
-#: svn/main.c:354
+#: svn/main.c:366
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -6410,7 +6522,7 @@
" Verwenden Sie »svn diff«, um lokale Änderungen in einer Arbeitskopie\n"
" anzuzeigen.\n"
-#: svn/main.c:384
+#: svn/main.c:396
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6449,7 +6561,7 @@
"\n"
" BASREV gibt an, in welcher Revision das Ziel zuerst gesucht wird.\n"
-#: svn/main.c:407
+#: svn/main.c:419
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -6457,7 +6569,7 @@
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
"Aufruf: help [UNTERBEFEHL...]\n"
-#: svn/main.c:413
+#: svn/main.c:425
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -6480,7 +6592,7 @@
" hinzugefügt.\n"
# FIXME: missing . after "(default: '.')" ??
-#: svn/main.c:426
+#: svn/main.c:438
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -6501,7 +6613,7 @@
# FIXME: "looked up" ist überall leicht unterschiedlich übersetzt
# Ich (Jens) bevorzuge "gesucht" statt "nachgeschlagen" oder "durchsucht", "nachgeschaut"
# FIXME: Standardsätze sollten eigene msgid haben!
-#: svn/main.c:436
+#: svn/main.c:449
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -6541,7 +6653,7 @@
" Größe (in Bytes)\n"
" Datum und Zeit der letzten Übertragung\n"
-#: svn/main.c:458
+#: svn/main.c:471
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -6555,16 +6667,16 @@
"\n"
" Benutze --force, um eine bereits vorhandene Sperre zu stehlen.\n"
-#: svn/main.c:466
+#: svn/main.c:479
msgid "read lock comment from file ARG"
msgstr "Lies Sperrkommentar aus Datei PAR"
-#: svn/main.c:467
+#: svn/main.c:480
msgid "specify lock comment ARG"
msgstr "Verwende PAR als Sperrkommentar"
# FIXME: behaviour oder behavior?
-#: svn/main.c:470
+#: svn/main.c:483
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -6621,7 +6733,7 @@
" svn log http://www.beispiel.de/repo/projekt foo.c bar.c\n"
# FIXME: WCPATH oder WC_PATH?
-#: svn/main.c:500
+#: svn/main.c:513
msgid ""
"Apply the differences between two sources to a working copy path.\n"
"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -6674,7 +6786,7 @@
" identischen Basisnamen, der eine Datei unterhalb von ».« beschreibt.\n"
" In diesem Fall werden die Änderungen auf die gefundene Datei angewandt.\n"
-#: svn/main.c:529
+#: svn/main.c:543
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -6705,7 +6817,7 @@
"\n"
" In beiden Fällen müssen alle Zwischenverzeichnisse bereits existieren.\n"
-#: svn/main.c:546
+#: svn/main.c:560
#, fuzzy
msgid ""
"Move and/or rename something in working copy or repository.\n"
@@ -6732,7 +6844,7 @@
" AK -> AK: Verschieben und zum Hinzufügen (mit Historie) einplanen\n"
" URL -> URL: Vollständig serverseitiges Verschieben.\n"
-#: svn/main.c:563
+#: svn/main.c:577
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6751,7 +6863,7 @@
# FIXME: s/prop/properties/
# Funktioniert 2. nicht auch lokal, z.B. für svn:log???
-#: svn/main.c:575
+#: svn/main.c:589
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -6770,7 +6882,7 @@
" 2. Bearbeitet nicht versionierte Eigenschaften im Projektarchiv.\n"
" ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.\n"
-#: svn/main.c:588
+#: svn/main.c:602
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6805,7 +6917,7 @@
"Formatierungen\n"
" abzuschalten (z.B. um Binäreigenschaften in Dateien umzuleiten).\n"
-#: svn/main.c:607
+#: svn/main.c:621
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6826,7 +6938,7 @@
" ZIEL legt nur das Projektarchiv fest, auf das zugegriffen wird.\n"
# FIXME: propchange?
-#: svn/main.c:619
+#: svn/main.c:633
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -6923,11 +7035,11 @@
"wird\n"
" die Eigenschaft nur für die Dateien in dem Verzeichnis setzen.\n"
-#: svn/main.c:661
+#: svn/main.c:675
msgid "read property value from file ARG"
msgstr "Lies Eigenschaftswert aus Datei PAR"
-#: svn/main.c:664
+#: svn/main.c:678
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -6948,7 +7060,7 @@
"übertragen\n"
" werden kann.\n"
-#: svn/main.c:673
+#: svn/main.c:688
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -6965,7 +7077,7 @@
"wieder\n"
" herstellen.\n"
-#: svn/main.c:682
+#: svn/main.c:697
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -7119,7 +7231,7 @@
" 965 687 joe wc/zig.c\n"
" Status gegenüber Revision: 981\n"
-#: svn/main.c:758
+#: svn/main.c:773
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL [PATH]\n"
@@ -7179,7 +7291,7 @@
" Alle Eigenschaften des Projektarchivs werden auf den behindernden Pfad\n"
" angewandt.\n"
-#: svn/main.c:785
+#: svn/main.c:801
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -7192,7 +7304,7 @@
" Benutze --force, um die Freigabe zu erzwingen.\n"
# FIXME: s/If no revision given/If no revision is given/
-#: svn/main.c:793
+#: svn/main.c:809
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -7269,19 +7381,24 @@
" angewandt. Behindernde Pfade werden in der ersten Spalte mit »E« "
"angezeigt.\n"
-#: svn/main.c:869 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
+#: svn/main.c:885 svnadmin/main.c:78 svnlook/main.c:289 svnsync/main.c:180
msgid "Caught signal"
msgstr "Abbruchsignal empfangen"
-#: svn/main.c:981
+#: svn/main.c:904
+#, fuzzy
+msgid "Revision property pair is empty"
+msgstr "Revisionseintrag ist keine Liste"
+
+#: svn/main.c:1034
msgid "Non-numeric limit argument given"
msgstr "Nicht-numerische Bereichsgrenze angegeben"
-#: svn/main.c:987
+#: svn/main.c:1040
msgid "Argument to --limit must be positive"
msgstr "Parameter für --limit muss positiv sein"
-#: svn/main.c:1007
+#: svn/main.c:1060
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
@@ -7289,19 +7406,19 @@
"Mehrere Revisionsparameter gefunden; bitte nicht zweimal -c oder "
"gleichzeitig -r und -c angeben"
-#: svn/main.c:1015 svn/main.c:1206
+#: svn/main.c:1068 svn/main.c:1290
msgid "Can't specify -c with --old"
msgstr "-c kann nicht mit --old verwendet werden"
-#: svn/main.c:1022
+#: svn/main.c:1075
msgid "Non-numeric change argument given to -c"
msgstr "Nicht-numerischer Parameter an -c übergeben"
-#: svn/main.c:1028
+#: svn/main.c:1081
msgid "There is no change 0"
msgstr "Es gibt keine Änderung 0"
-#: svn/main.c:1055
+#: svn/main.c:1108
msgid ""
"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
"N:M' instead of '-r N -r M'"
@@ -7309,32 +7426,42 @@
"Mehrere Revisionsparameter gefunden; bitte nicht -r und -c angeben oder »-r "
"N:M« statt »-r N -r M« verwenden"
-#: svn/main.c:1068 svnadmin/main.c:1314
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Syntaxfehler in Revisionsparameter »%s«"
-#: svn/main.c:1222 svn/main.c:1232
+#: svn/main.c:1194
+#, c-format
+msgid "Error converting depth from locale to UTF8"
+msgstr ""
+
+#: svn/main.c:1214
+#, fuzzy, c-format
+msgid "'%s' is not a valid depth; try 0, 1, or 2"
+msgstr "»%s« ist kein gültiger Subversion-Eigenschaftsname"
+
+#: svn/main.c:1306 svn/main.c:1316
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props und --no-auto-props schließen sich gegenseitig aus"
-#: svn/main.c:1248
+#: svn/main.c:1332
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Syntaxfehler im »native-eol« Parameter »%s«"
-#: svn/main.c:1324 svndumpfilter/main.c:1207 svnlook/main.c:2048
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "Unterbefehl benötigt einen Parameter\n"
-#: svn/main.c:1343 svnadmin/main.c:1443 svndumpfilter/main.c:1226
-#: svnlook/main.c:2067
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
+#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Unbekannter Befehl: »%s«\n"
-#: svn/main.c:1376
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7343,19 +7470,19 @@
"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n"
"Geben Sie »svn help %s« für Hilfe ein.\n"
-#: svn/main.c:1413
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"Die Datei für die Logmeldung ist versioniert; geben Sie »--force-log« an, um "
"sie zu verwenden"
-#: svn/main.c:1420
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"Die Datei für den Sperrkommentar ist versioniert; geben Sie »--force-log« "
"an, um sie zu verwenden"
-#: svn/main.c:1440
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7363,7 +7490,7 @@
"Die Logmeldung ist ein Pfad (war -F gemeint?); geben Sie »--force-log« an, "
"um sie zu verwenden"
-#: svn/main.c:1447
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7371,12 +7498,12 @@
"Der Sperrkommentar ist ein Pfad (war -F gemeint?); geben Sie »--force-log« "
"an, um ihn zu verwenden"
-#: svn/main.c:1570
+#: svn/main.c:1668
#, fuzzy
msgid "Try 'svn help' for more info"
msgstr "Geben Sie »%s help« für weitere Hilfe ein.\n"
-#: svn/main.c:1580
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -7397,7 +7524,7 @@
msgstr ""
"Beim Zusammenführen von Arbeitskopien wird eine explizite Revision benötigt"
-#: svn/mkdir-cmd.c:84
+#: svn/mkdir-cmd.c:87
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "Versuchen Sie »svn add« oder »svn add --non-recursive«."
@@ -7571,13 +7698,13 @@
#: svn/notify.c:394
#, fuzzy, c-format
-msgid "Path '%s' is now part of changelist '%s'.\n"
+msgid "Path '%s' is now a member of changelist '%s'.\n"
msgstr "Pfad »%s« ist keine Datei"
-#: svn/notify.c:401
-#, c-format
-msgid "Path '%s' is no longer associated with a changelist.\n"
-msgstr ""
+#: svn/notify.c:402
+#, fuzzy, c-format
+msgid "Path '%s' is no longer a member of a changelist.\n"
+msgstr "Pfad »%s« ist keine Datei"
#: svn/propdel-cmd.c:77
#, c-format
@@ -7591,12 +7718,12 @@
"Zum Löschen der versionierten Eigenschaft »%s« darf keine Revision angegeben "
"werden"
-#: svn/propdel-cmd.c:116
+#: svn/propdel-cmd.c:124
#, c-format
msgid "property '%s' deleted (recursively) from '%s'.\n"
msgstr "Eigenschaft »%s« wurde (rekursiv) von »%s« gelöscht.\n"
-#: svn/propdel-cmd.c:117
+#: svn/propdel-cmd.c:125
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "Eigenschaft »%s« wurde von »%s« gelöscht.\n"
@@ -7606,7 +7733,7 @@
msgid "'%s' is not a valid Subversion property name"
msgstr "»%s« ist kein gültiger Subversion-Eigenschaftsname"
-#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:241 svn/propset-cmd.c:85
+#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:243 svn/propset-cmd.c:85
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr "Fehlerhafte Kodierung: Eigenschaftswert ist nicht als UTF8 gespeichert"
@@ -7627,36 +7754,36 @@
"Beim Bearbeiten der versionierten Eigenschaft »%s« darf keine Revision "
"angegeben werden"
-#: svn/propedit-cmd.c:154 svn/propset-cmd.c:158
+#: svn/propedit-cmd.c:154 svn/propset-cmd.c:161
msgid "Explicit target argument required"
msgstr "Expliziter Zielparameter benötigt"
-#: svn/propedit-cmd.c:211 svn/switch-cmd.c:140
+#: svn/propedit-cmd.c:213 svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "»%s« scheint kein Pfad einer Arbeitskopie zu sein"
-#: svn/propedit-cmd.c:264
+#: svn/propedit-cmd.c:268
#, c-format
msgid "Set new value for property '%s' on '%s'\n"
msgstr "Neuer Wert für Eigenschaft »%s« für »%s« gesetzt\n"
-#: svn/propedit-cmd.c:274
+#: svn/propedit-cmd.c:278
#, c-format
msgid "No changes to property '%s' on '%s'\n"
msgstr "Keine Änderungen der Eigenschaft »%s« für »%s«\n"
-#: svn/proplist-cmd.c:71
-#, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "Nicht versionierte Eigenschaft in Revision %ld:\n"
-
-#: svn/proplist-cmd.c:119
+#: svn/proplist-cmd.c:95
#, c-format
msgid "Properties on '%s':\n"
msgstr "Eigenschaften zu »%s«:\n"
-#: svn/props.c:51
+#: svn/proplist-cmd.c:156
+#, c-format
+msgid "Unversioned properties on revision %ld:\n"
+msgstr "Nicht versionierte Eigenschaft in Revision %ld:\n"
+
+#: svn/props.c:53
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
@@ -7664,11 +7791,11 @@
"Die Revision muss als Zahl, Datum oder »HEAD« angegeben werden, wenn auf "
"eine Revisionseigenschaft zugegriffen wird"
-#: svn/props.c:58
+#: svn/props.c:60
msgid "Wrong number of targets specified"
msgstr "Falsche Anzahl Ziele angegeben"
-#: svn/props.c:67
+#: svn/props.c:69
msgid "Either a URL or versioned item is required"
msgstr "Eine URL oder ein versioniertes Objekt muss angegeben werden"
@@ -7684,26 +7811,26 @@
"Beim Setzen der versionierten Eigenschaft »%s« darf keine Revision angegeben "
"werden"
-#: svn/propset-cmd.c:151
+#: svn/propset-cmd.c:154
#, c-format
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr "Explizites Ziel erforderlich (»%s« als Eigenschaftswert interpretiert)"
-#: svn/propset-cmd.c:184
+#: svn/propset-cmd.c:191
#, c-format
msgid "property '%s' set (recursively) on '%s'\n"
msgstr "Eigenschaft »%s« (rekursiv) für »%s« gesetzt\n"
-#: svn/propset-cmd.c:185
+#: svn/propset-cmd.c:192
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "Eigenschaft »%s« für »%s« gesetzt\n"
-#: svn/revert-cmd.c:86
+#: svn/revert-cmd.c:93
msgid "Try 'svn revert --recursive' instead?"
msgstr "Versuchen Sie »svn revert --non-recursive« stattdessen?"
-#: svn/status-cmd.c:317
+#: svn/status-cmd.c:298
#, c-format
msgid ""
"\n"
@@ -7722,7 +7849,7 @@
msgid "'%s' to '%s' is not a valid relocation"
msgstr "Umplatzieren von »%s« nach »%s« ist nicht möglich"
-#: svn/util.c:60
+#: svn/util.c:61
#, c-format
msgid ""
"\n"
@@ -7731,7 +7858,7 @@
"\n"
"Revision %ld übertragen.\n"
-#: svn/util.c:68
+#: svn/util.c:69
#, c-format
msgid ""
"\n"
@@ -7740,7 +7867,14 @@
"\n"
"Warnung: %s\n"
-#: svn/util.c:136
+#: svn/util.c:145
+msgid ""
+"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
+"time configuration option is empty or consists solely of whitespace. "
+"Expected a shell command."
+msgstr ""
+
+#: svn/util.c:152
msgid ""
"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
"no 'editor-cmd' run-time configuration option was found"
@@ -7748,52 +7882,52 @@
"Es wurde weder die Option »--editor-cmd« übergeben noch eine der "
"Umgebungsvariablen SVN_EDITOR, VISUAL oder EDITOR gesetzt"
-#: svn/util.c:162
+#: svn/util.c:178
#, c-format
msgid "Can't get working directory"
msgstr "Kann Arbeitsverzeichnis nicht ermitteln"
-#: svn/util.c:173 svn/util.c:196
+#: svn/util.c:189 svn/util.c:212
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "Kann Arbeitsverzeichnis nicht nach »%s« wechseln"
-#: svn/util.c:221
+#: svn/util.c:237
#, c-format
msgid "Can't write to '%s'"
msgstr "Kann nicht nach »%s« schreiben"
-#: svn/util.c:266
+#: svn/util.c:282
#, c-format
msgid "system('%s') returned %d"
msgstr "Aufruf des Editors »%s« gab Fehler %d zurück"
-#: svn/util.c:307
+#: svn/util.c:323
msgid "Error normalizing edited contents to internal format"
msgstr "Fehler beim Normalisieren des bearbeiteten Inhalts ins interne Format"
-#: svn/util.c:338
+#: svn/util.c:354
#, c-format
msgid "Can't restore working directory"
msgstr "Kann nicht in das Arbeitsverzeichnis zurückwechseln"
-#: svn/util.c:380
+#: svn/util.c:396
msgid "Log message contains a zero byte"
msgstr "Logmeldung enthält ein Null Byte"
-#: svn/util.c:440
+#: svn/util.c:456
msgid "Your commit message was left in a temporary file:"
msgstr "Ihre Logmeldung wurde in einer Temporärdatei abgelegt:"
-#: svn/util.c:492
+#: svn/util.c:508
msgid "--This line, and those below, will be ignored--"
msgstr "-- Diese und die folgenden Zeilen werden ignoriert --"
-#: svn/util.c:517
+#: svn/util.c:533
msgid "Error normalizing log message to internal format"
msgstr "Fehler beim Normalisieren der Logmeldung ins interne Format"
-#: svn/util.c:532
+#: svn/util.c:548
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
@@ -7802,11 +7936,11 @@
"OS400 nicht unterstützt. Verwenden Sie die Option --message (-m) oder --file "
"(-F)"
-#: svn/util.c:618
+#: svn/util.c:634
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr "Kann den Editor für Logmeldungen nur im interaktiven Modus aufrufen"
-#: svn/util.c:631
+#: svn/util.c:647
msgid ""
"Could not use external editor to fetch log message; consider setting the "
"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
@@ -7816,7 +7950,7 @@
"Sie entweder die $SVN_EDITOR Umgebungsvariable oder verwenden Sie die --"
"message (-m) oder --file (-F) Optionen"
-#: svn/util.c:667
+#: svn/util.c:683
msgid ""
"\n"
"Log message unchanged or not specified\n"
@@ -7826,7 +7960,7 @@
"Logmeldung unverändert oder nicht angegeben\n"
"A)bbrechen, Weitermac)hen, E)ditieren\n"
-#: svn/util.c:720
+#: svn/util.c:736
msgid "Use --force to override this restriction"
msgstr "Benutzen Sie »--force«, um diese Einschränkung aufzuheben"
@@ -8074,12 +8208,13 @@
"Gibt die Namen aller nicht übertragenen Transaktionen aus.\n"
#: svnadmin/main.c:381
+#, fuzzy
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
-"Run the Berkeley DB recovery procedure on a repository. Do\n"
-"this if you've been getting errors indicating that recovery\n"
-"ought to be run. Recovery requires exclusive access and will\n"
+"Run the recovery procedure on a repository. Do this if you've\n"
+"been getting errors indicating that recovery ought to be run.\n"
+"Berkeley DB recovery requires exclusive access and will\n"
"exit if the repository is in use by another process.\n"
msgstr ""
"Aufruf: svnadmin recover ARCHIV_PFAD\n"
@@ -8209,7 +8344,7 @@
"\n"
"Verfügbare Unterbefehle:\n"
-#: svnadmin/main.c:698 svnlook/main.c:1674 svnserve/main.c:204
+#: svnadmin/main.c:698 svnlook/main.c:1687 svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -8227,7 +8362,7 @@
"Bitte warten, die Wiederherstellung des Projektarchivs kann einige Zeit "
"dauern ...\n"
-#: svnadmin/main.c:810
+#: svnadmin/main.c:811
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -8236,14 +8371,14 @@
"Vielleicht hat noch ein anderer Prozess (httpd, svnserve, svn)\n"
"das Projektarchiv geöffnet?"
-#: svnadmin/main.c:815
+#: svnadmin/main.c:816
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr ""
"Warte auf Freigabe des Projektarchivs; Vielleicht ist es durch einen anderen "
"Prozess geöffnet?\n"
-#: svnadmin/main.c:822
+#: svnadmin/main.c:824
#, c-format
msgid ""
"\n"
@@ -8252,57 +8387,57 @@
"\n"
"Wiederherstellung vollständig abgeschlossen.\n"
-#: svnadmin/main.c:829
+#: svnadmin/main.c:831
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "Die neueste Revision des Projektarchivs ist %ld.\n"
-#: svnadmin/main.c:939
+#: svnadmin/main.c:941
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "Transaktion »%s« entfernt.\n"
-#: svnadmin/main.c:1007 svnadmin/main.c:1034
+#: svnadmin/main.c:1009 svnadmin/main.c:1036
#, c-format
msgid "Missing revision"
msgstr "Fehlende Revision"
-#: svnadmin/main.c:1010 svnadmin/main.c:1037
+#: svnadmin/main.c:1012 svnadmin/main.c:1039
#, c-format
msgid "Only one revision allowed"
msgstr "Nur eine Revision zulässig"
-#: svnadmin/main.c:1016
+#: svnadmin/main.c:1018
#, c-format
msgid "Exactly one property name and one file argument required"
msgstr "Genau ein Eigenschaftsname und ein Dateiparameter erforderlich"
-#: svnadmin/main.c:1043
+#: svnadmin/main.c:1045
#, c-format
msgid "Exactly one file argument required"
msgstr "Genau ein Dateiparameter benötigt"
-#: svnadmin/main.c:1117 svnlook/main.c:1739
+#: svnadmin/main.c:1119 svnlook/main.c:1752
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID Marke: %s\n"
-#: svnadmin/main.c:1118 svnlook/main.c:1740
+#: svnadmin/main.c:1120 svnlook/main.c:1753
#, c-format
msgid "Owner: %s\n"
msgstr "Eigentümer: %s\n"
-#: svnadmin/main.c:1119 svnlook/main.c:1741
+#: svnadmin/main.c:1121 svnlook/main.c:1754
#, c-format
msgid "Created: %s\n"
msgstr "Erstellt: %s\n"
-#: svnadmin/main.c:1120 svnlook/main.c:1742
+#: svnadmin/main.c:1122 svnlook/main.c:1755
#, c-format
msgid "Expires: %s\n"
msgstr "Läuft ab: %s\n"
-#: svnadmin/main.c:1122
+#: svnadmin/main.c:1124
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8313,7 +8448,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1123
+#: svnadmin/main.c:1125
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8324,38 +8459,38 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1180
+#: svnadmin/main.c:1182
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "Pfad »%s« ist nicht gesperrt.\n"
-#: svnadmin/main.c:1192
+#: svnadmin/main.c:1194
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "Sperre für »%s« entfernt.\n"
-#: svnadmin/main.c:1300
+#: svnadmin/main.c:1303
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Mehrere Revisionsparameter gefunden; Bitte »-r N:M« anstelle »-r N -r M« "
"verwenden"
-#: svnadmin/main.c:1425
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "Unterbefehl benötigt einen Parameter\n"
-#: svnadmin/main.c:1510
-#, c-format
+#: svnadmin/main.c:1502
+#, fuzzy, c-format
msgid ""
-"subcommand '%s' doesn't accept option '%s'\n"
+"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnadmin help %s' for usage.\n"
msgstr ""
"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n"
"Geben Sie »svnadmin help %s« ein, um Hilfe zu erhalten.\n"
-#: svnadmin/main.c:1543
+#: svnadmin/main.c:1535
#, fuzzy
msgid "Try 'svnadmin help' for more info"
msgstr "Geben Sie »svnversion --help« für weitere Hilfe ein.\n"
@@ -8510,43 +8645,47 @@
msgid "Try 'svndumpfilter help' for more info"
msgstr ""
-#: svnlook/main.c:99
-msgid "specify revision number ARG"
-msgstr "Revisionsnummer PAR angegeben"
-
-#: svnlook/main.c:102
-msgid "specify transaction name ARG"
-msgstr "Transaktionsname PAR angeben"
-
-#: svnlook/main.c:105
-msgid "be verbose"
-msgstr "ausführliche Meldungen"
-
-#: svnlook/main.c:108
-msgid "show node revision ids for each path"
-msgstr "gibt die IDs der Knotenrevisionen jedes Pfades aus"
-
-#: svnlook/main.c:114
-msgid "do not print differences for added files"
-msgstr "Keine Unterschiede für hinzugefügte Dateien ausgeben"
-
-#: svnlook/main.c:117
-msgid "print differences against the copy source"
-msgstr "Gibt Unterschiede gegenüber der Quelle der Kopie aus"
-
-#: svnlook/main.c:120
-msgid "operate on a revision property (use with -r or -t)"
-msgstr "Arbeite auf einer Revisionseigenschaft (mit -r oder -t verwenden)"
-
-#: svnlook/main.c:123
-msgid "show full paths instead of indenting them"
-msgstr "Zeige vollständige Pfade anstatt sie einzurücken"
-
-#: svnlook/main.c:126
+#: svnlook/main.c:93
msgid "show details for copies"
msgstr "Zeige Details für Kopien"
-#: svnlook/main.c:138
+#: svnlook/main.c:96
+msgid "print differences against the copy source"
+msgstr "Gibt Unterschiede gegenüber der Quelle der Kopie aus"
+
+#: svnlook/main.c:99
+msgid "show full paths instead of indenting them"
+msgstr "Zeige vollständige Pfade anstatt sie einzurücken"
+
+#: svnlook/main.c:105
+msgid "do not print differences for added files"
+msgstr "Keine Unterschiede für hinzugefügte Dateien ausgeben"
+
+#: svnlook/main.c:111
+msgid "operate on single directory only"
+msgstr "Nicht rekursiv hinabsteigen"
+
+#: svnlook/main.c:114
+msgid "specify revision number ARG"
+msgstr "Revisionsnummer PAR angegeben"
+
+#: svnlook/main.c:117
+msgid "operate on a revision property (use with -r or -t)"
+msgstr "Arbeite auf einer Revisionseigenschaft (mit -r oder -t verwenden)"
+
+#: svnlook/main.c:120
+msgid "show node revision ids for each path"
+msgstr "gibt die IDs der Knotenrevisionen jedes Pfades aus"
+
+#: svnlook/main.c:123
+msgid "specify transaction name ARG"
+msgstr "Transaktionsname PAR angeben"
+
+#: svnlook/main.c:126
+msgid "be verbose"
+msgstr "ausführliche Meldungen"
+
+#: svnlook/main.c:141
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -8556,7 +8695,7 @@
"\n"
"Gibt den Autor aus.\n"
-#: svnlook/main.c:143
+#: svnlook/main.c:146
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -8567,7 +8706,7 @@
"Gibt den Inhalt einer Datei aus. Ein vorangestellter »/« im DATEI_PFAD ist\n"
"optional.\n"
-#: svnlook/main.c:148
+#: svnlook/main.c:151
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -8577,7 +8716,7 @@
"\n"
"Gibt die geänderten Pfade aus.\n"
-#: svnlook/main.c:153
+#: svnlook/main.c:156
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -8587,7 +8726,7 @@
"\n"
"Gibt das Datum aus.\n"
-#: svnlook/main.c:158
+#: svnlook/main.c:161
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -8598,7 +8737,7 @@
"Gibt Unterschiede von geänderten Dateien oder Eigenschaften im GNU-Stil "
"aus.\n"
-#: svnlook/main.c:164
+#: svnlook/main.c:167
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -8610,7 +8749,7 @@
"Gibt diejenigen Pfade aus, die (durch Eigenschaftsmodifikationen) selbst\n"
"bzw. deren Dateien geändert wurden.\n"
-#: svnlook/main.c:170
+#: svnlook/main.c:173
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -8620,7 +8759,7 @@
"\n"
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
-#: svnlook/main.c:175
+#: svnlook/main.c:178
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8633,7 +8772,7 @@
"(oder\n"
"über das Basisverzeichnis, falls kein Pfad angegeben wurde.)\n"
-#: svnlook/main.c:181
+#: svnlook/main.c:184
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -8643,7 +8782,7 @@
"\n"
"Gibt den Autor, das Datum, die Größe der Logmeldung und die Logmeldung aus.\n"
-#: svnlook/main.c:186
+#: svnlook/main.c:189
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -8654,7 +8793,7 @@
"Wenn eine Sperre für einen Pfad im Projektarchiv existiert, beschreibe "
"diese.\n"
-#: svnlook/main.c:191
+#: svnlook/main.c:194
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -8664,7 +8803,7 @@
"\n"
"Gibt die Logmeldung aus.\n"
-#: svnlook/main.c:196
+#: svnlook/main.c:199
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -8676,7 +8815,7 @@
"Gibt den Rohwert einer Eigenschaft eines Pfades im Projektarchiv aus.\n"
"Mit --revprop wird der Rohwert einer Revisionseigenschaft ausgegeben.\n"
-#: svnlook/main.c:202
+#: svnlook/main.c:205
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8690,7 +8829,7 @@
"Mit --revprop werden Revisionseigenschaften ausgegeben.\n"
"Mit -v werden auch die Eigenschaftswerte ausgegeben.\n"
-#: svnlook/main.c:209
+#: svnlook/main.c:212
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8703,7 +8842,7 @@
"Basis des Baumes), wobei optional die IDs der Knotenrevisionen ausgegeben "
"werden.\n"
-#: svnlook/main.c:215
+#: svnlook/main.c:218
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -8713,7 +8852,7 @@
"\n"
"Gibt die UUID des Projektarchivs aus.\n"
-#: svnlook/main.c:220
+#: svnlook/main.c:223
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -8723,53 +8862,53 @@
"\n"
"Gibt die neueste Revisionsnummer aus.\n"
-#: svnlook/main.c:815
+#: svnlook/main.c:819
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Kopiert: %s (von Rev %ld, %s)\n"
-#: svnlook/main.c:884
+#: svnlook/main.c:888
msgid "Added"
msgstr "Hinzugefügt"
-#: svnlook/main.c:885
+#: svnlook/main.c:889
msgid "Deleted"
msgstr "Gelöscht"
-#: svnlook/main.c:886
+#: svnlook/main.c:890
msgid "Modified"
msgstr "Geändert"
-#: svnlook/main.c:887
+#: svnlook/main.c:891
msgid "Index"
msgstr "Index"
-#: svnlook/main.c:899
+#: svnlook/main.c:903
#, c-format
msgid "(Binary files differ)\n"
msgstr "(Binärdateien verschieden)\n"
-#: svnlook/main.c:1028
+#: svnlook/main.c:1036
msgid "unknown"
msgstr "unbekannt"
-#: svnlook/main.c:1171 svnlook/main.c:1264 svnlook/main.c:1293
+#: svnlook/main.c:1183 svnlook/main.c:1276 svnlook/main.c:1305
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr ""
"Transaktion »%s« ist nicht von einer Revision abgeleitet, wie eigenartig"
-#: svnlook/main.c:1201
+#: svnlook/main.c:1213
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "»%s« ist eine URL, sollte vermutlich ein Pfad sein"
-#: svnlook/main.c:1228
+#: svnlook/main.c:1240
#, c-format
msgid "Path '%s' is not a file"
msgstr "Pfad »%s« ist keine Datei"
-#: svnlook/main.c:1367
+#: svnlook/main.c:1379
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -8778,7 +8917,7 @@
"REVISION PFAD <ID>\n"
"-------- ---------\n"
-#: svnlook/main.c:1372
+#: svnlook/main.c:1384
#, c-format
msgid ""
"REVISION PATH\n"
@@ -8787,27 +8926,27 @@
"REVISION PFAD\n"
"-------- ----\n"
-#: svnlook/main.c:1419
+#: svnlook/main.c:1431
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Eigenschaft »%s« wurde in Revision %ld nicht gefunden"
-#: svnlook/main.c:1426
+#: svnlook/main.c:1438
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "Eigenschaft »%s« wurde in Pfad »%s« in Revision %ld nicht gefunden"
-#: svnlook/main.c:1431
+#: svnlook/main.c:1443
#, fuzzy, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "Eigenschaft »%s« wurde in Pfad »%s« in Revision %ld nicht gefunden"
-#: svnlook/main.c:1603 svnlook/main.c:1818
+#: svnlook/main.c:1616 svnlook/main.c:1831
#, c-format
msgid "Missing repository path argument"
msgstr "Fehlende Option für Pfad des Projektarchivs"
-#: svnlook/main.c:1664
+#: svnlook/main.c:1677
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -8830,11 +8969,11 @@
"\n"
"Verfügbare Unterbefehle:\n"
-#: svnlook/main.c:1720
+#: svnlook/main.c:1733
msgid "Missing path argument"
msgstr "Fehlender Pfad Parameter"
-#: svnlook/main.c:1745
+#: svnlook/main.c:1758
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8843,7 +8982,7 @@
"Kommentar (%i Zeilen):\n"
"%s\n"
-#: svnlook/main.c:1746
+#: svnlook/main.c:1759
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8852,42 +8991,42 @@
"Kommentar (%i Zeile):\n"
"%s\n"
-#: svnlook/main.c:1792
+#: svnlook/main.c:1805
#, c-format
msgid "Missing propname argument"
msgstr "Fehlender PROPNAME Parameter"
-#: svnlook/main.c:1793
+#: svnlook/main.c:1806
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Eigenschaftsname und Pfad im Projektarchiv nicht angegeben"
-#: svnlook/main.c:1799
+#: svnlook/main.c:1812
msgid "Missing propname or repository path argument"
msgstr "Eigenschaftsname oder Pfad im Projektarchiv nicht angegeben"
-#: svnlook/main.c:1957
+#: svnlook/main.c:1971
msgid "Invalid revision number supplied"
msgstr "Ungültige Revisionsnummer angegeben"
-#: svnlook/main.c:2018
+#: svnlook/main.c:2036
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr ""
"Die Parameter »--transaction« (-t) und »--revision« (-r) können nicht\n"
"gleichzeitig angegeben werden"
-#: svnlook/main.c:2100
+#: svnlook/main.c:2118
#, c-format
msgid "Repository argument required\n"
msgstr "Projektarchiv Parameter erforderlich\n"
-#: svnlook/main.c:2109
+#: svnlook/main.c:2127
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "»%s« ist eine URL obwohl es ein Pfad sein sollte\n"
-#: svnlook/main.c:2160
+#: svnlook/main.c:2178
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8896,74 +9035,94 @@
"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n"
"Geben Sie »svnlook help %s« ein, um Hilfe zu erhalten.\n"
-#: svnlook/main.c:2203
+#: svnlook/main.c:2221
msgid "Try 'svnlook help' for more info"
msgstr ""
-#: svnserve/main.c:141
+#: svnserve/cyrus_auth.c:243
+#, c-format
+msgid "Can't get hostname"
+msgstr "Kann den Hostnamen nicht erhalten"
+
+#: svnserve/cyrus_auth.c:311
+msgid "Could not obtain the list of SASL mechanisms"
+msgstr "Konnte die Liste der SASL-Mechanismen nicht erhalten"
+
+#: svnserve/cyrus_auth.c:351
+msgid "Couldn't obtain the authenticated username"
+msgstr "Kann den angemeldeten Benutzername nicht erhalten"
+
+#: svnserve/main.c:142
msgid "daemon mode"
msgstr "Daemonmodus"
-#: svnserve/main.c:143
+#: svnserve/main.c:144
msgid "listen port (for daemon mode)"
msgstr "Horche auf Port (als Daemon)"
-#: svnserve/main.c:145
+#: svnserve/main.c:146
msgid "listen hostname or IP address (for daemon mode)"
msgstr "Horche auf Hostnamen oder IP-Adresse (als Daemon)"
-#: svnserve/main.c:147
+#: svnserve/main.c:148
msgid "run in foreground (useful for debugging)"
msgstr "Im Vordergrund starten (nützlich zum Debuggen)"
-#: svnserve/main.c:148 svnversion/main.c:123
+#: svnserve/main.c:149 svnversion/main.c:123
msgid "display this help"
msgstr "Hilfe anzeigen"
-#: svnserve/main.c:151
+#: svnserve/main.c:152
msgid "inetd mode"
msgstr "Inetd-Modus"
-#: svnserve/main.c:152
+#: svnserve/main.c:153
msgid "root of directory to serve"
msgstr "Basis des bereitzustellenden Verzeichnisses"
-#: svnserve/main.c:154
+#: svnserve/main.c:155
msgid "force read only, overriding repository config file"
msgstr ""
"Erzwinge Schreibschutz. Setze Einstellung in der\n"
"Projektarchivkonfiguration außer Kraft."
-#: svnserve/main.c:155
+#: svnserve/main.c:156
msgid "tunnel mode"
msgstr "Tunnelmodus"
-#: svnserve/main.c:157
+#: svnserve/main.c:158
msgid "tunnel username (default is current uid's name)"
msgstr "Benutzername »tunneln« (Vorgabe ist der Name der aktuellen UID)"
-#: svnserve/main.c:159
+#: svnserve/main.c:160
msgid "use threads instead of fork"
msgstr "Verwende »Threads« anstelle »Fork«"
-#: svnserve/main.c:161
+#: svnserve/main.c:162
msgid "listen once (useful for debugging)"
msgstr "Einmal zuhören (nützlich zum Debuggen)"
-#: svnserve/main.c:163
-msgid "write server process ID to file arg"
-msgstr "Schreibe Server-Prozess-ID ins Dateiargument"
+# FIXME: svn --help help gibt "--config-dir par" aus (par statt PAR)!
+#: svnserve/main.c:164
+#, fuzzy
+msgid "read configuration from file ARG"
+msgstr "Benutzerkonfigurationsdateien aus dem Verzeichnis PAR lesen"
#: svnserve/main.c:166
+#, fuzzy
+msgid "write server process ID to file ARG"
+msgstr "Schreibe Server-Prozess-ID ins Dateiargument"
+
+#: svnserve/main.c:169
msgid "run as a windows service (SCM only)"
msgstr "Als Windows-Dienst starten (nur SCM)"
-#: svnserve/main.c:178
+#: svnserve/main.c:181
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Geben Sie »%s --help« für weitere Hilfe ein.\n"
-#: svnserve/main.c:187
+#: svnserve/main.c:190
msgid ""
"usage: svnserve [options]\n"
"\n"
@@ -8973,21 +9132,21 @@
"\n"
"Gültige Optionen:\n"
-#: svnserve/main.c:450
+#: svnserve/main.c:444
#, fuzzy, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "Arbeitskopie Pfad »%s« existiert nicht im Projektarchiv"
-#: svnserve/main.c:492
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Sie müssen genau einen der Parameter -d, -i, -t oder -X angeben.\n"
-#: svnserve/main.c:502
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "Die Option --tunnel-user ist nur im Tunnelmodus zulässig.\n"
-#: svnserve/main.c:571
+#: svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
@@ -8996,53 +9155,45 @@
"svnserve: Die Option --service ist nur gültig, wenn der Prozess durch den "
"Service Control Manager gestartet wurde.\n"
-#: svnserve/main.c:607
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "Kann Adressinformation nicht ermitteln"
-#: svnserve/main.c:623
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "Kann Serververbindung nicht erzeugen"
-#: svnserve/main.c:636
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "Kann Serververbindung nicht binden"
-#: svnserve/main.c:704
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "Kann Clientverbindung nicht annehmen"
-#: svnserve/main.c:758
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "Kann »Thread« Attribut nicht erzeugen"
-#: svnserve/main.c:766
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "Kann nicht in den gelösten Status wechseln"
-#: svnserve/main.c:779
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "Kann Thread nicht erzeugen"
-#: svnserve/sasl_auth.c:243
-#, c-format
-msgid "Can't get hostname"
-msgstr "Kann den Hostnamen nicht erhalten"
-
-#: svnserve/sasl_auth.c:311
-msgid "Could not obtain the list of SASL mechanisms"
-msgstr "Konnte die Liste der SASL-Mechanismen nicht erhalten"
-
-#: svnserve/sasl_auth.c:351
-msgid "Couldn't obtain the authenticated username"
-msgstr "Kann den angemeldeten Benutzername nicht erhalten"
+#: svnserve/serve.c:1437
+#, fuzzy
+msgid "Path is not a string"
+msgstr "Pfad ist keine Datei in einer Arbeitskopie"
#: svnserve/winservice.c:341
#, c-format
@@ -9068,7 +9219,7 @@
"Der Dienst konnte nicht gestartet werden; ein interner Fehler trat beim "
"Starten des Dienstes auf"
-#: svnsync/main.c:56
+#: svnsync/main.c:64
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -9098,29 +9249,37 @@
"Anders ausgedrückt stellt das Zielprojektarchiv einen Spiegel des\n"
"Quellprojektarchivs dar, auf den nur lesend zugegriffen werden darf.\n"
-#: svnsync/main.c:71
+#: svnsync/main.c:79
+#, fuzzy
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
-"Transfer all pending revisions from source to destination.\n"
+"Transfer all pending revisions to the destination from the source\n"
+"with which it was initialized.\n"
msgstr ""
"Aufruf: svnsync synchronize ZIEL_URL\n"
"\n"
"Überträgt alle laufenden Revisionen von der Quelle zum Ziel.\n"
-#: svnsync/main.c:76
+#: svnsync/main.c:85
msgid ""
-"usage: svnsync copy-revprops DEST_URL REV\n"
+"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
-"Copy all revision properties for revision REV from source to\n"
+"Copy the revision properties in a given range of revisions to the\n"
+"destination from the source with which it was initialized.\n"
+"\n"
+"If REV and REV2 are provided, copy properties for the revisions\n"
+"specified by that range, inclusively. If only REV is provided,\n"
+"copy properties for that revision alone. If REV is not provided,\n"
+"copy properties for all revisions previously transferred to the\n"
"destination.\n"
-msgstr ""
-"Aufruf: svnsync copy-revprops ZIEL_URL REV\n"
"\n"
-"Kopiert alle Revisionseigenschaften der Revision REV von der Quelle zum "
-"Ziel.\n"
+"REV and REV2 must be revisions which were previously transferred\n"
+"to the destination. You may use \"HEAD\" for either revision to\n"
+"mean \"the last revision transferred\".\n"
+msgstr ""
-#: svnsync/main.c:82
+#: svnsync/main.c:101
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -9130,66 +9289,94 @@
"\n"
"Beschreibt die Anwendung dieses Programms und seiner Unterbefehle.\n"
-#: svnsync/main.c:184
+#: svnsync/main.c:115
+msgid ""
+"specify a username ARG (deprecated;\n"
+" see --source-username and --sync-username)"
+msgstr ""
+
+#: svnsync/main.c:119
+msgid ""
+"specify a password ARG (deprecated;\n"
+" see --source-password and --sync-password)"
+msgstr ""
+
+#: svnsync/main.c:123
+msgid "connect to source repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:125
+msgid "connect to source repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:127
+msgid "connect to sync repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:129
+msgid "connect to sync repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:218
#, c-format
msgid "Can't get local hostname"
msgstr "Kann den lokalen Hostnamen nicht bekommen"
-#: svnsync/main.c:206
+#: svnsync/main.c:241
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr ""
"Konnte Sperre für Zielprojektarchiv nicht erhalten, die zurzeit von\n"
"»%s« gehalten wird\n"
-#: svnsync/main.c:301
+#: svnsync/main.c:336
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "Basis der Sitzung ist »%s«, aber die Basis des Projektarchivs ist »%s«"
-#: svnsync/main.c:368
+#: svnsync/main.c:403
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr ""
"Kopierte Eigenschaften für Revision %ld (%s* Eigenschaften übergangen).\n"
-#: svnsync/main.c:373
+#: svnsync/main.c:408
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Eigenschaften für Revision %ld kopiert.\n"
-#: svnsync/main.c:414
+#: svnsync/main.c:450
msgid "Cannot initialize a repository with content in it"
msgstr "Kann kein Projektarchiv mit Inhalt initialisieren"
# CHECKME
-#: svnsync/main.c:425
+#: svnsync/main.c:461
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Das Zielprojektarchiv synchronisiert bereits von »%s«"
-#: svnsync/main.c:489 svnsync/main.c:492 svnsync/main.c:1159
-#: svnsync/main.c:1250
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Pfad »%s« ist keine URL"
-#: svnsync/main.c:874
+#: svnsync/main.c:914
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Revision %ld übertragen.\n"
-#: svnsync/main.c:913
+#: svnsync/main.c:954
msgid "Destination repository has not been initialized"
msgstr "Zielprojektarchiv wurde noch nicht initialisiert"
-#: svnsync/main.c:928
+#: svnsync/main.c:969
#, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
msgstr ""
"UUID des Quellprojektarchivs (%s) entspricht nicht der erwarteten UUID (%s)"
-#: svnsync/main.c:990
+#: svnsync/main.c:1032
#, c-format
msgid ""
"Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -9200,7 +9387,7 @@
"und Ziel-HEAD (%ld) sind inkonsistent. Haben Sie in das Ziel ohne Verwendung "
"von svnsync übertragen?"
-#: svnsync/main.c:1028
+#: svnsync/main.c:1070
#, c-format
msgid ""
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
@@ -9209,22 +9396,30 @@
"Ziel-HEAD (%ld) ist nicht die zuletzt zusammengeführte Revision (%ld). Haben "
"Sie in das Ziel ohne Verwendung von svnsync übertragen?"
-#: svnsync/main.c:1105
+#: svnsync/main.c:1148
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr "Übertragung erzeugte Revision %ld, sollte aber %ld erzeugen"
-#: svnsync/main.c:1214
-msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+#: svnsync/main.c:1275 svnsync/main.c:1280
+#, fuzzy, c-format
+msgid ""
+"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr ""
"Kann keine Revisionseigenschaften für eine Revision kopieren, die noch nicht "
"synchronisiert wurde"
-#: svnsync/main.c:1253
-msgid "Invalid revision number"
+#: svnsync/main.c:1332
+#, fuzzy, c-format
+msgid "'%s' is not a valid revision range"
+msgstr "»%s« hat eine ungültige Revision"
+
+#: svnsync/main.c:1346 svnsync/main.c:1366
+#, fuzzy, c-format
+msgid "Invalid revision number (%ld)"
msgstr "Ungültige Revisionsnummer"
-#: svnsync/main.c:1289
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -9240,16 +9435,22 @@
"\n"
"Verfügbare Unterbefehle:\n"
-#: svnsync/main.c:1479
-#, c-format
+#: svnsync/main.c:1581
msgid ""
-"subcommand '%s' doesn't accept option '%s'\n"
+"Cannot use --username or --password with any of --source-username, --source-"
+"password, --sync-username, or --sync-password.\n"
+msgstr ""
+
+#: svnsync/main.c:1661
+#, fuzzy, c-format
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnsync help %s' for usage.\n"
msgstr ""
"Unterbefehl »%s« akzeptiert die Option »%s« nicht\n"
"Geben Sie »svnsync help %s« für Hilfe ein.\n"
-#: svnsync/main.c:1541
+#: svnsync/main.c:1733
#, fuzzy
msgid "Try 'svnsync help' for more info"
msgstr ""
@@ -9332,16 +9533,73 @@
msgstr "gibt letzte geänderte statt aktueller Revisionen aus"
# FIXME: check spaces!
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "exportiert %s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "»%s« nicht versioniert und nicht exportiert\n"
+#~ msgid "'%s' is not under version control or doesn't exist"
+#~ msgstr "»%s« ist nicht unter Versionskontrolle oder existiert nicht"
+
+#~ msgid "No support for repos <--> working copy moves"
+#~ msgstr ""
+#~ "Verschieben von Arbeitskopie <--> Projektarchiv wird nicht unterstützt"
+
+#~ msgid "Cannot read entry for '%s'"
+#~ msgstr "Kann Eintrag für »%s« nicht lesen"
+
+#~ msgid "Lock comment has illegal characters"
+#~ msgstr "Sperrkommentar enthält illegale Zeichen"
+
+#~ msgid "Can't find entry for '%s'"
+#~ msgstr "Kann Eintrag für »%s« nicht finden"
+
+#, fuzzy
+#~ msgid "Can't get user name"
+#~ msgstr "Kann keinen Dateinamen holen"
+
+#~ msgid "Unhandled SASL interaction"
+#~ msgstr "Nicht behandelte SASL-Interaktion"
+
+#~ msgid " arg"
+#~ msgstr " par"
+
+#~ msgid "'%s' has unsupported special file type '%s'"
+#~ msgstr "»%s« hat nicht unterstützten speziellen Dateityp »%s«"
+
+#~ msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
+#~ msgstr "Prüfsummenfehler für »%s«; erwartet: »%s«, tatsächlich: »%s«"
+
+#~ msgid "No entry for '%s'"
+#~ msgstr "Kein Eintrag für »%s«"
+
+#~ msgid "Cannot revert: '%s' is not under version control"
+#~ msgstr "Kann nicht zurücksetzen: »%s« ist nicht unter Versionskontrolle"
+
+#~ msgid "Cannot copy or move '%s': it's not under version control"
+#~ msgstr ""
+#~ "Kann »%s« nicht kopieren oder verschieben, da es sich nicht unter\n"
+#~ "Versionskontrolle befindet"
+
+#~ msgid "descend recursively"
+#~ msgstr "Rekursiv hinabsteigen"
+
+#~ msgid ""
+#~ "usage: svnsync copy-revprops DEST_URL REV\n"
+#~ "\n"
+#~ "Copy all revision properties for revision REV from source to\n"
+#~ "destination.\n"
+#~ msgstr ""
+#~ "Aufruf: svnsync copy-revprops ZIEL_URL REV\n"
+#~ "\n"
+#~ "Kopiert alle Revisionseigenschaften der Revision REV von der Quelle zum "
+#~ "Ziel.\n"
+
# FIXME: muss noch in libsvn_ra/ra_loader.c:699 als übersetzbar markiert werden
# (Franzosen verwenden "* ra_%s : %s\n")
# svn --help gibt aus: "* ra_dav: Modul"
diff --git a/subversion/po/es.po b/subversion/po/es.po
index 3cf7536..9e7f3aa 100644
--- a/subversion/po/es.po
+++ b/subversion/po/es.po
@@ -29,7 +29,7 @@
msgstr ""
"Project-Id-Version: subversion 1.4\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-04-03 01:08-0300\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2007-03-30 01:15-0300\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Spanish <dev@subversion.tigris.org>\n"
@@ -1176,37 +1176,37 @@
msgid "'%s' has local modifications"
msgstr "'%s' está modificado localmente"
-#: libsvn_client/diff.c:136
+#: libsvn_client/diff.c:135
#, c-format
msgid " Reverted %s:r%s%s"
msgstr " Se revirtió %s:r%s%s"
-#: libsvn_client/diff.c:154
+#: libsvn_client/diff.c:153
#, c-format
msgid " Merged %s:r%s%s"
msgstr " Se fusionó %s:r%s%s"
-#: libsvn_client/diff.c:176
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sCambios de propiedades en %s%s"
-#: libsvn_client/diff.c:204
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "Nombre: %s%s"
-#: libsvn_client/diff.c:323
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revisión: %ld)"
-#: libsvn_client/diff.c:325
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(copia de trabajo)"
-#: libsvn_client/diff.c:468
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "No se puede mostrar: el archivo está marcado como binario.%s"
@@ -1214,27 +1214,27 @@
#. -----------------------------------------------------------------------
#. ** Utilities. **
#. Sanity check -- ensure that we have valid revisions to look at.
-#: libsvn_client/diff.c:828 libsvn_client/merge.c:61
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "No se especificaron todas las revisiones requeridas"
-#: libsvn_client/diff.c:843
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr ""
"Al menos una revisión debe ser no-local para un diff de clavija (pegged)"
-#: libsvn_client/diff.c:955 libsvn_client/diff.c:967
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' no se encontró en el repositorio en la revisión %ld"
-#: libsvn_client/diff.c:1026
+#: libsvn_client/diff.c:1025
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr ""
"Lo siento, svn_client_diff4 fue llamado de una manera que todavía no está "
"admitida"
-#: libsvn_client/diff.c:1068
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1242,12 +1242,12 @@
"Sólo los diffs entre la base de texto de una ruta y sus archivos de trabajo "
"son soportados en este momento"
-#: libsvn_client/diff.c:1213 libsvn_client/switch.c:107
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "El directorio '%s' no tiene URL"
-#: libsvn_client/diff.c:1422
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr "El 'diff' resumido sólo puede comparar dos referencias al repositorio"
@@ -1273,7 +1273,7 @@
msgstr "'%s' ya existe"
#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
-#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2463
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr ""
@@ -1297,7 +1297,7 @@
#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
-#: libsvn_client/ra.c:390 libsvn_client/ra.c:756 libsvn_client/ra.c:893
+#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
#, c-format
msgid "'%s' has no URL"
msgstr "'%s' no tiene URL"
@@ -1427,34 +1427,34 @@
msgid "Unknown node kind for '%s'"
msgstr "Tipo de nodo desconocido para '%s'"
-#: libsvn_client/ra.c:148
+#: libsvn_client/ra.c:133
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr ""
"Intento de asignar la propiedad de copia de trabajo '%s' en '%s' en una "
"operación que no es de commit"
-#: libsvn_client/ra.c:511
+#: libsvn_client/ra.c:496
#, c-format
msgid "Missing changed-path information for '%s' in revision %ld"
msgstr "Información changed-path faltante para '%s' en la revisión %ld"
-#: libsvn_client/ra.c:631
+#: libsvn_client/ra.c:616
#, c-format
msgid "Path '%s' doesn't exist in revision %ld"
msgstr "La ruta '%s' no existe en la revisión %ld"
-#: libsvn_client/ra.c:678 libsvn_client/ra.c:841
+#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "Imposible encontrar la ubicación de '%s' en la revisión %ld"
-#: libsvn_client/ra.c:689
+#: libsvn_client/ra.c:674
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "'%s' en la revisión %ld es un objeto no relacionado"
-#: libsvn_client/ra.c:846
+#: libsvn_client/ra.c:831
#, c-format
msgid ""
"The location for '%s' for revision %ld does not exist in the repository or "
@@ -1651,15 +1651,15 @@
msgid "deleting changes"
msgstr "borrar cambios"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2393
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "Falta el id de revisión del nodo"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2403
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "Orden de cambios erróneo: nuevo ID de revisión de nodo sin delete"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2414
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "Orden de cambios erróneo: cambio no aditivo en una ruta eliminada"
@@ -1779,120 +1779,120 @@
msgid "set repository uuid"
msgstr "asignar uuid del repositorio"
-#: libsvn_fs_base/dag.c:220
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"BD corrupta: el id de la transacción inicial no es '0' en el sistema de "
"archivos '%s'"
-#: libsvn_fs_base/dag.c:228
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr ""
"BD corrupta: el id de la copia inicial no es '0' en el sistema de archivos '%"
"s'"
-#: libsvn_fs_base/dag.c:237
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"BD corrupta: el número de la revisión inicial no es '0' en el sistema de "
"archivos '%s'"
-#: libsvn_fs_base/dag.c:285 libsvn_fs_base/dag.c:461 libsvn_fs_fs/dag.c:333
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "Se intentó crearle una entrada a un padre que no era un directorio"
-#: libsvn_fs_base/dag.c:455 libsvn_fs_fs/dag.c:327
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Se intentó crear un nodo con un nombre ilegal '%s'"
-#: libsvn_fs_base/dag.c:467 libsvn_fs_base/dag.c:701 libsvn_fs_fs/dag.c:339
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "Se intentó clonar el hijo de un nodo inmutable"
-#: libsvn_fs_base/dag.c:474
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Se intentó crear una entrada que ya existe"
-#: libsvn_fs_base/dag.c:525 libsvn_fs_fs/dag.c:401
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "Se intentó establecer una entrada en un nodo que no es un directorio"
-#: libsvn_fs_base/dag.c:531 libsvn_fs_fs/dag.c:407
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "Se intentó establecer una entrada en un nodo inmutable"
-#: libsvn_fs_base/dag.c:595
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr ""
"No se puede establecer una lista de propiedades en el nodo-revisión "
"*inmutable* %s"
-#: libsvn_fs_base/dag.c:707
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "Se intentó crear un clon hijo con un nombre ilegal '%s'"
-#: libsvn_fs_base/dag.c:833
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "Se intentó borrar la entrada '%s' de un nodo que no es un directorio"
-#: libsvn_fs_base/dag.c:839
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "Se intentó borrar la entrada '%s' de un nodo de directorio inmutable"
-#: libsvn_fs_base/dag.c:846
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Se intentó borrar un nodo con un nombre ilegal '%s'"
-#: libsvn_fs_base/dag.c:861 libsvn_fs_base/dag.c:894
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Falló el borrado: el directorio no tiene una entrada '%s'"
-#: libsvn_fs_base/dag.c:943
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Se intentó la remoción de un nodo inmutable"
-#: libsvn_fs_base/dag.c:1063
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr ""
"Se intentó obtener el contenido texto de un nodo que *no* era un archivo"
-#: libsvn_fs_base/dag.c:1098
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Se intentó obtener el tamaño de un nodo que *no* era un archivo"
-#: libsvn_fs_base/dag.c:1124
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr ""
"Se intentó obtener la suma de verificación de un nodo que *no* era un archivo"
-#: libsvn_fs_base/dag.c:1155 libsvn_fs_base/dag.c:1209
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr ""
"Se intentó establecer el contenido texto de un nodo que *no* era un archivo"
-#: libsvn_fs_base/dag.c:1161 libsvn_fs_base/dag.c:1215
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Se intentó establecer el contenido texto de un nodo inmutable"
-#: libsvn_fs_base/dag.c:1238
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1903,12 +1903,12 @@
" esperada: %s\n"
" presente: %s\n"
-#: libsvn_fs_base/dag.c:1293
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Se intentó abrir nodo hijo '%s' inexistente"
-#: libsvn_fs_base/dag.c:1299
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Se intentó abrir un nodo con un nombre ilegal '%s'"
@@ -2070,7 +2070,7 @@
"Error de la BD Berkeley para el sistema de archivos '%s' al abrir el "
"ambiente:\n"
-#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:642
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Se esperaba el formato de FS '%d', se encontró '%d'"
@@ -2218,7 +2218,7 @@
msgid "Transaction is dead: '%s'"
msgstr "La transacción está muerta: '%s'"
-#: libsvn_fs_base/revs-txns.c:1078
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "La transacción abortó, pero la limpieza posterior falló"
@@ -2386,139 +2386,140 @@
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Versión de cargador FS (%d) no soportada para fsfs"
-#: libsvn_fs_fs/fs_fs.c:351
+#: libsvn_fs_fs/fs_fs.c:352
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "No se pudo tomar el mutex FSFS de lista de txn"
-#: libsvn_fs_fs/fs_fs.c:359
+#: libsvn_fs_fs/fs_fs.c:360
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "No se pudo soltar el mutex FSFS de lista de txn"
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "No se pudo desbloquear la transacción desconocida '%s'"
-#: libsvn_fs_fs/fs_fs.c:389
+#: libsvn_fs_fs/fs_fs.c:390
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "No se pudo desbloquear la transacción no bloqueada '%s'"
-#: libsvn_fs_fs/fs_fs.c:396
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
-#: libsvn_fs_fs/fs_fs.c:402
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr ""
-#: libsvn_fs_fs/fs_fs.c:464
+#: libsvn_fs_fs/fs_fs.c:465
#, 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 ""
-#: libsvn_fs_fs/fs_fs.c:500
+#: libsvn_fs_fs/fs_fs.c:501
#, 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 ""
-#: libsvn_fs_fs/fs_fs.c:507 libsvn_subr/io.c:1512
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "No se pudo conseguir un bloqueo exclusivo sobre el archivo '%s'"
-#: libsvn_fs_fs/fs_fs.c:833 libsvn_fs_fs/fs_fs.c:847
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "Se encontró una cabecera inválida el un archivo de revisión"
-#: libsvn_fs_fs/fs_fs.c:949 libsvn_fs_fs/fs_fs.c:963 libsvn_fs_fs/fs_fs.c:970
-#: libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985 libsvn_fs_fs/fs_fs.c:993
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "Línea de incremento en repositorio de texto malformada en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1062
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "Falta el campo tipo en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1093
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "Falta cpath en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1120 libsvn_fs_fs/fs_fs.c:1126
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "Línea copyroot malformada en el node-rev"
-#: libsvn_fs_fs/fs_fs.c:1144 libsvn_fs_fs/fs_fs.c:1150
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "Línea copyfrom malformada en el node-rev"
-#: libsvn_fs_fs/fs_fs.c:1259 libsvn_fs_fs/fs_fs.c:3674
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "Intento de escribir en lo que no era una transacción"
-#: libsvn_fs_fs/fs_fs.c:1343
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "Cabecera de representación malformada"
-#: libsvn_fs_fs/fs_fs.c:1367
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "Falta node-id en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1373
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "node-id corrupto en node-rev"
-#: libsvn_fs_fs/fs_fs.c:1418
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "Al archivo de revisión le falta el fin de línea final"
-#: libsvn_fs_fs/fs_fs.c:1430
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "La línea final en un archivo de revisión tiene más de 64 caracteres"
-#: libsvn_fs_fs/fs_fs.c:1445
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "Le falta un espacio a la línea final en un archivo de revisión"
-#: libsvn_fs_fs/fs_fs.c:1474 libsvn_fs_fs/fs_fs.c:1532 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "No hay una revisión %ld"
-#: libsvn_fs_fs/fs_fs.c:1592
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "Datos svndiff malformados en la representación"
-#: libsvn_fs_fs/fs_fs.c:1735 libsvn_fs_fs/fs_fs.c:1748
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr ""
"La lectura de una ventana de svndiff leyó más allá del fin de la "
"representación"
-#: libsvn_fs_fs/fs_fs.c:1884
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "datos svndiff pidieron una fuente que no existe"
-#: libsvn_fs_fs/fs_fs.c:1890
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "la posición pedida por svndiff va más allá del final del flujo"
-#: libsvn_fs_fs/fs_fs.c:1913 libsvn_fs_fs/fs_fs.c:1930
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "el largo de la ventana svndiff está corrupto"
-#: libsvn_fs_fs/fs_fs.c:1978
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2529,95 +2530,95 @@
" esperada: %s\n"
" presente: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2201 libsvn_fs_fs/fs_fs.c:2214
-#: libsvn_fs_fs/fs_fs.c:2220 libsvn_fs_fs/fs_fs.c:4765
-#: libsvn_fs_fs/fs_fs.c:4774 libsvn_fs_fs/fs_fs.c:4780
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "Entrada corrupta de directorio"
-#: libsvn_fs_fs/fs_fs.c:2559 libsvn_fs_fs/fs_fs.c:2567
-#: libsvn_fs_fs/fs_fs.c:2599 libsvn_fs_fs/fs_fs.c:2619
-#: libsvn_fs_fs/fs_fs.c:2653 libsvn_fs_fs/fs_fs.c:2658
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "Línea de cambios inválida en archivo de rev"
-#: libsvn_fs_fs/fs_fs.c:2592
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "Tipo de cambio inválido en archivo de rev"
-#: libsvn_fs_fs/fs_fs.c:2612
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "Bandera text-mod inválida en archivo de rev"
-#: libsvn_fs_fs/fs_fs.c:2632
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "Bandera prop-mod inválida en archivo de rev"
-#: libsvn_fs_fs/fs_fs.c:2816
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "No se permite copiar desde transacciones"
-#: libsvn_fs_fs/fs_fs.c:2872
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Imposible crear directorio de transacción en '%s' para la revisión %ld"
-#: libsvn_fs_fs/fs_fs.c:3106 libsvn_fs_fs/fs_fs.c:3113
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "archivo next-id corrupto"
-#: libsvn_fs_fs/fs_fs.c:3200
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "La limpieza posterior a la transacción falló"
-#: libsvn_fs_fs/fs_fs.c:3368
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "Tipo de cambio inválido"
-#: libsvn_fs_fs/fs_fs.c:3693
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "No se puede asignar contenido de tipo 'texto' a un directorio"
-#: libsvn_fs_fs/fs_fs.c:3783 libsvn_fs_fs/fs_fs.c:3788
-#: libsvn_fs_fs/fs_fs.c:3795
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "Archivo actual corrupto"
-#: libsvn_fs_fs/fs_fs.c:4084 libsvn_subr/io.c:2790 svn/util.c:252
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "No se pudo obtener atributos del archivo '%s'"
-#: libsvn_fs_fs/fs_fs.c:4088
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "No se pudo cambiar los permisos de '%s'"
-#: libsvn_fs_fs/fs_fs.c:4237
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "No se pudo tomar el mutex del repositorio FSFS"
-#: libsvn_fs_fs/fs_fs.c:4251
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "No se pudo soltar el mutex del repositorio FSFS"
-#: libsvn_fs_fs/fs_fs.c:4370
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "La transacción está obsoleta"
-#: libsvn_fs_fs/fs_fs.c:4706
+#: libsvn_fs_fs/fs_fs.c:4807
#, fuzzy
msgid "Recovery encountered a non-directory node"
msgstr "Se intentó establecer una entrada en un nodo que no es un directorio"
-#: libsvn_fs_fs/fs_fs.c:4728
+#: libsvn_fs_fs/fs_fs.c:4829
msgid "Recovery encountered a deltified directory representation"
msgstr ""
-#: libsvn_fs_fs/fs_fs.c:4991
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "No existe tal transacción"
@@ -3072,8 +3073,8 @@
msgid "%s request failed on '%s'"
msgstr "requerimiento %s falló en '%s'"
-#: libsvn_ra_local/ra_plugin.c:106 libsvn_ra_local/ra_plugin.c:595
-#: libsvn_wc/update_editor.c:2605
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -3086,15 +3087,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:248
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "Módulo para acceder a un repositorio en el disco local."
-#: libsvn_ra_local/ra_plugin.c:288
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "No se pudo abrir una sesión ra_local con el URL"
-#: libsvn_ra_local/ra_plugin.c:1440
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Versión de cargador RA (%d) no soportada para ra_local."
@@ -3301,8 +3302,8 @@
msgid ""
"Server doesn't support setting arbitrary revision properties during commit"
msgstr ""
-"El servidor no admite el establecer propiedades de revisión arbitrarias "
-"en el momento del commit"
+"El servidor no admite el establecer propiedades de revisión arbitrarias en "
+"el momento del commit"
#: libsvn_ra_svn/client.c:900
msgid "Non-string as part of file contents"
@@ -3833,36 +3834,41 @@
msgstr ""
"La ruta del sistema de archivos '%s' no es ni un archivo ni un directorio"
-#: libsvn_repos/reporter.c:218
+#: libsvn_repos/reporter.c:222
#, c-format
msgid "Invalid depth (%s) for path '%s'"
msgstr "Profundidad inválida (%s) para la ruta '%s'"
-#: libsvn_repos/reporter.c:649
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "La ruta '%s' de la copia de trabajo no existe en el repositorio"
-#: libsvn_repos/reporter.c:944
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "No se está autorizado a abrir la raíz de la operación de edición"
-#: libsvn_repos/reporter.c:963
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "La ruta objetivo no existe"
-#: libsvn_repos/reporter.c:970
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "No se puede reemplazar a un directorio desde dentro de él"
-#: libsvn_repos/reporter.c:1013
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "'Report' inválido para la base de la copia de trabajo"
-#: libsvn_repos/reporter.c:1028
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "Dos reportes en el nivel base sin objetivos"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "Tipo de nodo no soportado para la ruta '%s'"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -4174,7 +4180,7 @@
msgid "Can't flush file to disk"
msgstr "No se pudo purgar el búfer de un archivo hacia el disco"
-#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:537
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
#, c-format
msgid "Can't open stdin"
msgstr "No se pudo abrir la entrada estándar"
@@ -4475,27 +4481,27 @@
"\"%s\": comando desconocido.\n"
"\n"
-#: libsvn_subr/opt.c:788
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Error de sintaxis analizando la revisión '%s'"
-#: libsvn_subr/opt.c:865
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "El URL '%s'no está propiamente codificado como URL"
-#: libsvn_subr/opt.c:871
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "El URL '%s' contiene un elemento '..'"
-#: libsvn_subr/opt.c:900
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Error resolviendo mayúsculas/minúsculas de '%s'"
-#: libsvn_subr/opt.c:1002
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4506,7 +4512,7 @@
" compilado %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:1005
+#: libsvn_subr/opt.c:998
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4520,7 +4526,7 @@
"por CollabNet (http://www.Collab.Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1056 libsvn_subr/opt.c:1097
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Tipee '%s help' para ver el modo de uso.\n"
@@ -4625,7 +4631,7 @@
msgid "Passphrase for '%s': "
msgstr "Frase clave para '%s': "
-#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1633
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "El archivo '%s' tiene finales de línea inconsistentes"
@@ -5318,7 +5324,7 @@
msgid "Can't find entry '%s' in '%s'"
msgstr "No se puede encontrar la entrada '%s' en '%s'"
-#: libsvn_wc/props.c:726
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5327,7 +5333,7 @@
"Intentando añadir una nueva propiedad '%s' con valor '%s',\n"
"pero ya existe con valor '%s'."
-#: libsvn_wc/props.c:764
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5336,7 +5342,7 @@
"Intentando cambiar la propiedad '%s' de '%s' a '%s',\n"
"pero la propiedad no existe."
-#: libsvn_wc/props.c:809
+#: libsvn_wc/props.c:808
#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
@@ -5344,7 +5350,7 @@
"Se intenta eliminar la propiedad '%s' pero su valor fue modificado de '%s' a "
"'%s'."
-#: libsvn_wc/props.c:838
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5353,52 +5359,52 @@
"Intentando cambiar la propiedad '%s' de '%s' a '%s',\n"
"pero la propiedad ya existe con valor '%s'."
-#: libsvn_wc/props.c:1023
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Falta el fin de línea en el archivo wcprops de '%s'"
-#: libsvn_wc/props.c:1206 libsvn_wc/props.c:1238 libsvn_wc/props.c:1508
-#: libsvn_wc/props.c:1756
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "Error al leer propiedades del disco"
-#: libsvn_wc/props.c:1266
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "No se pudo escribir el hash de la propiedad para '%s'"
-#: libsvn_wc/props.c:1500 libsvn_wc/props.c:1669
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "La propiedad '%s' es una propiedad de entradas"
-#: libsvn_wc/props.c:1547
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "No se puede asignar '%s' en un directorio ('%s')"
-#: libsvn_wc/props.c:1555
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "No se puede asignar '%s' en un archivo ('%s')"
-#: libsvn_wc/props.c:1561
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' no es ni un archivo ni un directorio"
-#: libsvn_wc/props.c:1642
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "El archivo '%s' tiene una propiedad mime que indica que es binario"
-#: libsvn_wc/props.c:2508
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Error interpretando propiedad %s en '%s': '%s'"
-#: libsvn_wc/props.c:2521
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
@@ -5547,12 +5553,12 @@
"Inconsistencia en la suma de verificación de '%s': registrada '%s', "
"presente: '%s'"
-#: libsvn_wc/update_editor.c:3003
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s' no tiene información de ancestros"
-#: libsvn_wc/update_editor.c:3162
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "El URL 'copyfrom' '%s' tiene una raíz de repositorio diferente a '%s'"
@@ -5591,10 +5597,10 @@
msgid ""
"Local, non-commit operations do not take a log message or revision properties"
msgstr ""
-"Las operaciones locales que no involucran un 'commit' o las remotas que operan"
-" sobre propedades de revisión, no llevan un mensaje de log"
+"Las operaciones locales que no involucran un 'commit' o las remotas que "
+"operan sobre propedades de revisión, no llevan un mensaje de log"
-#: svn/diff-cmd.c:117 svnserve/main.c:546
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "No se pudo abrir la salida estándar"
@@ -5658,7 +5664,7 @@
"Subversion es una herramienta para control de versiones.\n"
"Para información adicional, vea http://subversion.tigris.org/\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1429
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -7352,7 +7358,7 @@
"Se encontraron múltiples indicaciones de revisiones; no se puede usar -r y -"
"c, o intente '-r N:M' en vez de '-r N -r M'"
-#: svn/main.c:1121 svnadmin/main.c:1316
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Error de sintaxis en el parámetro de revisión '%s'"
@@ -7376,18 +7382,18 @@
msgid "Syntax error in native-eol argument '%s'"
msgstr "Error de sintaxis en el parámetro de native-eol '%s'"
-#: svn/main.c:1413 svndumpfilter/main.c:1207 svnlook/main.c:2066
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "El subcomando requiere un parámetro\n"
-#: svn/main.c:1432 svnadmin/main.c:1445 svndumpfilter/main.c:1226
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Comando desconocido: '%s'\n"
-#: svn/main.c:1465
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7396,19 +7402,19 @@
"El subcomando '%s' no acepta la opción '%s'\n"
"Tipee 'svn help %s' para ver modo de uso.\n"
-#: svn/main.c:1502
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"El mensaje de log es un archivo versionado, use '--force-log' para actuar de "
"todas formas"
-#: svn/main.c:1509
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"El mensaje de bloqueo es un archivo versionado, use '--force-log' para "
"actuar de todas formas"
-#: svn/main.c:1529
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7416,7 +7422,7 @@
"El mensaje de log es una ruta (¿la intención fue usar -F?); use '--force-"
"log' para forzar la acción"
-#: svn/main.c:1536
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7424,11 +7430,11 @@
"El mensaje de bloqueo es una ruta (¿la intención fue usar -F?); use '--force-"
"log' para forzar la acción"
-#: svn/main.c:1671
+#: svn/main.c:1668
msgid "Try 'svn help' for more info"
msgstr "Pruebe 'svn help' para más información"
-#: svn/main.c:1681
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -8400,19 +8406,19 @@
msgid "Removed lock on '%s'.\n"
msgstr "Se removió el bloqueo sobre '%s'.\n"
-#: svnadmin/main.c:1302
+#: svnadmin/main.c:1303
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Se encontraron múltiples indicaciones de revisiones; intente '-r N:M' en vez "
"de '-r N -r M'"
-#: svnadmin/main.c:1427
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "el subcomando requiere un parámetro\n"
-#: svnadmin/main.c:1512
+#: svnadmin/main.c:1502
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8421,7 +8427,7 @@
"El subcomando '%s' no acepta la opción '%s'\n"
"Tipee 'svnadmin help %s' para ver modo de uso.\n"
-#: svnadmin/main.c:1545
+#: svnadmin/main.c:1535
msgid "Try 'svnadmin help' for more info"
msgstr "Pruebe 'svnadmin help' para más información"
@@ -9052,63 +9058,63 @@
"\n"
"Opciones válidas:\n"
-#: svnserve/main.c:458
+#: svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "svnserve: La ruta raíz '%s' no existe o no es un direcotrio.\n"
-#: svnserve/main.c:507
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Debe especificar exactamente una de entre -d, -i, -t o -X.\n"
-#: svnserve/main.c:525
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "La opción --tunnel-user sólo es válida en modo túnel.\n"
-#: svnserve/main.c:594
+#: svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
"Service Control Manager.\n"
msgstr ""
-#: svnserve/main.c:630
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "No se pudo obtener la info de dirección"
-#: svnserve/main.c:646
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "No se pudo crear el socket servidor"
-#: svnserve/main.c:659
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "No se pudo asociar el socket servidor a una dirección (bind)"
-#: svnserve/main.c:727
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "No se pudo aceptar la conexión cliente"
-#: svnserve/main.c:781
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "No se pudo crear threadattr"
-#: svnserve/main.c:789
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "No se pudo marcar al hilo de ejecución como 'detached'"
-#: svnserve/main.c:802
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "No se pudo crear el hilo de ejecución"
-#: svnserve/serve.c:1463
+#: svnserve/serve.c:1437
msgid "Path is not a string"
msgstr "La ruta no es una cadena"
@@ -9270,8 +9276,8 @@
msgid "Destination repository is already synchronizing from '%s'"
msgstr "El repositorio destino ya está sincronizándose desde '%s'"
-#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1202
-#: svnsync/main.c:1381
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "La ruta '%s' no es un URL"
@@ -9315,7 +9321,7 @@
msgid "Commit created rev %ld but should have created %ld"
msgstr "El commit creó la rev %ld pero debió crear la rev %ld"
-#: svnsync/main.c:1274 svnsync/main.c:1279
+#: svnsync/main.c:1275 svnsync/main.c:1280
#, c-format
msgid ""
"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
@@ -9323,17 +9329,17 @@
"No se pueden copiar revprops de una revisión (%ld) que no todavía no se "
"sincronizó"
-#: svnsync/main.c:1331
+#: svnsync/main.c:1332
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "'%s' no es un rango de revisiones válido"
-#: svnsync/main.c:1345 svnsync/main.c:1365
+#: svnsync/main.c:1346 svnsync/main.c:1366
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Número de revisión inválido (%ld)"
-#: svnsync/main.c:1422
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -9347,7 +9353,7 @@
"\n"
"Subcomandos disponibles:\n"
-#: svnsync/main.c:1586
+#: svnsync/main.c:1581
msgid ""
"Cannot use --username or --password with any of --source-username, --source-"
"password, --sync-username, or --sync-password.\n"
@@ -9355,7 +9361,7 @@
"No se puede usar --username o --password con --source-username, --source-"
"password, --sync-username, o --sync-password.\n"
-#: svnsync/main.c:1666
+#: svnsync/main.c:1661
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9364,7 +9370,7 @@
"El subcomando '%s' no acepta la opción '%s'\n"
"Tipee 'svnsync help %s' para ver modo de uso.\n"
-#: svnsync/main.c:1738
+#: svnsync/main.c:1733
msgid "Try 'svnsync help' for more info"
msgstr "Pruebe 'svnsync help' para más información"
@@ -9440,12 +9446,12 @@
msgid "last changed rather than current revisions"
msgstr "revisiones del último cambio en vez de actual"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "exportado%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "%s no es un recurso versionado, no se exporta\n"
diff --git a/subversion/po/fr.po b/subversion/po/fr.po
index 758d4dc..2b52f3b 100644
--- a/subversion/po/fr.po
+++ b/subversion/po/fr.po
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: subversion 1.5\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-04-03 11:15+0200\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2007-03-27 09:33+0200\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: French <dev@subversion.tigris.org>\n"
@@ -1266,37 +1266,37 @@
msgid "'%s' has local modifications"
msgstr "'%s' a des modifications locales"
-#: libsvn_client/diff.c:136
+#: libsvn_client/diff.c:135
#, c-format
msgid " Reverted %s:r%s%s"
msgstr " Annulé %s:r%s%s"
-#: libsvn_client/diff.c:154
+#: libsvn_client/diff.c:153
#, c-format
msgid " Merged %s:r%s%s"
msgstr " Fusionné %s:r%s%s"
-#: libsvn_client/diff.c:176
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sModification de propriétés sur %s%s"
-#: libsvn_client/diff.c:204
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "Nom : %s%s"
-#: libsvn_client/diff.c:323
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(révision %ld)"
-#: libsvn_client/diff.c:325
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(copie de travail)"
-#: libsvn_client/diff.c:468
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Impossible d'afficher : fichier considéré comme binaire.%s"
@@ -1304,26 +1304,26 @@
#. -----------------------------------------------------------------------
#. ** Utilities. **
#. Sanity check -- ensure that we have valid revisions to look at.
-#: libsvn_client/diff.c:828 libsvn_client/merge.c:61
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "Toutes les révisions requises ne sont pas précisées"
-#: libsvn_client/diff.c:843
+#: libsvn_client/diff.c:842
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:955 libsvn_client/diff.c:967
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, 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:1026
+#: libsvn_client/diff.c:1025
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr "Désolé, appel de svn_client_diff4 de manière non encore supportée"
-#: libsvn_client/diff.c:1068
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1331,12 +1331,12 @@
"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:1213 libsvn_client/switch.c:107
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Le répertoire '%s' n'a pas d'URL associée"
-#: libsvn_client/diff.c:1422
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr "Le diff résumé compare seulement un dépôt à un autre"
@@ -1360,7 +1360,7 @@
msgstr "'%s' existe déjà"
#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
-#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2463
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Sommes de contrôle différentes pour '%s' ; '%s' attendu, '%s' obtenu"
@@ -1738,17 +1738,17 @@
msgid "deleting changes"
msgstr "effaçant des modifications"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2393
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "Absence de l'ID requise de la révision du noeud"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2403
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr ""
"Ordre de modificaiton invalide : nouvel ID de révision de noeud sans "
"effacement"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2414
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr ""
"Ordre de modification invalide : modification autre qu'un ajout sur un "
@@ -1871,126 +1871,126 @@
msgid "set repository uuid"
msgstr "définissant l'identifiant (uuid) du dépôt"
-#: libsvn_fs_base/dag.c:220
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"Base corrompue : la transaction initiale n'est pas '0' dans le système de "
"fichier '%s'"
-#: libsvn_fs_base/dag.c:228
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr ""
"Base corrompue : la copie initiale n'est pas '0' dans le système de fichier "
"'%s'"
-#: libsvn_fs_base/dag.c:237
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"Base corrompue : le numéro de révision initial n'est pas '0' dans le système "
"de fichier '%s'"
-#: libsvn_fs_base/dag.c:285 libsvn_fs_base/dag.c:461 libsvn_fs_fs/dag.c:333
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr ""
"Tentative de création d'une entrée dans un parent qui n'est pas un répertoire"
-#: libsvn_fs_base/dag.c:455 libsvn_fs_fs/dag.c:327
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Tentative de création d'un noeud avec un nom illégal '%s'"
-#: libsvn_fs_base/dag.c:467 libsvn_fs_base/dag.c:701 libsvn_fs_fs/dag.c:339
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "Tentative de clonage d'un enfant de noeud non modifiable"
-#: libsvn_fs_base/dag.c:474
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Tentative de création d'une entrée qui existe déjà"
-#: libsvn_fs_base/dag.c:525 libsvn_fs_fs/dag.c:401
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "Tentative de fixer une entrée à un noeud qui n'est pas un répertoire"
-#: libsvn_fs_base/dag.c:531 libsvn_fs_fs/dag.c:407
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "Tentative de fixer une entrée à un noeud non modifiable"
-#: libsvn_fs_base/dag.c:595
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr ""
"Impossible de fixer des propriétés sur la révision de noeud *non modifiable* "
"%s"
-#: libsvn_fs_base/dag.c:707
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "Tentative de clonage d'un enfant avec un nom illégal '%s'"
-#: libsvn_fs_base/dag.c:833
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr ""
"Tentative de suppression de l'entrée '%s' d'un noeud qui n'est *pas* un "
"répertoire"
-#: libsvn_fs_base/dag.c:839
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr ""
"Tentative de suppression de l'entrée '%s' d'un noeud répertoire non "
"modifiable"
-#: libsvn_fs_base/dag.c:846
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Tentative de suppression d'un noeud avec un nom illégal '%s'"
-#: libsvn_fs_base/dag.c:861 libsvn_fs_base/dag.c:894
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Suppression échouée : le répertoire n'a pas d'entrée '%s'"
-#: libsvn_fs_base/dag.c:943
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Tentative d'effacer un noeud non modifiable"
-#: libsvn_fs_base/dag.c:1063
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr ""
"Tentative d'obtention du contenu textuel d'une noeud qui n'est pas un fichier"
-#: libsvn_fs_base/dag.c:1098
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Tentative d'obtention de la taille d'un noeud qui n'est pas un fichier"
-#: libsvn_fs_base/dag.c:1124
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr ""
"Tentative d'obtention de la somme de contrôle d'un noeud qui n'est pas un "
"fichier"
-#: libsvn_fs_base/dag.c:1155 libsvn_fs_base/dag.c:1209
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr ""
"Tentative de définir le contenu textuel d'un noeud qui n'est pas un fichier"
-#: libsvn_fs_base/dag.c:1161 libsvn_fs_base/dag.c:1215
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Tentative de définir le contenu textuel d'un noeud non modifiable"
-#: libsvn_fs_base/dag.c:1238
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -2001,12 +2001,12 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_fs_base/dag.c:1293
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Tentative d'ouverture d'un noeud fils non existant '%s'"
-#: libsvn_fs_base/dag.c:1299
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Tentative d'ouverture d'un noeud avec un nom illégal '%s'"
@@ -2157,7 +2157,7 @@
"Erreur de base Berkeley pour le système de fichiers '%s' en ouvrant "
"l'environnement :\n"
-#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:642
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Format de stockage attendu '%d' ; format trouvé '%d'"
@@ -2301,7 +2301,7 @@
msgid "Transaction is dead: '%s'"
msgstr "Transaction morte : '%s'"
-#: libsvn_fs_base/revs-txns.c:1078
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "Transaction interrompue, mais échec du nettoyage (cleanup)"
@@ -2467,41 +2467,41 @@
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:351
+#: libsvn_fs_fs/fs_fs.c:352
#, 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:359
+#: libsvn_fs_fs/fs_fs.c:360
#, 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:385
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Impossible de déverrouiller la transaction inconnue '%s'"
-#: libsvn_fs_fs/fs_fs.c:389
+#: libsvn_fs_fs/fs_fs.c:390
#, 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:396
+#: libsvn_fs_fs/fs_fs.c:397
#, 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:402
+#: libsvn_fs_fs/fs_fs.c:403
#, 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:464
+#: libsvn_fs_fs/fs_fs.c:465
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2511,7 +2511,7 @@
"transaction '%s' parce qu'une représentation précédente est en cours "
"d'écriture par ce processus."
-#: libsvn_fs_fs/fs_fs.c:500
+#: libsvn_fs_fs/fs_fs.c:501
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2521,94 +2521,95 @@
"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:507 libsvn_subr/io.c:1512
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, 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:833 libsvn_fs_fs/fs_fs.c:847
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "Entête malformée dans le fichier de révision"
-#: libsvn_fs_fs/fs_fs.c:949 libsvn_fs_fs/fs_fs.c:963 libsvn_fs_fs/fs_fs.c:970
-#: libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985 libsvn_fs_fs/fs_fs.c:993
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr ""
"Ligne 'offset' d'une représentation textuelle malformée dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1062
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "Champs 'kind' manquant dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1093
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "'cpath' manquant dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1120 libsvn_fs_fs/fs_fs.c:1126
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "Ligne 'copyroot' malformée dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1144 libsvn_fs_fs/fs_fs.c:1150
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "Ligne 'copyfrom' malformée dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1259 libsvn_fs_fs/fs_fs.c:3674
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "Tentative d'écriture vers une non-transaction"
-#: libsvn_fs_fs/fs_fs.c:1343
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "Entête de représentation mal formée"
-#: libsvn_fs_fs/fs_fs.c:1367
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "'node-id' manquant dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1373
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "'node-id' corrompu dans 'node-rev'"
-#: libsvn_fs_fs/fs_fs.c:1418
+#: libsvn_fs_fs/fs_fs.c:1506
#, 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:1430
+#: libsvn_fs_fs/fs_fs.c:1518
#, 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:1445
+#: libsvn_fs_fs/fs_fs.c:1533
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:1474 libsvn_fs_fs/fs_fs.c:1532 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "Pas de révision %ld"
-#: libsvn_fs_fs/fs_fs.c:1592
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "Représentation des données de svndiff mal formées"
-#: libsvn_fs_fs/fs_fs.c:1735 libsvn_fs_fs/fs_fs.c:1748
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
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:1884
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "Données de svndiff ayant requis une source inexistante"
-#: libsvn_fs_fs/fs_fs.c:1890
+#: libsvn_fs_fs/fs_fs.c:2001
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:1913 libsvn_fs_fs/fs_fs.c:1930
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "Taille de fenêtre de svndiff corrompue"
-#: libsvn_fs_fs/fs_fs.c:1978
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2619,95 +2620,95 @@
" attendu : %s\n"
" obtenu : %s\n"
-#: libsvn_fs_fs/fs_fs.c:2201 libsvn_fs_fs/fs_fs.c:2214
-#: libsvn_fs_fs/fs_fs.c:2220 libsvn_fs_fs/fs_fs.c:4765
-#: libsvn_fs_fs/fs_fs.c:4774 libsvn_fs_fs/fs_fs.c:4780
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "Entrée du répertoire corrompue"
-#: libsvn_fs_fs/fs_fs.c:2559 libsvn_fs_fs/fs_fs.c:2567
-#: libsvn_fs_fs/fs_fs.c:2599 libsvn_fs_fs/fs_fs.c:2619
-#: libsvn_fs_fs/fs_fs.c:2653 libsvn_fs_fs/fs_fs.c:2658
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
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:2592
+#: libsvn_fs_fs/fs_fs.c:2703
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:2612
+#: libsvn_fs_fs/fs_fs.c:2723
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:2632
+#: libsvn_fs_fs/fs_fs.c:2743
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:2816
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "Copie à partir des transactions impossible"
-#: libsvn_fs_fs/fs_fs.c:2872
+#: libsvn_fs_fs/fs_fs.c:2983
#, 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:3106 libsvn_fs_fs/fs_fs.c:3113
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "Fichier identificateur suivant (next-id) corrompu"
-#: libsvn_fs_fs/fs_fs.c:3200
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "Échec du nettoyage de la transaction"
-#: libsvn_fs_fs/fs_fs.c:3368
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "Type de modification invalide"
-#: libsvn_fs_fs/fs_fs.c:3693
+#: libsvn_fs_fs/fs_fs.c:3804
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:3783 libsvn_fs_fs/fs_fs.c:3788
-#: libsvn_fs_fs/fs_fs.c:3795
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "Fichier courant corrompu"
-#: libsvn_fs_fs/fs_fs.c:4084 libsvn_subr/io.c:2790 svn/util.c:252
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "'%s' n'est pas consultable (stat)"
-#: libsvn_fs_fs/fs_fs.c:4088
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "Impossible de changer les droits (chmod) de '%s'"
-#: libsvn_fs_fs/fs_fs.c:4237
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "Impossible d'obtenir l'exclusivité (mutex) du dépôt FSFS"
-#: libsvn_fs_fs/fs_fs.c:4251
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "Impossible de rendre l'exclusivité (mutex) du dépôt FSFS"
-#: libsvn_fs_fs/fs_fs.c:4370
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "Transaction obsolète"
-#: libsvn_fs_fs/fs_fs.c:4706
+#: libsvn_fs_fs/fs_fs.c:4807
msgid "Recovery encountered a non-directory node"
msgstr "La réparation a trouvé un noeud qui n'est pas un répertoire"
-#: libsvn_fs_fs/fs_fs.c:4728
+#: libsvn_fs_fs/fs_fs.c:4829
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:4991
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "Transaction non trouvée"
@@ -3163,8 +3164,8 @@
msgid "%s request failed on '%s'"
msgstr "Échec de la requête %s sur '%s'"
-#: libsvn_ra_local/ra_plugin.c:106 libsvn_ra_local/ra_plugin.c:595
-#: libsvn_wc/update_editor.c:2605
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -3177,15 +3178,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:248
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "Module d'accès à un dépôt sur un disque local."
-#: libsvn_ra_local/ra_plugin.c:288
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "Impossible d'ouvrir une session ra_local pour l'URL"
-#: libsvn_ra_local/ra_plugin.c:1440
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Version %d du chargeur RA (accès dépôt) non supporté pour ra_local"
@@ -3936,36 +3937,41 @@
"Le chemin '%s' n'est ni un fichier ni un répertoire dans le système de "
"fichiers"
-#: libsvn_repos/reporter.c:218
+#: libsvn_repos/reporter.c:222
#, c-format
msgid "Invalid depth (%s) for path '%s'"
msgstr "Profondeur invalide (%s) pour le chemin '%s'"
-#: libsvn_repos/reporter.c:649
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "Le chemin de copie de travail '%s' n'existe pas dans le dépôt"
-#: libsvn_repos/reporter.c:944
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "Non autorisé à ouvrir la racine de l'opération d'édition"
-#: libsvn_repos/reporter.c:963
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "Le chemin cible n'existe pas"
-#: libsvn_repos/reporter.c:970
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "On ne peut remplacer un répertoire de l'intérieur de ce répertoire"
-#: libsvn_repos/reporter.c:1013
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "Rapport invalide pour le sommet de la copie de travail"
-#: libsvn_repos/reporter.c:1028
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "Deux rapports au sommet sans aucune cible"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "Type de noeud non supporté pour le chemin '%s'"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -4283,7 +4289,7 @@
msgid "Can't flush file to disk"
msgstr "Impossible de vidanger (flush) le fichier sur disque"
-#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:537
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
#, c-format
msgid "Can't open stdin"
msgstr "Impossible d'ouvrir l'entrée standard (stdin)"
@@ -4583,27 +4589,27 @@
"'%s': Commande inconnue.\n"
"\n"
-#: libsvn_subr/opt.c:788
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Erreur de syntaxe sur la révision '%s'"
-#: libsvn_subr/opt.c:865
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "L'URL '%s' n'est pas correctement encodée (URI-encoded)"
-#: libsvn_subr/opt.c:871
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "L'URL '%s' contient un composant '..'"
-#: libsvn_subr/opt.c:900
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Erreur à la résolution de la casse de '%s'"
-#: libsvn_subr/opt.c:1002
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4614,7 +4620,7 @@
" compilé %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:1005
+#: libsvn_subr/opt.c:998
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4627,7 +4633,7 @@
"Il inclut du logiciel développé par CollabNet (http://www.Collab.Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1056 libsvn_subr/opt.c:1097
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Entrer '%s help' pour l'aide.\n"
@@ -4732,7 +4738,7 @@
msgid "Passphrase for '%s': "
msgstr "Phrase de passe pour '%s' : "
-#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1633
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Le fichier '%s' a des sauts de ligne incohérents"
@@ -5424,7 +5430,7 @@
msgid "Can't find entry '%s' in '%s'"
msgstr "Impossible de trouver l'entrée '%s' dans '%s'"
-#: libsvn_wc/props.c:726
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5433,7 +5439,7 @@
"Essai d'ajouter une nouvelle propriété '%s' valant '%s',\n"
"mais elle existe déjà avec la valeur '%s'."
-#: libsvn_wc/props.c:764
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5442,14 +5448,14 @@
"Essai de modifier la propriété '%s' de '%s' à '%s',\n"
"mais elle n'existe pas."
-#: libsvn_wc/props.c:809
+#: libsvn_wc/props.c:808
#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
msgstr ""
"Essai d'effacer la propriété '%s', mais valeur modifiée de '%s' à '%s'."
-#: libsvn_wc/props.c:838
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5458,52 +5464,52 @@
"Essai de modifier la propriété '%s' de '%s' à '%s',\n"
"mais elle existe déjà avec la valeur '%s'."
-#: libsvn_wc/props.c:1023
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Fin de ligne manquante dans le fichier wcprops pour '%s'"
-#: libsvn_wc/props.c:1206 libsvn_wc/props.c:1238 libsvn_wc/props.c:1508
-#: libsvn_wc/props.c:1756
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "Échec au chargement des propriétés à partir du disque"
-#: libsvn_wc/props.c:1266
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Impossible d'écrire le hash de la propriété pour '%s'"
-#: libsvn_wc/props.c:1500 libsvn_wc/props.c:1669
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "La propriété '%s' n'est pas une propriété d'entrée"
-#: libsvn_wc/props.c:1547
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Définition de '%s' sur un répertoire ('%s') impossible"
-#: libsvn_wc/props.c:1555
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Définition de '%s' sur un fichier ('%s') impossible"
-#: libsvn_wc/props.c:1561
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' n'est ni un fichier ni un répertoire"
-#: libsvn_wc/props.c:1642
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Le fichier '%s' a un type mime binaire"
-#: libsvn_wc/props.c:2508
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Erreur d'analyse de la propriété %s sur '%s' : '%s'"
-#: libsvn_wc/props.c:2521
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
@@ -5645,12 +5651,12 @@
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Somme de contrôle différente pour '%s' ; stocké '%s', actuel '%s'"
-#: libsvn_wc/update_editor.c:3003
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s' n'a pas d'ancêtre"
-#: libsvn_wc/update_editor.c:3162
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "L'URL source '%s' concerne un dépôt différent de '%s'"
@@ -5692,7 +5698,7 @@
"Opération locale sans propagation (commit), pas de message ni de propriété "
"de révision"
-#: svn/diff-cmd.c:117 svnserve/main.c:546
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "La sortie standard (stdout) ne peut être ouverte"
@@ -5757,7 +5763,7 @@
"Subversion est un outil pour gérer des versions.\n"
"Pour plus d'informations, voir http://subversion.tigris.org/\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1429
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -7392,7 +7398,7 @@
"Arguments de révision multiples : ne pas utiliser à la fois -r et -c, ou "
"essayer '-r M:N' au lieu de '-r M -r N'"
-#: svn/main.c:1121 svnadmin/main.c:1316
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Erreur de syntaxe à l'argument de révision '%s'"
@@ -7417,18 +7423,18 @@
msgstr ""
"Erreur de syntaxe à l'argument de fin de ligne native (native-eol) '%s'"
-#: svn/main.c:1413 svndumpfilter/main.c:1207 svnlook/main.c:2066
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "Argument de la sous-commande attendu\n"
-#: svn/main.c:1432 svnadmin/main.c:1445 svndumpfilter/main.c:1226
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Commande inconnue : '%s'\n"
-#: svn/main.c:1465
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7437,17 +7443,17 @@
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svn help %s' pour l'aide.\n"
-#: svn/main.c:1502
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"Le fichier de l'entrée du journal est versionné; forcer avec '--force-log'"
-#: svn/main.c:1509
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"Le fichier de commentaire du verrou est versionné ; forcer avec '--force-log'"
-#: svn/main.c:1529
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7455,7 +7461,7 @@
"Le message de propagation donné est un chemin (-F était voulu ?) ; forcer "
"avec '--force-log'"
-#: svn/main.c:1536
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7463,11 +7469,11 @@
"Le commentaire du verrou est un chemin de fichier (-F était voulu ?) ; "
"forcer avec '--force-log'"
-#: svn/main.c:1671
+#: svn/main.c:1668
msgid "Try 'svn help' for more info"
msgstr "Essayer 'svn help' pour plus d'information."
-#: svn/main.c:1681
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -8422,18 +8428,18 @@
msgid "Removed lock on '%s'.\n"
msgstr "'%s' déverrouillé\n"
-#: svnadmin/main.c:1302
+#: svnadmin/main.c:1303
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Option -r rencontrée plusieurs fois ; essayer '-r M:N' au lieu de '-r M -r N'"
-#: svnadmin/main.c:1427
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "Sous-commande attendue\n"
-#: svnadmin/main.c:1512
+#: svnadmin/main.c:1502
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8442,7 +8448,7 @@
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svnadmin help %s' pour l'aide.\n"
-#: svnadmin/main.c:1545
+#: svnadmin/main.c:1535
msgid "Try 'svnadmin help' for more info"
msgstr "Essayer 'svnadmin help' pour plus d'information"
@@ -9065,22 +9071,22 @@
"\n"
"Options disponibles :\n"
-#: svnserve/main.c:458
+#: svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr ""
"svnserve : Le chemin racine '%s' n'existe pas ou n'est pas un répertoire.\n"
-#: svnserve/main.c:507
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Une des options -d, -i, -t ou -X doit être précisée.\n"
-#: svnserve/main.c:525
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "L'option --tunnel-user n'est valide qu'en mode tunnel.\n"
-#: svnserve/main.c:594
+#: svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
@@ -9089,42 +9095,42 @@
"svnserve : L'option --service n'est valide que si le processus est lancé par "
"le contrôleur de service (SCM)\n"
-#: svnserve/main.c:630
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "Impossible d'avoir les informations de l'adresse"
-#: svnserve/main.c:646
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "Impossible de créer un 'socket' serveur"
-#: svnserve/main.c:659
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "Impossible de lier (bind) le 'socket' serveur"
-#: svnserve/main.c:727
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "Impossible d'accepter une connexion d'un client"
-#: svnserve/main.c:781
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "Impossible de créer un attribut de thread (threadattr)"
-#: svnserve/main.c:789
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "Impossible de détacher la thread"
-#: svnserve/main.c:802
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "Impossible de créer une thread"
-#: svnserve/serve.c:1463
+#: svnserve/serve.c:1437
msgid "Path is not a string"
msgstr "Le chemin n'est pas une chaîne de caractère"
@@ -9298,8 +9304,8 @@
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Le dépôt destination est déjà synchronisé à partir de '%s'"
-#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1202
-#: svnsync/main.c:1381
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Le chemin '%s' n'est pas une URL"
@@ -9344,7 +9350,7 @@
msgid "Commit created rev %ld but should have created %ld"
msgstr "La propagation (commit) a créé la révision %ld au lieu de la %ld"
-#: svnsync/main.c:1274 svnsync/main.c:1279
+#: svnsync/main.c:1275 svnsync/main.c:1280
#, c-format
msgid ""
"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
@@ -9352,17 +9358,17 @@
"Impossible de copier les propriétés de révision d'une révision (%ld) non "
"encore synchronisée"
-#: svnsync/main.c:1331
+#: svnsync/main.c:1332
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "'%s' n'est pas un interval de révisions valide"
-#: svnsync/main.c:1345 svnsync/main.c:1365
+#: svnsync/main.c:1346 svnsync/main.c:1366
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Numéro de révision invalide (%ld)"
-#: svnsync/main.c:1422
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -9376,7 +9382,7 @@
"\n"
"Sous-commandes disponibles :\n"
-#: svnsync/main.c:1586
+#: svnsync/main.c:1581
msgid ""
"Cannot use --username or --password with any of --source-username, --source-"
"password, --sync-username, or --sync-password.\n"
@@ -9384,7 +9390,7 @@
"Impossible d'utiliser --username ou --password pour un des --source-"
"username, --source-password, --sync-username ou --sync-password.\n"
-#: svnsync/main.c:1666
+#: svnsync/main.c:1661
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9393,7 +9399,7 @@
"La sous-commande '%s' n'accepte pas l'option '%s'\n"
"Entrer 'svnsync help %s' pour l'aide.\n"
-#: svnsync/main.c:1738
+#: svnsync/main.c:1733
msgid "Try 'svnsync help' for more info"
msgstr "Essayer 'svnsync help' pour plus d'information"
@@ -9468,12 +9474,12 @@
msgid "last changed rather than current revisions"
msgstr "dernière révision modifiée plutôt que la courante"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "exporté%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "'%s' non versionné et non exporté\n"
diff --git a/subversion/po/it.po b/subversion/po/it.po
index 5a79ddb..4a96253 100644
--- a/subversion/po/it.po
+++ b/subversion/po/it.po
@@ -89,7 +89,7 @@
msgstr ""
"Project-Id-Version: subversion 1.2.0\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-04-02 07:49+0200\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2007-04-02 09:56+0200\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Italian <dev@subversion.tigris.org>\n"
@@ -169,6 +169,7 @@
#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
#: libsvn_subr/cmdline.c:316 svn/util.c:758
+#, c-format
msgid "Write error"
msgstr "Errore di scrittura"
@@ -1248,37 +1249,37 @@
msgid "'%s' has local modifications"
msgstr "'%s' ha modifiche locali"
-#: libsvn_client/diff.c:136
+#: libsvn_client/diff.c:135
#, c-format
msgid " Reverted %s:r%s%s"
msgstr "Ripristinato %s:r%s%s"
-#: libsvn_client/diff.c:154
+#: libsvn_client/diff.c:153
#, c-format
msgid " Merged %s:r%s%s"
msgstr " Fuso %s:r%s%s"
-#: libsvn_client/diff.c:176
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sProprietà modificate su: %s%s"
-#: libsvn_client/diff.c:204
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "Nome: %s%s"
-#: libsvn_client/diff.c:323
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revisione %ld)"
-#: libsvn_client/diff.c:325
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(copia locale)"
-#: libsvn_client/diff.c:468
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Non posso mostrarlo: file indicato come binario.%s"
@@ -1286,24 +1287,25 @@
#. -----------------------------------------------------------------------
#. ** Utilities. **
#. Sanity check -- ensure that we have valid revisions to look at.
-#: libsvn_client/diff.c:828 libsvn_client/merge.c:61
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "Non tutte le revisioni richieste sono state specificate"
-#: libsvn_client/diff.c:843
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr "Almeno una revisione deve essere non locale per una pegged diff"
-#: libsvn_client/diff.c:955 libsvn_client/diff.c:967
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' non è stato trovato nel repository alla revisione %ld"
-#: libsvn_client/diff.c:1026
+#: libsvn_client/diff.c:1025
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
-msgstr "Spiacente, svn_client_diff4 è stato invocato in un modo non ancora supportato"
+msgstr ""
+"Spiacente, svn_client_diff4 è stato invocato in un modo non ancora supportato"
-#: libsvn_client/diff.c:1068
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1311,12 +1313,12 @@
"Solo differenze fra il testo base di un percorso e i suoi file di lavoro "
"sono supportati correntemente"
-#: libsvn_client/diff.c:1213 libsvn_client/switch.c:107
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "La directory '%s' non ha URL"
-#: libsvn_client/diff.c:1422
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr ""
"Il diff riassuntivo può confrontare solo un repository ad un altro repository"
@@ -1343,7 +1345,7 @@
msgstr "'%s' esiste già"
#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
-#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2463
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Errore di checksum per '%s'; atteso: '%s', effettivo: '%s'"
@@ -1364,10 +1366,9 @@
"Non è stato trovato un genitore comune, non è possibile operare su argomenti "
"disgiunti"
-#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2054
-#: libsvn_client/merge.c:2060 libsvn_client/merge.c:2238
-#: libsvn_client/merge.c:2401 libsvn_client/ra.c:375 libsvn_client/ra.c:741
-#: libsvn_client/ra.c:878
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
+#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
#, c-format
msgid "'%s' has no URL"
msgstr "'%s' non ha URL"
@@ -1438,7 +1439,7 @@
msgid ".merge-right.r%ld"
msgstr ".merge-dx.r%ld"
-#: libsvn_client/merge.c:1156
+#: libsvn_client/merge.c:1164
#, c-format
msgid ""
"Path '%s' is in conflict, and must be resolved before the remainder of the "
@@ -1447,7 +1448,7 @@
"C'è un conflitto con il percorso '%s' che va risolto prima che il resto\n"
"della fusione richiesta possa essere applicato"
-#: libsvn_client/merge.c:1449 libsvn_client/merge.c:1762
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
msgid "Use of two URLs is not compatible with merge info modification"
msgstr ""
"L'uso di due URL non è compatibile con la modifica delle informazioni\n"
@@ -1647,6 +1648,7 @@
msgstr "Il file '%s' è stato modificato inaspettatamente durante il diff"
#: libsvn_diff/diff_file.c:707
+#, c-format
msgid "Error parsing diff options"
msgstr "Errore nel parsing delle opzioni di diff"
@@ -1691,14 +1693,17 @@
msgstr "Tipo di filesystem sconosciuto '%s'"
#: libsvn_fs/fs-loader.c:253
+#, c-format
msgid "Can't allocate FS mutex"
msgstr "Non riesco ad allocare il mutex per il filesystem"
#: libsvn_fs/fs-loader.c:289
+#, c-format
msgid "Can't grab FS mutex"
msgstr "Non riesco a prendere il mutex per il filesystem"
#: libsvn_fs/fs-loader.c:295
+#, c-format
msgid "Can't ungrab FS mutex"
msgstr "Non posso abbandonare il mutex per il filesystem"
@@ -1719,17 +1724,17 @@
msgid "deleting changes"
msgstr "sto cancellando le modifiche"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2393
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "L'ID di nodo di revisione richiesto è mancante"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2403
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr ""
"Ordine dei cambiamenti non valido: nuovo ID di revisione di nodo senza una "
"cancellazione"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2414
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr ""
"Ordine dei cambiamenti non valido: operazione diversa da add su un percorso "
@@ -1851,108 +1856,116 @@
msgid "set repository uuid"
msgstr "imposto l'uuid del repository"
-#: libsvn_fs_base/dag.c:219
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"DB corrotto: l'id della transazione iniziale non è '0' nel filesystem '%s'"
-#: libsvn_fs_base/dag.c:227
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "DB corrotto: l'id della copia iniziale non è '0' nel filesystem '%s'"
-#: libsvn_fs_base/dag.c:236
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"DB corrotta: il numero iniziale di revisione non è '0' nel filesystem '%s'"
-#: libsvn_fs_base/dag.c:284 libsvn_fs_base/dag.c:460 libsvn_fs_fs/dag.c:333
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "Tentativo di creare una voce in un genitore che non è una directory"
-#: libsvn_fs_base/dag.c:454 libsvn_fs_fs/dag.c:327
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Tentativo di creazione di un nodo con un nome illegale '%s'"
-#: libsvn_fs_base/dag.c:466 libsvn_fs_base/dag.c:700 libsvn_fs_fs/dag.c:339
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
+#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "Tentativo di clonare un figlio di nodo immutabile"
-#: libsvn_fs_base/dag.c:473
+#: libsvn_fs_base/dag.c:475
+#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Tentativo di creare una voce già esistente"
-#: libsvn_fs_base/dag.c:524 libsvn_fs_fs/dag.c:401
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "Tentativo di scrivere una voce in un nodo non di directory"
-#: libsvn_fs_base/dag.c:530 libsvn_fs_fs/dag.c:407
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "Tentativo di scrivere una voce in un nodo immutable"
-#: libsvn_fs_base/dag.c:594
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr ""
"Non posso impostare la lista delle proprietà su un nodo di revisione %s "
"*immutabile*"
-#: libsvn_fs_base/dag.c:706
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "Tentativo di clonare un nodo figlio con un nome illegale '%s'"
-#: libsvn_fs_base/dag.c:832
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "Tentativo di cancellare la voce '%s' da un nodo non di directory"
-#: libsvn_fs_base/dag.c:838
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr ""
"Tentativo di cancellare la voce '%s' da un nodo di directory immutabile"
-#: libsvn_fs_base/dag.c:845
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Tentativo di cancellazione di un nodo con un nome illegale '%s'"
-#: libsvn_fs_base/dag.c:860 libsvn_fs_base/dag.c:893
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Cancellazione fallita: la directory non ha nessuna voce '%s'"
-#: libsvn_fs_base/dag.c:942
+#: libsvn_fs_base/dag.c:944
+#, c-format
msgid "Attempted removal of immutable node"
msgstr "Tentativo di rimuovere un nodo immutabile"
-#: libsvn_fs_base/dag.c:1062
+#: libsvn_fs_base/dag.c:1064
+#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr ""
"Tentativo di leggere il contenuto testuale di un nodo che *non* è di tipo "
"file"
-#: libsvn_fs_base/dag.c:1097
+#: libsvn_fs_base/dag.c:1099
+#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Tentativo di ottenere la lunghezza di un nodo che *non* è di tipo file"
-#: libsvn_fs_base/dag.c:1123
+#: libsvn_fs_base/dag.c:1125
+#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "Tentativo di calcolare il checksum di un nodo che *non* è di tipo file"
-#: libsvn_fs_base/dag.c:1154 libsvn_fs_base/dag.c:1208
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
+#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "Tentativo di scrittura di contenuto testuale in un nodo non di file "
-#: libsvn_fs_base/dag.c:1160 libsvn_fs_base/dag.c:1214
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
+#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Tentativo di scrittura di contenuto testuale in un nodo immutabile"
-#: libsvn_fs_base/dag.c:1237
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1963,12 +1976,12 @@
" atteso: %s\n"
" effettivo: %s\n"
-#: libsvn_fs_base/dag.c:1292
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Tentativo di aprire un nodo figlio inesistente '%s'"
-#: libsvn_fs_base/dag.c:1298
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Tentativo di aprire un nodo con un nome illegale '%s'"
@@ -2117,7 +2130,7 @@
"Errore del DB Berkeley per il filesystem '%s' durante l'apertura "
"dell'ambiente:\n"
-#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:642
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr ""
@@ -2146,30 +2159,30 @@
"a caldo. Se il problema persiste, prova a disattivare tale \n"
"opzione in DB_CONFIG."
-#: libsvn_fs_base/fs.c:1240
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr ""
"Modulo da usare con un repository che si appoggia ad un database Berkeley"
-#: libsvn_fs_base/fs.c:1274
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Versione del lettore di filesystem (%d) per bdb non supportata"
-#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr ""
"Non posso verificare il blocco al percorso '%s'; nessun nome utente "
"disponibile"
-#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr ""
"L'utente %s non possiede il blocco sul path '%s' (attualmente bloccato da %s)"
-#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr ""
@@ -2264,7 +2277,7 @@
msgid "Transaction is dead: '%s'"
msgstr "La transazione è morta: '%s'"
-#: libsvn_fs_base/revs-txns.c:1078
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "Transazione interrotta, ma la ripulitura è fallita"
@@ -2274,87 +2287,87 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:391 libsvn_fs_fs/tree.c:310
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "File non trovato: transazione '%s', percorso '%s'"
-#: libsvn_fs_base/tree.c:396 libsvn_fs_fs/tree.c:315
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "File non trovato: revisione %ld, percorso '%s'"
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:406 libsvn_fs_fs/tree.c:330
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "Il file esiste già: filesystem '%s', transzione '%s', percorso '%s'"
-#: libsvn_fs_base/tree.c:411 libsvn_fs_fs/tree.c:336
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "Il file esiste già: filesystem '%s', revisione %ld, percorso '%s'"
-#: libsvn_fs_base/tree.c:419 libsvn_fs_fs/tree.c:346
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "L'oggetto non è la root di una transazione"
-#: libsvn_fs_base/tree.c:834 libsvn_fs_fs/tree.c:755
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "Errore nell'apertura di '%s'"
-#: libsvn_fs_base/tree.c:1466 libsvn_fs_fs/tree.c:1202
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr ""
"Non posso confrontare dei valori di proprietà in due differenti filesystem"
-#: libsvn_fs_base/tree.c:1799
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "Database corrotto: conto del predecessore sbagliato"
-#: libsvn_fs_base/tree.c:1854 libsvn_fs_fs/tree.c:1239
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Node immutabile inatteso in '%s'"
-#: libsvn_fs_base/tree.c:1875 libsvn_fs_fs/tree.c:1262
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "Conflitto in '%s'"
-#: libsvn_fs_base/tree.c:1925 libsvn_fs_base/tree.c:2637
-#: libsvn_fs_fs/tree.c:1311 libsvn_fs_fs/tree.c:1803
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr ""
"Cattiva fusione; l'antenato, la sorgente e la destinazione non\n"
"sono tutti nello stesso filesystem"
-#: libsvn_fs_base/tree.c:1941 libsvn_fs_fs/tree.c:1327
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr ""
"Cattiva fusione: la destinazione '%s' ha lo stesso id ('%s') del suo antenato"
-#: libsvn_fs_base/tree.c:2444
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "La transazione '%s' non è sincronizzata con la transazione '%s' "
-#: libsvn_fs_base/tree.c:2820 libsvn_fs_fs/tree.c:1942
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "La directory di root non può essere cancellata"
-#: libsvn_fs_base/tree.c:3000 libsvn_fs_fs/tree.c:2014
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "Non posso effettuare copie tra due differenti filesystem ('%s' e '%s')"
-#: libsvn_fs_base/tree.c:3009 libsvn_fs_fs/tree.c:2020
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "La copia da un albero modificabile non è attualmente supportata"
-#: libsvn_fs_base/tree.c:3504 libsvn_fs_fs/tree.c:2444
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2365,12 +2378,12 @@
" atteso: %s\n"
" effettivo: %s\n"
-#: libsvn_fs_base/tree.c:3757 libsvn_fs_fs/tree.c:2680
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr "Non posso confrontare due file provenienti da differenti filesystems"
-#: libsvn_fs_base/tree.c:3766 libsvn_fs_base/tree.c:3771
-#: libsvn_fs_fs/tree.c:2689 libsvn_fs_fs/tree.c:2694
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
@@ -2397,65 +2410,71 @@
msgstr "File di blocco corrotto per il percoroso '%s' nel filesystem '%s'"
#: libsvn_fs_fs/fs.c:88
+#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Non riesco a recuperare i data condivisi dell'FSFS"
#: libsvn_fs_fs/fs.c:104
+#, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "Non riesco a creare il mutex in scrittura per l'FSFS"
#: libsvn_fs_fs/fs.c:112
+#, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "Non riesco a creare la lista dei mutex per le transazioni"
#: libsvn_fs_fs/fs.c:118
+#, c-format
msgid "Can't store FSFS shared data"
msgstr "Non riesco ad archiviare i dati condivisi dell'FSFS"
-#: libsvn_fs_fs/fs.c:352
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr ""
"Modulo da usare con un repository che si appoggia ad un normale file system "
"(FSFS)"
-#: libsvn_fs_fs/fs.c:386
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Versione del lettore di filesystem (%d) per fsfs non supportata"
-#: libsvn_fs_fs/fs_fs.c:351
+#: libsvn_fs_fs/fs_fs.c:352
+#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "Non riesco ad ottenere il mutex della lista di transazioni per l'FSFS"
-#: libsvn_fs_fs/fs_fs.c:359
+#: libsvn_fs_fs/fs_fs.c:360
+#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "Non riesco a rilasciare il mutex della lista di transazioni per l'FSFS"
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Non riesco a sbloccare la transazione '%s'"
-#: libsvn_fs_fs/fs_fs.c:389
+#: libsvn_fs_fs/fs_fs.c:390
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "Non posso sbloccare la transazione '%s' che non è bloccata"
-#: libsvn_fs_fs/fs_fs.c:396
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
"Non posso sbloccare il file di blocco del prototipo di revisione per la "
"transazione '%s'"
-#: libsvn_fs_fs/fs_fs.c:402
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr ""
"Non posso chiudere il file di blocco del prototipo di revisione per la "
"transazione '%s'"
-#: libsvn_fs_fs/fs_fs.c:464
+#: libsvn_fs_fs/fs_fs.c:465
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2465,7 +2484,7 @@
"transazione '%s'\n"
"perché una precedente rappresentazione è in scrittura da questo processo"
-#: libsvn_fs_fs/fs_fs.c:500
+#: libsvn_fs_fs/fs_fs.c:501
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2475,96 +2494,99 @@
"transazione '%s'\n"
"perché una precedente rappresentazione è in scrittura da questo processo"
-#: libsvn_fs_fs/fs_fs.c:507 libsvn_subr/io.c:1512
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Non riesco ad ottenere l'accesso esclusivo al file '%s'"
-#: libsvn_fs_fs/fs_fs.c:833 libsvn_fs_fs/fs_fs.c:847
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "Trovato header non conforme nel file di revisione"
# Ecco cosa ho concepito rileggendo i suggerimenti di Erik
# giorgio_v@mac.com: ho tolto il lato "diagnostico", lasciando solo il report dell'errore
# vero e proprio. Per cui proporrei...
-#: libsvn_fs_fs/fs_fs.c:949 libsvn_fs_fs/fs_fs.c:963 libsvn_fs_fs/fs_fs.c:970
-#: libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985 libsvn_fs_fs/fs_fs.c:993
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "Offset non conforme in un nodo di revisione. "
-#: libsvn_fs_fs/fs_fs.c:1062
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "Campo del tipo mancante nel nodo di revisione"
-#: libsvn_fs_fs/fs_fs.c:1093
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "Cpath mancante nel nodo di revisione"
-#: libsvn_fs_fs/fs_fs.c:1120 libsvn_fs_fs/fs_fs.c:1126
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "Linea copyroot non conforme nel nodo di revisione"
-#: libsvn_fs_fs/fs_fs.c:1144 libsvn_fs_fs/fs_fs.c:1150
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "Linea copyfrom non conforme nel nodo di revisione"
-#: libsvn_fs_fs/fs_fs.c:1259 libsvn_fs_fs/fs_fs.c:3674
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "Tentativo di scrittura in una non-transazione"
-#: libsvn_fs_fs/fs_fs.c:1343
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "Header della rappresentazione non conforme"
-#: libsvn_fs_fs/fs_fs.c:1367
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "Node-id mancante nel nodo di revisione"
-#: libsvn_fs_fs/fs_fs.c:1373
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "Node-id corrotto nel nodo di revisione"
-#: libsvn_fs_fs/fs_fs.c:1418
+#: libsvn_fs_fs/fs_fs.c:1506
+#, c-format
msgid "Revision file lacks trailing newline"
msgstr "Il file di revisione manca della terminazione di riga finale"
-#: libsvn_fs_fs/fs_fs.c:1430
+#: libsvn_fs_fs/fs_fs.c:1518
+#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "La riga finale nel file di revisione è più lunga di 64 caratteri"
-#: libsvn_fs_fs/fs_fs.c:1445
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "Alla riga finale nel file di revisione manca uno spazio"
-#: libsvn_fs_fs/fs_fs.c:1474 libsvn_fs_fs/fs_fs.c:1532 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "Revisione %ld inesistente"
-#: libsvn_fs_fs/fs_fs.c:1592
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "Dati svndiff nella rappresentazione non conformi"
-#: libsvn_fs_fs/fs_fs.c:1735 libsvn_fs_fs/fs_fs.c:1748
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr ""
"La lettura di una finestra svndiff ha letto oltre la fine della "
"rappresentazione"
-#: libsvn_fs_fs/fs_fs.c:1884
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "I dati svndiff hanno richiesto una sorgente inesistente"
-#: libsvn_fs_fs/fs_fs.c:1890
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "svndiff ha richiesto una posizione oltre la fine dei dati"
-#: libsvn_fs_fs/fs_fs.c:1913 libsvn_fs_fs/fs_fs.c:1930
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "La lunghezza della finestra svndiff è corrotta"
-#: libsvn_fs_fs/fs_fs.c:1978
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2575,121 +2597,124 @@
" atteso: %s\n"
" effettivo: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2201 libsvn_fs_fs/fs_fs.c:2214
-#: libsvn_fs_fs/fs_fs.c:2220 libsvn_fs_fs/fs_fs.c:4765
-#: libsvn_fs_fs/fs_fs.c:4774 libsvn_fs_fs/fs_fs.c:4780
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "Voce della directory corrotta"
-#: libsvn_fs_fs/fs_fs.c:2559 libsvn_fs_fs/fs_fs.c:2567
-#: libsvn_fs_fs/fs_fs.c:2599 libsvn_fs_fs/fs_fs.c:2619
-#: libsvn_fs_fs/fs_fs.c:2653 libsvn_fs_fs/fs_fs.c:2658
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "Linea di modifiche non valida nel file di revisione"
-#: libsvn_fs_fs/fs_fs.c:2592
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "Tipo di cambiamento non valido nel file di revisione"
-#: libsvn_fs_fs/fs_fs.c:2612
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "Opzione text-mod non valida nel file di revisione"
-#: libsvn_fs_fs/fs_fs.c:2632
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "Opzione prop-mod non valida nel file di revisione"
-#: libsvn_fs_fs/fs_fs.c:2816
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "La copia dalle transazioni non è consentita"
-#: libsvn_fs_fs/fs_fs.c:2872
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr ""
"Impossibile creare una directory di transazione in '%s' per la revisione %ld"
-#: libsvn_fs_fs/fs_fs.c:3106 libsvn_fs_fs/fs_fs.c:3113
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "file next-id corrotto"
-#: libsvn_fs_fs/fs_fs.c:3200
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "Ripulitura della transazione fallita"
-#: libsvn_fs_fs/fs_fs.c:3368
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "Tipo di cambiamento non valido"
-#: libsvn_fs_fs/fs_fs.c:3693
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "Non è possibile impostare il contenuto testuale di una directory"
-#: libsvn_fs_fs/fs_fs.c:3783 libsvn_fs_fs/fs_fs.c:3788
-#: libsvn_fs_fs/fs_fs.c:3795
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "File corrente corrotto"
-#: libsvn_fs_fs/fs_fs.c:4084 libsvn_subr/io.c:2790 svn/util.c:252
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "Non riesco a eseguire stat() su '%s'"
-#: libsvn_fs_fs/fs_fs.c:4088
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "Non riesco ad eseguire chmod su '%s'"
-#: libsvn_fs_fs/fs_fs.c:4237
+#: libsvn_fs_fs/fs_fs.c:4340
+#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "Non riesco a prendere il mutex per il filesystem"
-#: libsvn_fs_fs/fs_fs.c:4251
+#: libsvn_fs_fs/fs_fs.c:4354
+#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "Non posso abbandonare il mutex per il filesystem"
-#: libsvn_fs_fs/fs_fs.c:4370
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "Transazione scaduta"
-#: libsvn_fs_fs/fs_fs.c:4706
+#: libsvn_fs_fs/fs_fs.c:4807
msgid "Recovery encountered a non-directory node"
msgstr "Tentativo di recupero ha incontrato un nodo che non è una directory"
-#: libsvn_fs_fs/fs_fs.c:4728
+#: libsvn_fs_fs/fs_fs.c:4829
msgid "Recovery encountered a deltified directory representation"
msgstr ""
"Il recupero ha incontrato una rappresentazione differenziale\n"
"della directory"
-#: libsvn_fs_fs/fs_fs.c:4991
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "Transazione inesistente"
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "Non riesco a scrivere il file di hash '%s' per il blocco/entrate"
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "Non riesco ad interpretare il file di hash '%s' per il blocco/entrate"
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "Il percorso '%s' non esiste alla revisione HEAD"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "Blocco fallito: esiste una versione più recente di '%s'"
#: libsvn_fs_util/merge-info-sqlite-index.c:102
msgid "Merge Tracking schema format not set"
-msgstr "Il formato per lo schema del tracking delle fusioni non è stato impostato"
+msgstr ""
+"Il formato per lo schema del tracking delle fusioni non è stato impostato"
#: libsvn_fs_util/merge-info-sqlite-index.c:107
#, c-format
@@ -2748,6 +2773,7 @@
msgstr "Il file '%s' esiste già"
#: libsvn_ra_dav/commit.c:1112
+#, c-format
msgid "Could not write svndiff to temp file"
msgstr "Non sono riuscito a scrivere l'svndiff su un file temporaneo"
@@ -2829,6 +2855,7 @@
msgstr "Codifica XML sconosciuta: '%s'"
#: libsvn_ra_dav/fetch.c:2952
+#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr ""
"Il gestore delle risposte di REPORT non è riuscito a completare la guida "
@@ -2976,10 +3003,12 @@
msgstr "Ricevuto elemento close-directory senza aver mai aperto una directory"
#: libsvn_ra_dav/replay.c:432 libsvn_ra_serf/replay.c:498
+#, c-format
msgid "Error writing stream: unexpected EOF"
msgstr "Errore in scrittura: EOF inatteso"
#: libsvn_ra_dav/replay.c:439
+#, c-format
msgid "Got cdata content for a prop delete"
msgstr "Ricevuto un contenuto cdata per la cancellazione di una proprieta'"
@@ -3108,6 +3137,7 @@
msgstr "timeout della connessione al server"
#: libsvn_ra_dav/util.c:829
+#, c-format
msgid "Can't calculate the request body size"
msgstr "Non posso calcolare la dimensione del corpo della richiesta"
@@ -3126,8 +3156,8 @@
msgid "%s request failed on '%s'"
msgstr "richiesta %s fallita su '%s'"
-#: libsvn_ra_local/ra_plugin.c:106 libsvn_ra_local/ra_plugin.c:595
-#: libsvn_wc/update_editor.c:2605
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -3140,15 +3170,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:248
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "Modulo per accedere ad un repository sul disco locale."
-#: libsvn_ra_local/ra_plugin.c:288
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "Non posso aprire una sessione ra_local su una URL"
-#: libsvn_ra_local/ra_plugin.c:1440
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Versione del lettore (%d) per ra_local non supportata"
@@ -3180,6 +3210,7 @@
msgstr "Il percorso '%s' non è presente"
#: libsvn_ra_serf/commit.c:915
+#, c-format
msgid "Failed writing updated file"
msgstr "Scrittura del file aggiornato fallita"
@@ -3284,6 +3315,7 @@
msgstr "Nome host sconosciuto '%s'"
#: libsvn_ra_svn/client.c:136
+#, c-format
msgid "Can't create socket"
msgstr "Non riesco a creare un socket"
@@ -3324,6 +3356,7 @@
msgstr "Errore nel processo figlio: %s"
#: libsvn_ra_svn/client.c:440
+#, c-format
msgid "Can't create tunnel"
msgstr "Non riesco a creare il tunnel"
@@ -3462,6 +3495,7 @@
#: libsvn_ra_svn/cyrus_auth.c:171 svnserve/cyrus_auth.c:104
#: svnserve/cyrus_auth.c:114
+#, c-format
msgid "Could not initialize the SASL library"
msgstr "Non riesco ad inizializzare la libreria SASL"
@@ -3484,6 +3518,7 @@
msgstr "Non-stringa come parte del delta di un testo"
#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
+#, c-format
msgid "Command 'finish-replay' invalid outside of replays"
msgstr "Il comando 'finish-replay' non è valido al di fuori dei replay"
@@ -3505,6 +3540,7 @@
msgstr "Comando socnosciuto '%s'"
#: libsvn_ra_svn/internal_auth.c:97 libsvn_subr/prompt.c:156
+#, c-format
msgid "Can't get password"
msgstr "Non riesco a leggere la password"
@@ -3547,14 +3583,17 @@
msgstr "Status sconosciuto '%s' nella risposta del comando"
#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
+#, c-format
msgid "Can't read from connection"
msgstr "Non riesco a leggere dalla connessione"
#: libsvn_ra_svn/streams.c:91 libsvn_ra_svn/streams.c:166
+#, c-format
msgid "Can't write to connection"
msgstr "Non riesco a scrivere verso la connessione"
#: libsvn_ra_svn/streams.c:144
+#, c-format
msgid "Can't get socket timeout"
msgstr "Non riesco ad ottenete il timeout del socket"
@@ -3727,6 +3766,7 @@
msgstr "Non riesco a creare uno stdout nullo per l'aggancio '%s'"
#: libsvn_repos/hooks.c:209
+#, c-format
msgid "Error closing write end of stderr pipe"
msgstr "Errore nella chiusura del lato in scrittura per la pipe di stderr"
@@ -3736,10 +3776,12 @@
msgstr "Fallita l'esecuzione dell'aggancio '%s'"
#: libsvn_repos/hooks.c:227
+#, c-format
msgid "Error closing read end of stderr pipe"
msgstr "Errore nella chiusura del lato di lettura della pipe stderr"
#: libsvn_repos/hooks.c:231
+#, c-format
msgid "Error closing null file"
msgstr "Errore nella chiusura del file nullo"
@@ -3885,36 +3927,41 @@
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "Il percorso di filesystem '%s' non è un file o una directory"
-#: libsvn_repos/reporter.c:218
+#: libsvn_repos/reporter.c:222
#, c-format
msgid "Invalid depth (%s) for path '%s'"
msgstr "Profondità non valida (%s) per il percorso '%s'"
-#: libsvn_repos/reporter.c:649
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "Il percorso '%s' della copia di lavoro non esiste nel repository"
-#: libsvn_repos/reporter.c:944
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "Non autorizzato ad aprire la root per un'operazione di modifica"
-#: libsvn_repos/reporter.c:963
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "Il percorso indicato come obbiettivo non esiste"
-#: libsvn_repos/reporter.c:970
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "Non posso sostituire la directory dall'interno della stessa"
-#: libsvn_repos/reporter.c:1013
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "Rapporto non valido per il primo livello della copia di lavoro"
-#: libsvn_repos/reporter.c:1028
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "Due rapporti al primo livello senza nessun obiettivo"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "Tipo di nodo non supportato per il percorso '%s'"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -4015,6 +4062,7 @@
msgstr "Incontrato percorso illeggibile; accesso negato"
#: libsvn_subr/cmdline.c:493
+#, c-format
msgid "Error initializing command line arguments"
msgstr "Errore nell'inizializzazione degli argumenti della linea di comando"
@@ -4051,22 +4099,27 @@
msgstr "Errore nella scrittura dell'hash di '%s'"
#: libsvn_subr/date.c:204
+#, c-format
msgid "Can't manipulate current date"
msgstr "Non posso manipolare il valore della data corrente"
#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
+#, c-format
msgid "Can't calculate requested date"
msgstr "Non posso calcolare la data della richiesta"
#: libsvn_subr/date.c:281
+#, c-format
msgid "Can't expand time"
msgstr "Non riesco ad espandere la proprietà time"
#: libsvn_subr/dso.c:71
+#, c-format
msgid "Can't grab DSO mutex"
msgstr "Non riesco ad ottenere il mutex DSO"
#: libsvn_subr/dso.c:85 libsvn_subr/dso.c:107 libsvn_subr/dso.c:122
+#, c-format
msgid "Can't ungrab DSO mutex"
msgstr "Non riesco a rilasciare il mutex DSO"
@@ -4104,10 +4157,12 @@
msgstr "I link simbolici non sono supportati su questa piattaforma"
#: libsvn_subr/io.c:559
+#, c-format
msgid "Can't read contents of link"
msgstr "Non riesco a leggere il contenuto del collegamento"
#: libsvn_subr/io.c:621
+#, c-format
msgid "Can't find a temporary directory"
msgstr "Non riesco a trovare la directory temporanea"
@@ -4197,6 +4252,7 @@
msgstr "Non riesco a mettere il file '%s' in lettura-scrittura"
#: libsvn_subr/io.c:1427
+#, c-format
msgid "Error getting UID of process"
msgstr "Errore nell'ottenere l'UID del processo"
@@ -4211,14 +4267,17 @@
msgstr "Non riesco a scaricare il file '%s'"
#: libsvn_subr/io.c:1544
+#, c-format
msgid "Can't flush stream"
msgstr "Non riesco a scaricare il flusso"
#: libsvn_subr/io.c:1556 libsvn_subr/io.c:1573
+#, c-format
msgid "Can't flush file to disk"
msgstr "Non riesco a scaricare il file sul disco"
-#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:537
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#, c-format
msgid "Can't open stdin"
msgstr "Non riesco ad aprire stdin"
@@ -4227,6 +4286,7 @@
msgstr "La lettura dallo stdin è disabilitata"
#: libsvn_subr/io.c:1630
+#, c-format
msgid "Can't get file name"
msgstr "Non riesco ad ottenere il nome del file"
@@ -4348,6 +4408,7 @@
msgstr "Non riesco a chiudere il file '%s'"
#: libsvn_subr/io.c:2621
+#, c-format
msgid "Can't close stream"
msgstr "Non riesco a chiudere il flusso"
@@ -4357,6 +4418,7 @@
msgstr "Non riesco a leggere il file '%s'"
#: libsvn_subr/io.c:2632 libsvn_subr/io.c:2656 libsvn_subr/io.c:2669
+#, c-format
msgid "Can't read stream"
msgstr "Non riesco ad aprire il flusso"
@@ -4366,6 +4428,7 @@
msgstr "Non riesco ad ottenere gli attributi dal file '%s'"
#: libsvn_subr/io.c:2644
+#, c-format
msgid "Can't get attribute information from stream"
msgstr "Non riesco a ricavare le informazioni dell'attributo dal flusso"
@@ -4375,6 +4438,7 @@
msgstr "Non riesco ad impostare il puntatore di posizione nel file '%s'"
#: libsvn_subr/io.c:2681
+#, c-format
msgid "Can't set position pointer in stream"
msgstr "Non riesco ad impostare il puntatore di posizione nel flusso"
@@ -4384,6 +4448,7 @@
msgstr "Non riesco a scrivere su '%s'"
#: libsvn_subr/io.c:2693 libsvn_subr/io.c:2727
+#, c-format
msgid "Can't write to stream"
msgstr "Non riesco a scrivere nel flusso"
@@ -4422,6 +4487,7 @@
msgstr "Non riesco a rimuovere la directory '%s'"
#: libsvn_subr/io.c:3001
+#, c-format
msgid "Can't read directory"
msgstr "Non riesco a leggere la directory"
@@ -4511,27 +4577,27 @@
"\"%s\": comando sconosciuto.\n"
"\n"
-#: libsvn_subr/opt.c:788
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Errore di sintassi nella lettura della revisione '%s'"
-#: libsvn_subr/opt.c:865
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "L'URL '%s' non è propriamente codificata come URI"
-#: libsvn_subr/opt.c:871
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "L'URL '%s' contiene un elemento '..'"
-#: libsvn_subr/opt.c:900
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Errore nella risoluzione del caso '%s'"
-#: libsvn_subr/opt.c:1002
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4542,7 +4608,7 @@
" compilato %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:1005
+#: libsvn_subr/opt.c:998
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4556,7 +4622,7 @@
"Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1056 libsvn_subr/opt.c:1097
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Digita '%s help' per informazioni.\n"
@@ -4572,6 +4638,7 @@
msgstr "'%s' non è un file ne' una directory"
#: libsvn_subr/path.c:1251
+#, c-format
msgid "Can't determine the native path encoding"
msgstr "Non riesco a determinare la codifuca nativa del percorso"
@@ -4581,6 +4648,7 @@
msgstr "Carattere di controllo non valido '0x%02x' nel percorso '%s'"
#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
+#, c-format
msgid "Can't read stdin"
msgstr "Non riesco a leggere stdin"
@@ -4659,7 +4727,7 @@
msgid "Passphrase for '%s': "
msgstr "Password per '%s': "
-#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1633
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Il file '%s' ha terminatori di riga inconsistenti"
@@ -5357,7 +5425,7 @@
msgid "Can't find entry '%s' in '%s'"
msgstr "Non posso trovare la voce '%s' in '%s'"
-#: libsvn_wc/props.c:726
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5366,7 +5434,7 @@
"Sto cercando di aggiungere la proprietà '%s', con valore '%s',\n"
"ma ne esiste già una con valore '%s'."
-#: libsvn_wc/props.c:764
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5375,7 +5443,7 @@
"Sto cercando di modificare la proprietà '%s' da '%s' a '%s',\n"
"ma non esiste."
-#: libsvn_wc/props.c:809
+#: libsvn_wc/props.c:808
#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
@@ -5383,7 +5451,7 @@
"Sto cercando di eliminare la proprietà '%s' ma il suo valore è stato "
"modificato da '%s' a '%s'."
-#: libsvn_wc/props.c:838
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5392,52 +5460,52 @@
"Sto cercando di modificare la proprietà '%s', da '%s' a '%s',\n"
"ma ne esiste già una con valore '%s'."
-#: libsvn_wc/props.c:1023
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Fine riga mancante nel file wcprops per '%s'"
-#: libsvn_wc/props.c:1206 libsvn_wc/props.c:1238 libsvn_wc/props.c:1508
-#: libsvn_wc/props.c:1756
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "Caricamento delle proprietà dal disco fallito"
-#: libsvn_wc/props.c:1266
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Non riesco a scrivere l'hash della proprietà per '%s'"
-#: libsvn_wc/props.c:1500 libsvn_wc/props.c:1669
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "La proprietà '%s' è vuota"
-#: libsvn_wc/props.c:1547
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Non posso impostare '%s' su una directory (%s)"
-#: libsvn_wc/props.c:1555
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Non posso impostare '%s' su un file (%s)"
-#: libsvn_wc/props.c:1561
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' non è un file o una directory"
-#: libsvn_wc/props.c:1642
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Il file '%s' ha la proprietà 'mime type' impostata a binario"
-#: libsvn_wc/props.c:2508
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Errore nella lettura della proprietà %s su '%s': '%s'"
-#: libsvn_wc/props.c:2521
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
@@ -5583,12 +5651,12 @@
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Errore di checksum per '%s'; atteso: '%s', effettivo: '%s'"
-#: libsvn_wc/update_editor.c:3003
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s' non ha informazioni di ascendenza"
-#: libsvn_wc/update_editor.c:3162
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Copyfrom-url '%s' ha un altro repository di root rispetto a '%s'"
@@ -5630,11 +5698,13 @@
"Operazioni in locale, senza commit, non usano messaggi di log o\n"
"revisioni di proprietà"
-#: svn/diff-cmd.c:117 svnserve/main.c:546
+#: svn/diff-cmd.c:117 svnserve/main.c:530
+#, c-format
msgid "Can't open stdout"
msgstr "Non riesco ad aprire stdout"
#: svn/diff-cmd.c:119
+#, c-format
msgid "Can't open stderr"
msgstr "Non riesco ad aprire stderr"
@@ -5643,6 +5713,7 @@
msgstr "L'opzione '--new' è valida insieme all'opzione '--old'"
#: svn/diff-cmd.c:214
+#, c-format
msgid "Target lists to diff may not contain both working copy paths and URLs"
msgstr ""
"La lista dei percorsi da esaminare non può contenere sia percorsi locali che "
@@ -5693,7 +5764,7 @@
"Per ulteriori informazioni, vedi http://subversion.tigris.org/\n"
"\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1429
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -5750,51 +5821,63 @@
msgstr "Revisione: %ld\n"
#: svn/info-cmd.c:276
+#, c-format
msgid "Node Kind: file\n"
msgstr "Tipo di Nodo: file\n"
#: svn/info-cmd.c:280
+#, c-format
msgid "Node Kind: directory\n"
msgstr "Tipo di Nodo: directory\n"
#: svn/info-cmd.c:284
+#, c-format
msgid "Node Kind: none\n"
msgstr "Tipo di Nodo: nessuno\n"
#: svn/info-cmd.c:289
+#, c-format
msgid "Node Kind: unknown\n"
msgstr "Tipo di Nodo: sconosciuto\n"
#: svn/info-cmd.c:298
+#, c-format
msgid "Schedule: normal\n"
msgstr "Azione: normale\n"
#: svn/info-cmd.c:302
+#, c-format
msgid "Schedule: add\n"
msgstr "Azione: aggiungi\n"
#: svn/info-cmd.c:306
+#, c-format
msgid "Schedule: delete\n"
msgstr "Azione: cancella\n"
#: svn/info-cmd.c:310
+#, c-format
msgid "Schedule: replace\n"
msgstr "Azione: sovrascrivi\n"
#: svn/info-cmd.c:326
+#, c-format
msgid "Depth: empty\n"
msgstr "Profondità: vuoti\n"
#: svn/info-cmd.c:330
+#, c-format
msgid "Depth: files\n"
msgstr "Profondità: file\n"
#: svn/info-cmd.c:334
+#, c-format
msgid "Depth: immediates\n"
msgstr "Profondità: immediati\n"
#. Other depths should never happen here.
#: svn/info-cmd.c:345
+#, c-format
msgid "Depth: INVALID\n"
msgstr "Profondità: NON VALIDO\n"
@@ -5928,6 +6011,7 @@
msgstr "(nessuna data)"
#: svn/log-cmd.c:203
+#, c-format
msgid "Changed paths:\n"
msgstr "Percorsi cambiati:\n"
@@ -7382,12 +7466,13 @@
"c,\n"
"prova '-r N:M' invece di '-r N -r M'"
-#: svn/main.c:1121 svnadmin/main.c:1316
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Errore di sintassi nell'argomento di revisione '%s'"
#: svn/main.c:1194
+#, c-format
msgid "Error converting depth from locale to UTF8"
msgstr "Errore nella conversione della profondità dal locale a UTF8"
@@ -7405,17 +7490,18 @@
msgid "Syntax error in native-eol argument '%s'"
msgstr "Errore di sintassi nell'argomento native-eol '%s'"
-#: svn/main.c:1413 svndumpfilter/main.c:1207 svnlook/main.c:2066
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
+#, c-format
msgid "Subcommand argument required\n"
msgstr "È necessario specificare un argomento per il comando\n"
-#: svn/main.c:1432 svnadmin/main.c:1445 svndumpfilter/main.c:1226
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Comando sconosciuto: '%s'\n"
-#: svn/main.c:1465
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7424,19 +7510,19 @@
"Il comando '%s' non accetta l'opzione '%s'\n"
"Digita 'svn help %s' per le istruzioni.\n"
-#: svn/main.c:1502
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"Il file contenente il messaggio di log è sotto controllo di versione;\n"
"usa --force-log per proseguire comunque"
-#: svn/main.c:1509
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"Il file contenente il commento di blocco è sotto controllo di versione;\n"
"usa --force-log per proseguire comunque"
-#: svn/main.c:1529
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7444,7 +7530,7 @@
"Il messaggio di log è il nome di un percorso (volevi usare -F?);\n"
"usa '--force-log' per proseguire comunque"
-#: svn/main.c:1536
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7452,11 +7538,11 @@
"Il commento di blocco è il nome di un percorso (volevi usare -F?);\n"
"usa '--force-log' per proseguire comunque"
-#: svn/main.c:1671
+#: svn/main.c:1668
msgid "Try 'svn help' for more info"
msgstr "Usa '%s help' per maggiori informazioni"
-#: svn/main.c:1681
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -7562,26 +7648,32 @@
msgstr "Alla revisione %ld.\n"
#: svn/notify.c:279
+#, c-format
msgid "External export complete.\n"
msgstr "Esportazione dell'oggetto esterno completata.\n"
#: svn/notify.c:280
+#, c-format
msgid "Export complete.\n"
msgstr "Esportazione completata.\n"
#: svn/notify.c:287
+#, c-format
msgid "External checkout complete.\n"
msgstr "Checkout dell'oggetto esterno completata.\n"
#: svn/notify.c:288
+#, c-format
msgid "Checkout complete.\n"
msgstr "Checkout completato.\n"
#: svn/notify.c:295
+#, c-format
msgid "External update complete.\n"
msgstr "Aggiornamente dell'oggetto esterno completata.\n"
#: svn/notify.c:296
+#, c-format
msgid "Update complete.\n"
msgstr "Aggiornamento completato.\n"
@@ -7625,6 +7717,7 @@
msgstr "Sovrascrivo %s\n"
#: svn/notify.c:368
+#, c-format
msgid "Transmitting file data "
msgstr "Trasmissione dati "
@@ -7834,6 +7927,7 @@
"e l'opzione di configurazione 'editor-cmd' non è stata trovata"
#: svn/util.c:178
+#, c-format
msgid "Can't get working directory"
msgstr "Non riesco a rilevare la directory di lavoro"
@@ -7859,6 +7953,7 @@
"formato interno"
#: svn/util.c:354
+#, c-format
msgid "Can't restore working directory"
msgstr "Non riesco a ripristinare la directory di lavoro"
@@ -7918,6 +8013,7 @@
msgstr "Usa --force per ignorare questa restrizione"
#: svnadmin/main.c:95 svndumpfilter/main.c:62
+#, c-format
msgid "Can't open stdio file"
msgstr "Non riesco ad aprire un file di stdio"
@@ -8286,6 +8382,7 @@
msgstr "Deltificazione della revisione %ld..."
#: svnadmin/main.c:569
+#, c-format
msgid "done.\n"
msgstr "fatto.\n"
@@ -8313,6 +8410,7 @@
"\n"
#: svnadmin/main.c:775
+#, c-format
msgid ""
"Repository lock acquired.\n"
"Please wait; recovering the repository may take some time...\n"
@@ -8329,12 +8427,14 @@
"un altro processo come httpd o svn lo stanno utilizzando?"
#: svnadmin/main.c:816
+#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr ""
"In attesa di ottenere il blocco del repository; forse un altro\n"
"processo lo sta utilizzando?\n"
#: svnadmin/main.c:824
+#, c-format
msgid ""
"\n"
"Recovery completed.\n"
@@ -8353,18 +8453,22 @@
msgstr "Transazione '%s' rimossa.\n"
#: svnadmin/main.c:1009 svnadmin/main.c:1036
+#, c-format
msgid "Missing revision"
msgstr "Revisione mancante"
#: svnadmin/main.c:1012 svnadmin/main.c:1039
+#, c-format
msgid "Only one revision allowed"
msgstr "È permessa una sola revisione"
#: svnadmin/main.c:1018
+#, c-format
msgid "Exactly one property name and one file argument required"
msgstr "È richiesto esattamente un solo nome di proprietà come argomento"
#: svnadmin/main.c:1045
+#, c-format
msgid "Exactly one file argument required"
msgstr "È richiesto esattamente un solo file come argomento"
@@ -8420,17 +8524,18 @@
msgid "Removed lock on '%s'.\n"
msgstr "Rimosso il blocco da '%s'\n"
-#: svnadmin/main.c:1302
+#: svnadmin/main.c:1303
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Vi sono più argomenti di revisione; prova '-r N:M' invece di '-r N -r M'"
-#: svnadmin/main.c:1427
+#: svnadmin/main.c:1428
+#, c-format
msgid "subcommand argument required\n"
msgstr "richiesto argomento per il comando\n"
-#: svnadmin/main.c:1512
+#: svnadmin/main.c:1502
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8439,7 +8544,7 @@
"Il sotto-comando '%s' non accetta l'opzione '%s'\n"
"Digita 'svnadmin help %s' per maggiori informazioni.\n"
-#: svnadmin/main.c:1545
+#: svnadmin/main.c:1535
msgid "Try 'svnadmin help' for more info"
msgstr "Usa 'svnversion --help' per maggiori informazioni."
@@ -8463,6 +8568,7 @@
msgstr "Percorso di origine della copia non valido '%s'"
#: svndumpfilter/main.c:558
+#, c-format
msgid "No valid copyfrom revision in filtered stream"
msgstr "Nessun revisione copyfrom valida nel flusso filtrato"
@@ -8527,18 +8633,22 @@
"Commandi disponibili:\n"
#: svndumpfilter/main.c:943
+#, c-format
msgid "Excluding (and dropping empty revisions for) prefixes:\n"
msgstr "Sto escludendo (ed eliminando le revisioni vuote per) i prefissi:\n"
#: svndumpfilter/main.c:945
+#, c-format
msgid "Excluding prefixes:\n"
msgstr "Sto escludendo i prefissi:\n"
#: svndumpfilter/main.c:947
+#, c-format
msgid "Including (and dropping empty revisions for) prefixes:\n"
msgstr "Sto includendo (ed eliminando le revisioni vuote per) i prefissi:\n"
#: svndumpfilter/main.c:949
+#, c-format
msgid "Including prefixes:\n"
msgstr "Sto includendo i prefissi:\n"
@@ -8566,6 +8676,7 @@
msgstr "%d nodi eliminati:\n"
#: svndumpfilter/main.c:1245
+#, c-format
msgid ""
"\n"
"Error: no prefixes supplied.\n"
@@ -8822,6 +8933,7 @@
msgstr "Indice"
#: svnlook/main.c:903
+#, c-format
msgid "(Binary files differ)\n"
msgstr "(I file binari sono diversi)\n"
@@ -8845,6 +8957,7 @@
msgstr "Il percorso '%s' non è un file"
#: svnlook/main.c:1379
+#, c-format
msgid ""
"REVISION PATH <ID>\n"
"-------- ---------\n"
@@ -8853,6 +8966,7 @@
"--------- --------\n"
#: svnlook/main.c:1384
+#, c-format
msgid ""
"REVISION PATH\n"
"-------- ----\n"
@@ -8876,6 +8990,7 @@
msgstr "Proprietà '%s' non trovata nel percorso '%s' nella transazione %s"
#: svnlook/main.c:1616 svnlook/main.c:1831
+#, c-format
msgid "Missing repository path argument"
msgstr "Argomento di percorso del repository mancante"
@@ -8925,10 +9040,12 @@
"%s\n"
#: svnlook/main.c:1805
+#, c-format
msgid "Missing propname argument"
msgstr "Argomento di nome della proprietà mancante"
#: svnlook/main.c:1806
+#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Argomenti percorso di repository e nome di proprietà mancanti"
@@ -8947,6 +9064,7 @@
"Gli argomenti '--transaction' (-t) e '--revision' (-r) non possono coesistere"
#: svnlook/main.c:2118
+#, c-format
msgid "Repository argument required\n"
msgstr "È richiesto un repository come argomento\n"
@@ -8969,6 +9087,7 @@
msgstr "Usa 'svnlook help' per maggiori informazioni"
#: svnserve/cyrus_auth.c:243
+#, c-format
msgid "Can't get hostname"
msgstr "Non riesco ad ottenere il nome dell'host"
@@ -9057,20 +9176,22 @@
"\n"
"Opzioni valide:\n"
-#: svnserve/main.c:458
+#: svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "svnserve: Il percorso di root '%s'non esiste o non è una directory\n"
-#: svnserve/main.c:507
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Devi specificare esattamente un'opzione fra -d, -i, -t o -X.\n"
-#: svnserve/main.c:525
+#: svnserve/main.c:511
+#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "L'opzione --tunnel-user è valida solo per la modalità tunnel.\n"
-#: svnserve/main.c:594
+#: svnserve/main.c:576
+#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
"Service Control Manager.\n"
@@ -9078,51 +9199,62 @@
"svnserve: L'opzione --service è valida solo se il processo è avviato\n"
"dal Service Control Manager\n"
-#: svnserve/main.c:630
+#: svnserve/main.c:612
+#, c-format
msgid "Can't get address info"
msgstr "Non riesco ad ottenere le informazioni dell'indirizzo"
-#: svnserve/main.c:646
+#: svnserve/main.c:626
+#, c-format
msgid "Can't create server socket"
msgstr "Non riesco a creare un socket per il server"
-#: svnserve/main.c:659
+#: svnserve/main.c:637
+#, c-format
msgid "Can't bind server socket"
msgstr "Non riesco ad allacciarmi al socket del server"
-#: svnserve/main.c:727
+#: svnserve/main.c:703
+#, c-format
msgid "Can't accept client connection"
msgstr "Non posso accettare la connessione del client"
-#: svnserve/main.c:781
+#: svnserve/main.c:755
+#, c-format
msgid "Can't create threadattr"
msgstr "Non riesco a creare l'attributo del thread"
-#: svnserve/main.c:789
+#: svnserve/main.c:763
+#, c-format
msgid "Can't set detached state"
msgstr "Non riesco ad impostare lo stato scollegato"
-#: svnserve/main.c:802
+#: svnserve/main.c:776
+#, c-format
msgid "Can't create thread"
msgstr "Non riesco a creare il thread"
-#: svnserve/serve.c:1463
+#: svnserve/serve.c:1437
msgid "Path is not a string"
msgstr "Il valore di path non è una stringa"
#: svnserve/winservice.c:341
+#, c-format
msgid "Failed to create winservice_start_event"
msgstr "Impossibile creare winservice_start_event"
#: svnserve/winservice.c:352
+#, c-format
msgid "The service failed to start"
msgstr "Impossibile avviare il servizio"
#: svnserve/winservice.c:400
+#, c-format
msgid "Failed to connect to Service Control Manager"
msgstr "Impossibile connettersi al Service Control Manager"
#: svnserve/winservice.c:411
+#, c-format
msgid ""
"The service failed to start; an internal error occurred while starting the "
"service"
@@ -9245,6 +9377,7 @@
msgstr "connessione ad un repository di sincronia con la password ARG"
#: svnsync/main.c:218
+#, c-format
msgid "Can't get local hostname"
msgstr "Non riesco ad ottenere il nome dell'host locale"
@@ -9280,8 +9413,8 @@
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Il repository di destinazione si sta già sincronizzando con '%s'"
-#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1202
-#: svnsync/main.c:1381
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Il percorso '%s' non è un'URL"
@@ -9328,7 +9461,7 @@
msgid "Commit created rev %ld but should have created %ld"
msgstr "Il commit ha creato la revisione %ld ma avrebbe dovuto creare %ld"
-#: svnsync/main.c:1274 svnsync/main.c:1279
+#: svnsync/main.c:1275 svnsync/main.c:1280
#, c-format
msgid ""
"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
@@ -9336,17 +9469,17 @@
"Non posso copiare revprops per una revisione (%ld) che non è stata ancora "
"sincronizzata"
-#: svnsync/main.c:1331
+#: svnsync/main.c:1332
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "'%s' non è un intervallo di revisione valido"
-#: svnsync/main.c:1345 svnsync/main.c:1365
+#: svnsync/main.c:1346 svnsync/main.c:1366
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Numero di revisione non valido (%ld)"
-#: svnsync/main.c:1422
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -9361,7 +9494,7 @@
"\n"
"Commandi disponibili:\n"
-#: svnsync/main.c:1586
+#: svnsync/main.c:1581
msgid ""
"Cannot use --username or --password with any of --source-username, --source-"
"password, --sync-username, or --sync-password.\n"
@@ -9370,7 +9503,7 @@
"username,\n"
"--source-password, --sync-username o --sync-password.\n"
-#: svnsync/main.c:1666
+#: svnsync/main.c:1661
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9380,15 +9513,17 @@
"Digita 'svnsync help %s' per le informazioni\n"
"sul suo utilizzo.\n"
-#: svnsync/main.c:1738
+#: svnsync/main.c:1733
msgid "Try 'svnsync help' for more info"
msgstr "Usa 'svnsync help' per maggiori informazioni"
#: svnversion/main.c:39
+#, c-format
msgid "Type 'svnversion --help' for usage.\n"
msgstr "Digita 'svnversion --help' per informazioni.\n"
#: svnversion/main.c:50
+#, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
"\n"
@@ -9452,12 +9587,12 @@
msgid "last changed rather than current revisions"
msgstr "ultimo cambiamento anziché la revisione corrente"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "esportato%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "'%s' non sotto controllo di versione e non esportato\n"
diff --git a/subversion/po/ja.po b/subversion/po/ja.po
index 0f9cd55..bc3c89f 100644
--- a/subversion/po/ja.po
+++ b/subversion/po/ja.po
@@ -175,7 +175,7 @@
msgstr ""
"Project-Id-Version: subversion trunk\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-03-26 21:18+0900\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2007-03-27 02:05+0900\n"
"Last-Translator: Subversion <dev@subversion.tigris.org>\n"
"Language-Team: Japanese <dev@subversion.tigris.org>\n"
@@ -1101,8 +1101,8 @@
msgstr "パス '%s' は存在しません"
#: libsvn_client/commit.c:741 libsvn_client/copy.c:295
-#: libsvn_client/copy.c:768 libsvn_client/copy.c:1036
-#: libsvn_client/copy.c:1423
+#: libsvn_client/copy.c:759 libsvn_client/copy.c:1025
+#: libsvn_client/copy.c:1417
#, c-format
msgid "Path '%s' already exists"
msgstr "パス '%s' は既に存在しています"
@@ -1112,15 +1112,15 @@
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' は予約された名称です。インポートはできません"
-#: libsvn_client/commit.c:872 libsvn_client/copy.c:918
+#: libsvn_client/commit.c:872 libsvn_client/copy.c:909
msgid "Commit failed (details follow):"
msgstr "コミットに失敗しました (詳しい理由は以下のとおりです):"
-#: libsvn_client/commit.c:880 libsvn_client/copy.c:926
+#: libsvn_client/commit.c:880 libsvn_client/copy.c:917
msgid "Commit succeeded, but other errors follow:"
msgstr "コミットには成功しましたが、続けて他のエラーが生じました:"
-#: libsvn_client/commit.c:887 libsvn_client/copy.c:933
+#: libsvn_client/commit.c:887 libsvn_client/copy.c:924
msgid "Error unlocking locked dirs (details follow):"
msgstr ""
"ディレクトリのロック解除中にエラーが発生しました (詳しい理由は以下のとおりで"
@@ -1132,7 +1132,7 @@
"コミット後にリビジョンを上げる際にエラーが発生しました (詳しくは以下のとおり"
"です):"
-#: libsvn_client/commit.c:909 libsvn_client/copy.c:944
+#: libsvn_client/commit.c:909 libsvn_client/copy.c:935
msgid "Error in post-commit clean-up (details follow):"
msgstr "コミット後の掃除中にエラーが発生しました (詳しくは以下のとおりです):"
@@ -1227,13 +1227,13 @@
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "標準の属性については、リビジョン属性の明示的な設定はできません"
-#: libsvn_client/copy.c:305 libsvn_client/copy.c:1433
+#: libsvn_client/copy.c:305 libsvn_client/copy.c:1427
#: libsvn_client/update.c:98
#, c-format
msgid "Path '%s' is not a directory"
msgstr "パス '%s' はディレクトリではありません"
-#: libsvn_client/copy.c:667
+#: libsvn_client/copy.c:658
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
@@ -1242,66 +1242,66 @@
"コピー元とコピー先 (または移動元と移動先) は同じリポジトリ内にはないようです "
"(元: '%s'; 先: '%s')"
-#: libsvn_client/copy.c:749
+#: libsvn_client/copy.c:740
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "URL '%s' は自身には移動できません"
-#: libsvn_client/copy.c:758 libsvn_client/prop_commands.c:229
+#: libsvn_client/copy.c:749 libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "パス '%s' がリビジョン %ld に存在しません"
-#: libsvn_client/copy.c:1265
+#: libsvn_client/copy.c:1259
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr ""
"コピー元 (もしくは移動元) の URL '%s' は別のリポジトリに由来しています。一緒"
"に扱えない作業コピーのままにしておきます"
-#: libsvn_client/copy.c:1410
+#: libsvn_client/copy.c:1404
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "パス '%s' がリビジョン %ld に見つかりません"
-#: libsvn_client/copy.c:1415
+#: libsvn_client/copy.c:1409
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "パス '%s' が HEAD リビジョンに見つかりません"
-#: libsvn_client/copy.c:1458
+#: libsvn_client/copy.c:1452
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "'%s' のエントリが存在します (それなのに作業ファイルがありません)"
-#: libsvn_client/copy.c:1552 libsvn_client/log.c:87
+#: libsvn_client/copy.c:1546 libsvn_client/log.c:87
msgid "Revision type requires a working copy path, not a URL"
msgstr "リビジョン形式には URL ではなく作業コピーパスが必要となります。"
-#: libsvn_client/copy.c:1587
+#: libsvn_client/copy.c:1581
msgid "Cannot mix repository and working copy sources"
msgstr "コピー元 (または移動元) にリポジトリと作業コピーは混在できません"
-#: libsvn_client/copy.c:1629
+#: libsvn_client/copy.c:1623
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "パス '%s' は自身の子ノード '%s' にはコピーできません"
-#: libsvn_client/copy.c:1649
+#: libsvn_client/copy.c:1643
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "パス '%s' は自身には移動できません"
-#: libsvn_client/copy.c:1658
+#: libsvn_client/copy.c:1652
msgid "Moves between the working copy and the repository are not supported"
msgstr "作業コピー・リポジトリ間の移動はサポートされていません"
-#: libsvn_client/copy.c:1716
+#: libsvn_client/copy.c:1710
#, c-format
msgid "'%s' does not seem to have a URL associated with it"
msgstr "'%s' に該当する URL は存在しないようです"
-#: libsvn_client/copy.c:2054 svn/move-cmd.c:60
+#: libsvn_client/copy.c:2048 svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "移動操作に (HEAD 以外の) リビジョンは指定できません"
@@ -1322,39 +1322,39 @@
msgid "'%s' has local modifications"
msgstr "'%s' にはローカルで修正が加えられています"
-#: libsvn_client/diff.c:136
+#: libsvn_client/diff.c:135
#, c-format
msgid " Reverted %s:r%s%s"
msgstr " %s:r%s を元に戻しました%s"
-#: libsvn_client/diff.c:154
+#: libsvn_client/diff.c:153
#, c-format
msgid " Merged %s:r%s%s"
msgstr " %s:r%s をマージしました%s"
-#: libsvn_client/diff.c:176
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%s属性に変更があったパス: %s%s"
-#: libsvn_client/diff.c:204
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "名前: %s%s"
# * Label for the diff output from 'svn diff'.
-#: libsvn_client/diff.c:323
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(リビジョン %ld)"
# * Label for the diff output from 'svn diff'.
-#: libsvn_client/diff.c:325
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(作業コピー)"
-#: libsvn_client/diff.c:468
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "表示できません: バイナリ形式としてマークされたファイルです。%s"
@@ -1362,28 +1362,28 @@
#. -----------------------------------------------------------------------
#. ** Utilities. **
#. Sanity check -- ensure that we have valid revisions to look at.
-#: libsvn_client/diff.c:828 libsvn_client/merge.c:61
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "必要なリビジョンがすべては指定されていません"
-#: libsvn_client/diff.c:843
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr ""
"peg リビジョン指定をつけて diff を使う場合、少なくとも一方のリビジョンはロー"
"カルにあってはいけません"
-#: libsvn_client/diff.c:955 libsvn_client/diff.c:967
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' は、リポジトリのリビジョン %ld には見つかりませんでした"
-#: libsvn_client/diff.c:1026
+#: libsvn_client/diff.c:1025
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr ""
"すみません。まだサポートされていないやり方で svn_client_diff4 が呼び出されま"
"した"
-#: libsvn_client/diff.c:1068
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1391,12 +1391,12 @@
"今のところ、パスのテキストベースと作業ファイルの差分しかサポートされていませ"
"ん"
-#: libsvn_client/diff.c:1213 libsvn_client/switch.c:107
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "ディレクトリ '%s' に URL がありません"
-#: libsvn_client/diff.c:1422
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr "差分の要約はリポジトリとリポジトリとの比較にしか使えません"
@@ -1422,7 +1422,7 @@
msgstr "'%s' は既に存在します"
#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
-#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2463
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "'%s' のチェックサムが一致しませんでした。期待: '%s', 実際: '%s'"
@@ -1441,8 +1441,8 @@
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "共通の親が見つかりません。互いに無関係の引数に対する操作はできません"
-#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2054
-#: libsvn_client/merge.c:2060 libsvn_client/merge.c:2238
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
#, c-format
msgid "'%s' has no URL"
@@ -1513,7 +1513,7 @@
msgid ".merge-right.r%ld"
msgstr ".merge-right.r%ld"
-#: libsvn_client/merge.c:1156
+#: libsvn_client/merge.c:1164
#, c-format
msgid ""
"Path '%s' is in conflict, and must be resolved before the remainder of the "
@@ -1522,7 +1522,7 @@
"パス '%s' が衝突しています。指定されたマージのうちまだ適用されていないものを"
"適用する前に、この衝突を解決しなければなりません"
-#: libsvn_client/merge.c:1449 libsvn_client/merge.c:1762
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
msgid "Use of two URLs is not compatible with merge info modification"
msgstr "マージ情報の修正とともに 2 つの URL を使用することはできません"
@@ -1799,15 +1799,15 @@
msgid "deleting changes"
msgstr "変更を削除しています"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2393
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "必要なノードリビジョン識別番号がありません"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2403
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "不正な変更順序: ノードリビジョン識別番号を削除せず新しく追加しています"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2414
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "不正な変更順序: 削除したパスに対して、追加ではない変更をしています"
@@ -1928,115 +1928,115 @@
msgid "set repository uuid"
msgstr "リポジトリ UUID を設定しています"
-#: libsvn_fs_base/dag.c:219
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"DB が壊れています: ファイルシステム '%s' の最初のトランザクション ID が '0' "
"でありません"
-#: libsvn_fs_base/dag.c:227
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr ""
"DB が壊れています: ファイルシステム '%s' の最初のコピー ID が '0' でありませ"
"ん"
-#: libsvn_fs_base/dag.c:236
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"DB が壊れています: ファイルシステム '%s' の最初のリビジョン番号が '0' であり"
"ません"
-#: libsvn_fs_base/dag.c:284 libsvn_fs_base/dag.c:460 libsvn_fs_fs/dag.c:333
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "ディレクトリでない親にエントリを作成しようとしました"
-#: libsvn_fs_base/dag.c:454 libsvn_fs_fs/dag.c:327
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "不正な名前 '%s' をもつノードを作成しようとしました"
-#: libsvn_fs_base/dag.c:466 libsvn_fs_base/dag.c:700 libsvn_fs_fs/dag.c:339
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "変更できないノードの子を複製しようとしました"
-#: libsvn_fs_base/dag.c:473
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "既に存在するエントリを作成しようとしました"
-#: libsvn_fs_base/dag.c:524 libsvn_fs_fs/dag.c:401
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "ディレクトリでないノードにエントリを設定しようとしました"
-#: libsvn_fs_base/dag.c:530 libsvn_fs_fs/dag.c:407
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "変更できないノードにエントリを設定しようとしました"
-#: libsvn_fs_base/dag.c:594
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "変更できない ノードリビジョン %s には属性リストを設定できません"
-#: libsvn_fs_base/dag.c:706
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "不正な名前 '%s' をもつ子のクローンを作成しようとしました"
-#: libsvn_fs_base/dag.c:832
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "ディレクトリでないノードからエントリ '%s' を削除しようとしました"
-#: libsvn_fs_base/dag.c:838
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "変更できないディレクトリノードからエントリ '%s' を削除しようとしました"
-#: libsvn_fs_base/dag.c:845
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "不正な名前 '%s' をもつノードを削除しようとしました"
-#: libsvn_fs_base/dag.c:860 libsvn_fs_base/dag.c:893
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "削除が失敗しました: ディレクトリにエントリ '%s' がありません"
-#: libsvn_fs_base/dag.c:942
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "変更できないノードを削除しようとしました"
-#: libsvn_fs_base/dag.c:1062
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "ファイルでないノードのテキストを取得しようとしました"
-#: libsvn_fs_base/dag.c:1097
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "ファイルでないノードの長さを取得しようとしました"
-#: libsvn_fs_base/dag.c:1123
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "ファイルでないノードのチェックサムを取得しようとしました"
-#: libsvn_fs_base/dag.c:1154 libsvn_fs_base/dag.c:1208
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "ファイルでないノードにテキストを設定しようとしました"
-#: libsvn_fs_base/dag.c:1160 libsvn_fs_base/dag.c:1214
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "変更できないノードにはテキストを設定できません"
-#: libsvn_fs_base/dag.c:1237
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -2047,12 +2047,12 @@
" 期待: %s\n"
" 実際: %s\n"
-#: libsvn_fs_base/dag.c:1292
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "存在しない子ノード '%s' を開こうとしました"
-#: libsvn_fs_base/dag.c:1298
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "不正な名前 '%s' をもつノードを開こうとしました"
@@ -2208,7 +2208,7 @@
"ファイルシステム '%s' に対して環境を開いているときに Berkeley DB エラーが起き"
"ました\n"
-#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:642
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "期待されるファイルシステム形式は '%d' ですが、実際の形式は '%d' です"
@@ -2236,29 +2236,29 @@
"DB_LOG_AUTOREMOVE 機能が hotcopy アルゴリズムを妨害しているかもしれません。\n"
"問題が起き続けるようであれば、DB_CONFIG でこの機能を無効にしてみてください"
-#: libsvn_fs_base/fs.c:1240
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr "Berkeley DB リポジトリを扱うためのモジュール。"
-#: libsvn_fs_base/fs.c:1274
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "bdb 用のファイルシステムローダバージョン (%d) はサポートされていません"
-#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr ""
"パス '%s' にかけられたロックを検証できません。利用できるユーザ名がありません"
-#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr ""
"ユーザ %s はパス '%s' にロックを所有していません (現在ロックをかけているのは "
"%s です)"
-#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr ""
@@ -2353,7 +2353,7 @@
msgid "Transaction is dead: '%s'"
msgstr "トランザクションが死んでいます: '%s'"
-#: libsvn_fs_base/revs-txns.c:1078
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "トランザクションが中断されましたが、掃除が失敗しました"
@@ -2363,89 +2363,89 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:391 libsvn_fs_fs/tree.c:310
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "ファイルが見つかりません: トランザクション %s, パス '%s'"
-#: libsvn_fs_base/tree.c:396 libsvn_fs_fs/tree.c:315
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "ファイルが見つかりません: リビジョン %ld, パス '%s'"
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:406 libsvn_fs_fs/tree.c:330
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr ""
"ファイルが既に存在します: ファイルシステム '%s', トランザクション %s, パス '%"
"s'"
-#: libsvn_fs_base/tree.c:411 libsvn_fs_fs/tree.c:336
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr ""
"ファイルが既に存在します: ファイルシステム '%s', リビジョン %ld, パス '%s'"
# ? root object
-#: libsvn_fs_base/tree.c:419 libsvn_fs_fs/tree.c:346
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "ルートオブジェクトはトランザクションルートでなければなりません"
-#: libsvn_fs_base/tree.c:834 libsvn_fs_fs/tree.c:755
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "'%s' を開けませんでした"
-#: libsvn_fs_base/tree.c:1465 libsvn_fs_fs/tree.c:1202
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr "二つの異なるファイルシステムの間で属性値の比較はできません"
-#: libsvn_fs_base/tree.c:1798
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "DB が壊れています: 祖先の番号が不正です"
-#: libsvn_fs_base/tree.c:1853 libsvn_fs_fs/tree.c:1239
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "'%s' に予想外の変更できないノードがあります"
-#: libsvn_fs_base/tree.c:1874 libsvn_fs_fs/tree.c:1262
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "'%s' で競合が生じています"
-#: libsvn_fs_base/tree.c:1924 libsvn_fs_base/tree.c:2636
-#: libsvn_fs_fs/tree.c:1311 libsvn_fs_fs/tree.c:1803
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr ""
"不正なマージです。祖先・マージ元・対象のどれかが同じファイルシステムにありま"
"せん"
-#: libsvn_fs_base/tree.c:1940 libsvn_fs_fs/tree.c:1327
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr "不正なマージです。対象 '%s' が祖先と同じ ID '%s' をもっています"
-#: libsvn_fs_base/tree.c:2443
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "トランザクション '%s' はリビジョン '%s' に対して古くなっています"
-#: libsvn_fs_base/tree.c:2819 libsvn_fs_fs/tree.c:1942
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "ルートディレクトリは削除できません"
-#: libsvn_fs_base/tree.c:2999 libsvn_fs_fs/tree.c:2014
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "二つの異なるファイルシステム ('%s' と '%s') の間でコピーはできません"
-#: libsvn_fs_base/tree.c:3008 libsvn_fs_fs/tree.c:2020
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "変更可能なツリーからのコピーは今のところサポートされていません"
-#: libsvn_fs_base/tree.c:3503 libsvn_fs_fs/tree.c:2444
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2456,12 +2456,12 @@
" 期待: %s\n"
" 実際: %s\n"
-#: libsvn_fs_base/tree.c:3756 libsvn_fs_fs/tree.c:2680
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr "二つの異なるファイルシステムの間でファイルの内容の比較はできません"
-#: libsvn_fs_base/tree.c:3765 libsvn_fs_base/tree.c:3770
-#: libsvn_fs_fs/tree.c:2689 libsvn_fs_fs/tree.c:2694
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
@@ -2507,51 +2507,51 @@
msgid "Can't store FSFS shared data"
msgstr "FSFS 共有データを保存できません"
-#: libsvn_fs_fs/fs.c:352
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr "プレインファイル (FSFS) リポジトリを扱うためのモジュール。"
-#: libsvn_fs_fs/fs.c:386
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr ""
"fsfs 用のファイルシステムローダバージョン (%d) はサポートされていません"
-#: libsvn_fs_fs/fs_fs.c:351
+#: libsvn_fs_fs/fs_fs.c:352
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "FSFS トランザクションリストの相互排他ロックを奪えません"
-#: libsvn_fs_fs/fs_fs.c:359
+#: libsvn_fs_fs/fs_fs.c:360
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "FSFS トランザクションリストの相互排他ロックを手放せません"
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "未知のトランザクション '%s' のロックを解除できません"
-#: libsvn_fs_fs/fs_fs.c:389
+#: libsvn_fs_fs/fs_fs.c:390
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "ロックされていないトランザクション '%s' のロックを解除できません"
-#: libsvn_fs_fs/fs_fs.c:396
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
"トランザクション '%s' 用のプロトタイプリビジョンロックファイルのロックを解除"
"できません"
-#: libsvn_fs_fs/fs_fs.c:402
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr ""
"トランザクション '%s' 用のプロトタイプリビジョンロックファイルを閉じることが"
"できません"
-#: libsvn_fs_fs/fs_fs.c:464
+#: libsvn_fs_fs/fs_fs.c:465
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2560,7 +2560,7 @@
"現在このプロセスが前の表現を書き込み中なので、トランザクション '%s' のプロト"
"タイプリビジョンファイルに書き込めません"
-#: libsvn_fs_fs/fs_fs.c:500
+#: libsvn_fs_fs/fs_fs.c:501
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2569,96 +2569,97 @@
"現在他のプロセスが前の表現を書き込み中なので、トランザクション '%s' のプロト"
"タイプリビジョンファイルに書き込めません"
-#: libsvn_fs_fs/fs_fs.c:507 libsvn_subr/io.c:1512
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "ファイル '%s' に対して排他的なロックを取得できません"
-#: libsvn_fs_fs/fs_fs.c:833 libsvn_fs_fs/fs_fs.c:847
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "リビジョンファイルで不正なヘッダが見つかりました"
# ? text rep offset line
-#: libsvn_fs_fs/fs_fs.c:949 libsvn_fs_fs/fs_fs.c:963 libsvn_fs_fs/fs_fs.c:970
-#: libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985 libsvn_fs_fs/fs_fs.c:993
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "node-rev に不正な text rep offset 行があります"
-#: libsvn_fs_fs/fs_fs.c:1062
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "node-rev に種別情報がありません"
-#: libsvn_fs_fs/fs_fs.c:1093
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "node-rev に cpath がありません"
-#: libsvn_fs_fs/fs_fs.c:1120 libsvn_fs_fs/fs_fs.c:1126
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "node-rev に不正な 'copyroot' 行があります"
-#: libsvn_fs_fs/fs_fs.c:1144 libsvn_fs_fs/fs_fs.c:1150
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "node-rev に不正な 'copyfrom' 行があります"
-#: libsvn_fs_fs/fs_fs.c:1259 libsvn_fs_fs/fs_fs.c:3674
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "トランザクションでないものに書き込もうとしました"
-#: libsvn_fs_fs/fs_fs.c:1343
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "不正な表現ヘッダです"
-#: libsvn_fs_fs/fs_fs.c:1367
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "node-rev の node-id がありません"
-#: libsvn_fs_fs/fs_fs.c:1373
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "node-rev の node-id が壊れています"
-#: libsvn_fs_fs/fs_fs.c:1418
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "リビジョンファイルの末尾に改行がありません"
# character: byte 単位の処理での文字数
-#: libsvn_fs_fs/fs_fs.c:1430
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "リビジョンファイルの最終行が 64 bytes 以上です"
-#: libsvn_fs_fs/fs_fs.c:1445
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "リビジョンファイルの最終行に空白文字がありません"
-#: libsvn_fs_fs/fs_fs.c:1474 libsvn_fs_fs/fs_fs.c:1532 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "リビジョン %ld はありません"
-#: libsvn_fs_fs/fs_fs.c:1592
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "表現に不正 svndiff データがあります"
# ? svndiff window
-#: libsvn_fs_fs/fs_fs.c:1735 libsvn_fs_fs/fs_fs.c:1748
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "表現の終点を越えて 1 つの svndiff window を読んでいます"
-#: libsvn_fs_fs/fs_fs.c:1884
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "svndiff データが、存在しないソースを要求しました"
-#: libsvn_fs_fs/fs_fs.c:1890
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "svndiff がストリームの終点を越えた位置を要求しました"
-#: libsvn_fs_fs/fs_fs.c:1913 libsvn_fs_fs/fs_fs.c:1930
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "svndiff window の長さが壊れています"
-#: libsvn_fs_fs/fs_fs.c:1978
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2669,113 +2670,113 @@
" 期待: %s\n"
" 実際: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2201 libsvn_fs_fs/fs_fs.c:2214
-#: libsvn_fs_fs/fs_fs.c:2220 libsvn_fs_fs/fs_fs.c:4765
-#: libsvn_fs_fs/fs_fs.c:4774 libsvn_fs_fs/fs_fs.c:4780
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "ディレクトリエントリが壊れています"
-#: libsvn_fs_fs/fs_fs.c:2559 libsvn_fs_fs/fs_fs.c:2567
-#: libsvn_fs_fs/fs_fs.c:2599 libsvn_fs_fs/fs_fs.c:2619
-#: libsvn_fs_fs/fs_fs.c:2653 libsvn_fs_fs/fs_fs.c:2658
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "リビジョンファイルに不正な changes 行があります"
-#: libsvn_fs_fs/fs_fs.c:2592
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "リビジョンファイルに不正な変更種別があります"
-#: libsvn_fs_fs/fs_fs.c:2612
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "リビジョンファイルに不正な text-mod フラグがあります"
-#: libsvn_fs_fs/fs_fs.c:2632
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "リビジョンファイルに不正な prop-mod フラグがあります"
-#: libsvn_fs_fs/fs_fs.c:2816
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "トランザクションからのコピーは許可されません"
-#: libsvn_fs_fs/fs_fs.c:2872
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "'%s' (リビジョン %ld) のトランザクションディレクトリを作成できません"
-#: libsvn_fs_fs/fs_fs.c:3106 libsvn_fs_fs/fs_fs.c:3113
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "next-id ファイルが壊れています"
-#: libsvn_fs_fs/fs_fs.c:3200
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "トランザクションの掃除が失敗しました"
-#: libsvn_fs_fs/fs_fs.c:3368
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "不正な変更形式です"
-#: libsvn_fs_fs/fs_fs.c:3693
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "ディレクトリの内容にはテキストを設定できません"
-#: libsvn_fs_fs/fs_fs.c:3783 libsvn_fs_fs/fs_fs.c:3788
-#: libsvn_fs_fs/fs_fs.c:3795
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "現在のファイルは壊れています"
-#: libsvn_fs_fs/fs_fs.c:4084 libsvn_subr/io.c:2790 svn/util.c:252
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "'%s' に対して stat を実行できません"
-#: libsvn_fs_fs/fs_fs.c:4088
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "chmod '%s' はできません"
-#: libsvn_fs_fs/fs_fs.c:4237
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "FSFS リポジトリの相互排他ロックを奪えません"
-#: libsvn_fs_fs/fs_fs.c:4251
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "FSFS リポジトリの相互排他ロックを手放せません"
-#: libsvn_fs_fs/fs_fs.c:4370
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "トランザクションはリポジトリ側と比べて古くなっています"
-#: libsvn_fs_fs/fs_fs.c:4706
+#: libsvn_fs_fs/fs_fs.c:4807
msgid "Recovery encountered a non-directory node"
msgstr "復旧時にディレクトリでないノードが見つかりました"
-#: libsvn_fs_fs/fs_fs.c:4728
+#: libsvn_fs_fs/fs_fs.c:4829
msgid "Recovery encountered a deltified directory representation"
msgstr "復旧時に差分化されたディレクトリ表現が見つかりました"
-#: libsvn_fs_fs/fs_fs.c:4991
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "そのようなトランザクションはありません"
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "lock/entries ハッシュファイル '%s' を書き込めません"
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "lock/entries ハッシュファイル '%s' をパースできません"
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "パス '%s' は HEAD リビジョンに存在しません"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "ロックが失敗しました: '%s' の新しいバージョンが存在します"
@@ -3216,8 +3217,8 @@
msgid "%s request failed on '%s'"
msgstr "%s リクエスト (相手: '%s') が失敗しました"
-#: libsvn_ra_local/ra_plugin.c:106 libsvn_ra_local/ra_plugin.c:595
-#: libsvn_wc/update_editor.c:2605
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -3231,15 +3232,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:248
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "ローカルディスク上のリポジトリにアクセスするモジュール。"
-#: libsvn_ra_local/ra_plugin.c:288
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "URL に対し ra_local セッションを開始できません"
-#: libsvn_ra_local/ra_plugin.c:1440
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr ""
@@ -3980,36 +3981,41 @@
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "ファイルシステムのパス '%s' はファイルでもディレクトリでもありません"
-#: libsvn_repos/reporter.c:218
+#: libsvn_repos/reporter.c:222
#, c-format
msgid "Invalid depth (%s) for path '%s'"
msgstr "深さの指定 (%s) が不正です (パス: '%s')"
-#: libsvn_repos/reporter.c:649
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "作業コピーパス '%s' がリポジトリに存在しません"
-#: libsvn_repos/reporter.c:944
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "編集用ルートパスを開く操作が認証されていません"
-#: libsvn_repos/reporter.c:963
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "対象パスは存在しません"
-#: libsvn_repos/reporter.c:970
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "ディレクトリを内側から置換することはできません"
-#: libsvn_repos/reporter.c:1013
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "作業コピーのトップレベルについての報告が不正です"
-#: libsvn_repos/reporter.c:1028
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "対象がないのにトップレベルの報告が 2 つあります"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "パス '%s' のノード種別はサポートされていません"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -4055,35 +4061,35 @@
msgid "Creating conf directory"
msgstr "設定用のディレクトリを作成しています"
-#: libsvn_repos/repos.c:1482
+#: libsvn_repos/repos.c:1484
msgid "Creating svnserve.conf file"
msgstr "svnserve.conf ファイルを作成しています"
-#: libsvn_repos/repos.c:1507
+#: libsvn_repos/repos.c:1509
msgid "Creating passwd file"
msgstr "パスワードファイルを作成しています"
-#: libsvn_repos/repos.c:1577
+#: libsvn_repos/repos.c:1579
msgid "Creating authz file"
msgstr "認証ファイルを作成しています"
-#: libsvn_repos/repos.c:1610
+#: libsvn_repos/repos.c:1612
msgid "Could not create top-level directory"
msgstr "トップレベルのディレクトリを作成できませんでした"
-#: libsvn_repos/repos.c:1614
+#: libsvn_repos/repos.c:1616
msgid "Creating DAV sandbox dir"
msgstr "DAV サンドボックスディレクトリを作成しています"
-#: libsvn_repos/repos.c:1695
+#: libsvn_repos/repos.c:1697
msgid "Error opening db lockfile"
msgstr "DB ロックファイルを開く際にエラーが発生しました"
-#: libsvn_repos/repos.c:1732
+#: libsvn_repos/repos.c:1734
msgid "Repository creation failed"
msgstr "リポジトリの作成に失敗しました"
-#: libsvn_repos/repos.c:1813
+#: libsvn_repos/repos.c:1815
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr ""
@@ -4326,7 +4332,7 @@
msgid "Can't flush file to disk"
msgstr "ファイルをディスクにフラッシュできません"
-#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:537
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
#, c-format
msgid "Can't open stdin"
msgstr "標準入力を開けません"
@@ -4626,28 +4632,28 @@
"\"%s\": 未知のコマンドです。\n"
"\n"
-#: libsvn_subr/opt.c:788
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "リビジョン '%s' のパース中に構文エラーが生じました"
-#: libsvn_subr/opt.c:865
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL '%s' は適切に URI エンコードされていません"
-#: libsvn_subr/opt.c:871
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL '%s' に要素 '..' が含まれています"
-#: libsvn_subr/opt.c:900
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "'%s' の競合を解消する際にエラーが発生しました"
# c-format arguments: pgm_name, SVN_VERSION, __DATE__, __TIME__
-#: libsvn_subr/opt.c:1002
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4658,7 +4664,7 @@
" コンパイル日時: %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:1005
+#: libsvn_subr/opt.c:998
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4674,7 +4680,7 @@
"が含まれています。\n"
"\n"
-#: libsvn_subr/opt.c:1056 libsvn_subr/opt.c:1097
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "使用方法を知りたいときは '%s help' と打ってください。\n"
@@ -4779,7 +4785,7 @@
msgid "Passphrase for '%s': "
msgstr "'%s' のパスフレーズ: "
-#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1633
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "ファイル '%s' は改行文字が一貫していません"
@@ -5466,7 +5472,7 @@
msgid "Can't find entry '%s' in '%s'"
msgstr "エントリ '%s' が '%s' で見つかりません"
-#: libsvn_wc/props.c:726
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5475,7 +5481,7 @@
"新しい属性 '%s' に値 '%s' を与えて追加しようとしています。\n"
"しかし属性には値 '%s' が既についています。"
-#: libsvn_wc/props.c:764
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5484,7 +5490,7 @@
"属性 '%s' を '%s' から '%s' に変更しようとしています。\n"
"しかしその属性は存在しません。"
-#: libsvn_wc/props.c:809
+#: libsvn_wc/props.c:808
#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
@@ -5492,7 +5498,7 @@
"属性 '%s' を削除しようとしています。しかし値が '%s' から '%s' に変更されてい"
"ます。"
-#: libsvn_wc/props.c:838
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5501,52 +5507,52 @@
"属性 '%s' を '%s' から '%s' に変更しようとしています。\n"
"しかし属性には値 '%s' が既についています。"
-#: libsvn_wc/props.c:1023
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "'%s' の wcprops ファイルに行末文字がありません"
-#: libsvn_wc/props.c:1206 libsvn_wc/props.c:1238 libsvn_wc/props.c:1508
-#: libsvn_wc/props.c:1756
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "ディスクから属性をロードできませんでした"
-#: libsvn_wc/props.c:1266
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "'%s' の属性のハッシュを書き込めません"
-#: libsvn_wc/props.c:1500 libsvn_wc/props.c:1669
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "属性 '%s' はエントリ属性です"
-#: libsvn_wc/props.c:1547
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "'%s' をディレクトリ ('%s') に設定できません"
-#: libsvn_wc/props.c:1555
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "'%s' をファイル ('%s') に設定できません"
-#: libsvn_wc/props.c:1561
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' はファイルでもディレクトリでもありません"
-#: libsvn_wc/props.c:1642
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "ファイル '%s' の MIME タイプ属性はバイナリです"
-#: libsvn_wc/props.c:2508
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "属性 %s を '%s' においてパースする際にエラーが発生しました: '%s'"
-#: libsvn_wc/props.c:2521
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
@@ -5694,12 +5700,12 @@
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "'%s' のチェックサムが一致しませんでした。記録: '%s', 実際: '%s'"
-#: libsvn_wc/update_editor.c:3003
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s' には系統情報がありません"
-#: libsvn_wc/update_editor.c:3162
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "コピー元の URL '%s' のリポジトリルートが、'%s' と異なっています"
@@ -5741,7 +5747,7 @@
"ローカルの、コミットを伴わない操作にログメッセージやリビジョン属性はつけられ"
"ません"
-#: svn/diff-cmd.c:117 svnserve/main.c:546
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "標準出力を開けません"
@@ -5810,7 +5816,7 @@
"Subversion はバージョン管理用のツールです。\n"
"さらに詳しい情報は、http://subversion.tigris.org/ をご覧ください。\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1429
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -7826,7 +7832,7 @@
"複数のリビジョン引数が指定されています。-r と -c を用いた指定はできません。'-"
"r <N> -r <M>' の代わりに '-r <N>:<M>' を使ってみてください"
-#: svn/main.c:1121 svnadmin/main.c:1316
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "リビジョン引数 '%s' で構文エラーが生じました"
@@ -7851,18 +7857,18 @@
msgid "Syntax error in native-eol argument '%s'"
msgstr "native-eol の引数 '%s' 中で構文エラーが生じました"
-#: svn/main.c:1413 svndumpfilter/main.c:1207 svnlook/main.c:2066
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "サブコマンドに引数が必要です\n"
-#: svn/main.c:1432 svnadmin/main.c:1445 svndumpfilter/main.c:1226
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "未知のコマンドです: '%s'\n"
-#: svn/main.c:1465
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7871,19 +7877,19 @@
"サブコマンド '%s' にはオプション '%s' をつけられません。\n"
"使用方法を知りたいときは 'svn help %s' と打ってください。\n"
-#: svn/main.c:1502
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"ログメッセージファイルがバージョン管理されているファイルです。無効にするには "
"'--force-log' を用いてください"
-#: svn/main.c:1509
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"ロックについてのコメントのファイルがバージョン管理されているファイルです。無"
"効にするには '--force-log' を用いてください"
-#: svn/main.c:1529
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7891,7 +7897,7 @@
"ログメッセージがパス名です (-F のつもりでしたか?)。無効にするには '--force-"
"log' を用いてください"
-#: svn/main.c:1536
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7899,11 +7905,11 @@
"ロックについてのコメントがパス名です (-F のつもりでしたか?)。無効にするには "
"'--force-log' を用いてください"
-#: svn/main.c:1671
+#: svn/main.c:1668
msgid "Try 'svn help' for more info"
msgstr "より詳しく知りたいときは 'svn help' を試してみてください"
-#: svn/main.c:1681
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -8967,19 +8973,19 @@
msgid "Removed lock on '%s'.\n"
msgstr "'%s' のロックを解除しました。\n"
-#: svnadmin/main.c:1302
+#: svnadmin/main.c:1303
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"複数のリビジョン引数が指定されています。'-r <N> -r <M>' の代わりに '-r <N>:"
"<M>' を使ってみてください"
-#: svnadmin/main.c:1427
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "サブコマンドに引数が必要です\n"
-#: svnadmin/main.c:1512
+#: svnadmin/main.c:1502
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8988,7 +8994,7 @@
"サブコマンド '%s' にはオプション '%s' をつけられません。\n"
"使用方法を知りたいときは 'svnadmin help %s' と打ってください。\n"
-#: svnadmin/main.c:1545
+#: svnadmin/main.c:1535
msgid "Try 'svnadmin help' for more info"
msgstr "より詳しく知りたいときは 'svnadmin help' を試してみてください"
@@ -9765,21 +9771,21 @@
"有効なオプション:\n"
# FIXME: Remove a trailing period and a trailing newline.
-#: svnserve/main.c:458
+#: svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "svnserve: ルートパス '%s' が存在しないかディレクトリではありません。\n"
-#: svnserve/main.c:507
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "-d, -i, -t, -X のいずれかを一つだけ指定しなければいけません。\n"
-#: svnserve/main.c:525
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "オプション --tunnel-user はトンネルモードでのみ有効です。\n"
-#: svnserve/main.c:594
+#: svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
@@ -9788,42 +9794,42 @@
"svnserve: --service フラグは、プロセスが Service Control Manager によって開始"
"されている場合にのみ有効です。\n"
-#: svnserve/main.c:630
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "アドレス情報を取得できません"
-#: svnserve/main.c:646
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "サーバソケットを作成できません"
-#: svnserve/main.c:659
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "サーバソケットをバインドできません"
-#: svnserve/main.c:727
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "クライアントの接続を受け入れることができません"
-#: svnserve/main.c:781
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "スレッド属性を作成できません"
-#: svnserve/main.c:789
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "独立した状態を設定できません"
-#: svnserve/main.c:802
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "スレッドを作成できません"
-#: svnserve/serve.c:1463
+#: svnserve/serve.c:1437
msgid "Path is not a string"
msgstr "パスが文字列でありません"
@@ -10029,8 +10035,8 @@
msgid "Destination repository is already synchronizing from '%s'"
msgstr "同期先リポジトリは既に '%s' から同期中です"
-#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1202
-#: svnsync/main.c:1381
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "パス '%s' は URL ではありません"
@@ -10076,25 +10082,25 @@
"コミットでリビジョン %ld が作成されましたが、作成されるべきだったのは %ld で"
"す"
-#: svnsync/main.c:1274 svnsync/main.c:1279
+#: svnsync/main.c:1275 svnsync/main.c:1280
#, c-format
msgid ""
"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr ""
"まだ同期されていないリビジョン (%ld) のリビジョン属性はコピーできません"
-#: svnsync/main.c:1331
+#: svnsync/main.c:1332
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "'%s' はリビジョン範囲として有効ではありません"
-#: svnsync/main.c:1345 svnsync/main.c:1365
+#: svnsync/main.c:1346 svnsync/main.c:1366
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "リビジョン番号が不正です (%ld)"
# * Description for svnsync.
-#: svnsync/main.c:1422
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -10113,7 +10119,7 @@
"\n"
"利用可能なサブコマンド:\n"
-#: svnsync/main.c:1586
+#: svnsync/main.c:1581
msgid ""
"Cannot use --username or --password with any of --source-username, --source-"
"password, --sync-username, or --sync-password.\n"
@@ -10121,7 +10127,7 @@
"--username や --password は、--source-username、--source-assword、--sync-"
"username、--sync-password のいずれとも使用できません。\n"
-#: svnsync/main.c:1666
+#: svnsync/main.c:1661
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -10130,7 +10136,7 @@
"サブコマンド '%s' にはオプション '%s' をつけられません。\n"
"使用方法を知りたいときは 'svnsync help %s' と打ってください。\n"
-#: svnsync/main.c:1738
+#: svnsync/main.c:1733
msgid "Try 'svnsync help' for more info"
msgstr "より詳しく知りたいときは 'svnsync help' を試してみてください"
@@ -10224,12 +10230,12 @@
"現在のリビジョンの代わりに、最後に変更が加えられ\n"
" たリビジョンを表示します"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "エクスポートされたものです%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "'%s' はバージョン管理下になく、エクスポートされたものでもありません\n"
diff --git a/subversion/po/ko.po b/subversion/po/ko.po
index 2d37a73..a6d8d13 100644
--- a/subversion/po/ko.po
+++ b/subversion/po/ko.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: subversion\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-02-17 03:26+0900\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2007-03-22 15:24+0100\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Korean <dev@subversion.tigris.org>\n"
@@ -84,10 +84,8 @@
msgid "Read error in pipe"
msgstr "파이프에서 읽기 오류 발생"
-#: include/svn_error_codes.h:231
-#: libsvn_subr/cmdline.c:299
-#: libsvn_subr/cmdline.c:316
-#: svn/util.c:742
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
+#: libsvn_subr/cmdline.c:316 svn/util.c:758
#, c-format
msgid "Write error"
msgstr "쓰기 오류"
@@ -236,599 +234,611 @@
msgid "Invalid switch"
msgstr "잘못된 전환(switch)"
-#: include/svn_error_codes.h:398
+#: include/svn_error_codes.h:397
+#, fuzzy
+msgid "Changelist doesn't match"
+msgstr "변경목록: %s\n"
+
+#: include/svn_error_codes.h:403
msgid "General filesystem error"
msgstr "파일 시스템 일반 오류"
-#: include/svn_error_codes.h:402
+#: include/svn_error_codes.h:407
msgid "Error closing filesystem"
msgstr "파일 시스템 닫기 오류"
-#: include/svn_error_codes.h:406
+#: include/svn_error_codes.h:411
msgid "Filesystem is already open"
msgstr "파일 시스템이 이미 열려있습니다."
-#: include/svn_error_codes.h:410
+#: include/svn_error_codes.h:415
msgid "Filesystem is not open"
msgstr "파일 시스템이 열린 상태가 아닙니다."
-#: include/svn_error_codes.h:414
+#: include/svn_error_codes.h:419
msgid "Filesystem is corrupt"
msgstr "파일 시스템이 손상되었습니다."
-#: include/svn_error_codes.h:418
+#: include/svn_error_codes.h:423
msgid "Invalid filesystem path syntax"
msgstr "유효하지 않은 파일시스템 경로 형식입니다."
-#: include/svn_error_codes.h:422
+#: include/svn_error_codes.h:427
msgid "Invalid filesystem revision number"
msgstr "파일 시스템의 리비전 번호가 잘못되었습니다."
-#: include/svn_error_codes.h:426
+#: include/svn_error_codes.h:431
msgid "Invalid filesystem transaction name"
msgstr "파일 시스템의 트랜잭션 이름이 잘못되었습니다."
-#: include/svn_error_codes.h:430
+#: include/svn_error_codes.h:435
msgid "Filesystem directory has no such entry"
msgstr "파일 시스템 디렉토리에 그런 항목이 없습니다."
-#: include/svn_error_codes.h:434
+#: include/svn_error_codes.h:439
msgid "Filesystem has no such representation"
msgstr "Filesystem has no such representation"
-#: include/svn_error_codes.h:438
+#: include/svn_error_codes.h:443
msgid "Filesystem has no such string"
msgstr "파일 시스템에 그런 문자열이 없습니다."
-#: include/svn_error_codes.h:442
+#: include/svn_error_codes.h:447
msgid "Filesystem has no such copy"
msgstr "파일 시스템에 그런 사본이 없습니다."
-#: include/svn_error_codes.h:446
+#: include/svn_error_codes.h:451
msgid "The specified transaction is not mutable"
msgstr "본 명령이 수행되면 다시 되돌릴 수 없습니다."
-#: include/svn_error_codes.h:450
+#: include/svn_error_codes.h:455
msgid "Filesystem has no item"
msgstr "파일 시스템에 그런 아이템이 없습니다."
-#: include/svn_error_codes.h:454
+#: include/svn_error_codes.h:459
msgid "Filesystem has no such node-rev-id"
msgstr "파일 시스템에 그런 node-rev-id 가 없습니다."
-#: include/svn_error_codes.h:458
+#: include/svn_error_codes.h:463
msgid "String does not represent a node or node-rev-id"
msgstr "문자열이 노드 혹은 node-rev-id를 뜻하지 않습니다."
-#: include/svn_error_codes.h:462
+#: include/svn_error_codes.h:467
msgid "Name does not refer to a filesystem directory"
msgstr "이름이 파일시스템 디렉토리를 참조하지 않습니다."
-#: include/svn_error_codes.h:466
+#: include/svn_error_codes.h:471
msgid "Name does not refer to a filesystem file"
msgstr "이름이 파일시스템 파일을 참조하지 않습니다."
-#: include/svn_error_codes.h:470
+#: include/svn_error_codes.h:475
msgid "Name is not a single path component"
msgstr "이름이 파일시스템 단일 경로 요소가 아닙니다."
-#: include/svn_error_codes.h:474
+#: include/svn_error_codes.h:479
msgid "Attempt to change immutable filesystem node"
msgstr "변경 불가능한 파일 시스템 노드에 변경을 시도합니다."
-#: include/svn_error_codes.h:478
+#: include/svn_error_codes.h:483
msgid "Item already exists in filesystem"
msgstr "아이템이 이미 파일 시스템에 있습니다."
-#: include/svn_error_codes.h:482
+#: include/svn_error_codes.h:487
msgid "Attempt to remove or recreate fs root dir"
msgstr "파일 시스템의 루트에 대하여 제거 혹은 재생성을 시도합니다"
-#: include/svn_error_codes.h:486
+#: include/svn_error_codes.h:491
msgid "Object is not a transaction root"
msgstr "개체가 트랜잭션의 루트가 아닙니다"
-#: include/svn_error_codes.h:490
+#: include/svn_error_codes.h:495
msgid "Object is not a revision root"
msgstr "개체가 리비전의 루트가 아닙니다"
-#: include/svn_error_codes.h:494
+#: include/svn_error_codes.h:499
msgid "Merge conflict during commit"
msgstr "커밋도중 병합이 충돌하였습니다."
-#: include/svn_error_codes.h:498
+#: include/svn_error_codes.h:503
msgid "A representation vanished or changed between reads"
msgstr "읽는 도중 표현내용이 삭제되거나 변경되었습니다."
-#: include/svn_error_codes.h:502
+#: include/svn_error_codes.h:507
msgid "Tried to change an immutable representation"
msgstr "변경할 수 없는 표현식에 대해 변경 시도합니다."
-#: include/svn_error_codes.h:506
+#: include/svn_error_codes.h:511
msgid "Malformed skeleton data"
msgstr "잘못된 형식의 스케레톤 데이터"
-#: include/svn_error_codes.h:510
+#: include/svn_error_codes.h:515
msgid "Transaction is out of date"
msgstr "트랜잭션이 기한 만료됨"
-#: include/svn_error_codes.h:514
+#: include/svn_error_codes.h:519
msgid "Berkeley DB error"
msgstr "버클리 DB 오류"
-#: include/svn_error_codes.h:518
+#: include/svn_error_codes.h:523
msgid "Berkeley DB deadlock error"
msgstr "버클리 DB 데드락 오류"
-#: include/svn_error_codes.h:522
+#: include/svn_error_codes.h:527
msgid "Transaction is dead"
msgstr "트랜잭션 종료됨"
-#: include/svn_error_codes.h:526
+#: include/svn_error_codes.h:531
msgid "Transaction is not dead"
msgstr "트랜잭션 종료되지 않음"
-#: include/svn_error_codes.h:531
+#: include/svn_error_codes.h:536
msgid "Unknown FS type"
msgstr "알 수 없는 파일 시스템 종류"
-#: include/svn_error_codes.h:536
+#: include/svn_error_codes.h:541
msgid "No user associated with filesystem"
msgstr "파일 시스템과 연관된 사용자가 없습니다."
-#: include/svn_error_codes.h:541
+#: include/svn_error_codes.h:546
msgid "Path is already locked"
msgstr "경로는 이미 잠겨 있습니다."
-#: include/svn_error_codes.h:546
-#: include/svn_error_codes.h:678
+#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
msgid "Path is not locked"
msgstr "경로는 잠기지 않았습니다."
-#: include/svn_error_codes.h:551
+#: include/svn_error_codes.h:556
msgid "Lock token is incorrect"
msgstr "잠금 토큰이 잘못되었습니다."
-#: include/svn_error_codes.h:556
+#: include/svn_error_codes.h:561
msgid "No lock token provided"
msgstr "잠금 토큰이 제공되지 않았습니다."
-#: include/svn_error_codes.h:561
+#: include/svn_error_codes.h:566
msgid "Username does not match lock owner"
msgstr "Username이 잠금 소유자와 일치하지 않습니다."
-#: include/svn_error_codes.h:566
+#: include/svn_error_codes.h:571
msgid "Filesystem has no such lock"
msgstr "파일 시스템에 그런 잠금이 없습니다."
-#: include/svn_error_codes.h:571
+#: include/svn_error_codes.h:576
msgid "Lock has expired"
msgstr "잠금이 만료되었습니다."
-#: include/svn_error_codes.h:576
+#: include/svn_error_codes.h:581
msgid "Item is out of date"
msgstr "아이템이 오래되었습니다"
-#: include/svn_error_codes.h:588
+#: include/svn_error_codes.h:586
+#, fuzzy
+msgid "SQLite error"
+msgstr "쓰기 오류"
+
+#: include/svn_error_codes.h:598
msgid "Unsupported FS format"
msgstr "지원하지 않은 FS 포맷"
-#: include/svn_error_codes.h:593
+#: include/svn_error_codes.h:603
msgid "Representation is being written"
msgstr "표현식을 출력중입니다."
-#: include/svn_error_codes.h:599
+#: include/svn_error_codes.h:609
msgid "The repository is locked, perhaps for db recovery"
msgstr "저장소가 잠기어 있습니다. 아마 DB 복구중일 것입니다."
-#: include/svn_error_codes.h:603
+#: include/svn_error_codes.h:613
msgid "A repository hook failed"
msgstr "저장소 훅(repository hook) 실패"
-#: include/svn_error_codes.h:607
+#: include/svn_error_codes.h:617
msgid "Incorrect arguments supplied"
msgstr "잘못된 인자가 넘겨졌습니다."
-#: include/svn_error_codes.h:611
+#: include/svn_error_codes.h:621
msgid "A report cannot be generated because no data was supplied"
msgstr "데이터가 없어서 보고서를 생성할 수 없습니다."
-#: include/svn_error_codes.h:615
+#: include/svn_error_codes.h:625
msgid "Bogus revision report"
msgstr "이상한 리비전 보고"
-#: include/svn_error_codes.h:624
+#: include/svn_error_codes.h:634
msgid "Unsupported repository version"
msgstr "지원되지 않는 저장소 버전"
-#: include/svn_error_codes.h:628
+#: include/svn_error_codes.h:638
msgid "Disabled repository feature"
msgstr "제한된 저장소 기능"
-#: include/svn_error_codes.h:632
+#: include/svn_error_codes.h:642
msgid "Error running post-commit hook"
msgstr "post-commit 훅 실행중 오류"
-#: include/svn_error_codes.h:637
+#: include/svn_error_codes.h:647
msgid "Error running post-lock hook"
msgstr "post-lock 훅 실행중 오류"
-#: include/svn_error_codes.h:642
+#: include/svn_error_codes.h:652
msgid "Error running post-unlock hook"
msgstr "post-unlock 훅 실행중 오류"
-#: include/svn_error_codes.h:649
+#: include/svn_error_codes.h:659
msgid "Bad URL passed to RA layer"
msgstr "RA 계층에 잘못된 URL이 전달되었습니다."
-#: include/svn_error_codes.h:653
+#: include/svn_error_codes.h:663
msgid "Authorization failed"
msgstr "인증 실패"
-#: include/svn_error_codes.h:657
+#: include/svn_error_codes.h:667
msgid "Unknown authorization method"
msgstr "알 수 없는 인증 방식"
-#: include/svn_error_codes.h:661
+#: include/svn_error_codes.h:671
msgid "Repository access method not implemented"
msgstr "저장소 접근 방법이 구현되지 않았습니다"
-#: include/svn_error_codes.h:665
+#: include/svn_error_codes.h:675
msgid "Item is out-of-date"
msgstr "아이템이 오래되었습니다"
-#: include/svn_error_codes.h:669
+#: include/svn_error_codes.h:679
msgid "Repository has no UUID"
msgstr "저장소에 UUID가 없습니다"
-#: include/svn_error_codes.h:673
+#: include/svn_error_codes.h:683
msgid "Unsupported RA plugin ABI version"
msgstr "지원하지 않는 RA 플러긴 ABI 버전입니다."
-#: include/svn_error_codes.h:685
+#: include/svn_error_codes.h:695
msgid "RA layer failed to init socket layer"
msgstr "RA 계층에서 소켓 계층 초기화에 실패하였습니다."
-#: include/svn_error_codes.h:689
+#: include/svn_error_codes.h:699
msgid "RA layer failed to create HTTP request"
msgstr "RA 계층에서 HTTP 요청을 생성하지 못했습니다."
-#: include/svn_error_codes.h:693
+#: include/svn_error_codes.h:703
msgid "RA layer request failed"
msgstr "RA 계층 요청 실패"
-#: include/svn_error_codes.h:697
+#: include/svn_error_codes.h:707
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA 계층이 요구된 OPTIONS 정보를 수신하지 않았습니다."
-#: include/svn_error_codes.h:701
+#: include/svn_error_codes.h:711
msgid "RA layer failed to fetch properties"
msgstr "RA 계층이 속성 추출에 실패하였습니다."
-#: include/svn_error_codes.h:705
+#: include/svn_error_codes.h:715
msgid "RA layer file already exists"
msgstr "RA 계층 파일이 이미 존재합니다"
-#: include/svn_error_codes.h:709
+#: include/svn_error_codes.h:719
msgid "Invalid configuration value"
msgstr "잘못된 설정 값"
-#: include/svn_error_codes.h:713
+#: include/svn_error_codes.h:723
msgid "HTTP Path Not Found"
msgstr "HTTP 경로 발견되지 않음"
-#: include/svn_error_codes.h:717
+#: include/svn_error_codes.h:727
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "WebDAV PROPPATCH 실행 실패"
-#: include/svn_error_codes.h:722
-#: include/svn_error_codes.h:763
-#: libsvn_ra_svn/marshal.c:612
-#: libsvn_ra_svn/marshal.c:720
-#: libsvn_ra_svn/marshal.c:747
+#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
+#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
+#: libsvn_ra_svn/marshal.c:774
msgid "Malformed network data"
msgstr "잘못된 네트워크 데이터"
-#: include/svn_error_codes.h:727
+#: include/svn_error_codes.h:737
msgid "Unable to extract data from response header"
msgstr "응답헤더에서 데이터를 추출할 수 없습니다."
-#: include/svn_error_codes.h:732
+#: include/svn_error_codes.h:742
msgid "Repository has been moved"
msgstr "저장소가 이동되었습니다"
-#: include/svn_error_codes.h:738
-#: include/svn_error_codes.h:767
+#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
msgid "Couldn't find a repository"
msgstr "저장소를 찾을 수 없음"
-#: include/svn_error_codes.h:742
+#: include/svn_error_codes.h:752
msgid "Couldn't open a repository"
msgstr "저장소를 열 수 없음"
-#: include/svn_error_codes.h:747
+#: include/svn_error_codes.h:757
msgid "Special code for wrapping server errors to report to client"
msgstr "클라이언트에 보고하기 위한 서버 에러 래핑 특수 코드"
-#: include/svn_error_codes.h:751
+#: include/svn_error_codes.h:761
msgid "Unknown svn protocol command"
msgstr "알 수 없는 svn 프로토콜 명령"
-#: include/svn_error_codes.h:755
+#: include/svn_error_codes.h:765
msgid "Network connection closed unexpectedly"
msgstr "네트워크 접속이 예기치 않게 종료되었습니다."
-#: include/svn_error_codes.h:759
+#: include/svn_error_codes.h:769
msgid "Network read/write error"
msgstr "네트워크 읽기/쓰기 오류"
-#: include/svn_error_codes.h:771
+#: include/svn_error_codes.h:781
msgid "Client/server version mismatch"
msgstr "클라이언트/서버 버전 불일치"
-#: include/svn_error_codes.h:779
+#: include/svn_error_codes.h:786
+msgid "Cannot negotiate authentication mechanism"
+msgstr "인증 방법 협상 불가능"
+
+#: include/svn_error_codes.h:795
msgid "Credential data unavailable"
msgstr "인증 정보가 사용불가합니다."
-#: include/svn_error_codes.h:783
+#: include/svn_error_codes.h:799
msgid "No authentication provider available"
msgstr "인증 정보를 얻기 위한 장치가 없습니다."
-#: include/svn_error_codes.h:787
-#: include/svn_error_codes.h:791
+#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
msgid "All authentication providers exhausted"
msgstr "인증 정보를 얻기위한 장치를 모두 사용하였습니다."
-#: include/svn_error_codes.h:797
+#: include/svn_error_codes.h:813
msgid "Read access denied for root of edit"
msgstr "읽기 금지"
-#: include/svn_error_codes.h:802
+#: include/svn_error_codes.h:818
msgid "Item is not readable"
msgstr "아이템이 읽기 불가능합니다"
-#: include/svn_error_codes.h:807
+#: include/svn_error_codes.h:823
msgid "Item is partially readable"
msgstr "아이템이 부분적으로 읽기 가능합니다"
-#: include/svn_error_codes.h:811
+#: include/svn_error_codes.h:827
msgid "Invalid authz configuration"
msgstr "잘못된 authz 설정"
-#: include/svn_error_codes.h:816
+#: include/svn_error_codes.h:832
msgid "Item is not writable"
msgstr "아이템이 쓰기가능하지 않습니다."
-#: include/svn_error_codes.h:822
+#: include/svn_error_codes.h:838
msgid "Svndiff data has invalid header"
msgstr "Svndiff 데이터가 잘못된 헤더를 가지고 있습니다."
-#: include/svn_error_codes.h:826
+#: include/svn_error_codes.h:842
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff 데이터가 손상된 윈도우를 포함하고 있습니다."
-#: include/svn_error_codes.h:830
+#: include/svn_error_codes.h:846
msgid "Svndiff data contains backward-sliding source view"
msgstr "Svndiff 데이터에 뒤로 진행하는 부분이 있습니다."
-#: include/svn_error_codes.h:834
+#: include/svn_error_codes.h:850
msgid "Svndiff data contains invalid instruction"
msgstr "Svndiff 데이터에 잘못된 명령이 포함되어있습니다."
-#: include/svn_error_codes.h:838
+#: include/svn_error_codes.h:854
msgid "Svndiff data ends unexpectedly"
msgstr "Svndiff 데이터가 예기치않게 끝났습니다."
-#: include/svn_error_codes.h:842
+#: include/svn_error_codes.h:858
msgid "Svndiff compressed data is invalid"
msgstr "Svndiff 의 압축된 데이터가 잘못되었습니다"
-#: include/svn_error_codes.h:848
+#: include/svn_error_codes.h:864
msgid "Diff data source modified unexpectedly"
msgstr "Diff 데이터가 예기치않은 방식으로 수정되었습니다"
-#: include/svn_error_codes.h:854
+#: include/svn_error_codes.h:870
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache에 SVN 파일시스템에 대한 경로가 없습니다"
-#: include/svn_error_codes.h:858
+#: include/svn_error_codes.h:874
msgid "Apache got a malformed URI"
msgstr "Apache에 잘못된 URI 를 받았습니다."
-#: include/svn_error_codes.h:862
+#: include/svn_error_codes.h:878
msgid "Activity not found"
msgstr "명령이 발견되지 않았습니다."
-#: include/svn_error_codes.h:866
+#: include/svn_error_codes.h:882
msgid "Baseline incorrect"
msgstr "기준 리비전 불일치"
-#: include/svn_error_codes.h:870
+#: include/svn_error_codes.h:886
msgid "Input/output error"
msgstr "입출력 오류"
-#: include/svn_error_codes.h:876
+#: include/svn_error_codes.h:892
msgid "A path under version control is needed for this operation"
msgstr "버전 관리대상인 경로가 본 명령어에 필요합니다"
-#: include/svn_error_codes.h:880
+#: include/svn_error_codes.h:896
msgid "Repository access is needed for this operation"
msgstr "본 명령에는 저장소 접근이 필요합니다"
-#: include/svn_error_codes.h:884
+#: include/svn_error_codes.h:900
msgid "Bogus revision information given"
msgstr "이상한 리비전 정보가 주어졌습니다."
-#: include/svn_error_codes.h:888
+#: include/svn_error_codes.h:904
msgid "Attempting to commit to a URL more than once"
msgstr "URL에 대한 커밋이 한 번이상 시도됩니다."
-#: include/svn_error_codes.h:892
+#: include/svn_error_codes.h:908
msgid "Operation does not apply to binary file"
msgstr "명령은 바이너리 파일에 적용되지 않습니다"
-#: include/svn_error_codes.h:898
+#: include/svn_error_codes.h:914
msgid "Format of an svn:externals property was invalid"
msgstr "svn:externals 에 대한 형식이 올바르지 않습니다"
-#: include/svn_error_codes.h:902
+#: include/svn_error_codes.h:918
msgid "Attempting restricted operation for modified resource"
msgstr "수정된 자료에 대하여 제한된 명령을 수행합니다."
-#: include/svn_error_codes.h:906
+#: include/svn_error_codes.h:922
msgid "Operation does not apply to directory"
msgstr "디렉토리에는 적용할 수 없는 명령"
-#: include/svn_error_codes.h:910
+#: include/svn_error_codes.h:926
msgid "Revision range is not allowed"
msgstr "리비전 범위는 사용 불가능합니다."
-#: include/svn_error_codes.h:914
+#: include/svn_error_codes.h:930
msgid "Inter-repository relocation not allowed"
msgstr "저장소를 넘어서는 'URL 전환'은 불가능합니다."
-#: include/svn_error_codes.h:918
+#: include/svn_error_codes.h:934
msgid "Author name cannot contain a newline"
msgstr "작성자 이름은 개행 문자를 포함할 수 없습니다."
-#: include/svn_error_codes.h:922
+#: include/svn_error_codes.h:938
msgid "Bad property name"
msgstr "잘못된 속성 이름"
-#: include/svn_error_codes.h:927
+#: include/svn_error_codes.h:943
msgid "Two versioned resources are unrelated"
msgstr "두개의 버전관리 대상이 연관성이 없습니다."
-#: include/svn_error_codes.h:932
+#: include/svn_error_codes.h:948
msgid "Path has no lock token"
msgstr "지정한 경로에 잠금 토큰이 없습니다."
-#: include/svn_error_codes.h:937
+#: include/svn_error_codes.h:953
msgid "Operation does not support multiple sources"
msgstr "명령은 복수의 원본은 지원하지 않습니다"
-#: include/svn_error_codes.h:943
+#: include/svn_error_codes.h:959
msgid "A problem occurred; see later errors for details"
msgstr "문제 발생함: 상세한 것은 다음 오류참고"
-#: include/svn_error_codes.h:947
+#: include/svn_error_codes.h:963
msgid "Failure loading plugin"
msgstr "플러긴 로딩 실패"
-#: include/svn_error_codes.h:951
+#: include/svn_error_codes.h:967
msgid "Malformed file"
msgstr "잘못된 파일"
-#: include/svn_error_codes.h:955
+#: include/svn_error_codes.h:971
msgid "Incomplete data"
msgstr "불완전한 데이터"
-#: include/svn_error_codes.h:959
+#: include/svn_error_codes.h:975
msgid "Incorrect parameters given"
msgstr "잘못된 인자가 넘겨짐"
-#: include/svn_error_codes.h:963
+#: include/svn_error_codes.h:979
msgid "Tried a versioning operation on an unversioned resource"
msgstr "버전관리 대상이 아닌 것에 버전관련 명령을 시도했습니다."
-#: include/svn_error_codes.h:967
+#: include/svn_error_codes.h:983
msgid "Test failed"
msgstr "테스트 실패"
-#: include/svn_error_codes.h:971
+#: include/svn_error_codes.h:987
msgid "Trying to use an unsupported feature"
msgstr "지원하지 않는 속성을 사용하는 중"
-#: include/svn_error_codes.h:975
+#: include/svn_error_codes.h:991
msgid "Unexpected or unknown property kind"
msgstr "예기치 않은 혹은 알려지지 않은 속성 종류"
-#: include/svn_error_codes.h:979
+#: include/svn_error_codes.h:995
msgid "Illegal target for the requested operation"
msgstr "요구된 명령에 대하여 잘못된 대상"
-#: include/svn_error_codes.h:983
+#: include/svn_error_codes.h:999
msgid "MD5 checksum is missing"
msgstr "MD5 체크섬 누락됨"
-#: include/svn_error_codes.h:987
+#: include/svn_error_codes.h:1003
msgid "Directory needs to be empty but is not"
msgstr "디렉토리가 비어있어야만 합니다"
-#: include/svn_error_codes.h:991
+#: include/svn_error_codes.h:1007
msgid "Error calling external program"
msgstr "외부 프로그램 실행 중 오류"
-#: include/svn_error_codes.h:995
+#: include/svn_error_codes.h:1011
msgid "Python exception has been set with the error"
msgstr "오류에 파이썬 예외가 있습니다."
-#: include/svn_error_codes.h:999
+#: include/svn_error_codes.h:1015
msgid "A checksum mismatch occurred"
msgstr "체크섬 불일치 오류가 발생하였습니다."
-#: include/svn_error_codes.h:1003
+#: include/svn_error_codes.h:1019
msgid "The operation was interrupted"
msgstr "명령 수행이 간섭으로 중단됩니다."
-#: include/svn_error_codes.h:1007
+#: include/svn_error_codes.h:1023
msgid "The specified diff option is not supported"
msgstr "지정한 diff 옵션은 지원되지 않는 것입니다."
-#: include/svn_error_codes.h:1011
+#: include/svn_error_codes.h:1027
msgid "Property not found"
msgstr "속성을 찾을 수 없습니다."
-#: include/svn_error_codes.h:1015
+#: include/svn_error_codes.h:1031
msgid "No auth file path available"
msgstr "인증 파일 경로가 유효하지 않습니다."
-#: include/svn_error_codes.h:1020
+#: include/svn_error_codes.h:1035
+msgid "Merge info parse error"
+msgstr ""
+
+#: include/svn_error_codes.h:1040
msgid "Incompatible library version"
msgstr "호환되지 않는 라이브러리 버전"
-#: include/svn_error_codes.h:1026
+#: include/svn_error_codes.h:1046
msgid "Error parsing arguments"
msgstr "인자를 분석 도중 오류 발생"
-#: include/svn_error_codes.h:1030
+#: include/svn_error_codes.h:1050
msgid "Not enough arguments provided"
msgstr "인자가 충분히 주어지지 않았습니다"
-#: include/svn_error_codes.h:1034
+#: include/svn_error_codes.h:1054
msgid "Mutually exclusive arguments specified"
msgstr "동시에 존재할 수 없는 인자가 주어졌습니다."
-#: include/svn_error_codes.h:1038
+#: include/svn_error_codes.h:1058
msgid "Attempted command in administrative dir"
msgstr "관리 디렉토리에 명령을 수행중입니다."
-#: include/svn_error_codes.h:1042
+#: include/svn_error_codes.h:1062
msgid "The log message file is under version control"
msgstr "로그 메시지 파일은 버전 관리 대상입니다."
-#: include/svn_error_codes.h:1046
+#: include/svn_error_codes.h:1066
msgid "The log message is a pathname"
msgstr "로그 메시지는 경로명입니다."
-#: include/svn_error_codes.h:1050
+#: include/svn_error_codes.h:1070
msgid "Committing in directory scheduled for addition"
msgstr "추가하기 위한 디렉토리를 커밋 중"
-#: include/svn_error_codes.h:1054
+#: include/svn_error_codes.h:1074
msgid "No external editor available"
msgstr "외부 편집기가 없습니다"
-#: include/svn_error_codes.h:1058
+#: include/svn_error_codes.h:1078
msgid "Something is wrong with the log message's contents"
msgstr "로그 메시지 내용이 이상합니다."
-#: include/svn_error_codes.h:1062
+#: include/svn_error_codes.h:1082
msgid "A log message was given where none was necessary"
msgstr "로그메시지가 필요없는 곳에 지정되었습니다."
-#: libsvn_client/add.c:345
-#: libsvn_wc/copy.c:188
+#: libsvn_client/add.c:345 libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "'%s' 디렉토리를 닫을 수 없습니다."
@@ -838,8 +848,7 @@
msgid "Error during recursive add of '%s'"
msgstr "'%s'를 재귀적으로 추가하는 중에 오류 발생"
-#: libsvn_client/blame.c:368
-#: libsvn_client/blame.c:838
+#: libsvn_client/blame.c:368 libsvn_client/blame.c:838
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "'%s' 바이너리 파일에 대하여 '수정한 사람 보기'를 수행할 수 없습니다"
@@ -852,8 +861,7 @@
msgid "Start revision must precede end revision"
msgstr "시작 버전은 종료버전보다 앞서야 합니다."
-#: libsvn_client/blame.c:725
-#: libsvn_client/cat.c:208
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL '%s' 는 디렉토리입니다."
@@ -863,24 +871,16 @@
msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
msgstr "리비전 명령 '%c' 은 이전 리비전을 필요로 합니다. (리비전 %ld; %s)"
-#: libsvn_client/cat.c:73
-#: libsvn_client/export.c:241
-#, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "'%s' 은(는) 버전 컨트롤 대상이 아니거나 존재하지 않습니다."
-
-#: libsvn_client/cat.c:79
+#: libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "URL '%s' 는 디렉토리입니다."
-#: libsvn_client/cat.c:131
-#: libsvn_client/export.c:183
+#: libsvn_client/cat.c:126 libsvn_client/export.c:183
msgid "(local)"
msgstr "(로컬)"
-#: libsvn_client/checkout.c:91
-#: libsvn_client/export.c:895
+#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL '%s'는 존재하지 않습니다."
@@ -890,16 +890,16 @@
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL('%s')은 파일입니다. 디렉토리를 지정하세요."
-#: libsvn_client/checkout.c:166
+#: libsvn_client/checkout.c:168
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "'%s'는 이미 작업 사본에 있으며, 다른 URL 입니다."
-#: libsvn_client/checkout.c:170
+#: libsvn_client/checkout.c:172
msgid "; run 'svn update' to complete it"
msgstr "; 'svn update' 를 수행하여 완료하십시오."
-#: libsvn_client/checkout.c:180
+#: libsvn_client/checkout.c:182
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s'은(는) 존재하며, 디렉토리가 아닙니다"
@@ -913,154 +913,98 @@
msgid "New entry name required when importing a file"
msgstr "파일을 임포트할 때 새 항목 이름이 필요합니다."
-#: libsvn_client/commit.c:546
-#: libsvn_wc/adm_ops.c:1010
-#: libsvn_wc/questions.c:91
+#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1016
+#: libsvn_wc/questions.c:92
#, c-format
msgid "'%s' does not exist"
msgstr "'%s'는 존재하지 않습니다."
-#: libsvn_client/commit.c:606
-#: libsvn_client/copy.c:283
-#: svnlook/main.c:1204
+#: libsvn_client/commit.c:607 libsvn_client/copy.c:286 svnlook/main.c:1216
#, c-format
msgid "Path '%s' does not exist"
msgstr "경로 '%s'는 존재하지 않습니다."
-#: libsvn_client/commit.c:737
-#: libsvn_client/copy.c:292
-#: libsvn_client/copy.c:617
-#: libsvn_client/copy.c:868
-#: libsvn_client/copy.c:1194
+#: libsvn_client/commit.c:741 libsvn_client/copy.c:295
+#: libsvn_client/copy.c:759 libsvn_client/copy.c:1025
+#: libsvn_client/copy.c:1417
#, c-format
msgid "Path '%s' already exists"
msgstr "경로 '%s' 는 이미 존재합니다."
-#: libsvn_client/commit.c:752
+#: libsvn_client/commit.c:756
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' 는 예약된 이름이며, 임포트될 수 없습니다."
-#: libsvn_client/commit.c:868
-#: libsvn_client/copy.c:760
+#: libsvn_client/commit.c:872 libsvn_client/copy.c:909
msgid "Commit failed (details follow):"
msgstr "커밋이 실패하였습니다:"
-#: libsvn_client/commit.c:876
-#: libsvn_client/copy.c:768
+#: libsvn_client/commit.c:880 libsvn_client/copy.c:917
msgid "Commit succeeded, but other errors follow:"
msgstr "커밋이 성공하였지만, 오류가 있습니다:"
-#: libsvn_client/commit.c:883
-#: libsvn_client/copy.c:775
+#: libsvn_client/commit.c:887 libsvn_client/copy.c:924
msgid "Error unlocking locked dirs (details follow):"
msgstr "잠긴 디렉토리를 해제하는데 실패함 (아래에 자세히):"
-#: libsvn_client/commit.c:894
+#: libsvn_client/commit.c:898
msgid "Error bumping revisions post-commit (details follow):"
msgstr "커밋 후 리비전들을 갱신하는 도중 오류가 발생하였습니다:"
-#: libsvn_client/commit.c:905
-#: libsvn_client/copy.c:786
+#: libsvn_client/commit.c:909 libsvn_client/copy.c:935
msgid "Error in post-commit clean-up (details follow):"
msgstr "커밋 후처리를 마무리하는 중에 오류 발생 (아래에 자세히):"
-#: libsvn_client/commit.c:1189
+#: libsvn_client/commit.c:1193
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "'%s' 는 URL 입니다. URL은 커밋 대상이 될 수 없습니다."
-#: libsvn_client/commit.c:1388
+#: libsvn_client/commit.c:1392
msgid "Are all the targets part of the same working copy?"
msgstr "모든 대상이 같은 작업 사본내에 있습니까?"
-#: libsvn_client/commit.c:1403
+#: libsvn_client/commit.c:1407
msgid "Cannot non-recursively commit a directory deletion"
msgstr "디렉토리를 삭제하는 커밋은 재귀호출이어야만 합니다."
-#: libsvn_client/commit_util.c:252
-#: libsvn_client/commit_util.c:263
+#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "'%s'의 알 수 없는 항목입니다."
-#: libsvn_client/commit_util.c:280
+#: libsvn_client/commit_util.c:284
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "'%s' 항목이 예기치 못하게 특별 상태를 변경하였습니다."
-#: libsvn_client/commit_util.c:331
+#: libsvn_client/commit_util.c:335
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "커밋 멈춤: '%s' 이(가) 아직 충돌 상태임."
-#: libsvn_client/commit_util.c:397
+#: libsvn_client/commit_util.c:401
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "'%s'이(가) 작업사본의 루트가 될 것으로 기대하지 마십시오."
-#: libsvn_client/commit_util.c:415
-#: libsvn_client/commit_util.c:1054
+#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "커밋 아이템 '%s' 은(는) 복사표시가 되어있지만 원본 URL이 없습니다."
-#: libsvn_client/commit_util.c:705
-#: libsvn_client/commit_util.c:847
-#: libsvn_client/copy.c:1486
-#: libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1468
-#: libsvn_client/diff.c:2198
-#: libsvn_client/diff.c:2793
-#: libsvn_client/diff.c:2921
-#: libsvn_client/locking_commands.c:259
-#: libsvn_client/log.c:133
-#: libsvn_client/prop_commands.c:354
-#: libsvn_client/prop_commands.c:608
-#: libsvn_client/prop_commands.c:772
-#: libsvn_client/prop_commands.c:1108
-#: libsvn_client/ra.c:181
-#: libsvn_client/revisions.c:89
-#: libsvn_client/status.c:256
-#: libsvn_client/switch.c:107
-#: libsvn_wc/adm_crawler.c:453
-#: libsvn_wc/adm_crawler.c:477
-#: libsvn_wc/adm_ops.c:1363
-#: libsvn_wc/adm_ops.c:2652
-#: libsvn_wc/adm_ops.c:2678
-#: libsvn_wc/adm_ops.c:2714
-#: libsvn_wc/adm_ops.c:2773
-#: libsvn_wc/copy.c:307
-#: libsvn_wc/copy.c:663
-#: libsvn_wc/copy.c:785
-#: libsvn_wc/copy.c:792
-#: libsvn_wc/diff.c:1793
-#: libsvn_wc/entries.c:2276
-#: libsvn_wc/entries.c:2872
-#: libsvn_wc/props.c:496
-#: libsvn_wc/props.c:1104
-#: libsvn_wc/props.c:1555
-#: libsvn_wc/questions.c:186
-#: libsvn_wc/questions.c:300
-#: libsvn_wc/status.c:729
-#: libsvn_wc/translate.c:269
-#: libsvn_wc/update_editor.c:2386
-#: libsvn_wc/update_editor.c:3229
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "'%s' 은(는) 버전 컨트롤 대상이 아닙니다."
-
-#: libsvn_client/commit_util.c:708
+#: libsvn_client/commit_util.c:709
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "'%s' 항목은 URL이 없습니다."
-#: libsvn_client/commit_util.c:741
+#: libsvn_client/commit_util.c:742
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr "'%s'의 추가 스케쥴은 있지만, 상위는 버전관리 대상이 아닙니다."
-#: libsvn_client/commit_util.c:761
+#: libsvn_client/commit_util.c:762
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1071,94 +1015,103 @@
"아마, 지금 버전관리되고 있지 않은 (혹은 아직 버전이 없는) 디렉토리\n"
"안에서 대상을 커밋하고 있는 중인 것 같습니다."
-#: libsvn_client/commit_util.c:802
+#: libsvn_client/commit_util.c:803
#, 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' 이지만, 그 하위인 '%s'는 커밋 대상입니다."
+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' 이지만, 그 하위인 '%s'는 커밋 대"
+"상입니다."
-#: libsvn_client/commit_util.c:909
+#: libsvn_client/commit_util.c:907
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr "'%s', '%s' 는 둘다 같은 URL을 참조하므로 커밋할 수 없습니다."
-#: libsvn_client/commit_util.c:1059
+#: libsvn_client/commit_util.c:1057
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
-msgstr "커밋 아이템 '%s' 은(는) 복사표시가 되어있지만 잘못된 리비전을 가지고 있습니다."
+msgstr ""
+"커밋 아이템 '%s' 은(는) 복사표시가 되어있지만 잘못된 리비전을 가지고 있습니"
+"다."
-#: libsvn_client/copy.c:302
-#: libsvn_client/copy.c:1204
-#: libsvn_client/update.c:78
+#: libsvn_client/commit_util.c:1822
+msgid "Standard properties can't be set explicitly as revision properties"
+msgstr ""
+
+#: libsvn_client/copy.c:305 libsvn_client/copy.c:1427
+#: libsvn_client/update.c:98
#, c-format
msgid "Path '%s' is not a directory"
msgstr "경로 '%s'은(는) 디렉토리가 아닙니다"
-#: libsvn_client/copy.c:516
+#: libsvn_client/copy.c:658
#, c-format
-msgid "Source and dest appear not to be in the same repository (src: '%s'; dst: '%s')"
+msgid ""
+"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
+"s')"
msgstr "원본과 대상이 같은 저장소안에 있지 않습니다. (원본: '%s'; 대상: '%s')"
-#: libsvn_client/copy.c:598
+#: libsvn_client/copy.c:740
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "URL '%s'을(를) 자기 자신으로 이동할 수 없습니다."
-#: libsvn_client/copy.c:607
-#: libsvn_client/prop_commands.c:226
+#: libsvn_client/copy.c:749 libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "경로 '%s'은(는) 리비전 %ld에 없습니다."
-#: libsvn_client/copy.c:1043
+#: libsvn_client/copy.c:1259
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr "원본 URL '%s'은(는) 외부 저장소에서 온 것이며, 작업사본과 연결되지 않습니다."
+msgstr ""
+"원본 URL '%s'은(는) 외부 저장소에서 온 것이며, 작업사본과 연결되지 않습니다."
-#: libsvn_client/copy.c:1181
+#: libsvn_client/copy.c:1404
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "경로 '%s'는 리비전 %ld에 없습니다."
-#: libsvn_client/copy.c:1186
+#: libsvn_client/copy.c:1409
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "경로 '%s'는 head 리비전에 없습니다."
-#: libsvn_client/copy.c:1229
+#: libsvn_client/copy.c:1452
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "작업사본에는 없을지라도 '%s'가 이미 등록되어 있음"
-#: libsvn_client/copy.c:1323
-#: libsvn_client/log.c:86
+#: libsvn_client/copy.c:1546 libsvn_client/log.c:87
msgid "Revision type requires a working copy path, not a URL"
msgstr "리비전 형식은 URL대신 작업 사본 경로를 필요로합니다."
-#: libsvn_client/copy.c:1357
+#: libsvn_client/copy.c:1581
msgid "Cannot mix repository and working copy sources"
msgstr "저장소에 원본 리스트의 작업 사본 경로들을 넣을 수 없습니다"
-#: libsvn_client/copy.c:1398
+#: libsvn_client/copy.c:1623
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "경로 '%s' 를 자신의 하부 디렉토리('%s')에 복사할 수 없습니다."
-#: libsvn_client/copy.c:1418
+#: libsvn_client/copy.c:1643
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "경로 '%s'을(를) 자기 자신에게 복사 할 수 없습니다."
-#: libsvn_client/copy.c:1427
+#: libsvn_client/copy.c:1652
msgid "Moves between the working copy and the repository are not supported"
msgstr "작업 사본과 저장소 간 이동은 지원하지 않습니다"
-#: libsvn_client/copy.c:1492
+#: libsvn_client/copy.c:1710
#, c-format
msgid "'%s' does not seem to have a URL associated with it"
msgstr "'%s'에는 URL이 관계되어 있지 않아 보입니다."
-#: libsvn_client/copy.c:1830
-#: svn/move-cmd.c:60
+#: libsvn_client/copy.c:2048 svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "이동 명령은 리비전(HEAD 값은 제외)을 명시할 수 없습니다."
@@ -1167,279 +1120,291 @@
msgid "'%s' is in the way of the resource actually under version control"
msgstr "'%s'은(는) 실제적으로 버전관리 대상입니다."
+#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2781 libsvn_wc/entries.c:1256
+#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2969
+#: libsvn_wc/update_editor.c:2178
+#, c-format
+msgid "'%s' is not under version control"
+msgstr "'%s' 은(는) 버전 컨트롤 대상이 아닙니다."
+
#: libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "'%s'은(는) 수정되었습니다."
-#: libsvn_client/diff.c:99
+#: libsvn_client/diff.c:135
+#, fuzzy, c-format
+msgid " Reverted %s:r%s%s"
+msgstr "다시 복원함 '%s'\n"
+
+#: libsvn_client/diff.c:153
+#, c-format
+msgid " Merged %s:r%s%s"
+msgstr ""
+
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%s속성 변경됨: %s%s"
-#: libsvn_client/diff.c:127
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "이름: %s%s"
-#: libsvn_client/diff.c:203
-#, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr "URL에 스키마가 없음 ('%s' 과 '%s')"
-
-#: libsvn_client/diff.c:209
-#: libsvn_client/diff.c:215
-#, c-format
-msgid "URL has no scheme: '%s'"
-msgstr "URL에 스키마가 없음: '%s'"
-
-#: libsvn_client/diff.c:222
-#, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "아직 지원하지 않는 혼합형 스키마입니다. ('%s' 과 '%s')"
-
-#: libsvn_client/diff.c:287
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revision %ld)"
-#: libsvn_client/diff.c:289
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(working copy)"
-#: libsvn_client/diff.c:432
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "표시할 수 없음: 파일이 바이너리로 되어있음. %s"
-#. xgettext: the '.working', '.merge-left.r%ld' and
-#. '.merge-right.r%ld' strings are used to tag onto a file
-#. name in case of a merge conflict
-#: libsvn_client/diff.c:887
-msgid ".working"
-msgstr ".working"
-
-#: libsvn_client/diff.c:889
-#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".merge-left.r%ld"
-
-#: libsvn_client/diff.c:892
-#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".merge-right.r%ld"
-
-#: libsvn_client/diff.c:1533
-#: libsvn_client/diff.c:1737
+#. -----------------------------------------------------------------------
+#. ** Utilities. **
+#. Sanity check -- ensure that we have valid revisions to look at.
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "필요한 리비전이 빠져있습니다."
-#: libsvn_client/diff.c:1548
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr "고정된 리비전을 위한 diff에서 적어도 하나의 리비전이 로컬이 아닙니다."
-#: libsvn_client/diff.c:1660
-#: libsvn_client/diff.c:1672
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s'가 저장소의 리비전 %ld에서 발견되지 않았습니다."
-#: libsvn_client/diff.c:2018
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+#: libsvn_client/diff.c:1025
+#, fuzzy
+msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr "죄송합니다. svn_client_diff3 가 지원하지 않는 방법으로 호출되었습니다."
-#: libsvn_client/diff.c:2057
-msgid "Only diffs between a path's text-base and its working files are supported at this time"
-msgstr "현재는 경로의 마지막 업데이트 내용과 작업된 내용의 차이만 생성할 수 있습니다."
+#: libsvn_client/diff.c:1067
+msgid ""
+"Only diffs between a path's text-base and its working files are supported at "
+"this time"
+msgstr ""
+"현재는 경로의 마지막 업데이트 내용과 작업된 내용의 차이만 생성할 수 있습니다."
-#: libsvn_client/diff.c:2202
-#: libsvn_client/switch.c:111
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "디렉토리 '%s'에 URL정보가 없습니다."
-#: libsvn_client/diff.c:2409
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr "요약 비교는 보관소대 보관소로만 가능합니다."
-#: libsvn_client/diff.c:2766
-#: libsvn_client/diff.c:2772
-#: libsvn_client/diff.c:2906
-#: libsvn_client/locking_commands.c:263
-#: libsvn_client/ra.c:382
-#: libsvn_client/ra.c:748
-#: libsvn_client/ra.c:885
-#, c-format
-msgid "'%s' has no URL"
-msgstr "'%s'은(는) URL을 포함하지 않습니다."
-
#: libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s'는 EOL 값으로 적당하지 않습니다."
-#: libsvn_client/export.c:271
+#: libsvn_client/export.c:260
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr "대상 디렉토리가 존재합니다. 강제(--force)로 해야만 덮어쓰게 됩니다."
-#: libsvn_client/export.c:369
-#: libsvn_client/export.c:512
+#: libsvn_client/export.c:358 libsvn_client/export.c:501
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s'은(는) 존재하며, 디렉토리가 아닙니다."
-#: libsvn_client/export.c:373
-#: libsvn_client/export.c:516
+#: libsvn_client/export.c:362 libsvn_client/export.c:505
#, c-format
msgid "'%s' already exists"
msgstr "'%s'은(는) 이미 존재합니다."
-#: libsvn_client/export.c:687
-#: libsvn_wc/adm_crawler.c:908
-#: libsvn_wc/update_editor.c:1871
-#: libsvn_wc/update_editor.c:2516
+#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "'%s'의 체크섬값이 일치하지 않습니다. 기대값:'%s', 실제값: '%s'"
-#: libsvn_client/info.c:244
-#, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "'%s'를 위한 등록정보를 찾을 수 없습니다."
-
-#: libsvn_client/info.c:380
-#: libsvn_client/info.c:405
-#: libsvn_client/info.c:415
+#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL '%s'은(는) 리비전('%ld')에 존재하지 않습니다."
-#: libsvn_client/list.c:226
+#: libsvn_client/list.c:222
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL '%s'은(는) 그 리비전에서 존재하지 않습니다."
-#: libsvn_client/locking_commands.c:198
+#: libsvn_client/locking_commands.c:199
msgid "No common parent found, unable to operate on disjoint arguments"
-msgstr "공유하는 상위 디렉토리가 존재하지 없습니다. 분리된 경로들이 지정되었습니다."
+msgstr ""
+"공유하는 상위 디렉토리가 존재하지 없습니다. 분리된 경로들이 지정되었습니다."
-#: libsvn_client/locking_commands.c:287
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
+#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
+#, c-format
+msgid "'%s' has no URL"
+msgstr "'%s'은(는) URL을 포함하지 않습니다."
+
+#: libsvn_client/locking_commands.c:284
msgid "Unable to lock/unlock across multiple repositories"
msgstr "복수의 저장소간의 잠금/해제는 불가능합니다."
-#: libsvn_client/locking_commands.c:328
+#: libsvn_client/locking_commands.c:325
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' 은 현 작업사본에서 잠기지 않았습니다."
-#: libsvn_client/locking_commands.c:376
+#: libsvn_client/locking_commands.c:373
#, c-format
msgid "'%s' is not locked"
msgstr "'%s'는 잠기지 않았습니다."
-#: libsvn_client/locking_commands.c:409
-#: libsvn_fs/fs-loader.c:901
-#: libsvn_ra/ra_loader.c:625
+#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:932
+#: libsvn_ra/ra_loader.c:863
msgid "Lock comment contains illegal characters"
msgstr "잠금 설명에 잘못된 문자가 있습니다"
-#: libsvn_client/log.c:73
+#: libsvn_client/log.c:74
msgid "Missing required revision specification"
msgstr "필요한 리비전 지정이 생략됨"
-#: libsvn_client/log.c:139
-#: libsvn_client/status.c:261
-#: libsvn_client/update.c:92
+#: libsvn_client/log.c:137 libsvn_client/status.c:271
+#: libsvn_client/update.c:112
#, c-format
msgid "Entry '%s' has no URL"
msgstr "항목 '%s'는 URL이 없습니다."
-#: libsvn_client/log.c:370
+#: libsvn_client/log.c:368
msgid "No commits in repository"
msgstr "저장소에 커밋 없음"
-#: libsvn_client/prop_commands.c:71
+#: libsvn_client/merge.c:87
+#, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
+msgstr "URL에 스키마가 없음 ('%s' 과 '%s')"
+
+#: libsvn_client/merge.c:93 libsvn_client/merge.c:99
+#, c-format
+msgid "URL has no scheme: '%s'"
+msgstr "URL에 스키마가 없음: '%s'"
+
+#: libsvn_client/merge.c:106
+#, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr "아직 지원하지 않는 혼합형 스키마입니다. ('%s' 과 '%s')"
+
+#. xgettext: the '.working', '.merge-left.r%ld' and
+#. '.merge-right.r%ld' strings are used to tag onto a file
+#. name in case of a merge conflict
+#: libsvn_client/merge.c:328
+msgid ".working"
+msgstr ".working"
+
+#: libsvn_client/merge.c:330
+#, c-format
+msgid ".merge-left.r%ld"
+msgstr ".merge-left.r%ld"
+
+#: libsvn_client/merge.c:333
+#, c-format
+msgid ".merge-right.r%ld"
+msgstr ".merge-right.r%ld"
+
+#: libsvn_client/merge.c:1164
+#, c-format
+msgid ""
+"Path '%s' is in conflict, and must be resolved before the remainder of the "
+"requested merge can be applied"
+msgstr ""
+
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
+msgid "Use of two URLs is not compatible with merge info modification"
+msgstr ""
+
+#: libsvn_client/prop_commands.c:73
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s'은/는 저장소상의 속성이며, 클라이언트에서는 접근 불가능합니다."
-#: libsvn_client/prop_commands.c:213
+#: libsvn_client/prop_commands.c:216
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "속성 '%s'는 일반적인 속성이 아닙니다."
-#: libsvn_client/prop_commands.c:315
+#: libsvn_client/prop_commands.c:320
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "리비전 속성 '%s'는 본 문맥에서 허용되지 않습니다"
-#: libsvn_client/prop_commands.c:323
-#: libsvn_client/prop_commands.c:442
+#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
#, c-format
msgid "Bad property name: '%s'"
msgstr "잘못된 속성이름: '%s'"
-#: libsvn_client/prop_commands.c:334
+#: libsvn_client/prop_commands.c:339
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
-msgstr "작업 사본이 아닌 대상 '%s'에 대한 속성 설정은 BASE 리비전이 필요합니다."
+msgstr ""
+"작업 사본이 아닌 대상 '%s'에 대한 속성 설정은 BASE 리비전이 필요합니다."
-#: libsvn_client/prop_commands.c:340
+#: libsvn_client/prop_commands.c:345
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr "작업 사본이 아닌 대상 '%s'에 대한 재귀적 설정은 지원하지 않습니다."
-#: libsvn_client/prop_commands.c:438
+#: libsvn_client/prop_commands.c:439
msgid "Value will not be set unless forced"
msgstr "강제(--force)하지 않으면 값이 설정되지 않습니다."
-#: libsvn_client/prop_commands.c:661
+#: libsvn_client/prop_commands.c:659
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "'%s'은(는) 리비전 %ld에 없습니다."
-#: libsvn_client/prop_commands.c:668
-#: libsvn_client/prop_commands.c:932
+#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:948
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "'%s'의 노드를 알 수 없습니다."
-#: libsvn_client/ra.c:132
+#: libsvn_client/ra.c:133
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr "커밋 명령 없이 작업사본의 속성 '%s'를 '%s'에 설정하려 시도합니다."
-#: libsvn_client/ra.c:359
-#, c-format
-msgid "Can't find entry for '%s'"
-msgstr "'%s'를 위한 등록정보를 찾을 수 없습니다."
-
-#: libsvn_client/ra.c:503
+#: libsvn_client/ra.c:496
#, c-format
msgid "Missing changed-path information for '%s' in revision %ld"
msgstr "'%s'의 변경된 경로 정보가 누락됨, 리비전 %ld."
-#: libsvn_client/ra.c:623
+#: libsvn_client/ra.c:616
#, c-format
msgid "Path '%s' doesn't exist in revision %ld"
msgstr "경로 '%s'는 리비전 %ld 에 존재하지 않습니다"
-#: libsvn_client/ra.c:670
-#: libsvn_client/ra.c:833
+#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "'%s'의 저장소 위치를 찾을 수 없습니다. 리비전 %ld."
-#: libsvn_client/ra.c:681
+#: libsvn_client/ra.c:674
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "'%s' (리비전 %ld)는 연관이 없는 개체입니다."
-#: libsvn_client/ra.c:838
+#: libsvn_client/ra.c:831
#, c-format
-msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object"
-msgstr "'%s'에 대한 위치(리비전 %ld)가 저장소내에 존재하지 않거나 연관되지 않는 개체를 참조하고 있습니다."
+msgid ""
+"The location for '%s' for revision %ld does not exist in the repository or "
+"refers to an unrelated object"
+msgstr ""
+"'%s'에 대한 위치(리비전 %ld)가 저장소내에 존재하지 않거나 연관되지 않는 개체"
+"를 참조하고 있습니다."
#: libsvn_client/relocate.c:101
#, c-format
@@ -1449,18 +1414,29 @@
#: libsvn_client/relocate.c:108
#, c-format
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
-msgstr "'%s'의 저장소는 '%s'라는 uuid를 가지고 있습니다만 작업사본은 '%s' 입니다."
+msgstr ""
+"'%s'의 저장소는 '%s'라는 uuid를 가지고 있습니다만 작업사본은 '%s' 입니다."
-#: libsvn_client/revisions.c:99
+#: libsvn_client/revisions.c:93
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "경로 '%s'는 커밋된 리비젼이 없습니다"
-#: libsvn_client/revisions.c:109
+#: libsvn_client/revisions.c:103
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "'%s'에 대한 인식 불가능한 리비전 종류의 요청을 받았습니다."
+#: libsvn_client/update.c:138 libsvn_wc/log.c:2573
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr "'%s'는 작업 사본 디렉토리가 아닙니다"
+
+#: libsvn_client/update.c:146
+#, fuzzy, c-format
+msgid "'%s' is neither a file nor a directory"
+msgstr "'%s'는 파일이나 디렉토리가 아닙니다"
+
#: libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
msgstr "svndiff 데이터 압축을 실패하였습니다"
@@ -1495,7 +1471,8 @@
#: libsvn_delta/svndiff.c:507
#, c-format
-msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgid ""
+"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
msgstr "잘못된 diff 스트림: [tgt] insn %d이 뷰의 시작 위치를 넘었습니다."
#: libsvn_delta/svndiff.c:514
@@ -1515,8 +1492,7 @@
msgid "Svndiff has invalid header"
msgstr "Svndiff 데이터가 잘못된 헤더를 가지고 있습니다."
-#: libsvn_delta/svndiff.c:688
-#: libsvn_delta/svndiff.c:844
+#: libsvn_delta/svndiff.c:688 libsvn_delta/svndiff.c:844
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff 데이터가 손상된 윈도우를 포함하고 있습니다."
@@ -1524,8 +1500,7 @@
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff 데이터에 뒤로 진행하는 부분이 있습니다."
-#: libsvn_delta/svndiff.c:746
-#: libsvn_delta/svndiff.c:793
+#: libsvn_delta/svndiff.c:746 libsvn_delta/svndiff.c:793
#: libsvn_delta/svndiff.c:866
msgid "Unexpected end of svndiff input"
msgstr "svndiff의 입력이 알 수 없는 이유로 중단되었습니다."
@@ -1555,8 +1530,7 @@
msgid "Failed to delete mmap '%s'"
msgstr "mmap '%s'의 제거에 실패하였습니다."
-#: libsvn_fs/fs-loader.c:105
-#: libsvn_ra/ra_loader.c:158
+#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:158
#: libsvn_ra/ra_loader.c:171
#, c-format
msgid "'%s' does not define '%s()'"
@@ -1569,7 +1543,8 @@
#: libsvn_fs/fs-loader.c:138
#, c-format
-msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgid ""
+"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr "FS 모듈 버전 불일치 '%s': 발견된 것 %d.%d.%d%s, 기대되는 것 %d.%d.%d%s"
#: libsvn_fs/fs-loader.c:163
@@ -1592,7 +1567,7 @@
msgid "Can't ungrab FS mutex"
msgstr "파일시스템 뮤텍스를 얻을 수 없습니다."
-#: libsvn_fs/fs-loader.c:907
+#: libsvn_fs/fs-loader.c:938
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "만료기간이 음수로 지정되었습니다."
@@ -1609,18 +1584,15 @@
msgid "deleting changes"
msgstr "변경 내용 삭제중"
-#: libsvn_fs_base/bdb/changes-table.c:145
-#: libsvn_fs_fs/fs_fs.c:2385
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "필요한 노드 리비전 ID가 누락되었습니다."
-#: libsvn_fs_base/bdb/changes-table.c:156
-#: libsvn_fs_fs/fs_fs.c:2395
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "변경 순서 오류: 삭제 없는 새 노드 리비전 ID"
-#: libsvn_fs_base/bdb/changes-table.c:166
-#: libsvn_fs_fs/fs_fs.c:2406
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "변경 순서 오류: 삭제된 경로상에는 추가할 수 없습니다."
@@ -1691,8 +1663,7 @@
msgid "storing node revision"
msgstr "노드 리비전 저장 중"
-#: libsvn_fs_base/bdb/reps-table.c:93
-#: libsvn_fs_base/bdb/reps-table.c:200
+#: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
#, c-format
msgid "No such representation '%s'"
msgstr "없는 표현 항목: '%s'"
@@ -1740,119 +1711,109 @@
msgid "set repository uuid"
msgstr "저장소 uuid 설정"
-#: libsvn_fs_base/dag.c:217
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr "손상된 DB: 파일시스템('%s')의 초기 트랜잭션 id가 '0'이 아닙니다."
-#: libsvn_fs_base/dag.c:225
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "손상된 DB: 파일 시스템('%s')의 초기 copy id가 '0'이 아닙니다."
-#: libsvn_fs_base/dag.c:234
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr "손상된 DB: 파일시스템('%s')의 초기 리비전 번호가 '0'이 아닙니다."
-#: libsvn_fs_base/dag.c:282
-#: libsvn_fs_base/dag.c:458
-#: libsvn_fs_fs/dag.c:334
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "디렉토리가 아닌 상위 노드에 생성하려 하였습니다."
-#: libsvn_fs_base/dag.c:452
-#: libsvn_fs_fs/dag.c:328
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr " 잘못된 이름('%s')으로 노드를 생성하려 했습니다."
-#: libsvn_fs_base/dag.c:464
-#: libsvn_fs_base/dag.c:698
-#: libsvn_fs_fs/dag.c:340
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "변경 불가능한 노드로 복제를 시도하였습니다."
-#: libsvn_fs_base/dag.c:471
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "이미 존재하는 디렉토리를 다시 생성하려 하였습니다."
-#: libsvn_fs_base/dag.c:522
-#: libsvn_fs_fs/dag.c:402
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "디렉토리가 아닌 노드에 설정하려하였습니다."
-#: libsvn_fs_base/dag.c:528
-#: libsvn_fs_fs/dag.c:408
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "변경할 수 없는 노드에 대해 설정하려 했습니다."
-#: libsvn_fs_base/dag.c:592
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "되돌릴수 없는 노드(%s) 리비전에 대해 속성리스트를 설정할 수 없습니다."
-#: libsvn_fs_base/dag.c:704
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "잘못된 이름 '%s'으로 하위 노드를 생성하려합니다."
-#: libsvn_fs_base/dag.c:830
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "디렉토리가 아닌 노드에서 '%s'를 삭제하려합니다."
-#: libsvn_fs_base/dag.c:836
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "변경할 수 없는 디렉토리에서 '%s'를 삭제하려합니다."
-#: libsvn_fs_base/dag.c:843
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "잘못된 이름으로된 노드(%s)를 삭제하려합니다."
-#: libsvn_fs_base/dag.c:858
-#: libsvn_fs_base/dag.c:891
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "삭제 오류: 디렉토리에 그런 항목이 없습니다. : '%s'"
-#: libsvn_fs_base/dag.c:940
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "변경할 수 없는 노드를 삭제하려합니다."
-#: libsvn_fs_base/dag.c:1060
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "파일이 아닌 노드로부터 텍스트를 얻으려 시도했습니다."
-#: libsvn_fs_base/dag.c:1095
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "파일이 아닌 노드로부터 길이를 얻으려 시도했습니다."
-#: libsvn_fs_base/dag.c:1121
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "파일이 아닌 노드로부터 체크섬 값을 얻으려 시도했습니다."
-#: libsvn_fs_base/dag.c:1152
-#: libsvn_fs_base/dag.c:1206
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "파일이 아닌 노드에 텍스트 내용을 설정할 수 없음"
-#: libsvn_fs_base/dag.c:1158
-#: libsvn_fs_base/dag.c:1212
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "변경할 수 없는 노드의 내용을 설정하려합니다."
-#: libsvn_fs_base/dag.c:1235
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1863,18 +1824,17 @@
" 기대값 : %s\n"
" 실제값 : %s\n"
-#: libsvn_fs_base/dag.c:1290
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "존재하지 않는 하위 노드 '%s'를 열려고 합니다."
-#: libsvn_fs_base/dag.c:1296
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "잘못된 이름의 노드 '%s'를 열려고 합니다."
-#: libsvn_fs_base/err.c:38
-#: libsvn_fs_fs/err.c:38
+#: libsvn_fs_base/err.c:38 libsvn_fs_fs/err.c:38
msgid "Filesystem object has not been opened yet"
msgstr "파일시스템 개체가 아직 열리지 않았습니다."
@@ -1883,8 +1843,7 @@
msgid "Corrupt filesystem revision %ld in filesystem '%s'"
msgstr "손상된 파일시스템 리비전 %ld (파일시스템 '%s')"
-#: libsvn_fs_base/err.c:62
-#: libsvn_fs_fs/err.c:52
+#: libsvn_fs_base/err.c:62 libsvn_fs_fs/err.c:52
#, c-format
msgid "Reference to non-existent node '%s' in filesystem '%s'"
msgstr "존재하지 않는 노드 '%s'에 대한 참조, 파일시스템 '%s'"
@@ -1897,15 +1856,17 @@
#: libsvn_fs_base/err.c:84
#, c-format
msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
-msgstr "손상된 등록정보가 '%s'를 위한 'transactions' 테이블에 있습니다. 파일시스템 '%s'"
+msgstr ""
+"손상된 등록정보가 '%s'를 위한 'transactions' 테이블에 있습니다. 파일시스템 '%"
+"s'"
#: libsvn_fs_base/err.c:95
#, c-format
msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
-msgstr "손상된 등록정보가 '%s'를 위한 'copies' 테이블에 있습니다. 파일 시스템 '%s'"
+msgstr ""
+"손상된 등록정보가 '%s'를 위한 'copies' 테이블에 있습니다. 파일 시스템 '%s'"
-#: libsvn_fs_base/err.c:106
-#: libsvn_fs_fs/err.c:63
+#: libsvn_fs_base/err.c:106 libsvn_fs_fs/err.c:63
#, c-format
msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
msgstr "파일은 변경될 수 없습니다: 파일시스템 '%s', 리비전 %ld, 경로 '%s'"
@@ -1915,8 +1876,7 @@
msgid "No transaction named '%s' in filesystem '%s'"
msgstr "트랜잭션 이름이 '%s'로는 존재하지 않습니다. 파일 시스템 '%s'"
-#: libsvn_fs_base/err.c:128
-#: libsvn_fs_fs/err.c:74
+#: libsvn_fs_base/err.c:128 libsvn_fs_fs/err.c:74
#, c-format
msgid "Cannot modify transaction named '%s' in filesystem '%s'"
msgstr "'%s' 라는 트랜잭션은 수정될 수 없습니다. 파일 시스템 '%s'"
@@ -1926,14 +1886,12 @@
msgid "No copy with id '%s' in filesystem '%s'"
msgstr "'%s'라는 아이디의 사본이 없습니다. 파일시스템 '%s'"
-#: libsvn_fs_base/err.c:149
-#: libsvn_fs_fs/err.c:85
+#: libsvn_fs_base/err.c:149 libsvn_fs_fs/err.c:85
#, c-format
msgid "'%s' is not a directory in filesystem '%s'"
msgstr "'%s'는 디렉토리가 아닙니다. 파일시스템 '%s'"
-#: libsvn_fs_base/err.c:160
-#: libsvn_fs_fs/err.c:96
+#: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
#, c-format
msgid "'%s' is not a file in filesystem '%s'"
msgstr "'%s'는 파일이 아닙니다. 파일시스템 '%s'"
@@ -1951,75 +1909,77 @@
#: libsvn_fs_base/err.c:190
#, c-format
msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "'%s'를 위한 'locks' 테이블에 손상된 잠금이 존재합니다. 파일 시스템 '%s'"
+msgstr ""
+"'%s'를 위한 'locks' 테이블에 손상된 잠금이 존재합니다. 파일 시스템 '%s'"
-#: libsvn_fs_base/err.c:200
-#: libsvn_fs_fs/err.c:117
+#: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
#, c-format
msgid "No lock on path '%s' in filesystem '%s'"
msgstr "'%s'에 잠금이 없습니다. 파일시스템 '%s'"
-#: libsvn_fs_base/err.c:211
-#: libsvn_fs_fs/err.c:128
+#: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
#, c-format
msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
msgstr "잠금이 만료되었습니다: 잠금 토큰 '%s'. 파일시스템 '%s'"
-#: libsvn_fs_base/err.c:222
-#: libsvn_fs_fs/err.c:139
+#: libsvn_fs_base/err.c:222 libsvn_fs_fs/err.c:139
#, c-format
msgid "No username is currently associated with filesystem '%s'"
msgstr "사용자가 파일시스템에 할당되어 있지 않습니다. '%s'"
-#: libsvn_fs_base/err.c:235
-#: libsvn_fs_fs/err.c:152
+#: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
#, c-format
msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "사용자 '%s' 는 사용자 '%s'의 소유로된 잠금을 사용하려 합니다. 파일시스템 '%s'"
+msgstr ""
+"사용자 '%s' 는 사용자 '%s'의 소유로된 잠금을 사용하려 합니다. 파일시스템 '%s'"
-#: libsvn_fs_base/err.c:247
-#: libsvn_fs_fs/err.c:164
+#: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
#, c-format
msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
msgstr "경로 '%s'는 사용자 '%s'가 이미 잠궜습니다. 파일시스템 '%s'"
-#: libsvn_fs_base/fs.c:79
+#: libsvn_fs_base/fs.c:80
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr "잘못된 데이터베이스 버전: %d.%d.%d, 최소한 %d.%d.%d는 되어야합니다."
-#: libsvn_fs_base/fs.c:90
+#: libsvn_fs_base/fs.c:91
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
-msgstr "잘못된 데이터베이스 버전: 컴파일당시 버전 %d.%d.%d, 실행되고 있는 버전 %d.%d.%d"
+msgstr ""
+"잘못된 데이터베이스 버전: 컴파일당시 버전 %d.%d.%d, 실행되고 있는 버전 %d.%d."
+"%d"
-#: libsvn_fs_base/fs.c:108
-#: libsvn_fs_fs/fs.c:54
+#: libsvn_fs_base/fs.c:109 libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "파일 시스템 객체는 이미 열려있습니다."
-#: libsvn_fs_base/fs.c:189
+#: libsvn_fs_base/fs.c:190
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
-msgstr "DB 환경을 종료하는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 발생하였습니다:\n"
+msgstr ""
+"DB 환경을 종료하는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 발생하였습니"
+"다:\n"
-#: libsvn_fs_base/fs.c:539
+#: libsvn_fs_base/fs.c:540
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
-msgstr "DB 환경을 생성하는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 발생하였습니다:\n"
+msgstr ""
+"DB 환경을 생성하는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 발생하였습니"
+"다:\n"
-#: libsvn_fs_base/fs.c:545
+#: libsvn_fs_base/fs.c:546
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
-msgstr "DB 환경을 여는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 발생하였습니다:\n"
+msgstr ""
+"DB 환경을 여는 중에 파일시스템 '%s' 에 Berkeley DB 오류가 발생하였습니다:\n"
-#: libsvn_fs_base/fs.c:672
-#: libsvn_fs_fs/fs_fs.c:631
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "예상되는 파일시스템 포맷 '%d', 발견된 포맷 '%d'"
-#: libsvn_fs_base/fs.c:1094
+#: libsvn_fs_base/fs.c:1112
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
"may be interfering with the hotcopy algorithm. If \n"
@@ -2031,7 +1991,7 @@
"만약 문제가 지속되면, DB_CONFIG 내에서 본 속성을\n"
"끄십시오."
-#: libsvn_fs_base/fs.c:1113
+#: libsvn_fs_base/fs.c:1131
msgid ""
"Error running catastrophic recovery on hotcopy; the \n"
"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
@@ -2043,32 +2003,31 @@
"만약 문제가 지속되면, DB_CONFIG 내에서 본 속성을\n"
"끄십시오."
-#: libsvn_fs_base/fs.c:1222
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr "Berkeley DB로 된 저장소에 접근하기 위한 모듈"
-#: libsvn_fs_base/fs.c:1255
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "BDB의 지원하지 않는 FS 로더 버전 (%d)"
-#: libsvn_fs_base/lock.c:444
-#: libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
-msgstr "'%s' 경로에 대한 잠금을 확인할 수 없습니다; 사용자가 지정되지 않았습니다."
+msgstr ""
+"'%s' 경로에 대한 잠금을 확인할 수 없습니다; 사용자가 지정되지 않았습니다."
-#: libsvn_fs_base/lock.c:450
-#: libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr "사용자 %s 은/는 '%s'를 잠그지 않았습니다. (현재 %s에 의해 잠겼습니다)"
-#: libsvn_fs_base/lock.c:457
-#: libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
-msgstr "'%s' 경로에 대한 잠금을 확인할 수 없습니다; 잠금 토큰을 발견할 수 없습니다."
+msgstr ""
+"'%s' 경로에 대한 잠금을 확인할 수 없습니다; 잠금 토큰을 발견할 수 없습니다."
#. Helper macro that evaluates to an error message indicating that
#. the representation referred to by X has an unknown node kind.
@@ -2092,7 +2051,9 @@
#: libsvn_fs_base/reps-strings.c:531
#, c-format
-msgid "Corruption detected whilst reading delta chain from representation '%s' to '%s'"
+msgid ""
+"Corruption detected whilst reading delta chain from representation '%s' to '%"
+"s'"
msgstr "'%s'에서 '%s'로의 델타 체인이 읽혀지긴하였지만, 오류도 발견되었습니다."
#: libsvn_fs_base/reps-strings.c:779
@@ -2105,8 +2066,7 @@
msgid "Failure reading rep '%s'"
msgstr "저장소 '%s' 읽기 실패"
-#: libsvn_fs_base/reps-strings.c:811
-#: libsvn_fs_base/reps-strings.c:897
+#: libsvn_fs_base/reps-strings.c:811 libsvn_fs_base/reps-strings.c:897
#, c-format
msgid ""
"Checksum mismatch on rep '%s':\n"
@@ -2121,8 +2081,7 @@
msgid "Null rep, but offset past zero already"
msgstr "비어있는 rep입니다만, 내용이 있는 것처럼 접근합니다."
-#: libsvn_fs_base/reps-strings.c:1024
-#: libsvn_fs_base/reps-strings.c:1220
+#: libsvn_fs_base/reps-strings.c:1024 libsvn_fs_base/reps-strings.c:1220
#, c-format
msgid "Rep '%s' is not mutable"
msgstr "표현식 '%s'는 변경 불가능합니다."
@@ -2146,17 +2105,17 @@
msgid "Failed to calculate MD5 digest for '%s'"
msgstr "'%s'에 대한 MD5 값을 계산하는데 실패하였습니다."
-#: libsvn_fs_base/revs-txns.c:65
+#: libsvn_fs_base/revs-txns.c:67
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "트랜잭션 종료되지 않음: '%s'"
-#: libsvn_fs_base/revs-txns.c:68
+#: libsvn_fs_base/revs-txns.c:70
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "트랜잭션 종료됨: '%s'"
-#: libsvn_fs_base/revs-txns.c:981
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "트랜잭션이 취소되었으나 'cleanup'도 실패하였습니다."
@@ -2166,99 +2125,87 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:389
-#: libsvn_fs_fs/tree.c:309
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "파일 발견되지 않음: 트랜잭션 '%s', 경로 '%s'"
-#: libsvn_fs_base/tree.c:394
-#: libsvn_fs_fs/tree.c:314
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "파일 발견되지 않음: 리비전 %ld, 경로 '%s'"
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:404
-#: libsvn_fs_fs/tree.c:329
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "파일이 이미 존재함: 파일시스템 '%s', 트랜잭션 '%s', 경로 '%s'"
-#: libsvn_fs_base/tree.c:409
-#: libsvn_fs_fs/tree.c:335
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "파일이 이미 존재함: 파일시스템 '%s', 리비전 %ld, 경로 '%s'"
-#: libsvn_fs_base/tree.c:417
-#: libsvn_fs_fs/tree.c:345
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "루트 개체가 트랜잭션의 루트이어야 합니다."
-#: libsvn_fs_base/tree.c:832
-#: libsvn_fs_fs/tree.c:754
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "열 수 없습니다. '%s'"
-#: libsvn_fs_base/tree.c:1402
-#: libsvn_fs_fs/tree.c:1152
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr "서로 다른 두개의 파일 시스템간 속성은 비교할 수 없습니다."
-#: libsvn_fs_base/tree.c:1735
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "손상된 DB: 잘못된 predecessor count"
-#: libsvn_fs_base/tree.c:1790
-#: libsvn_fs_fs/tree.c:1189
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "경로 '%s'에 기대하지 못한 변경 불가능한 노드를 발견하였습니다."
-#: libsvn_fs_base/tree.c:1811
-#: libsvn_fs_fs/tree.c:1212
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "충돌 발생: '%s'"
-#: libsvn_fs_base/tree.c:1861
-#: libsvn_fs_base/tree.c:2566
-#: libsvn_fs_fs/tree.c:1261
-#: libsvn_fs_fs/tree.c:1748
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
-msgstr "병합 실패; diff 원본, 대상 그리고 차이를 반영할 대상이 모두 같은 파일시스템이어야 합니다."
+msgstr ""
+"병합 실패; diff 원본, 대상 그리고 차이를 반영할 대상이 모두 같은 파일시스템이"
+"어야 합니다."
-#: libsvn_fs_base/tree.c:1877
-#: libsvn_fs_fs/tree.c:1277
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
-msgstr "병합 실패; 차이를 반영할 대상 '%s'은 '%s' id를 가지고 있으며, 이는 diff 원본과 같습니다."
+msgstr ""
+"병합 실패; 차이를 반영할 대상 '%s'은 '%s' id를 가지고 있으며, 이는 diff 원본"
+"과 같습니다."
-#: libsvn_fs_base/tree.c:2373
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "트랜잭션 '%s' 는 리비전 '%s'의 관점에서 만료기간이 지났습니다."
-#: libsvn_fs_base/tree.c:2749
-#: libsvn_fs_fs/tree.c:1887
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "루트 디렉토리는 제거될 수 없습니다."
-#: libsvn_fs_base/tree.c:2929
-#: libsvn_fs_fs/tree.c:1959
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "서로 다른 파일시스템 간에 복사 할 수 없습니다 ('%s' 와 '%s')"
-#: libsvn_fs_base/tree.c:2938
-#: libsvn_fs_fs/tree.c:1965
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "뮤터블 트리에서의 복사는 지원하지 않습니다."
-#: libsvn_fs_base/tree.c:3433
-#: libsvn_fs_fs/tree.c:2389
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2269,25 +2216,22 @@
" 기대값 : %s\n"
" 실제값 : %s\n"
-#: libsvn_fs_base/tree.c:3686
-#: libsvn_fs_fs/tree.c:2625
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr "서로 다른 두개의 파일 시스템간의 파일 내용은 비교할 수 없습니다"
-#: libsvn_fs_base/tree.c:3695
-#: libsvn_fs_base/tree.c:3700
-#: libsvn_fs_fs/tree.c:2634
-#: libsvn_fs_fs/tree.c:2639
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
msgstr "'%s'는 파일이 아닙니다."
-#: libsvn_fs_fs/dag.c:384
+#: libsvn_fs_fs/dag.c:383
msgid "Can't get entries of non-directory"
msgstr "디렉토리가 아니면 목록을 얻을 수 없습니다."
-#: libsvn_fs_fs/dag.c:931
+#: libsvn_fs_fs/dag.c:930
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2303,175 +2247,171 @@
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
msgstr "손상된 잠금 파일 리비전 '%s' (파일시스템 '%s')"
-#: libsvn_fs_fs/fs.c:89
+#: libsvn_fs_fs/fs.c:88
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "FSFS 공용 데이터를 얻을 수 없습니다."
-#: libsvn_fs_fs/fs.c:105
+#: libsvn_fs_fs/fs.c:104
#, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "FSFS 쓰기 잠금을 생성할 수 없습니다"
-#: libsvn_fs_fs/fs.c:113
+#: libsvn_fs_fs/fs.c:112
#, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "FSFS 트랜잭션 리스트용 뮤텍스를 생성할 수 없습니다"
-#: libsvn_fs_fs/fs.c:119
+#: libsvn_fs_fs/fs.c:118
#, c-format
msgid "Can't store FSFS shared data"
msgstr "FSFS 공용 데이터를 저장할 수 없습니다"
-#: libsvn_fs_fs/fs.c:345
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr "일반 파일 기반 저장소를 접근하기 위한 모듈"
-#: libsvn_fs_fs/fs.c:378
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "fsfs에 대한 지원하지 않는 파일시스템 로더 버전(%d)입니다."
-#: libsvn_fs_fs/fs_fs.c:340
+#: libsvn_fs_fs/fs_fs.c:352
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "FSFS 트랜잭션 리스트를 얻을 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:348
+#: libsvn_fs_fs/fs_fs.c:360
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "FSFS 트랜잭션 리스트를 놓을 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:374
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "모르는 트랜잭션('%s')의 잠금을 해제할 수 없습니다"
-#: libsvn_fs_fs/fs_fs.c:378
+#: libsvn_fs_fs/fs_fs.c:390
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "잠겨있지 않은 트랜잭션('%s')을 해제할 수 없습니다"
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr "트랜잭션('%s')용 프로토타입 리비전 잠금파일을 해제할 수 없습니다"
-#: libsvn_fs_fs/fs_fs.c:391
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr "트랜잭션('%s')용 프로토타입 리비전 잠금파일을 닫을 수 없습니다"
-#: libsvn_fs_fs/fs_fs.c:453
+#: libsvn_fs_fs/fs_fs.c:465
#, 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 "이전 내용이 현재 이 프로세스에 의해 쓰여지고 있으므로,트랜잭션('%s')의 프로토타입 리비전 파일에 쓸 수 없습니다"
+msgid ""
+"Cannot write to the prototype revision file of transaction '%s' because a "
+"previous representation is currently being written by this process"
+msgstr ""
+"이전 내용이 현재 이 프로세스에 의해 쓰여지고 있으므로,트랜잭션('%s')의 프로토"
+"타입 리비전 파일에 쓸 수 없습니다"
-#: libsvn_fs_fs/fs_fs.c:489
+#: libsvn_fs_fs/fs_fs.c:501
#, 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 "이전 내용이 현재 다른 프로세스에 의해 쓰여지고 있으므로,트랜잭션('%s')의 프로토타입 리비전 파일에 쓸 수 없습니다"
+msgid ""
+"Cannot write to the prototype revision file of transaction '%s' because a "
+"previous representation is currently being written by another process"
+msgstr ""
+"이전 내용이 현재 다른 프로세스에 의해 쓰여지고 있으므로,트랜잭션('%s')의 프로"
+"토타입 리비전 파일에 쓸 수 없습니다"
-#: libsvn_fs_fs/fs_fs.c:496
-#: libsvn_subr/io.c:1511
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "파일 '%s'에 대해 배타적 잠금기능을 걸 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:825
-#: libsvn_fs_fs/fs_fs.c:839
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "리비전 파일내에 잘못된 형식의 헤더가 있습니다."
-#: libsvn_fs_fs/fs_fs.c:941
-#: libsvn_fs_fs/fs_fs.c:955
-#: libsvn_fs_fs/fs_fs.c:962
-#: libsvn_fs_fs/fs_fs.c:969
-#: libsvn_fs_fs/fs_fs.c:977
-#: libsvn_fs_fs/fs_fs.c:985
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "node-rev 에 잘못된 텍스트 rep 옵셋 라인"
-#: libsvn_fs_fs/fs_fs.c:1054
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "node-rev 내에 kind 필드가 없습니다."
-#: libsvn_fs_fs/fs_fs.c:1085
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "node-rev 내에 cpath가 없습니다"
-#: libsvn_fs_fs/fs_fs.c:1112
-#: libsvn_fs_fs/fs_fs.c:1118
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "node-rev 내에 copyroot 형식이 잘못되었습니다."
-#: libsvn_fs_fs/fs_fs.c:1136
-#: libsvn_fs_fs/fs_fs.c:1142
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "node-rev 내에 copyfrom 행에 오류가 있습니다."
-#: libsvn_fs_fs/fs_fs.c:1251
-#: libsvn_fs_fs/fs_fs.c:3613
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "트랜잭션이 아닌 것에 쓰기 시도를 하였습니다."
-#: libsvn_fs_fs/fs_fs.c:1335
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "보여질 내용의 헤더 형식이 잘못되었습니다."
-#: libsvn_fs_fs/fs_fs.c:1359
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "node-rev 내에 node-id가 없습니다."
-#: libsvn_fs_fs/fs_fs.c:1365
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "node-rev 내에 손상된 node-id가 있습니다."
-#: libsvn_fs_fs/fs_fs.c:1410
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "리비전 파일 내에 마지막 개행문자가 없습니다."
-#: libsvn_fs_fs/fs_fs.c:1422
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "리비전 파일 마지막 행의 길이가 64 문자를 넘습니다."
-#: libsvn_fs_fs/fs_fs.c:1437
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "리비전 파일의 마지막 행에 스페이스가 없습니다."
-#: libsvn_fs_fs/fs_fs.c:1466
-#: libsvn_fs_fs/fs_fs.c:1524
-#: libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "없는 리비전 %ld 입니다."
-#: libsvn_fs_fs/fs_fs.c:1584
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "보여질 내용에 잘못된 svndiff 데이터가 있습니다."
-#: libsvn_fs_fs/fs_fs.c:1727
-#: libsvn_fs_fs/fs_fs.c:1740
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "표시될 내용의 끝부분을 넘어 읽은 svndiff 창을 읽고 있습니다."
-#: libsvn_fs_fs/fs_fs.c:1876
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "존재하지않는 소스에 대하여 svndiff 데이터를 요청하였습니다."
-#: libsvn_fs_fs/fs_fs.c:1882
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "스트림의 마지막을 지난 위치에 대한 svndiff 요청을 받았습니다."
-#: libsvn_fs_fs/fs_fs.c:1905
-#: libsvn_fs_fs/fs_fs.c:1922
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "svndiff 창 길이가 손상되었습니다."
-#: libsvn_fs_fs/fs_fs.c:1970
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2482,165 +2422,177 @@
" 기대값: %s\n"
" 실제값: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2193
-#: libsvn_fs_fs/fs_fs.c:2206
-#: libsvn_fs_fs/fs_fs.c:2212
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "디렉토리 등록정보가 손상되었습니다."
-#: libsvn_fs_fs/fs_fs.c:2551
-#: libsvn_fs_fs/fs_fs.c:2559
-#: libsvn_fs_fs/fs_fs.c:2591
-#: libsvn_fs_fs/fs_fs.c:2611
-#: libsvn_fs_fs/fs_fs.c:2645
-#: libsvn_fs_fs/fs_fs.c:2650
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "rev-file 안에 변경된 줄 수 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:2584
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "rev-file 안에 종류값이 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:2604
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "rev-file 안에 text-mod 플래그 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:2624
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "rev-file 안에 prop-mod 값 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:2808
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "트랜잭션으로부터의 복사는 허용되지 않습니다."
-#: libsvn_fs_fs/fs_fs.c:2864
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "'%s'에 트랜잭션 디렉토리를 만들 수 없습니다. 리비전 %ld."
-#: libsvn_fs_fs/fs_fs.c:3045
-#: libsvn_fs_fs/fs_fs.c:3052
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "next-id 파일 손상됨"
-#: libsvn_fs_fs/fs_fs.c:3139
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "트랜잭션이 'cleanup' 오류"
-#: libsvn_fs_fs/fs_fs.c:3307
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "변경 형식이 잘못됨"
-#: libsvn_fs_fs/fs_fs.c:3632
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "디렉토리의 텍스트 내용을 설정할 수 없음"
-#: libsvn_fs_fs/fs_fs.c:3722
-#: libsvn_fs_fs/fs_fs.c:3727
-#: libsvn_fs_fs/fs_fs.c:3734
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "현재파일 손상됨"
-#: libsvn_fs_fs/fs_fs.c:4023
-#: libsvn_subr/io.c:2753
-#: svn/util.c:236
-#: svn/util.c:251
-#: svn/util.c:275
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
+#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "'%s' 의 stat을 볼 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:4027
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "chmod '%s' 할 수 없음"
-#: libsvn_fs_fs/fs_fs.c:4167
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "FSFS 저장소 뮤텍스를 얻을 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:4181
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "FSFS 저장소 뮤텍스를 반환할 수 없습니다."
-#: libsvn_fs_fs/fs_fs.c:4299
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "트랜잭션이 오래된 것임"
-#: libsvn_fs_fs/fs_fs.c:4599
+#: libsvn_fs_fs/fs_fs.c:4807
+#, fuzzy
+msgid "Recovery encountered a non-directory node"
+msgstr "디렉토리가 아닌 노드에 설정하려하였습니다."
+
+#: libsvn_fs_fs/fs_fs.c:4829
+msgid "Recovery encountered a deltified directory representation"
+msgstr ""
+
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "그런 트랜잭션이 없습니다."
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "잠금/엔트리의 해시 파일 '%s'을 쓸 수 없습니다."
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "잠금/엔트리의 해시 파일 '%s'을 분석 할 수 없습니다."
-#: libsvn_fs_fs/lock.c:715
-#: libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "경로 '%s'는 HEAD 리비전에 존재하지 않습니다."
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "잠금 실패: 새로운 버전의 '%s'가 존재합니다"
+#: libsvn_fs_util/merge-info-sqlite-index.c:102
+msgid "Merge Tracking schema format not set"
+msgstr ""
+
+#: libsvn_fs_util/merge-info-sqlite-index.c:107
+#, c-format
+msgid "Merge Tracking schema format %d not recognized"
+msgstr ""
+
#: libsvn_ra/ra_loader.c:213
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "RA 플러그인 버전이 다릅니다. '%s': 발견된 것 %d.%d.%d%s, 예상한 것 %d.%d.%d%s"
+msgstr ""
+"RA 플러그인 버전이 다릅니다. '%s': 발견된 것 %d.%d.%d%s, 예상한 것 %d.%d.%d%s"
-#: libsvn_ra/ra_loader.c:285
+#: libsvn_ra/ra_loader.c:397
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "알 수 없는 URL 스키마입니다. '%s'"
-#: libsvn_ra/ra_loader.c:336
+#: libsvn_ra/ra_loader.c:448
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "'%s'는 '%s'와 동일한 저장소에 있지 않습니다"
-#: libsvn_ra/ra_loader.c:707
+#: libsvn_ra/ra_loader.c:945
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - '%s' 스키마를 처리합니다.\n"
-#: libsvn_ra/ra_loader.c:793
+#: libsvn_ra/ra_loader.c:1031
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "알 수 없는 URL 스키마입니다. '%s'"
-#: libsvn_ra_dav/commit.c:225
-msgid "Could not fetch the Version Resource URL (needed during an import or when it is missing from the local, cached props)"
-msgstr "리소스의 URL을 얻을 수 없습니다. (이 값은 임포트에 사용되었고,작업사본에 없을 경우 캐시된 속성에서 얻습니다.)"
+#: libsvn_ra_dav/commit.c:222
+msgid ""
+"Could not fetch the Version Resource URL (needed during an import or when it "
+"is missing from the local, cached props)"
+msgstr ""
+"리소스의 URL을 얻을 수 없습니다. (이 값은 임포트에 사용되었고,작업사본에 없"
+"을 경우 캐시된 속성에서 얻습니다.)"
-#: libsvn_ra_dav/commit.c:462
-#: libsvn_ra_serf/commit.c:374
+#: libsvn_ra_dav/commit.c:459 libsvn_ra_serf/commit.c:374
#: libsvn_ra_serf/commit.c:435
#, c-format
msgid "Your file or directory '%s' is probably out-of-date"
msgstr "파일 또는 디렉토리 '%s'는 만료된 것입니다."
-#: libsvn_ra_dav/commit.c:470
+#: libsvn_ra_dav/commit.c:467
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "CHECKOUT 응답에 'Location:' 헤더가 없습니다."
-#: libsvn_ra_dav/commit.c:997
-#: libsvn_ra_serf/commit.c:1403
+#: libsvn_ra_dav/commit.c:994 libsvn_ra_serf/commit.c:1427
#, c-format
msgid "File '%s' already exists"
msgstr "파일 '%s'은(는) 이미 존재합니다."
-#: libsvn_ra_dav/commit.c:1115
+#: libsvn_ra_dav/commit.c:1112
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "svndiff 를 임시 파일에 기록할 수 없습니다."
@@ -2657,8 +2609,7 @@
msgid "Could not save file"
msgstr "파일을 저장할 수 없습니다."
-#: libsvn_ra_dav/fetch.c:778
-#: libsvn_ra_svn/client.c:909
+#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:920
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2698,15 +2649,18 @@
msgid "Got unrecognized encoding '%s'"
msgstr "인식할 수 없는 인코딩: '%s'"
-#: libsvn_ra_dav/fetch.c:1705
-#: libsvn_ra_dav/fetch.c:1709
+#: libsvn_ra_dav/fetch.c:1705 libsvn_ra_dav/fetch.c:1709
#: libsvn_ra_serf/locks.c:527
msgid "Server does not support locking features"
msgstr "서버가 잠금 기능을 지원하지 않습니다."
#: libsvn_ra_dav/fetch.c:1784
-msgid "DAV request failed; it's possible that the repository's pre-revprop-change hook either failed or is non-existent"
-msgstr "DAV 요청 실패: pre-revprop-change 훅이 실패하였거나 존재하지 않을 수 있습니다."
+msgid ""
+"DAV request failed; it's possible that the repository's pre-revprop-change "
+"hook either failed or is non-existent"
+msgstr ""
+"DAV 요청 실패: pre-revprop-change 훅이 실패하였거나 존재하지 않을 수 있습니"
+"다."
#: libsvn_ra_dav/fetch.c:2516
#, c-format
@@ -2718,7 +2672,7 @@
msgid "Unknown XML encoding: '%s'"
msgstr "알 수 없는 XML 인코딩: '%s'"
-#: libsvn_ra_dav/fetch.c:2940
+#: libsvn_ra_dav/fetch.c:2952
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr "REPORT 응답 처리가 편집기 구동을 완료하는데 실패하였습니다."
@@ -2747,8 +2701,7 @@
msgid "Failed to parse URI"
msgstr "URI를 분석하는데 실패하였습니다."
-#: libsvn_ra_dav/lock.c:392
-#: libsvn_ra_serf/locks.c:683
+#: libsvn_ra_dav/lock.c:392 libsvn_ra_serf/locks.c:683
#, c-format
msgid "'%s' is not locked in the repository"
msgstr "'%s'는 저장소안에서 잠겨있지 않습니다."
@@ -2759,18 +2712,30 @@
#: libsvn_ra_dav/merge.c:218
#, c-format
-msgid "Protocol error: we told the server not to auto-merge any resources, but it said that '%s' was merged"
-msgstr "프로토콜 오류: 서버에게 자동 병합을 하지 말도록 지시하였으나 서버에서 '%s'의 병합이 이루어졌다는 응답을 받았습니다."
+msgid ""
+"Protocol error: we told the server not to auto-merge any resources, but it "
+"said that '%s' was merged"
+msgstr ""
+"프로토콜 오류: 서버에게 자동 병합을 하지 말도록 지시하였으나 서버에서 '%s'의 "
+"병합이 이루어졌다는 응답을 받았습니다."
#: libsvn_ra_dav/merge.c:227
#, c-format
-msgid "Internal error: there is an unknown parent (%d) for the 'DAV:response' element within the MERGE response"
-msgstr "내부 오류: MERGE 응답안에 DAV:response 개체에 대한 알 수 없는 상위개체(%d)가 있습니다."
+msgid ""
+"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
+"element within the MERGE response"
+msgstr ""
+"내부 오류: MERGE 응답안에 DAV:response 개체에 대한 알 수 없는 상위개체(%d)가 "
+"있습니다."
#: libsvn_ra_dav/merge.c:242
#, c-format
-msgid "Protocol error: the MERGE response for the '%s' resource did not return all of the properties that we asked for (and need to complete the commit)"
-msgstr "프로토콜 오류: '%s' 에 대한 MERGE 응답이 요청한 모든 속성정보를 포함하고 있지 않습니다. (그리고, 커밋을 완료해야할 필요가 있습니다.)"
+msgid ""
+"Protocol error: the MERGE response for the '%s' resource did not return all "
+"of the properties that we asked for (and need to complete the commit)"
+msgstr ""
+"프로토콜 오류: '%s' 에 대한 MERGE 응답이 요청한 모든 속성정보를 포함하고 있"
+"지 않습니다. (그리고, 커밋을 완료해야할 필요가 있습니다.)"
#: libsvn_ra_dav/merge.c:261
#, c-format
@@ -2782,8 +2747,12 @@
msgstr "MERGE 속성 응답이 오류 상태를 포함하고 있습니다."
#: libsvn_ra_dav/options.c:144
-msgid "The OPTIONS response did not include the requested activity-collection-set; this often means that the URL is not WebDAV-enabled"
-msgstr "OPTIONS 응답이 요청한 activity-collection-set 에 대한 것을 포함하고 있지 않습니다. 대개 URL이 WebDAV 가 활성화되지 않은 경우 발생합니다."
+msgid ""
+"The OPTIONS response did not include the requested activity-collection-set; "
+"this often means that the URL is not WebDAV-enabled"
+msgstr ""
+"OPTIONS 응답이 요청한 activity-collection-set 에 대한 것을 포함하고 있지 않습"
+"니다. 대개 URL이 WebDAV 가 활성화되지 않은 경우 발생합니다."
#: libsvn_ra_dav/props.c:592
#, c-format
@@ -2809,8 +2778,7 @@
msgid "No part of path '%s' was found in repository HEAD"
msgstr "'%s'의 경로가 저장소의 HEAD 에서 발견되지 않았습니다."
-#: libsvn_ra_dav/props.c:758
-#: libsvn_ra_dav/props.c:813
+#: libsvn_ra_dav/props.c:758 libsvn_ra_dav/props.c:813
msgid "The VCC property was not found on the resource"
msgstr "VCC 속성이 리소스내에서 발견되지 않았습니다."
@@ -2820,20 +2788,22 @@
#: libsvn_ra_dav/props.c:947
msgid "'DAV:baseline-collection' was not present on the baseline resource"
-msgstr "'DAV:baseline-collection' 은 꺼내온(baseline) 리소스에 존재하지 않습니다."
+msgstr ""
+"'DAV:baseline-collection' 은 꺼내온(baseline) 리소스에 존재하지 않습니다."
#: libsvn_ra_dav/props.c:966
msgid "'DAV:version-name' was not present on the baseline resource"
msgstr "'DAV:version-name' 은 꺼내온(baseline) 리소스에 존재하지 않습니다."
-#: libsvn_ra_dav/props.c:1117
-#: libsvn_ra_serf/commit.c:718
+#: libsvn_ra_dav/props.c:1117 libsvn_ra_serf/commit.c:718
msgid "At least one property change failed; repository is unchanged"
-msgstr "적어도 하나의 속성이 변경에 실패하였습니다.: 저장소는 변경되지 않습니다."
+msgstr ""
+"적어도 하나의 속성이 변경에 실패하였습니다.: 저장소는 변경되지 않습니다."
#: libsvn_ra_dav/replay.c:272
msgid "Got apply-textdelta element without preceding add-file or open-file"
-msgstr "선행하는 add-file 혹은 open-file 없이 apply-textdelta 요소를 만났습니다"
+msgstr ""
+"선행하는 add-file 혹은 open-file 없이 apply-textdelta 요소를 만났습니다"
#: libsvn_ra_dav/replay.c:296
msgid "Got close-file element without preceding add-file or open-file"
@@ -2843,8 +2813,7 @@
msgid "Got close-directory element without ever opening a directory"
msgstr "디렉토리를 연 적이 없는데도 불구하고 close-directory 요소를 만났습니다"
-#: libsvn_ra_dav/replay.c:432
-#: libsvn_ra_serf/replay.c:498
+#: libsvn_ra_dav/replay.c:432 libsvn_ra_serf/replay.c:498
#, c-format
msgid "Error writing stream: unexpected EOF"
msgstr "쓰기 오류: 예상치 못한 EOF"
@@ -2863,8 +2832,10 @@
msgstr "잘못된 URL: 포트 번호가 음수입니다."
#: libsvn_ra_dav/session.c:461
-msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535"
-msgstr "잘못된 URL: 프록시 포트 번호가 TCP 포트번호의 최대값인 65536를 넘어섭니다."
+msgid ""
+"Invalid URL: proxy port number greater than maximum TCP port number 65535"
+msgstr ""
+"잘못된 URL: 프록시 포트 번호가 TCP 포트번호의 최대값인 65536를 넘어섭니다."
#: libsvn_ra_dav/session.c:475
msgid "Invalid config: illegal character in timeout value"
@@ -2899,20 +2870,20 @@
msgid "SSL is not supported"
msgstr "SSL은 지원되지 않습니다."
-#: libsvn_ra_dav/session.c:819
+#: libsvn_ra_dav/session.c:825
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "잘못된 설정: 인증서 파일 '%s' 를 읽을 수 없습니다."
-#: libsvn_ra_dav/session.c:928
+#: libsvn_ra_dav/session.c:934
msgid "The UUID property was not found on the resource or any of its parents"
msgstr "UUID 속성이 대상이나 대상의 어떤 상위에서도 발견되지 않았습니다"
-#: libsvn_ra_dav/session.c:936
+#: libsvn_ra_dav/session.c:942
msgid "Please upgrade the server to 0.19 or later"
msgstr "서버를 0.19 버전 이상으로 업그레이드 하세요."
-#: libsvn_ra_dav/session.c:1002
+#: libsvn_ra_dav/session.c:1009
#, c-format
msgid "Unsupported RA loader version (%d) for ra_dav"
msgstr "ra_dav의 지원하지 않는 RA 로더 버전 (%d)입니다."
@@ -2938,17 +2909,25 @@
#: libsvn_ra_dav/util.c:472
#, c-format
msgid "Repository moved permanently to '%s'; please relocate"
-msgstr "저장소가 영구히 '%s'로 옮겨졌습니다. svn switch --relocate를 사용하여 바꾸십시오"
+msgstr ""
+"저장소가 영구히 '%s'로 옮겨졌습니다. svn switch --relocate를 사용하여 바꾸십"
+"시오"
#: libsvn_ra_dav/util.c:474
#, c-format
msgid "Repository moved temporarily to '%s'; please relocate"
-msgstr "저장소가 잠시 '%s'로 옮겨졌습니다. svn switch --relocate를 사용하여 바꾸십시오"
+msgstr ""
+"저장소가 잠시 '%s'로 옮겨졌습니다. svn switch --relocate를 사용하여 바꾸십시"
+"오"
#: libsvn_ra_dav/util.c:482
#, c-format
-msgid "Server sent unexpected return value (%d %s) in response to %s request for '%s'"
-msgstr "서버가 예기치 않은 리턴 값 (%d %s) 을 %s 을/를 '%s'에 요청한 것에 대한 응답으로 보냈습니다"
+msgid ""
+"Server sent unexpected return value (%d %s) in response to %s request for '%"
+"s'"
+msgstr ""
+"서버가 예기치 않은 리턴 값 (%d %s) 을 %s 을/를 '%s'에 요청한 것에 대한 응답으"
+"로 보냈습니다"
#: libsvn_ra_dav/util.c:488
msgid "authorization failed"
@@ -2982,9 +2961,8 @@
msgid "%s request failed on '%s'"
msgstr "%s 요청이 '%s'에 대해 실패하였습니다."
-#: libsvn_ra_local/ra_plugin.c:103
-#: libsvn_ra_local/ra_plugin.c:588
-#: libsvn_wc/update_editor.c:2681
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -2997,15 +2975,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "로컬 디스크에 있는 저장소를 접근하기 위한 모듈"
-#: libsvn_ra_local/ra_plugin.c:285
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "URL에 대해 ra_local 세션을 열수 없습니다."
-#: libsvn_ra_local/ra_plugin.c:1392
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "ra_local에 대한 지원하지 않는 RA 로더 버전(%d)입니다."
@@ -3025,15 +3003,13 @@
msgid "Local URL '%s' contains unsupported hostname"
msgstr "로컬 URL '%s' 에 지원하지 않는 호스트이름이 있습니다."
-#: libsvn_ra_local/split_url.c:127
-#: libsvn_ra_local/split_url.c:134
+#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
#, c-format
msgid "Unable to open repository '%s'"
msgstr "저장소 '%s' 을/를 열 수 없습니다."
-#: libsvn_ra_serf/commit.c:367
-#: libsvn_ra_serf/commit.c:428
-#: libsvn_repos/commit.c:393
+#: libsvn_ra_serf/commit.c:367 libsvn_ra_serf/commit.c:428
+#: libsvn_repos/commit.c:375
#, c-format
msgid "Path '%s' not present"
msgstr "경로 '%s'는 존재하지 않습니다."
@@ -3043,7 +3019,7 @@
msgid "Failed writing updated file"
msgstr "수정된 파일을 쓰는데 실패하였습니다"
-#: libsvn_ra_serf/commit.c:1216
+#: libsvn_ra_serf/commit.c:1240
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr "디렉토리 추가 실패: %s 를 %s 에 (%d)"
@@ -3115,209 +3091,227 @@
msgid "Access repository via WebDAV protocol through serf."
msgstr "저장소를 serf를 통해 WebDAV 프로토콜로 접근합니다."
-#: libsvn_ra_serf/serf.c:155
+#: libsvn_ra_serf/serf.c:161
#, c-format
msgid "Could not lookup hostname: %s://%s"
msgstr "호스트명을 찾을 수 없습니다: %s://%s"
-#: libsvn_ra_serf/serf.c:732
+#: libsvn_ra_serf/serf.c:737
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "ra_serf에 대한 지원하지 않는 RA 로더 버전(%d)입니다."
-#: libsvn_ra_serf/update.c:2116
+#: libsvn_ra_serf/update.c:2155
#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "REPORT (%d) 검색 실패"
-#: libsvn_ra_serf/util.c:755
+#: libsvn_ra_serf/util.c:874
msgid "Unspecified error message"
msgstr "지정되지 않은 에러 메시지"
-#: libsvn_ra_serf/util.c:816
+#: libsvn_ra_serf/util.c:935
msgid "Premature EOF seen from server"
msgstr "서버로부터 EOF 를 너무 빨리 받았습니다."
-#: libsvn_ra_svn/client.c:115
+#: libsvn_ra_svn/client.c:124
#, c-format
msgid "Unknown hostname '%s'"
msgstr "알 수 없는 호스트: '%s'"
-#: libsvn_ra_svn/client.c:127
+#: libsvn_ra_svn/client.c:136
#, c-format
msgid "Can't create socket"
msgstr "소켓을 열 수 없습니다."
-#: libsvn_ra_svn/client.c:131
+#: libsvn_ra_svn/client.c:140
#, c-format
msgid "Can't connect to host '%s'"
msgstr "호스트 '%s'에 접속할 수 없습니다."
-#: libsvn_ra_svn/client.c:152
-msgid "Proplist element not a list"
-msgstr "Proplist 요소가 리스트 구조체가 아닙니다."
-
-#: libsvn_ra_svn/client.c:176
+#: libsvn_ra_svn/client.c:163
msgid "Prop diffs element not a list"
msgstr "Prop diff 요소가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:214
+#: libsvn_ra_svn/client.c:201
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "서버로부터 확인 불가능한 노드 종류 '%s'"
-#: libsvn_ra_svn/client.c:365
+#: libsvn_ra_svn/client.c:357
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "정의되지 않은 터널 스킴 '%s'"
-#: libsvn_ra_svn/client.c:382
+#: libsvn_ra_svn/client.c:374
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "터널 스킴 %s 는 %s라는 환경 변수의 정의를 필요로 합니다."
-#: libsvn_ra_svn/client.c:393
+#: libsvn_ra_svn/client.c:385
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "토큰 분리할 수 없는 명령 '%s'"
-#: libsvn_ra_svn/client.c:424
+#: libsvn_ra_svn/client.c:416
#, c-format
msgid "Error in child process: %s"
msgstr "자식 프로세스 오류: %s"
-#: libsvn_ra_svn/client.c:448
+#: libsvn_ra_svn/client.c:440
#, c-format
msgid "Can't create tunnel"
msgstr "터널 생성 불가능"
-#: libsvn_ra_svn/client.c:486
+#: libsvn_ra_svn/client.c:478
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "잘못된 svn 저장소 URL '%s'"
-#: libsvn_ra_svn/client.c:543
+#: libsvn_ra_svn/client.c:535
#, c-format
msgid "Server requires minimum version %d"
msgstr "서버는 적어도 버전 %d 을/를 요구합니다"
-#: libsvn_ra_svn/client.c:589
+#: libsvn_ra_svn/client.c:584
msgid "Impossibly long repository root from server"
msgstr "너무 긴 저장소 루트가 지정되었습니다."
-#: libsvn_ra_svn/client.c:600
+#: libsvn_ra_svn/client.c:595
msgid "Module for accessing a repository using the svn network protocol."
msgstr "svn 네트워크 프로토콜을 사용하여 저장소에 접근하는 모듈"
-#: libsvn_ra_svn/client.c:748
+#: libsvn_ra_svn/client.c:743
msgid "Server did not send repository root"
msgstr "서버가 저장소 루트를 전송하지 않았습니다."
-#: libsvn_ra_svn/client.c:889
+#: libsvn_ra_svn/client.c:816
+msgid ""
+"Server doesn't support setting arbitrary revision properties during commit"
+msgstr ""
+
+#: libsvn_ra_svn/client.c:900
msgid "Non-string as part of file contents"
msgstr "파일 내용이 부분적으로 문자열이 아닙니다."
-#: libsvn_ra_svn/client.c:988
+#: libsvn_ra_svn/client.c:999
msgid "Dirlist element not a list"
msgstr "Dirlist 요소가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:1145
+#: libsvn_ra_svn/client.c:1060
+#, fuzzy
+msgid "Merge info element is not a list"
+msgstr "Prop diff 요소가 리스트 구조체가 아닙니다."
+
+#: libsvn_ra_svn/client.c:1219
msgid "Log entry not a list"
msgstr "로그 엔트리가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:1158
+#: libsvn_ra_svn/client.c:1232
msgid "Changed-path entry not a list"
msgstr "바뀐 경로 엔트리가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:1234
+#: libsvn_ra_svn/client.c:1308
msgid "'stat' not implemented"
msgstr "'stat'는 구현되지 않았습니다"
-#: libsvn_ra_svn/client.c:1291
+#: libsvn_ra_svn/client.c:1365
msgid "'get-locations' not implemented"
msgstr "get-locations는 구현되지 않았습니다"
-#: libsvn_ra_svn/client.c:1303
+#: libsvn_ra_svn/client.c:1377
msgid "Location entry not a list"
msgstr "Location 엔트리가 리스트 구조체가 아닙니다"
-#: libsvn_ra_svn/client.c:1353
+#: libsvn_ra_svn/client.c:1427
msgid "'get-file-revs' not implemented"
msgstr "get-file-revs는 구현되지 않았습니다."
-#: libsvn_ra_svn/client.c:1366
+#: libsvn_ra_svn/client.c:1440
msgid "Revision entry not a list"
msgstr "리비전 엔트리가 리스트 구조체가 아닙니다."
-#: libsvn_ra_svn/client.c:1379
-#: libsvn_ra_svn/client.c:1404
+#: libsvn_ra_svn/client.c:1453 libsvn_ra_svn/client.c:1478
msgid "Text delta chunk not a string"
msgstr "문서의 차이 조각(text delta chunk)이 문자열이 아닙니다."
-#: libsvn_ra_svn/client.c:1416
+#: libsvn_ra_svn/client.c:1490
msgid "The get-file-revs command didn't return any revisions"
msgstr "get-file-revs 명령이 어떠한 리비전도 반환하지 않았습니다."
-#: libsvn_ra_svn/client.c:1464
+#: libsvn_ra_svn/client.c:1538
msgid "Server doesn't support the lock command"
msgstr "서버가 lock 명령을 지원하지 않습니다."
-#: libsvn_ra_svn/client.c:1528
+#: libsvn_ra_svn/client.c:1602
msgid "Server doesn't support the unlock command"
msgstr "서버가 unlock 명령을 지원하지 않습니다."
-#: libsvn_ra_svn/client.c:1625
+#: libsvn_ra_svn/client.c:1699
msgid "Lock response not a list"
msgstr "lock 명령의 응답이 리스트가 아닙니다"
-#: libsvn_ra_svn/client.c:1639
+#: libsvn_ra_svn/client.c:1713
msgid "Unknown status for lock command"
msgstr "lock 명령에 대한 알 수 없는 상태"
-#: libsvn_ra_svn/client.c:1661
+#: libsvn_ra_svn/client.c:1735
msgid "Didn't receive end marker for lock responses"
msgstr "lock 명령의 응답에 대한 종료 표시를 수신하지 않았습니다."
-#: libsvn_ra_svn/client.c:1748
+#: libsvn_ra_svn/client.c:1822
msgid "Unlock response not a list"
msgstr "unlock 명령의 응답이 리스트가 아닙니다"
-#: libsvn_ra_svn/client.c:1762
+#: libsvn_ra_svn/client.c:1836
msgid "Unknown status for unlock command"
msgstr "unlock 명령에 대한 알 수 없는 상태"
-#: libsvn_ra_svn/client.c:1783
+#: libsvn_ra_svn/client.c:1857
msgid "Didn't receive end marker for unlock responses"
msgstr "unlock 명령의 응답에 대한 종료 표시를 수신하지 않았습니다."
-#: libsvn_ra_svn/client.c:1807
-#: libsvn_ra_svn/client.c:1835
+#: libsvn_ra_svn/client.c:1881 libsvn_ra_svn/client.c:1909
msgid "Server doesn't support the get-lock command"
msgstr "서버가 get-lock 명령을 지원하지 않습니다."
-#: libsvn_ra_svn/client.c:1848
+#: libsvn_ra_svn/client.c:1922
msgid "Lock element not a list"
msgstr "리스트가 아닌 개체를 잠급니다"
-#: libsvn_ra_svn/client.c:1871
+#: libsvn_ra_svn/client.c:1945
msgid "Server doesn't support the replay command"
msgstr "서버가 replay 명령을 지원하지 않습니다."
-#: libsvn_ra_svn/client.c:1935
+#: libsvn_ra_svn/client.c:2010
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "ra_svn에 대한 지원하지 않는 RA 로더 버전(%d)입니다."
-#: libsvn_ra_svn/cram.c:194
-#: libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/sasl_auth.c:389
-#: libsvn_ra_svn/sasl_auth.c:444
-#: libsvn_ra_svn/simple_auth.c:61
+#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
+#: libsvn_ra_svn/cyrus_auth.c:437 libsvn_ra_svn/cyrus_auth.c:484
+#: libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "인증시도중 예상치 못한 서버 응답"
-#: libsvn_ra_svn/editor.c:387
-#: libsvn_ra_svn/editorp.c:456
+#: libsvn_ra_svn/cyrus_auth.c:171 svnserve/cyrus_auth.c:104
+#: svnserve/cyrus_auth.c:114
+#, c-format
+msgid "Could not initialize the SASL library"
+msgstr "SASL 라이브러리를 초기화 할 수 없습니다"
+
+#: libsvn_ra_svn/cyrus_auth.c:824 libsvn_ra_svn/internal_auth.c:57
+#: libsvn_ra_svn/internal_auth.c:110
+#, c-format
+msgid "Authentication error from server: %s"
+msgstr "서버 인증 오류 : %s"
+
+#: libsvn_ra_svn/cyrus_auth.c:828
+#, fuzzy
+msgid "Can't get username or password"
+msgstr "암호를 얻는데 실패하였습니다."
+
+#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
msgstr "편집 명령안에 잘못된 파일, 디렉토리 토큰이 있습니다."
@@ -3325,8 +3319,7 @@
msgid "Non-string as part of text delta"
msgstr "텍스트 조각의 일부가 문자열이 아닙니다."
-#: libsvn_ra_svn/editor.c:717
-#: libsvn_ra_svn/editorp.c:800
+#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
#, c-format
msgid "Command 'finish-replay' invalid outside of replays"
msgstr "'finish-replay' 명령은 replay 없이 수행할 수 없습니다"
@@ -3339,93 +3332,64 @@
msgid "Apply-textdelta already active"
msgstr "Apply-textdelta 는 이미 활성화 되어있습니다."
-#: libsvn_ra_svn/editorp.c:687
-#: libsvn_ra_svn/editorp.c:705
+#: libsvn_ra_svn/editorp.c:687 libsvn_ra_svn/editorp.c:705
msgid "Apply-textdelta not active"
msgstr "Apply-textdelta 는 활성화 상태가 아닙니다."
-#: libsvn_ra_svn/editorp.c:891
-#: libsvn_ra_svn/marshal.c:845
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:896
#, c-format
msgid "Unknown command '%s'"
msgstr "알 수 없는 명령 '%s'"
+#: libsvn_ra_svn/internal_auth.c:97 libsvn_subr/prompt.c:156
+#, c-format
+msgid "Can't get password"
+msgstr "암호를 얻는데 실패하였습니다."
+
#: libsvn_ra_svn/marshal.c:86
msgid "Capability entry is not a word"
msgstr "Capability 엔트리는 한 단어가 아닙니다."
-#: libsvn_ra_svn/marshal.c:253
-#: libsvn_ra_svn/streams.c:80
+#: libsvn_ra_svn/marshal.c:253 libsvn_ra_svn/streams.c:80
#: libsvn_ra_svn/streams.c:155
msgid "Connection closed unexpectedly"
msgstr "예상치 못하게 접속이 종료되었습니다."
-#: libsvn_ra_svn/marshal.c:509
+#: libsvn_ra_svn/marshal.c:536
msgid "String length larger than maximum"
msgstr "문자열 길이가 최대값을 넘었습니다."
-#: libsvn_ra_svn/marshal.c:546
+#: libsvn_ra_svn/marshal.c:573
msgid "Too many nested items"
msgstr "경로의 깊이가 너무 깊습니다."
-#: libsvn_ra_svn/marshal.c:565
+#: libsvn_ra_svn/marshal.c:592
msgid "Number is larger than maximum"
msgstr "숫자가 최대값을 넘었습니다."
-#: libsvn_ra_svn/marshal.c:768
+#: libsvn_ra_svn/marshal.c:796
+msgid "Proplist element not a list"
+msgstr "Proplist 요소가 리스트 구조체가 아닙니다."
+
+#: libsvn_ra_svn/marshal.c:819
msgid "Empty error list"
msgstr "비어 있는 오류 리스트"
-#: libsvn_ra_svn/marshal.c:777
+#: libsvn_ra_svn/marshal.c:828
msgid "Malformed error list"
msgstr "잘못된 형식의 오류 리스트"
-#: libsvn_ra_svn/marshal.c:816
+#: libsvn_ra_svn/marshal.c:867
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "명령의 응답안에 알 수 없는 상태 값 '%s'"
-#: libsvn_ra_svn/sasl_auth.c:179
-#: svnserve/sasl_auth.c:104
-#: svnserve/sasl_auth.c:114
-#, c-format
-msgid "Could not initialize the SASL library"
-msgstr "SASL 라이브러리를 초기화 할 수 없습니다"
-
-#: libsvn_ra_svn/sasl_auth.c:279
-msgid "Can't get user name"
-msgstr "사용자 이름을 얻을 수 없습니다."
-
-#: libsvn_ra_svn/sasl_auth.c:286
-#: libsvn_ra_svn/simple_auth.c:97
-#: libsvn_subr/prompt.c:156
-#, c-format
-msgid "Can't get password"
-msgstr "암호를 얻는데 실패하였습니다."
-
-#: libsvn_ra_svn/sasl_auth.c:293
-msgid "Unhandled SASL interaction"
-msgstr "처리할 수 없는 SASL 명령"
-
-#: libsvn_ra_svn/sasl_auth.c:761
-#: libsvn_ra_svn/simple_auth.c:58
-#: libsvn_ra_svn/simple_auth.c:110
-#, c-format
-msgid "Authentication error from server: %s"
-msgstr "서버 인증 오류 : %s"
-
-#: libsvn_ra_svn/simple_auth.c:117
-msgid "Cannot negotiate authentication mechanism"
-msgstr "인증 방법 협상 불가능"
-
-#: libsvn_ra_svn/streams.c:77
-#: libsvn_ra_svn/streams.c:152
+#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
msgstr "소켓으로부터 읽을 수 없습니다."
-#: libsvn_ra_svn/streams.c:91
-#: libsvn_ra_svn/streams.c:166
+#: libsvn_ra_svn/streams.c:91 libsvn_ra_svn/streams.c:166
#, c-format
msgid "Can't write to connection"
msgstr "소켓에 쓸 수 없습니다."
@@ -3435,24 +3399,22 @@
msgid "Can't get socket timeout"
msgstr "소켓 시간 제한 값을 구할 수 없습니다."
-#: libsvn_repos/commit.c:128
+#: libsvn_repos/commit.c:125
#, c-format
msgid "Out of date: '%s' in transaction '%s'"
msgstr "시간이 오래되었습니다.: '%s' (트랜잭션 '%s')"
-#: libsvn_repos/commit.c:292
-#: libsvn_repos/commit.c:453
+#: libsvn_repos/commit.c:274 libsvn_repos/commit.c:435
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "소스 경로는 얻었으나 리비전을 얻을 수 없습니다. '%s'"
-#: libsvn_repos/commit.c:324
-#: libsvn_repos/commit.c:484
+#: libsvn_repos/commit.c:306 libsvn_repos/commit.c:466
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "원본 URL '%s'은(는) 외부 저장소와 연결되어 있습니다."
-#: libsvn_repos/commit.c:609
+#: libsvn_repos/commit.c:591
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3474,8 +3436,12 @@
msgstr "대상 경로가 잘못되었습니다."
#: libsvn_repos/delta.c:257
-msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry"
-msgstr "잘못된 편집 오류; 적어도 하나의 경로가 디렉토리가 아니거나 소스가 존재하지않습니다."
+msgid ""
+"Invalid editor anchoring; at least one of the input paths is not a directory "
+"and there was no source entry"
+msgstr ""
+"잘못된 편집 오류; 적어도 하나의 경로가 디렉토리가 아니거나 소스가 존재하지않"
+"습니다."
#: libsvn_repos/dump.c:415
#, c-format
@@ -3485,7 +3451,8 @@
"WARNING: will fail.\n"
msgstr ""
"경고: 리비전 %ld 안에 있는 데이터를 참조하는 중입니다. 이것은 덤프된 버전\n"
-"경고: (%ld)보다 더 오래된 것입니다. 이 덤프를 비어 있는 저장소안에 적재하는 것은\n"
+"경고: (%ld)보다 더 오래된 것입니다. 이 덤프를 비어 있는 저장소안에 적재하는 "
+"것은\n"
"경고: 실패할 것입니다.\n"
#: libsvn_repos/dump.c:932
@@ -3508,27 +3475,30 @@
msgid "* Verified revision %ld.\n"
msgstr "* 검토된 리비전 %ld.\n"
-#: libsvn_repos/fs-wrap.c:57
-#: libsvn_repos/load.c:1209
+#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1209
msgid "Commit succeeded, but post-commit hook failed"
msgstr "커밋은 성공하였습니다만 post-commit 훅이 실패하였습니다."
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_repos/fs-wrap.c:183
#, c-format
-msgid "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client"
-msgstr "정상적인 속성 '%s'에 대한 저장공간이 저장소 인터페이스를 통해 접근할 수 없습니다.이는 클라이언트 버그일 수 있습니다."
+msgid ""
+"Storage of non-regular property '%s' is disallowed through the repository "
+"interface, and could indicate a bug in your client"
+msgstr ""
+"정상적인 속성 '%s'에 대한 저장공간이 저장소 인터페이스를 통해 접근할 수 없습"
+"니다.이는 클라이언트 버그일 수 있습니다."
-#: libsvn_repos/fs-wrap.c:303
+#: libsvn_repos/fs-wrap.c:329
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "쓰기 금지됨: 리비전 %ld에 대해서 전체를 읽을 수 있는 권한이 없습니다."
-#: libsvn_repos/fs-wrap.c:507
+#: libsvn_repos/fs-wrap.c:533
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr "'%s' 경로의 잠금을 풀수 없습니다. 인증된 사용자가 아닙니다."
-#: libsvn_repos/fs-wrap.c:521
+#: libsvn_repos/fs-wrap.c:547
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr "잠금 해제는 성공하였습니다만 post-commit 훅이 실패하였습니다."
@@ -3547,8 +3517,12 @@
#: libsvn_repos/hooks.c:116
#, c-format
-msgid "'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %d). "
-msgstr "'%s' 훅이 실패했습니다 (분명하게 빠져나가지 않았습니다: apr_exit_why_e 는 %d, 종료코드는 %d)."
+msgid ""
+"'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %"
+"d). "
+msgstr ""
+"'%s' 훅이 실패했습니다 (분명하게 빠져나가지 않았습니다: apr_exit_why_e 는 %"
+"d, 종료코드는 %d)."
#: libsvn_repos/hooks.c:123
#, c-format
@@ -3627,12 +3601,14 @@
#: libsvn_repos/load.c:173
#, c-format
msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
-msgstr "덤프 스트림이 잘못된 형태의 헤더를 포함하고 있습니다 (':' 없이) '%.20s'에서"
+msgstr ""
+"덤프 스트림이 잘못된 형태의 헤더를 포함하고 있습니다 (':' 없이) '%.20s'에서"
#: libsvn_repos/load.c:186
#, c-format
msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
-msgstr "덤프 스트림이 잘못된 형태의 헤더를 포함하고 있습니다 (값없이) '%.20s'에서"
+msgstr ""
+"덤프 스트림이 잘못된 형태의 헤더를 포함하고 있습니다 (값없이) '%.20s'에서"
#: libsvn_repos/load.c:273
msgid "Incomplete or unterminated property block"
@@ -3646,8 +3622,7 @@
msgid "Malformed dumpfile header"
msgstr "잘못된 덤프 파일 헤더"
-#: libsvn_repos/load.c:446
-#: libsvn_repos/load.c:488
+#: libsvn_repos/load.c:446 libsvn_repos/load.c:488
#, c-format
msgid "Unsupported dumpfile version: %d"
msgstr "지원되지 않는 덤프파일 버전: %d"
@@ -3672,7 +3647,9 @@
#: libsvn_repos/load.c:978
msgid "Malformed dumpstream: Revision 0 must not contain node records"
-msgstr "포맷오류가 있는 덤프 스트림: 0번 리비전이 노드 레코드를 포함하고 있지 않아야합니다"
+msgstr ""
+"포맷오류가 있는 덤프 스트림: 0번 리비전이 노드 레코드를 포함하고 있지 않아야"
+"합니다"
#: libsvn_repos/load.c:988
#, c-format
@@ -3703,7 +3680,7 @@
msgid " done.\n"
msgstr " 처리되었습니다.\n"
-#: libsvn_repos/load.c:1231
+#: libsvn_repos/load.c:1233
#, c-format
msgid ""
"\n"
@@ -3714,7 +3691,7 @@
"------- 커밋한 리비전 %ld >>>\n"
"\n"
-#: libsvn_repos/load.c:1237
+#: libsvn_repos/load.c:1239
#, c-format
msgid ""
"\n"
@@ -3735,31 +3712,41 @@
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "파일 시스템내의 '%s'는 파일이나 디렉토리가 아닙니다"
-#: libsvn_repos/reporter.c:602
+#: libsvn_repos/reporter.c:222
+#, fuzzy, c-format
+msgid "Invalid depth (%s) for path '%s'"
+msgstr "원본 경로 '%s' 에 대한 잘못된 복제입니다"
+
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "경로 '%s'은(는) 저장소에 없습니다."
-#: libsvn_repos/reporter.c:836
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "수정 명령의 루트를 열 수 있는 권한을 얻지 못하였습니다."
-#: libsvn_repos/reporter.c:855
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "목적지 경로가 존재하지 않습니다."
-#: libsvn_repos/reporter.c:862
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "디렉토리를 치환할 수 없습니다."
-#: libsvn_repos/reporter.c:905
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "최상위 작업사본 경로에 대한 잘못된 명령입니다."
-#: libsvn_repos/reporter.c:920
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "대상이 없는 두 개의 최상의 보고서"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "경로 '%s'에 지원될 수 없는 노드 종류입니다"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -3805,35 +3792,35 @@
msgid "Creating conf directory"
msgstr "conf 디렉토리 생성중"
-#: libsvn_repos/repos.c:1482
+#: libsvn_repos/repos.c:1484
msgid "Creating svnserve.conf file"
msgstr "svnserve.conf 파일 생성하는 중"
-#: libsvn_repos/repos.c:1507
+#: libsvn_repos/repos.c:1509
msgid "Creating passwd file"
msgstr "passwd 파일 생성하는 중"
-#: libsvn_repos/repos.c:1567
+#: libsvn_repos/repos.c:1579
msgid "Creating authz file"
msgstr "authz 파일 생성하는 중"
-#: libsvn_repos/repos.c:1600
+#: libsvn_repos/repos.c:1612
msgid "Could not create top-level directory"
msgstr "최상위 디렉토리를 생성할 수 없습니다."
-#: libsvn_repos/repos.c:1604
+#: libsvn_repos/repos.c:1616
msgid "Creating DAV sandbox dir"
msgstr "DAV 샌드박스 디렉토리 생성하는 중"
-#: libsvn_repos/repos.c:1685
+#: libsvn_repos/repos.c:1697
msgid "Error opening db lockfile"
msgstr "DB 잠금 파일 열기 실패"
-#: libsvn_repos/repos.c:1722
+#: libsvn_repos/repos.c:1734
msgid "Repository creation failed"
msgstr "저장소 생성 실패"
-#: libsvn_repos/repos.c:1803
+#: libsvn_repos/repos.c:1815
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "예상되는 파일시스템 포맷 '%d' 또는 '%d'; 발견된 포맷 '%d'"
@@ -3843,14 +3830,12 @@
msgid "Failed to find time on revision %ld"
msgstr "리비젼 %ld 에서 time을 발견 할 수 없습니다"
-#: libsvn_repos/rev_hunt.c:219
-#: libsvn_repos/rev_hunt.c:321
+#: libsvn_repos/rev_hunt.c:219 libsvn_repos/rev_hunt.c:321
#, c-format
msgid "Invalid start revision %ld"
msgstr "잘못된 시작 리비전 %ld"
-#: libsvn_repos/rev_hunt.c:223
-#: libsvn_repos/rev_hunt.c:325
+#: libsvn_repos/rev_hunt.c:223 libsvn_repos/rev_hunt.c:325
#, c-format
msgid "Invalid end revision %ld"
msgstr "잘못된 끝 리비전 %ld"
@@ -3859,7 +3844,7 @@
msgid "Unreadable path encountered; access denied"
msgstr "읽을 수 없는 경로 발생; 접근 거부되었습니다."
-#: libsvn_subr/cmdline.c:489
+#: libsvn_subr/cmdline.c:493
#, c-format
msgid "Error initializing command line arguments"
msgstr "명령행 인자 초기화 실패"
@@ -3901,8 +3886,7 @@
msgid "Can't manipulate current date"
msgstr "현재 날짜를 조작할 수 없습니다."
-#: libsvn_subr/date.c:278
-#: libsvn_subr/date.c:286
+#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
#, c-format
msgid "Can't calculate requested date"
msgstr "요청 시간을 계산할 수 없습니다."
@@ -3917,9 +3901,7 @@
msgid "Can't grab DSO mutex"
msgstr "DSO 뮤텍스를 얻을 수 없습니다."
-#: libsvn_subr/dso.c:85
-#: libsvn_subr/dso.c:107
-#: libsvn_subr/dso.c:122
+#: libsvn_subr/dso.c:85 libsvn_subr/dso.c:107 libsvn_subr/dso.c:122
#, c-format
msgid "Can't ungrab DSO mutex"
msgstr "DSO 뮤텍스를 해제할 수 없습니다."
@@ -3939,245 +3921,243 @@
msgstr "경로를 확인할 수 없습니다. '%s'"
#: libsvn_subr/io.c:377
-#: libsvn_subr/io.c:508
#, c-format
msgid "Can't open '%s'"
msgstr "열 수 없습니다. '%s'"
-#: libsvn_subr/io.c:399
-#: libsvn_subr/io.c:521
+#: libsvn_subr/io.c:399 libsvn_subr/io.c:522
#, c-format
msgid "Unable to make name for '%s'"
msgstr "이름을 만들 수 없습니다. '%s'"
-#: libsvn_subr/io.c:525
-#: libsvn_subr/io.c:579
-#: libsvn_subr/io.c:607
+#: libsvn_subr/io.c:509
+#, fuzzy, c-format
+msgid "Can't create symbolic link '%s'"
+msgstr "디렉토리 '%s'을/를 생성할 수 없습니다."
+
+#: libsvn_subr/io.c:526 libsvn_subr/io.c:580 libsvn_subr/io.c:608
msgid "Symbolic links are not supported on this platform"
msgstr "이 플랫폼에서는 심볼릭 링크가 지원되지 않습니다."
-#: libsvn_subr/io.c:558
+#: libsvn_subr/io.c:559
#, c-format
msgid "Can't read contents of link"
msgstr "링크의 내용을 읽을 수 없습니다."
-#: libsvn_subr/io.c:620
+#: libsvn_subr/io.c:621
#, c-format
msgid "Can't find a temporary directory"
msgstr "임시 디렉토리를 찾을 수 없습니다."
-#: libsvn_subr/io.c:714
+#: libsvn_subr/io.c:715
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "'%s'을/를 '%s' 로 복사할 수 없습니다."
-#: libsvn_subr/io.c:766
+#: libsvn_subr/io.c:767
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "'%s'에 권한을 설정할 수 없습니다."
-#: libsvn_subr/io.c:788
+#: libsvn_subr/io.c:789
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "'%s'을/를 '%s'에 추가할 수 없습니다."
-#: libsvn_subr/io.c:822
+#: libsvn_subr/io.c:823
#, c-format
msgid "Source '%s' is not a directory"
msgstr "원본 '%s'은 디렉토리가 아닙니다"
-#: libsvn_subr/io.c:828
+#: libsvn_subr/io.c:829
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "대상 '%s'은 디렉토리가 아닙니다"
-#: libsvn_subr/io.c:834
+#: libsvn_subr/io.c:835
#, c-format
msgid "Destination '%s' already exists"
msgstr "대상 '%s' 는 이미 존재합니다."
-#: libsvn_subr/io.c:903
-#: libsvn_subr/io.c:1814
-#: libsvn_subr/io.c:1865
-#: libsvn_subr/io.c:1928
+#: libsvn_subr/io.c:904 libsvn_subr/io.c:1830 libsvn_subr/io.c:1881
+#: libsvn_subr/io.c:1944
#, c-format
msgid "Can't read directory '%s'"
msgstr "디렉토리를 읽을 수 없습니다 '%s'"
-#: libsvn_subr/io.c:908
-#: libsvn_subr/io.c:1819
-#: libsvn_subr/io.c:1870
-#: libsvn_subr/io.c:1933
-#: libsvn_subr/io.c:3077
+#: libsvn_subr/io.c:909 libsvn_subr/io.c:1835 libsvn_subr/io.c:1886
+#: libsvn_subr/io.c:1949 libsvn_subr/io.c:3114
#, c-format
msgid "Error closing directory '%s'"
msgstr "디렉토리를 닫을 수 없습니다. '%s'"
-#: libsvn_subr/io.c:934
+#: libsvn_subr/io.c:935
#, c-format
msgid "Can't make directory '%s'"
msgstr "디렉토리 '%s'을/를 생성할 수 없습니다."
-#: libsvn_subr/io.c:1021
+#: libsvn_subr/io.c:1022
#, c-format
msgid "Can't set access time of '%s'"
msgstr "'%s' 에 접근 시각 설정을 할 수 없습니다."
-#: libsvn_subr/io.c:1161
+#: libsvn_subr/io.c:1162
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr "파일 권한을 얻을 수 없습니다. '%s' (파일 상태얻기(stat) 오류)"
-#: libsvn_subr/io.c:1172
+#: libsvn_subr/io.c:1173
#, c-format
msgid "Can't open file at '%s'"
msgstr "파일 '%s' 을/를 열 수 없습니다."
-#: libsvn_subr/io.c:1176
+#: libsvn_subr/io.c:1177
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr "파일 권한을 얻을 수 없습니다. '%s' (파일 상태얻기(stat) 오류)"
-#: libsvn_subr/io.c:1215
-#: libsvn_subr/io.c:1310
+#: libsvn_subr/io.c:1216 libsvn_subr/io.c:1311
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "파일 '%s'에 대해 권한을 변경할 수 없습니다"
-#: libsvn_subr/io.c:1350
+#: libsvn_subr/io.c:1351
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "파일 '%s'에 읽기 전용 속성을 설정할 수 없습니다."
-#: libsvn_subr/io.c:1382
+#: libsvn_subr/io.c:1383
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "파일 '%s'에 읽기/쓰기 속성을 설정할 수 없습니다."
-#: libsvn_subr/io.c:1426
+#: libsvn_subr/io.c:1427
#, c-format
msgid "Error getting UID of process"
msgstr "프로세스의 UID를 얻을 수 없습니다."
-#: libsvn_subr/io.c:1507
+#: libsvn_subr/io.c:1508
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "파일 '%s' 에 대한 공유 잠금기능을 걸 수 없습니다."
-#: libsvn_subr/io.c:1542
+#: libsvn_subr/io.c:1543
#, c-format
msgid "Can't flush file '%s'"
msgstr "파일을 플러시할 수 없습니다. '%s'"
-#: libsvn_subr/io.c:1543
+#: libsvn_subr/io.c:1544
#, c-format
msgid "Can't flush stream"
msgstr "스트림을 플러시 할 수 없습니다."
-#: libsvn_subr/io.c:1555
-#: libsvn_subr/io.c:1572
+#: libsvn_subr/io.c:1556 libsvn_subr/io.c:1573
#, c-format
msgid "Can't flush file to disk"
msgstr "디스크에 파일을 플러시할 수 없습니다."
-#: libsvn_subr/io.c:1593
-msgid "Reading from stdin is currently broken, so disabled"
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#, c-format
+msgid "Can't open stdin"
+msgstr "표준입력을 열 수 없습니다."
+
+#: libsvn_subr/io.c:1616
+#, fuzzy
+msgid "Reading from stdin is disallowed"
msgstr "표준 입력으로부터 읽는 것은 현재 지원하지 않습니다."
-#: libsvn_subr/io.c:1614
+#: libsvn_subr/io.c:1630
#, c-format
msgid "Can't get file name"
msgstr "파일 이름을 얻을 수 없습니다."
-#: libsvn_subr/io.c:1682
+#: libsvn_subr/io.c:1698
#, c-format
msgid "Can't remove file '%s'"
msgstr "파일을 제거할 수 없습니다. '%s'"
-#: libsvn_subr/io.c:1749
-#: libsvn_subr/io.c:2928
-#: libsvn_subr/io.c:3014
+#: libsvn_subr/io.c:1765 libsvn_subr/io.c:2965 libsvn_subr/io.c:3051
#, c-format
msgid "Can't open directory '%s'"
msgstr "디렉토리를 열 수 없습니다. '%s'"
-#: libsvn_subr/io.c:1795
-#: libsvn_subr/io.c:1825
+#: libsvn_subr/io.c:1811 libsvn_subr/io.c:1841
#, c-format
msgid "Can't remove '%s'"
msgstr "제거할 수 없습니다. '%s'"
-#: libsvn_subr/io.c:1805
+#: libsvn_subr/io.c:1821
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "디렉토리를 되감을 수 없습니다. '%s'"
-#: libsvn_subr/io.c:1997
+#: libsvn_subr/io.c:2013
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "프로세스 속성을 생성할 수 없습니다. %s'"
-#: libsvn_subr/io.c:2003
+#: libsvn_subr/io.c:2019
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "'%s' cmdtype을 처리할 수 없습니다."
-#: libsvn_subr/io.c:2015
+#: libsvn_subr/io.c:2031
#, c-format
msgid "Can't set process '%s' directory"
msgstr "프로세스에 디렉토리를 설정할 수 없습니다. '%s'"
-#: libsvn_subr/io.c:2028
+#: libsvn_subr/io.c:2044
#, c-format
msgid "Can't set process '%s' child input"
msgstr "자식 프로세스의 입력파일 경로를 설정할 수 없습니다. '%s'"
-#: libsvn_subr/io.c:2035
+#: libsvn_subr/io.c:2051
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "자식 프로세스의 출력파일 경로를 설정할 수 없습니다. '%s'"
-#: libsvn_subr/io.c:2042
+#: libsvn_subr/io.c:2058
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "자식 프로세스의 오류파일 경로를 설정할 수 없습니다. '%s'"
-#: libsvn_subr/io.c:2049
+#: libsvn_subr/io.c:2065
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
-msgstr "오류 처리기를 위한 자식 프로세스의 오류파일 경로를 설정할 수 없습니다. '%s'"
+msgstr ""
+"오류 처리기를 위한 자식 프로세스의 오류파일 경로를 설정할 수 없습니다. '%s'"
-#: libsvn_subr/io.c:2055
+#: libsvn_subr/io.c:2071
#, c-format
msgid "Can't set process '%s' error handler"
msgstr " 프로세스 '%s'의 에러 핸들러를 등록할 수 없습니다"
-#: libsvn_subr/io.c:2078
+#: libsvn_subr/io.c:2094
#, c-format
msgid "Can't start process '%s'"
msgstr "프로세스 '%s'을/를 시작할 수 없습니다."
-#: libsvn_subr/io.c:2102
+#: libsvn_subr/io.c:2118
#, c-format
msgid "Error waiting for process '%s'"
msgstr "프로세스 '%s'을/를 기다리던 중 에러 발생"
-#: libsvn_subr/io.c:2110
+#: libsvn_subr/io.c:2126
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "프로세스 '%s' 실패함 (종료이유 %d)"
-#: libsvn_subr/io.c:2117
+#: libsvn_subr/io.c:2133
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "프로세스 '%s' 오류 종료 코드 %d 반환함."
-#: libsvn_subr/io.c:2228
+#: libsvn_subr/io.c:2244
#, c-format
msgid "'%s' returned %d"
msgstr "'%s' 가 %d 을/를 반환합니다."
-#: libsvn_subr/io.c:2351
+#: libsvn_subr/io.c:2367
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4192,137 +4172,158 @@
"%s\n"
"%s"
-#: libsvn_subr/io.c:2478
+#: libsvn_subr/io.c:2494
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "non-file '%s'의 MIME 타입을 탐지할 수 없습니다."
-#: libsvn_subr/io.c:2568
+#: libsvn_subr/io.c:2584
#, c-format
msgid "Can't open file '%s'"
msgstr "file '%s' 를 열 수 없습니다."
-#: libsvn_subr/io.c:2604
+#: libsvn_subr/io.c:2620
#, c-format
msgid "Can't close file '%s'"
msgstr "파일 '%s'를 닫을 수 없습니다."
-#: libsvn_subr/io.c:2605
+#: libsvn_subr/io.c:2621
#, c-format
msgid "Can't close stream"
msgstr "스트림을 닫을 수 없습니다."
-#: libsvn_subr/io.c:2615
-#: libsvn_subr/io.c:2639
-#: libsvn_subr/io.c:2652
+#: libsvn_subr/io.c:2631 libsvn_subr/io.c:2655 libsvn_subr/io.c:2668
#, c-format
msgid "Can't read file '%s'"
msgstr "파일 '%s'를 읽을 수 없습니다."
-#: libsvn_subr/io.c:2616
-#: libsvn_subr/io.c:2640
-#: libsvn_subr/io.c:2653
+#: libsvn_subr/io.c:2632 libsvn_subr/io.c:2656 libsvn_subr/io.c:2669
#, c-format
msgid "Can't read stream"
msgstr "스트림을 읽을 수 없습니다."
-#: libsvn_subr/io.c:2627
+#: libsvn_subr/io.c:2643
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "파일 '%s' 로부터 속성 정보를 얻을 수 없습니다."
-#: libsvn_subr/io.c:2628
+#: libsvn_subr/io.c:2644
#, c-format
msgid "Can't get attribute information from stream"
msgstr "스트림으로부터 속성 정보를 얻을 수 없습니다."
-#: libsvn_subr/io.c:2664
+#: libsvn_subr/io.c:2680
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "파일 '%s'에 위치 포이터를 설정 할 수 없습니다."
-#: libsvn_subr/io.c:2665
+#: libsvn_subr/io.c:2681
#, c-format
msgid "Can't set position pointer in stream"
msgstr "스트림에 위치 포인터를 설정 할 수 없습니다."
-#: libsvn_subr/io.c:2676
-#: libsvn_subr/io.c:2689
+#: libsvn_subr/io.c:2692 libsvn_subr/io.c:2726
#, c-format
msgid "Can't write to file '%s'"
msgstr "파일 '%s'에 쓸 수 없습니다."
-#: libsvn_subr/io.c:2677
-#: libsvn_subr/io.c:2690
+#: libsvn_subr/io.c:2693 libsvn_subr/io.c:2727
#, c-format
msgid "Can't write to stream"
msgstr "스트림에 쓸 수 없습니다."
-#: libsvn_subr/io.c:2730
+#: libsvn_subr/io.c:2767
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "파일 '%s'의 길이 행을 읽을 수 없습니다."
-#: libsvn_subr/io.c:2734
+#: libsvn_subr/io.c:2771
msgid "Can't read length line in stream"
msgstr "스트림에서 길이 행을 읽을 수 없습니다."
-#: libsvn_subr/io.c:2781
+#: libsvn_subr/io.c:2818
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "'%s'을/를 '%s' 로 이동 할 수 없습니다."
-#: libsvn_subr/io.c:2859
+#: libsvn_subr/io.c:2896
#, c-format
msgid "Can't create directory '%s'"
msgstr "디렉토리 '%s'을/를 생성할 수 없습니다."
-#: libsvn_subr/io.c:2870
-#: libsvn_wc/copy.c:519
+#: libsvn_subr/io.c:2907 libsvn_wc/copy.c:509
#, c-format
msgid "Can't hide directory '%s'"
msgstr "디렉토리 '%s'을/를 숨길 수 없습니다."
-#: libsvn_subr/io.c:2882
+#: libsvn_subr/io.c:2919
#, c-format
msgid "Can't stat directory '%s'"
msgstr "디렉토리 '%s'의 상태를 알 수 없습니다."
-#: libsvn_subr/io.c:2946
+#: libsvn_subr/io.c:2983
#, c-format
msgid "Can't remove directory '%s'"
msgstr "디렉토리 '%s'을/를 제거할 수 없습니다."
-#: libsvn_subr/io.c:2964
+#: libsvn_subr/io.c:3001
#, c-format
msgid "Can't read directory"
msgstr "디렉토리를 읽을 수 없습니다."
-#: libsvn_subr/io.c:3033
+#: libsvn_subr/io.c:3070
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "'%s'에서 디렉토리 엔트리를 읽을 수 없습니다."
-#: libsvn_subr/io.c:3158
+#: libsvn_subr/io.c:3195
#, c-format
msgid "Can't check directory '%s'"
msgstr "디렉토리 '%s'를 체크할 수 없습니다."
-#: libsvn_subr/io.c:3180
+#: libsvn_subr/io.c:3217
#, c-format
msgid "Version %d is not non-negative"
msgstr "버젼 %d은/는 non-negative가 아닙니다."
-#: libsvn_subr/io.c:3230
+#: libsvn_subr/io.c:3267
#, c-format
msgid "Reading '%s'"
msgstr "'%s'을/를 읽습니다"
-#: libsvn_subr/io.c:3246
+#: libsvn_subr/io.c:3283
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "'%s'의 첫번째 줄은 숫자가 아닌 것을 포함하고 있습니다."
+#: libsvn_subr/mergeinfo.c:67
+msgid "Invalid revision number"
+msgstr "잘못된 리비전 번호가 지정되었습니다."
+
+#: libsvn_subr/mergeinfo.c:125
+#, fuzzy
+msgid "No revision list found "
+msgstr "없는 리비전 %ld 입니다."
+
+#: libsvn_subr/mergeinfo.c:135 libsvn_subr/mergeinfo.c:163
+#, fuzzy
+msgid "Invalid character found in revision list"
+msgstr "잘못된 끝 리비전 %ld"
+
+#: libsvn_subr/mergeinfo.c:169
+#, fuzzy
+msgid "Revision list parsing ended before hitting newline"
+msgstr "리비전 파일 내에 마지막 개행문자가 없습니다."
+
+#: libsvn_subr/mergeinfo.c:187
+msgid "Pathname not terminated by ':'"
+msgstr ""
+
+#: libsvn_subr/mergeinfo.c:195
+#, fuzzy
+msgid "Could not find end of line in revision line"
+msgstr "리비젼 %ld 에서 time을 발견 할 수 없습니다"
+
#: libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
@@ -4337,8 +4338,7 @@
msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
msgstr "모듈 경로를 UCS-2에서 UTF-8로 변환할 수 없습니다: '%s'"
-#: libsvn_subr/opt.c:217
-#: libsvn_subr/opt.c:295
+#: libsvn_subr/opt.c:217 libsvn_subr/opt.c:295
msgid ""
"\n"
"Valid options:\n"
@@ -4350,8 +4350,7 @@
msgid " ARG"
msgstr " ARG"
-#: libsvn_subr/opt.c:447
-#: libsvn_subr/opt.c:470
+#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
#, c-format
msgid ""
"\"%s\": unknown command.\n"
@@ -4360,27 +4359,27 @@
"\"%s\": 알 수 없는 명령입니다.\n"
"\n"
-#: libsvn_subr/opt.c:760
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "구문 오류 분석 리비젼 '%s'"
-#: libsvn_subr/opt.c:837
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL '%s'는 URI 인코딩에 적당하지 않습니다."
-#: libsvn_subr/opt.c:843
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL '%s'는 '..' 요소를 포함합니다."
-#: libsvn_subr/opt.c:872
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "'%s' 사항을 해결 중 에러 발생하였습니다."
-#: libsvn_subr/opt.c:974
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4391,52 +4390,46 @@
" %s, %s에 컴파일 됨\n"
"\n"
-#: libsvn_subr/opt.c:977
+#: libsvn_subr/opt.c:998
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
-"This product includes software developed by CollabNet (http://www.Collab.Net/).\n"
+"This product includes software developed by CollabNet (http://www.Collab."
+"Net/).\n"
"\n"
msgstr ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion은 오픈 소스 소프트웨어 입니다, http://subversion.tigris.org/\n"
-"이 제품은 CollabNet이 개발한 소프트웨어를 포함하고 있습니다.(http://www.Collab.Net/).\n"
+"이 제품은 CollabNet이 개발한 소프트웨어를 포함하고 있습니다.(http://www."
+"Collab.Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1028
-#: libsvn_subr/opt.c:1069
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "사용법은 '%s help'를 통해 볼 수 있습니다.\n"
-#: libsvn_subr/path.c:1182
+#: libsvn_subr/path.c:1107
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "절대 경로를 결정할 수 없습니다. '%s'"
-#: libsvn_subr/path.c:1220
+#: libsvn_subr/path.c:1145
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "'%s'는 파일이나 디렉토리가 아닙니다"
-#: libsvn_subr/path.c:1335
+#: libsvn_subr/path.c:1251
#, c-format
msgid "Can't determine the native path encoding"
msgstr "경로에 대한 기본 인코딩을 결정할 수 없습니다."
-#: libsvn_subr/path.c:1389
+#: libsvn_subr/path.c:1305
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "잘못된 제어 문자 '0x%02x'가 경로 '%s'에 있습니다."
-#: libsvn_subr/prompt.c:97
-#: svnserve/main.c:514
-#, c-format
-msgid "Can't open stdin"
-msgstr "표준입력을 열 수 없습니다."
-
-#: libsvn_subr/prompt.c:115
-#: libsvn_subr/prompt.c:119
+#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
msgstr "표준입력에서 읽을 수 없습니다."
@@ -4446,8 +4439,7 @@
msgid "Authentication realm: %s\n"
msgstr "인증 영역(realm): %s\n"
-#: libsvn_subr/prompt.c:204
-#: libsvn_subr/prompt.c:227
+#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
msgid "Username: "
msgstr "사용자명:"
@@ -4517,13 +4509,7 @@
msgid "Passphrase for '%s': "
msgstr "패스프레이즈 '%s':"
-#: libsvn_subr/subst.c:1600
-#, c-format
-msgid "'%s' has unsupported special file type '%s'"
-msgstr "'%s'은 특수 파일 타입 '%s'를 지원하지 않습니다."
-
-#: libsvn_subr/subst.c:1738
-#: libsvn_wc/props.c:1511
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "파일 '%s' 은 일치하지 않는 개행문자를 포함하고 있습니다"
@@ -4532,8 +4518,7 @@
msgid "Can't lock charset translation mutex"
msgstr "문자변환용 뮤텍스를 잠글 수 없습니다."
-#: libsvn_subr/utf.c:212
-#: libsvn_subr/utf.c:319
+#: libsvn_subr/utf.c:212 libsvn_subr/utf.c:319
msgid "Can't unlock charset translation mutex"
msgstr "문자변환용 뮤텍스를 해제할 수 없습니다."
@@ -4557,40 +4542,44 @@
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "'%i'을/를 '%i'(으)로 변환할 수 있는 컨버터를 만들 수 없습니다."
-#: libsvn_subr/utf.c:515
+#: libsvn_subr/utf.c:522
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "기본 인코딩에서 '%s'(으)로 문자열을 변환할 수 없습니다:"
-#: libsvn_subr/utf.c:519
+#: libsvn_subr/utf.c:526
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "'%s'에서 기본 인코딩으로 문자열을 변환할 수 없습니다:"
-#: libsvn_subr/utf.c:523
+#: libsvn_subr/utf.c:530
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "'%s'에서 '%s'(으)로 문자열을 변환할 수 없습니다:"
-#: libsvn_subr/utf.c:529
+#: libsvn_subr/utf.c:536
#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "CCSID '%i'에서 CCSID '%i'(으)로 문자열을 변환할 수 없습니다"
-#: libsvn_subr/utf.c:574
+#: libsvn_subr/utf.c:581
#, c-format
-msgid "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from UTF-8"
+msgid ""
+"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
+"UTF-8"
msgstr ""
"안전한 데이터:\n"
"\"%s\"\n"
"아스키 아닌 값(%d)이 따라 왔습니다: UTF-8과 상호 변환이 불가능합니다."
-#: libsvn_subr/utf.c:582
+#: libsvn_subr/utf.c:589
#, c-format
-msgid "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
-msgstr "ASCII가 아닌 (코드 %d) 문자가 발견되었으며, UTF-8과 상호 변환이 불가능합니다."
+msgid ""
+"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
+msgstr ""
+"ASCII가 아닌 (코드 %d) 문자가 발견되었으며, UTF-8과 상호 변환이 불가능합니다."
-#: libsvn_subr/utf.c:624
+#: libsvn_subr/utf.c:631
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -4621,18 +4610,19 @@
#: libsvn_subr/version.c:74
#, c-format
msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "'%s'의 버젼이 일치하지 않습니다: 발견된 버젼 %d.%d.%d%s, 기대 버젼 %d.%d.%d%s"
+msgstr ""
+"'%s'의 버젼이 일치하지 않습니다: 발견된 버젼 %d.%d.%d%s, 기대 버젼 %d.%d.%d%s"
#: libsvn_subr/xml.c:400
#, c-format
msgid "Malformed XML: %s at line %d"
msgstr "잘못된 XML: %s (줄 번호 %d)"
-#: libsvn_wc/adm_crawler.c:605
+#: libsvn_wc/adm_crawler.c:635
msgid "Error aborting report"
msgstr "보고 중지 실패"
-#: libsvn_wc/adm_crawler.c:919
+#: libsvn_wc/adm_crawler.c:1059
#, c-format
msgid "While preparing '%s' for commit"
msgstr "커밋을 위해 '%s'를 준비 중"
@@ -4651,324 +4641,345 @@
msgstr "adm 파일에는 APR_APPEND 가 지원되지 않습니다"
#: libsvn_wc/adm_files.c:597
-msgid "Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try again"
-msgstr "당신의 .svn/tmp 디릭토리가 누락되거나 손상되었습니다; 'svn cleanup' 명령을 실행한 뒤, 다시 시도하십시오"
+msgid ""
+"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
+"again"
+msgstr ""
+"당신의 .svn/tmp 디릭토리가 누락되거나 손상되었습니다; 'svn cleanup' 명령을 실"
+"행한 뒤, 다시 시도하십시오"
-#: libsvn_wc/adm_files.c:767
-#: libsvn_wc/lock.c:592
-#: libsvn_wc/lock.c:857
+#: libsvn_wc/adm_files.c:767 libsvn_wc/lock.c:592 libsvn_wc/lock.c:857
#, c-format
msgid "'%s' is not a working copy"
msgstr "'%s' 은 작업 사본이 아닙니다"
-#: libsvn_wc/adm_files.c:774
-#: libsvn_wc/adm_files.c:842
+#: libsvn_wc/adm_files.c:774 libsvn_wc/adm_files.c:842
#: libsvn_wc/adm_files.c:904
msgid "No such thing as 'base' working copy properties!"
msgstr "'base' 작업 사본 속성으로 그런 것은 없습니다.!"
-#: libsvn_wc/adm_files.c:973
-#: libsvn_wc/util.c:51
+#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:52
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s'은 디렉토리가 아닙니다"
-#: libsvn_wc/adm_files.c:1035
-#, c-format
-msgid "No entry for '%s'"
-msgstr "'%s'에 대한 항목이 없습니다"
-
-#: libsvn_wc/adm_files.c:1048
+#: libsvn_wc/adm_files.c:1044
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "리비젼 %ld은 존재하는 리비젼 %ld 과 '%s'에서 일치하지 않습니다"
-#: libsvn_wc/adm_files.c:1056
+#: libsvn_wc/adm_files.c:1052
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "URL '%s'은 '%s'에 존재하는 URL '%s'과 일치하지 않습니다"
-#: libsvn_wc/adm_ops.c:272
+#: libsvn_wc/adm_ops.c:278
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "인실할 수 없는 노드 종류: '%s'"
-#: libsvn_wc/adm_ops.c:1401
+#: libsvn_wc/adm_ops.c:1403
#, c-format
msgid "'%s' not found"
msgstr "'%s' 이 발견되지 않았습니다"
-#: libsvn_wc/adm_ops.c:1405
+#: libsvn_wc/adm_ops.c:1407
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "경로 '%s'에 지원될 수 없는 노드 종류입니다"
-#: libsvn_wc/adm_ops.c:1435
+#: libsvn_wc/adm_ops.c:1437
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s'는 이미 버젼 관리 대상입니다"
-#: libsvn_wc/adm_ops.c:1447
+#: libsvn_wc/adm_ops.c:1449
#, c-format
-msgid "Can't replace '%s' with a node of a differing type; the deletion must be committed and the parent updated before adding '%s'"
-msgstr "'%s'를 다른 타입의 노드와 교체할 수 없습니다; 삭제하여 커밋하고, 상위 디렉토리를업데이트 한 뒤, '%s'를 추가하십시오 "
+msgid ""
+"Can't replace '%s' with a node of a differing type; the deletion must be "
+"committed and the parent updated before adding '%s'"
+msgstr ""
+"'%s'를 다른 타입의 노드와 교체할 수 없습니다; 삭제하여 커밋하고, 상위 디렉토"
+"리를업데이트 한 뒤, '%s'를 추가하십시오 "
-#: libsvn_wc/adm_ops.c:1464
+#: libsvn_wc/adm_ops.c:1466
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr "'%s'를 추가하던 중, 상위 디렉토리의 엔트리를 발견할 수 없습니다."
-#: libsvn_wc/adm_ops.c:1469
+#: libsvn_wc/adm_ops.c:1471
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr "삭제가 예정된 상위 디렉토리에 '%s'를 추가할 수 없습니다"
-#: libsvn_wc/adm_ops.c:1485
+#: libsvn_wc/adm_ops.c:1487
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr "URL '%s'은(는) 상위 디렉토리와 다른 저장소입니다."
-#: libsvn_wc/adm_ops.c:1818
+#: libsvn_wc/adm_ops.c:1820
#, c-format
msgid "Error restoring text for '%s'"
msgstr "'%s'에 대한 텍스트 복구 오류"
-#: libsvn_wc/adm_ops.c:1949
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "복원할 수 없습니다: '%s'는 버전 관리 대상이 아닙니다."
-
-#: libsvn_wc/adm_ops.c:1977
+#: libsvn_wc/adm_ops.c:1990
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr "'%s'를 복원할 수 없습니다: 지원하지 않는 엔트리 노드 종류입니다"
-#: libsvn_wc/adm_ops.c:1988
+#: libsvn_wc/adm_ops.c:2001
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr "'%s'를 복원할 수 없습니다: 작업 사본에서 지원하지 않는 노드 종류입니다"
-#: libsvn_wc/adm_ops.c:2035
-msgid "Cannot revert addition of current directory; please try again from the parent directory"
-msgstr "현재 디렉토리의 추가를 복원할 수 없습니다: 상위 디렉토리에서 다시 시도하십시오."
+#: libsvn_wc/adm_ops.c:2048
+msgid ""
+"Cannot revert addition of current directory; please try again from the "
+"parent directory"
+msgstr ""
+"현재 디렉토리의 추가를 복원할 수 없습니다: 상위 디렉토리에서 다시 시도하십시"
+"오."
-#: libsvn_wc/adm_ops.c:2057
+#: libsvn_wc/adm_ops.c:2070
#, c-format
msgid "Unknown or unexpected kind for path '%s'"
msgstr "경로 '%s'에 대한 알 수 없거나 기대하지 않은 종류입니다."
-#: libsvn_wc/adm_ops.c:2219
+#: libsvn_wc/adm_ops.c:2232
#, c-format
msgid "File '%s' has local modifications"
msgstr "파일 '%s'는 로컬에서 수정되었습니다."
+#: libsvn_wc/adm_ops.c:2802
+#, fuzzy, c-format
+msgid "'%s' is not currently a member of changelist '%s'."
+msgstr "경로 '%s' 은/는 이제 변경 목록 '%s' 에 없습니다.\n"
+
#: libsvn_wc/copy.c:197
#, c-format
msgid "Error during recursive copy of '%s'"
msgstr "'%s'를 재귀적으로 복사하는 중에 오류 발생"
-#: libsvn_wc/copy.c:362
+#: libsvn_wc/copy.c:356
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "'%s'는 이미 존재하며 방해가 됩니다."
-#: libsvn_wc/copy.c:374
+#: libsvn_wc/copy.c:368
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "버전 관리되고 있는 항목 '%s'는 이미 존재합니다."
-#: libsvn_wc/copy.c:384
+#: libsvn_wc/copy.c:383
#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr "'%s'를 복사하거나 옮길 수 없습니다; 버전 관리 대상이 아닙니다"
+msgid ""
+"Cannot copy or move '%s': it's not in the repository yet; try committing "
+"first"
+msgstr ""
+"'%s'를 복사하거나 옮길 수 없습니다; 아직 저장소에 없습니다; 먼저 커밋하십시오"
-#: libsvn_wc/copy.c:393
+#: libsvn_wc/copy.c:658
#, c-format
-msgid "Cannot copy or move '%s': it's not in the repository yet; try committing first"
-msgstr "'%s'를 복사하거나 옮길 수 없습니다; 아직 저장소에 없습니다; 먼저 커밋하십시오"
+msgid ""
+"Cannot copy or move '%s': it is not in the repository yet; try committing "
+"first"
+msgstr ""
+"'%s'를 복사하거나 옮길 수 없습니다; 아직 저장소에 없습니다. 먼저 커밋하십시오"
-#: libsvn_wc/copy.c:672
-#, c-format
-msgid "Cannot copy or move '%s': it is not in the repository yet; try committing first"
-msgstr "'%s'를 복사하거나 옮길 수 없습니다; 아직 저장소에 없습니다. 먼저 커밋하십시오"
-
-#: libsvn_wc/copy.c:799
+#: libsvn_wc/copy.c:776
#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
-msgstr "'%s'에 목사할 수 없습니다. 원본이 저장소 '%s'에 있지 않고 '%s'에 있습니다."
+msgstr ""
+"'%s'에 목사할 수 없습니다. 원본이 저장소 '%s'에 있지 않고 '%s'에 있습니다."
-#: libsvn_wc/copy.c:806
+#: libsvn_wc/copy.c:783
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr "삭제가 예정된 상위 디렉토리에 '%s'를 추가할 수 없습니다"
-#: libsvn_wc/entries.c:91
-#: libsvn_wc/entries.c:349
-#: libsvn_wc/entries.c:561
-#: libsvn_wc/entries.c:822
+#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:352 libsvn_wc/entries.c:588
+#: libsvn_wc/entries.c:849
#, c-format
msgid "Entry '%s' has invalid '%s' value"
msgstr "엔트리 '%s'는 유효하지 않은 값 '%s'를 갖고 있습니다"
-#: libsvn_wc/entries.c:111
+#: libsvn_wc/entries.c:114
msgid "Invalid escape sequence"
msgstr "잘못된 이스케이프 시퀀스"
-#: libsvn_wc/entries.c:118
+#: libsvn_wc/entries.c:121
msgid "Invalid escaped character"
msgstr "잘못 이스케이프된 문자"
-#: libsvn_wc/entries.c:136
-#: libsvn_wc/entries.c:165
-#: libsvn_wc/entries.c:191
-#: libsvn_wc/entries.c:203
+#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:194
+#: libsvn_wc/entries.c:206
msgid "Unexpected end of entry"
msgstr "기대하지 않은 entry의 끝을 만남"
-#: libsvn_wc/entries.c:225
+#: libsvn_wc/entries.c:228
#, c-format
msgid "Invalid value for field '%s'"
msgstr "필드 '%s'에 잘못된 값입니다"
-#: libsvn_wc/entries.c:307
-#: libsvn_wc/entries.c:536
+#: libsvn_wc/entries.c:310 libsvn_wc/entries.c:563
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "엔트리 '%s'는 유효하지 않은 노드 종류를 갖고 있습니다"
-#: libsvn_wc/entries.c:328
-#: libsvn_wc/entries.c:513
+#: libsvn_wc/entries.c:331 libsvn_wc/entries.c:540
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "엔트리 '%s'에 유효하지 않은 저장소 루트가 있습니다."
-#: libsvn_wc/entries.c:947
+#: libsvn_wc/entries.c:995
#, c-format
msgid "XML parser failed in '%s'"
msgstr "XML 파서가 '%s'에 실패했습니다"
-#: libsvn_wc/entries.c:1006
+#: libsvn_wc/entries.c:1054
msgid "Missing default entry"
msgstr "기본 엔트리가 빠졌습니다"
-#: libsvn_wc/entries.c:1011
+#: libsvn_wc/entries.c:1059
msgid "Default entry has no revision number"
msgstr "기본 엔트리에 리비젼 넘버가 없습니다"
-#: libsvn_wc/entries.c:1016
+#: libsvn_wc/entries.c:1064
msgid "Default entry is missing URL"
msgstr "기본 엔트리게 URL 이 없습니다"
-#: libsvn_wc/entries.c:1092
+#: libsvn_wc/entries.c:1140
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "'%s'의 엔트리에 잘못된 버전이 들어 있는 행이 있습니다."
-#: libsvn_wc/entries.c:1109
+#: libsvn_wc/entries.c:1157
msgid "Missing entry terminator"
msgstr "엔트리 종결 태그가 빠졌습니다"
-#: libsvn_wc/entries.c:1112
+#: libsvn_wc/entries.c:1160
msgid "Invalid entry terminator"
msgstr "엔트리 종결 태그가 잘못되었습니다"
-#: libsvn_wc/entries.c:1116
+#: libsvn_wc/entries.c:1164
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "엔트리 %d가 '%s' 엔트리 파일에서 잘 못 되었습니다:"
-#: libsvn_wc/entries.c:1212
+#: libsvn_wc/entries.c:1287
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "작업 사본이 손상되었습니다; '%s'는 기본 엔트리가 없습니다"
-#: libsvn_wc/entries.c:1229
+#: libsvn_wc/entries.c:1304
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
-msgstr "작업 사본이 손상되었습니다; 디렉토리 '%s'는 유효하지 않은 스케쥴이 있습니다"
+msgstr ""
+"작업 사본이 손상되었습니다; 디렉토리 '%s'는 유효하지 않은 스케쥴이 있습니다"
-#: libsvn_wc/entries.c:1263
+#: libsvn_wc/entries.c:1338
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
-msgstr "작업 사본이 손상되었습니다; 디렉토리 '%s'의 '%s'는 유효하지 않은 스케쥴이 있습니다"
+msgstr ""
+"작업 사본이 손상되었습니다; 디렉토리 '%s'의 '%s'는 유효하지 않은 스케쥴이 있"
+"습니다"
-#: libsvn_wc/entries.c:1272
+#: libsvn_wc/entries.c:1347
#, c-format
-msgid "Corrupt working copy: '%s' in directory '%s' (which is scheduled for addition) is not itself scheduled for addition"
-msgstr "작업 사본이 손상되었습니다; 디렉토리 '%s'의 '%s'는 (추가 작업이 스케쥴된) 추가가 예정된 것과 다릅니다."
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"addition) is not itself scheduled for addition"
+msgstr ""
+"작업 사본이 손상되었습니다; 디렉토리 '%s'의 '%s'는 (추가 작업이 스케쥴된) 추"
+"가가 예정된 것과 다릅니다."
-#: libsvn_wc/entries.c:1280
+#: libsvn_wc/entries.c:1355
#, c-format
-msgid "Corrupt working copy: '%s' in directory '%s' (which is scheduled for deletion) is not itself scheduled for deletion"
-msgstr "작업 사본이 손상되었습니다; 디렉토리 '%s'의 '%s'는 (삭제 작업이 스케쥴된) 삭제가 예정된 것과 다릅니다."
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"deletion) is not itself scheduled for deletion"
+msgstr ""
+"작업 사본이 손상되었습니다; 디렉토리 '%s'의 '%s'는 (삭제 작업이 스케쥴된) 삭"
+"제가 예정된 것과 다릅니다."
-#: libsvn_wc/entries.c:1288
+#: libsvn_wc/entries.c:1363
#, c-format
-msgid "Corrupt working copy: '%s' in directory '%s' (which is scheduled for replacement) has an invalid schedule"
-msgstr "작업 사본이 손상되었습니다; 디렉토리 '%s'의 '%s'는 (교체 작업이 스케쥴된) 유효하지 않은 스케쥴이 있습니다."
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"replacement) has an invalid schedule"
+msgstr ""
+"작업 사본이 손상되었습니다; 디렉토리 '%s'의 '%s'는 (교체 작업이 스케쥴된) 유"
+"효하지 않은 스케쥴이 있습니다."
-#: libsvn_wc/entries.c:1925
+#: libsvn_wc/entries.c:2010
#, c-format
msgid "No default entry in directory '%s'"
msgstr "디릭토리 '%s'에 기본 엔트리가 없습니다"
-#: libsvn_wc/entries.c:1980
+#: libsvn_wc/entries.c:2065
#, c-format
msgid "Error writing to '%s'"
msgstr "'%s'에 쓰기 오류"
-#: libsvn_wc/entries.c:2303
+#: libsvn_wc/entries.c:2394
#, c-format
-msgid "Can't add '%s' to deleted directory; try undeleting its parent directory first"
-msgstr "삭제된 디렉토리에 '%s'를 추가 할 수 없습니다; 상위 디렉토리를 먼저 복원하십시오"
+msgid ""
+"Can't add '%s' to deleted directory; try undeleting its parent directory "
+"first"
+msgstr ""
+"삭제된 디렉토리에 '%s'를 추가 할 수 없습니다; 상위 디렉토리를 먼저 복원하십시"
+"오"
-#: libsvn_wc/entries.c:2309
+#: libsvn_wc/entries.c:2400
#, c-format
-msgid "Can't replace '%s' in deleted directory; try undeleting its parent directory first"
-msgstr "삭제된 디렉토리에서 '%s'를 교체 할 수 없습니다; 상위 디렉토리를 먼저 복원하십시오"
+msgid ""
+"Can't replace '%s' in deleted directory; try undeleting its parent directory "
+"first"
+msgstr ""
+"삭제된 디렉토리에서 '%s'를 교체 할 수 없습니다; 상위 디렉토리를 먼저 복원하십"
+"시오"
-#: libsvn_wc/entries.c:2318
+#: libsvn_wc/entries.c:2409
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr "'%s'는 없는 것으로 표시되어 있어서 추가 작업을 스케쥴할 수 없습니다"
-#: libsvn_wc/entries.c:2347
+#: libsvn_wc/entries.c:2438
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "'%s' 항목은 이미 관리 대상입니다."
-#: libsvn_wc/entries.c:2444
+#: libsvn_wc/entries.c:2535
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "'%s' 항목은 잘못된 스케쥴을 가지고 있습니다."
-#: libsvn_wc/entries.c:2590
+#: libsvn_wc/entries.c:2681
#, c-format
msgid "No such entry: '%s'"
msgstr "없는 항목: '%s'"
-#: libsvn_wc/entries.c:2717
+#: libsvn_wc/entries.c:2814
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "'%s'에 대한 엔트리 파일 쓰기 오류"
-#: libsvn_wc/entries.c:2759
+#: libsvn_wc/entries.c:2856
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "'%s' 디렉토리는 THIS_DIR 항목이 없습니다."
-#: libsvn_wc/entries.c:2888
+#: libsvn_wc/entries.c:2985
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "'%s' 은/는 인식 불가능한 노드 종류입니다."
-#: libsvn_wc/entries.c:2925
+#: libsvn_wc/entries.c:3022
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "예기치 않은 발견 '%s': 경로는 'missing' 표시가 되어 있습니다."
-#: libsvn_wc/lock.c:356
-#: libsvn_wc/lock.c:562
+#: libsvn_wc/lock.c:356 libsvn_wc/lock.c:562
#, c-format
msgid "Working copy '%s' locked"
msgstr "작업사본 '%s'은/는 잠겨 있습니다."
@@ -4978,8 +4989,7 @@
msgid "Path '%s' ends in '%s', which is unsupported for this operation"
msgstr "경로 '%s'는 '%s'에서 끝나며, 이는 지원하지 않은 동작입니다."
-#: libsvn_wc/lock.c:929
-#: libsvn_wc/lock.c:968
+#: libsvn_wc/lock.c:929 libsvn_wc/lock.c:968
#, c-format
msgid "Unable to check path existence for '%s'"
msgstr "경로가 존재하는지 확인할 수 없습니다. '%s'"
@@ -5029,7 +5039,7 @@
msgid "Lock file '%s' is not a regular file"
msgstr "잠그는 파일 '%s'은/는 일반 파일이 아닙니다."
-#: libsvn_wc/log.c:353
+#: libsvn_wc/log.c:355
msgid "Can't move source to dest"
msgstr "원본을 대상으로 이동시킬 수 없습니다."
@@ -5037,147 +5047,145 @@
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:516
+#: libsvn_wc/log.c:518
#, c-format
msgid "In directory '%s'"
msgstr "디렉토리 '%s'"
-#: libsvn_wc/log.c:541
+#: libsvn_wc/log.c:543
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "'%s'에 'left' 속성이 빠졌습니다"
-#: libsvn_wc/log.c:548
+#: libsvn_wc/log.c:550
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "'%s'에 'right' 속성이 빠졌습니다"
-#: libsvn_wc/log.c:616
+#: libsvn_wc/log.c:618
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "'%s'에 'dest' 속성이 빠졌습니다"
-#: libsvn_wc/log.c:697
+#: libsvn_wc/log.c:699
#, c-format
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "'%s'에 'timestamp' 속성이 빠졌습니다"
-#: libsvn_wc/log.c:793
-#: libsvn_wc/log.c:833
+#: libsvn_wc/log.c:795 libsvn_wc/log.c:835
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "'%s'에 'affected time'을 얻어 오는 중 오류 발생"
-#: libsvn_wc/log.c:844
+#: libsvn_wc/log.c:868
+#, fuzzy, c-format
+msgid "Error getting file size on '%s'"
+msgstr "'%s'에 'affected time'을 얻어 오는 중 오류 발생"
+
+#: libsvn_wc/log.c:886
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "'%s'에 대한 엔트리 수정 중 오류 발생"
-#: libsvn_wc/log.c:870
+#: libsvn_wc/log.c:912
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "'%s'에 대한 잠금해제 오류"
-#: libsvn_wc/log.c:893
+#: libsvn_wc/log.c:935
#, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "'%s'의 변경사항 목록을 제거하는 중 오류가 발생하였습니다."
-#: libsvn_wc/log.c:1025
+#: libsvn_wc/log.c:1067
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "'%s'에 대한 'revision' 속성이 빠졌습니다"
-#: libsvn_wc/log.c:1049
+#: libsvn_wc/log.c:1091
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "디렉토리 '%s'에 대한 로그 명령이 잘못된 곳에 위치해 있습니다"
-#: libsvn_wc/log.c:1245
+#: libsvn_wc/log.c:1287
#, c-format
msgid "Error checking existence of '%s'"
msgstr "'%s'의 존재 여부 점검하는 중 오류 발생"
-#: libsvn_wc/log.c:1302
+#: libsvn_wc/log.c:1353
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "'%s'의 text-base 교체 중 오류 발생"
-#: libsvn_wc/log.c:1307
+#: libsvn_wc/log.c:1358
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "'%s'의 'afftected time' 얻어 오는 중 오류 발생"
-#: libsvn_wc/log.c:1348
+#: libsvn_wc/log.c:1381
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "'%s'에 대한 'affected time' 얻어 오는 중 오류 발생"
-#: libsvn_wc/log.c:1363
+#: libsvn_wc/log.c:1401
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "'%s' 와 '%s' 비교중 오류 발생"
-#: libsvn_wc/log.c:1408
-#: libsvn_wc/log.c:1475
+#: libsvn_wc/log.c:1450 libsvn_wc/log.c:1517
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "'%s'의 엔트리 수정 중 오류 발생"
-#: libsvn_wc/log.c:1530
+#: libsvn_wc/log.c:1572
msgid "Invalid 'format' attribute"
msgstr "잘못된 'format' 속성"
-#: libsvn_wc/log.c:1565
+#: libsvn_wc/log.c:1607
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr "'name' 속성이 빠진 로그 엔트리 ( 디렉토리 '%s'에 대한 엔트리 '%s' )"
-#: libsvn_wc/log.c:1636
+#: libsvn_wc/log.c:1678
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "'%s'의 인식 할 수 없는 로그 파일 요소 '%s'"
-#: libsvn_wc/log.c:1647
+#: libsvn_wc/log.c:1689
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "'%s'의 '%s' 명령 처리 중 오류 발생"
-#: libsvn_wc/log.c:1829
+#: libsvn_wc/log.c:1871
msgid "Couldn't open log"
msgstr "로그를 열수 없습니다"
-#: libsvn_wc/log.c:1840
+#: libsvn_wc/log.c:1882
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "'%s'의 관리 로그 파일을 읽는 중 오류 발생"
-#: libsvn_wc/log.c:2454
+#: libsvn_wc/log.c:2524
#, c-format
msgid "Error writing log for '%s'"
msgstr "'%s'에 대한 로그 쓰기 오류"
-#: libsvn_wc/log.c:2503
-#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "'%s'는 작업 사본 디렉토리가 아닙니다"
-
-#: libsvn_wc/props.c:92
+#: libsvn_wc/props.c:95
#, c-format
msgid "Can't parse '%s'"
msgstr "'%s'를 분석할 수 없습니다"
-#: libsvn_wc/props.c:123
+#: libsvn_wc/props.c:126
#, c-format
msgid "Can't write property hash to '%s'"
msgstr "'%s'에 속성 해쉬를 쓸 수 없습니다"
-#: libsvn_wc/props.c:218
+#: libsvn_wc/props.c:221
#, c-format
msgid "Can't find entry '%s' in '%s'"
msgstr "'%s'에 엔트리 '%s'를 찾을 수 없습니다"
-#: libsvn_wc/props.c:645
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5186,7 +5194,7 @@
"새로운 속성 '%s'를 값 '%s'에 추가하려고 하지만,\n"
"이미 value '%s'에 속성이 존재합니다. "
-#: libsvn_wc/props.c:668
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5195,12 +5203,14 @@
"속성 '%s'를 '%s'에서 '%s'로 변경하려고 하지만,\n"
"그 속성은 존재 하지 않습니다."
-#: libsvn_wc/props.c:696
+#: libsvn_wc/props.c:808
#, c-format
-msgid "Trying to delete property '%s' but value has been modified from '%s' to '%s'."
-msgstr "새로운 속성 '%s'을/를 삭제하려하지만, 값이 '%s'에서 '%s' (으)로 바뀌었습니다."
+msgid ""
+"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
+msgstr ""
+"새로운 속성 '%s'을/를 삭제하려하지만, 값이 '%s'에서 '%s' (으)로 바뀌었습니다."
-#: libsvn_wc/props.c:714
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5209,70 +5219,79 @@
"속성 '%s'를 '%s'에서 '%s'로 변경하려고 하지만,\n"
"이미 값 '%s'에 속성이 존재합니다. "
-#: libsvn_wc/props.c:897
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "작업사본의 속성 파일 '%s'의 마지막 행이 없습니다."
-#: libsvn_wc/props.c:1080
-#: libsvn_wc/props.c:1116
-#: libsvn_wc/props.c:1386
-#: libsvn_wc/props.c:1638
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "디스크로 부터 속성을 로드하는 데 실패했습니다"
-#: libsvn_wc/props.c:1144
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "'%s'에 대한 속성 해쉬를 쓸 수 없습니다"
-#: libsvn_wc/props.c:1378
-#: libsvn_wc/props.c:1547
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "속성 '%s'는 엔트리 속성입니다"
-#: libsvn_wc/props.c:1425
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "속성('%s')을 디렉토리('%s')에 설정할 수 없습니다"
-#: libsvn_wc/props.c:1433
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "속성('%s')을 파일('%s')에 설정할 수 없습니다"
-#: libsvn_wc/props.c:1439
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s'는 파일이나 디렉토리가 아닙니다"
-#: libsvn_wc/props.c:1520
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "파일 '%s'는 바이너리 MIME 타입 속성을 갖고 있습니다"
-#: libsvn_wc/props.c:2181
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "'%s'에 대한 %s 속성을 분석하던 중 오류 발생: '%s'"
-#: libsvn_wc/props.c:2194
+#: libsvn_wc/props.c:2520
#, c-format
-msgid "Invalid %s property on '%s': target involves '.' or '..' or is an absolute path"
-msgstr "%s'에 대한 유효하지 않은 속성 %s : 대상은 '.' 이나 '..' 을 포함하거나 절대 경로입니다"
+msgid ""
+"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
+"path"
+msgstr ""
+"%s'에 대한 유효하지 않은 속성 %s : 대상은 '.' 이나 '..' 을 포함하거나 절대 경"
+"로입니다"
-#: libsvn_wc/questions.c:120
+#: libsvn_wc/questions.c:121
#, c-format
-msgid "Working copy format of '%s' is too old (%d); please check out your working copy again"
-msgstr "'%s'의 작업 사본 포맷은 너무 오래되었습니다(%d); 작업 사본을 다시 꺼내어 주십시오"
+msgid ""
+"Working copy format of '%s' is too old (%d); please check out your working "
+"copy again"
+msgstr ""
+"'%s'의 작업 사본 포맷은 너무 오래되었습니다(%d); 작업 사본을 다시 꺼내어 주십"
+"시오"
-#: libsvn_wc/questions.c:128
+#: libsvn_wc/questions.c:129
#, c-format
-msgid "This client is too old to work with working copy '%s'; please get a newer Subversion client"
-msgstr "이 클라이언트는 너무 오래되어 작업사본 '%s'에 대해 작업을 수행할 수 없습니다. subversion 을 업그레이드하십시오."
+msgid ""
+"This client is too old to work with working copy '%s'; please get a newer "
+"Subversion client"
+msgstr ""
+"이 클라이언트는 너무 오래되어 작업사본 '%s'에 대해 작업을 수행할 수 없습니"
+"다. subversion 을 업그레이드하십시오."
-#: libsvn_wc/questions.c:346
+#: libsvn_wc/questions.c:336
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5283,107 +5302,128 @@
" 기대값: %s\n"
" 실제값: %s\n"
-#: libsvn_wc/relocate.c:69
+#: libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr "재배치는 저장소의 URL 부분만을 수정할 수 있습니다."
-#: libsvn_wc/update_editor.c:438
+#: libsvn_wc/update_editor.c:440
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "'.' 이 등록되어 있지 않습니다: '%s'"
-#: libsvn_wc/update_editor.c:964
+#: libsvn_wc/update_editor.c:963
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "수정한 디렉토리는 지우지 않을 것입니다. '%s'"
-#: libsvn_wc/update_editor.c:1038
+#: libsvn_wc/update_editor.c:1037
#, c-format
msgid "Error writing log file for '%s'"
msgstr "'%s'에 대한 로그 파일 쓰기 오류"
-#: libsvn_wc/update_editor.c:1145
+#: libsvn_wc/update_editor.c:1144
#, c-format
-msgid "Failed to add directory '%s': a non-directory object of the same name already exists"
-msgstr "디렉토리 추가 실패 '%s': 디렉토리가 아닌 같은 이름의 개체가 이미 존재합니다"
+msgid ""
+"Failed to add directory '%s': a non-directory object of the same name "
+"already exists"
+msgstr ""
+"디렉토리 추가 실패 '%s': 디렉토리가 아닌 같은 이름의 개체가 이미 존재합니다"
-#: libsvn_wc/update_editor.c:1178
+#: libsvn_wc/update_editor.c:1177
#, c-format
-msgid "Failed to add directory '%s': an unversioned directory of the same name already exists"
-msgstr "강제로 디렉토리 추가 실패 '%s': 버전관리 되지 않는 같은 이름의 디렉토리가 이미 존재합니다"
+msgid ""
+"Failed to add directory '%s': an unversioned directory of the same name "
+"already exists"
+msgstr ""
+"강제로 디렉토리 추가 실패 '%s': 버전관리 되지 않는 같은 이름의 디렉토리가 이"
+"미 존재합니다"
-#: libsvn_wc/update_editor.c:1200
+#: libsvn_wc/update_editor.c:1199
#, c-format
-msgid "Failed to add directory '%s': a versioned directory of the same name already exists"
-msgstr "강제로 디렉토리 추가 실패 '%s': 버전관리 되는 같은 이름의 디렉토리가 이미 존재합니다"
+msgid ""
+"Failed to add directory '%s': a versioned directory of the same name already "
+"exists"
+msgstr ""
+"강제로 디렉토리 추가 실패 '%s': 버전관리 되는 같은 이름의 디렉토리가 이미 존"
+"재합니다"
-#: libsvn_wc/update_editor.c:1211
+#: libsvn_wc/update_editor.c:1210
#, c-format
-msgid "Failed to add directory '%s': object of the same name as the administrative directory"
+msgid ""
+"Failed to add directory '%s': object of the same name as the administrative "
+"directory"
msgstr "디렉토리 추가 실패 '%s': 같은 이름의 개체가 관리용도로 사용됩니다."
-#: libsvn_wc/update_editor.c:1225
+#: libsvn_wc/update_editor.c:1224
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr "디렉토리 추가 실패 '%s': copyfrom 인자는 아직 지원되지 않습니다."
-#: libsvn_wc/update_editor.c:1512
+#: libsvn_wc/update_editor.c:1521
msgid "Couldn't do property merge"
msgstr "속성을 병합할 수 없습니다"
-#: libsvn_wc/update_editor.c:1581
+#: libsvn_wc/update_editor.c:1590
#, c-format
-msgid "Failed to mark '%s' absent: item of the same name is already scheduled for addition"
-msgstr "'%s' 를 없는 것으로 표시할 수 없습니다: 이미 같은 이름의 항목이 추가되도록 스케쥴되어 있습니다"
+msgid ""
+"Failed to mark '%s' absent: item of the same name is already scheduled for "
+"addition"
+msgstr ""
+"'%s' 를 없는 것으로 표시할 수 없습니다: 이미 같은 이름의 항목이 추가되도록 스"
+"케쥴되어 있습니다"
-#: libsvn_wc/update_editor.c:1681
+#: libsvn_wc/update_editor.c:1690
#, c-format
-msgid "Failed to add file '%s': a file of the same name is already scheduled for addition with history"
-msgstr "파일 '%s'를 추가할 수 없습니다: 이미 같은 이름의 대상이 추가되도록 스케쥴되어 있습니다"
+msgid ""
+"Failed to add file '%s': a file of the same name is already scheduled for "
+"addition with history"
+msgstr ""
+"파일 '%s'를 추가할 수 없습니다: 이미 같은 이름의 대상이 추가되도록 스케쥴되"
+"어 있습니다"
-#: libsvn_wc/update_editor.c:1693
+#: libsvn_wc/update_editor.c:1702
#, c-format
-msgid "Failed to add file '%s': a non-file object of the same name already exists"
-msgstr "파일 '%s'를 추가할 수 없습니다: 파일이 아닌 같은 이름의 개체가 이미 존재합니다"
+msgid ""
+"Failed to add file '%s': a non-file object of the same name already exists"
+msgstr ""
+"파일 '%s'를 추가할 수 없습니다: 파일이 아닌 같은 이름의 개체가 이미 존재합니"
+"다"
-#: libsvn_wc/update_editor.c:1708
+#: libsvn_wc/update_editor.c:1717
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr "파일 '%s'를 추가할 수 없습니다: 같은 이름의 대상이 이미 존재합니다"
-#: libsvn_wc/update_editor.c:1725
+#: libsvn_wc/update_editor.c:1734
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "디렉토리 '%s' 의 파일 '%s'는 버젼 관리 대상이 아닙니다"
-#: libsvn_wc/update_editor.c:1879
+#: libsvn_wc/update_editor.c:1883
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "'%s' 에 대한 체크섬이 일치하지 않습니다; 기록된 것:'%s', 실제:'%s'"
-#: libsvn_wc/update_editor.c:3074
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s'가 히스토리를 갖고 있시 않습니다"
-#: libsvn_wc/update_editor.c:3237
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "복사 원본 URL '%s'은(는) '%s'와(과) 다른 저장소입니다."
-#: libsvn_wc/util.c:83
+#: libsvn_wc/util.c:84
msgid "Unable to make any directories"
msgstr "어떤 디렉토리도 만들 수 없습니다"
-#: svn/blame-cmd.c:206
-#: svn/list-cmd.c:227
+#: svn/blame-cmd.c:206 svn/list-cmd.c:227
msgid "'verbose' option invalid in XML mode"
msgstr "'verbose' 옵션은 XML 모드에서는 불가능합니다."
-#: svn/blame-cmd.c:218
-#: svn/info-cmd.c:477
-#: svn/list-cmd.c:239
-#: svn/status-cmd.c:244
+#: svn/blame-cmd.c:218 svn/info-cmd.c:511 svn/list-cmd.c:239
+#: svn/status-cmd.c:249
msgid "'incremental' option only valid in XML mode"
msgstr "'incremental' 옵션은 XML 모드에서만 가능합니다"
@@ -5392,22 +5432,25 @@
msgid "Skipping binary file: '%s'\n"
msgstr "바이너리 파일을 무시합니다: '%s'\n"
-#: svn/checkout-cmd.c:129
-#: svn/switch-cmd.c:127
+#: svn/changelist-cmd.c:61 svn/info-cmd.c:477 svn/log-cmd.c:410
+#: svn/revert-cmd.c:58
+#, c-format
+msgid "no such changelist '%s'"
+msgstr "없는 변경 목록: '%s'"
+
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "'%s' 은 URL 같아 보이지 않습니다."
-#: svn/copy-cmd.c:124
-#: svn/delete-cmd.c:64
-#: svn/mkdir-cmd.c:66
-#: svn/move-cmd.c:76
-#: svn/propedit-cmd.c:200
-msgid "Local, non-commit operations do not take a log message"
+#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66 svn/move-cmd.c:76
+#: svn/propedit-cmd.c:201
+#, fuzzy
+msgid ""
+"Local, non-commit operations do not take a log message or revision properties"
msgstr "사본에서만 작업하고, 커밋하지 않는 명령은 로그메시지를 받지 않습니다."
-#: svn/diff-cmd.c:117
-#: svnserve/main.c:523
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "표준 출력(stdout)을 열 수 없습니다."
@@ -5426,9 +5469,13 @@
msgid "Target lists to diff may not contain both working copy paths and URLs"
msgstr "diff 대상은 작업 사본과 URL을 동시에 포함할 수 없습니다."
-#: svn/export-cmd.c:84
-msgid "Destination directory exists; please remove the directory or use --force to overwrite"
-msgstr "대상 디렉토리가 존재합니다; 디렉토리를 제거하거나 --force 옵션을 사용하여 덮어 쓰십시오."
+#: svn/export-cmd.c:87
+msgid ""
+"Destination directory exists; please remove the directory or use --force to "
+"overwrite"
+msgstr ""
+"대상 디렉토리가 존재합니다; 디렉토리를 제거하거나 --force 옵션을 사용하여 덮"
+"어 쓰십시오."
#: svn/help-cmd.c:45
#, c-format
@@ -5451,8 +5498,10 @@
"'svn --version'를 사용하여 버전과 원격접속 모듈에 대한 정보를 얻으십시오.\n"
" 또는 'svn --version --quiet'를 사용하여 버전 정보만 얻으십시오.\n"
"\n"
-"대부분의 하위 명령들은 재귀적으로 수행하면서 파일이나 디렉토리를 인자로 취합니다.\n"
-"명령들에 인자가 주어지지 않으면 현재 디렉토리를 포함하여 재귀적으로 수행하게\n"
+"대부분의 하위 명령들은 재귀적으로 수행하면서 파일이나 디렉토리를 인자로 취합"
+"니다.\n"
+"명령들에 인자가 주어지지 않으면 현재 디렉토리를 포함하여 재귀적으로 수행하"
+"게\n"
"됩니다.\n"
"\n"
"가능한 명령:\n"
@@ -5465,8 +5514,7 @@
"Subversion은 형상관리를 위한 도구입니다.\n"
"더 상세한 정보를 위해서는 http://subversion.tigris.org/ 를 방문하세요.\n"
-#: svn/help-cmd.c:65
-#: svnsync/main.c:1296
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -5492,154 +5540,173 @@
msgid "'%s' has invalid revision"
msgstr "'%s'는 잘못된 리비전을 가지고 있습니다"
-#: svn/info-cmd.c:246
-#: svnadmin/main.c:1116
+#: svn/info-cmd.c:250 svnadmin/main.c:1118
#, c-format
msgid "Path: %s\n"
msgstr "경로: %s\n"
-#: svn/info-cmd.c:252
-#: svnlook/main.c:734
+#: svn/info-cmd.c:256 svnlook/main.c:738
#, c-format
msgid "Name: %s\n"
msgstr "이름: %s\n"
-#: svn/info-cmd.c:256
+#: svn/info-cmd.c:260
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: svn/info-cmd.c:259
+#: svn/info-cmd.c:263
#, c-format
msgid "Repository Root: %s\n"
msgstr "저장소 루트: %s\n"
-#: svn/info-cmd.c:263
+#: svn/info-cmd.c:267
#, c-format
msgid "Repository UUID: %s\n"
msgstr "저장소 UUID: %s\n"
-#: svn/info-cmd.c:267
+#: svn/info-cmd.c:271
#, c-format
msgid "Revision: %ld\n"
msgstr "리비전: %ld\n"
-#: svn/info-cmd.c:272
+#: svn/info-cmd.c:276
#, c-format
msgid "Node Kind: file\n"
msgstr "노드 종류: 파일\n"
-#: svn/info-cmd.c:276
+#: svn/info-cmd.c:280
#, c-format
msgid "Node Kind: directory\n"
msgstr "노드 종류: 디렉토리\n"
-#: svn/info-cmd.c:280
+#: svn/info-cmd.c:284
#, c-format
msgid "Node Kind: none\n"
msgstr "노드 종류: 없음\n"
-#: svn/info-cmd.c:285
+#: svn/info-cmd.c:289
#, c-format
msgid "Node Kind: unknown\n"
msgstr "노드 종류: 알려지지 않음\n"
-#: svn/info-cmd.c:294
+#: svn/info-cmd.c:298
#, c-format
msgid "Schedule: normal\n"
msgstr "스케쥴: 일반\n"
-#: svn/info-cmd.c:298
+#: svn/info-cmd.c:302
#, c-format
msgid "Schedule: add\n"
msgstr "스케쥴: 추가\n"
-#: svn/info-cmd.c:302
+#: svn/info-cmd.c:306
#, c-format
msgid "Schedule: delete\n"
msgstr "스케쥴: 삭제\n"
-#: svn/info-cmd.c:306
+#: svn/info-cmd.c:310
#, c-format
msgid "Schedule: replace\n"
msgstr "스케쥴: 치환\n"
-#: svn/info-cmd.c:314
+#: svn/info-cmd.c:326
+#, c-format
+msgid "Depth: empty\n"
+msgstr ""
+
+#: svn/info-cmd.c:330
+#, c-format
+msgid "Depth: files\n"
+msgstr ""
+
+#: svn/info-cmd.c:334
+#, c-format
+msgid "Depth: immediates\n"
+msgstr ""
+
+#. Other depths should never happen here.
+#: svn/info-cmd.c:345
+#, c-format
+msgid "Depth: INVALID\n"
+msgstr ""
+
+#: svn/info-cmd.c:349
#, c-format
msgid "Copied From URL: %s\n"
msgstr "복사해 올 URL: %s\n"
-#: svn/info-cmd.c:318
+#: svn/info-cmd.c:353
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "복사해 올 리비전: %ld\n"
-#: svn/info-cmd.c:323
+#: svn/info-cmd.c:358
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "마지막 수정 작업자: %s\n"
-#: svn/info-cmd.c:327
+#: svn/info-cmd.c:362
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "마지막 수정 리비전: %ld\n"
-#: svn/info-cmd.c:332
+#: svn/info-cmd.c:367
msgid "Last Changed Date"
msgstr "마지막 수정 일자"
-#: svn/info-cmd.c:338
+#: svn/info-cmd.c:373
msgid "Text Last Updated"
msgstr "마지막 내용 수정 일자"
-#: svn/info-cmd.c:342
+#: svn/info-cmd.c:377
msgid "Properties Last Updated"
msgstr "마지막 속성 수정 일자"
-#: svn/info-cmd.c:345
+#: svn/info-cmd.c:380
#, c-format
msgid "Checksum: %s\n"
msgstr "체크섬: %s\n"
-#: svn/info-cmd.c:350
+#: svn/info-cmd.c:385
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "충돌한 이전 베이스 파일: %s\n"
-#: svn/info-cmd.c:356
+#: svn/info-cmd.c:391
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "충돌한 이전 작업 파일: %s\n"
-#: svn/info-cmd.c:361
+#: svn/info-cmd.c:396
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "충돌한 현재 베이스 파일: %s\n"
-#: svn/info-cmd.c:366
+#: svn/info-cmd.c:401
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "충돌한 속성 파일: %s\n"
-#: svn/info-cmd.c:374
+#: svn/info-cmd.c:409
#, c-format
msgid "Lock Token: %s\n"
msgstr "잠금 토큰: %s\n"
-#: svn/info-cmd.c:378
+#: svn/info-cmd.c:413
#, c-format
msgid "Lock Owner: %s\n"
msgstr "잠금 생성자: %s\n"
-#: svn/info-cmd.c:383
+#: svn/info-cmd.c:418
msgid "Lock Created"
msgstr "잠금 생성일: "
-#: svn/info-cmd.c:387
+#: svn/info-cmd.c:422
msgid "Lock Expires"
msgstr "잠금 만료일: "
-#: svn/info-cmd.c:396
+#: svn/info-cmd.c:431
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -5648,7 +5715,7 @@
"잠금 이유 (%i 행):\n"
"%s\n"
-#: svn/info-cmd.c:397
+#: svn/info-cmd.c:432
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -5657,18 +5724,12 @@
"잠금 이유 (%i 행):\n"
"%s\n"
-#: svn/info-cmd.c:404
+#: svn/info-cmd.c:439
#, c-format
msgid "Changelist: %s\n"
msgstr "변경목록: %s\n"
-#: svn/info-cmd.c:443
-#: svn/revert-cmd.c:59
-#, c-format
-msgid "no such changelist '%s'"
-msgstr "없는 변경 목록: '%s'"
-
-#: svn/info-cmd.c:509
+#: svn/info-cmd.c:547
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
@@ -5677,7 +5738,7 @@
"%s: (버전 관리 대상이 아님)\n"
"\n"
-#: svn/info-cmd.c:518
+#: svn/info-cmd.c:556
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -5708,11 +5769,11 @@
msgid " (from %s:%ld)"
msgstr "(원본 %s:%ld)"
-#: svn/log-cmd.c:450
+#: svn/log-cmd.c:475
msgid "When specifying working copy paths, only one target may be given"
msgstr "작업 사본의 경로는 하나만 가능합니다."
-#: svn/log-cmd.c:462
+#: svn/log-cmd.c:487
msgid "Only relative paths can be specified after a URL"
msgstr "URL 뒤에 지정할 때는 상대 경로만 가능합니다."
@@ -5724,16 +5785,9 @@
msgid "force validity of log message source"
msgstr "로그 메시지의 유효성을 확인하지 않습니다."
-#: svn/main.c:63
-#: svn/main.c:64
-#: svnadmin/main.c:230
-#: svnadmin/main.c:233
-#: svndumpfilter/main.c:780
-#: svndumpfilter/main.c:783
-#: svnlook/main.c:90
-#: svnlook/main.c:93
-#: svnsync/main.c:104
-#: svnsync/main.c:106
+#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:230 svnadmin/main.c:233
+#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
+#: svnlook/main.c:102 svnsync/main.c:135 svnsync/main.c:137
msgid "show help on a subcommand"
msgstr "부속 명령어에 대한 도움말 보기"
@@ -5746,12 +5800,12 @@
msgstr "가능한 적게 출력합니다."
#: svn/main.c:67
-msgid "descend recursively"
-msgstr "재귀적으로 수행합니다."
+msgid "descend recursively, same as --depth=infinity"
+msgstr ""
#: svn/main.c:68
-msgid "operate on single directory only"
-msgstr "단일 디렉토리에만 적용합니다."
+msgid "obsolete; try --depth=files or --depth=immediates"
+msgstr ""
#: svn/main.c:70
msgid ""
@@ -5768,7 +5822,8 @@
" NUMBER revision number\n"
" '{' DATE '}' revision at start of the date\n"
" 'HEAD' latest in repository\n"
-" 'BASE' base rev of item's working copy\n"
+" 'BASE' base rev of item's working "
+"copy\n"
" 'COMMITTED' last commit at or before BASE\n"
" 'PREV' revision just before COMMITTED"
msgstr ""
@@ -5778,7 +5833,8 @@
" '{' DATE '}' 리비전이 시작하는 시각\n"
" 'HEAD' 저장소의 마지막 리비전\n"
" 'BASE' 작업 사본을 꺼내온 리비전\n"
-" 'COMMITTED' BASE 이전에 마지막 커밋된 리비전\n"
+" 'COMMITTED' BASE 이전에 마지막 커밋된 리비"
+"전\n"
" 'PREV' COMMITTED 의 직전 리비전"
#: svn/main.c:84
@@ -5793,12 +5849,8 @@
msgid "treat value as being in charset encoding ARG"
msgstr "값을 arg에 해당하는 문자코드로 취급합니다."
-#: svn/main.c:92
-#: svnadmin/main.c:236
-#: svndumpfilter/main.c:786
-#: svnlook/main.c:96
-#: svnserve/main.c:150
-#: svnsync/main.c:102
+#: svn/main.c:92 svnadmin/main.c:236 svndumpfilter/main.c:786
+#: svnlook/main.c:129 svnserve/main.c:151 svnsync/main.c:133
#: svnversion/main.c:125
msgid "show program version information"
msgstr "프로그램 버젼 정보를 보여줍니다"
@@ -5812,27 +5864,29 @@
msgstr "업데이트 정보를 출력합니다."
#: svn/main.c:96
-#: svnsync/main.c:96
msgid "specify a username ARG"
msgstr "arg를 접속에 필요한 사용자 ID로 사용합니다."
#: svn/main.c:98
-#: svnsync/main.c:98
msgid "specify a password ARG"
msgstr "arg를 접속에 필요한 패스워드로 사용합니다."
#: svn/main.c:101
msgid ""
"Default: '-u'. When Subversion is invoking an\n"
-" external diff program, ARG is simply passed along\n"
-" to the program. But when Subversion is using its\n"
+" external diff program, ARG is simply passed "
+"along\n"
+" to the program. But when Subversion is using "
+"its\n"
" default internal diff implementation, or when\n"
-" Subversion is displaying blame annotations, ARG\n"
+" Subversion is displaying blame annotations, "
+"ARG\n"
" could be any of the following:\n"
" -u (--unified):\n"
" Output 3 lines of unified context.\n"
" -b (--ignore-space-change):\n"
-" Ignore changes in the amount of white space.\n"
+" Ignore changes in the amount of white "
+"space.\n"
" -w (--ignore-all-space):\n"
" Ignore all white space.\n"
" --ignore-eol-style:\n"
@@ -5840,14 +5894,17 @@
msgstr ""
"기본값: '-u'. Subversion이 외부 diff 프로그램을 실행할 때\n"
" ARG가 프로그램의 인자로 넘겨집니다\n"
-" to the program. But when Subversion is using its\n"
+" to the program. But when Subversion is using "
+"its\n"
" default internal diff implementation, or when\n"
-" Subversion is displaying blame annotations, ARG\n"
+" Subversion is displaying blame annotations, "
+"ARG\n"
" could be any of the following:\n"
" -u (--unified):\n"
" Output 3 lines of unified context.\n"
" -b (--ignore-space-change):\n"
-" Ignore changes in the amount of white space.\n"
+" Ignore changes in the amount of white "
+"space.\n"
" -w (--ignore-all-space):\n"
" Ignore all white space.\n"
" --ignore-eol-style:\n"
@@ -5857,96 +5914,102 @@
msgid "pass contents of file ARG as additional args"
msgstr "arg로 주어진 파일 내용을 옵션으로 추가합니다."
-#: svn/main.c:131
+#: svn/main.c:132
+msgid ""
+"pass depth ('empty', 'files', 'immediates', or\n"
+" 'infinity') as ARG"
+msgstr ""
+
+#: svn/main.c:135
msgid "output in XML"
msgstr "XML 포맷으로 출력합니다."
-#: svn/main.c:132
+#: svn/main.c:136
msgid "use strict semantics"
msgstr "엄밀히 적용합니다."
-#: svn/main.c:134
+#: svn/main.c:138
msgid "do not cross copies while traversing history"
msgstr "과거에 copy 명령이 일어난 지점까지만 로그를 검색합니다."
-#: svn/main.c:136
+#: svn/main.c:140
msgid "disregard default and svn:ignore property ignores"
msgstr "svn:ignore로 지정한 것과 디폴트로 무시하는 파일들을 무시하지 않습니다."
-#: svn/main.c:138
-#: svnsync/main.c:94
+#: svn/main.c:142 svnsync/main.c:113
msgid "do not cache authentication tokens"
msgstr "인증 정보를 캐시에 저장하지 않습니다."
-#: svn/main.c:140
-#: svnsync/main.c:92
+#: svn/main.c:144 svnsync/main.c:111
msgid "do no interactive prompting"
msgstr "대화식 사용자 입력을 기다리지 않습니다."
-#: svn/main.c:142
+#: svn/main.c:146
msgid "try operation but make no changes"
msgstr "실제 명령은 수행하지 않고 시도만 합니다."
-#: svn/main.c:144
-#: svnlook/main.c:111
+#: svn/main.c:148 svnlook/main.c:108
msgid "do not print differences for deleted files"
msgstr "삭제된 파일에 대해서는 차이를 출력하지 않습니다."
-#: svn/main.c:146
+#: svn/main.c:150
msgid "notice ancestry when calculating differences"
msgstr "차이를 구할 때, 모든 히스토리를 참고합니다."
-#: svn/main.c:148
+#: svn/main.c:152
msgid "ignore ancestry when calculating merges"
msgstr "병합할 때, 히스토리를 무시합니다."
-#: svn/main.c:150
+#: svn/main.c:154
msgid "ignore externals definitions"
msgstr "외부 모듈(svn:externals로 지정된)은 무시합니다."
-#: svn/main.c:153
+#: svn/main.c:157
msgid "use ARG as diff command"
msgstr "arg를 diff 명령으로 사용합니다."
-#: svn/main.c:155
+#: svn/main.c:159
msgid "use ARG as merge command"
msgstr "arg를 merge 명령으로 사용합니다."
-#: svn/main.c:157
+#: svn/main.c:161
msgid "use ARG as external editor"
msgstr "arg를 외부 편집기로 사용합니다."
-#: svn/main.c:160
-msgid "use ARG as the older target"
-msgstr "arg를 오래된 파일로 사용합니다."
-
-#: svn/main.c:162
-msgid "use ARG as the newer target"
-msgstr "arg를 새 파일로 사용합니다."
-
#: svn/main.c:164
-msgid "operate on a revision property (use with -r)"
+#, fuzzy
+msgid "mark revisions as merged (use with -r)"
msgstr "속성의 리비전 지정합니다. (-r 옵션과 같이 사용)"
#: svn/main.c:166
+msgid "use ARG as the older target"
+msgstr "arg를 오래된 파일로 사용합니다."
+
+#: svn/main.c:168
+msgid "use ARG as the newer target"
+msgstr "arg를 새 파일로 사용합니다."
+
+#: svn/main.c:170
+msgid "operate on a revision property (use with -r)"
+msgstr "속성의 리비전 지정합니다. (-r 옵션과 같이 사용)"
+
+#: svn/main.c:172
msgid "relocate via URL-rewriting"
msgstr "URL-rewriting을 통하여 저장소 URL을 변경합니다."
-#: svn/main.c:168
-#: svnadmin/main.c:272
-#: svnsync/main.c:100
+#: svn/main.c:174 svnadmin/main.c:272 svnsync/main.c:131
msgid "read user configuration files from directory ARG"
msgstr "arg로 지정된 디렉토리에서 사용자 구성화일을 읽습니다."
-#: svn/main.c:170
+#: svn/main.c:176
msgid "enable automatic properties"
msgstr "자동 속성기능을 활성화합니다."
-#: svn/main.c:172
+#: svn/main.c:178
msgid "disable automatic properties"
msgstr "자동 속성기능을 비활성화합니다."
-#: svn/main.c:174
+#: svn/main.c:180
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -5956,37 +6019,44 @@
"행종료문자를 표준 시스템 문자가 아닌\n"
" 파일의 svn:eol-style 속성을\n"
" 'native'로 두어 다른 것을 사용합니다.\n"
-" ARG는 'LF', 'CR', 'CRLF' 중의 하나가 될 수 있습니다."
+" ARG는 'LF', 'CR', 'CRLF' 중의 하나가 될 수 있습니"
+"다."
-#: svn/main.c:182
+#: svn/main.c:188
msgid "maximum number of log entries"
msgstr "로그 개수의 최대값"
-#: svn/main.c:184
+#: svn/main.c:190
msgid "don't unlock the targets"
msgstr "대상의 잠금을 해제하지 않고 진행합니다."
-#: svn/main.c:186
+#: svn/main.c:192
msgid "show a summary of the results"
msgstr "요약된 결과 보기"
-#: svn/main.c:188
+#: svn/main.c:194
msgid "remove changelist association"
msgstr "변경 목록 관계를 제거합니다."
-#: svn/main.c:190
+#: svn/main.c:196
msgid "operate only on members of changelist ARG"
msgstr "변경 목록 ARG에 있는 것에만 가능한 명령입니다."
-#: svn/main.c:192
+#: svn/main.c:198
msgid "don't delete changelist after commit"
msgstr "커밋후에 변경 목록을 삭제하지 않습니다."
-#: svn/main.c:194
+#: svn/main.c:200
msgid "keep path in working copy"
msgstr "작업사본의 경로를 유지합니다"
-#: svn/main.c:233
+#: svn/main.c:202
+msgid ""
+"set revision property ARG in new revision\n"
+" using the name=value format"
+msgstr ""
+
+#: svn/main.c:244
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -5996,7 +6066,7 @@
"추가하도록 스케쥴링 되며, 다음 커밋할 때, 추가됩니다.\n"
"사용법: add PATH...\n"
-#: svn/main.c:241
+#: svn/main.c:252
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -6012,7 +6082,7 @@
" REV가 지정되면, 지정된 REV에서부터 찾아 보여줍니다.\n"
" \n"
-#: svn/main.c:251
+#: svn/main.c:262
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -6026,17 +6096,18 @@
" REV가 지정되면, 지정된 REV에서부터 찾아 출력합니다.\n"
" \n"
-#: svn/main.c:259
+#: svn/main.c:270
+#, fuzzy
msgid ""
"Associate (or deassociate) local paths with changelist CLNAME.\n"
"usage: 1. changelist CLNAME TARGET...\n"
-" 2. changelist --clear TARGET...\n"
+" 2. changelist --remove TARGET...\n"
msgstr ""
"변경 목록 CLNAME과 현재 경로를 연관(해제)시킵니다.\n"
"사용법: 1. changelist CLNAME TARGET...\n"
" 2. changelist --clear TARGET...\n"
-#: svn/main.c:265
+#: svn/main.c:277
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6071,7 +6142,8 @@
" 사용됩니다.\n"
" \n"
" 현 작업 사본에 관리대상으로 추가되지 않은 파일이 존재하고, checkout 할\n"
-" URL에 같은 이름의 파일이 관리대상으로 이미 존재하는 경우 오류를 내게 됩니다.\n"
+" URL에 같은 이름의 파일이 관리대상으로 이미 존재하는 경우 오류를 내게 됩니"
+"다.\n"
" 이 경우 --force 를 주게되면, 오류가 나지 않으며, 저장소의 관리대상으로\n"
" 취급하게 됩니다. 두 대응되는 대상이 같은 형식(파일 또는 디렉토리)이면,\n"
" 파일의 경우 저장소의 내용과 다른 것이 작업사본에 있는 경우 저장소에서 \n"
@@ -6082,7 +6154,7 @@
" 이렇게 충돌나는 대상에 대해서는 처음 컬럼에 'E'가 나타나게 됩니다.\n"
"\n"
-#: svn/main.c:290
+#: svn/main.c:302
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6092,7 +6164,7 @@
"중단된 명령을 재개합니다.\n"
"사용법: cleanup [PATH...]\n"
-#: svn/main.c:297
+#: svn/main.c:309
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6110,7 +6182,7 @@
" 잠긴 파일이 있거나, 잠긴 파일이 들어 있는 디렉토리는\n"
" 성공적으로 커밋이 되면 잠금이 해제가 됩니다.\n"
-#: svn/main.c:305
+#: svn/main.c:317
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6130,7 +6202,7 @@
" 잠긴 파일이 있거나, 잠긴 파일이 들어 있는 디렉토리는\n"
" 성공적으로 커밋이 되면 잠금이 해제가 됩니다.\n"
-#: svn/main.c:320
+#: svn/main.c:332
msgid ""
"Duplicate something in working copy or repository, remembering history.\n"
"usage: copy SRC[@REV]... DST\n"
@@ -6158,7 +6230,7 @@
" URL -> URL: 서버상에서 바로 복사함; 브랜치 & 태그를 만들 때 사용됨\n"
" 모든 SRC들은 같은 종류의 것이어야 합니다.\n"
-#: svn/main.c:336
+#: svn/main.c:348
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -6187,11 +6259,12 @@
" 2. URL로 지정된 아이템들은 저장소에서 즉시 삭제됩니다.\n"
"\n"
-#: svn/main.c:354
+#: svn/main.c:366
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
-" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n"
+" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
+"\\\n"
" [PATH...]\n"
" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
"\n"
@@ -6206,7 +6279,8 @@
" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. \n"
-" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default\n"
+" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
+"default\n"
" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
"\n"
" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
@@ -6215,32 +6289,42 @@
msgstr ""
"두 경로상의 차이점을 출력합니다.\n"
"사용법: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
-" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n"
+" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
+"\\\n"
" [PATH...]\n"
" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
"\n"
-" 1. REV 리비전에 있는 TARGET들이 N,M 두 리비전에서의 어떤 내용 변경이 있는지\n"
-" 보여줍니다. TARGET들은 모두가 작업사본 경로이거나 모두가 URL일 수 있습니다.\n"
+" 1. REV 리비전에 있는 TARGET들이 N,M 두 리비전에서의 어떤 내용 변경이 있는"
+"지\n"
+" 보여줍니다. TARGET들은 모두가 작업사본 경로이거나 모두가 URL일 수 있습니"
+"다.\n"
"\n"
" TARGET 중에 작업사본내의 경로이면서 N이 생략되면 BASE가 사용되고,\n"
-" 경로가 아니면 N은 반드시 명시되어야합니다. 또한 작업사본내의 경로이면서,\n"
+" 경로가 아니면 N은 반드시 명시되어야합니다. 또한 작업사본내의 경로이면"
+"서,\n"
" M이 생략되면 작업중인 파일이 사용되고, URL의 경우 HEAD가 사용됩니다.\n"
" '-c M' 옵션은 N = M-1 인 '-r N:M' 옵션과 같습니다.\n"
" '-c -M' 은 반대로 수행됩니다. 즉 '-r M:N, (N=M-1)'로 수행합니다.\n"
"\n"
-" 2. OLDREV 리비전의 OLD-TGT와 NEWREV 리비전의 NEW-TGT의 차이를 보여줍니다.\n"
-" PATH가 주어지면, OLD-TGT와 NEW-TGT에 대한 상대 경로를 구하여 차이를 보여주며,\n"
+" 2. OLDREV 리비전의 OLD-TGT와 NEWREV 리비전의 NEW-TGT의 차이를 보여줍니"
+"다.\n"
+" PATH가 주어지면, OLD-TGT와 NEW-TGT에 대한 상대 경로를 구하여 차이를 보여"
+"주며,\n"
" 출력은 그 경로에 대한 것으로 제한됩니다.\n"
-" OLD-TGT와 NEW-TGT는 모두 작업 사본내의 경로나 URL[@REV]로 표현될 수 있습니다.\n"
-" NEW-TGT가 생략되면 OLD-TGT를 사용합니다. -r N은 OLD-TGT의 디폴트 리비전을 N으로\n"
-" -r N:M 은 OLDREV의 디폴트 리비전을 N으로 NEW-TGT에 대해선 M으로 처리합니다.\n"
+" OLD-TGT와 NEW-TGT는 모두 작업 사본내의 경로나 URL[@REV]로 표현될 수 있습"
+"니다.\n"
+" NEW-TGT가 생략되면 OLD-TGT를 사용합니다. -r N은 OLD-TGT의 디폴트 리비전"
+"을 N으로\n"
+" -r N:M 은 OLDREV의 디폴트 리비전을 N으로 NEW-TGT에 대해선 M으로 처리합니"
+"다.\n"
" -c M 은 OLDREV의 기본값을 M-1로 NEWREV의 기본값을 M으로 처리합니다.\n"
"\n"
-" 3. 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]' 의 줄임 표현입니다.\n"
+" 3. 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]' 의 줄임 표현입"
+"니다.\n"
"\n"
" 'svn diff' 을 사용하면 작업 중 수정된 내용을 볼 수 있습니다.\n"
-#: svn/main.c:384
+#: svn/main.c:396
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6279,7 +6363,7 @@
" PEGREV가 지정될 경우엔, 어떤 리비젼에서 대상을 먼저 찾을지 결정합니다.\n"
" \n"
-#: svn/main.c:407
+#: svn/main.c:419
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -6287,7 +6371,7 @@
"본 프로그램과 그 하위 명령들에 대한 사용법을 보여줍니다.\n"
"usage: help [SUBCOMMAND...]\n"
-#: svn/main.c:413
+#: svn/main.c:425
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -6307,7 +6391,7 @@
" PATH가 디렉토리이면, 그 내용은 URL에 모두 추가 됩니다.\n"
" \n"
-#: svn/main.c:426
+#: svn/main.c:438
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -6322,7 +6406,7 @@
" 각 PATH에 해당하는 정보를 출력합니다. (기본값: '.').\n"
" PATH는 작업 사본 경로 혹은 URL이 될 수 있습니다.\n"
-#: svn/main.c:436
+#: svn/main.c:449
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -6361,7 +6445,7 @@
" 크기(바이트)\n"
" 마지막 커밋한 날짜와 시각\n"
-#: svn/main.c:458
+#: svn/main.c:471
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -6373,17 +6457,18 @@
"커밋할 수 없습니다.\n"
"사용법: lock TARGET...\n"
"\n"
-" --force 를 사용하면 다른 사람이나 다른 사본에서 잠궜을지라도 빼앗아옵니다.\n"
+" --force 를 사용하면 다른 사람이나 다른 사본에서 잠궜을지라도 빼앗아옵니"
+"다.\n"
-#: svn/main.c:466
+#: svn/main.c:479
msgid "read lock comment from file ARG"
msgstr "arg에서 잠금 메시지를 읽습니다."
-#: svn/main.c:467
+#: svn/main.c:480
msgid "specify lock comment ARG"
msgstr "arg에 잠금 메시지를 지정합니다."
-#: svn/main.c:470
+#: svn/main.c:483
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -6437,7 +6522,7 @@
" svn log http://www.example.com/repo/project/foo.c\n"
" svn log http://www.example.com/repo/project foo.c bar.c\n"
-#: svn/main.c:500
+#: svn/main.c:513
msgid ""
"Apply the differences between two sources to a working copy path.\n"
"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -6477,8 +6562,10 @@
" 이 경우 리비전이 반드시 지정되어야 합니다.\n"
" \n"
" \n"
-" 3. 세번째 형식에서는 SOURCE에는 특정 URL, 혹은 작업중인 파일을 지정합니다.\n"
-" 파일인 경우 해당 URL을 구하여 비교대상으로 합니다. 그 URL의 리비전 REV의\n"
+" 3. 세번째 형식에서는 SOURCE에는 특정 URL, 혹은 작업중인 파일을 지정합니"
+"다.\n"
+" 파일인 경우 해당 URL을 구하여 비교대상으로 합니다. 그 URL의 리비전 REV"
+"의\n"
" 내용을 리비전 N과 M의 내용과 비교하게 됩니다. REV가 누락되면 HEAD로\n"
" 가정합니다.\n"
" '-c M' 옵션은 N = M-1 인 '-r N:M' 옵션과 같습니다.\n"
@@ -6486,10 +6573,11 @@
"\n"
" WCPATH는 작업사본의 경로이며 병합되는 내용이 반영되는 곳입니다.\n"
" WCPATH를 생략하면, SOURCE의 마지막 요소인 파일과 같은 이름이 현재\n"
-" 디렉토리안에 있다면 그 파일에 반영되며, 그렇지 않는 경우 '.'을 가정하게 됩니다.\n"
+" 디렉토리안에 있다면 그 파일에 반영되며, 그렇지 않는 경우 '.'을 가정하게 됩"
+"니다.\n"
" \n"
-#: svn/main.c:529
+#: svn/main.c:543
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -6519,7 +6607,7 @@
"\n"
" 두 경우 생성될 디렉토리 상위의 디렉토리들은 존재해야만 합니다.\n"
-#: svn/main.c:546
+#: svn/main.c:560
msgid ""
"Move and/or rename something in working copy or repository.\n"
"usage: move SRC... DST\n"
@@ -6535,7 +6623,8 @@
" URL -> URL: complete server-side rename.\n"
" All the SRCs must be of the same type.\n"
msgstr ""
-"작업 사본내 혹은 저장소 안의 파일이나 디렉토리를 이동하거나, 이름을 바꿉니다.\n"
+"작업 사본내 혹은 저장소 안의 파일이나 디렉토리를 이동하거나, 이름을 바꿉니"
+"다.\n"
"사용법: move SRC DST\n"
"복수의 원본들을 옮길 때, 반드시 디렉토리여야만 하는, \n"
"DST의 하위로 추가 될 것입니다.\n"
@@ -6544,11 +6633,12 @@
" 주의: --revision 옵션은 더 이상 사용되지 않습니다.\n"
"\n"
" SRC와 DST 는 둘다 작업사본 혹은 URL이어야 합니다.\n"
-" WC -> WC: 작업 사본내에서 바로 이동 후, 추가하도록 스케쥴링하며, 로그 메시지도 복사됩니다.\n"
+" WC -> WC: 작업 사본내에서 바로 이동 후, 추가하도록 스케쥴링하며, 로그 "
+"메시지도 복사됩니다.\n"
" URL -> URL: 서버 상에서만 이름을 바꾸며, 바로 커밋됩니다.\n"
" 모든 SRC들은 같은 종류의 것이어야 합니다.\n"
-#: svn/main.c:563
+#: svn/main.c:577
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6566,7 +6656,7 @@
" 2. 원격지 REV 리비전의 버전관리되지 않는 속성을 제거합니다.\n"
" TARGET은 접근할 저장소를 지정합니다.\n"
-#: svn/main.c:575
+#: svn/main.c:589
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -6584,7 +6674,7 @@
" 2. 원격지의 버전관리되지 않는 속성을 편집합니다.\n"
" TARGET은 접근할 저장소를 지정합니다.\n"
-#: svn/main.c:588
+#: svn/main.c:602
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6617,7 +6707,7 @@
" (이 옵션은 바이너리 속성 출력을 재지정하여 파일에\n"
" 쓰로자 할 때 유용합니다.)\n"
-#: svn/main.c:607
+#: svn/main.c:621
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6637,7 +6727,7 @@
" 2. 원격지의 버전관리 대상이 아닌 속성을 출력.\n"
" TARGET은 접근할 저장소를 지정합니다.\n"
-#: svn/main.c:619
+#: svn/main.c:633
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -6653,9 +6743,11 @@
" but will store any arbitrary properties set:\n"
" svn:ignore - A newline separated list of file patterns to ignore.\n"
" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
-" URL, HeadURL - The URL for the head version of the object.\n"
+" URL, HeadURL - The URL for the head version of the "
+"object.\n"
" Author, LastChangedBy - The last person to modify the file.\n"
-" Date, LastChangedDate - The date/time the object was last modified.\n"
+" Date, LastChangedDate - The date/time the object was last "
+"modified.\n"
" Rev, Revision, - The last revision the object changed.\n"
" LastChangedRevision\n"
" Id - A compressed summary of the previous\n"
@@ -6681,7 +6773,8 @@
msgstr ""
"파일, 디렉토리, 리비전의 PROPNAME 속성을 PROPVAL 값으로 설정합니다.\n"
"사용법: 1. propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2. propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [TARGET]\n"
+" 2. propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] "
+"[TARGET]\n"
"\n"
" 1. 작업 사본내에서 속성 값을 만듭니다.\n"
" 2. 저장소 리비전에 버전관리하지 않는 속성을 만듭니다.\n"
@@ -6690,8 +6783,10 @@
" PROVAL 값은 --file 로 지정하여 줄 수도 있습니다.\n"
" 참고: svn은 다음과 같은 특별한 '버전관리' 속성을 인식합니다.\n"
" 이 외에도 임의의 원하는 속성을 설정할 수 있습니다.\n"
-" svn:ignore - 한 줄에 하나씩 값을 주어 커밋, 업데이트 등에서 무시하는 목록을 지정합니다.\n"
-" svn:keywords - 본문 내에 치환될 키워드 목록을 지정합니다. 다음은 가능한 값들입니다.\n"
+" svn:ignore - 한 줄에 하나씩 값을 주어 커밋, 업데이트 등에서 무시하는 "
+"목록을 지정합니다.\n"
+" svn:keywords - 본문 내에 치환될 키워드 목록을 지정합니다. 다음은 가능"
+"한 값들입니다.\n"
" URL, HeadURL - 개체의 최신 버전의 URL.\n"
" Author, LastChangedBy - 최종 파일 수정 작업자.\n"
" Date, LastChangedDate - 최종 파일 수정 날짜/시각.\n"
@@ -6699,30 +6794,33 @@
" LastChangedRevision\n"
" Id - 위 네가지 키워드를 종합한 포맷.\n"
" \n"
-" svn:executable - 속성이 존재하면, 체크아웃, 업데이트 후에 파일을 실행가능 하도록 만듭니다.\n"
+" svn:executable - 속성이 존재하면, 체크아웃, 업데이트 후에 파일을 실행가"
+"능 하도록 만듭니다.\n"
" svn:eol-style - 다음 중 하나 'native', 'LF', 'CR', 'CRLF'.\n"
" svn:mime-type - 파일의 MIME 형식을 지정합니다. \n"
" 이 속성은 병합하는데 사용되며, Apache 웹서버가 사용합니다.\n"
" 'text/' 로 시작하는 MIME 형식은 텍스트로 취급하며,\n"
" 그외의 것은 바이너리로 취급됩니다.\n"
" svn:externals - 한 줄에 하나씩 지정하는 외부 모듈 리스트입니다.\n"
-" 각각은 현재 디렉토리에 대해 체크아웃, 업데이트시에 상대 디렉토리 경로로 만들어 지며,\n"
+" 각각은 현재 디렉토리에 대해 체크아웃, 업데이트시에 상대 디렉토리 경로"
+"로 만들어 지며,\n"
" URL을 하나 지정해야하며, 추가적으로 리비전 플래그를 넣을 수 있습니다.\n"
" foo http://example.com/repos/zig\n"
" foo/bar -r 1234 http://example.com/repos/zag\n"
" svn:needs-lock - 지정되면, 수정되기 전에 반드시 잠궈져야 합니다.\n"
" 잠궈지기 전에는 작업사본에서는 항상 읽기 전용으로 만들어 집니다.\n"
" \n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type, svn-needs-lock\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type, svn-needs-"
+"lock\n"
" 속성들은 디렉토리에는 지정할 수 없으며, 설정시 재귀적으로 수행되는 명령이\n"
" 아니라면, 디렉토리에 대해서는 실패하며, 재귀적일 경우 파일에 대해서만\n"
" 설정됩니다.\n"
-#: svn/main.c:661
+#: svn/main.c:675
msgid "read property value from file ARG"
msgstr "arg에서 속성 값을 읽습니다."
-#: svn/main.c:664
+#: svn/main.c:678
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -6738,7 +6836,7 @@
" 단지 충돌 표시만을 없앨 뿐입니다. 충돌 요소들과 관련된 파일만\n"
" 삭제하며, 다시 커밋할 수 있는 상태로 만들어줍니다.\n"
-#: svn/main.c:673
+#: svn/main.c:688
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -6746,13 +6844,16 @@
" Note: this subcommand does not require network access, and resolves\n"
" any conflicted states. However, it does not restore removed directories.\n"
msgstr ""
-"작업 사본을 받아 왔던 최초 상태로 되돌립니다. (작업한 내용을 모두 되돌립니다.)\n"
+"작업 사본을 받아 왔던 최초 상태로 되돌립니다. (작업한 내용을 모두 되돌립니"
+"다.)\n"
"사용법: revert PATH...\n"
"\n"
-" 주의: 본 부속 명령은 네트워크 요청이 전혀 필요하지 않습니다. 또한 충돌한 상황을\n"
-" 해결하지 않습니다. 그리고, 삭제된 디렉토리에 대해서는 다시 되돌려놓지 않습니다.\n"
+" 주의: 본 부속 명령은 네트워크 요청이 전혀 필요하지 않습니다. 또한 충돌한 상"
+"황을\n"
+" 해결하지 않습니다. 그리고, 삭제된 디렉토리에 대해서는 다시 되돌려놓지 않습"
+"니다.\n"
-#: svn/main.c:682
+#: svn/main.c:697
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -6856,7 +6957,8 @@
" 네번째컬럼: 과거의 커밋로그를 포함하도록 스케쥴링하는지를 나타냅니다..\n"
" ' ' 과거의 커밋로그 포함하지 않음\n"
" '+' 과거의 커밋로그 포함함\n"
-" 다섯번째컬럼: 아이템이 상위 경로에 대하여 전환(switch)되었는지를 나타냅니다.\n"
+" 다섯번째컬럼: 아이템이 상위 경로에 대하여 전환(switch)되었는지를 나타냅니"
+"다.\n"
" ' ' 기본\n"
" 'S' 전환됨\n"
" 여섯번째컬럼: 저장소 잠금 토큰\n"
@@ -6898,7 +7000,7 @@
" 965 687 joe wc/zig.c\n"
" Status against revision: 981\n"
-#: svn/main.c:758
+#: svn/main.c:773
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL [PATH]\n"
@@ -6930,7 +7032,8 @@
"\n"
" 1. 작업사본을 저장소내의 새 URL로 미러링을 합니다.\n"
" 'svn update'와 비슷한 일을 합니다. 하지만 이것은\n"
-" 작업사본의 URL을 같은 저장소내의 브랜치나 태그로 전환하는데 사용합니다.\n"
+" 작업사본의 URL을 같은 저장소내의 브랜치나 태그로 전환하는데 사용합니"
+"다.\n"
"\n"
" 2. 작업 사본 하위 디렉토리에는 checkout 할 때의 URL 정보가 들어 있는 \n"
" 메타정보가 있습니다. 이 정보를 새 URL로 갱신합니다.\n"
@@ -6938,8 +7041,10 @@
" 작업사본의 구조는 그대로 유지합니다.\n"
"\n"
" 현 작업 사본에 관리대상으로 추가되지 않은 파일이 존재하고, switch를 할\n"
-" URL에 같은 이름의 파일이 관리대상으로 이미 존재하는 경우 오류를 내게 됩니다.\n"
-" 이 경우 --force 를 주게되면, 오류가 나지 않으며, switch될 URL의 관리대상으로\n"
+" URL에 같은 이름의 파일이 관리대상으로 이미 존재하는 경우 오류를 내게 됩니"
+"다.\n"
+" 이 경우 --force 를 주게되면, 오류가 나지 않으며, switch될 URL의 관리대상으"
+"로\n"
" 취급하게 됩니다. 두 대응되는 대상이 같은 형식(파일 또는 디렉토리)이면,\n"
" 파일의 경우 저장소의 내용과 다른 것이 작업사본에 있는 경우 저장소에서 \n"
" 꺼내온 뒤 수정한 것으로 봅니다. 즉, 현 작업 사본의 내용이 바뀌지\n"
@@ -6948,7 +7053,7 @@
" 또한, 저장소에 있는 대상의 속성들이 모두 작업사본에 적용됩니다.\n"
" 즉, switch 명령으로 내용은 변하지 않으며, 메타 정보와 속성이 변경됩니다.\n"
-#: svn/main.c:785
+#: svn/main.c:801
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -6960,7 +7065,7 @@
"\n"
" --force 를 사용하면 강제로 해제합니다.\n"
-#: svn/main.c:793
+#: svn/main.c:809
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -7016,7 +7121,8 @@
" 의미합니다.\n"
"\n"
" 현 작업 사본에 관리대상으로 추가되지 않은 파일이 존재하고, update를 할\n"
-" URL에 같은 이름의 파일이 관리대상으로 이미 존재하는 경우 오류를 내게 됩니다.\n"
+" URL에 같은 이름의 파일이 관리대상으로 이미 존재하는 경우 오류를 내게 됩니"
+"다.\n"
" 이 경우 --force 를 주게되면, 오류가 나지 않으며, 저장소의 관리대상으로\n"
" 취급하게 됩니다. 두 대응되는 대상이 같은 형식(파일 또는 디렉토리)이면,\n"
" 파일의 경우 저장소의 내용과 다른 것이 작업사본에 있는 경우 저장소에서 \n"
@@ -7027,74 +7133,85 @@
" 이렇게 충돌나는 대상에 대해서는 처음 컬럼에 'E'가 나타나게 됩니다.\n"
"\n"
-#: svn/main.c:869
-#: svnadmin/main.c:78
-#: svnlook/main.c:285
-#: svnsync/main.c:146
+#: svn/main.c:885 svnadmin/main.c:78 svnlook/main.c:289 svnsync/main.c:180
msgid "Caught signal"
msgstr "시그널 수신"
-#: svn/main.c:981
+#: svn/main.c:904
+#, fuzzy
+msgid "Revision property pair is empty"
+msgstr "리비전 엔트리가 리스트 구조체가 아닙니다."
+
+#: svn/main.c:1034
msgid "Non-numeric limit argument given"
msgstr "숫자를 입력해야 합니다."
-#: svn/main.c:987
+#: svn/main.c:1040
msgid "Argument to --limit must be positive"
msgstr "--limit의 인자는 반드시 양수여야합니다."
-#: svn/main.c:1007
-msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r"
+#: svn/main.c:1060
+msgid ""
+"Multiple revision arguments encountered; can't specify -c twice, or both -c "
+"and -r"
msgstr "복수의 리비전 인자를 받았습니다. -c 를 두번 지정할 수 없습니다."
-#: svn/main.c:1015
-#: svn/main.c:1206
+#: svn/main.c:1068 svn/main.c:1290
msgid "Can't specify -c with --old"
msgstr "--old 와 같이 -c 옵션을 지정할 수 없습니다"
-#: svn/main.c:1022
+#: svn/main.c:1075
msgid "Non-numeric change argument given to -c"
msgstr "-c 인자로 숫자를 입력해야 합니다."
-#: svn/main.c:1028
+#: svn/main.c:1081
msgid "There is no change 0"
msgstr "0번에 대해 변경 내역이 없습니다."
-#: svn/main.c:1055
-msgid "Multiple revision arguments encountered; can't specify -r and -c, or try '-r N:M' instead of '-r N -r M'"
-msgstr "복수의 리비전 인자를 받았습니다. -r과 -c릉 지정할 수 없으며, 또는 '-r M -r N' 대신 '-r M:N' 을 사용하세요."
+#: svn/main.c:1108
+msgid ""
+"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
+"N:M' instead of '-r N -r M'"
+msgstr ""
+"복수의 리비전 인자를 받았습니다. -r과 -c릉 지정할 수 없으며, 또는 '-r M -r "
+"N' 대신 '-r M:N' 을 사용하세요."
-#: svn/main.c:1068
-#: svnadmin/main.c:1314
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "리비전 인자 '%s'안에 구문오류가 있습니다."
-#: svn/main.c:1222
-#: svn/main.c:1232
+#: svn/main.c:1194
+#, c-format
+msgid "Error converting depth from locale to UTF8"
+msgstr ""
+
+#: svn/main.c:1214
+#, fuzzy, c-format
+msgid "'%s' is not a valid depth; try 0, 1, or 2"
+msgstr "'%s'는 올바른 subversion 속성 이름이 아닙니다"
+
+#: svn/main.c:1306 svn/main.c:1316
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props 와 --no-auto-props 는 동시에 올 수 없습니다."
-#: svn/main.c:1248
+#: svn/main.c:1332
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "native-eol 인자 '%s' 에 구문오류가 있습니다."
-#: svn/main.c:1324
-#: svndumpfilter/main.c:1207
-#: svnlook/main.c:2048
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "인자가 필요한 명령입니다.\n"
-#: svn/main.c:1343
-#: svnadmin/main.c:1443
-#: svndumpfilter/main.c:1226
-#: svnlook/main.c:2067
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
+#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "알 수 없는 명령: '%s'\n"
-#: svn/main.c:1376
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7103,36 +7220,51 @@
"'%s' 명령은 '%s' 를 옵션으로 취하지 않습니다.\n"
"'svn help %s' 로 사용법을 보십시오.\n"
-#: svn/main.c:1413
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
-msgstr "로그 메시지 파일은 버전관리 대상입니다. 강제로 지정하려면 '--force-log' 를 사용하세요."
+msgstr ""
+"로그 메시지 파일은 버전관리 대상입니다. 강제로 지정하려면 '--force-log' 를 사"
+"용하세요."
-#: svn/main.c:1420
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "잠그는 이유에 대한 파일이 버전관리 대상입니다. 강제로 지정하려면 '--force-log' 를 사용하세요."
+msgstr ""
+"잠그는 이유에 대한 파일이 버전관리 대상입니다. 강제로 지정하려면 '--force-"
+"log' 를 사용하세요."
-#: svn/main.c:1440
-msgid "The log message is a pathname (was -F intended?); use '--force-log' to override"
-msgstr "로그 메시지가 경로명입니다. (-F 를 사용하려던 것인가요?) 강제로 사용하려면 '--force-log'를 사용하세요"
+#: svn/main.c:1526
+msgid ""
+"The log message is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr ""
+"로그 메시지가 경로명입니다. (-F 를 사용하려던 것인가요?) 강제로 사용하려면 "
+"'--force-log'를 사용하세요"
-#: svn/main.c:1447
-msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override"
-msgstr "잠그는 이유를 경로명으로 하였습니다. (-F 를 사용하려던 것인가요?) 강제로 사용하려면 '--force-log'를 사용하세요"
+#: svn/main.c:1533
+msgid ""
+"The lock comment is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr ""
+"잠그는 이유를 경로명으로 하였습니다. (-F 를 사용하려던 것인가요?) 강제로 사용"
+"하려면 '--force-log'를 사용하세요"
-#: svn/main.c:1582
+#: svn/main.c:1668
msgid "Try 'svn help' for more info"
msgstr "더 많은 정보를 위해 'svn help'를 이용해 보세요"
-#: svn/main.c:1592
-msgid "svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)\n"
-msgstr "svn: 'svn cleanup'은 잠금 파일을 제거합니다. ('svn help cleanup'은 자세한 설명을 보여줍니다)\n"
+#: svn/main.c:1678
+msgid ""
+"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
+"details)\n"
+msgstr ""
+"svn: 'svn cleanup'은 잠금 파일을 제거합니다. ('svn help cleanup'은 자세한 설"
+"명을 보여줍니다)\n"
#: svn/merge-cmd.c:59
msgid "Second revision required"
msgstr "두 번째 리비전이 필요합니다"
-#: svn/merge-cmd.c:73
-#: svn/merge-cmd.c:97
+#: svn/merge-cmd.c:73 svn/merge-cmd.c:97
msgid "Too many arguments given"
msgstr "많은 인자가 주어졌습니다."
@@ -7140,7 +7272,7 @@
msgid "A working copy merge source needs an explicit revision"
msgstr "작업사본에 대한 병합은 원본을 명시적으로 적어줘야 합니다."
-#: svn/mkdir-cmd.c:84
+#: svn/mkdir-cmd.c:87
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "'svn add' 또는 'svn add --non-recursive' 를 사용하세요."
@@ -7308,13 +7440,13 @@
msgstr "'%s' 는 잠금이 해제 되었습니다.\n"
#: svn/notify.c:394
-#, c-format
-msgid "Path '%s' is now part of changelist '%s'.\n"
+#, fuzzy, c-format
+msgid "Path '%s' is now a member of changelist '%s'.\n"
msgstr "경로 '%s' 은/는 이제 변경 목록 '%s' 에 없습니다.\n"
-#: svn/notify.c:401
-#, c-format
-msgid "Path '%s' is no longer associated with a changelist.\n"
+#: svn/notify.c:402
+#, fuzzy, c-format
+msgid "Path '%s' is no longer a member of a changelist.\n"
msgstr "경로 '%s'은/는 더 이상 변경 목록과 관계없습니다.\n"
#: svn/propdel-cmd.c:77
@@ -7327,12 +7459,12 @@
msgid "Cannot specify revision for deleting versioned property '%s'"
msgstr "버전관리 되는 '%s' 속성을 제거하기 위해 리비전을 지정할 수 없습니다."
-#: svn/propdel-cmd.c:116
+#: svn/propdel-cmd.c:124
#, c-format
msgid "property '%s' deleted (recursively) from '%s'.\n"
msgstr "속성 '%s' 이 (재귀적으로) '%s'에서 삭제되었습니다.\n"
-#: svn/propdel-cmd.c:117
+#: svn/propdel-cmd.c:125
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "속성 '%s' 이 '%s'에서 삭제되었습니다.\n"
@@ -7342,9 +7474,7 @@
msgid "'%s' is not a valid Subversion property name"
msgstr "'%s'는 올바른 subversion 속성 이름이 아닙니다"
-#: svn/propedit-cmd.c:105
-#: svn/propedit-cmd.c:241
-#: svn/propset-cmd.c:85
+#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:243 svn/propset-cmd.c:85
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr "잘못된 인코딩 옵션: 속성 값이 UTF8으로 저장되어 있지 않습니다."
@@ -7363,23 +7493,21 @@
msgid "Cannot specify revision for editing versioned property '%s'"
msgstr "버전관리 되는 '%s' 속성을 편집하기 위해 리비전을 지정할 수 없습니다."
-#: svn/propedit-cmd.c:154
-#: svn/propset-cmd.c:158
+#: svn/propedit-cmd.c:154 svn/propset-cmd.c:161
msgid "Explicit target argument required"
msgstr "대상 인자를 명시적으로 넣어주세요."
-#: svn/propedit-cmd.c:211
-#: svn/switch-cmd.c:140
+#: svn/propedit-cmd.c:213 svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "'%s' 은 작업 사본 경로로 보이지 않습니다."
-#: svn/propedit-cmd.c:264
+#: svn/propedit-cmd.c:268
#, c-format
msgid "Set new value for property '%s' on '%s'\n"
msgstr "속성('%s'; '%s')을 새로이 설정합니다\n"
-#: svn/propedit-cmd.c:274
+#: svn/propedit-cmd.c:278
#, c-format
msgid "No changes to property '%s' on '%s'\n"
msgstr "속성('%s'; '%s')에 변화가 없습니다.\n"
@@ -7395,8 +7523,12 @@
msgstr "리비전 속성(%ld):\n"
#: svn/props.c:53
-msgid "Must specify the revision as a number, a date or 'HEAD' when operating on a revision property"
-msgstr "리비전 속성에 대해 명령을 수행할 경우는 반드시 숫자나 날짜 혹은 'HEAD'로 리비전 속성을 명시해야 합니다."
+msgid ""
+"Must specify the revision as a number, a date or 'HEAD' when operating on a "
+"revision property"
+msgstr ""
+"리비전 속성에 대해 명령을 수행할 경우는 반드시 숫자나 날짜 혹은 'HEAD'로 리비"
+"전 속성을 명시해야 합니다."
#: svn/props.c:60
msgid "Wrong number of targets specified"
@@ -7416,26 +7548,26 @@
msgid "Cannot specify revision for setting versioned property '%s'"
msgstr "버전관리되는 속성 '%s'에는 리버전을 명시할 수 없습니다."
-#: svn/propset-cmd.c:151
+#: svn/propset-cmd.c:154
#, c-format
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr "대상을 명시해야합니다. ('%s' 는 속성값으로 인식됩니다.)"
-#: svn/propset-cmd.c:184
+#: svn/propset-cmd.c:191
#, c-format
msgid "property '%s' set (recursively) on '%s'\n"
msgstr "속성 '%s'을/를 (재귀적으로) '%s'에 설정하였습니다.\n"
-#: svn/propset-cmd.c:185
+#: svn/propset-cmd.c:192
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "속성 '%s' 를 '%s'에 설정합니다.\n"
-#: svn/revert-cmd.c:86
+#: svn/revert-cmd.c:93
msgid "Try 'svn revert --recursive' instead?"
msgstr "'svn revert --recursive' 를 사용하세요."
-#: svn/status-cmd.c:293
+#: svn/status-cmd.c:298
#, c-format
msgid ""
"\n"
@@ -7454,7 +7586,7 @@
msgid "'%s' to '%s' is not a valid relocation"
msgstr "'%s'에서 '%s'로 재배치 할 수 없습니다."
-#: svn/util.c:60
+#: svn/util.c:61
#, c-format
msgid ""
"\n"
@@ -7463,7 +7595,7 @@
"\n"
"커밋된 리비전 %ld.\n"
-#: svn/util.c:68
+#: svn/util.c:69
#, c-format
msgid ""
"\n"
@@ -7472,69 +7604,89 @@
"\n"
"경고: %s\n"
-#: svn/util.c:136
-msgid "None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and no 'editor-cmd' run-time configuration option was found"
-msgstr "환경변수 SVN_EDITOR, VISUAL, EDITOR 중 하나는 설정하거나, 'editor-cmd' 를 구성화일에 명시해야합니다."
+#: svn/util.c:145
+msgid ""
+"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
+"time configuration option is empty or consists solely of whitespace. "
+"Expected a shell command."
+msgstr ""
-#: svn/util.c:162
+#: svn/util.c:152
+msgid ""
+"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
+"no 'editor-cmd' run-time configuration option was found"
+msgstr ""
+"환경변수 SVN_EDITOR, VISUAL, EDITOR 중 하나는 설정하거나, 'editor-cmd' 를 구"
+"성화일에 명시해야합니다."
+
+#: svn/util.c:178
#, c-format
msgid "Can't get working directory"
msgstr "작업 사본 디렉토리를 구할 수 없습니다."
-#: svn/util.c:173
-#: svn/util.c:196
+#: svn/util.c:189 svn/util.c:212
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "작업 사본 디렉토리를 '%s'로 바꿀 수 없습니다."
-#: svn/util.c:221
+#: svn/util.c:237
#, c-format
msgid "Can't write to '%s'"
msgstr "'%s' 에 쓸 수 없습니다."
-#: svn/util.c:266
+#: svn/util.c:282
#, c-format
msgid "system('%s') returned %d"
msgstr "system('%s') 가 %d 을/를 반환합니다."
-#: svn/util.c:307
+#: svn/util.c:323
msgid "Error normalizing edited contents to internal format"
msgstr "수정된 내용을 내부 포맷으로 정규화 도중 오류 발생"
-#: svn/util.c:338
+#: svn/util.c:354
#, c-format
msgid "Can't restore working directory"
msgstr "작업 사본 디렉토리를 재설치할 수 없습니다."
-#: svn/util.c:380
+#: svn/util.c:396
msgid "Log message contains a zero byte"
msgstr "로그 메시지의 길이가 0 입니다."
-#: svn/util.c:440
+#: svn/util.c:456
msgid "Your commit message was left in a temporary file:"
-msgstr "커밋 메시지는 다음 파일에 저장되어 있으며, -F로 재사용 할 수 있습니다. :"
+msgstr ""
+"커밋 메시지는 다음 파일에 저장되어 있으며, -F로 재사용 할 수 있습니다. :"
-#: svn/util.c:492
+#: svn/util.c:508
msgid "--This line, and those below, will be ignored--"
msgstr "--이 줄 이하는 자동으로 제거됩니다--"
-#: svn/util.c:517
+#: svn/util.c:533
msgid "Error normalizing log message to internal format"
msgstr "로그를 내부 포맷으로 정규화 도중 오류 발생"
-#: svn/util.c:532
-msgid "Use of an external editor to fetch log message is not supported on OS400; consider using the --message (-m) or --file (-F) options"
-msgstr "OS400에서는 외부 에디터를 사용할 수 없습니다. 변수를 설정하시거나; --message (-m) 또는 --file (-F) 옵션을 사용하세요."
+#: svn/util.c:548
+msgid ""
+"Use of an external editor to fetch log message is not supported on OS400; "
+"consider using the --message (-m) or --file (-F) options"
+msgstr ""
+"OS400에서는 외부 에디터를 사용할 수 없습니다. 변수를 설정하시거나; --message "
+"(-m) 또는 --file (-F) 옵션을 사용하세요."
-#: svn/util.c:618
+#: svn/util.c:634
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr "대화식이 아닐 때 로그 메세지를 얻기 위해 에디터를 실행 할 수 없습니다"
-#: svn/util.c:631
-msgid "Could not use external editor to fetch log message; consider setting the $SVN_EDITOR environment variable or using the --message (-m) or --file (-F) options"
-msgstr "로그 메시지를 구하기 위해 외부 프로그램을 사용할 수 없습니다. SVN_EDITOR 환경변수를 설정하시거나 --message (-m) 또는 --file (-F) 옵션을 사용하세요."
+#: svn/util.c:647
+msgid ""
+"Could not use external editor to fetch log message; consider setting the "
+"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
+"options"
+msgstr ""
+"로그 메시지를 구하기 위해 외부 프로그램을 사용할 수 없습니다. SVN_EDITOR 환경"
+"변수를 설정하시거나 --message (-m) 또는 --file (-F) 옵션을 사용하세요."
-#: svn/util.c:667
+#: svn/util.c:683
msgid ""
"\n"
"Log message unchanged or not specified\n"
@@ -7544,12 +7696,11 @@
"로그 메시지가 변경되지 않았거나 지정되지 않았습니다\n"
"취소(A), 계속(C), 수정(E)\n"
-#: svn/util.c:720
+#: svn/util.c:736
msgid "Use --force to override this restriction"
msgstr "강제로 적용하려면 --force 옵션을 사용하세요."
-#: svnadmin/main.c:95
-#: svndumpfilter/main.c:62
+#: svnadmin/main.c:95 svndumpfilter/main.c:62
#, c-format
msgid "Can't open stdio file"
msgstr "stdio 파일을 열 수 없습니다"
@@ -7681,7 +7832,8 @@
msgstr ""
"사용법: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
"\n"
-"요청된 리비젼 범위내에서, 경로상의 해당 리비젼에 변경된 부분을 증분 백업 해놓습니다.\n"
+"요청된 리비젼 범위내에서, 경로상의 해당 리비젼에 변경된 부분을 증분 백업 해놓"
+"습니다.\n"
"증분 백업은 오직 이전 버젼과의 차이만을 저장하여 압축합니다.\n"
"리비젼이 지정되지 않았다면,\n"
"단순히 HEAD 리비젼에서 수행됩니다.\n"
@@ -7790,12 +7942,13 @@
"모든 커밋안된 트랜잭션의 이름을 출력해줍니다.\n"
#: svnadmin/main.c:381
+#, fuzzy
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
-"Run the Berkeley DB recovery procedure on a repository. Do\n"
-"this if you've been getting errors indicating that recovery\n"
-"ought to be run. Recovery requires exclusive access and will\n"
+"Run the recovery procedure on a repository. Do this if you've\n"
+"been getting errors indicating that recovery ought to be run.\n"
+"Berkeley DB recovery requires exclusive access and will\n"
"exit if the repository is in use by another process.\n"
msgstr ""
"사용법: svnadmin recover REPOS_PATH\n"
@@ -7893,8 +8046,7 @@
msgid "Revisions must not be greater than the youngest revision (%ld)"
msgstr "리비전은 끝 최신 리비전(%ld) 보다 더 작아야합니다."
-#: svnadmin/main.c:556
-#: svnadmin/main.c:655
+#: svnadmin/main.c:556 svnadmin/main.c:655
msgid "First revision cannot be higher than second"
msgstr "첫번 째 리비젼이 두번째 보다 더 높을 수 없습니다."
@@ -7917,14 +8069,13 @@
"Available subcommands:\n"
msgstr ""
"일반적인 사용법: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"특정 부속 명령의 사용법을 위해서는 'svnadmin help <subcommand>' 를 참조하십시오.\n"
+"특정 부속 명령의 사용법을 위해서는 'svnadmin help <subcommand>' 를 참조하십시"
+"오.\n"
"'svnlook --version'으로 버전과 파일시스템 모듈을 볼 수가 있습니다.\n"
"\n"
"가능한 하위 명령 목록:\n"
-#: svnadmin/main.c:698
-#: svnlook/main.c:1674
-#: svnserve/main.c:204
+#: svnadmin/main.c:698 svnlook/main.c:1687 svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -7941,7 +8092,7 @@
"저장소 잠금을 획득했습니다.\n"
"기다려 주십시오; 저장소 복구는 시간이 소요될 수 있습니다...\n"
-#: svnadmin/main.c:810
+#: svnadmin/main.c:811
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -7949,12 +8100,14 @@
"배타적인 저장소 접근을 얻을 수 없습니다; 혹시 httpd, \n"
"svnserve 나 svn 같은 다른 프로세스들에 의해 열려있습니까?"
-#: svnadmin/main.c:815
+#: svnadmin/main.c:816
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
-msgstr "저장소 잠금을 기다리고 있습니다: 혹시 다른 프로세스에 의해 열려 있지 않습니까?\n"
+msgstr ""
+"저장소 잠금을 기다리고 있습니다: 혹시 다른 프로세스에 의해 열려 있지 않습니"
+"까?\n"
-#: svnadmin/main.c:822
+#: svnadmin/main.c:824
#, c-format
msgid ""
"\n"
@@ -7963,63 +8116,57 @@
"\n"
"복구가 완료되었습니다.\n"
-#: svnadmin/main.c:829
+#: svnadmin/main.c:831
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "가장 최근의 repos 리비젼은 %ld 입니다.\n"
-#: svnadmin/main.c:939
+#: svnadmin/main.c:941
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "트랜잭션 '%s' 가 제거되었습니다.\n"
-#: svnadmin/main.c:1007
-#: svnadmin/main.c:1034
+#: svnadmin/main.c:1009 svnadmin/main.c:1036
#, c-format
msgid "Missing revision"
msgstr "리비젼이 누락되었습니다"
-#: svnadmin/main.c:1010
-#: svnadmin/main.c:1037
+#: svnadmin/main.c:1012 svnadmin/main.c:1039
#, c-format
msgid "Only one revision allowed"
msgstr "오직 하나의 리비젼만이 허용됩니다"
-#: svnadmin/main.c:1016
+#: svnadmin/main.c:1018
#, c-format
msgid "Exactly one property name and one file argument required"
msgstr "정확하게 하나의 속성과 하나의 파일 인자만 필요합니다"
-#: svnadmin/main.c:1043
+#: svnadmin/main.c:1045
#, c-format
msgid "Exactly one file argument required"
msgstr "정확하게 하나의 파일 인자만 필요합니다"
-#: svnadmin/main.c:1117
-#: svnlook/main.c:1739
+#: svnadmin/main.c:1119 svnlook/main.c:1752
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID 토큰: %s\n"
-#: svnadmin/main.c:1118
-#: svnlook/main.c:1740
+#: svnadmin/main.c:1120 svnlook/main.c:1753
#, c-format
msgid "Owner: %s\n"
msgstr "소유자: %s\n"
-#: svnadmin/main.c:1119
-#: svnlook/main.c:1741
+#: svnadmin/main.c:1121 svnlook/main.c:1754
#, c-format
msgid "Created: %s\n"
msgstr "생성일: %s\n"
-#: svnadmin/main.c:1120
-#: svnlook/main.c:1742
+#: svnadmin/main.c:1122 svnlook/main.c:1755
#, c-format
msgid "Expires: %s\n"
msgstr "만료일: %s\n"
-#: svnadmin/main.c:1122
+#: svnadmin/main.c:1124
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8030,7 +8177,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1123
+#: svnadmin/main.c:1125
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8041,26 +8188,28 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1180
+#: svnadmin/main.c:1182
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "'%s' 는 잠궈지지 안않았습니다.\n"
-#: svnadmin/main.c:1192
+#: svnadmin/main.c:1194
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "잠금 해제됨 '%s'\n"
-#: svnadmin/main.c:1300
-msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
-msgstr "복수의 리비전 인자를 받았습니다. '-r M -r N' 대신 '-r M:N' 을 사용하세요."
+#: svnadmin/main.c:1303
+msgid ""
+"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
+msgstr ""
+"복수의 리비전 인자를 받았습니다. '-r M -r N' 대신 '-r M:N' 을 사용하세요."
-#: svnadmin/main.c:1425
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "부속 명령어 인자가 필요합니다\n"
-#: svnadmin/main.c:1510
+#: svnadmin/main.c:1502
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8069,7 +8218,7 @@
"부속 명령 '%s' 는 옵션 '%s'를 허용할 수 없습니다\n"
"'svnadmin help %s'로 사용법을 보십시오.\n"
-#: svnadmin/main.c:1543
+#: svnadmin/main.c:1535
msgid "Try 'svnadmin help' for more info"
msgstr "더 많은 정보를 위해 'svnadmin help'를 이용하세요."
@@ -8150,7 +8299,8 @@
"Available subcommands:\n"
msgstr ""
"일반적인 사용법: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
-"특정 부속 명령의 사용법을 위해서는 'svndumpfilter help <subcommand>'를 참조하십시오.\n"
+"특정 부속 명령의 사용법을 위해서는 'svndumpfilter help <subcommand>'를 참조하"
+"십시오.\n"
"'svndumpfilter --version'으로 버전을 볼 수가 있습니다.\n"
"\n"
"가능한 하위 명령 목록:\n"
@@ -8220,43 +8370,47 @@
msgid "Try 'svndumpfilter help' for more info"
msgstr "더 많은 정보를 위해 'svndumpfilter help'를 이용하세요"
-#: svnlook/main.c:99
-msgid "specify revision number ARG"
-msgstr "리비젼 번호로 ARG를 지정합니다"
-
-#: svnlook/main.c:102
-msgid "specify transaction name ARG"
-msgstr "arg를 트랜잭션 이름으로 지정합니다"
-
-#: svnlook/main.c:105
-msgid "be verbose"
-msgstr "자세히 출력합니다."
-
-#: svnlook/main.c:108
-msgid "show node revision ids for each path"
-msgstr "각 경로에 대한 노드 리비젼 아이디를 보여줍니다"
-
-#: svnlook/main.c:114
-msgid "do not print differences for added files"
-msgstr "추가된 파일에 대해서는 차이를 출력하지 않음"
-
-#: svnlook/main.c:117
-msgid "print differences against the copy source"
-msgstr "사본의 원본과 차이를 출력합니다."
-
-#: svnlook/main.c:120
-msgid "operate on a revision property (use with -r or -t)"
-msgstr "속성의 리비전 지정합니다. (-r 이나 -t 옵션과 같이 사용)"
-
-#: svnlook/main.c:123
-msgid "show full paths instead of indenting them"
-msgstr "생략형태의 경로대신 전체 경로를 보여줍니다."
-
-#: svnlook/main.c:126
+#: svnlook/main.c:93
msgid "show details for copies"
msgstr "사본들의 세부사항을 보여줍니다."
-#: svnlook/main.c:138
+#: svnlook/main.c:96
+msgid "print differences against the copy source"
+msgstr "사본의 원본과 차이를 출력합니다."
+
+#: svnlook/main.c:99
+msgid "show full paths instead of indenting them"
+msgstr "생략형태의 경로대신 전체 경로를 보여줍니다."
+
+#: svnlook/main.c:105
+msgid "do not print differences for added files"
+msgstr "추가된 파일에 대해서는 차이를 출력하지 않음"
+
+#: svnlook/main.c:111
+msgid "operate on single directory only"
+msgstr "단일 디렉토리에만 적용합니다."
+
+#: svnlook/main.c:114
+msgid "specify revision number ARG"
+msgstr "리비젼 번호로 ARG를 지정합니다"
+
+#: svnlook/main.c:117
+msgid "operate on a revision property (use with -r or -t)"
+msgstr "속성의 리비전 지정합니다. (-r 이나 -t 옵션과 같이 사용)"
+
+#: svnlook/main.c:120
+msgid "show node revision ids for each path"
+msgstr "각 경로에 대한 노드 리비젼 아이디를 보여줍니다"
+
+#: svnlook/main.c:123
+msgid "specify transaction name ARG"
+msgstr "arg를 트랜잭션 이름으로 지정합니다"
+
+#: svnlook/main.c:126
+msgid "be verbose"
+msgstr "자세히 출력합니다."
+
+#: svnlook/main.c:141
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -8266,7 +8420,7 @@
"\n"
"작성자를 출력합니다.\n"
-#: svnlook/main.c:143
+#: svnlook/main.c:146
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -8276,7 +8430,7 @@
"\n"
"파일 내용을 출력합니다. FILE_PATH 맨 앞에 오는 '/'는 생략가능합니다.\n"
-#: svnlook/main.c:148
+#: svnlook/main.c:151
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -8286,7 +8440,7 @@
"\n"
"변경된 것들의 경로를 출력합니다.\n"
-#: svnlook/main.c:153
+#: svnlook/main.c:156
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -8296,7 +8450,7 @@
"\n"
"최종 날짜를 출력합니다.\n"
-#: svnlook/main.c:158
+#: svnlook/main.c:161
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -8306,7 +8460,7 @@
"\n"
"바뀐 파일과 속성들을 GNU 형식의 diff로 출력합니다.\n"
-#: svnlook/main.c:164
+#: svnlook/main.c:167
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -8318,7 +8472,7 @@
"속성 변경으로 인한 자체 수정이나 포함하는 파일들이 변경된\n"
"디렉토리들을 출력한다.\n"
-#: svnlook/main.c:170
+#: svnlook/main.c:173
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -8328,7 +8482,7 @@
"\n"
"이 프로그램 혹은 그것의 부속 명령에 대한 사용법을 출력함.\n"
-#: svnlook/main.c:175
+#: svnlook/main.c:178
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8340,7 +8494,7 @@
"저장소안의 경로(지정하지 않으면 루트)에 대한 커밋로그에 대한\n"
"정보를 출력합니다.\n"
-#: svnlook/main.c:181
+#: svnlook/main.c:184
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -8350,7 +8504,7 @@
"\n"
"작성자, 변경날짜, 커밋로그 메시지 크기, 커밋로그 메시지를 출력합니다.\n"
-#: svnlook/main.c:186
+#: svnlook/main.c:189
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -8360,7 +8514,7 @@
"\n"
"저장소안의 경로가 잠겨 있으면, 잠금에 대한 설명을 보여줍니다.\n"
-#: svnlook/main.c:191
+#: svnlook/main.c:194
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -8370,7 +8524,7 @@
"\n"
"커밋로그 메시지를 출력합니다.\n"
-#: svnlook/main.c:196
+#: svnlook/main.c:199
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -8382,7 +8536,7 @@
"저장소내의 경로에 대한 속성 값을 출력합니다.\n"
"--revprop 옵션을 주면 대상이 아닌 리비전의 속성을 출력합니다.\n"
-#: svnlook/main.c:202
+#: svnlook/main.c:205
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8396,7 +8550,7 @@
"--revprop 옵션을 주면 대상이 아닌 리비전의 속성을 출력합니다.\n"
"-v 옵션을 주면 속성값도 출력합니다.\n"
-#: svnlook/main.c:209
+#: svnlook/main.c:212
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8405,10 +8559,11 @@
msgstr ""
"사용법: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
-"PATH_IN_REPOS로 시작하는 (생략되면 루트가 사용됩니다) 경로들의 전체 구조를 출력합니다.\n"
+"PATH_IN_REPOS로 시작하는 (생략되면 루트가 사용됩니다) 경로들의 전체 구조를 출"
+"력합니다.\n"
"--show-ids 를 넣으면 노드의 리비전을 출력합니다.\n"
-#: svnlook/main.c:215
+#: svnlook/main.c:218
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -8418,7 +8573,7 @@
"\n"
"저장소의 UUID를 출력합니다.\n"
-#: svnlook/main.c:220
+#: svnlook/main.c:223
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -8428,54 +8583,52 @@
"\n"
"가정 최신의 리비전 번호를 출력합니다.\n"
-#: svnlook/main.c:815
+#: svnlook/main.c:819
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "복사됨: %s (원본 리비전 %ld, %s)\n"
-#: svnlook/main.c:884
+#: svnlook/main.c:888
msgid "Added"
msgstr "추가됨"
-#: svnlook/main.c:885
+#: svnlook/main.c:889
msgid "Deleted"
msgstr "삭제됨"
-#: svnlook/main.c:886
+#: svnlook/main.c:890
msgid "Modified"
msgstr "수정됨"
-#: svnlook/main.c:887
+#: svnlook/main.c:891
msgid "Index"
msgstr "인덱스"
-#: svnlook/main.c:899
+#: svnlook/main.c:903
#, c-format
msgid "(Binary files differ)\n"
msgstr "(서로 다른 바이너리 파일)\n"
-#: svnlook/main.c:1028
+#: svnlook/main.c:1036
msgid "unknown"
msgstr "알 수 없음"
-#: svnlook/main.c:1171
-#: svnlook/main.c:1264
-#: svnlook/main.c:1293
+#: svnlook/main.c:1183 svnlook/main.c:1276 svnlook/main.c:1305
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "실행 구문 '%s' 는 리비전관리 대상이 아닙니다: 이상한 동작 발생"
-#: svnlook/main.c:1201
+#: svnlook/main.c:1213
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "'%s' 은 URL 입니다. 경로를 입력해야합니다."
-#: svnlook/main.c:1228
+#: svnlook/main.c:1240
#, c-format
msgid "Path '%s' is not a file"
msgstr "'%s' 경로는 파일이 아닙니다."
-#: svnlook/main.c:1367
+#: svnlook/main.c:1379
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -8484,7 +8637,7 @@
"리비전 경로 <ID>\n"
"-------- ---------\n"
-#: svnlook/main.c:1372
+#: svnlook/main.c:1384
#, c-format
msgid ""
"REVISION PATH\n"
@@ -8493,28 +8646,27 @@
"리비전 경로\n"
"-------- ----\n"
-#: svnlook/main.c:1419
+#: svnlook/main.c:1431
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "속성 '%s'는 리비전 %ld에 없습니다."
-#: svnlook/main.c:1426
+#: svnlook/main.c:1438
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "속성('%s')이 경로('%s')상에서 발견되지 않았습니다. (리비전 %ld)"
-#: svnlook/main.c:1431
+#: svnlook/main.c:1443
#, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "속성 '%s'이 경로 '%s' 트랜잭션 %s에서 발견되지 않았습니다"
-#: svnlook/main.c:1603
-#: svnlook/main.c:1818
+#: svnlook/main.c:1616 svnlook/main.c:1831
#, c-format
msgid "Missing repository path argument"
msgstr "저장소 경로가 지정되지 않았습니다."
-#: svnlook/main.c:1664
+#: svnlook/main.c:1677
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -8527,17 +8679,18 @@
msgstr ""
"일반적인 사용법: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"주의: --revision'과 '--transaction' 을 취하는 하위 명령들은 이 옵션들 없이\n"
-" 실행될 수 있습니다. 이 경우 가장 최신의 리비전에 대하여 명령을 수행합니다.\n"
+" 실행될 수 있습니다. 이 경우 가장 최신의 리비전에 대하여 명령을 수행합니"
+"다.\n"
"'svnlook help <subcommand>'와 같은 형식으로 각각의 도움말을 볼 수 있습니다.\n"
"'svnlook --version'으로 버전과 파일시스템 모듈을 볼 수가 있습니다.\n"
"\n"
"가능한 부속 명령어 목록:\n"
-#: svnlook/main.c:1720
+#: svnlook/main.c:1733
msgid "Missing path argument"
msgstr "경로가 지정되지 않았습니다"
-#: svnlook/main.c:1745
+#: svnlook/main.c:1758
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8546,7 +8699,7 @@
"설명 (%i 행):\n"
"%s\n"
-#: svnlook/main.c:1746
+#: svnlook/main.c:1759
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8555,39 +8708,41 @@
"설명 (%i 행):\n"
"%s\n"
-#: svnlook/main.c:1792
+#: svnlook/main.c:1805
#, c-format
msgid "Missing propname argument"
msgstr "속성 이름이 지정되지 않았습니다"
-#: svnlook/main.c:1793
+#: svnlook/main.c:1806
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "propname과 저장소 경로가 지정되지 않았습니다."
-#: svnlook/main.c:1799
+#: svnlook/main.c:1812
msgid "Missing propname or repository path argument"
msgstr "propname 또는 저장소 경로가 지정되지 않았습니다."
-#: svnlook/main.c:1957
+#: svnlook/main.c:1971
msgid "Invalid revision number supplied"
msgstr "잘못된 리비전 번호가 지정되었습니다."
-#: svnlook/main.c:2018
-msgid "The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
-msgstr "'--transaction' (-t) 과 '--revision' (-r) 인자는 동시에 사용 불가능합니다."
+#: svnlook/main.c:2036
+msgid ""
+"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
+msgstr ""
+"'--transaction' (-t) 과 '--revision' (-r) 인자는 동시에 사용 불가능합니다."
-#: svnlook/main.c:2100
+#: svnlook/main.c:2118
#, c-format
msgid "Repository argument required\n"
msgstr "저장소 인자가 팔요합니다\n"
-#: svnlook/main.c:2109
+#: svnlook/main.c:2127
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "'%s' 는 URL입니다. 경로를 넣어주세요.\n"
-#: svnlook/main.c:2160
+#: svnlook/main.c:2178
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8596,73 +8751,90 @@
"명령 '%s'는 옵션 '%s'를 인식하지 못합니다.\n"
"'svnlook help %s'를 이용하여 사용법을 확인하세요.\n"
-#: svnlook/main.c:2203
+#: svnlook/main.c:2221
msgid "Try 'svnlook help' for more info"
msgstr "더 많은 정보를 위해 'svnlook help'를 이용하세요"
-#: svnserve/main.c:141
+#: svnserve/cyrus_auth.c:243
+#, c-format
+msgid "Can't get hostname"
+msgstr "호스트 이름을 얻을 수 없습니다."
+
+#: svnserve/cyrus_auth.c:311
+msgid "Could not obtain the list of SASL mechanisms"
+msgstr "SASL 메커니즘 리스트를 얻을 수 없습니다."
+
+#: svnserve/cyrus_auth.c:351
+msgid "Couldn't obtain the authenticated username"
+msgstr "인증된 사용자명을 얻을 수가 없습니다"
+
+#: svnserve/main.c:142
msgid "daemon mode"
msgstr "데몬 모드"
-#: svnserve/main.c:143
+#: svnserve/main.c:144
msgid "listen port (for daemon mode)"
msgstr "리슨 포트 (데몬 모드)"
-#: svnserve/main.c:145
+#: svnserve/main.c:146
msgid "listen hostname or IP address (for daemon mode)"
msgstr "리슨 호스트명 혹은 IP 주소 (데몬 모드)"
-#: svnserve/main.c:147
+#: svnserve/main.c:148
msgid "run in foreground (useful for debugging)"
msgstr "포어그라운드로 실행 (디버깅용)"
-#: svnserve/main.c:148
-#: svnversion/main.c:123
+#: svnserve/main.c:149 svnversion/main.c:123
msgid "display this help"
msgstr "이 도움말을 출력함"
-#: svnserve/main.c:151
+#: svnserve/main.c:152
msgid "inetd mode"
msgstr "inetd 모드"
-#: svnserve/main.c:152
+#: svnserve/main.c:153
msgid "root of directory to serve"
msgstr "서비스를 제공할 루트 디렉토리"
-#: svnserve/main.c:154
+#: svnserve/main.c:155
msgid "force read only, overriding repository config file"
msgstr "저장소 구성화일을 무시하고. 읽기 전용으로 바꿈."
-#: svnserve/main.c:155
+#: svnserve/main.c:156
msgid "tunnel mode"
msgstr "터널 모드"
-#: svnserve/main.c:157
+#: svnserve/main.c:158
msgid "tunnel username (default is current uid's name)"
msgstr "터널 사용자명 (생략값은 현재 uid의 이름)"
-#: svnserve/main.c:159
+#: svnserve/main.c:160
msgid "use threads instead of fork"
msgstr "fork대신 thread 사용합니다."
-#: svnserve/main.c:161
+#: svnserve/main.c:162
msgid "listen once (useful for debugging)"
msgstr "1 회만 listen 합니다. (디버깅에 사용됩니다.)"
-#: svnserve/main.c:163
+#: svnserve/main.c:164
+#, fuzzy
+msgid "read configuration from file ARG"
+msgstr "arg로 지정된 디렉토리에서 사용자 구성화일을 읽습니다."
+
+#: svnserve/main.c:166
msgid "write server process ID to file ARG"
msgstr "서버 프로세스 ID를 파일 인자에 기록"
-#: svnserve/main.c:166
+#: svnserve/main.c:169
msgid "run as a windows service (SCM only)"
msgstr "windows 서비스로만 실행됩니다 (SCM 에서만)"
-#: svnserve/main.c:178
+#: svnserve/main.c:181
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "사용법은 보시려면, '%s --help' 을 이용하세요.\n"
-#: svnserve/main.c:187
+#: svnserve/main.c:190
msgid ""
"usage: svnserve [options]\n"
"\n"
@@ -8672,72 +8844,68 @@
"\n"
"옵션 목록:\n"
-#: svnserve/main.c:450
+#: svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "svnserve: 루트 경로 '%s'은(는) 존재하지 않거나 디렉토리가 아닙니다.\n"
-#: svnserve/main.c:492
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "-d, -i, -t, -X 중 한가지만 지정하십시오.\n"
-#: svnserve/main.c:502
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "옵션 --tunnel-user는 터널 모드에서만 유효합니다.\n"
-#: svnserve/main.c:571
+#: svnserve/main.c:576
#, c-format
-msgid "svnserve: The --service flag is only valid if the process is started by the Service Control Manager.\n"
-msgstr "svnserver: --service 플래그는 프로세스가 Service Control Manager에 의해 실행되었을 때만 유효합니다.\n"
+msgid ""
+"svnserve: The --service flag is only valid if the process is started by the "
+"Service Control Manager.\n"
+msgstr ""
+"svnserver: --service 플래그는 프로세스가 Service Control Manager에 의해 실행"
+"되었을 때만 유효합니다.\n"
-#: svnserve/main.c:607
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "주소 정보를 찾을 수 없습니다."
-#: svnserve/main.c:623
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "서버 소켓을 생성 할 수 없습니다."
-#: svnserve/main.c:636
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "서버소켓을 바인드할 수 없습니다."
-#: svnserve/main.c:704
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "클라이언트 소켓접속을 받을 수 없습니다."
-#: svnserve/main.c:758
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "threadattr을 생성할 수 없습니다."
-#: svnserve/main.c:766
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "분리된 상태를 설정할 수 없습니다."
-#: svnserve/main.c:779
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "쓰레드를 생성 할 수 없습니다."
-#: svnserve/sasl_auth.c:243
-#, c-format
-msgid "Can't get hostname"
-msgstr "호스트 이름을 얻을 수 없습니다."
-
-#: svnserve/sasl_auth.c:311
-msgid "Could not obtain the list of SASL mechanisms"
-msgstr "SASL 메커니즘 리스트를 얻을 수 없습니다."
-
-#: svnserve/sasl_auth.c:351
-msgid "Couldn't obtain the authenticated username"
-msgstr "인증된 사용자명을 얻을 수가 없습니다"
+#: svnserve/serve.c:1437
+#, fuzzy
+msgid "Path is not a string"
+msgstr "경로는 작업사본 파일이 아닙니다."
#: svnserve/winservice.c:341
#, c-format
@@ -8756,10 +8924,14 @@
#: svnserve/winservice.c:411
#, c-format
-msgid "The service failed to start; an internal error occurred while starting the service"
-msgstr "서비스 시작에 실패하였습니다; 서비스를 구동하는 중에 내부 오류가 발생하였습니다"
+msgid ""
+"The service failed to start; an internal error occurred while starting the "
+"service"
+msgstr ""
+"서비스 시작에 실패하였습니다; 서비스를 구동하는 중에 내부 오류가 발생하였습니"
+"다"
-#: svnsync/main.c:56
+#: svnsync/main.c:64
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -8789,29 +8961,37 @@
"\n"
"\n"
-#: svnsync/main.c:71
+#: svnsync/main.c:79
+#, fuzzy
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
-"Transfer all pending revisions from source to destination.\n"
+"Transfer all pending revisions to the destination from the source\n"
+"with which it was initialized.\n"
msgstr ""
"사용법: svnsync synchronize DEST_URL\n"
"\n"
"대기중인 모든 요청사항을 대상 저장소로 이동함.\n"
-#: svnsync/main.c:76
+#: svnsync/main.c:85
msgid ""
-"usage: svnsync copy-revprops DEST_URL REV\n"
+"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
-"Copy all revision properties for revision REV from source to\n"
+"Copy the revision properties in a given range of revisions to the\n"
+"destination from the source with which it was initialized.\n"
+"\n"
+"If REV and REV2 are provided, copy properties for the revisions\n"
+"specified by that range, inclusively. If only REV is provided,\n"
+"copy properties for that revision alone. If REV is not provided,\n"
+"copy properties for all revisions previously transferred to the\n"
"destination.\n"
+"\n"
+"REV and REV2 must be revisions which were previously transferred\n"
+"to the destination. You may use \"HEAD\" for either revision to\n"
+"mean \"the last revision transferred\".\n"
msgstr ""
-"사용법: svnsync copy-revprops DEST_URL REV\n"
-"\n"
-"REV의 리비전 속성을 모두 원본에서 사본으로 복사합니다\n"
-"\n"
-#: svnsync/main.c:82
+#: svnsync/main.c:101
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -8821,86 +9001,129 @@
"\n"
"이 프로그램이나 그것의 부속 명령어의 사용법을 보여줍니다.\n"
-#: svnsync/main.c:184
+#: svnsync/main.c:115
+msgid ""
+"specify a username ARG (deprecated;\n"
+" see --source-username and --sync-username)"
+msgstr ""
+
+#: svnsync/main.c:119
+msgid ""
+"specify a password ARG (deprecated;\n"
+" see --source-password and --sync-password)"
+msgstr ""
+
+#: svnsync/main.c:123
+msgid "connect to source repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:125
+msgid "connect to source repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:127
+msgid "connect to sync repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:129
+msgid "connect to sync repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:218
#, c-format
msgid "Can't get local hostname"
msgstr "로컬 파일 이름을 얻을 수 없습니다."
-#: svnsync/main.c:206
+#: svnsync/main.c:241
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr "'%s'에 의해 잠겨 있어 대상 저장소를 잠그지 못하였습니다.\n"
-#: svnsync/main.c:301
+#: svnsync/main.c:336
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "세션은 '%s'에 있습니다, 그러나 저장소의 루트는 '%s'에 있습니다."
-#: svnsync/main.c:368
+#: svnsync/main.c:403
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr "리비전 %ld의 복사된 속성 (%s* 속성 무시됨)\n"
-#: svnsync/main.c:373
+#: svnsync/main.c:408
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "리비전 %ld의 복사된 속성\n"
-#: svnsync/main.c:414
+#: svnsync/main.c:450
msgid "Cannot initialize a repository with content in it"
msgstr "저장된 내용으로 인해 저장소를 초기화 할 수 없습니다."
-#: svnsync/main.c:425
+#: svnsync/main.c:461
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "대상 저장소는 이미 '%s'(으)로부터 동기화를 하고 있습니다."
-#: svnsync/main.c:489
-#: svnsync/main.c:492
-#: svnsync/main.c:1159
-#: svnsync/main.c:1250
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "'%s' 경로는 URL이 아닙니다."
-#: svnsync/main.c:874
+#: svnsync/main.c:914
#, c-format
msgid "Committed revision %ld.\n"
msgstr "커밋된 리비전 %ld.\n"
-#: svnsync/main.c:913
+#: svnsync/main.c:954
msgid "Destination repository has not been initialized"
msgstr "대상 저장소는 초기화되지 않았습니다"
-#: svnsync/main.c:928
+#: svnsync/main.c:969
#, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
msgstr "대상 저장소의 UUID (%s)가 기대하는 UUID (%s)와 일치하지 않습니다."
-#: svnsync/main.c:990
+#: svnsync/main.c:1032
#, c-format
-msgid "Revision being currently copied (%ld), last merged revision (%ld), and destination HEAD (%ld) are inconsistent; have you committed to the destination without using svnsync?"
-msgstr "현재 복사중인 리비전(%ld), 마지막으로 병합된 리비전(%ld), 그리고 대상 HEAD (%ld)의 정보가 일치하지 않습니다. svnsync를 수행하지 않고 커밋하셨습니까?"
+msgid ""
+"Revision being currently copied (%ld), last merged revision (%ld), and "
+"destination HEAD (%ld) are inconsistent; have you committed to the "
+"destination without using svnsync?"
+msgstr ""
+"현재 복사중인 리비전(%ld), 마지막으로 병합된 리비전(%ld), 그리고 대상 HEAD (%"
+"ld)의 정보가 일치하지 않습니다. svnsync를 수행하지 않고 커밋하셨습니까?"
-#: svnsync/main.c:1028
+#: svnsync/main.c:1070
#, c-format
-msgid "Destination HEAD (%ld) is not the last merged revision (%ld); have you committed to the destination without using svnsync?"
-msgstr "대상 HEAD (%ld)가 마지막으로 병합된 리비전(%ld)이 아닙니다. svnsync를 수행하지 않고 커밋하셨습니까?"
+msgid ""
+"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
+"committed to the destination without using svnsync?"
+msgstr ""
+"대상 HEAD (%ld)가 마지막으로 병합된 리비전(%ld)이 아닙니다. svnsync를 수행하"
+"지 않고 커밋하셨습니까?"
-#: svnsync/main.c:1105
+#: svnsync/main.c:1148
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr "리비전 %ld로 생성된 커밋은 %ld(으)로 생성되었어야 합니다."
-#: svnsync/main.c:1214
-msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+#: svnsync/main.c:1275 svnsync/main.c:1280
+#, fuzzy, c-format
+msgid ""
+"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr "아직 동기화되지 않은 리비젼에 대해 revprops를 복사할 수 없습니다"
-#: svnsync/main.c:1253
-msgid "Invalid revision number"
+#: svnsync/main.c:1332
+#, fuzzy, c-format
+msgid "'%s' is not a valid revision range"
+msgstr "'%s'는 잘못된 리비전을 가지고 있습니다"
+
+#: svnsync/main.c:1346 svnsync/main.c:1366
+#, fuzzy, c-format
+msgid "Invalid revision number (%ld)"
msgstr "잘못된 리비전 번호가 지정되었습니다."
-#: svnsync/main.c:1289
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -8909,12 +9132,19 @@
"Available subcommands:\n"
msgstr ""
"일반적인 사용법: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
-"특정 하위명령의 사용법을 위해서는 'svnsync help <subcommand>' 를 참조하십시오.\n"
+"특정 하위명령의 사용법을 위해서는 'svnsync help <subcommand>' 를 참조하십시"
+"오.\n"
"'svnsync --version'을 이용하면 버전과 접근 모듈 목록을 볼 수 있습니다.\n"
"\n"
"가능한 부속 명령 목록:\n"
-#: svnsync/main.c:1479
+#: svnsync/main.c:1581
+msgid ""
+"Cannot use --username or --password with any of --source-username, --source-"
+"password, --sync-username, or --sync-password.\n"
+msgstr ""
+
+#: svnsync/main.c:1661
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8923,7 +9153,7 @@
"부속 명령어 '%s' 은/는 옵션 '%s' 을/를 취하지 않습니다.\n"
"'svnsync help %s' 로 사용법을 보십시오.\n"
-#: svnsync/main.c:1541
+#: svnsync/main.c:1733
msgid "Try 'svnsync help' for more info"
msgstr "더 많은 정보를 위해 'svnsync help'를 이용하세요"
@@ -8998,53 +9228,108 @@
msgid "last changed rather than current revisions"
msgstr "현재 리비전 대신 마지막 커밋된 리비전을 출력"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "익스포트됨%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "'%s' 는 관리대상이 아니며, 익스포트 되지 않았습니다\n"
+#~ msgid "'%s' is not under version control or doesn't exist"
+#~ msgstr "'%s' 은(는) 버전 컨트롤 대상이 아니거나 존재하지 않습니다."
+
+#~ msgid "Cannot read entry for '%s'"
+#~ msgstr "'%s'를 위한 등록정보를 찾을 수 없습니다."
+
+#~ msgid "Can't find entry for '%s'"
+#~ msgstr "'%s'를 위한 등록정보를 찾을 수 없습니다."
+
+#~ msgid "Can't get user name"
+#~ msgstr "사용자 이름을 얻을 수 없습니다."
+
+#~ msgid "Unhandled SASL interaction"
+#~ msgstr "처리할 수 없는 SASL 명령"
+
+#~ msgid "'%s' has unsupported special file type '%s'"
+#~ msgstr "'%s'은 특수 파일 타입 '%s'를 지원하지 않습니다."
+
+#~ msgid "No entry for '%s'"
+#~ msgstr "'%s'에 대한 항목이 없습니다"
+
+#~ msgid "Cannot revert: '%s' is not under version control"
+#~ msgstr "복원할 수 없습니다: '%s'는 버전 관리 대상이 아닙니다."
+
+#~ msgid "Cannot copy or move '%s': it's not under version control"
+#~ msgstr "'%s'를 복사하거나 옮길 수 없습니다; 버전 관리 대상이 아닙니다"
+
+#~ msgid "descend recursively"
+#~ msgstr "재귀적으로 수행합니다."
+
+#~ msgid ""
+#~ "usage: svnsync copy-revprops DEST_URL REV\n"
+#~ "\n"
+#~ "Copy all revision properties for revision REV from source to\n"
+#~ "destination.\n"
+#~ msgstr ""
+#~ "사용법: svnsync copy-revprops DEST_URL REV\n"
+#~ "\n"
+#~ "REV의 리비전 속성을 모두 원본에서 사본으로 복사합니다\n"
+#~ "\n"
+
#~ msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
#~ msgstr "'%s'의 체크섬값이 일치하지 않습니다. 기대값:'%s', 실제값: '%s'"
+
#~ msgid " arg"
#~ msgstr " arg"
+
#~ msgid "Lock comment has illegal characters"
#~ msgstr "잠금 설명에 잘못된 문자가 있습니다."
+
#~ msgid "No support for repos <--> working copy moves"
#~ msgstr "저장소와 작업 사본간의 이동은 지원되지 않습니다."
+
#~ msgid "Could not create a request (%s '%s')"
#~ msgstr "요청을 할 수 없습니다 (%s '%s')"
+
#~ msgid "Could not create a CHECKOUT request (%s)"
#~ msgstr "CHECKOUT 요청을 할 수 없습니다. (%s)"
+
#~ msgid "Could not create a DELETE request (%s)"
#~ msgstr "DELETE 요청을 할 수 없습니다. (%s)"
+
#~ msgid "Could not create a PUT request (%s)"
#~ msgstr "PUT 요청을 할 수 없습니다. (%s)"
+
#~ msgid "applying log message to %s"
#~ msgstr "로그 메시지를 %s에 적용할 수 없습니다."
+
#~ msgid "Could not create a GET request for '%s'"
#~ msgstr "'%s'에 대한 GET 요청을 할 수 없습니다."
+
#~ msgid "Unlock request failed"
#~ msgstr "잠금해제 요청 실패"
+
#~ msgid "Error spooling the %s request response to disk"
#~ msgstr "%s 요청을 디스크에 스풀링하다 오류가 발생하였습니다."
+
#~ msgid ""
#~ "'%s' hook failed with error output:\n"
#~ "%s"
#~ msgstr ""
#~ "'%s' 훅이 다음 오류를 내고 실패하였습니다:\n"
#~ "%s"
+
#~ msgid "Error opening local file"
#~ msgstr "로컬 파일 열기 오류"
+
#~ msgid "Failed to add directory '%s': object of the same name already exists"
#~ msgstr "디렉토리 추가 실패 '%s': 같은 이름의 개체가 이미 존재합니다."
+
#~ msgid ""
#~ "Failed to add directory '%s': object of the same name is already "
#~ "scheduled for addition"
#~ msgstr ""
#~ "디렉토리 추가 실패 '%s': 같은 이름의 개체를 이미 추가 요청을 하였습니다."
-
diff --git a/subversion/po/nb.po b/subversion/po/nb.po
index fe9b0fe..9733de6 100644
--- a/subversion/po/nb.po
+++ b/subversion/po/nb.po
@@ -59,7 +59,7 @@
msgstr ""
"Project-Id-Version: subversion 1.1.0\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-03-31 00:04+0200\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2007-03-14 17:28+0100\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Norwegian <dev@subversion.tigris.org>\n"
@@ -1187,37 +1187,37 @@
msgid "'%s' has local modifications"
msgstr "«%s» er endret lokalt"
-#: libsvn_client/diff.c:136
+#: libsvn_client/diff.c:135
#, fuzzy, c-format
msgid " Reverted %s:r%s%s"
msgstr "Tilbakestilte «%s»\n"
-#: libsvn_client/diff.c:154
+#: libsvn_client/diff.c:153
#, c-format
msgid " Merged %s:r%s%s"
msgstr ""
-#: libsvn_client/diff.c:176
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sEgenskapsforandringer på: %s%s"
-#: libsvn_client/diff.c:204
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "Navn: %s%s"
-#: libsvn_client/diff.c:323
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revisjon %ld)"
-#: libsvn_client/diff.c:325
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(arbeidskopi)"
-#: libsvn_client/diff.c:468
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Kan ikke vises: Filen er merket som binær type.%s"
@@ -1225,25 +1225,25 @@
#. -----------------------------------------------------------------------
#. ** Utilities. **
#. Sanity check -- ensure that we have valid revisions to look at.
-#: libsvn_client/diff.c:828 libsvn_client/merge.c:61
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "Noen nødvendige revisjoner er ikke spesifisert"
-#: libsvn_client/diff.c:843
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr "Minst én revisjon må være ikke-lokal for en bundet diff"
-#: libsvn_client/diff.c:955 libsvn_client/diff.c:967
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "«%s» ble ikke funnet i depotet ved revisjon %ld"
-#: libsvn_client/diff.c:1026
+#: libsvn_client/diff.c:1025
#, fuzzy
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr "svn_client_diff3 ble kalt på en måte som foreløpig ikke er støttet"
-#: libsvn_client/diff.c:1068
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1251,12 +1251,12 @@
"For øyeblikket støttes kun forskjeller mellom filstiers tekstbase og deres "
"arbeidsfiler"
-#: libsvn_client/diff.c:1213 libsvn_client/switch.c:107
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Katalogen «%s» mangler adresse"
-#: libsvn_client/diff.c:1422
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr "Oppsummeringsdiff kan bare sammenligne depot med depot"
@@ -1280,7 +1280,7 @@
msgstr "«%s» finnes allerede"
#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
-#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2463
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Kontrollsum for «%s» er feil. Forventet: «%s», gjeldende: «%s»"
@@ -1301,8 +1301,8 @@
"Ingen felles forelder funnet, klarer ikke å operere på usammenhengende "
"argumenter"
-#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2053
-#: libsvn_client/merge.c:2059 libsvn_client/merge.c:2237
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
#, c-format
msgid "'%s' has no URL"
@@ -1373,14 +1373,14 @@
msgid ".merge-right.r%ld"
msgstr ".merge-right.r%ld"
-#: libsvn_client/merge.c:1155
+#: libsvn_client/merge.c:1164
#, c-format
msgid ""
"Path '%s' is in conflict, and must be resolved before the remainder of the "
"requested merge can be applied"
msgstr ""
-#: libsvn_client/merge.c:1448 libsvn_client/merge.c:1761
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
msgid "Use of two URLs is not compatible with merge info modification"
msgstr ""
@@ -1648,15 +1648,15 @@
msgid "deleting changes"
msgstr "forandringer slettes"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2393
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "Mangler påkrevet noderevisjonsidentifikator"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2403
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "Ugyldig endringsrekkefølge: Ny node-revisjons-ID uten sletting"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2414
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr ""
"Ugyldig endringsrekkefølge: Annen endring enn tillegg på slettet filsti"
@@ -1776,111 +1776,111 @@
msgid "set repository uuid"
msgstr "sett depot-uuid"
-#: libsvn_fs_base/dag.c:219
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"Ødelagt database: Innledende transaksjons-ID er ikke «0» i filsystem «%s»"
-#: libsvn_fs_base/dag.c:227
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "Ødelagt database: Innledende kopi-ID er ikke «0» i filsystem «%s»"
-#: libsvn_fs_base/dag.c:236
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"Ødelagt database: Innledende revisjonsnummer er ikke «0» i filsystem «%s»"
-#: libsvn_fs_base/dag.c:284 libsvn_fs_base/dag.c:460 libsvn_fs_fs/dag.c:333
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "Forsøkte å opprette post i forelder som ikke er en katalog"
-#: libsvn_fs_base/dag.c:454 libsvn_fs_fs/dag.c:327
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Forsøkte å opprette en node med ulovlig navn «%s»"
-#: libsvn_fs_base/dag.c:466 libsvn_fs_base/dag.c:700 libsvn_fs_fs/dag.c:339
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "Forsøkte å klone barn av ikke-foranderlig node"
-#: libsvn_fs_base/dag.c:473
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Forsøkte å opprette post som allerede finnes"
-#: libsvn_fs_base/dag.c:524 libsvn_fs_fs/dag.c:401
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "Forsøkte å sette post i node som ikke er en katalog"
-#: libsvn_fs_base/dag.c:530 libsvn_fs_fs/dag.c:407
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "Forsøkte å sette post i uforanderlig node"
-#: libsvn_fs_base/dag.c:594
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "Kan ikke sette egenskapsliste i *uforanderlig* noderevisjon %s"
-#: libsvn_fs_base/dag.c:706
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "Forsøkte å klone et barn med det ulovlige navnet «%s»"
-#: libsvn_fs_base/dag.c:832
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "Forsøkte å slette posten «%s» fra node som *ikke* er en katalog"
-#: libsvn_fs_base/dag.c:838
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "Forsøkte å slette posten «%s» fra uforanderlig katalognode"
-#: libsvn_fs_base/dag.c:845
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Forsøkte å slette en node med det ulovlige navnet «%s»"
-#: libsvn_fs_base/dag.c:860 libsvn_fs_base/dag.c:893
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Sletting feilet: Katalogen har ingen post «%s»"
-#: libsvn_fs_base/dag.c:942
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Forsøkte å fjerne uforanderlig node"
-#: libsvn_fs_base/dag.c:1062
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "Forsøkte å hente tekstinnhold fra en *ikke*-filnode"
-#: libsvn_fs_base/dag.c:1097
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Forsøkte å finne lengden på en *ikke*-filnode"
-#: libsvn_fs_base/dag.c:1123
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "Forsøkte å lese kontrollsum fra en *ikke*-filnode"
-#: libsvn_fs_base/dag.c:1154 libsvn_fs_base/dag.c:1208
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "Forsøkte å sette tekstinnhold på en *ikke*-filnode"
-#: libsvn_fs_base/dag.c:1160 libsvn_fs_base/dag.c:1214
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Forsøkte å sette tekstinnhold på en uforanderlig node"
-#: libsvn_fs_base/dag.c:1237
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1891,12 +1891,12 @@
" forventet: %s\n"
" faktisk: %s\n"
-#: libsvn_fs_base/dag.c:1292
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Forsøkte å åpne ikke-eksisterende barnenode «%s»"
-#: libsvn_fs_base/dag.c:1298
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Forsøkte å åpne node med det ulovlige navnet «%s»"
@@ -2029,7 +2029,7 @@
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr "Berkeley DB-feil for filsystem «%s» under åpning av miljø:\n"
-#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:642
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Forventet filsystemformat «%d»; fant format «%d»"
@@ -2056,26 +2056,26 @@
"DB_LOG_AUTOREMOVE kan skape problemer for hotcopy-algoritmen.\n"
"Hvis problemet vedvarer, prøv å deaktivere det i DB_CONFIG"
-#: libsvn_fs_base/fs.c:1240
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr "Modul for bruk mot et Berkeley DB-depot."
-#: libsvn_fs_base/fs.c:1274
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Versjonen av filsystemlaster (%d) for bdb er ikke støttet"
-#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr "Kan ikke kontrollere lås på stien «%s»; ingen brukernavn tilgjengelig"
-#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr "Bruker %s eier ikke egen lås på stien «%s» (for øyeblikket låst av %s)"
-#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr ""
@@ -2170,7 +2170,7 @@
msgid "Transaction is dead: '%s'"
msgstr "Transaksjonen er død: «%s»"
-#: libsvn_fs_base/revs-txns.c:1078
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "Transaksjonen avbrutt, men opprydning feilet"
@@ -2180,85 +2180,85 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:391 libsvn_fs_fs/tree.c:310
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "Fant ikke filen: Transaksjon «%s», sti «%s»"
-#: libsvn_fs_base/tree.c:396 libsvn_fs_fs/tree.c:315
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "Filen ikke funnet: Revisjon %ld, filsti «%s»"
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:406 libsvn_fs_fs/tree.c:330
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "Filen eksisterer allerede: Filsystem «%s», transaksjon «%s», sti «%s»"
-#: libsvn_fs_base/tree.c:411 libsvn_fs_fs/tree.c:336
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "Filen eksisterer allerede: Filsystem «%s», revisjon %ld, sti «%s»"
-#: libsvn_fs_base/tree.c:419 libsvn_fs_fs/tree.c:346
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "Rotobjekt må være en transaksjonsrot"
-#: libsvn_fs_base/tree.c:834 libsvn_fs_fs/tree.c:755
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "Feil under åpning av «%s»"
-#: libsvn_fs_base/tree.c:1466 libsvn_fs_fs/tree.c:1202
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr "Kan ikke sammenligne egenskapsverdi mellom to forskjellige filsystemer"
-#: libsvn_fs_base/tree.c:1799
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "Ødelagt database: Galt forfedreantall"
-#: libsvn_fs_base/tree.c:1854 libsvn_fs_fs/tree.c:1239
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Uventet uforanderlig node i «%s»"
-#: libsvn_fs_base/tree.c:1875 libsvn_fs_fs/tree.c:1262
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "Konflikt i «%s»"
-#: libsvn_fs_base/tree.c:1925 libsvn_fs_base/tree.c:2637
-#: libsvn_fs_fs/tree.c:1311 libsvn_fs_fs/tree.c:1803
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr ""
"Feilaktig fletting; opprinnelse, kilde og mål er ikke alle i det samme "
"filsystemet"
-#: libsvn_fs_base/tree.c:1941 libsvn_fs_fs/tree.c:1327
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr "Feilaktig fletting; målet «%s» har ID «%s», samme som opprinnelse"
-#: libsvn_fs_base/tree.c:2444
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "Transaksjonen «%s» er utdatert i forhold til revisjon «%s»"
-#: libsvn_fs_base/tree.c:2820 libsvn_fs_fs/tree.c:1942
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "Rotkatalogen kan ikke slettes"
-#: libsvn_fs_base/tree.c:3000 libsvn_fs_fs/tree.c:2014
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "Kan ikke kopiere mellom to forskjellige filsystemer («%s» og «%s»)"
-#: libsvn_fs_base/tree.c:3009 libsvn_fs_fs/tree.c:2020
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "Kopi fra foranderlig tre er foreløpig ikke støttet"
-#: libsvn_fs_base/tree.c:3504 libsvn_fs_fs/tree.c:2444
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2269,12 +2269,12 @@
" forventet: %s\n"
" faktisk: %s\n"
-#: libsvn_fs_base/tree.c:3757 libsvn_fs_fs/tree.c:2680
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr "Kan ikke sammenligne filinnhold mellom to forskjellige filsystemer"
-#: libsvn_fs_base/tree.c:3766 libsvn_fs_base/tree.c:3771
-#: libsvn_fs_fs/tree.c:2689 libsvn_fs_fs/tree.c:2694
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
@@ -2320,46 +2320,46 @@
msgid "Can't store FSFS shared data"
msgstr "Kan ikke lagre delte data i FSFS"
-#: libsvn_fs_fs/fs.c:352
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr "Modul for bruk mot et filbasert (FSFS) depot."
-#: libsvn_fs_fs/fs.c:386
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Versjonen av filsystemlaster (%d) for fsfs er ikke støttet"
-#: libsvn_fs_fs/fs_fs.c:351
+#: libsvn_fs_fs/fs_fs.c:352
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "Kan ikke overta transaksjonsliste-mutex for FSFS"
-#: libsvn_fs_fs/fs_fs.c:359
+#: libsvn_fs_fs/fs_fs.c:360
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "Kan ikke slippe transaksjonsliste-mutex for FSFS"
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Kan ikke låse opp ukjent transaksjon «%s»"
-#: libsvn_fs_fs/fs_fs.c:389
+#: libsvn_fs_fs/fs_fs.c:390
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "Kan ikke låse opp ulåst transaksjon «%s»"
-#: libsvn_fs_fs/fs_fs.c:396
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr "Kan ikke låse opp prototyperevisjon-låsefil for transaksjon «%s»"
-#: libsvn_fs_fs/fs_fs.c:402
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr "Kan ikke lukke prototyperevisjon-låsefil for transaksjon «%s»"
-#: libsvn_fs_fs/fs_fs.c:464
+#: libsvn_fs_fs/fs_fs.c:465
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2368,7 +2368,7 @@
"Kan ikke skrive til prototyperevisjonsfila for transaksjon «%s» fordi en "
"tidligere representasjon skrives av denne prosessen"
-#: libsvn_fs_fs/fs_fs.c:500
+#: libsvn_fs_fs/fs_fs.c:501
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2377,94 +2377,95 @@
"Kan ikke skrive til prototyperevisjonsfila for transaksjon «%s» fordi en "
"tidligere representasjon skrives av en annen prosess"
-#: libsvn_fs_fs/fs_fs.c:507 libsvn_subr/io.c:1512
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Klarte ikke få eksklusiv lås på filen «%s»"
-#: libsvn_fs_fs/fs_fs.c:833 libsvn_fs_fs/fs_fs.c:847
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "Fant misdannet hodefelt i revisjonsfil"
-#: libsvn_fs_fs/fs_fs.c:949 libsvn_fs_fs/fs_fs.c:963 libsvn_fs_fs/fs_fs.c:970
-#: libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985 libsvn_fs_fs/fs_fs.c:993
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "Misdannet angivelse i node-rev av tekstrepresentasjonens forskyving"
-#: libsvn_fs_fs/fs_fs.c:1062
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "Mangler typefelt i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1093
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "Mangler cpath i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1120 libsvn_fs_fs/fs_fs.c:1126
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "Misdannet copyroot-linje i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1144 libsvn_fs_fs/fs_fs.c:1150
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "Misdannet copyfrom-linje i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1259 libsvn_fs_fs/fs_fs.c:3674
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "Forsøk på å skrive til en ikke-transaksjon"
-#: libsvn_fs_fs/fs_fs.c:1343
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "Ugyldig hodedata for representasjon"
-#: libsvn_fs_fs/fs_fs.c:1367
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "Manglende node-id i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1373
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "Ødelagt node-id i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1418
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "Revisjonsfilen mangler avsluttende linjeskift"
-#: libsvn_fs_fs/fs_fs.c:1430
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "Siste linje i revisjonsfilen er lengre enn 64 tegn"
-#: libsvn_fs_fs/fs_fs.c:1445
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "Siste linje i revisjonsfil mangler mellomrom"
-#: libsvn_fs_fs/fs_fs.c:1474 libsvn_fs_fs/fs_fs.c:1532 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "Revisjon %ld ikke funnet"
-#: libsvn_fs_fs/fs_fs.c:1592
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "Misdannet svndiff-data i fremstillingen"
-#: libsvn_fs_fs/fs_fs.c:1735 libsvn_fs_fs/fs_fs.c:1748
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr ""
"Lesing av et svndiff-vindu førte til lesing forbi slutten av fremstillingen"
-#: libsvn_fs_fs/fs_fs.c:1884
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "svndiff-data forespurte ikke-eksisterende kilde"
-#: libsvn_fs_fs/fs_fs.c:1890
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "svndiff forespurte posisjon forbi slutten av datastrømmen"
-#: libsvn_fs_fs/fs_fs.c:1913 libsvn_fs_fs/fs_fs.c:1930
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "svndiff-vinduslengde er ødelagt"
-#: libsvn_fs_fs/fs_fs.c:1978
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2475,113 +2476,113 @@
" forventet: %s\n"
" gjeldende: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2201 libsvn_fs_fs/fs_fs.c:2214
-#: libsvn_fs_fs/fs_fs.c:2220 libsvn_fs_fs/fs_fs.c:4765
-#: libsvn_fs_fs/fs_fs.c:4774 libsvn_fs_fs/fs_fs.c:4780
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "Ødelagt katalogpost"
-#: libsvn_fs_fs/fs_fs.c:2559 libsvn_fs_fs/fs_fs.c:2567
-#: libsvn_fs_fs/fs_fs.c:2599 libsvn_fs_fs/fs_fs.c:2619
-#: libsvn_fs_fs/fs_fs.c:2653 libsvn_fs_fs/fs_fs.c:2658
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "Ugyldig endringslinje i rev-file"
-#: libsvn_fs_fs/fs_fs.c:2592
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "Ugyldig type endring i revisjonsfil"
-#: libsvn_fs_fs/fs_fs.c:2612
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "Ugyldig text-mod-merke i rev-file"
-#: libsvn_fs_fs/fs_fs.c:2632
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "Ugyldig prop-mod-merke i rev-file"
-#: libsvn_fs_fs/fs_fs.c:2816
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "Kopiering fra transaksjoner er ikke tillatt"
-#: libsvn_fs_fs/fs_fs.c:2872
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Klarer ikke å opprette transaksjonskatalog i «%s» for revisjon %ld"
-#: libsvn_fs_fs/fs_fs.c:3106 libsvn_fs_fs/fs_fs.c:3113
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "next-id-fil er ødelagt"
-#: libsvn_fs_fs/fs_fs.c:3200
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "Transaksjonsopprydning feilet"
-#: libsvn_fs_fs/fs_fs.c:3368
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "Ugyldig endringstype"
-#: libsvn_fs_fs/fs_fs.c:3693
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "Kan ikke sette tekstinnholdet til en katalog"
-#: libsvn_fs_fs/fs_fs.c:3783 libsvn_fs_fs/fs_fs.c:3788
-#: libsvn_fs_fs/fs_fs.c:3795
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "Gjeldende fil er ødelagt"
-#: libsvn_fs_fs/fs_fs.c:4084 libsvn_subr/io.c:2790 svn/util.c:252
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "Finner ikke status for «%s»"
-#: libsvn_fs_fs/fs_fs.c:4088
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "Kan ikke endre filrettigheter på «%s»"
-#: libsvn_fs_fs/fs_fs.c:4237
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "Kan ikke overta FSFS depot-mutex"
-#: libsvn_fs_fs/fs_fs.c:4251
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "Kan ikke slippe FSFS depot-mutex"
-#: libsvn_fs_fs/fs_fs.c:4370
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "Transaksjonen er foreldet"
-#: libsvn_fs_fs/fs_fs.c:4706
+#: libsvn_fs_fs/fs_fs.c:4807
msgid "Recovery encountered a non-directory node"
msgstr "Fant en node under gjenoppretting som ikke er en katalog"
-#: libsvn_fs_fs/fs_fs.c:4728
+#: libsvn_fs_fs/fs_fs.c:4829
msgid "Recovery encountered a deltified directory representation"
msgstr "Gjenopprettingen kom over en deltifisert katalogrepresentasjon"
-#: libsvn_fs_fs/fs_fs.c:4991
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "Transaksjon ikke funnet"
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "Kan ikke skrive lås/post-hashfil «%s»"
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "Kan ikke tolke lås/post-hashfil «%s»"
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "Stien «%s» finnes ikke i HEAD-revisjonen"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "Låsing feilet: En nyere versjon av «%s» finnes"
@@ -3012,8 +3013,8 @@
msgid "%s request failed on '%s'"
msgstr "Forespørselen %s feilet på «%s»"
-#: libsvn_ra_local/ra_plugin.c:106 libsvn_ra_local/ra_plugin.c:595
-#: libsvn_wc/update_editor.c:2605
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -3026,15 +3027,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:248
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "Modul for tilgang til et depot på lokal disk."
-#: libsvn_ra_local/ra_plugin.c:288
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "Klarer ikke åpne en ra_local-økt til URL"
-#: libsvn_ra_local/ra_plugin.c:1440
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Versjon av RA-laster (%d) for ra_local er ikke støttet"
@@ -3764,36 +3765,41 @@
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "Filsystemstien «%s» er verken en fil eller katalog"
-#: libsvn_repos/reporter.c:218
+#: libsvn_repos/reporter.c:222
#, fuzzy, c-format
msgid "Invalid depth (%s) for path '%s'"
msgstr "Ugyldig kildesti «%s» for kopi"
-#: libsvn_repos/reporter.c:649
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "Arbeidskopistien «%s» finnes ikke i depotet"
-#: libsvn_repos/reporter.c:944
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "Ikke autorisert til å åpne roten for redigeringsoperasjonen"
-#: libsvn_repos/reporter.c:963
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "Målstien finnes ikke"
-#: libsvn_repos/reporter.c:970
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "Kan ikke erstatte en katalog innenfra"
-#: libsvn_repos/reporter.c:1013
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "Ugyldig toppnivårapport for arbeidskopi"
-#: libsvn_repos/reporter.c:1028
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "To toppnivårapporter uten mål"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "Nodetypen i filstien «%s» er ikke støttet"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -4105,7 +4111,7 @@
msgid "Can't flush file to disk"
msgstr "Kan ikke tømme filen til disk"
-#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:537
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
#, c-format
msgid "Can't open stdin"
msgstr "Kan ikke åpne standardinndata"
@@ -4407,27 +4413,27 @@
"«%s»: Ukjent kommando.\n"
"\n"
-#: libsvn_subr/opt.c:788
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Syntaksfeil under analysering av revisjon «%s»"
-#: libsvn_subr/opt.c:865
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "Adressen «%s» er ikke riktig kodet for oppsettadresser (URI)"
-#: libsvn_subr/opt.c:871
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URLen «%s» inneholder et «..»-element"
-#: libsvn_subr/opt.c:900
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Feil under løsning av bokstavstørrelse på «%s»"
-#: libsvn_subr/opt.c:1002
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4438,7 +4444,7 @@
" kompilert %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:1005
+#: libsvn_subr/opt.c:998
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4452,7 +4458,7 @@
"Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1056 libsvn_subr/opt.c:1097
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Skriv «%s help» for bruk.\n"
@@ -4557,7 +4563,7 @@
msgid "Passphrase for '%s': "
msgstr "Adgangsfrase/-setning for «%s»: "
-#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1633
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Filen «%s» har ikke ensartede linjeskift"
@@ -5240,7 +5246,7 @@
msgid "Can't find entry '%s' in '%s'"
msgstr "Finner ikke oppføringen «%s» i «%s»"
-#: libsvn_wc/props.c:726
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5249,7 +5255,7 @@
"Prøver å legge til ny egenskap «%s» med verdien «%s»,\n"
"men egenskapen finnes allerede med verdien «%s»."
-#: libsvn_wc/props.c:764
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5258,7 +5264,7 @@
"Prøver å forandre egenskapen «%s» fra «%s» til «%s»,\n"
"men egenskapen finnes ikke."
-#: libsvn_wc/props.c:809
+#: libsvn_wc/props.c:808
#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
@@ -5266,7 +5272,7 @@
"Prøver å slette egenskap «%s», men verdien er blitt forandret fra «%s» til «%"
"s»."
-#: libsvn_wc/props.c:838
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5275,52 +5281,52 @@
"Prøver å forandre egenskapen «%s» fra «%s» til «%s»,\n"
"men egenskapen finnes allerede med verdien «%s»."
-#: libsvn_wc/props.c:1023
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Mangler linjeslutt i «wcprops»-fil for «%s»"
-#: libsvn_wc/props.c:1206 libsvn_wc/props.c:1238 libsvn_wc/props.c:1508
-#: libsvn_wc/props.c:1756
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "Feil under lasting av egenskaper fra disk"
-#: libsvn_wc/props.c:1266
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Kan ikke skrive egenskapstabell for «%s»"
-#: libsvn_wc/props.c:1500 libsvn_wc/props.c:1669
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "Egenskapen «%s» er en oppføringsegenskap"
-#: libsvn_wc/props.c:1547
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Kan ikke sette «%s» på en katalog («%s»)"
-#: libsvn_wc/props.c:1555
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Kan ikke sette «%s» på en fil («%s»)"
-#: libsvn_wc/props.c:1561
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "«%s» er ikke en fil eller katalog"
-#: libsvn_wc/props.c:1642
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Filen «%s» har en binær MIME-type-egenskap"
-#: libsvn_wc/props.c:2508
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Feil under tolking av %s-egenskapen på «%s»: «%s»"
-#: libsvn_wc/props.c:2521
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
@@ -5467,12 +5473,12 @@
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Feil kontrollsum for «%s». Lagret: «%s», gjeldende: «%s»"
-#: libsvn_wc/update_editor.c:3003
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "«%s» mangler informasjon om opprinnelse"
-#: libsvn_wc/update_editor.c:3162
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Kilde-URL «%s» har forskjellig depotrot enn «%s»"
@@ -5514,7 +5520,7 @@
msgstr ""
"Lokale operasjoner som ikke involverer innlegging bruker ikke loggmelding"
-#: svn/diff-cmd.c:117 svnserve/main.c:546
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "Kan ikke åpne for standardutdata"
@@ -5578,7 +5584,7 @@
"Subversion er et verktøy for versjonshåndtering\n"
"Se http://subversion.tigris.org/ for mer informasjon\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1429
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -7242,7 +7248,7 @@
"Flere revisjonsargumenter ble brukt; -r og -c kan ikke brukes samtidig, "
"eller prøv «-r N:M» i stedet for «-r N -r M»"
-#: svn/main.c:1121 svnadmin/main.c:1316
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Syntaksfeil i revisjonsargumentet «%s»"
@@ -7266,18 +7272,18 @@
msgid "Syntax error in native-eol argument '%s'"
msgstr "Syntaksfeil i «native-eol»-argumentet «%s»"
-#: svn/main.c:1413 svndumpfilter/main.c:1207 svnlook/main.c:2066
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "Delkommandoen må ha et argument\n"
-#: svn/main.c:1432 svnadmin/main.c:1445 svndumpfilter/main.c:1226
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Ukjent kommando: «%s»\n"
-#: svn/main.c:1465
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7286,18 +7292,18 @@
"Delkommandoen «%s» godtar ikke valget «%s»\n"
"Skriv «svn help %s» for bruksområde.\n"
-#: svn/main.c:1502
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"Loggmeldingsfilen er under versjonskontroll. Bruk «--force-log» for å "
"overstyre"
-#: svn/main.c:1509
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"Låsekommentarfilen er en versjonert fil; bruk «--force-log» for å overstyre"
-#: svn/main.c:1529
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7305,7 +7311,7 @@
"Loggmeldingen er en filsti (ville du bruke -F?). Bruk «--force-log» for å\n"
"overstyre"
-#: svn/main.c:1536
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7313,11 +7319,11 @@
"Låsekommentaren er en filsti (ble -F brukt med vilje?). Bruk «--force-log»\n"
"for å overstyre"
-#: svn/main.c:1671
+#: svn/main.c:1668
msgid "Try 'svn help' for more info"
msgstr "Prøv «svn help» for mer informasjon"
-#: svn/main.c:1681
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -8268,18 +8274,18 @@
msgid "Removed lock on '%s'.\n"
msgstr "Fjernet lås på «%s».\n"
-#: svnadmin/main.c:1302
+#: svnadmin/main.c:1303
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Flere revisjonsargumenter ble brukt, prøv «-r N:M» i stedet for «-r N -r M»"
-#: svnadmin/main.c:1427
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "delkommandoen må ha et argument\n"
-#: svnadmin/main.c:1512
+#: svnadmin/main.c:1502
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8288,7 +8294,7 @@
"Delkommandoen «%s» tar ikke argumentet «%s»\n"
"Skriv «svnadmin help %s» for bruk.\n"
-#: svnadmin/main.c:1545
+#: svnadmin/main.c:1535
msgid "Try 'svnadmin help' for more info"
msgstr "Prøv «svnadmin --help» for mer informasjon"
@@ -8915,22 +8921,22 @@
"\n"
"Lovlige valg:\n"
-#: svnserve/main.c:458
+#: svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "svnserve: Rotstien «%s» finnes ikke eller er ikke en katalog.\n"
-#: svnserve/main.c:507
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Nøyaktig én av disse må spesifiseres: -d, -i, -t eller -X.\n"
-#: svnserve/main.c:525
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "Valget --tunnel-user er bare gyldig i tunnelmodus.\n"
# ### FIXME: What is the Norwegian term for SCM?
-#: svnserve/main.c:594
+#: svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
@@ -8939,42 +8945,42 @@
"svnserve: «--service»-flagget er bare gyldig hvis prosessen er startet av "
"Service Control Manager.\n"
-#: svnserve/main.c:630
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "Kan ikke hente adresseinfo"
-#: svnserve/main.c:646
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "Kan ikke opprette tjenersokkel"
-#: svnserve/main.c:659
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "Kan ikke binde tjenersokkel"
-#: svnserve/main.c:727
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "Kan ikke akseptere klienttilkobling"
-#: svnserve/main.c:781
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "Kan ikke opprette trådegenskap"
-#: svnserve/main.c:789
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "Kan ikke kjøre i bakgrunnen"
-#: svnserve/main.c:802
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "Kan ikke opprette tråd"
-#: svnserve/serve.c:1463
+#: svnserve/serve.c:1437
#, fuzzy
msgid "Path is not a string"
msgstr "Filstien er ikke til en fil i en arbeidskopi"
@@ -9153,8 +9159,8 @@
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Måldepotet synkroniserer allerede fra «%s»"
-#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1202
-#: svnsync/main.c:1381
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Filstien «%s» er ikke en URL"
@@ -9198,7 +9204,7 @@
msgid "Commit created rev %ld but should have created %ld"
msgstr "Innleggingen opprettet revisjon %ld, men skulle laget %ld"
-#: svnsync/main.c:1274 svnsync/main.c:1279
+#: svnsync/main.c:1275 svnsync/main.c:1280
#, c-format
msgid ""
"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
@@ -9206,17 +9212,17 @@
"Kan ikke kopiere revisjonsegenskaper for en revisjon (%ld) som ikke er blitt "
"synkronisert enda"
-#: svnsync/main.c:1331
+#: svnsync/main.c:1332
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "«%s» er ikke et gyldig revisjonsområde"
-#: svnsync/main.c:1345 svnsync/main.c:1365
+#: svnsync/main.c:1346 svnsync/main.c:1366
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "Ugyldig revisjonsnummer (%ld)"
-#: svnsync/main.c:1422
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -9230,7 +9236,7 @@
"\n"
"Tilgjengelige delkommandoer:\n"
-#: svnsync/main.c:1586
+#: svnsync/main.c:1581
msgid ""
"Cannot use --username or --password with any of --source-username, --source-"
"password, --sync-username, or --sync-password.\n"
@@ -9238,7 +9244,7 @@
"Kan ikke bruke --username eller --password med noen av valgene --source-"
"username, -source-password, --sync-username eller --sync-password.\n"
-#: svnsync/main.c:1666
+#: svnsync/main.c:1661
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -9247,7 +9253,7 @@
"Delkommandoen «%s» godtar ikke valget «%s»\n"
"Skriv «svnsync help %s» for bruksanvisning.\n"
-#: svnsync/main.c:1738
+#: svnsync/main.c:1733
msgid "Try 'svnsync help' for more info"
msgstr "Prøv «svnsync help» for mer informasjon"
@@ -9323,12 +9329,12 @@
msgid "last changed rather than current revisions"
msgstr "sist endrede i stedet for aktuelle revisjoner"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "eksportert%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "«%s» er verken versjonert eller eksportert\n"
diff --git a/subversion/po/pl.po b/subversion/po/pl.po
index 3ce3a06..fdba3e4 100644
--- a/subversion/po/pl.po
+++ b/subversion/po/pl.po
@@ -34,7 +34,7 @@
msgstr ""
"Project-Id-Version: subversion 1.1.0\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-01-22 11:09+0800\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2006-10-30 14:18+0100\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Polish <dev@subversion.tigris.org>\n"
@@ -112,8 +112,8 @@
msgid "Read error in pipe"
msgstr "Błąd odczytu IPC"
-#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:291
-#: libsvn_subr/cmdline.c:308 svn/util.c:742
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
+#: libsvn_subr/cmdline.c:316 svn/util.c:758
#, c-format
msgid "Write error"
msgstr "Błąd zapisu"
@@ -266,609 +266,627 @@
msgid "Invalid switch"
msgstr "Niewłaściwe zlecenie"
-#: include/svn_error_codes.h:398
+#: include/svn_error_codes.h:397
+#, fuzzy
+msgid "Changelist doesn't match"
+msgstr "Suma kontrolna: %s\n"
+
+#: include/svn_error_codes.h:403
msgid "General filesystem error"
msgstr "Błąd systemu plików"
-#: include/svn_error_codes.h:402
+#: include/svn_error_codes.h:407
msgid "Error closing filesystem"
msgstr "Błąd w trakcie zamykania systemu plików"
-#: include/svn_error_codes.h:406
+#: include/svn_error_codes.h:411
msgid "Filesystem is already open"
msgstr "System plików jest już otwarty"
-#: include/svn_error_codes.h:410
+#: include/svn_error_codes.h:415
msgid "Filesystem is not open"
msgstr "System plików nie jest otwarty"
-#: include/svn_error_codes.h:414
+#: include/svn_error_codes.h:419
msgid "Filesystem is corrupt"
msgstr "Uszkodzony system plików"
-#: include/svn_error_codes.h:418
+#: include/svn_error_codes.h:423
msgid "Invalid filesystem path syntax"
msgstr "Błędna składnia ścieżki"
-#: include/svn_error_codes.h:422
+#: include/svn_error_codes.h:427
msgid "Invalid filesystem revision number"
msgstr "Błędny numer wersji"
-#: include/svn_error_codes.h:426
+#: include/svn_error_codes.h:431
msgid "Invalid filesystem transaction name"
msgstr "Błędna nazwa transakcji"
-#: include/svn_error_codes.h:430
+#: include/svn_error_codes.h:435
msgid "Filesystem directory has no such entry"
msgstr "Katalog nie zawiera takiego elementu"
-#: include/svn_error_codes.h:434
+#: include/svn_error_codes.h:439
msgid "Filesystem has no such representation"
msgstr "Katalog nie ma takiej reprezentacji"
-#: include/svn_error_codes.h:438
+#: include/svn_error_codes.h:443
msgid "Filesystem has no such string"
msgstr "System plików nie zawiera takiego napisu"
-#: include/svn_error_codes.h:442
+#: include/svn_error_codes.h:447
msgid "Filesystem has no such copy"
msgstr "System plików nie zawiera takiej kopii"
-#: include/svn_error_codes.h:446
+#: include/svn_error_codes.h:451
msgid "The specified transaction is not mutable"
msgstr "Podana transakcja nie może być modyfikowana"
-#: include/svn_error_codes.h:450
+#: include/svn_error_codes.h:455
msgid "Filesystem has no item"
msgstr "System plików nie zawiera podanego elementu"
-#: include/svn_error_codes.h:454
+#: include/svn_error_codes.h:459
msgid "Filesystem has no such node-rev-id"
msgstr "System plików nie zawiera węzła o podanym identyfikatorze wersji"
-#: include/svn_error_codes.h:458
+#: include/svn_error_codes.h:463
msgid "String does not represent a node or node-rev-id"
msgstr "Napis nie zawiera identyfikatora węzła lub wersji węzła"
-#: include/svn_error_codes.h:462
+#: include/svn_error_codes.h:467
msgid "Name does not refer to a filesystem directory"
msgstr "Nazwa nie odnosi się do katalogu systemu plików"
-#: include/svn_error_codes.h:466
+#: include/svn_error_codes.h:471
msgid "Name does not refer to a filesystem file"
msgstr "Nazwa nie odnosi się do pliku systemu plików"
-#: include/svn_error_codes.h:470
+#: include/svn_error_codes.h:475
msgid "Name is not a single path component"
msgstr "Nazwa nie jest pojedynczą ścieżką"
-#: include/svn_error_codes.h:474
+#: include/svn_error_codes.h:479
msgid "Attempt to change immutable filesystem node"
msgstr "Próba zmiany węzła nie mogącego ulegać zmianom"
-#: include/svn_error_codes.h:478
+#: include/svn_error_codes.h:483
msgid "Item already exists in filesystem"
msgstr "Element już istnieje"
-#: include/svn_error_codes.h:482
+#: include/svn_error_codes.h:487
msgid "Attempt to remove or recreate fs root dir"
msgstr ""
"Próba usunięcia lub ponownego utworzenia głównego katalogu systemu plików"
-#: include/svn_error_codes.h:486
+#: include/svn_error_codes.h:491
msgid "Object is not a transaction root"
msgstr "Obiekt nie wskazuje na korzeń transakcji"
-#: include/svn_error_codes.h:490
+#: include/svn_error_codes.h:495
msgid "Object is not a revision root"
msgstr "Obiekt nie wskazuje na korzeń wersji"
-#: include/svn_error_codes.h:494
+#: include/svn_error_codes.h:499
msgid "Merge conflict during commit"
msgstr "Konflikt łączenia zmian w trakcie zatwierdzania"
-#: include/svn_error_codes.h:498
+#: include/svn_error_codes.h:503
msgid "A representation vanished or changed between reads"
msgstr "Reprezentacja zniknęła lub zmieniła się pomiędzy kolejnymi odczytami"
-#: include/svn_error_codes.h:502
+#: include/svn_error_codes.h:507
msgid "Tried to change an immutable representation"
msgstr "Próba zmiany reprezentacji nie mogącej ulegać zmianom"
-#: include/svn_error_codes.h:506
+#: include/svn_error_codes.h:511
msgid "Malformed skeleton data"
msgstr "Błędne dane wzorcowe"
-#: include/svn_error_codes.h:510
+#: include/svn_error_codes.h:515
msgid "Transaction is out of date"
msgstr "Transakcja jest nieaktualna"
-#: include/svn_error_codes.h:514
+#: include/svn_error_codes.h:519
msgid "Berkeley DB error"
msgstr "Błąd Berkeley DB"
-#: include/svn_error_codes.h:518
+#: include/svn_error_codes.h:523
msgid "Berkeley DB deadlock error"
msgstr "Zakleszczenie Berkeley DB"
-#: include/svn_error_codes.h:522
+#: include/svn_error_codes.h:527
msgid "Transaction is dead"
msgstr "Transakcja jest zniszczona"
-#: include/svn_error_codes.h:526
+#: include/svn_error_codes.h:531
msgid "Transaction is not dead"
msgstr "Transakcja nie jest zniszczona"
-#: include/svn_error_codes.h:531
+#: include/svn_error_codes.h:536
msgid "Unknown FS type"
msgstr "Nieznany typ systemu plików"
-#: include/svn_error_codes.h:536
+#: include/svn_error_codes.h:541
msgid "No user associated with filesystem"
msgstr "Brak użytkownika skojarzonego z systemem plików"
-#: include/svn_error_codes.h:541
+#: include/svn_error_codes.h:546
msgid "Path is already locked"
msgstr "Ścieżka została już zablokowana"
-#: include/svn_error_codes.h:546 include/svn_error_codes.h:678
+#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
msgid "Path is not locked"
msgstr "Ścieżka nie jest zablokowana"
-#: include/svn_error_codes.h:551
+#: include/svn_error_codes.h:556
msgid "Lock token is incorrect"
msgstr "Żeton blokady jest niepoprawny"
-#: include/svn_error_codes.h:556
+#: include/svn_error_codes.h:561
msgid "No lock token provided"
msgstr "Nie podano żetonu blokady"
-#: include/svn_error_codes.h:561
+#: include/svn_error_codes.h:566
msgid "Username does not match lock owner"
msgstr "Nazwa użytkownika nie zgadza się z nazwą właściciela blokady"
-#: include/svn_error_codes.h:566
+#: include/svn_error_codes.h:571
msgid "Filesystem has no such lock"
msgstr "System plików nie zawiera takiej blokady"
-#: include/svn_error_codes.h:571
+#: include/svn_error_codes.h:576
msgid "Lock has expired"
msgstr "Blokada wygasła"
-#: include/svn_error_codes.h:576
+#: include/svn_error_codes.h:581
msgid "Item is out of date"
msgstr "Element jest nieaktualny"
-#: include/svn_error_codes.h:588
+#: include/svn_error_codes.h:586
+#, fuzzy
+msgid "SQLite error"
+msgstr "Błąd zapisu"
+
+#: include/svn_error_codes.h:598
msgid "Unsupported FS format"
msgstr "Nieznany format systemu plików"
-#: include/svn_error_codes.h:593
+#: include/svn_error_codes.h:603
#, fuzzy
msgid "Representation is being written"
msgstr "Reprezentacja nie jest typu 'delta'"
-#: include/svn_error_codes.h:599
+#: include/svn_error_codes.h:609
msgid "The repository is locked, perhaps for db recovery"
msgstr ""
"Repozytorium jest zablokowane, być może ze względu na odtwarzanie bazy danych"
-#: include/svn_error_codes.h:603
+#: include/svn_error_codes.h:613
msgid "A repository hook failed"
msgstr "Błąd wykonania skryptu (hook) repozytorium"
-#: include/svn_error_codes.h:607
+#: include/svn_error_codes.h:617
msgid "Incorrect arguments supplied"
msgstr "Błędne parametry"
-#: include/svn_error_codes.h:611
+#: include/svn_error_codes.h:621
msgid "A report cannot be generated because no data was supplied"
msgstr "Brak danych do wygenerowania raportu"
-#: include/svn_error_codes.h:615
+#: include/svn_error_codes.h:625
msgid "Bogus revision report"
msgstr "Niepoprawny raport o wersji"
-#: include/svn_error_codes.h:624
+#: include/svn_error_codes.h:634
msgid "Unsupported repository version"
msgstr "Nieobsługiwana wersja repozytorium"
-#: include/svn_error_codes.h:628
+#: include/svn_error_codes.h:638
msgid "Disabled repository feature"
msgstr "Wyłączona obsługa funkcji repozytorium"
-#: include/svn_error_codes.h:632
+#: include/svn_error_codes.h:642
msgid "Error running post-commit hook"
msgstr "Błąd działania skryptu post-commit"
-#: include/svn_error_codes.h:637
+#: include/svn_error_codes.h:647
msgid "Error running post-lock hook"
msgstr "Błąd podczas działania skryptu post-lock"
-#: include/svn_error_codes.h:642
+#: include/svn_error_codes.h:652
msgid "Error running post-unlock hook"
msgstr "Błąd podczas działania skryptu post-unlock"
-#: include/svn_error_codes.h:649
+#: include/svn_error_codes.h:659
msgid "Bad URL passed to RA layer"
msgstr "Błędy URL przekazany do warstwy RA"
-#: include/svn_error_codes.h:653
+#: include/svn_error_codes.h:663
msgid "Authorization failed"
msgstr "Nieudana autoryzacja"
-#: include/svn_error_codes.h:657
+#: include/svn_error_codes.h:667
msgid "Unknown authorization method"
msgstr "Nieznana metoda autoryzacji"
-#: include/svn_error_codes.h:661
+#: include/svn_error_codes.h:671
msgid "Repository access method not implemented"
msgstr "Nie zaimplementowana metoda dostępu do repozytorium"
-#: include/svn_error_codes.h:665
+#: include/svn_error_codes.h:675
msgid "Item is out-of-date"
msgstr "Nieaktualna wartość"
-#: include/svn_error_codes.h:669
+#: include/svn_error_codes.h:679
msgid "Repository has no UUID"
msgstr "Repozytorium nie ma UUID"
-#: include/svn_error_codes.h:673
+#: include/svn_error_codes.h:683
msgid "Unsupported RA plugin ABI version"
msgstr "Nieobsługiwana wersja ABI w pluginie RA"
-#: include/svn_error_codes.h:685
+#: include/svn_error_codes.h:695
msgid "RA layer failed to init socket layer"
msgstr "Warstwa RA nie zainicjowała połączenia sieciowego"
-#: include/svn_error_codes.h:689
+#: include/svn_error_codes.h:699
msgid "RA layer failed to create HTTP request"
msgstr "Warstwa RA nie stworzyła żądania HTTP"
-#: include/svn_error_codes.h:693
+#: include/svn_error_codes.h:703
msgid "RA layer request failed"
msgstr "Żądanie warstwy RA nie powiodło się"
-#: include/svn_error_codes.h:697
+#: include/svn_error_codes.h:707
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "Warstwa RA nie otrzymała wymaganych informacji"
-#: include/svn_error_codes.h:701
+#: include/svn_error_codes.h:711
msgid "RA layer failed to fetch properties"
msgstr "Warstwa RA nie zdołała pobrać atrybutów"
-#: include/svn_error_codes.h:705
+#: include/svn_error_codes.h:715
msgid "RA layer file already exists"
msgstr "Plik warstwy RA już istnieje"
-#: include/svn_error_codes.h:709
+#: include/svn_error_codes.h:719
msgid "Invalid configuration value"
msgstr "Błąd konfiguracji"
-#: include/svn_error_codes.h:713
+#: include/svn_error_codes.h:723
msgid "HTTP Path Not Found"
msgstr "Nie znaleziono adresu HTTP"
-#: include/svn_error_codes.h:717
+#: include/svn_error_codes.h:727
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Błąd wykonania PROPPATCH WebDAV"
-#: include/svn_error_codes.h:722 include/svn_error_codes.h:763
-#: libsvn_ra_svn/marshal.c:612 libsvn_ra_svn/marshal.c:720
-#: libsvn_ra_svn/marshal.c:747
+#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
+#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
+#: libsvn_ra_svn/marshal.c:774
msgid "Malformed network data"
msgstr "Błędne dane z sieci"
-#: include/svn_error_codes.h:727
+#: include/svn_error_codes.h:737
msgid "Unable to extract data from response header"
msgstr "Nie udało się zdekodować danych z nagłówka odpowiedzi"
-#: include/svn_error_codes.h:732
+#: include/svn_error_codes.h:742
#, fuzzy
msgid "Repository has been moved"
msgstr "Repozytorium nie ma UUID"
-#: include/svn_error_codes.h:738 include/svn_error_codes.h:767
+#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
msgid "Couldn't find a repository"
msgstr "Nie znaleziono repozytorium"
-#: include/svn_error_codes.h:742
+#: include/svn_error_codes.h:752
msgid "Couldn't open a repository"
msgstr "Nie zdołano otworzyć repozytorium"
-#: include/svn_error_codes.h:747
+#: include/svn_error_codes.h:757
msgid "Special code for wrapping server errors to report to client"
msgstr "Błąd serwera"
-#: include/svn_error_codes.h:751
+#: include/svn_error_codes.h:761
msgid "Unknown svn protocol command"
msgstr "Nieznane polecenie protokołu svn"
-#: include/svn_error_codes.h:755
+#: include/svn_error_codes.h:765
msgid "Network connection closed unexpectedly"
msgstr "Nieoczekiwane przerwanie połączenia sieciowego"
-#: include/svn_error_codes.h:759
+#: include/svn_error_codes.h:769
msgid "Network read/write error"
msgstr "Błąd odczytu/zapisu sieciowego"
-#: include/svn_error_codes.h:771
+#: include/svn_error_codes.h:781
msgid "Client/server version mismatch"
msgstr "Niezgodność wersji klienta i serwera"
-#: include/svn_error_codes.h:779
+#: include/svn_error_codes.h:786
+msgid "Cannot negotiate authentication mechanism"
+msgstr "Nie można określić sposobu autoryzacji"
+
+#: include/svn_error_codes.h:795
msgid "Credential data unavailable"
msgstr "Brak danych uwierzytelniających"
-#: include/svn_error_codes.h:783
+#: include/svn_error_codes.h:799
msgid "No authentication provider available"
msgstr "Brak mechanizmów uwierzytelniania"
-#: include/svn_error_codes.h:787 include/svn_error_codes.h:791
+#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
msgid "All authentication providers exhausted"
msgstr "Wyczerpano możliwości uwierzytelniania"
-#: include/svn_error_codes.h:797
+#: include/svn_error_codes.h:813
msgid "Read access denied for root of edit"
msgstr "Brak prawa do odczytu"
-#: include/svn_error_codes.h:802
+#: include/svn_error_codes.h:818
msgid "Item is not readable"
msgstr "Nie można odczytać elementu"
-#: include/svn_error_codes.h:807
+#: include/svn_error_codes.h:823
msgid "Item is partially readable"
msgstr "Element można tylko częściowo odczytać"
-#: include/svn_error_codes.h:811
+#: include/svn_error_codes.h:827
#, fuzzy
msgid "Invalid authz configuration"
msgstr "Błąd konfiguracji"
-#: include/svn_error_codes.h:816
+#: include/svn_error_codes.h:832
msgid "Item is not writable"
msgstr "Elementu nie można zapisywać"
-#: include/svn_error_codes.h:822
+#: include/svn_error_codes.h:838
msgid "Svndiff data has invalid header"
msgstr "Błędny nagłówek danych svndiff"
-#: include/svn_error_codes.h:826
+#: include/svn_error_codes.h:842
msgid "Svndiff data contains corrupt window"
msgstr "Błędne okno danych svndiff"
-#: include/svn_error_codes.h:830
+#: include/svn_error_codes.h:846
msgid "Svndiff data contains backward-sliding source view"
msgstr "Dane svndiff zawierają wsteczny podgląd"
-#: include/svn_error_codes.h:834
+#: include/svn_error_codes.h:850
msgid "Svndiff data contains invalid instruction"
msgstr "Dane svndiff zawierają nieznaną instrukcję"
-#: include/svn_error_codes.h:838
+#: include/svn_error_codes.h:854
msgid "Svndiff data ends unexpectedly"
msgstr "Nieoczekiwany koniec danych svndiff"
-#: include/svn_error_codes.h:842
+#: include/svn_error_codes.h:858
msgid "Svndiff compressed data is invalid"
msgstr "Błędny nagłówek skompresowanych danych svndiff"
-#: include/svn_error_codes.h:848
+#: include/svn_error_codes.h:864
#, fuzzy
msgid "Diff data source modified unexpectedly"
msgstr "Nieoczekiwany koniec danych svndiff"
-#: include/svn_error_codes.h:854
+#: include/svn_error_codes.h:870
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache nie zna ścieżki do systemu plików Subversion"
-#: include/svn_error_codes.h:858
+#: include/svn_error_codes.h:874
msgid "Apache got a malformed URI"
msgstr "Apache otrzymał błędny URI"
-#: include/svn_error_codes.h:862
+#: include/svn_error_codes.h:878
msgid "Activity not found"
msgstr "Nie znaleziono aktywności"
-#: include/svn_error_codes.h:866
+#: include/svn_error_codes.h:882
msgid "Baseline incorrect"
msgstr "Błędna linia bazowa"
-#: include/svn_error_codes.h:870
+#: include/svn_error_codes.h:886
msgid "Input/output error"
msgstr "Błąd wejścia/wyjścia"
-#: include/svn_error_codes.h:876
+#: include/svn_error_codes.h:892
msgid "A path under version control is needed for this operation"
msgstr "To polecenie wymaga ścieżki podlegającej zarządzaniu wersjami "
-#: include/svn_error_codes.h:880
+#: include/svn_error_codes.h:896
msgid "Repository access is needed for this operation"
msgstr "To polecenie wymaga dostępu do repozytorium"
-#: include/svn_error_codes.h:884
+#: include/svn_error_codes.h:900
msgid "Bogus revision information given"
msgstr "Błędne informacje o wersji"
-#: include/svn_error_codes.h:888
+#: include/svn_error_codes.h:904
msgid "Attempting to commit to a URL more than once"
msgstr "Próba zatwierdzenia URL więcej niż raz"
-#: include/svn_error_codes.h:892
+#: include/svn_error_codes.h:908
msgid "Operation does not apply to binary file"
msgstr "Polecenie niedostępne dla plików binarnych"
-#: include/svn_error_codes.h:898
+#: include/svn_error_codes.h:914
msgid "Format of an svn:externals property was invalid"
msgstr "Błędny format atrybutu svn:externals"
-#: include/svn_error_codes.h:902
+#: include/svn_error_codes.h:918
msgid "Attempting restricted operation for modified resource"
msgstr "Próba wykonania zastrzeżonej operacji dla zmodyfikowanego zasobu"
-#: include/svn_error_codes.h:906
+#: include/svn_error_codes.h:922
msgid "Operation does not apply to directory"
msgstr "Polecenie niedostępne dla katalogów"
-#: include/svn_error_codes.h:910
+#: include/svn_error_codes.h:926
msgid "Revision range is not allowed"
msgstr "Zakres wersji jest niedozwolony w tym przypadku"
-#: include/svn_error_codes.h:914
+#: include/svn_error_codes.h:930
msgid "Inter-repository relocation not allowed"
msgstr "Przeniesienie między repozytoriami nie jest dozwolone"
-#: include/svn_error_codes.h:918
+#: include/svn_error_codes.h:934
msgid "Author name cannot contain a newline"
msgstr "Nazwa autora nie może zawierać znaku nowego wiersza"
-#: include/svn_error_codes.h:922
+#: include/svn_error_codes.h:938
msgid "Bad property name"
msgstr "Błędna nazwa atrybutu"
-#: include/svn_error_codes.h:927
+#: include/svn_error_codes.h:943
msgid "Two versioned resources are unrelated"
msgstr "Podane zasoby nie są ze sobą związane"
-#: include/svn_error_codes.h:932
+#: include/svn_error_codes.h:948
msgid "Path has no lock token"
msgstr "Ścieżka nie zawiera żetonu blokady"
-#: include/svn_error_codes.h:937
+#: include/svn_error_codes.h:953
#, fuzzy
msgid "Operation does not support multiple sources"
msgstr "Polecenie niedostępne dla katalogów"
-#: include/svn_error_codes.h:943
+#: include/svn_error_codes.h:959
msgid "A problem occurred; see later errors for details"
msgstr "Wystąpił błąd, szczegóły dalej."
-#: include/svn_error_codes.h:947
+#: include/svn_error_codes.h:963
msgid "Failure loading plugin"
msgstr "Błąd ładowania plugina."
-#: include/svn_error_codes.h:951
+#: include/svn_error_codes.h:967
msgid "Malformed file"
msgstr "Błędny plik."
-#: include/svn_error_codes.h:955
+#: include/svn_error_codes.h:971
msgid "Incomplete data"
msgstr "Niepełne dane"
-#: include/svn_error_codes.h:959
+#: include/svn_error_codes.h:975
msgid "Incorrect parameters given"
msgstr "Błędne parametry"
-#: include/svn_error_codes.h:963
+#: include/svn_error_codes.h:979
msgid "Tried a versioning operation on an unversioned resource"
msgstr ""
"Polecenie wymaga pliku podlegającego zarządzaniu wersjami, podany parametr "
"tego warunku nie spełnia."
-#: include/svn_error_codes.h:967
+#: include/svn_error_codes.h:983
msgid "Test failed"
msgstr "Błąd testu."
-#: include/svn_error_codes.h:971
+#: include/svn_error_codes.h:987
msgid "Trying to use an unsupported feature"
msgstr "Próba użycia nieobsługiwanej funkcji"
-#: include/svn_error_codes.h:975
+#: include/svn_error_codes.h:991
msgid "Unexpected or unknown property kind"
msgstr "Nieoczekiwany lub nieznany typ atrybutu"
-#: include/svn_error_codes.h:979
+#: include/svn_error_codes.h:995
msgid "Illegal target for the requested operation"
msgstr "Nielegalny obiekt dla podanej operacji"
-#: include/svn_error_codes.h:983
+#: include/svn_error_codes.h:999
msgid "MD5 checksum is missing"
msgstr "Niezgodność sumy kontrolnej MD5"
-#: include/svn_error_codes.h:987
+#: include/svn_error_codes.h:1003
msgid "Directory needs to be empty but is not"
msgstr "Katalog powinien być pusty - a nie jest"
-#: include/svn_error_codes.h:991
+#: include/svn_error_codes.h:1007
msgid "Error calling external program"
msgstr "Błąd uruchamiania zewnętrznego programu"
-#: include/svn_error_codes.h:995
+#: include/svn_error_codes.h:1011
msgid "Python exception has been set with the error"
msgstr "Wyjątek języka Python"
-#: include/svn_error_codes.h:999
+#: include/svn_error_codes.h:1015
msgid "A checksum mismatch occurred"
msgstr "Niezgodność sumy kontrolnej"
-#: include/svn_error_codes.h:1003
+#: include/svn_error_codes.h:1019
msgid "The operation was interrupted"
msgstr "Wykonanie polecenia przerwano"
-#: include/svn_error_codes.h:1007
+#: include/svn_error_codes.h:1023
msgid "The specified diff option is not supported"
msgstr "Podana opcja diff nie jest obsługiwana"
-#: include/svn_error_codes.h:1011
+#: include/svn_error_codes.h:1027
msgid "Property not found"
msgstr "Nie ma takiego atrybutu"
-#: include/svn_error_codes.h:1015
+#: include/svn_error_codes.h:1031
msgid "No auth file path available"
msgstr "Brak ścieżki do pliku uwierzytelniającego"
-#: include/svn_error_codes.h:1020
+#: include/svn_error_codes.h:1035
+msgid "Merge info parse error"
+msgstr ""
+
+#: include/svn_error_codes.h:1040
msgid "Incompatible library version"
msgstr "Niekompatybilna wersja biblioteki"
-#: include/svn_error_codes.h:1026
+#: include/svn_error_codes.h:1046
#, fuzzy
msgid "Error parsing arguments"
msgstr "Błąd klienta w trakcie parsowania parametrów"
-#: include/svn_error_codes.h:1030
+#: include/svn_error_codes.h:1050
#, fuzzy
msgid "Not enough arguments provided"
msgstr "Zbyt mało parametrów"
-#: include/svn_error_codes.h:1034
+#: include/svn_error_codes.h:1054
msgid "Mutually exclusive arguments specified"
msgstr "Podano sprzeczne parametry"
-#: include/svn_error_codes.h:1038
+#: include/svn_error_codes.h:1058
msgid "Attempted command in administrative dir"
msgstr "Próba wykonania polecenia w katalogu administracyjnym"
-#: include/svn_error_codes.h:1042
+#: include/svn_error_codes.h:1062
msgid "The log message file is under version control"
msgstr "Plik z opisem zmian podlega zarządzaniu wersjami"
-#: include/svn_error_codes.h:1046
+#: include/svn_error_codes.h:1066
msgid "The log message is a pathname"
msgstr "Opis zmian jest ścieżką"
-#: include/svn_error_codes.h:1050
+#: include/svn_error_codes.h:1070
msgid "Committing in directory scheduled for addition"
msgstr "Próba zatwierdzania w katalogu oczekującym na dodanie"
-#: include/svn_error_codes.h:1054
+#: include/svn_error_codes.h:1074
msgid "No external editor available"
msgstr "Brak zewnętrznego edytora"
-#: include/svn_error_codes.h:1058
+#: include/svn_error_codes.h:1078
msgid "Something is wrong with the log message's contents"
msgstr "Opis zmian zawiera jakiś błąd"
-#: include/svn_error_codes.h:1062
+#: include/svn_error_codes.h:1082
msgid "A log message was given where none was necessary"
msgstr "Wprowadzono opis zmian mimo, że nie jest wymagany"
-#: libsvn_client/add.c:344 libsvn_wc/copy.c:188
+#: libsvn_client/add.c:345 libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "Nie można zamknąć katalogu '%s'"
-#: libsvn_client/add.c:352
+#: libsvn_client/add.c:353
#, c-format
msgid "Error during recursive add of '%s'"
msgstr "Błąd podczas rekursywnego dodawania '%s'"
@@ -886,7 +904,7 @@
msgid "Start revision must precede end revision"
msgstr "Wersja początkowa musi być mniejsza, niż końcowa"
-#: libsvn_client/blame.c:725 libsvn_client/cat.c:208
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL '%s' odnosi się do katalogu"
@@ -896,40 +914,35 @@
msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
msgstr "Polecenie '%c' dla wersji %ld '%s' wymaga podania wersji wcześniejszej"
-#: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "'%s' nie podlega zarządzaniu wersjami lub nie istnieje"
-
-#: libsvn_client/cat.c:79
+#: libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "'%s' odnosi się do katalogu"
-#: libsvn_client/cat.c:131 libsvn_client/export.c:183
+#: libsvn_client/cat.c:126 libsvn_client/export.c:183
msgid "(local)"
msgstr "(lokalny)"
-#: libsvn_client/checkout.c:92
+#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL '%s' nie istnieje"
-#: libsvn_client/checkout.c:96
+#: libsvn_client/checkout.c:95
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL '%s' odnosi się do pliku, nie do katalogu"
-#: libsvn_client/checkout.c:167
+#: libsvn_client/checkout.c:168
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "'%s' jest już kopią roboczą innego URL"
-#: libsvn_client/checkout.c:171
+#: libsvn_client/checkout.c:172
msgid "; run 'svn update' to complete it"
msgstr "; uruchom 'svn update' aby zakończyć"
-#: libsvn_client/checkout.c:181
+#: libsvn_client/checkout.c:182
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' już istnieje i nie jest katalogiem"
@@ -944,119 +957,99 @@
msgid "New entry name required when importing a file"
msgstr "Wymagane podanie nazwy obiektu podczas importowania pliku"
-#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:997 libsvn_wc/questions.c:91
+#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1016
+#: libsvn_wc/questions.c:92
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' nie istnieje"
-#: libsvn_client/commit.c:606 libsvn_client/copy.c:283 svnlook/main.c:1204
+#: libsvn_client/commit.c:607 libsvn_client/copy.c:286 svnlook/main.c:1216
#, c-format
msgid "Path '%s' does not exist"
msgstr "Ścieżka '%s' nie istnieje"
-#: libsvn_client/commit.c:737 libsvn_client/copy.c:292
-#: libsvn_client/copy.c:617 libsvn_client/copy.c:868 libsvn_client/copy.c:1194
+#: libsvn_client/commit.c:741 libsvn_client/copy.c:295
+#: libsvn_client/copy.c:759 libsvn_client/copy.c:1025
+#: libsvn_client/copy.c:1417
#, c-format
msgid "Path '%s' already exists"
msgstr "Ścieżka '%s' już istnieje"
-#: libsvn_client/commit.c:752
+#: libsvn_client/commit.c:756
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' to nazwa zastrzeżona i nie może zostać zaimportowana"
-#: libsvn_client/commit.c:868 libsvn_client/copy.c:760
+#: libsvn_client/commit.c:872 libsvn_client/copy.c:909
msgid "Commit failed (details follow):"
msgstr "Zatwierdzenie nie powiodło się (szczegóły poniżej):"
-#: libsvn_client/commit.c:876 libsvn_client/copy.c:768
+#: libsvn_client/commit.c:880 libsvn_client/copy.c:917
msgid "Commit succeeded, but other errors follow:"
msgstr "Zatwierdzenie powiodło się, lecz wystąpiły inne błędy:"
-#: libsvn_client/commit.c:883 libsvn_client/copy.c:775
+#: libsvn_client/commit.c:887 libsvn_client/copy.c:924
msgid "Error unlocking locked dirs (details follow):"
msgstr "Nie udało się odblokowanie katalogów (szczegóły poniżej):"
-#: libsvn_client/commit.c:894
+#: libsvn_client/commit.c:898
msgid "Error bumping revisions post-commit (details follow):"
msgstr "Błąd operacji post-commit (szczegóły poniżej):"
-#: libsvn_client/commit.c:905 libsvn_client/copy.c:786
+#: libsvn_client/commit.c:909 libsvn_client/copy.c:935
msgid "Error in post-commit clean-up (details follow):"
msgstr "Błąd oczyszczania post-commit (szczegóły poniżej):"
-#: libsvn_client/commit.c:1189
+#: libsvn_client/commit.c:1193
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "'%s' to URL, a URL nie może być obiektem zatwierdzenia"
-#: libsvn_client/commit.c:1388
+#: libsvn_client/commit.c:1392
msgid "Are all the targets part of the same working copy?"
msgstr "Czy wszystkie obiekty docelowe należą do tej samej kopii roboczej?"
-#: libsvn_client/commit.c:1403
+#: libsvn_client/commit.c:1407
msgid "Cannot non-recursively commit a directory deletion"
msgstr "Zatwierdzenie usunięcia katalogu musi być wykonane rekursywnie"
-#: libsvn_client/commit_util.c:252 libsvn_client/commit_util.c:263
+#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "Nieznany rodzaj obiektu dla '%s'"
-#: libsvn_client/commit_util.c:280
+#: libsvn_client/commit_util.c:284
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "Obiekt '%s' został zastąpiony plikiem specjalnym"
-#: libsvn_client/commit_util.c:331
+#: libsvn_client/commit_util.c:335
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "Zatwierdzanie przerwane: konflikt obiektu '%s'"
-#: libsvn_client/commit_util.c:397
+#: libsvn_client/commit_util.c:401
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "Niespodziewanie '%s' okazał się głównym katalogiem kopii roboczej"
-#: libsvn_client/commit_util.c:415 libsvn_client/commit_util.c:1065
+#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "Element '%s' zaznaczony do skopiowania, lecz nie podano źródłowego URL"
-#: libsvn_client/commit_util.c:705 libsvn_client/commit_util.c:853
-#: libsvn_client/copy.c:1485 libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1468 libsvn_client/diff.c:2198
-#: libsvn_client/diff.c:2793 libsvn_client/diff.c:2921
-#: libsvn_client/locking_commands.c:259 libsvn_client/log.c:133
-#: libsvn_client/prop_commands.c:354 libsvn_client/prop_commands.c:608
-#: libsvn_client/prop_commands.c:772 libsvn_client/prop_commands.c:1131
-#: libsvn_client/ra.c:181 libsvn_client/revisions.c:89
-#: libsvn_client/status.c:256 libsvn_client/switch.c:107
-#: libsvn_wc/adm_crawler.c:453 libsvn_wc/adm_crawler.c:477
-#: libsvn_wc/adm_ops.c:1350 libsvn_wc/adm_ops.c:2638 libsvn_wc/adm_ops.c:2664
-#: libsvn_wc/adm_ops.c:2700 libsvn_wc/adm_ops.c:2759 libsvn_wc/copy.c:307
-#: libsvn_wc/copy.c:663 libsvn_wc/copy.c:785 libsvn_wc/copy.c:792
-#: libsvn_wc/diff.c:1793 libsvn_wc/entries.c:2276 libsvn_wc/entries.c:2872
-#: libsvn_wc/props.c:484 libsvn_wc/props.c:1092 libsvn_wc/props.c:1543
-#: libsvn_wc/questions.c:186 libsvn_wc/questions.c:300 libsvn_wc/status.c:729
-#: libsvn_wc/translate.c:269 libsvn_wc/update_editor.c:2299
-#: libsvn_wc/update_editor.c:3150
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "'%s' nie podlega zarządzaniu wersjami"
-
-#: libsvn_client/commit_util.c:708
+#: libsvn_client/commit_util.c:709
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "Element '%s' nie ma URL"
-#: libsvn_client/commit_util.c:741
+#: libsvn_client/commit_util.c:742
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr ""
"'%s' przeznaczony do dodania w katalogu nie podlegającym kontroli wersji"
-#: libsvn_client/commit_util.c:761
+#: libsvn_client/commit_util.c:762
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1067,7 +1060,7 @@
"do dodania. Czy próbujesz zatwierdzić obiekt, który jest w katalogu\n"
"nie podlegającym zarządzaniu wersjami?"
-#: libsvn_client/commit_util.c:802
+#: libsvn_client/commit_util.c:803
#, c-format
msgid ""
"'%s' is not under version control and is not part of the commit, yet its "
@@ -1076,24 +1069,28 @@
"'%s' nie podlega zarządzaniu wersjami i nie podlega zatwierdzaniu, jednak "
"podrzędny obiekt '%s' ma zostać zatwierdzony"
-#: libsvn_client/commit_util.c:920
+#: libsvn_client/commit_util.c:907
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr ""
"Nie można zatwierdzić '%s' i '%s' ponieważ odnoszą się do tego samego URL"
-#: libsvn_client/commit_util.c:1070
+#: libsvn_client/commit_util.c:1057
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "Element '%s' zaznaczony do skopiowania, lecz wersja jest niewłaściwa"
-#: libsvn_client/copy.c:302 libsvn_client/copy.c:1204
-#: libsvn_client/update.c:78
+#: libsvn_client/commit_util.c:1822
+msgid "Standard properties can't be set explicitly as revision properties"
+msgstr ""
+
+#: libsvn_client/copy.c:305 libsvn_client/copy.c:1427
+#: libsvn_client/update.c:98
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Ścieżka '%s' nie jest katalogiem"
-#: libsvn_client/copy.c:516
+#: libsvn_client/copy.c:658
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
@@ -1102,66 +1099,67 @@
"Obiekty źródłowy i docelowy nie znajdują się w tym samym repozytorium"
"(źródło: '%s'; cel: '%s')"
-#: libsvn_client/copy.c:598
+#: libsvn_client/copy.c:740
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Nie można przenieść URL '%s' do samego siebie"
-#: libsvn_client/copy.c:607 libsvn_client/prop_commands.c:226
+#: libsvn_client/copy.c:749 libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Ścieżka '%s' nie istnieje w wersji %ld"
-#: libsvn_client/copy.c:1043
+#: libsvn_client/copy.c:1259
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr ""
"Źródłowy URL '%s' pochodzi z zewnętrznego repozytorium; pozostaje jako kopia "
"rozłączona"
-#: libsvn_client/copy.c:1181
+#: libsvn_client/copy.c:1404
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Ścieżka '%s' nie znaleziona w wersji '%ld'"
-#: libsvn_client/copy.c:1186
+#: libsvn_client/copy.c:1409
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Ścieżki '%s' nie znaleziono w wersji HEAD"
-#: libsvn_client/copy.c:1229
+#: libsvn_client/copy.c:1452
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "Element '%s' istnieje, choć nie znaleziono kopii roboczej pliku"
-#: libsvn_client/copy.c:1323 libsvn_client/log.c:86
+#: libsvn_client/copy.c:1546 libsvn_client/log.c:87
msgid "Revision type requires a working copy path, not a URL"
msgstr ""
-#: libsvn_client/copy.c:1357
-msgid "Cannot mix repository and working copy paths in source list"
-msgstr ""
+#: libsvn_client/copy.c:1581
+#, fuzzy
+msgid "Cannot mix repository and working copy sources"
+msgstr "Ścieżka nie wskazuje na plik w ramach kopii roboczej"
-#: libsvn_client/copy.c:1398
+#: libsvn_client/copy.c:1623
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Nie można skopiować ścieżki '%s' do własnej podrzędnej '%s'"
-#: libsvn_client/copy.c:1418
+#: libsvn_client/copy.c:1643
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Nie można przenieść ścieżki '%s' do siebie samej"
-#: libsvn_client/copy.c:1427
-msgid "No support for repos <--> working copy moves"
-msgstr "Przenoszenie repozytorium <--> kopia robocza nie jest obsługiwane"
+#: libsvn_client/copy.c:1652
+msgid "Moves between the working copy and the repository are not supported"
+msgstr ""
-#: libsvn_client/copy.c:1491
+#: libsvn_client/copy.c:1710
#, c-format
msgid "'%s' does not seem to have a URL associated with it"
msgstr "obiekt '%s' nie posiada związanego z nim URL"
-#: libsvn_client/copy.c:1817 svn/move-cmd.c:67
+#: libsvn_client/copy.c:2048 svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr ""
"Nie można określić wersji (z wyjątkiem HEAD) dla operacji przeniesienia"
@@ -1171,88 +1169,77 @@
msgid "'%s' is in the way of the resource actually under version control"
msgstr "'%s' leży w miejscu pliku podlegającego zarządzaniu wersjami"
+#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2781 libsvn_wc/entries.c:1256
+#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2969
+#: libsvn_wc/update_editor.c:2178
+#, c-format
+msgid "'%s' is not under version control"
+msgstr "'%s' nie podlega zarządzaniu wersjami"
+
#: libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "'%s' zawiera lokalne modyfikacje"
-#: libsvn_client/diff.c:99
+#: libsvn_client/diff.c:135
+#, fuzzy, c-format
+msgid " Reverted %s:r%s%s"
+msgstr "Wycofano zmiany w '%s'\n"
+
+#: libsvn_client/diff.c:153
+#, c-format
+msgid " Merged %s:r%s%s"
+msgstr ""
+
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sZmiany atrybutów dla: %s%s"
-#: libsvn_client/diff.c:127
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "Nazwa: %s%s"
-#: libsvn_client/diff.c:203
-#, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr "URLe nie zawierają schematu ('%s' i '%s')"
-
-#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
-#, c-format
-msgid "URL has no scheme: '%s'"
-msgstr "URL nie zawiera schematu: '%s'"
-
-#: libsvn_client/diff.c:222
-#, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "Łączenie różnych schematów dostępu nie jest obsługiwane ('%s' i '%s')"
-
-#: libsvn_client/diff.c:287
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(wersja %ld)"
-#: libsvn_client/diff.c:289
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(kopia robocza)"
-#: libsvn_client/diff.c:432
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Nie można wyświetlić: plik binarny.%s"
-#. xgettext: the '.working', '.merge-left.r%ld' and
-#. '.merge-right.r%ld' strings are used to tag onto a file
-#. name in case of a merge conflict
-#: libsvn_client/diff.c:887
-msgid ".working"
-msgstr ".robocza"
-
-#: libsvn_client/diff.c:889
-#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".merge-lewo.w%ld"
-
-#: libsvn_client/diff.c:892
-#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".merge-prawo.w%ld"
-
-#: libsvn_client/diff.c:1533 libsvn_client/diff.c:1737
+#. -----------------------------------------------------------------------
+#. ** Utilities. **
+#. Sanity check -- ensure that we have valid revisions to look at.
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "Nie wszystkie wymagane wersje zostały podane"
-#: libsvn_client/diff.c:1548
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr "Przynajmniej jedna wersja musi być zdalna aby wykonać pegged diff"
-#: libsvn_client/diff.c:1660 libsvn_client/diff.c:1672
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' nie występuje w repozytorium w wersji %ld"
-#: libsvn_client/diff.c:2018
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+#: libsvn_client/diff.c:1025
+#, fuzzy
+msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr ""
"Niestety, ale svn_client_diff3 uruchomiono w sposób, który nie jest \n"
"jeszcze obsługiwany"
-#: libsvn_client/diff.c:2057
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1260,178 +1247,213 @@
"Jedynie porównania między wersją bazową i jej plikiem roboczym są obecnie "
"obsługiwane"
-#: libsvn_client/diff.c:2202 libsvn_client/switch.c:111
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Katalog '%s' nie ma URL"
-#: libsvn_client/diff.c:2409
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr ""
-#: libsvn_client/diff.c:2766 libsvn_client/diff.c:2772
-#: libsvn_client/diff.c:2906 libsvn_client/locking_commands.c:263
-#: libsvn_client/ra.c:382 libsvn_client/ra.c:748 libsvn_client/ra.c:885
-#, c-format
-msgid "'%s' has no URL"
-msgstr "'%s' nie ma URL"
-
#: libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s' nie jest poprawnym znakiem końca linii"
-#: libsvn_client/export.c:271
+#: libsvn_client/export.c:260
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr ""
"Katalog docelowy już istnieje i nie zostanie nadpisany o ile nie zostanie to "
"wymuszone."
-#: libsvn_client/export.c:369 libsvn_client/export.c:512
+#: libsvn_client/export.c:358 libsvn_client/export.c:501
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s' istnieje i nie jest katalogiem"
-#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#: libsvn_client/export.c:362 libsvn_client/export.c:505
#, c-format
msgid "'%s' already exists"
msgstr "'%s' już istnieje"
-#: libsvn_client/export.c:687 libsvn_wc/update_editor.c:1759
-#: libsvn_wc/update_editor.c:2429
+#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Błąd sumy kontrolnej dla '%s'; oczekiwana: '%s', faktyczna: '%s'"
-#: libsvn_client/info.c:244
-#, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "Nie można czytać elementu dla '%s'"
-
-#: libsvn_client/info.c:380 libsvn_client/info.c:405 libsvn_client/info.c:415
+#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
#, fuzzy, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL '%s' nie istnieje w wersji '%ld'"
-#: libsvn_client/list.c:225
+#: libsvn_client/list.c:222
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL '%s' nie istnieje w tej wersji"
-#: libsvn_client/locking_commands.c:198
+#: libsvn_client/locking_commands.c:199
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr ""
"Nie znaleziono wspólnego rodzica, nie można użyć rozłącznych argumentów"
-#: libsvn_client/locking_commands.c:287
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
+#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
+#, c-format
+msgid "'%s' has no URL"
+msgstr "'%s' nie ma URL"
+
+#: libsvn_client/locking_commands.c:284
msgid "Unable to lock/unlock across multiple repositories"
msgstr "Nie można założyć/zdjąć blokady jednocześnie dla różnych repozytoriów."
-#: libsvn_client/locking_commands.c:328
+#: libsvn_client/locking_commands.c:325
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' nie jest zablokowane w danej kopii roboczej"
-#: libsvn_client/locking_commands.c:376
+#: libsvn_client/locking_commands.c:373
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' nie jest zablokowane"
-#: libsvn_client/locking_commands.c:409 libsvn_ra/ra_loader.c:625
-msgid "Lock comment has illegal characters"
+#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:932
+#: libsvn_ra/ra_loader.c:863
+#, fuzzy
+msgid "Lock comment contains illegal characters"
msgstr "Opis zakładanej blokady zawiera nieprawidłowe znaki"
-#: libsvn_client/log.c:73
+#: libsvn_client/log.c:74
msgid "Missing required revision specification"
msgstr "Nie podano wymaganej specyfikacji wersji"
-#: libsvn_client/log.c:139 libsvn_client/status.c:261
-#: libsvn_client/update.c:92
+#: libsvn_client/log.c:137 libsvn_client/status.c:271
+#: libsvn_client/update.c:112
#, c-format
msgid "Entry '%s' has no URL"
msgstr "Element '%s' nie ma URL"
-#: libsvn_client/log.c:370
+#: libsvn_client/log.c:368
msgid "No commits in repository"
msgstr "Brak zatwierdzeń w repozytorium"
-#: libsvn_client/prop_commands.c:71
+#: libsvn_client/merge.c:87
+#, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
+msgstr "URLe nie zawierają schematu ('%s' i '%s')"
+
+#: libsvn_client/merge.c:93 libsvn_client/merge.c:99
+#, c-format
+msgid "URL has no scheme: '%s'"
+msgstr "URL nie zawiera schematu: '%s'"
+
+#: libsvn_client/merge.c:106
+#, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr "Łączenie różnych schematów dostępu nie jest obsługiwane ('%s' i '%s')"
+
+#. xgettext: the '.working', '.merge-left.r%ld' and
+#. '.merge-right.r%ld' strings are used to tag onto a file
+#. name in case of a merge conflict
+#: libsvn_client/merge.c:328
+msgid ".working"
+msgstr ".robocza"
+
+#: libsvn_client/merge.c:330
+#, c-format
+msgid ".merge-left.r%ld"
+msgstr ".merge-lewo.w%ld"
+
+#: libsvn_client/merge.c:333
+#, c-format
+msgid ".merge-right.r%ld"
+msgstr ".merge-prawo.w%ld"
+
+#: libsvn_client/merge.c:1164
+#, c-format
+msgid ""
+"Path '%s' is in conflict, and must be resolved before the remainder of the "
+"requested merge can be applied"
+msgstr ""
+
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
+msgid "Use of two URLs is not compatible with merge info modification"
+msgstr ""
+
+#: libsvn_client/prop_commands.c:73
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s' jest atryputem wcprop, tak więc nie jest dostępny dla klientów"
-#: libsvn_client/prop_commands.c:213
+#: libsvn_client/prop_commands.c:216
#, fuzzy, c-format
msgid "Property '%s' is not a regular property"
msgstr "Atrybut '%s' jest atrybutem pliku/katalogu"
-#: libsvn_client/prop_commands.c:315
+#: libsvn_client/prop_commands.c:320
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "Atrybut wersji '%s' jest niedozwolony w tym kontekście"
-#: libsvn_client/prop_commands.c:323 libsvn_client/prop_commands.c:442
+#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
#, c-format
msgid "Bad property name: '%s'"
msgstr "Niepoprawna nazwa atrybutu: '%s'"
-#: libsvn_client/prop_commands.c:334
+#: libsvn_client/prop_commands.c:339
#, fuzzy, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr "Ustawianie atrybutu na zdalnym obiekcie '%s' nie jest obsługiwane"
-#: libsvn_client/prop_commands.c:340
+#: libsvn_client/prop_commands.c:345
#, fuzzy, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr "Ustawianie atrybutu na zdalnym obiekcie '%s' nie jest obsługiwane"
-#: libsvn_client/prop_commands.c:438
+#: libsvn_client/prop_commands.c:439
msgid "Value will not be set unless forced"
msgstr "Wartość nie zostanie ustawiona o ile nie zostanie to wymuszone"
-#: libsvn_client/prop_commands.c:661
+#: libsvn_client/prop_commands.c:659
#, fuzzy, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "Ścieżka '%s' nie istnieje w wersji %ld"
-#: libsvn_client/prop_commands.c:668 libsvn_client/prop_commands.c:936
+#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:948
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "Nieznany rodzaj obiektu dla '%s'"
-#: libsvn_client/ra.c:132
+#: libsvn_client/ra.c:133
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr ""
"Próba ustawienia atrybutu kopii roboczej '%s' na '%s' w operacji innej, niż "
"zatwierdzanie."
-#: libsvn_client/ra.c:359
-#, c-format
-msgid "Can't find entry for '%s'"
-msgstr "Nie można znaleźć elementu dla '%s'"
-
-#: libsvn_client/ra.c:503
+#: libsvn_client/ra.c:496
#, c-format
msgid "Missing changed-path information for '%s' in revision %ld"
msgstr "Brak informacji o zmianie ścieżki dla '%s' w wersji %ld"
-#: libsvn_client/ra.c:623
-#, c-format
-msgid "path '%s' doesn't exist in revision %ld"
+#: libsvn_client/ra.c:616
+#, fuzzy, c-format
+msgid "Path '%s' doesn't exist in revision %ld"
msgstr "ścieżka '%s' nie istnieje w wersji %ld"
-#: libsvn_client/ra.c:670 libsvn_client/ra.c:833
+#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "Nie odnaleziono lokalizacji repozytorium dla '%s' w wersji %ld"
-#: libsvn_client/ra.c:681
+#: libsvn_client/ra.c:674
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "'%s' w wersji %ld jest obiektem niezwiązanym"
-#: libsvn_client/ra.c:838
+#: libsvn_client/ra.c:831
#, c-format
msgid ""
"The location for '%s' for revision %ld does not exist in the repository or "
@@ -1450,16 +1472,26 @@
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
msgstr "Repozytorium '%s' ma uuid '%s', tymczasem kopia robocza ma '%s'"
-#: libsvn_client/revisions.c:99
+#: libsvn_client/revisions.c:93
#, fuzzy, c-format
msgid "Path '%s' has no committed revision"
msgstr "Ścieżki '%s' nie znaleziono w wersji HEAD"
-#: libsvn_client/revisions.c:109
+#: libsvn_client/revisions.c:103
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "Zażądano nieznanego typ wersji dla '%s'"
+#: libsvn_client/update.c:138 libsvn_wc/log.c:2573
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr "'%s' nie jest kopią roboczą"
+
+#: libsvn_client/update.c:146
+#, fuzzy, c-format
+msgid "'%s' is neither a file nor a directory"
+msgstr "'%s' nie jest ani nazwą pliku ani katalogu"
+
#: libsvn_delta/svndiff.c:144
#, fuzzy
msgid "Compression of svndiff data failed"
@@ -1490,13 +1522,13 @@
msgstr ""
"Niewłaściwy strumień diff: instrukcja %d przepełniła okno obiektu docelowego"
-#: libsvn_delta/svndiff.c:501
+#: libsvn_delta/svndiff.c:500
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr ""
"Niewłaściwy strumień diff: instrukcja %d przepełniła okno obiektu źródłowego"
-#: libsvn_delta/svndiff.c:508
+#: libsvn_delta/svndiff.c:507
#, c-format
msgid ""
"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
@@ -1504,34 +1536,34 @@
"Niewłaściwy strumień diff: instrukcja %d zaczyna się poza pozycją okna "
"obiektu docelowego"
-#: libsvn_delta/svndiff.c:515
+#: libsvn_delta/svndiff.c:514
#, c-format
msgid "Invalid diff stream: [new] insn %d overflows the new data section"
msgstr ""
"Niewłaściwy strumień diff: instrukcja %d przepełniła nową sekcję danych"
-#: libsvn_delta/svndiff.c:525
+#: libsvn_delta/svndiff.c:524
msgid "Delta does not fill the target window"
msgstr "Delta nie wypełnia docelowego okna danych"
-#: libsvn_delta/svndiff.c:528
+#: libsvn_delta/svndiff.c:527
msgid "Delta does not contain enough new data"
msgstr "Delta nie zawiera nowych danych w wystarczającej ilości"
-#: libsvn_delta/svndiff.c:634
+#: libsvn_delta/svndiff.c:633
msgid "Svndiff has invalid header"
msgstr "Błędny nagłówek danych svndiff"
-#: libsvn_delta/svndiff.c:689 libsvn_delta/svndiff.c:845
+#: libsvn_delta/svndiff.c:688 libsvn_delta/svndiff.c:844
msgid "Svndiff contains corrupt window header"
msgstr "Okno danych svndiff zawiera uszkodzony nagłówek"
-#: libsvn_delta/svndiff.c:698
+#: libsvn_delta/svndiff.c:697
msgid "Svndiff has backwards-sliding source views"
msgstr "Dane svndiff zawierają wsteczny podgląd"
-#: libsvn_delta/svndiff.c:747 libsvn_delta/svndiff.c:794
-#: libsvn_delta/svndiff.c:867
+#: libsvn_delta/svndiff.c:746 libsvn_delta/svndiff.c:793
+#: libsvn_delta/svndiff.c:866
msgid "Unexpected end of svndiff input"
msgstr "Nieoczekiwany koniec danych wejściowych svndiff"
@@ -1599,12 +1631,7 @@
msgid "Can't ungrab FS mutex"
msgstr "Nie można odblokować semafora FS"
-#: libsvn_fs/fs-loader.c:901
-#, fuzzy
-msgid "Lock comment contains illegal characters"
-msgstr "Opis zakładanej blokady zawiera nieprawidłowe znaki"
-
-#: libsvn_fs/fs-loader.c:907
+#: libsvn_fs/fs-loader.c:938
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Przekazano ujemna datę wygaśnięcia do svn_fs_lock"
@@ -1623,17 +1650,17 @@
msgid "deleting changes"
msgstr "usuwanie zmian"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2385
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "Brak wymaganego ID wersji obiektu"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2395
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr ""
"Niewłaściwy porządek zmian: ID nowego węzła wersji nie jest\n"
"zmianą typu usunięcie ścieżki"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2406
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr ""
"Niewłaściwy porządek zmian: zmiana typu non-add poprzedza\n"
@@ -1755,115 +1782,115 @@
msgid "set repository uuid"
msgstr "ustaw uuid repozytorium"
-#: libsvn_fs_base/dag.c:217
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"Uszkodzona DB: identyfikator transakcji nie jest '0' w systemie plików '%s'"
-#: libsvn_fs_base/dag.c:225
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "Uszkodzona DB: identyfikator kopii nie jest '0' w systemie plików '%s'"
-#: libsvn_fs_base/dag.c:234
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"Uszkodzona DB: początkowy numer wersji nie jest '0' w systemie plików '%s'"
-#: libsvn_fs_base/dag.c:282 libsvn_fs_base/dag.c:458 libsvn_fs_fs/dag.c:334
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "Próba stworzenia elementu, którego rodzicem nie jest katalog"
-#: libsvn_fs_base/dag.c:452 libsvn_fs_fs/dag.c:328
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Próba stworzenia węzła o nieprawidłowej nazwie '%s'"
-#: libsvn_fs_base/dag.c:464 libsvn_fs_base/dag.c:698 libsvn_fs_fs/dag.c:340
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr ""
"Próba stworzenia kopii potomnego obiektu węzła nie podlegającego zmianom"
-#: libsvn_fs_base/dag.c:471
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Próba stworzenia obiektu, który już istnieje"
-#: libsvn_fs_base/dag.c:522 libsvn_fs_fs/dag.c:402
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "Próba ustawienia elementu w węźle nie będącym katalogiem"
-#: libsvn_fs_base/dag.c:528 libsvn_fs_fs/dag.c:408
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "Próba ustawienia elementu w węźle nie mogącym ulegać zmianom"
-#: libsvn_fs_base/dag.c:592
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "Nie można ustawić atrybutu proplist na stałym węźle wersji %s"
-#: libsvn_fs_base/dag.c:704
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr ""
"Próba stworzenia kopii elementu potomnego o następującej \n"
"nieprawidłowej nazwie: '%s'"
-#: libsvn_fs_base/dag.c:830
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "Próba usunięcia elementu '%s' z węzła, który nie jest katalogiem"
-#: libsvn_fs_base/dag.c:836
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr ""
"Próba usunięcia elementy '%s' z węzła (katalog) nie podlegającego zmianom"
-#: libsvn_fs_base/dag.c:843
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Próba usunięcia węzła o nieprawidłowej nazwie '%s'"
-#: libsvn_fs_base/dag.c:858 libsvn_fs_base/dag.c:891
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Błąd usuwania: katalog nie zawiera elementu '%s'"
-#: libsvn_fs_base/dag.c:940
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Próba usunięcia węzła nie mogącego ulegać zmianom"
-#: libsvn_fs_base/dag.c:1060
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "Próba pobrania zawartości węzła, który nie jest plikiem"
-#: libsvn_fs_base/dag.c:1095
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Próba pobrania długości węzła, który nie jest plikiem"
-#: libsvn_fs_base/dag.c:1121
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "Próba pobrania sumy kontrolnej węzła, który nie jest plikiem"
-#: libsvn_fs_base/dag.c:1152 libsvn_fs_base/dag.c:1206
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "Próba ustawienia tekstowej zawartości węzła (różny od pliku)"
-#: libsvn_fs_base/dag.c:1158 libsvn_fs_base/dag.c:1212
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Próba ustawienia tekstowej zawartości węzła nie podlegającego zmianom"
-#: libsvn_fs_base/dag.c:1235
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1874,12 +1901,12 @@
" oczekiwano: %s\n"
" wyliczono: %s\n"
-#: libsvn_fs_base/dag.c:1290
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Próba otwarcia nieistniejącego węzła '%s'"
-#: libsvn_fs_base/dag.c:1296
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Próba otwarcia węzła o nieprawidłowej nazwie '%s'"
@@ -1989,49 +2016,49 @@
"Ścieżka '%s' już została zablokowana przez użytkownika '%s' w systemie "
"plików '%s'"
-#: libsvn_fs_base/fs.c:79
+#: libsvn_fs_base/fs.c:80
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr ""
"Zła wersja bazy danych: posiadana %d.%d.%d, a powinna być co najmniej w "
"wersji %d.%d.%d"
-#: libsvn_fs_base/fs.c:90
+#: libsvn_fs_base/fs.c:91
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr "Zła wersja bazy danych: skompilowane z %d.%d.%d, działa z %d.%d.%d"
-#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:54
+#: libsvn_fs_base/fs.c:109 libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "System plików jest już otwarty"
-#: libsvn_fs_base/fs.c:189
+#: libsvn_fs_base/fs.c:190
#, fuzzy, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr ""
"Wystąpił błąd bazy danych Berkeley DB podczas operacji %s dla systemu plików "
"%s:\n"
-#: libsvn_fs_base/fs.c:539
+#: libsvn_fs_base/fs.c:540
#, fuzzy, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr ""
"Wystąpił błąd bazy danych Berkeley DB podczas operacji %s dla systemu plików "
"%s:\n"
-#: libsvn_fs_base/fs.c:545
+#: libsvn_fs_base/fs.c:546
#, fuzzy, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr ""
"Wystąpił błąd bazy danych Berkeley DB podczas operacji %s dla systemu plików "
"%s:\n"
-#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:631
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Oczekiwany format systemu plików '%d'; znaleziony format '%d'"
-#: libsvn_fs_base/fs.c:1094
+#: libsvn_fs_base/fs.c:1112
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
"may be interfering with the hotcopy algorithm. If \n"
@@ -2043,7 +2070,7 @@
" będzie się powtarzał, spróbuj wyłączyć tę właściwość \n"
"w DB_CONFIG."
-#: libsvn_fs_base/fs.c:1113
+#: libsvn_fs_base/fs.c:1131
msgid ""
"Error running catastrophic recovery on hotcopy; the \n"
"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
@@ -2055,30 +2082,30 @@
"problem będzie się powtarzał, spróbuj wyłączyć tę właściwość \n"
"w DB_CONFIG."
-#: libsvn_fs_base/fs.c:1222
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr "Moduł do współpracy z repozytorium działającym na bazie Berkeley DB."
-#: libsvn_fs_base/fs.c:1255
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Nieobsługiwana wersja loadera systemu plików (%d) dla bdb"
-#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr ""
"Nie można zweryfikować blokady założonej na ścieżce '%s'; brak nazwy "
"użytkownika"
-#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr ""
"Użytkownik %s nie jest właścicielem blokady ścieżki '%s' (aktualnie \n"
"zablokowanej przez %s)"
-#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr ""
@@ -2163,17 +2190,17 @@
msgid "Failed to calculate MD5 digest for '%s'"
msgstr "Obliczenie sumy kontrolnej MD5 dla '%s' nie powiodło się"
-#: libsvn_fs_base/revs-txns.c:65
+#: libsvn_fs_base/revs-txns.c:67
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "Transakcja nie jest zniszczona: '%s'"
-#: libsvn_fs_base/revs-txns.c:68
+#: libsvn_fs_base/revs-txns.c:70
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "Transakcja jest zniszczona: '%s'"
-#: libsvn_fs_base/revs-txns.c:981
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "Transakcja przerwana oraz sprzątanie nie powiodło się"
@@ -2183,87 +2210,87 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:389 libsvn_fs_fs/tree.c:309
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "Nie znaleziono pliku: transakcja '%s', ścieżka '%s'"
-#: libsvn_fs_base/tree.c:394 libsvn_fs_fs/tree.c:314
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "Nie znaleziono pliku: wersja '%ld', ścieżka '%s'"
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:404 libsvn_fs_fs/tree.c:329
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "Plik już istnieje: system plików '%s', transakcja '%s', ścieżka '%s'"
-#: libsvn_fs_base/tree.c:409 libsvn_fs_fs/tree.c:335
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "Plik już istnieje: system plików '%s', wersja %ld, ścieżka '%s'"
-#: libsvn_fs_base/tree.c:417 libsvn_fs_fs/tree.c:345
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "Obiekt główny nie wskazuje na korzeń transakcji"
-#: libsvn_fs_base/tree.c:832 libsvn_fs_fs/tree.c:754
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "Nie mozna otworzyć '%s'"
-#: libsvn_fs_base/tree.c:1402 libsvn_fs_fs/tree.c:1152
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr "Nie można porównać wartości atrybutów w dwóch różnych systemach plików"
-#: libsvn_fs_base/tree.c:1735
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "Uszkodzona DB: błędny poprzednik"
-#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1189
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Nieoczekiwany węzeł nie podlegający dla '%s'"
-#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1212
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "Konflikt z '%s'"
-#: libsvn_fs_base/tree.c:1861 libsvn_fs_base/tree.c:2566
-#: libsvn_fs_fs/tree.c:1261 libsvn_fs_fs/tree.c:1748
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr ""
"Źłe łączenie; przodek, źródłowy albo docelowy obiekt nie mają tego samego \n"
"typu systemu plików"
-#: libsvn_fs_base/tree.c:1877 libsvn_fs_fs/tree.c:1277
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr ""
"Źłe łączenie: obiekt docelowy '%s' ma identyfikator '%s' \n"
"identyczny ze swoim przodkiem"
-#: libsvn_fs_base/tree.c:2373
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "Transakcja '%s' jest nieaktualna względem wersji '%s'"
-#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1887
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "Katalog główny nie może zostać usunięty"
-#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1959
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, fuzzy, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "Nie można porównać wartości atrybutów w dwóch różnych systemach plików"
-#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1965
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "Kopiowanie z zmiennego drzewa nie jest jeszcze wspierane"
-#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2389
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2274,22 +2301,22 @@
" oczekiwano: %s\n"
" wyliczono: %s\n"
-#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2625
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr "Nie można porównać zawartości pliku w dwóch różnych systemach plików"
-#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
-#: libsvn_fs_fs/tree.c:2634 libsvn_fs_fs/tree.c:2639
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
msgstr "'%s' nie jest plikiem"
-#: libsvn_fs_fs/dag.c:384
+#: libsvn_fs_fs/dag.c:383
msgid "Can't get entries of non-directory"
msgstr "Nie można pobrać składowych obiektu nie będącego katalogiem"
-#: libsvn_fs_fs/dag.c:931
+#: libsvn_fs_fs/dag.c:930
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2305,169 +2332,170 @@
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
msgstr "Uszkodzony plik blokady dla ścieżki '%s' w systemie plików '%s'"
-#: libsvn_fs_fs/fs.c:89
+#: libsvn_fs_fs/fs.c:88
#, fuzzy, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Nie można dostarczyć semefora dla FSFS"
-#: libsvn_fs_fs/fs.c:105
+#: libsvn_fs_fs/fs.c:104
#, fuzzy, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "Nie udało utworzyć się semafora dla FSFS"
-#: libsvn_fs_fs/fs.c:113
+#: libsvn_fs_fs/fs.c:112
#, fuzzy, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "Nie udało utworzyć się semafora dla FSFS"
-#: libsvn_fs_fs/fs.c:119
+#: libsvn_fs_fs/fs.c:118
#, fuzzy, c-format
msgid "Can't store FSFS shared data"
msgstr "Nie można zachować semafora FSFS"
-#: libsvn_fs_fs/fs.c:345
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr ""
"Moduł do współpracy z repozytorium działającym na systemie plików (FSFS)."
-#: libsvn_fs_fs/fs.c:378
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Nieobsługiwana wersja loadera systemu plików (%d) dla fsfs"
-#: libsvn_fs_fs/fs_fs.c:340
+#: libsvn_fs_fs/fs_fs.c:352
#, fuzzy, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "Nie można zablokować semafora FS"
-#: libsvn_fs_fs/fs_fs.c:348
+#: libsvn_fs_fs/fs_fs.c:360
#, fuzzy, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "Nie można odblokować semafora FS"
-#: libsvn_fs_fs/fs_fs.c:374
+#: libsvn_fs_fs/fs_fs.c:386
#, fuzzy, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Nie można odblokować tablicy znaków tłumaczeń"
-#: libsvn_fs_fs/fs_fs.c:378
+#: libsvn_fs_fs/fs_fs.c:390
#, fuzzy, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "Nie można odblokować tablicy znaków tłumaczeń"
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
-#: libsvn_fs_fs/fs_fs.c:391
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr ""
-#: libsvn_fs_fs/fs_fs.c:453
+#: libsvn_fs_fs/fs_fs.c:465
#, 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 ""
-#: libsvn_fs_fs/fs_fs.c:489
+#: libsvn_fs_fs/fs_fs.c:501
#, 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 ""
-#: libsvn_fs_fs/fs_fs.c:496 libsvn_subr/io.c:1532
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Nie można założyć blokady na pliku '%s'"
-#: libsvn_fs_fs/fs_fs.c:825 libsvn_fs_fs/fs_fs.c:839
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "Błędny nagłówek w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:941 libsvn_fs_fs/fs_fs.c:955 libsvn_fs_fs/fs_fs.c:962
-#: libsvn_fs_fs/fs_fs.c:969 libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "Błędny offset reprezentacji w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1054
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "Brak pola kind w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1085
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "Brak cpath w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1112 libsvn_fs_fs/fs_fs.c:1118
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "Błędna linia copyroot w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1136 libsvn_fs_fs/fs_fs.c:1142
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "Błędna linia copyfrom w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1251 libsvn_fs_fs/fs_fs.c:3613
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "Próba zapisu node-rev o stałym ID"
-#: libsvn_fs_fs/fs_fs.c:1335
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "Błędny nagłówek tablicy reprezentacji"
-#: libsvn_fs_fs/fs_fs.c:1359
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "Brak node-id w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1365
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "Błędny node-id w node-rev"
-#: libsvn_fs_fs/fs_fs.c:1410
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "W pliku wersji brak końcowego znaku końca wiersza"
-#: libsvn_fs_fs/fs_fs.c:1422
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "Ostatnia linia w pliku wersji dłuższa niż 64 znaki"
-#: libsvn_fs_fs/fs_fs.c:1437
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "Brak spacji w ostatniej linii pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:1466 libsvn_fs_fs/fs_fs.c:1524 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "Nie ma takiej wersji %ld"
-#: libsvn_fs_fs/fs_fs.c:1584
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "Błędne dane svndiff w tablicy reprezentacji"
-#: libsvn_fs_fs/fs_fs.c:1727 libsvn_fs_fs/fs_fs.c:1740
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr ""
"Podczas czytania danych okna svndiff przekroczono koniec \n"
"tablicy reprezentacji"
-#: libsvn_fs_fs/fs_fs.c:1876
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "Żądane dane svndiff wskazują na nieistniejące źródło"
-#: libsvn_fs_fs/fs_fs.c:1882
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "Żądana pozycja svndiff jest poza końcem strumienia"
-#: libsvn_fs_fs/fs_fs.c:1905 libsvn_fs_fs/fs_fs.c:1922
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "Błędne okno danych svndiff"
-#: libsvn_fs_fs/fs_fs.c:1970
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2478,108 +2506,127 @@
" oczekiwano: %s\n"
" znaleziono: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2193 libsvn_fs_fs/fs_fs.c:2206
-#: libsvn_fs_fs/fs_fs.c:2212
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "Uszkodzony wpis w katalogu"
-#: libsvn_fs_fs/fs_fs.c:2551 libsvn_fs_fs/fs_fs.c:2559
-#: libsvn_fs_fs/fs_fs.c:2591 libsvn_fs_fs/fs_fs.c:2611
-#: libsvn_fs_fs/fs_fs.c:2645 libsvn_fs_fs/fs_fs.c:2650
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "Niewłaściwe zmiany w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:2584
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "Niewłaściwy rodzaj modyfikacji w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:2604
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "Niewłaściwa flaga text-mod w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:2624
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "Niewłaściwa flaga prop-mod w pliku wersji"
-#: libsvn_fs_fs/fs_fs.c:2808
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "Kopiowanie z transakcji niedozwolone"
-#: libsvn_fs_fs/fs_fs.c:2864
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Nie można utworzyć katalogu transakcji w '%s' dla wersji %ld"
-#: libsvn_fs_fs/fs_fs.c:3045 libsvn_fs_fs/fs_fs.c:3052
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "Plik next-id jest uszkodzony"
-#: libsvn_fs_fs/fs_fs.c:3139
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "Nie powiodło się sprzątanie po transakcji"
-#: libsvn_fs_fs/fs_fs.c:3307
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "Niewłaściwy typ zmiany"
-#: libsvn_fs_fs/fs_fs.c:3632
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "Nie można ustawić zawartości katalogu"
-#: libsvn_fs_fs/fs_fs.c:3722 libsvn_fs_fs/fs_fs.c:3727
-#: libsvn_fs_fs/fs_fs.c:3734
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "Bieżący plik jest uszkodzony"
-#: libsvn_fs_fs/fs_fs.c:4023 libsvn_subr/io.c:2663 svn/util.c:236
-#: svn/util.c:251 svn/util.c:275
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
+#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "Nie można pobrać informacji o '%s'"
-#: libsvn_fs_fs/fs_fs.c:4027
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "Nie można wykonać chmod '%s'"
-#: libsvn_fs_fs/fs_fs.c:4167
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "Nie można uzyskać blokady semafora FSFS"
-#: libsvn_fs_fs/fs_fs.c:4181
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "Nie można odblokować semefora FSFS"
-#: libsvn_fs_fs/fs_fs.c:4299
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "Transakcja jest nieaktualna"
-#: libsvn_fs_fs/fs_fs.c:4599
+#: libsvn_fs_fs/fs_fs.c:4807
+#, fuzzy
+msgid "Recovery encountered a non-directory node"
+msgstr "Próba ustawienia elementu w węźle nie będącym katalogiem"
+
+#: libsvn_fs_fs/fs_fs.c:4829
+msgid "Recovery encountered a deltified directory representation"
+msgstr ""
+
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "Brak takiej transakcji"
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "Nie można zapisać blokady/składowych pliku hash '%s'"
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "Nie można sparsować blokady/składowych pliku hash '%s'"
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "ścieżka '%s' nie istnieje w najnowszej wersji repozytorium"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "Nie udało się założyć blokady: istnieje nowsza wersja '%s'"
+#: libsvn_fs_util/merge-info-sqlite-index.c:102
+msgid "Merge Tracking schema format not set"
+msgstr ""
+
+#: libsvn_fs_util/merge-info-sqlite-index.c:107
+#, c-format
+msgid "Merge Tracking schema format %d not recognized"
+msgstr ""
+
#: libsvn_ra/ra_loader.c:213
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
@@ -2587,27 +2634,27 @@
"Niewłaściwa wersja wtyczki RA dla '%s': znaleziona %d.%d.%d%s, oczekiwana %d."
"%d.%d%s"
-#: libsvn_ra/ra_loader.c:285
+#: libsvn_ra/ra_loader.c:397
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Nieznany schemat URL: '%s'"
-#: libsvn_ra/ra_loader.c:336
+#: libsvn_ra/ra_loader.c:448
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "'%s' nie jest tym samym repozytorium co '%s'"
-#: libsvn_ra/ra_loader.c:707
+#: libsvn_ra/ra_loader.c:945
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - obsługuje schemat '%s'\n"
-#: libsvn_ra/ra_loader.c:793
+#: libsvn_ra/ra_loader.c:1031
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Nieznany schemat URL: '%s'"
-#: libsvn_ra_dav/commit.c:225
+#: libsvn_ra_dav/commit.c:222
msgid ""
"Could not fetch the Version Resource URL (needed during an import or when it "
"is missing from the local, cached props)"
@@ -2615,22 +2662,22 @@
"Nie można pobrać URLa zasobów (potrzebnego podczas importu lub\n"
"gdy nie zawiera go lokalny cache atrybutów)"
-#: libsvn_ra_dav/commit.c:462 libsvn_ra_serf/commit.c:374
+#: libsvn_ra_dav/commit.c:459 libsvn_ra_serf/commit.c:374
#: libsvn_ra_serf/commit.c:435
#, c-format
msgid "Your file or directory '%s' is probably out-of-date"
msgstr "Plik lub katalog '%s' jest prawdopodobnie nieaktualny"
-#: libsvn_ra_dav/commit.c:470
+#: libsvn_ra_dav/commit.c:467
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "Odpowiedź CHECKOUT nie zawiera nagłówka 'Location:'"
-#: libsvn_ra_dav/commit.c:997 libsvn_ra_serf/commit.c:1403
+#: libsvn_ra_dav/commit.c:994 libsvn_ra_serf/commit.c:1427
#, c-format
msgid "File '%s' already exists"
msgstr "Plik '%s' już istnieje"
-#: libsvn_ra_dav/commit.c:1115
+#: libsvn_ra_dav/commit.c:1112
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "Nie udało się zapisać różnic do pliku tymczasowego"
@@ -2648,7 +2695,7 @@
msgid "Could not save file"
msgstr "Błąd w trakcie zapisywania pliku"
-#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:909
+#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:920
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2711,7 +2758,7 @@
msgid "Unknown XML encoding: '%s'"
msgstr "Nieznane kodowanie XML: '%s'"
-#: libsvn_ra_dav/fetch.c:2940
+#: libsvn_ra_dav/fetch.c:2952
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr "Obsługa odpowiedzi REPORT nie zrealizowała cyklu współpracy z edytorem"
@@ -2915,22 +2962,22 @@
msgid "SSL is not supported"
msgstr "SSL nie jest obsługiwany"
-#: libsvn_ra_dav/session.c:819
+#: libsvn_ra_dav/session.c:825
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "Błąd konfiguracji: ładowanie certyfikatu '%s' nie powiodło się"
-#: libsvn_ra_dav/session.c:928
+#: libsvn_ra_dav/session.c:934
msgid "The UUID property was not found on the resource or any of its parents"
msgstr ""
"Atrybut UUID nie został znaleziony ani w podanym obiekcie, ani też w\n"
"żadnym z jego katalogów nadrzędnych."
-#: libsvn_ra_dav/session.c:936
+#: libsvn_ra_dav/session.c:942
msgid "Please upgrade the server to 0.19 or later"
msgstr "Zaktualizuj serwer do wersji 0.19 lub nowszej."
-#: libsvn_ra_dav/session.c:1002
+#: libsvn_ra_dav/session.c:1009
#, c-format
msgid "Unsupported RA loader version (%d) for ra_dav"
msgstr "Nieobsługiwana wersja loadera RA (%d) dla ra_dav"
@@ -3002,8 +3049,8 @@
msgid "%s request failed on '%s'"
msgstr "żądanie %s nie powiodło się dla '%s'"
-#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:588
-#: libsvn_wc/update_editor.c:2603
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -3016,15 +3063,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "Moduł umożliwiający dostęp do repozytorium na lokalnym dysku."
-#: libsvn_ra_local/ra_plugin.c:285
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "Nie można utworzyć połączenia w sesji ra_local do URL"
-#: libsvn_ra_local/ra_plugin.c:1392
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Nieobsługiwana wersja loadera modułu RA (%d) dla ra_local"
@@ -3050,7 +3097,7 @@
msgstr "Nie zdołano otworzyć repozytorium '%s'"
#: libsvn_ra_serf/commit.c:367 libsvn_ra_serf/commit.c:428
-#: libsvn_repos/commit.c:393
+#: libsvn_repos/commit.c:375
#, c-format
msgid "Path '%s' not present"
msgstr "Ścieżka '%s' nie istnieje"
@@ -3060,7 +3107,7 @@
msgid "Failed writing updated file"
msgstr "Zapis zaktualizowanego pliku nie powiódł się"
-#: libsvn_ra_serf/commit.c:1216
+#: libsvn_ra_serf/commit.c:1240
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr ""
@@ -3145,209 +3192,232 @@
"Moduł umożliwiający dostęp do repozytorium przy pomocy protokołu\n"
"WebDAV (DeltaV)."
-#: libsvn_ra_serf/serf.c:155
+#: libsvn_ra_serf/serf.c:161
#, c-format
msgid "Could not lookup hostname: %s://%s"
msgstr "Nie można odszukać hosta: %s://%s"
-#: libsvn_ra_serf/serf.c:732
+#: libsvn_ra_serf/serf.c:737
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Nieobsługiwana wersja loadera RA (%d) dla ra_serf"
-#: libsvn_ra_serf/update.c:2116
+#: libsvn_ra_serf/update.c:2155
#, fuzzy, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "Błąd podczas odbierania RAPORTU"
-#: libsvn_ra_serf/util.c:755
+#: libsvn_ra_serf/util.c:874
#, fuzzy
msgid "Unspecified error message"
msgstr "użyj podanego tekstu jako opisu zmian"
-#: libsvn_ra_serf/util.c:816
+#: libsvn_ra_serf/util.c:935
msgid "Premature EOF seen from server"
msgstr "Serwer za wcześnie wysłał EOF"
-#: libsvn_ra_svn/client.c:115
+#: libsvn_ra_svn/client.c:124
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Nie znaleziono komputera '%s'"
-#: libsvn_ra_svn/client.c:127
+#: libsvn_ra_svn/client.c:136
#, c-format
msgid "Can't create socket"
msgstr "Nie udało się utworzyć gniazdka"
-#: libsvn_ra_svn/client.c:131
+#: libsvn_ra_svn/client.c:140
#, c-format
msgid "Can't connect to host '%s'"
msgstr "Nieudane połączenie z komputerem '%s'"
-#: libsvn_ra_svn/client.c:152
-msgid "Proplist element not a list"
-msgstr "Element proplist nie jest listą"
-
-#: libsvn_ra_svn/client.c:176
+#: libsvn_ra_svn/client.c:163
msgid "Prop diffs element not a list"
msgstr "Element zbioru różnic atrybutów nie jest listą"
-#: libsvn_ra_svn/client.c:214
+#: libsvn_ra_svn/client.c:201
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "Nieznany rodzaj obiektu: '%s' z serwera"
-#: libsvn_ra_svn/client.c:365
+#: libsvn_ra_svn/client.c:357
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Nieznany tunel '%s'"
-#: libsvn_ra_svn/client.c:382
+#: libsvn_ra_svn/client.c:374
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "Tunel %s wymaga zdefiniowania zmiennej środowiskowej %s"
-#: libsvn_ra_svn/client.c:393
+#: libsvn_ra_svn/client.c:385
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Nieznane polecenie '%s'"
-#: libsvn_ra_svn/client.c:424
+#: libsvn_ra_svn/client.c:416
#, c-format
msgid "Error in child process: %s"
msgstr "Błąd procesu potomnego: %s"
-#: libsvn_ra_svn/client.c:448
+#: libsvn_ra_svn/client.c:440
#, c-format
msgid "Can't create tunnel"
msgstr "Nie udało się utworzyć tunelu"
-#: libsvn_ra_svn/client.c:486
+#: libsvn_ra_svn/client.c:478
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "Nieprawidłowy URL '%s' repozytorium svn"
-#: libsvn_ra_svn/client.c:543
+#: libsvn_ra_svn/client.c:535
#, c-format
msgid "Server requires minimum version %d"
msgstr "Serwer wymaga co najmniej wersji %d"
-#: libsvn_ra_svn/client.c:589
+#: libsvn_ra_svn/client.c:584
msgid "Impossibly long repository root from server"
msgstr "Ścieżka katalogu głównego repozytorium jest zbyt długa"
-#: libsvn_ra_svn/client.c:600
+#: libsvn_ra_svn/client.c:595
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Moduł umożliwiający dostęp do repozytorium przy pomocy protokołu svn."
-#: libsvn_ra_svn/client.c:748
+#: libsvn_ra_svn/client.c:743
msgid "Server did not send repository root"
msgstr "Serwer nie przesłał głównego katalogu repozytorium"
-#: libsvn_ra_svn/client.c:889
+#: libsvn_ra_svn/client.c:816
+msgid ""
+"Server doesn't support setting arbitrary revision properties during commit"
+msgstr ""
+
+#: libsvn_ra_svn/client.c:900
msgid "Non-string as part of file contents"
msgstr "Plik zawiera dane, nie będące tekstem"
-#: libsvn_ra_svn/client.c:988
+#: libsvn_ra_svn/client.c:999
msgid "Dirlist element not a list"
msgstr "Element dirlist nie jest listą"
-#: libsvn_ra_svn/client.c:1145
+#: libsvn_ra_svn/client.c:1060
+#, fuzzy
+msgid "Merge info element is not a list"
+msgstr "Element zbioru różnic atrybutów nie jest listą"
+
+#: libsvn_ra_svn/client.c:1219
msgid "Log entry not a list"
msgstr "Element log nie jest listą"
-#: libsvn_ra_svn/client.c:1158
+#: libsvn_ra_svn/client.c:1232
msgid "Changed-path entry not a list"
msgstr "Wpis w liście zmienionych ścieżek nie jest listą"
-#: libsvn_ra_svn/client.c:1234
+#: libsvn_ra_svn/client.c:1308
msgid "'stat' not implemented"
msgstr "Nie zaimplementowane 'stat'"
-#: libsvn_ra_svn/client.c:1291
+#: libsvn_ra_svn/client.c:1365
msgid "'get-locations' not implemented"
msgstr "Nie zaimplementowane polecenie 'get-locations'"
-#: libsvn_ra_svn/client.c:1303
+#: libsvn_ra_svn/client.c:1377
msgid "Location entry not a list"
msgstr "Wpis w lokalizacjach nie jest listą"
-#: libsvn_ra_svn/client.c:1353
+#: libsvn_ra_svn/client.c:1427
msgid "'get-file-revs' not implemented"
msgstr "Nie zaimplementowane polecenie 'get-file-revs'"
-#: libsvn_ra_svn/client.c:1366
+#: libsvn_ra_svn/client.c:1440
msgid "Revision entry not a list"
msgstr "Wpis w Revision nie jest listą"
-#: libsvn_ra_svn/client.c:1379 libsvn_ra_svn/client.c:1404
+#: libsvn_ra_svn/client.c:1453 libsvn_ra_svn/client.c:1478
msgid "Text delta chunk not a string"
msgstr "Fragment różnic w tekście nie jest listą"
-#: libsvn_ra_svn/client.c:1416
+#: libsvn_ra_svn/client.c:1490
msgid "The get-file-revs command didn't return any revisions"
msgstr "polecenie get-file-revs nie zwróciło żadnych wersji"
-#: libsvn_ra_svn/client.c:1464
+#: libsvn_ra_svn/client.c:1538
msgid "Server doesn't support the lock command"
msgstr "Serwer nie obsługuje polecenia zakładania blokady"
-#: libsvn_ra_svn/client.c:1528
+#: libsvn_ra_svn/client.c:1602
msgid "Server doesn't support the unlock command"
msgstr "Serwer nie obsługuje operacji zdejmowania blokady"
-#: libsvn_ra_svn/client.c:1625
+#: libsvn_ra_svn/client.c:1699
#, fuzzy
msgid "Lock response not a list"
msgstr "Element lock nie jest listą"
-#: libsvn_ra_svn/client.c:1639
+#: libsvn_ra_svn/client.c:1713
#, fuzzy
msgid "Unknown status for lock command"
msgstr "Nieznane polecenie protokołu svn"
-#: libsvn_ra_svn/client.c:1661
+#: libsvn_ra_svn/client.c:1735
msgid "Didn't receive end marker for lock responses"
msgstr ""
-#: libsvn_ra_svn/client.c:1748
+#: libsvn_ra_svn/client.c:1822
#, fuzzy
msgid "Unlock response not a list"
msgstr "Element lock nie jest listą"
-#: libsvn_ra_svn/client.c:1762
+#: libsvn_ra_svn/client.c:1836
#, fuzzy
msgid "Unknown status for unlock command"
msgstr "Komenda zwróciła nieznany status '%s'"
-#: libsvn_ra_svn/client.c:1783
+#: libsvn_ra_svn/client.c:1857
msgid "Didn't receive end marker for unlock responses"
msgstr ""
-#: libsvn_ra_svn/client.c:1807 libsvn_ra_svn/client.c:1835
+#: libsvn_ra_svn/client.c:1881 libsvn_ra_svn/client.c:1909
msgid "Server doesn't support the get-lock command"
msgstr "Serwer nie obsługuje polecenia get-lock"
-#: libsvn_ra_svn/client.c:1848
+#: libsvn_ra_svn/client.c:1922
msgid "Lock element not a list"
msgstr "Element lock nie jest listą"
-#: libsvn_ra_svn/client.c:1871
+#: libsvn_ra_svn/client.c:1945
#, fuzzy
msgid "Server doesn't support the replay command"
msgstr "Serwer nie obsługuje polecenia zakładania blokady"
-#: libsvn_ra_svn/client.c:1935
+#: libsvn_ra_svn/client.c:2010
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Nieobsługiwana wersja loadera RA (%d) dla ra_svn"
#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/sasl_auth.c:389 libsvn_ra_svn/sasl_auth.c:444
-#: libsvn_ra_svn/simple_auth.c:61
+#: libsvn_ra_svn/cyrus_auth.c:437 libsvn_ra_svn/cyrus_auth.c:484
+#: libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "Nieoczekiwana odpowiedź serwera na autoryzację"
+#: libsvn_ra_svn/cyrus_auth.c:171 svnserve/cyrus_auth.c:104
+#: svnserve/cyrus_auth.c:114
+#, c-format
+msgid "Could not initialize the SASL library"
+msgstr "Nie udała się inicjalizacja biblioteki SASL"
+
+#: libsvn_ra_svn/cyrus_auth.c:824 libsvn_ra_svn/internal_auth.c:57
+#: libsvn_ra_svn/internal_auth.c:110
+#, c-format
+msgid "Authentication error from server: %s"
+msgstr "Błąd autoryzacji na serwerze: %s"
+
+#: libsvn_ra_svn/cyrus_auth.c:828
+#, fuzzy
+msgid "Can't get username or password"
+msgstr "Nie można pobrać hasła"
+
#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
msgstr "Niewłaściwy żeton pliku lub katalogu"
@@ -3373,11 +3443,16 @@
msgid "Apply-textdelta not active"
msgstr "Operacja apply-textdelta nieaktywna"
-#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:845
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:896
#, c-format
msgid "Unknown command '%s'"
msgstr "Nieznane polecenie: '%s'"
+#: libsvn_ra_svn/internal_auth.c:97 libsvn_subr/prompt.c:156
+#, c-format
+msgid "Can't get password"
+msgstr "Nie można pobrać hasła"
+
#: libsvn_ra_svn/marshal.c:86
msgid "Capability entry is not a word"
msgstr "Pole określające możliwości serwera bądź klienta musi być typu WORD"
@@ -3387,62 +3462,35 @@
msgid "Connection closed unexpectedly"
msgstr "Nieoczekiwane przerwanie połączenia sieciowego"
-#: libsvn_ra_svn/marshal.c:509
+#: libsvn_ra_svn/marshal.c:536
msgid "String length larger than maximum"
msgstr "Długość tekstu przekracza dopuszczalne maksimum"
-#: libsvn_ra_svn/marshal.c:546
+#: libsvn_ra_svn/marshal.c:573
msgid "Too many nested items"
msgstr "Zbyt wiele zagnieżdżonych elementów"
-#: libsvn_ra_svn/marshal.c:565
+#: libsvn_ra_svn/marshal.c:592
msgid "Number is larger than maximum"
msgstr "Wartość liczby przekracza dopuszczalne maksimum"
-#: libsvn_ra_svn/marshal.c:768
+#: libsvn_ra_svn/marshal.c:796
+msgid "Proplist element not a list"
+msgstr "Element proplist nie jest listą"
+
+#: libsvn_ra_svn/marshal.c:819
msgid "Empty error list"
msgstr "Pusta lista błędów"
-#: libsvn_ra_svn/marshal.c:777
+#: libsvn_ra_svn/marshal.c:828
msgid "Malformed error list"
msgstr "Zły format listy błędów"
-#: libsvn_ra_svn/marshal.c:816
+#: libsvn_ra_svn/marshal.c:867
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "Komenda zwróciła nieznany status '%s'"
-#: libsvn_ra_svn/sasl_auth.c:179 svnserve/sasl_auth.c:104
-#: svnserve/sasl_auth.c:114
-#, c-format
-msgid "Could not initialize the SASL library"
-msgstr "Nie udała się inicjalizacja biblioteki SASL"
-
-#: libsvn_ra_svn/sasl_auth.c:279
-#, fuzzy
-msgid "Can't get user name"
-msgstr "Nie można dostać nazwy pliku"
-
-#: libsvn_ra_svn/sasl_auth.c:286 libsvn_ra_svn/simple_auth.c:97
-#: libsvn_subr/prompt.c:156
-#, c-format
-msgid "Can't get password"
-msgstr "Nie można pobrać hasła"
-
-#: libsvn_ra_svn/sasl_auth.c:293
-msgid "Unhandled SASL interaction"
-msgstr ""
-
-#: libsvn_ra_svn/sasl_auth.c:761 libsvn_ra_svn/simple_auth.c:58
-#: libsvn_ra_svn/simple_auth.c:110
-#, c-format
-msgid "Authentication error from server: %s"
-msgstr "Błąd autoryzacji na serwerze: %s"
-
-#: libsvn_ra_svn/simple_auth.c:117
-msgid "Cannot negotiate authentication mechanism"
-msgstr "Nie można określić sposobu autoryzacji"
-
#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
@@ -3458,22 +3506,22 @@
msgid "Can't get socket timeout"
msgstr "Błąd otwarcia standardowego wyjścia"
-#: libsvn_repos/commit.c:128
+#: libsvn_repos/commit.c:125
#, c-format
msgid "Out of date: '%s' in transaction '%s'"
msgstr "Nieaktualne: '%s' w transakcji z '%s'"
-#: libsvn_repos/commit.c:292 libsvn_repos/commit.c:453
+#: libsvn_repos/commit.c:274 libsvn_repos/commit.c:435
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "Otrzymana ścieżka źródłowa nie posiada numeru wersji dla '%s'"
-#: libsvn_repos/commit.c:324 libsvn_repos/commit.c:484
+#: libsvn_repos/commit.c:306 libsvn_repos/commit.c:466
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "Źródłowy URL '%s' jest z innego repozytorium"
-#: libsvn_repos/commit.c:609
+#: libsvn_repos/commit.c:591
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3539,7 +3587,7 @@
"Zatwierdzenie powiodło się, lecz nie powiodło się wykonanie skryptu hook\n"
"post-commit"
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_repos/fs-wrap.c:183
#, c-format
msgid ""
"Storage of non-regular property '%s' is disallowed through the repository "
@@ -3549,17 +3597,17 @@
"jest niedozwolone, może to oznaczać występowanie błędu w \n"
"Twoim kliencie svn"
-#: libsvn_repos/fs-wrap.c:303
+#: libsvn_repos/fs-wrap.c:329
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "Zapis zabroniony: nieautoryzowana próba odczytu wersji %ld."
-#: libsvn_repos/fs-wrap.c:507
+#: libsvn_repos/fs-wrap.c:533
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr "Nie można zdjąć blokady ścieżki '%s', brak zautoryzowanego użytkownika"
-#: libsvn_repos/fs-wrap.c:521
+#: libsvn_repos/fs-wrap.c:547
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr ""
"Zdjęcie blokady powiodło się, lecz nie powiodło się wykonanie skryptu post-"
@@ -3741,7 +3789,7 @@
msgid " done.\n"
msgstr " zrobione.\n"
-#: libsvn_repos/load.c:1231
+#: libsvn_repos/load.c:1233
#, c-format
msgid ""
"\n"
@@ -3752,7 +3800,7 @@
"------- Zatwierdzona wersja %ld >>>\n"
"\n"
-#: libsvn_repos/load.c:1237
+#: libsvn_repos/load.c:1239
#, c-format
msgid ""
"\n"
@@ -3768,36 +3816,46 @@
msgid "'%s' not found in filesystem"
msgstr "'%s' nie znaleziony w systemie plików"
-#: libsvn_repos/replay.c:367
+#: libsvn_repos/replay.c:387
#, c-format
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "Ścieżka '%s' systemu plików nie jest ani plikiem ani katalogiem"
-#: libsvn_repos/reporter.c:602
+#: libsvn_repos/reporter.c:222
+#, fuzzy, c-format
+msgid "Invalid depth (%s) for path '%s'"
+msgstr "Błędna składnia ścieżki '%s'"
+
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "Ścieżka kopii roboczej '%s' nie istnieje w repozytorium"
-#: libsvn_repos/reporter.c:836
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "Brak uprawnień do otwarcia katalogu głównego edycji"
-#: libsvn_repos/reporter.c:855
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "Docelowa śieżka nie istnieje"
-#: libsvn_repos/reporter.c:862
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "Nie można zastąpić katalogu będąc w tym katalogu"
-#: libsvn_repos/reporter.c:905
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "Niepoprawna operacja na katalogu głównym kopii roboczej"
-#: libsvn_repos/reporter.c:920
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "Dwa główne raporty bez obiektu docelowego"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "Nieznany rodzaj obiektu dla ścieżki '%s'"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -3843,36 +3901,36 @@
msgid "Creating conf directory"
msgstr "Tworzenie katalogu konfiguracji"
-#: libsvn_repos/repos.c:1482
+#: libsvn_repos/repos.c:1484
msgid "Creating svnserve.conf file"
msgstr "Tworzenie pliku svnserve.conf"
-#: libsvn_repos/repos.c:1507
+#: libsvn_repos/repos.c:1509
msgid "Creating passwd file"
msgstr "Tworzenie pliku passwd"
-#: libsvn_repos/repos.c:1567
+#: libsvn_repos/repos.c:1579
#, fuzzy
msgid "Creating authz file"
msgstr "Tworzenie pliku passwd"
-#: libsvn_repos/repos.c:1600
+#: libsvn_repos/repos.c:1612
msgid "Could not create top-level directory"
msgstr "Nie można stworzyć katalogu głównego"
-#: libsvn_repos/repos.c:1604
+#: libsvn_repos/repos.c:1616
msgid "Creating DAV sandbox dir"
msgstr "Tworzenie katalogu roboczego DAV"
-#: libsvn_repos/repos.c:1685
+#: libsvn_repos/repos.c:1697
msgid "Error opening db lockfile"
msgstr "Błąd otwierania pliku blokady dla db"
-#: libsvn_repos/repos.c:1722
+#: libsvn_repos/repos.c:1734
msgid "Repository creation failed"
msgstr "Tworzenie repozytorium nie powiodło się"
-#: libsvn_repos/repos.c:1803
+#: libsvn_repos/repos.c:1815
#, fuzzy, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "Oczekiwany format systemu plików '%d'; znaleziony format '%d'"
@@ -3896,7 +3954,7 @@
msgid "Unreadable path encountered; access denied"
msgstr "Nie można odczytać ścieżki; dostęp zabroniony"
-#: libsvn_subr/cmdline.c:481
+#: libsvn_subr/cmdline.c:493
#, c-format
msgid "Error initializing command line arguments"
msgstr "Błąd podczas inicjalizacji argumentów linii poleceń"
@@ -3972,234 +4030,245 @@
msgid "Can't check path '%s'"
msgstr "Nie można sprawdzić ścieżki '%s'"
-#: libsvn_subr/io.c:377 libsvn_subr/io.c:508
+#: libsvn_subr/io.c:377
#, c-format
msgid "Can't open '%s'"
msgstr "Nie mozna otworzyć '%s'"
-#: libsvn_subr/io.c:399 libsvn_subr/io.c:521
+#: libsvn_subr/io.c:399 libsvn_subr/io.c:522
#, c-format
msgid "Unable to make name for '%s'"
msgstr "Nie zdołano przydzielić nazwy dla '%s'"
-#: libsvn_subr/io.c:525 libsvn_subr/io.c:579 libsvn_subr/io.c:607
+#: libsvn_subr/io.c:509
+#, fuzzy, c-format
+msgid "Can't create symbolic link '%s'"
+msgstr "Nie można utworzyć katalogu '%s'"
+
+#: libsvn_subr/io.c:526 libsvn_subr/io.c:580 libsvn_subr/io.c:608
msgid "Symbolic links are not supported on this platform"
msgstr "Na tej platformie nie są wspierane dowiązania symboliczne"
-#: libsvn_subr/io.c:558
+#: libsvn_subr/io.c:559
#, c-format
msgid "Can't read contents of link"
msgstr "Nie można przeczytać zawartości wskazywanej przez odniesienie"
-#: libsvn_subr/io.c:620
+#: libsvn_subr/io.c:621
#, c-format
msgid "Can't find a temporary directory"
msgstr "Nie można znaleźć katalogu tymczasowego"
-#: libsvn_subr/io.c:753
+#: libsvn_subr/io.c:715
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "Nie można skopiować '%s' do '%s'"
-#: libsvn_subr/io.c:787
+#: libsvn_subr/io.c:767
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "Nie można przypisać praw dla '%s'"
-#: libsvn_subr/io.c:809
+#: libsvn_subr/io.c:789
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "Nie można dodać '%s' do '%s'"
-#: libsvn_subr/io.c:843
+#: libsvn_subr/io.c:823
#, c-format
msgid "Source '%s' is not a directory"
msgstr "Źródło '%s' nie jest katalogiem"
-#: libsvn_subr/io.c:849
+#: libsvn_subr/io.c:829
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "Obiekt docelowy '%s' nie jest katalogiem"
-#: libsvn_subr/io.c:855
+#: libsvn_subr/io.c:835
#, c-format
msgid "Destination '%s' already exists"
msgstr "Ścieżka docelowa '%s' już istnieje"
-#: libsvn_subr/io.c:924 libsvn_subr/io.c:1821 libsvn_subr/io.c:1872
-#: libsvn_subr/io.c:1935
+#: libsvn_subr/io.c:904 libsvn_subr/io.c:1830 libsvn_subr/io.c:1881
+#: libsvn_subr/io.c:1944
#, c-format
msgid "Can't read directory '%s'"
msgstr "Nie można odczytać katalogu '%s'"
-#: libsvn_subr/io.c:929 libsvn_subr/io.c:1826 libsvn_subr/io.c:1877
-#: libsvn_subr/io.c:1940 libsvn_subr/io.c:2987
+#: libsvn_subr/io.c:909 libsvn_subr/io.c:1835 libsvn_subr/io.c:1886
+#: libsvn_subr/io.c:1949 libsvn_subr/io.c:3114
#, c-format
msgid "Error closing directory '%s'"
msgstr "Błąd zamykania katalogu '%s'"
-#: libsvn_subr/io.c:955
+#: libsvn_subr/io.c:935
#, c-format
msgid "Can't make directory '%s'"
msgstr "Nie można stworzyć katalogu '%s'"
-#: libsvn_subr/io.c:1042
+#: libsvn_subr/io.c:1022
#, c-format
msgid "Can't set access time of '%s'"
msgstr "Nie można ustawić informacji o czasie dostępu do '%s'"
-#: libsvn_subr/io.c:1182
+#: libsvn_subr/io.c:1162
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr "Nie można odczytać domyślnych praw dla pliku '%s' (błąd stat)"
-#: libsvn_subr/io.c:1193
+#: libsvn_subr/io.c:1173
#, c-format
msgid "Can't open file at '%s'"
msgstr "Nie można otworzyć pliku '%s'"
-#: libsvn_subr/io.c:1197
+#: libsvn_subr/io.c:1177
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr "Nie można odczytać domyślnych praw dla pliku '%s' (błąd stat)"
-#: libsvn_subr/io.c:1236 libsvn_subr/io.c:1331
+#: libsvn_subr/io.c:1216 libsvn_subr/io.c:1311
#, fuzzy, c-format
msgid "Can't change perms of file '%s'"
msgstr "Nie można zmienić praw odczytu/zapisu do pliku '%s'"
-#: libsvn_subr/io.c:1371
+#: libsvn_subr/io.c:1351
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "Nie można ustawić atrybutu 'tylko do odczytu' dla pliku '%s'"
-#: libsvn_subr/io.c:1403
+#: libsvn_subr/io.c:1383
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "Nie można ustawić atrybutu 'do zapisu i odczytu' dla pliku '%s'"
-#: libsvn_subr/io.c:1447
+#: libsvn_subr/io.c:1427
#, c-format
msgid "Error getting UID of process"
msgstr "Błąd pobierania UID procesu"
-#: libsvn_subr/io.c:1528
+#: libsvn_subr/io.c:1508
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "Nie można założyć dzielonej blokady dla pliku '%s'"
-#: libsvn_subr/io.c:1563
+#: libsvn_subr/io.c:1543
#, c-format
msgid "Can't flush file '%s'"
msgstr "Nie można opróżnić pliku '%s'"
-#: libsvn_subr/io.c:1564
+#: libsvn_subr/io.c:1544
#, c-format
msgid "Can't flush stream"
msgstr "Nie można opróżnić strumienia"
-#: libsvn_subr/io.c:1576 libsvn_subr/io.c:1593
+#: libsvn_subr/io.c:1556 libsvn_subr/io.c:1573
#, c-format
msgid "Can't flush file to disk"
msgstr "Nie można opróżnić pliku na dysk"
-#: libsvn_subr/io.c:1614
-msgid "Reading from stdin is currently broken, so disabled"
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#, c-format
+msgid "Can't open stdin"
+msgstr "Nie można otworzyć standardowego wejścia"
+
+#: libsvn_subr/io.c:1616
+#, fuzzy
+msgid "Reading from stdin is disallowed"
msgstr ""
"Czytanie z standardowego wejścia jest aktualnie uszkodzone,\n"
"tak więc zostanie wyłączone"
-#: libsvn_subr/io.c:1635
+#: libsvn_subr/io.c:1630
#, c-format
msgid "Can't get file name"
msgstr "Nie można dostać nazwy pliku"
-#: libsvn_subr/io.c:1703
+#: libsvn_subr/io.c:1698
#, c-format
msgid "Can't remove file '%s'"
msgstr "Nie można usunąć pliku '%s'"
-#: libsvn_subr/io.c:1757 libsvn_subr/io.c:2838 libsvn_subr/io.c:2924
+#: libsvn_subr/io.c:1765 libsvn_subr/io.c:2965 libsvn_subr/io.c:3051
#, c-format
msgid "Can't open directory '%s'"
msgstr "Nie można otworzyć katalogu '%s'"
-#: libsvn_subr/io.c:1802 libsvn_subr/io.c:1832
+#: libsvn_subr/io.c:1811 libsvn_subr/io.c:1841
#, c-format
msgid "Can't remove '%s'"
msgstr "Nie można usunąć '%s'"
-#: libsvn_subr/io.c:1812
+#: libsvn_subr/io.c:1821
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "Nie można przejść do pierwszego elementu katalogu '%s'"
-#: libsvn_subr/io.c:2004
+#: libsvn_subr/io.c:2013
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "Nie można utworzyć atrybutów procesu '%s'"
-#: libsvn_subr/io.c:2010
+#: libsvn_subr/io.c:2019
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "Nie można ustalić sposobu wywołania procesu '%s'"
-#: libsvn_subr/io.c:2022
+#: libsvn_subr/io.c:2031
#, c-format
msgid "Can't set process '%s' directory"
msgstr "Nie można ustawić katalogu dla procesu '%s'"
-#: libsvn_subr/io.c:2035
+#: libsvn_subr/io.c:2044
#, c-format
msgid "Can't set process '%s' child input"
msgstr "Nie można przydzielić procesowi '%s' strumienia wejściowego"
-#: libsvn_subr/io.c:2042
+#: libsvn_subr/io.c:2051
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "Nie można przydzielić procesowi '%s' strumienia wyjściowego"
-#: libsvn_subr/io.c:2049
+#: libsvn_subr/io.c:2058
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "Nie można przydzielić procesowi '%s' strumienia błędów"
-#: libsvn_subr/io.c:2056
+#: libsvn_subr/io.c:2065
#, fuzzy, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr "Nie można przydzielić procesowi '%s' strumienia błędów"
-#: libsvn_subr/io.c:2062
+#: libsvn_subr/io.c:2071
#, fuzzy, c-format
msgid "Can't set process '%s' error handler"
msgstr "Nie można przydzielić procesowi '%s' strumienia błędów"
-#: libsvn_subr/io.c:2085
+#: libsvn_subr/io.c:2094
#, c-format
msgid "Can't start process '%s'"
msgstr "Nie można uruchomić procesu '%s'"
-#: libsvn_subr/io.c:2109
+#: libsvn_subr/io.c:2118
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Błąd podczas czekania na proces '%s'"
-#: libsvn_subr/io.c:2117
+#: libsvn_subr/io.c:2126
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "Proces '%s' zakończył się niepowodzeniem ( kod błędu: %d )"
-#: libsvn_subr/io.c:2124
+#: libsvn_subr/io.c:2133
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "Proces '%s' zwrócił kod błędu %d"
-#: libsvn_subr/io.c:2235
+#: libsvn_subr/io.c:2244
#, c-format
msgid "'%s' returned %d"
msgstr "'%s' zwrócił kod błędu %d"
-#: libsvn_subr/io.c:2358
+#: libsvn_subr/io.c:2367
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4214,130 +4283,159 @@
"%s\n"
"%s"
-#: libsvn_subr/io.c:2411
+#: libsvn_subr/io.c:2494
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "Nie można określić typu MIME dla obiektu '%s'"
-#: libsvn_subr/io.c:2478
+#: libsvn_subr/io.c:2584
#, c-format
msgid "Can't open file '%s'"
msgstr "Nie można otworzyć pliku '%s'"
-#: libsvn_subr/io.c:2514
+#: libsvn_subr/io.c:2620
#, c-format
msgid "Can't close file '%s'"
msgstr "Nie można zamknąć katalogu '%s'"
-#: libsvn_subr/io.c:2515
+#: libsvn_subr/io.c:2621
#, c-format
msgid "Can't close stream"
msgstr "Nie można zamknąć strumienia"
-#: libsvn_subr/io.c:2525 libsvn_subr/io.c:2549 libsvn_subr/io.c:2562
+#: libsvn_subr/io.c:2631 libsvn_subr/io.c:2655 libsvn_subr/io.c:2668
#, c-format
msgid "Can't read file '%s'"
msgstr "Nie można czytać z pliku '%s'"
-#: libsvn_subr/io.c:2526 libsvn_subr/io.c:2550 libsvn_subr/io.c:2563
+#: libsvn_subr/io.c:2632 libsvn_subr/io.c:2656 libsvn_subr/io.c:2669
#, c-format
msgid "Can't read stream"
msgstr "Nie można czytać z strumienia"
-#: libsvn_subr/io.c:2537
+#: libsvn_subr/io.c:2643
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "Nie można uzyskać z pliku '%s' informacji o atrybutach"
-#: libsvn_subr/io.c:2538
+#: libsvn_subr/io.c:2644
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Nie mogę uzyskać ze strumienia informacji o atrybutach"
-#: libsvn_subr/io.c:2574
+#: libsvn_subr/io.c:2680
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "Nie można ustawić wskaźnika pozycji w pliku '%s'"
-#: libsvn_subr/io.c:2575
+#: libsvn_subr/io.c:2681
#, c-format
msgid "Can't set position pointer in stream"
msgstr "Nie można ustawić wskaźnika pozycji strumienia"
-#: libsvn_subr/io.c:2586 libsvn_subr/io.c:2599
+#: libsvn_subr/io.c:2692 libsvn_subr/io.c:2726
#, c-format
msgid "Can't write to file '%s'"
msgstr "Nie można pisać do pliku '%s'"
-#: libsvn_subr/io.c:2587 libsvn_subr/io.c:2600
+#: libsvn_subr/io.c:2693 libsvn_subr/io.c:2727
#, c-format
msgid "Can't write to stream"
msgstr "Nie można pisać do strumienia"
-#: libsvn_subr/io.c:2640
+#: libsvn_subr/io.c:2767
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "Nie można odczytać długości linii z pliku '%s'"
-#: libsvn_subr/io.c:2644
+#: libsvn_subr/io.c:2771
msgid "Can't read length line in stream"
msgstr "Nie można odczytać długości linii z strumienia"
-#: libsvn_subr/io.c:2691
+#: libsvn_subr/io.c:2818
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Nie można przenieść '%s' do '%s'"
-#: libsvn_subr/io.c:2769
+#: libsvn_subr/io.c:2896
#, c-format
msgid "Can't create directory '%s'"
msgstr "Nie można utworzyć katalogu '%s'"
-#: libsvn_subr/io.c:2780 libsvn_wc/copy.c:519
+#: libsvn_subr/io.c:2907 libsvn_wc/copy.c:509
#, c-format
msgid "Can't hide directory '%s'"
msgstr "Nie można ukryć katalogu '%s'"
-#: libsvn_subr/io.c:2792
+#: libsvn_subr/io.c:2919
#, c-format
msgid "Can't stat directory '%s'"
msgstr "Nie można pobrać informacji o katalogu '%s'"
-#: libsvn_subr/io.c:2856
+#: libsvn_subr/io.c:2983
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Nie można usunąć katalogu '%s'"
-#: libsvn_subr/io.c:2874
+#: libsvn_subr/io.c:3001
#, c-format
msgid "Can't read directory"
msgstr "Nie można czytać z katalogu"
-#: libsvn_subr/io.c:2943
+#: libsvn_subr/io.c:3070
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "Nie można czytać kolejnego elementu katalogu '%s'"
-#: libsvn_subr/io.c:3068
+#: libsvn_subr/io.c:3195
#, c-format
msgid "Can't check directory '%s'"
msgstr "Nie można sprawdzić katalogu '%s'"
-#: libsvn_subr/io.c:3090
+#: libsvn_subr/io.c:3217
#, c-format
msgid "Version %d is not non-negative"
msgstr "Numer wersji %d nie jest nieujemny"
-#: libsvn_subr/io.c:3140
+#: libsvn_subr/io.c:3267
#, c-format
msgid "Reading '%s'"
msgstr "Czytanie '%s'"
-#: libsvn_subr/io.c:3156
+#: libsvn_subr/io.c:3283
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "Pierwsza linia '%s' nie jest cyfrą"
+#: libsvn_subr/mergeinfo.c:67
+#, fuzzy
+msgid "Invalid revision number"
+msgstr "Podano błędny numer wersji"
+
+#: libsvn_subr/mergeinfo.c:125
+#, fuzzy
+msgid "No revision list found "
+msgstr "Nie ma takiej wersji %ld"
+
+#: libsvn_subr/mergeinfo.c:135 libsvn_subr/mergeinfo.c:163
+#, fuzzy
+msgid "Invalid character found in revision list"
+msgstr "Nieprawidłowa końcowa wersja %ld"
+
+#: libsvn_subr/mergeinfo.c:169
+#, fuzzy
+msgid "Revision list parsing ended before hitting newline"
+msgstr "W pliku wersji brak końcowego znaku końca wiersza"
+
+#: libsvn_subr/mergeinfo.c:187
+msgid "Pathname not terminated by ':'"
+msgstr ""
+
+#: libsvn_subr/mergeinfo.c:195
+#, fuzzy
+msgid "Could not find end of line in revision line"
+msgstr "Nie znaleziono atrybutu czas dla wersji %ld"
+
#: libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
@@ -4363,8 +4461,8 @@
"Poprawne opcje:\n"
#: libsvn_subr/opt.c:424
-msgid " arg"
-msgstr " ARG"
+msgid " ARG"
+msgstr ""
#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
#, c-format
@@ -4375,27 +4473,27 @@
"\"%s\": nieznane polecenie.\n"
"\n"
-#: libsvn_subr/opt.c:760
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Błąd składniowy w trakcie parsowania wersji '%s'"
-#: libsvn_subr/opt.c:837
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL '%s' nie jest poprawnie zakodowany"
-#: libsvn_subr/opt.c:843
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL '%s' zawiera element '..'"
-#: libsvn_subr/opt.c:872
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Błąd ustalania wielkości liter dla '%s'"
-#: libsvn_subr/opt.c:974
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4406,7 +4504,7 @@
" kompilacja %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:977
+#: libsvn_subr/opt.c:998
#, fuzzy
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
@@ -4421,36 +4519,31 @@
"Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1028 libsvn_subr/opt.c:1069
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Użyj '%s help' by otrzymać podstawowe instrukcje.\n"
-#: libsvn_subr/path.c:1182
+#: libsvn_subr/path.c:1107
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "Nie można ustalić absolutnej ścieżki '%s'"
-#: libsvn_subr/path.c:1220
+#: libsvn_subr/path.c:1145
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "'%s' nie jest ani nazwą pliku ani katalogu"
-#: libsvn_subr/path.c:1335
+#: libsvn_subr/path.c:1251
#, c-format
msgid "Can't determine the native path encoding"
msgstr "Nie można ustalić natywnego kodowania dla ścieżki"
-#: libsvn_subr/path.c:1389
+#: libsvn_subr/path.c:1305
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Błędny znak kontrolny '0x%02x' w ścieżce '%s'"
-#: libsvn_subr/prompt.c:97 svnserve/main.c:514
-#, c-format
-msgid "Can't open stdin"
-msgstr "Nie można otworzyć standardowego wejścia"
-
#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
@@ -4531,12 +4624,7 @@
msgid "Passphrase for '%s': "
msgstr "Hasło (passphrase) dla '%s': "
-#: libsvn_subr/subst.c:1599
-#, fuzzy, c-format
-msgid "'%s' has unsupported special file type '%s'"
-msgstr "'%s' nie jest plikiem w systemie plików '%s'"
-
-#: libsvn_subr/subst.c:1737 libsvn_wc/props.c:1499
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Plik '%s' ma niejednolite znaki końca wiersza"
@@ -4569,27 +4657,27 @@
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "Nie można stworzyć konwertera z kodowania znaków '%s' do '%s'"
-#: libsvn_subr/utf.c:515
+#: libsvn_subr/utf.c:522
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "Nie można dokonać konwersji z natywnego kodowania do '%s':"
-#: libsvn_subr/utf.c:519
+#: libsvn_subr/utf.c:526
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "Nie można dokonać konwersji z '%s' do natywnego kodowania:"
-#: libsvn_subr/utf.c:523
+#: libsvn_subr/utf.c:530
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "Nie można dokonać konwersji z '%s' do '%s'"
-#: libsvn_subr/utf.c:529
+#: libsvn_subr/utf.c:536
#, fuzzy, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "Nie można dokonać konwersji z '%s' do '%s'"
-#: libsvn_subr/utf.c:574
+#: libsvn_subr/utf.c:581
#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
@@ -4598,7 +4686,7 @@
"Bezpieczne dane '%s' następują po znaku nie ASCII %d: nie można go "
"skonwertować do/z UTF-8"
-#: libsvn_subr/utf.c:582
+#: libsvn_subr/utf.c:589
#, c-format
msgid ""
"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
@@ -4606,7 +4694,7 @@
"Wykryto znak nie ASCII o kodzie %d, nie można przeprowadzić konwersji do/z "
"UTF-8"
-#: libsvn_subr/utf.c:624
+#: libsvn_subr/utf.c:631
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -4644,16 +4732,11 @@
msgid "Malformed XML: %s at line %d"
msgstr "Uszkodzony XML: %s w linii %d"
-#: libsvn_wc/adm_crawler.c:605
+#: libsvn_wc/adm_crawler.c:635
msgid "Error aborting report"
msgstr "Błąd w trakcie przerywania generowania raportu"
-#: libsvn_wc/adm_crawler.c:908
-#, c-format
-msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
-msgstr "Błąd sumy kontrolnej dla '%s'; oczekiwana: '%s', faktyczna: '%s'"
-
-#: libsvn_wc/adm_crawler.c:919
+#: libsvn_wc/adm_crawler.c:1059
#, c-format
msgid "While preparing '%s' for commit"
msgstr ""
@@ -4689,47 +4772,42 @@
msgid "No such thing as 'base' working copy properties!"
msgstr "Nie ma czegoś takiego jak 'bazowe' atrybuty kopii roboczej"
-#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:51
+#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:52
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' nie jest katalogiem"
-#: libsvn_wc/adm_files.c:1035
-#, c-format
-msgid "No entry for '%s'"
-msgstr "Brak wpisu dla '%s'"
-
-#: libsvn_wc/adm_files.c:1048
+#: libsvn_wc/adm_files.c:1044
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "Wersja %ld nie odpowiada istniejącej wersji %ld w '%s'"
-#: libsvn_wc/adm_files.c:1056
+#: libsvn_wc/adm_files.c:1052
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "URL '%s' nie zgadza się z istniejącym URL '%s' w '%s'"
-#: libsvn_wc/adm_ops.c:259
+#: libsvn_wc/adm_ops.c:278
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "Nieznany rodzaj obiektu: '%s'"
-#: libsvn_wc/adm_ops.c:1388
+#: libsvn_wc/adm_ops.c:1403
#, c-format
msgid "'%s' not found"
msgstr "Nie znaleziono '%s'"
-#: libsvn_wc/adm_ops.c:1392
+#: libsvn_wc/adm_ops.c:1407
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Nieznany rodzaj obiektu dla ścieżki '%s'"
-#: libsvn_wc/adm_ops.c:1422
+#: libsvn_wc/adm_ops.c:1437
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s' już podlega zarządzaniu wersjami"
-#: libsvn_wc/adm_ops.c:1434
+#: libsvn_wc/adm_ops.c:1449
#, fuzzy, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
@@ -4739,47 +4817,42 @@
"możliwe. Usuń ten obiekt - zatwierdzając tą operację, zaktualizuj\n"
"kopię roboczą i dopiero wtedy dodaj '%s'"
-#: libsvn_wc/adm_ops.c:1451
+#: libsvn_wc/adm_ops.c:1466
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr ""
"W trakcie dodawania '%s' nie znaleziono informacji o katalogu nadrzędnym"
-#: libsvn_wc/adm_ops.c:1456
+#: libsvn_wc/adm_ops.c:1471
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr "Nie można dodać '%s' - katalog nadrzędny ma zostać skasowany"
-#: libsvn_wc/adm_ops.c:1472
+#: libsvn_wc/adm_ops.c:1487
#, fuzzy, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr ""
"Źródłowy URL '%s' zawiera różny od swojego przodka katalog główny "
"repozytorium"
-#: libsvn_wc/adm_ops.c:1804
+#: libsvn_wc/adm_ops.c:1820
#, c-format
msgid "Error restoring text for '%s'"
msgstr "Błąd podczas przywracania zawartości '%s'"
-#: libsvn_wc/adm_ops.c:1935
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "Nie można wycofać zmian: '%s' nie podlega zarządzaniu wersjami"
-
-#: libsvn_wc/adm_ops.c:1963
+#: libsvn_wc/adm_ops.c:1990
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr "Nie można wycofać zmian w '%s': nie znany rodzaj obiektu"
-#: libsvn_wc/adm_ops.c:1974
+#: libsvn_wc/adm_ops.c:2001
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr ""
"Nie można wycofać zmian w '%s': obiekt znajdujący się w kopii roboczej\n"
"jest nieznanego rodzaju "
-#: libsvn_wc/adm_ops.c:2021
+#: libsvn_wc/adm_ops.c:2048
msgid ""
"Cannot revert addition of current directory; please try again from the "
"parent directory"
@@ -4787,39 +4860,37 @@
"Nie można wycofać operacji dodania bieżącego katalogu, spróbuj\n"
"ponownie wykonać to polecenie znajdując się w katalogu nadrzędnym"
-#: libsvn_wc/adm_ops.c:2043
+#: libsvn_wc/adm_ops.c:2070
#, c-format
msgid "Unknown or unexpected kind for path '%s'"
msgstr "Nie znany lub niedopuszczalny rodzaj obiektu dla ścieżki '%s'"
-#: libsvn_wc/adm_ops.c:2205
+#: libsvn_wc/adm_ops.c:2232
#, c-format
msgid "File '%s' has local modifications"
msgstr "Plik '%s' zawiera lokalne zmiany"
+#: libsvn_wc/adm_ops.c:2802
+#, fuzzy, c-format
+msgid "'%s' is not currently a member of changelist '%s'."
+msgstr "Ścieżka '%s' nie jest plikiem"
+
#: libsvn_wc/copy.c:197
#, fuzzy, c-format
msgid "Error during recursive copy of '%s'"
msgstr "Błąd podczas rekursywnego dodawania '%s'"
-#: libsvn_wc/copy.c:362
+#: libsvn_wc/copy.c:356
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "'%s' już istnieje i znajduje się w wskazanym miejscu"
-#: libsvn_wc/copy.c:374
+#: libsvn_wc/copy.c:368
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "Już istnieje podlegający zarządzaniu wersjami element '%s'"
-#: libsvn_wc/copy.c:384
-#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr ""
-"Nie można skopiować lub przenieść '%s': obiekt nie podlega zarządzaniu\n"
-"wersjami"
-
-#: libsvn_wc/copy.c:393
+#: libsvn_wc/copy.c:383
#, c-format
msgid ""
"Cannot copy or move '%s': it's not in the repository yet; try committing "
@@ -4829,7 +4900,7 @@
"się w repozytorium; zatwierdź transakcję dodającą go do repozytorium i\n"
"spróbuj ponownie"
-#: libsvn_wc/copy.c:672
+#: libsvn_wc/copy.c:658
#, c-format
msgid ""
"Cannot copy or move '%s': it is not in the repository yet; try committing "
@@ -4839,7 +4910,7 @@
"się w repozytorium; zatwierdź transakcję dodającą go do repozytorium\n"
"i spróbuj ponownie."
-#: libsvn_wc/copy.c:799
+#: libsvn_wc/copy.c:776
#, fuzzy, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
msgstr ""
@@ -4847,106 +4918,106 @@
"się w repozytorium; zatwierdź transakcję dodającą go do repozytorium\n"
"i spróbuj ponownie."
-#: libsvn_wc/copy.c:806
+#: libsvn_wc/copy.c:783
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr ""
"Nie można kopiować do '%s' ponieważ zlecono wcześniej skasowanie obiektu"
-#: libsvn_wc/entries.c:91 libsvn_wc/entries.c:349 libsvn_wc/entries.c:561
-#: libsvn_wc/entries.c:822
+#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:352 libsvn_wc/entries.c:588
+#: libsvn_wc/entries.c:849
#, c-format
msgid "Entry '%s' has invalid '%s' value"
msgstr "Obiekt '%s' ma niepoprawną wartość '%s'"
-#: libsvn_wc/entries.c:111
+#: libsvn_wc/entries.c:114
#, fuzzy
msgid "Invalid escape sequence"
msgstr "Niewłaściwe zlecenie"
-#: libsvn_wc/entries.c:118
+#: libsvn_wc/entries.c:121
#, fuzzy
msgid "Invalid escaped character"
msgstr "Niewłaściwy typ zmiany"
-#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
-#: libsvn_wc/entries.c:203
+#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:194
+#: libsvn_wc/entries.c:206
#, fuzzy
msgid "Unexpected end of entry"
msgstr "Nieoczekiwany koniec danych wejściowych svndiff"
-#: libsvn_wc/entries.c:225
+#: libsvn_wc/entries.c:228
#, c-format
msgid "Invalid value for field '%s'"
msgstr "Niewłaściwa wartość dla pola '%s'"
-#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:536
+#: libsvn_wc/entries.c:310 libsvn_wc/entries.c:563
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "Obiekt '%s' jest nieznanego rodzaju"
-#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:513
+#: libsvn_wc/entries.c:331 libsvn_wc/entries.c:540
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "Obiekt '%s' zawiera nieprawidłowy katalog główny repozytorium"
-#: libsvn_wc/entries.c:947
+#: libsvn_wc/entries.c:995
#, c-format
msgid "XML parser failed in '%s'"
msgstr "Błąd parsera XML dla '%s'"
-#: libsvn_wc/entries.c:1006
+#: libsvn_wc/entries.c:1054
msgid "Missing default entry"
msgstr "Brak domyślnej wartości"
-#: libsvn_wc/entries.c:1011
+#: libsvn_wc/entries.c:1059
msgid "Default entry has no revision number"
msgstr "Domyślna wartość nie ma numeru wersji"
-#: libsvn_wc/entries.c:1016
+#: libsvn_wc/entries.c:1064
msgid "Default entry is missing URL"
msgstr "Domyślna wartość nie ma URL"
-#: libsvn_wc/entries.c:1092
+#: libsvn_wc/entries.c:1140
#, fuzzy, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "Błąd zapisu pliku entries dla '%s'"
-#: libsvn_wc/entries.c:1109
+#: libsvn_wc/entries.c:1157
#, fuzzy
msgid "Missing entry terminator"
msgstr "Brak domyślnej wartości"
-#: libsvn_wc/entries.c:1112
+#: libsvn_wc/entries.c:1160
#, fuzzy
msgid "Invalid entry terminator"
msgstr "Błędna relokacja"
-#: libsvn_wc/entries.c:1116
+#: libsvn_wc/entries.c:1164
#, fuzzy, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "Błąd zapisu pliku entries dla '%s'"
-#: libsvn_wc/entries.c:1212
+#: libsvn_wc/entries.c:1287
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "Uszkodzona kopia robocza: katalog '%s' nie ma domyślnego elementu"
-#: libsvn_wc/entries.c:1229
+#: libsvn_wc/entries.c:1304
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
msgstr ""
"Uszkodzona kopia robocza: katalog '%s' ma niepoprawne operacje\n"
"oczekujące na zatwierdzenie"
-#: libsvn_wc/entries.c:1263
+#: libsvn_wc/entries.c:1338
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
msgstr ""
"Uszkodzona kopia robocza: '%s' w katalogu '%s' ma niepoprawne operacje\n"
"oczekujące na zatwierdzenie"
-#: libsvn_wc/entries.c:1272
+#: libsvn_wc/entries.c:1347
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4955,7 +5026,7 @@
"Uszkodzona kopia robocza: '%s' w katalogu '%s' (oczekującym na\n"
"dodanie do repozytorium) nie jest zarejestrowany do dodania"
-#: libsvn_wc/entries.c:1280
+#: libsvn_wc/entries.c:1355
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4964,7 +5035,7 @@
"Uszkodzona kopia robocza: '%s' w katalogu '%s' (oczekującym na\n"
"skasowanie) nie jest zarejestrowany do skasowania"
-#: libsvn_wc/entries.c:1288
+#: libsvn_wc/entries.c:1363
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4973,17 +5044,17 @@
"Uszkodzona kopia robocza: '%s' w katalogu '%s' (oczekuje na\n"
"zastąpienie) ma niepoprawne operacje oczekujące na zatwierdzenie"
-#: libsvn_wc/entries.c:1925
+#: libsvn_wc/entries.c:2010
#, c-format
msgid "No default entry in directory '%s'"
msgstr "Brak domyślnego obiektu w katalogu '%s'"
-#: libsvn_wc/entries.c:1980
+#: libsvn_wc/entries.c:2065
#, c-format
msgid "Error writing to '%s'"
msgstr "Błąd zapisu do '%s'"
-#: libsvn_wc/entries.c:2303
+#: libsvn_wc/entries.c:2394
#, c-format
msgid ""
"Can't add '%s' to deleted directory; try undeleting its parent directory "
@@ -4992,7 +5063,7 @@
"Nie można dodać '%s' do skasowanego katalogu, spróbuj cofnąć kasowanie\n"
"katalogu nadrzędnego"
-#: libsvn_wc/entries.c:2309
+#: libsvn_wc/entries.c:2400
#, c-format
msgid ""
"Can't replace '%s' in deleted directory; try undeleting its parent directory "
@@ -5001,44 +5072,44 @@
"Nie można zastąpić '%s' w skasowanym katalogu, spróbuj cofnąć kasowanie\n"
"katalogu nadrzędnego"
-#: libsvn_wc/entries.c:2318
+#: libsvn_wc/entries.c:2409
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr ""
"'%s' jest oznaczony jako nieobecny, nie może zostać zlecone jego\n"
"skasowanie"
-#: libsvn_wc/entries.c:2347
+#: libsvn_wc/entries.c:2438
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "Obiekt '%s' już podlega zarządzaniu wersjami"
-#: libsvn_wc/entries.c:2444
+#: libsvn_wc/entries.c:2535
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "Obiekt '%s' ma niepoprawne operacje oczekujące na zatwierdzenie"
-#: libsvn_wc/entries.c:2590
+#: libsvn_wc/entries.c:2681
#, c-format
msgid "No such entry: '%s'"
msgstr "Nie ma takiego obiektu: '%s'"
-#: libsvn_wc/entries.c:2717
+#: libsvn_wc/entries.c:2814
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "Błąd zapisu pliku entries dla '%s'"
-#: libsvn_wc/entries.c:2759
+#: libsvn_wc/entries.c:2856
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "Katalog '%s' nie zawiera elementu THIS_DIR"
-#: libsvn_wc/entries.c:2888
+#: libsvn_wc/entries.c:2985
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "'%s' jest nieznanego rodzaju"
-#: libsvn_wc/entries.c:2925
+#: libsvn_wc/entries.c:3022
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "Nieoczekiwanie znaleziono '%s': ścieżka jest oznaczona jako brakująca"
@@ -5104,7 +5175,7 @@
msgid "Lock file '%s' is not a regular file"
msgstr "Plik blokady '%s' nie jest normalnym plikiem"
-#: libsvn_wc/log.c:339
+#: libsvn_wc/log.c:355
msgid "Can't move source to dest"
msgstr "Przeniesienie nie udało się."
@@ -5112,147 +5183,147 @@
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:502
+#: libsvn_wc/log.c:518
#, c-format
msgid "In directory '%s'"
msgstr "W katalogu '%s'"
-#: libsvn_wc/log.c:527
+#: libsvn_wc/log.c:543
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "Brak 'lewego' parametru w '%s'"
-#: libsvn_wc/log.c:534
+#: libsvn_wc/log.c:550
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "Brak 'prawego' parametru w '%s'<"
-#: libsvn_wc/log.c:602
+#: libsvn_wc/log.c:618
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "Brak parametru 'cel' w '%s'"
-#: libsvn_wc/log.c:683
+#: libsvn_wc/log.c:699
#, c-format
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "Brak parametru 'timestamp' w '%s'"
-#: libsvn_wc/log.c:779 libsvn_wc/log.c:819
+#: libsvn_wc/log.c:795 libsvn_wc/log.c:835
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "Błąd ustalania czasu dostępu dla '%s'"
-#: libsvn_wc/log.c:830
+#: libsvn_wc/log.c:868
+#, fuzzy, c-format
+msgid "Error getting file size on '%s'"
+msgstr "Błąd ustalania czasu dostępu dla '%s'"
+
+#: libsvn_wc/log.c:886
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "Błąd przy modyfikacji informacji o '%s'"
-#: libsvn_wc/log.c:856
+#: libsvn_wc/log.c:912
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "Błąd podczas usuwania blokady dla '%s'"
-#: libsvn_wc/log.c:879
+#: libsvn_wc/log.c:935
#, fuzzy, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "Błąd czytania zmian dla klucza '%s'"
-#: libsvn_wc/log.c:1011
+#: libsvn_wc/log.c:1067
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "Brak atrybutu wersji dla '%s'"
-#: libsvn_wc/log.c:1035
+#: libsvn_wc/log.c:1091
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "Polecenie log dla katalogu '%s' jest niepoprawnie umieszczone"
-#: libsvn_wc/log.c:1231
+#: libsvn_wc/log.c:1287
#, c-format
msgid "Error checking existence of '%s'"
msgstr "Błąd przy sprawdzaniu czy '%s' istnieje"
-#: libsvn_wc/log.c:1288
+#: libsvn_wc/log.c:1353
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "Błąd aktualizowania wersji bazowej '%s'"
-#: libsvn_wc/log.c:1293
+#: libsvn_wc/log.c:1358
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "Błąd pobierania czasu zmiany dla '%s'"
-#: libsvn_wc/log.c:1334
+#: libsvn_wc/log.c:1381
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "Błąd pobierania czasu zmiany dla '%s'"
-#: libsvn_wc/log.c:1349
+#: libsvn_wc/log.c:1401
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "Błąd porównywania '%s' i '%s'"
-#: libsvn_wc/log.c:1394 libsvn_wc/log.c:1461
+#: libsvn_wc/log.c:1450 libsvn_wc/log.c:1517
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "Błąd modyfikacji '%s'"
-#: libsvn_wc/log.c:1516
+#: libsvn_wc/log.c:1572
#, fuzzy
msgid "Invalid 'format' attribute"
msgstr "Błąd konfiguracji"
-#: libsvn_wc/log.c:1551
+#: libsvn_wc/log.c:1607
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr ""
"Zapis w logu nie zawiera atrybutu 'name' (element '%s' w katalogu '%s')"
-#: libsvn_wc/log.c:1622
+#: libsvn_wc/log.c:1678
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "Nieznany rodzaj obiektu w logu: '%s' w '%s'"
-#: libsvn_wc/log.c:1633
+#: libsvn_wc/log.c:1689
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "Błąd wykonania polecenia '%s' w '%s'"
-#: libsvn_wc/log.c:1815
+#: libsvn_wc/log.c:1871
msgid "Couldn't open log"
msgstr "Błąd otwarcia logu"
-#: libsvn_wc/log.c:1826
+#: libsvn_wc/log.c:1882
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "Błąd zapisu logu administracyjnego '%s'"
-#: libsvn_wc/log.c:2440
+#: libsvn_wc/log.c:2524
#, c-format
msgid "Error writing log for '%s'"
msgstr "Nie udany zapis logu dla '%s'"
-#: libsvn_wc/log.c:2489
-#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "'%s' nie jest kopią roboczą"
-
-#: libsvn_wc/props.c:92
+#: libsvn_wc/props.c:95
#, c-format
msgid "Can't parse '%s'"
msgstr "Nie można sparsować '%s'"
-#: libsvn_wc/props.c:123
+#: libsvn_wc/props.c:126
#, c-format
msgid "Can't write property hash to '%s'"
msgstr "Nie można zapisać atrybutów '%s'"
-#: libsvn_wc/props.c:218
+#: libsvn_wc/props.c:221
#, c-format
msgid "Can't find entry '%s' in '%s'"
msgstr "Nie znaleziono '%s' w ramach '%s'"
-#: libsvn_wc/props.c:633
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5261,7 +5332,7 @@
"Nie można dodać nowego atrybutu '%s' o wartości '%s', \n"
"ponieważ atrybut taki już istnieje i ma wartość '%s'."
-#: libsvn_wc/props.c:656
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5270,7 +5341,7 @@
"Nie można zmienić wartości atrybutu '%s' z '%s' do '%s',\n"
"ponieważ atrybut taki nie istnieje."
-#: libsvn_wc/props.c:684
+#: libsvn_wc/props.c:808
#, fuzzy, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
@@ -5278,7 +5349,7 @@
"Nie można dodać nowego atrybutu '%s' o wartości '%s', \n"
"ponieważ atrybut taki już istnieje i ma wartość '%s'."
-#: libsvn_wc/props.c:702
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5287,52 +5358,52 @@
"Nie można zmienić wartości atrybutu '%s' z '%s' do '%s',\n"
"ponieważ atrybut taki już istnieje o wartości '%s'."
-#: libsvn_wc/props.c:885
+#: libsvn_wc/props.c:1022
#, fuzzy, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Brak atrybutu wersji dla '%s'"
-#: libsvn_wc/props.c:1068 libsvn_wc/props.c:1104 libsvn_wc/props.c:1374
-#: libsvn_wc/props.c:1626
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "Nieudane pobieranie atrybutów z dysku"
-#: libsvn_wc/props.c:1132
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Nie można zapisać atrybutów '%s'"
-#: libsvn_wc/props.c:1366 libsvn_wc/props.c:1535
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "Atrybut '%s' jest atrybutem pliku/katalogu"
-#: libsvn_wc/props.c:1413
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Nie można ustawić '%s' dla katalogu ('%s')"
-#: libsvn_wc/props.c:1421
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Nie można ustawić '%s' dla pliku ('%s')"
-#: libsvn_wc/props.c:1427
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' nie jest plikiem ani katalogiem"
-#: libsvn_wc/props.c:1508
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Plik '%s' ma binarny typ MIME"
-#: libsvn_wc/props.c:2169
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Błąd parsowania atrybutu %s '%s': '%s'"
-#: libsvn_wc/props.c:2182
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
@@ -5341,7 +5412,7 @@
"Błędny atrybut %s '%s': wartość wykorzystuje '.' lub '..' albo też\n"
"jest ścieżką bezwzględną"
-#: libsvn_wc/questions.c:120
+#: libsvn_wc/questions.c:121
#, c-format
msgid ""
"Working copy format of '%s' is too old (%d); please check out your working "
@@ -5350,7 +5421,7 @@
"Format kopii roboczej '%s' jest zbyt stary (%d); pobierz kopię roboczą\n"
"na nowo"
-#: libsvn_wc/questions.c:128
+#: libsvn_wc/questions.c:129
#, c-format
msgid ""
"This client is too old to work with working copy '%s'; please get a newer "
@@ -5359,7 +5430,7 @@
"Ten klient jest zbyt stary by obsługiwać kopię roboczą '%s';\n"
"zainstaluj nowszego klienta Subversion"
-#: libsvn_wc/questions.c:346
+#: libsvn_wc/questions.c:336
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5370,47 +5441,47 @@
" oczekiwano: %s\n"
" znaleziono: %s\n"
-#: libsvn_wc/relocate.c:69
+#: libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr ""
-#: libsvn_wc/update_editor.c:399
+#: libsvn_wc/update_editor.c:440
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "Brak elementu '.' w '%s'"
-#: libsvn_wc/update_editor.c:923
+#: libsvn_wc/update_editor.c:963
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "Nie można skasować lokalnie zmodyfikowanego katalogu '%s'"
-#: libsvn_wc/update_editor.c:997
+#: libsvn_wc/update_editor.c:1037
#, c-format
msgid "Error writing log file for '%s'"
msgstr "Błąd w trakcie zapisu do pliku logu dla '%s'"
-#: libsvn_wc/update_editor.c:1101
+#: libsvn_wc/update_editor.c:1144
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': a non-directory object of the same name "
"already exists"
msgstr "Błąd dodawania katalogu '%s': obiekt o tej samej nazwie już istnieje"
-#: libsvn_wc/update_editor.c:1134
+#: libsvn_wc/update_editor.c:1177
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': an unversioned directory of the same name "
"already exists"
msgstr "Błąd dodawania katalogu '%s': obiekt o tej samej nazwie już istnieje"
-#: libsvn_wc/update_editor.c:1156
+#: libsvn_wc/update_editor.c:1199
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': a versioned directory of the same name already "
"exists"
msgstr "Błąd dodawania katalogu '%s': obiekt o tej samej nazwie już istnieje"
-#: libsvn_wc/update_editor.c:1167
+#: libsvn_wc/update_editor.c:1210
#, c-format
msgid ""
"Failed to add directory '%s': object of the same name as the administrative "
@@ -5419,18 +5490,18 @@
"Błąd dodawania katalogu '%s': tą samą nazwę nosi katalog\n"
"administracyjny"
-#: libsvn_wc/update_editor.c:1181
+#: libsvn_wc/update_editor.c:1224
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr ""
"Błąd dodawania katalogu '%s': parametry copyfrom nie są jeszcze\n"
"obsługiwane"
-#: libsvn_wc/update_editor.c:1435
+#: libsvn_wc/update_editor.c:1521
msgid "Couldn't do property merge"
msgstr "Nie udało się łączenie zmian atrybutu"
-#: libsvn_wc/update_editor.c:1505
+#: libsvn_wc/update_editor.c:1590
#, c-format
msgid ""
"Failed to mark '%s' absent: item of the same name is already scheduled for "
@@ -5439,7 +5510,7 @@
"Nie udało się oznaczanie '%s' jako brakującego: element o tej samej\n"
"nazwie oczekuje na dodanie"
-#: libsvn_wc/update_editor.c:1605
+#: libsvn_wc/update_editor.c:1690
#, fuzzy, c-format
msgid ""
"Failed to add file '%s': a file of the same name is already scheduled for "
@@ -5448,67 +5519,75 @@
"Błąd dodawania pliku '%s': obiekt o tej samej nazwie już oczekuje na\n"
"dodanie"
-#: libsvn_wc/update_editor.c:1617
+#: libsvn_wc/update_editor.c:1702
#, fuzzy, c-format
msgid ""
"Failed to add file '%s': a non-file object of the same name already exists"
msgstr "Błąd dodawania pliku '%s': obiekt o tej samej nazwie już istnieje"
-#: libsvn_wc/update_editor.c:1632
+#: libsvn_wc/update_editor.c:1717
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr "Błąd dodawania pliku '%s': obiekt o tej samej nazwie już istnieje"
-#: libsvn_wc/update_editor.c:1649
+#: libsvn_wc/update_editor.c:1734
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "Plik '%s' w katalogu '%s' nie podlega zarządzaniu wersjami"
-#: libsvn_wc/update_editor.c:1767
+#: libsvn_wc/update_editor.c:1883
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Błąd sumy kontrolnej dla '%s'; zapisana: '%s', faktyczna: '%s'<"
-#: libsvn_wc/update_editor.c:2995
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "Brak informacji o pochodzeniu '%s'"
-#: libsvn_wc/update_editor.c:3158
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Źródłowy URL '%s' jest z innego repozytorium niż '%s'"
-#: libsvn_wc/util.c:83
+#: libsvn_wc/util.c:84
msgid "Unable to make any directories"
msgstr "Nieudane tworzenie jakichkolwiek katalogów"
-#: svn/blame-cmd.c:234 svn/list-cmd.c:252
+#: svn/blame-cmd.c:206 svn/list-cmd.c:227
msgid "'verbose' option invalid in XML mode"
msgstr "Opcja 'verbose' nie jest prawidłową opcją dla trybu XML"
-#: svn/blame-cmd.c:246 svn/info-cmd.c:507 svn/list-cmd.c:264
-#: svn/status-cmd.c:268
+#: svn/blame-cmd.c:218 svn/info-cmd.c:511 svn/list-cmd.c:239
+#: svn/status-cmd.c:249
msgid "'incremental' option only valid in XML mode"
msgstr "Opcja 'incremental' jest prawidłowa tylko w trybie XML"
-#: svn/blame-cmd.c:313
+#: svn/blame-cmd.c:280
#, c-format
msgid "Skipping binary file: '%s'\n"
msgstr "Pomijanie binarnego pliku: '%s'\n"
-#: svn/checkout-cmd.c:129 svn/switch-cmd.c:127
+#: svn/changelist-cmd.c:61 svn/info-cmd.c:477 svn/log-cmd.c:410
+#: svn/revert-cmd.c:58
+#, fuzzy, c-format
+msgid "no such changelist '%s'"
+msgstr "Nie ma takiego obiektu: '%s'"
+
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "'%s' nie wygląda na URL"
-#: svn/copy-cmd.c:126 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66
-#: svn/propedit-cmd.c:200
-msgid "Local, non-commit operations do not take a log message"
+#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66 svn/move-cmd.c:76
+#: svn/propedit-cmd.c:201
+#, fuzzy
+msgid ""
+"Local, non-commit operations do not take a log message or revision properties"
msgstr ""
"Operacje, które nie są zatwierdzaniem wersji nie wymagają podawania opisu"
-#: svn/diff-cmd.c:117 svnserve/main.c:523
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "Błąd otwarcia standardowego wyjścia"
@@ -5530,7 +5609,7 @@
"Listy plików do porównania nie mogą zawierać jednocześnie ścieżek\n"
"z kopii roboczej i URLi"
-#: svn/export-cmd.c:84
+#: svn/export-cmd.c:87
msgid ""
"Destination directory exists; please remove the directory or use --force to "
"overwrite"
@@ -5573,7 +5652,7 @@
"Subversion jest narzędziem zarządzania wersjami.\n"
"Szczegółowe informacje - patrz http://subversion.tigris.org/\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1296
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -5594,158 +5673,179 @@
msgid "Invalid URL '%s'"
msgstr "Niewłaściwy URL '%s'"
-#: svn/info-cmd.c:111
+#: svn/info-cmd.c:88
#, fuzzy, c-format
msgid "'%s' has invalid revision"
msgstr "Obiekt '%s' jest nieznanego rodzaju"
-#: svn/info-cmd.c:267 svnadmin/main.c:1116
+#: svn/info-cmd.c:250 svnadmin/main.c:1118
#, c-format
msgid "Path: %s\n"
msgstr "Ścieżka: %s\n"
-#: svn/info-cmd.c:273 svnlook/main.c:734
+#: svn/info-cmd.c:256 svnlook/main.c:738
#, c-format
msgid "Name: %s\n"
msgstr "Nazwa: %s\n"
-#: svn/info-cmd.c:277
+#: svn/info-cmd.c:260
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: svn/info-cmd.c:280
+#: svn/info-cmd.c:263
#, c-format
msgid "Repository Root: %s\n"
msgstr "Katalog główny repozytorium: %s\n"
-#: svn/info-cmd.c:284
+#: svn/info-cmd.c:267
#, c-format
msgid "Repository UUID: %s\n"
msgstr "UUID repozytorium: %s\n"
-#: svn/info-cmd.c:288
+#: svn/info-cmd.c:271
#, c-format
msgid "Revision: %ld\n"
msgstr "Wersja: %ld\n"
-#: svn/info-cmd.c:293
+#: svn/info-cmd.c:276
#, c-format
msgid "Node Kind: file\n"
msgstr "Rodzaj obiektu: plik\n"
-#: svn/info-cmd.c:297
+#: svn/info-cmd.c:280
#, c-format
msgid "Node Kind: directory\n"
msgstr "Rodzaj obiektu: katalog\n"
-#: svn/info-cmd.c:301
+#: svn/info-cmd.c:284
#, c-format
msgid "Node Kind: none\n"
msgstr "Rodzaj obiektu: brak\n"
-#: svn/info-cmd.c:306
+#: svn/info-cmd.c:289
#, c-format
msgid "Node Kind: unknown\n"
msgstr "Rodzaj obiektu: nieznany\n"
-#: svn/info-cmd.c:315
+#: svn/info-cmd.c:298
#, c-format
msgid "Schedule: normal\n"
msgstr "Zlecenie: normalne\n"
-#: svn/info-cmd.c:319
+#: svn/info-cmd.c:302
#, c-format
msgid "Schedule: add\n"
msgstr "Zlecenie: dodaj\n"
-#: svn/info-cmd.c:323
+#: svn/info-cmd.c:306
#, c-format
msgid "Schedule: delete\n"
msgstr "Zlecenie: skasuj\n"
-#: svn/info-cmd.c:327
+#: svn/info-cmd.c:310
#, c-format
msgid "Schedule: replace\n"
msgstr "Zlecenie: zastąp\n"
-#: svn/info-cmd.c:335
+#: svn/info-cmd.c:326
+#, c-format
+msgid "Depth: empty\n"
+msgstr ""
+
+#: svn/info-cmd.c:330
+#, c-format
+msgid "Depth: files\n"
+msgstr ""
+
+#: svn/info-cmd.c:334
+#, c-format
+msgid "Depth: immediates\n"
+msgstr ""
+
+#. Other depths should never happen here.
+#: svn/info-cmd.c:345
+#, c-format
+msgid "Depth: INVALID\n"
+msgstr ""
+
+#: svn/info-cmd.c:349
#, c-format
msgid "Copied From URL: %s\n"
msgstr "Skopiowane z URL: %s\n"
-#: svn/info-cmd.c:339
+#: svn/info-cmd.c:353
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "Skopiowane z wersji: %ld\n"
-#: svn/info-cmd.c:344
+#: svn/info-cmd.c:358
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "Autor ostatniej zmiany: %s\n"
-#: svn/info-cmd.c:348
+#: svn/info-cmd.c:362
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "Ostatnia zmiana w wersji: %ld\n"
-#: svn/info-cmd.c:353
+#: svn/info-cmd.c:367
msgid "Last Changed Date"
msgstr "Data ostatniej zmiany"
-#: svn/info-cmd.c:359
+#: svn/info-cmd.c:373
msgid "Text Last Updated"
msgstr "Treść ostatnio aktualizowana"
-#: svn/info-cmd.c:363
+#: svn/info-cmd.c:377
msgid "Properties Last Updated"
msgstr "Atrybuty ostatnio aktualizowane"
-#: svn/info-cmd.c:366
+#: svn/info-cmd.c:380
#, c-format
msgid "Checksum: %s\n"
msgstr "Suma kontrolna: %s\n"
-#: svn/info-cmd.c:371
+#: svn/info-cmd.c:385
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "Wersja bazowa pliku w chwili wystąpienia konfliktu: %s\n"
-#: svn/info-cmd.c:377
+#: svn/info-cmd.c:391
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "Wersja robocza pliku w chwili wystąpienia konfliktu: %s\n"
-#: svn/info-cmd.c:382
+#: svn/info-cmd.c:396
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr ""
"Wersja bieżąca (repozytorium) pliku w chwili wystąpienia konfliktu: %s\n"
-#: svn/info-cmd.c:387
+#: svn/info-cmd.c:401
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "Plik z opisem konfliktu atrybutów: %s\n"
-#: svn/info-cmd.c:395
+#: svn/info-cmd.c:409
#, c-format
msgid "Lock Token: %s\n"
msgstr "Żeton blokady: %s\n"
-#: svn/info-cmd.c:399
+#: svn/info-cmd.c:413
#, c-format
msgid "Lock Owner: %s\n"
msgstr "Właściciel blokady: %s\n"
-#: svn/info-cmd.c:404
+#: svn/info-cmd.c:418
msgid "Lock Created"
msgstr "Blokada została utworzona"
-#: svn/info-cmd.c:408
+#: svn/info-cmd.c:422
msgid "Lock Expires"
msgstr "Blokada wygasła"
-#: svn/info-cmd.c:417
+#: svn/info-cmd.c:431
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -5754,7 +5854,7 @@
"Opis blokady (%i linii):\n"
"%s\n"
-#: svn/info-cmd.c:418
+#: svn/info-cmd.c:432
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -5763,17 +5863,12 @@
"Opis blokady (%i linia):\n"
"%s\n"
-#: svn/info-cmd.c:425
+#: svn/info-cmd.c:439
#, fuzzy, c-format
msgid "Changelist: %s\n"
msgstr "Suma kontrolna: %s\n"
-#: svn/info-cmd.c:477 svn/revert-cmd.c:59
-#, fuzzy, c-format
-msgid "no such changelist '%s'"
-msgstr "Nie ma takiego obiektu: '%s'"
-
-#: svn/info-cmd.c:539
+#: svn/info-cmd.c:547
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
@@ -5782,7 +5877,7 @@
"%s: (nie podlega zarządzaniu wersjami)\n"
"\n"
-#: svn/info-cmd.c:548
+#: svn/info-cmd.c:556
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -5811,13 +5906,13 @@
msgid " (from %s:%ld)"
msgstr " (z %s:%ld)"
-#: svn/log-cmd.c:450
+#: svn/log-cmd.c:475
msgid "When specifying working copy paths, only one target may be given"
msgstr ""
"Przy podawaniu ścieżek kopii roboczych, tylko jeden argument może \n"
"zostać podany"
-#: svn/log-cmd.c:462
+#: svn/log-cmd.c:487
msgid "Only relative paths can be specified after a URL"
msgstr "Po podaniu URLa mogą występować tylko względne ścieżki"
@@ -5831,7 +5926,7 @@
#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:230 svnadmin/main.c:233
#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
-#: svnlook/main.c:93 svnsync/main.c:104 svnsync/main.c:106
+#: svnlook/main.c:102 svnsync/main.c:135 svnsync/main.c:137
msgid "show help on a subcommand"
msgstr "wyświetl tekst pomocy dla polecenia"
@@ -5845,12 +5940,12 @@
msgstr "wypisuj jak najmniej informacji"
#: svn/main.c:67
-msgid "descend recursively"
-msgstr "przetwarzaj katalogi wraz z podkatalogami"
+msgid "descend recursively, same as --depth=infinity"
+msgstr ""
#: svn/main.c:68
-msgid "operate on single directory only"
-msgstr "działaj tylko w jednym katalogu, bez podkatalogów"
+msgid "obsolete; try --depth=files or --depth=immediates"
+msgstr ""
#: svn/main.c:70
msgid ""
@@ -5898,7 +5993,7 @@
msgstr "zakładaj iż parametry są podane w kodowaniu ARG"
#: svn/main.c:92 svnadmin/main.c:236 svndumpfilter/main.c:786
-#: svnlook/main.c:96 svnserve/main.c:150 svnsync/main.c:102
+#: svnlook/main.c:129 svnserve/main.c:151 svnsync/main.c:133
#: svnversion/main.c:125
#, fuzzy
msgid "show program version information"
@@ -5912,11 +6007,11 @@
msgid "display update information"
msgstr "podaj informacje o możliwych aktualizacjach"
-#: svn/main.c:96 svnsync/main.c:96
+#: svn/main.c:96
msgid "specify a username ARG"
msgstr "użyj ARG jako nazwy użytkownika"
-#: svn/main.c:98 svnsync/main.c:98
+#: svn/main.c:98
msgid "specify a password ARG"
msgstr "użyj ARG jako hasła"
@@ -5946,95 +6041,106 @@
msgid "pass contents of file ARG as additional args"
msgstr "potraktuj zawartość pliku ARG jako dodatkowe parametry"
-#: svn/main.c:131
+#: svn/main.c:132
+msgid ""
+"pass depth ('empty', 'files', 'immediates', or\n"
+" 'infinity') as ARG"
+msgstr ""
+
+#: svn/main.c:135
msgid "output in XML"
msgstr "generuj wynik w formacie XML"
-#: svn/main.c:132
+#: svn/main.c:136
msgid "use strict semantics"
msgstr "używaj ścisłej semantyki"
-#: svn/main.c:134
+#: svn/main.c:138
msgid "do not cross copies while traversing history"
msgstr "prezentuj tylko historię od ostatniego kopiowania"
-#: svn/main.c:136
+#: svn/main.c:140
msgid "disregard default and svn:ignore property ignores"
msgstr ""
"nie pomijaj plików zwykle ignorowanych (ze względu na domyślne\n"
"ustawienia, lub atrybut svn:ignore)"
-#: svn/main.c:138 svnsync/main.c:94
+#: svn/main.c:142 svnsync/main.c:113
msgid "do not cache authentication tokens"
msgstr "nie zapamiętuj danych uwierzytelniających"
-#: svn/main.c:140 svnsync/main.c:92
+#: svn/main.c:144 svnsync/main.c:111
msgid "do no interactive prompting"
msgstr "nie zadawaj żadnych interaktywnych pytań"
-#: svn/main.c:142
+#: svn/main.c:146
msgid "try operation but make no changes"
msgstr ""
"próbne wykonanie - zasymuluj wykonanie operacji ale nie zapisuj\n"
"żadnych zmian"
-#: svn/main.c:144 svnlook/main.c:111
+#: svn/main.c:148 svnlook/main.c:108
msgid "do not print differences for deleted files"
msgstr "nie wypisuj zmian w plikach, które zostały skasowane"
-#: svn/main.c:146
+#: svn/main.c:150
msgid "notice ancestry when calculating differences"
msgstr "uwzględniaj pochodzenie przy wyliczaniu różnic"
-#: svn/main.c:148
+#: svn/main.c:152
msgid "ignore ancestry when calculating merges"
msgstr "nie uwzględniaj pochodzenia przy wyliczaniu zmian do dołączenia"
-#: svn/main.c:150
+#: svn/main.c:154
msgid "ignore externals definitions"
msgstr "nie uwzględniaj zewnętrznych definicji"
-#: svn/main.c:153
+#: svn/main.c:157
msgid "use ARG as diff command"
msgstr "użyj ARG jako polecenia diff (porównującego)"
-#: svn/main.c:155
+#: svn/main.c:159
msgid "use ARG as merge command"
msgstr "użyj ARG jako polecenia merge (łączącego)"
-#: svn/main.c:157
+#: svn/main.c:161
msgid "use ARG as external editor"
msgstr "użyj ARG jako polecenia uruchamiającego edytor tekstu"
-#: svn/main.c:160
-msgid "use ARG as the older target"
-msgstr "użyj ARG jako starszego obiektu"
-
-#: svn/main.c:162
-msgid "use ARG as the newer target"
-msgstr "użyj ARG jako nowszego obiektu"
-
#: svn/main.c:164
-msgid "operate on a revision property (use with -r)"
+#, fuzzy
+msgid "mark revisions as merged (use with -r)"
msgstr "działaj na atrybucie wersji (do użycia wraz z -r)"
#: svn/main.c:166
+msgid "use ARG as the older target"
+msgstr "użyj ARG jako starszego obiektu"
+
+#: svn/main.c:168
+msgid "use ARG as the newer target"
+msgstr "użyj ARG jako nowszego obiektu"
+
+#: svn/main.c:170
+msgid "operate on a revision property (use with -r)"
+msgstr "działaj na atrybucie wersji (do użycia wraz z -r)"
+
+#: svn/main.c:172
msgid "relocate via URL-rewriting"
msgstr "zmień URL repozytorium"
-#: svn/main.c:168 svnadmin/main.c:272 svnsync/main.c:100
+#: svn/main.c:174 svnadmin/main.c:272 svnsync/main.c:131
msgid "read user configuration files from directory ARG"
msgstr "pobierz konfigurację użytkownika z katalogu ARG"
-#: svn/main.c:170
+#: svn/main.c:176
msgid "enable automatic properties"
msgstr "używaj automatycznych atrybutów"
-#: svn/main.c:172
+#: svn/main.c:178
msgid "disable automatic properties"
msgstr "nie używaj automatycznych atrybutów"
-#: svn/main.c:174
+#: svn/main.c:180
#, fuzzy
msgid ""
"use a different EOL marker than the standard\n"
@@ -6047,36 +6153,42 @@
"svn:eol-style.\n"
" ARG może być jednym z 'LF', 'CR', 'CRLF'"
-#: svn/main.c:182
+#: svn/main.c:188
msgid "maximum number of log entries"
msgstr "maksymalna liczba wspisów log"
-#: svn/main.c:184
+#: svn/main.c:190
msgid "don't unlock the targets"
msgstr "nie usuwaj blokad dla obiektów"
-#: svn/main.c:186
+#: svn/main.c:192
msgid "show a summary of the results"
msgstr "podkaż podsumowanie wyników"
-#: svn/main.c:188
+#: svn/main.c:194
msgid "remove changelist association"
msgstr ""
-#: svn/main.c:190
+#: svn/main.c:196
msgid "operate only on members of changelist ARG"
msgstr ""
-#: svn/main.c:192
+#: svn/main.c:198
msgid "don't delete changelist after commit"
msgstr ""
-#: svn/main.c:194
+#: svn/main.c:200
#, fuzzy
msgid "keep path in working copy"
msgstr "Ścieżka nie wskazuje na plik w ramach kopii roboczej"
-#: svn/main.c:233
+#: svn/main.c:202
+msgid ""
+"set revision property ARG in new revision\n"
+" using the name=value format"
+msgstr ""
+
+#: svn/main.c:244
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -6087,7 +6199,7 @@
"następnym zatwierdzaniu.\n"
"Wykorzystanie: add ŚCIEŻKA...\n"
-#: svn/main.c:241
+#: svn/main.c:252
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -6105,7 +6217,7 @@
" Argument WERSJA określa, w której wersji OBIEKT będzie najpierw \n"
"sprawdzany.\n"
-#: svn/main.c:251
+#: svn/main.c:262
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -6119,14 +6231,14 @@
" Argument WERSJA jeśli został wyspecyfikowany oznacza on wersję OBIEKTU,\n"
"w której będzie najpierw sprawdzany.\n"
-#: svn/main.c:259
+#: svn/main.c:270
msgid ""
"Associate (or deassociate) local paths with changelist CLNAME.\n"
"usage: 1. changelist CLNAME TARGET...\n"
-" 2. changelist --clear TARGET...\n"
+" 2. changelist --remove TARGET...\n"
msgstr ""
-#: svn/main.c:265
+#: svn/main.c:277
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6151,7 +6263,7 @@
" to the obstructing path.\n"
msgstr ""
-#: svn/main.c:290
+#: svn/main.c:302
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6161,7 +6273,7 @@
"przerwane operacje itp.\n"
"Wykorzystanie: cleanup [ŚCIEŻKA...]\n"
-#: svn/main.c:297
+#: svn/main.c:309
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6181,7 +6293,7 @@
" polecenia zawiera zablokowane obiekty, to po udanej operacji \n"
" zatwierdzania blokady na tych obiektach będą zdjęte.\n"
-#: svn/main.c:305
+#: svn/main.c:317
#, fuzzy
msgid ""
"Send changes from your working copy to the repository.\n"
@@ -6203,7 +6315,7 @@
" polecenia zawiera zablokowane obiekty, to po udanej operacji \n"
" zatwierdzania blokady na tych obiektach będą zdjęte.\n"
-#: svn/main.c:320
+#: svn/main.c:332
#, fuzzy
msgid ""
"Duplicate something in working copy or repository, remembering history.\n"
@@ -6237,7 +6349,7 @@
" kopii roboczej; zapis często używany do tworzenia \n"
" odgałęzień i tagów.\n"
-#: svn/main.c:336
+#: svn/main.c:348
#, fuzzy
msgid ""
"Remove files and directories from version control.\n"
@@ -6269,7 +6381,7 @@
" repozytorium, przy czym operacja ta jest natychmiastowo\n"
" zatwierdzana.\n"
-#: svn/main.c:354
+#: svn/main.c:366
#, fuzzy
msgid ""
"Display the differences between two revisions or paths.\n"
@@ -6331,7 +6443,7 @@
" wprowadzone w kopii roboczej w stosunku do wersji pobranej z\n"
" repozytorium (zmiany do zatwierdzenia).\n"
-#: svn/main.c:384
+#: svn/main.c:396
#, fuzzy
msgid ""
"Create an unversioned copy of a tree.\n"
@@ -6375,7 +6487,7 @@
"rozpatrywana jako pierwsza.\n"
"\n"
-#: svn/main.c:407
+#: svn/main.c:419
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -6383,7 +6495,7 @@
"Opisz sposób używania tego programu lub jednego z jego poleceń.\n"
"Wykorzystanie: help [POLECENIE...]\n"
-#: svn/main.c:413
+#: svn/main.c:425
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -6404,7 +6516,7 @@
" jest katalogiem, to zawartość katalogu jest dodawana bezpośrednio za "
"URLem.\n"
-#: svn/main.c:426
+#: svn/main.c:438
#, fuzzy
msgid ""
"Display information about a local or remote item.\n"
@@ -6421,7 +6533,7 @@
" o '.' czyli katalogu bieżącym). Parametr OBIEKT może być albo\n"
" ścieżką katalogu roboczego albo URLem.\n"
-#: svn/main.c:436
+#: svn/main.c:449
#, fuzzy
msgid ""
"List directory entries in the repository.\n"
@@ -6460,7 +6572,7 @@
" informacji o ostatniej zmianie (numer wersji, autor, data i czas)\n"
" oraz o rozmiarze pliku (w bajtach).\n"
-#: svn/main.c:458
+#: svn/main.c:471
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -6475,17 +6587,17 @@
"Użyj opcji --force aby odebrać blokadę innemu użytkownikowi lub \n"
"ścieżce innej kopii roboczej.\n"
-#: svn/main.c:466
+#: svn/main.c:479
#, fuzzy
msgid "read lock comment from file ARG"
msgstr "pobieraj dane z pliku ARG"
-#: svn/main.c:467
+#: svn/main.c:480
#, fuzzy
msgid "specify lock comment ARG"
msgstr "użyj podanego tekstu jako opisu zmian"
-#: svn/main.c:470
+#: svn/main.c:483
#, fuzzy
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
@@ -6545,7 +6657,7 @@
" svn log http://www.example.com/repo/project/foo.c\n"
" svn log http://www.example.com/repo/project foo.c bar.c\n"
-#: svn/main.c:500
+#: svn/main.c:513
#, fuzzy
msgid ""
"Apply the differences between two sources to a working copy path.\n"
@@ -6598,7 +6710,7 @@
" który zgadza się też z nazwą pliku w katalogu '.' - w tym wypadku\n"
" zmiany zostaną naniesione w tym pliku.\n"
-#: svn/main.c:529
+#: svn/main.c:543
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -6629,7 +6741,7 @@
"\n"
" W obydwu wypadkach wszelkie nadrzędne katalogi muszą już istnieć.\n"
-#: svn/main.c:546
+#: svn/main.c:560
#, fuzzy
msgid ""
"Move and/or rename something in working copy or repository.\n"
@@ -6663,7 +6775,7 @@
"\n"
"\n"
-#: svn/main.c:563
+#: svn/main.c:577
#, fuzzy
msgid ""
"Remove a property from files, dirs, or revisions.\n"
@@ -6683,7 +6795,7 @@
" kopii roboczej.\n"
" 2. Usuwany jest - z repozytorium - atrybut wersji.\n"
-#: svn/main.c:575
+#: svn/main.c:589
#, fuzzy
msgid ""
"Edit a property with an external editor.\n"
@@ -6704,7 +6816,7 @@
"\n"
" 2. Modyfikacji - w repozytorium - podlega atrybut wersji.\n"
-#: svn/main.c:588
+#: svn/main.c:602
#, fuzzy
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
@@ -6742,7 +6854,7 @@
" (jest użyteczna np. gdy kopiujemy wartość binarnego atrybutu do\n"
" pliku).\n"
-#: svn/main.c:607
+#: svn/main.c:621
#, fuzzy
msgid ""
"List all properties on files, dirs, or revisions.\n"
@@ -6766,7 +6878,7 @@
"\n"
" 2. Wypisz niewersjonowane atrybuty dla podanej wersji repozytorium.\n"
-#: svn/main.c:619
+#: svn/main.c:633
#, fuzzy
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
@@ -6862,12 +6974,12 @@
" a uruchomienie z opcją --recursive spowoduje ustawienie atrybutu dla \n"
" wszystkich plików w tym katalogu.\n"
-#: svn/main.c:661
+#: svn/main.c:675
#, fuzzy
msgid "read property value from file ARG"
msgstr "pobieraj dane z pliku ARG"
-#: svn/main.c:664
+#: svn/main.c:678
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -6885,7 +6997,7 @@
" możliwość zatwierdzenia zmian. Powinno być używane po ręcznym\n"
" rozwikłaniu konfliktu.\n"
-#: svn/main.c:673
+#: svn/main.c:688
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -6901,7 +7013,7 @@
" Do działania nie wymaga dostępu do sieci, automatycznie rozwiązuje\n"
" wszelkie konflikty.\n"
-#: svn/main.c:682
+#: svn/main.c:697
#, fuzzy
msgid ""
"Print the status of working copy files and directories.\n"
@@ -7060,7 +7172,7 @@
" 965 687 joe wc/zig.c\n"
" Head revision: 981\n"
-#: svn/main.c:758
+#: svn/main.c:773
#, fuzzy
msgid ""
"Update the working copy to a different URL.\n"
@@ -7102,7 +7214,7 @@
" (np. zmienia się sposób dostępu albo nazwa maszyny) ale kopia\n"
" robocza nadal odpowiada temu samemu katalogowi w repozytorium.\n"
-#: svn/main.c:785
+#: svn/main.c:801
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -7114,7 +7226,7 @@
"\n"
"Użyj opcji --force aby zerwać blokadę.\n"
-#: svn/main.c:793
+#: svn/main.c:809
#, fuzzy
msgid ""
"Bring changes from the repository into the working copy.\n"
@@ -7172,20 +7284,25 @@
" zmianach w jego atrybutach. Litera 'B' w trzeciej kolumnie oznacza,\n"
" że żeton blokady tego pliku został albo uszkodzony albo wykradziony.\n"
-#: svn/main.c:869 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
+#: svn/main.c:885 svnadmin/main.c:78 svnlook/main.c:289 svnsync/main.c:180
msgid "Caught signal"
msgstr "Złapano sygnał"
-#: svn/main.c:981
+#: svn/main.c:904
+#, fuzzy
+msgid "Revision property pair is empty"
+msgstr "Wpis w Revision nie jest listą"
+
+#: svn/main.c:1034
msgid "Non-numeric limit argument given"
msgstr "Podano nienumeryczny argument określający limit"
-#: svn/main.c:987
+#: svn/main.c:1040
#, fuzzy
msgid "Argument to --limit must be positive"
msgstr "Argument dla -c musi być dodatni"
-#: svn/main.c:1007
+#: svn/main.c:1060
#, fuzzy
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
@@ -7193,21 +7310,21 @@
msgstr ""
"Wielokrotnie podano opcję numeru wersji; spróbuj '-r M:N' zamiast '-r M -r N'"
-#: svn/main.c:1015 svn/main.c:1206
+#: svn/main.c:1068 svn/main.c:1290
msgid "Can't specify -c with --old"
msgstr "Nie można wyspecyfikować opcji -c wraz z opcją --old"
-#: svn/main.c:1022
+#: svn/main.c:1075
#, fuzzy
msgid "Non-numeric change argument given to -c"
msgstr "Podano nienumeryczny argument określający limit"
-#: svn/main.c:1028
+#: svn/main.c:1081
#, fuzzy
msgid "There is no change 0"
msgstr "tworzenie zmiany"
-#: svn/main.c:1055
+#: svn/main.c:1108
#, fuzzy
msgid ""
"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
@@ -7215,32 +7332,42 @@
msgstr ""
"Wielokrotnie podano opcję numeru wersji; spróbuj '-r M:N' zamiast '-r M -r N'"
-#: svn/main.c:1068 svnadmin/main.c:1314
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Błąd składniowy w numerze wersji '%s'"
-#: svn/main.c:1222 svn/main.c:1232
+#: svn/main.c:1194
+#, c-format
+msgid "Error converting depth from locale to UTF8"
+msgstr ""
+
+#: svn/main.c:1214
+#, fuzzy, c-format
+msgid "'%s' is not a valid depth; try 0, 1, or 2"
+msgstr "'%s' nie jest ani nazwą pliku ani katalogu"
+
+#: svn/main.c:1306 svn/main.c:1316
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "Opcje --auto-props i --no-auto-props nie mogą występować równocześnie"
-#: svn/main.c:1248
+#: svn/main.c:1332
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Błąd składniowy w nazwie native-eol '%s'"
-#: svn/main.c:1324 svndumpfilter/main.c:1207 svnlook/main.c:2048
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "Polecenie wymaga podania parametru\n"
-#: svn/main.c:1343 svnadmin/main.c:1443 svndumpfilter/main.c:1226
-#: svnlook/main.c:2067
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
+#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Nieznane polecenie: '%s'\n"
-#: svn/main.c:1376
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7249,19 +7376,19 @@
"Polecenie '%s' nie obsługuje opcji '%s'.\n"
"Użyj 'svn help %s' by otrzymać informacje o sposobie jego używania.\n"
-#: svn/main.c:1413
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"Plik z opisem zmian jest plikiem podlegającym zarządzaniu wersjami;\n"
"użyj '--force-log' by wymusić jego użycie."
-#: svn/main.c:1420
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"Plik z opisem blokady jest plikiem podlegającym zarządzaniu wersjami;\n"
"użyj '--force-log' by wymusić jego użycie."
-#: svn/main.c:1440
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7269,7 +7396,7 @@
"Opis zmian jest ścieżką (chciano użyć -F?); użyj --force-log by\n"
"wymusić użycie takiego opisu "
-#: svn/main.c:1447
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7277,12 +7404,12 @@
"Opis blokady jest ścieżką (chciano użyć -F?); użyj --force-log by\n"
"wymusić użycie takiego opisu"
-#: svn/main.c:1570
+#: svn/main.c:1668
#, fuzzy
msgid "Try 'svn help' for more info"
msgstr "Użyj '%s help' by otrzymać podstawowe instrukcje.\n"
-#: svn/main.c:1580
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -7303,7 +7430,7 @@
msgid "A working copy merge source needs an explicit revision"
msgstr "Użycie kopii roboczej jako źródła dla dołączania wymaga podania wersji"
-#: svn/mkdir-cmd.c:84
+#: svn/mkdir-cmd.c:87
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "Zamiast tego spróbuj wykonać 'svn add' lub 'svn add --non-recursive'."
@@ -7472,13 +7599,13 @@
#: svn/notify.c:394
#, fuzzy, c-format
-msgid "Path '%s' is now part of changelist '%s'.\n"
+msgid "Path '%s' is now a member of changelist '%s'.\n"
msgstr "Ścieżka '%s' nie jest plikiem"
-#: svn/notify.c:401
-#, c-format
-msgid "Path '%s' is no longer associated with a changelist.\n"
-msgstr ""
+#: svn/notify.c:402
+#, fuzzy, c-format
+msgid "Path '%s' is no longer a member of a changelist.\n"
+msgstr "Ścieżka '%s' nie jest plikiem"
#: svn/propdel-cmd.c:77
#, c-format
@@ -7490,12 +7617,12 @@
msgid "Cannot specify revision for deleting versioned property '%s'"
msgstr "Nie można określić wersji dla usunięcia atrybutu '%s'"
-#: svn/propdel-cmd.c:116
+#: svn/propdel-cmd.c:124
#, c-format
msgid "property '%s' deleted (recursively) from '%s'.\n"
msgstr "atrybut '%s' rekursywnie usunięty z '%s'.\n"
-#: svn/propdel-cmd.c:117
+#: svn/propdel-cmd.c:125
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "atrybut '%s' usunięty z '%s'.\n"
@@ -7505,7 +7632,7 @@
msgid "'%s' is not a valid Subversion property name"
msgstr "'%s' nie jest ani nazwą pliku ani katalogu"
-#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:241 svn/propset-cmd.c:85
+#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:243 svn/propset-cmd.c:85
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr "Nieprawidłowe kodowanie: wartość atrybutu nie jest w UTF8"
@@ -7524,48 +7651,48 @@
msgid "Cannot specify revision for editing versioned property '%s'"
msgstr "Nie można określić wersji dla edycji atrybutu '%s'"
-#: svn/propedit-cmd.c:154 svn/propset-cmd.c:158
+#: svn/propedit-cmd.c:154 svn/propset-cmd.c:161
msgid "Explicit target argument required"
msgstr "Parametr podający obiekt docelowy jest wymagany"
-#: svn/propedit-cmd.c:211 svn/switch-cmd.c:140
+#: svn/propedit-cmd.c:213 svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "'%s' nie wygląda na ścieżkę kopii roboczej"
-#: svn/propedit-cmd.c:264
+#: svn/propedit-cmd.c:268
#, c-format
msgid "Set new value for property '%s' on '%s'\n"
msgstr "Ustaw nową wartość atrybutu '%s' dla '%s'\n"
-#: svn/propedit-cmd.c:274
+#: svn/propedit-cmd.c:278
#, c-format
msgid "No changes to property '%s' on '%s'\n"
msgstr "Bez zmian atrybutu %s dla '%s'\n"
-#: svn/proplist-cmd.c:71
-#, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "Atrybuty nie podlegające zarządzaniu wersjami w wersji %ld:\n"
-
-#: svn/proplist-cmd.c:119
+#: svn/proplist-cmd.c:95
#, fuzzy, c-format
msgid "Properties on '%s':\n"
msgstr "atrybut '%s' ustawiony dla '%s'\n"
-#: svn/props.c:51
+#: svn/proplist-cmd.c:156
+#, c-format
+msgid "Unversioned properties on revision %ld:\n"
+msgstr "Atrybuty nie podlegające zarządzaniu wersjami w wersji %ld:\n"
+
+#: svn/props.c:53
#, fuzzy
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
msgstr "W trakcie obsługi atrybutów wersji, wersja musi być podana explicite"
-#: svn/props.c:58
+#: svn/props.c:60
#, fuzzy
msgid "Wrong number of targets specified"
msgstr "Podano niewłaściwą ilość ścieżek"
-#: svn/props.c:67
+#: svn/props.c:69
msgid "Either a URL or versioned item is required"
msgstr "Wymagane podanie URL lub obiektu"
@@ -7579,26 +7706,26 @@
msgid "Cannot specify revision for setting versioned property '%s'"
msgstr "Nie można określić wersji dla ustawienia atrybutu '%s'"
-#: svn/propset-cmd.c:151
+#: svn/propset-cmd.c:154
#, c-format
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr "Wymagane podanie obiektu docelowego ('%s' jako wartość atrybutu)"
-#: svn/propset-cmd.c:184
+#: svn/propset-cmd.c:191
#, c-format
msgid "property '%s' set (recursively) on '%s'\n"
msgstr "atrybut '%s' ustawiony rekursywnie dla '%s'\n"
-#: svn/propset-cmd.c:185
+#: svn/propset-cmd.c:192
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "atrybut '%s' ustawiony dla '%s'\n"
-#: svn/revert-cmd.c:86
+#: svn/revert-cmd.c:93
msgid "Try 'svn revert --recursive' instead?"
msgstr "Zamiast tego spróbuj wykonać 'svn revert --recursive'."
-#: svn/status-cmd.c:317
+#: svn/status-cmd.c:298
#, c-format
msgid ""
"\n"
@@ -7615,7 +7742,7 @@
msgid "'%s' to '%s' is not a valid relocation"
msgstr "'%s' do '%s' nie jest prawidłowym przeniesieniem"
-#: svn/util.c:60
+#: svn/util.c:61
#, c-format
msgid ""
"\n"
@@ -7624,14 +7751,21 @@
"\n"
"Zatwierdzona wersja %ld.\n"
-#: svn/util.c:68
+#: svn/util.c:69
#, fuzzy, c-format
msgid ""
"\n"
"Warning: %s\n"
msgstr "%sostrzeżenie: %s\n"
-#: svn/util.c:136
+#: svn/util.c:145
+msgid ""
+"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
+"time configuration option is empty or consists solely of whitespace. "
+"Expected a shell command."
+msgstr ""
+
+#: svn/util.c:152
msgid ""
"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
"no 'editor-cmd' run-time configuration option was found"
@@ -7639,52 +7773,52 @@
"Nie zdefiniowano żadnej spośród zmiennych środowiskowych SVN_EDITOR, VISUAL "
"ani EDITOR, nie zdefiniowano też opcji konfiguracyjnej 'editor-cmd'"
-#: svn/util.c:162
+#: svn/util.c:178
#, c-format
msgid "Can't get working directory"
msgstr "Nie można ustalić katalogu bieżącego"
-#: svn/util.c:173 svn/util.c:196
+#: svn/util.c:189 svn/util.c:212
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "Nie można zmienić katalogu bieżącego na '%s'"
-#: svn/util.c:221
+#: svn/util.c:237
#, c-format
msgid "Can't write to '%s'"
msgstr "Nie można pisać do '%s'"
-#: svn/util.c:266
+#: svn/util.c:282
#, c-format
msgid "system('%s') returned %d"
msgstr "Polecenie system('%s') zwróciło %d"
-#: svn/util.c:307
+#: svn/util.c:323
msgid "Error normalizing edited contents to internal format"
msgstr ""
-#: svn/util.c:338
+#: svn/util.c:354
#, c-format
msgid "Can't restore working directory"
msgstr "Nie można odtworzyć katalogu bieżącego"
-#: svn/util.c:380
+#: svn/util.c:396
msgid "Log message contains a zero byte"
msgstr "Opis zmian zawiera bajt zerowy"
-#: svn/util.c:440
+#: svn/util.c:456
msgid "Your commit message was left in a temporary file:"
msgstr "Opis zmian pozostawiono w pliku tymczasowym:"
-#: svn/util.c:492
+#: svn/util.c:508
msgid "--This line, and those below, will be ignored--"
msgstr "--Ta linia i następne zostaną zignorowane--"
-#: svn/util.c:517
+#: svn/util.c:533
msgid "Error normalizing log message to internal format"
msgstr ""
-#: svn/util.c:532
+#: svn/util.c:548
#, fuzzy
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
@@ -7694,13 +7828,13 @@
"odpowiednio zmienną środowiskową SVN_EDITOR albo skorzystaj z odpowiedniej "
"spośród opcji: --message (-m) bądź --file (-F)"
-#: svn/util.c:618
+#: svn/util.c:634
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr ""
"Nie można wywołać edytora do wyświetlenia opisu zmian w trybie "
"nieinteraktywnym."
-#: svn/util.c:631
+#: svn/util.c:647
msgid ""
"Could not use external editor to fetch log message; consider setting the "
"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
@@ -7710,7 +7844,7 @@
"odpowiednio zmienną środowiskową SVN_EDITOR albo skorzystaj z odpowiedniej "
"spośród opcji: --message (-m) bądź --file (-F)"
-#: svn/util.c:667
+#: svn/util.c:683
msgid ""
"\n"
"Log message unchanged or not specified\n"
@@ -7720,7 +7854,7 @@
"Nie podano opisu zmian.\n"
"Przerwij (a), kontynuuj (c), edytuj (e)?\n"
-#: svn/util.c:720
+#: svn/util.c:736
msgid "Use --force to override this restriction"
msgstr "Użyj opcji --force aby obejść to ograniczenie"
@@ -7968,12 +8102,13 @@
"Wypisuje nazwy wszystkich nie zatwierdzonych transakcji.\n"
#: svnadmin/main.c:381
+#, fuzzy
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
-"Run the Berkeley DB recovery procedure on a repository. Do\n"
-"this if you've been getting errors indicating that recovery\n"
-"ought to be run. Recovery requires exclusive access and will\n"
+"Run the recovery procedure on a repository. Do this if you've\n"
+"been getting errors indicating that recovery ought to be run.\n"
+"Berkeley DB recovery requires exclusive access and will\n"
"exit if the repository is in use by another process.\n"
msgstr ""
"użycie: svnadmin recover KATALOG_REP\n"
@@ -8105,7 +8240,7 @@
"\n"
"Dostępne polecenia:\n"
-#: svnadmin/main.c:698 svnlook/main.c:1674 svnserve/main.c:204
+#: svnadmin/main.c:698 svnlook/main.c:1687 svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -8120,7 +8255,7 @@
"Uzyskano blokadę repozytorium.\n"
"Proszę czekać; odtwarzanie repozytorium może trwać długo...\n"
-#: svnadmin/main.c:810
+#: svnadmin/main.c:811
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -8128,13 +8263,13 @@
"Nie powiodło się założenie blokady na repozytorium; możliwe, że \n"
"procesy takie jak httpd, svnserver lub svn blokują dostęp."
-#: svnadmin/main.c:815
+#: svnadmin/main.c:816
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr ""
"Oczekiwanie na blokadę repozytorium; możliwe, że inny proces blokuje dostęp\n"
-#: svnadmin/main.c:822
+#: svnadmin/main.c:824
#, c-format
msgid ""
"\n"
@@ -8143,57 +8278,57 @@
"\n"
"Odtwarzanie zakończone.\n"
-#: svnadmin/main.c:829
+#: svnadmin/main.c:831
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "Najnowsza wersja repozytorium to %ld.\n"
-#: svnadmin/main.c:939
+#: svnadmin/main.c:941
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "Usunięto transakcję '%s'.\n"
-#: svnadmin/main.c:1007 svnadmin/main.c:1034
+#: svnadmin/main.c:1009 svnadmin/main.c:1036
#, c-format
msgid "Missing revision"
msgstr "Brak wersji"
-#: svnadmin/main.c:1010 svnadmin/main.c:1037
+#: svnadmin/main.c:1012 svnadmin/main.c:1039
#, c-format
msgid "Only one revision allowed"
msgstr "Tylko jedna wersja jest dozwolona"
-#: svnadmin/main.c:1016
+#: svnadmin/main.c:1018
#, fuzzy, c-format
msgid "Exactly one property name and one file argument required"
msgstr "Wymagany dokładnie jeden parametr - plik"
-#: svnadmin/main.c:1043
+#: svnadmin/main.c:1045
#, c-format
msgid "Exactly one file argument required"
msgstr "Wymagany dokładnie jeden parametr - plik"
-#: svnadmin/main.c:1117 svnlook/main.c:1739
+#: svnadmin/main.c:1119 svnlook/main.c:1752
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID żetonu: %s\n"
-#: svnadmin/main.c:1118 svnlook/main.c:1740
+#: svnadmin/main.c:1120 svnlook/main.c:1753
#, c-format
msgid "Owner: %s\n"
msgstr "Właściciel: %s\n"
-#: svnadmin/main.c:1119 svnlook/main.c:1741
+#: svnadmin/main.c:1121 svnlook/main.c:1754
#, c-format
msgid "Created: %s\n"
msgstr "Utworzone: %s\n"
-#: svnadmin/main.c:1120 svnlook/main.c:1742
+#: svnadmin/main.c:1122 svnlook/main.c:1755
#, c-format
msgid "Expires: %s\n"
msgstr "Wygasa: %s\n"
-#: svnadmin/main.c:1122
+#: svnadmin/main.c:1124
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8204,7 +8339,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1123
+#: svnadmin/main.c:1125
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8215,38 +8350,38 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1180
+#: svnadmin/main.c:1182
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "Ścieżka '%s' nie jest zablokowana.\n"
-#: svnadmin/main.c:1192
+#: svnadmin/main.c:1194
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "Zdjęto blokadę z '%s'.\n"
-#: svnadmin/main.c:1300
+#: svnadmin/main.c:1303
#, fuzzy
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Wielokrotnie podano opcję numeru wersji; spróbuj '-r M:N' zamiast '-r M -r N'"
-#: svnadmin/main.c:1425
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "polecenie wymaga parametrów\n"
-#: svnadmin/main.c:1510
-#, c-format
+#: svnadmin/main.c:1502
+#, fuzzy, c-format
msgid ""
-"subcommand '%s' doesn't accept option '%s'\n"
+"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnadmin help %s' for usage.\n"
msgstr ""
"polecenie '%s' nie obsługuje opcji '%s'\n"
"Użyj 'svnadmin help %s' by uzyskać więcej informacji..\n"
-#: svnadmin/main.c:1543
+#: svnadmin/main.c:1535
#, fuzzy
msgid "Try 'svnadmin help' for more info"
msgstr "Użyj 'svnversion --help' by otrzymać podstawowe instrukcje.\n"
@@ -8400,43 +8535,47 @@
msgid "Try 'svndumpfilter help' for more info"
msgstr ""
-#: svnlook/main.c:99
-msgid "specify revision number ARG"
-msgstr "podaj numer wersji"
-
-#: svnlook/main.c:102
-msgid "specify transaction name ARG"
-msgstr "podaje nazwę transakcji"
-
-#: svnlook/main.c:105
-msgid "be verbose"
-msgstr "podawaj informacje pomocnicze"
-
-#: svnlook/main.c:108
-msgid "show node revision ids for each path"
-msgstr "podawaj identyfikator węzła dla każdej ścieżki"
-
-#: svnlook/main.c:114
-msgid "do not print differences for added files"
-msgstr "nie wypisuj zmian dla dodanych plików"
-
-#: svnlook/main.c:117
-msgid "print differences against the copy source"
-msgstr "wypisuje zmiany wobec kopii źródłowej"
-
-#: svnlook/main.c:120
-msgid "operate on a revision property (use with -r or -t)"
-msgstr "działaj na atrybucie wersji (do użycia wraz z -r lub -t)"
-
-#: svnlook/main.c:123
-msgid "show full paths instead of indenting them"
-msgstr "pokaż pełne ścieżki zamiast stosować wcięcia"
-
-#: svnlook/main.c:126
+#: svnlook/main.c:93
msgid "show details for copies"
msgstr "pokaż szczegóły dla kopii"
-#: svnlook/main.c:138
+#: svnlook/main.c:96
+msgid "print differences against the copy source"
+msgstr "wypisuje zmiany wobec kopii źródłowej"
+
+#: svnlook/main.c:99
+msgid "show full paths instead of indenting them"
+msgstr "pokaż pełne ścieżki zamiast stosować wcięcia"
+
+#: svnlook/main.c:105
+msgid "do not print differences for added files"
+msgstr "nie wypisuj zmian dla dodanych plików"
+
+#: svnlook/main.c:111
+msgid "operate on single directory only"
+msgstr "działaj tylko w jednym katalogu, bez podkatalogów"
+
+#: svnlook/main.c:114
+msgid "specify revision number ARG"
+msgstr "podaj numer wersji"
+
+#: svnlook/main.c:117
+msgid "operate on a revision property (use with -r or -t)"
+msgstr "działaj na atrybucie wersji (do użycia wraz z -r lub -t)"
+
+#: svnlook/main.c:120
+msgid "show node revision ids for each path"
+msgstr "podawaj identyfikator węzła dla każdej ścieżki"
+
+#: svnlook/main.c:123
+msgid "specify transaction name ARG"
+msgstr "podaje nazwę transakcji"
+
+#: svnlook/main.c:126
+msgid "be verbose"
+msgstr "podawaj informacje pomocnicze"
+
+#: svnlook/main.c:141
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -8446,7 +8585,7 @@
"\n"
"Podaje autora.\n"
-#: svnlook/main.c:143
+#: svnlook/main.c:146
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -8457,7 +8596,7 @@
"Wypisuje treść podanego pliku. Wiodący '/' w ramach ŚCIEŻKI_DO_PLIKU\n"
"jest opcjonalny.\n"
-#: svnlook/main.c:148
+#: svnlook/main.c:151
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -8467,7 +8606,7 @@
"\n"
"Wypisuje ścieżki do obiektów, które zostały zmienione.\n"
-#: svnlook/main.c:153
+#: svnlook/main.c:156
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -8477,7 +8616,7 @@
"\n"
"Wypisuje datę.\n"
-#: svnlook/main.c:158
+#: svnlook/main.c:161
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -8487,7 +8626,7 @@
"\n"
"Wypisuje (w stylu GNU diff) informację o zmienionych plikach i atrybutach.\n"
-#: svnlook/main.c:164
+#: svnlook/main.c:167
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -8500,7 +8639,7 @@
"(zmiany atrybutów) bądź pośrednia (zmiany plików znajdujących się w\n"
"katalogu).\n"
-#: svnlook/main.c:170
+#: svnlook/main.c:173
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -8510,7 +8649,7 @@
"\n"
"Podaje informacje o używaniu tego programu lub jego poleceń.\n"
-#: svnlook/main.c:175
+#: svnlook/main.c:178
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8522,7 +8661,7 @@
"Podaje informacje o historii obiektu o podanej ścieżce w repozytorium\n"
"(przy braku parametru głównego katalogu repozytorium).\n"
-#: svnlook/main.c:181
+#: svnlook/main.c:184
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -8532,7 +8671,7 @@
"\n"
"Wypisuje autora, datę/czas, rozmiar opisu zmiany oraz opis zmiany.\n"
-#: svnlook/main.c:186
+#: svnlook/main.c:189
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -8543,7 +8682,7 @@
"Jeżeli blokada jest założona, podaje informacje o blokadzie \n"
"obiektu o podanej ścieżce w repozytorium.\n"
-#: svnlook/main.c:191
+#: svnlook/main.c:194
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -8553,7 +8692,7 @@
"\n"
"Wypisuje opis zmiany.\n"
-#: svnlook/main.c:196
+#: svnlook/main.c:199
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -8566,7 +8705,7 @@
"repozytorium.\n"
"Jeśli podano opcję --revprop wyświetla wartość wersjonowanego atrybutu.\n"
-#: svnlook/main.c:202
+#: svnlook/main.c:205
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8580,7 +8719,7 @@
"jeśli podano opcję --revprop, wyświetla wersjonowane atrybuty.\n"
"Gdy podano opcję -v, wypisuje także wartości atrybutów.\n"
-#: svnlook/main.c:209
+#: svnlook/main.c:212
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8593,7 +8732,7 @@
"ścieżki (gdy jej nie podano, zawartość całego repozytorium od głównego\n"
"katalogu począwszy), opcjonalnie podając także identyfikatory wersji.\n"
-#: svnlook/main.c:215
+#: svnlook/main.c:218
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -8603,7 +8742,7 @@
"\n"
"Wypisuje UUID repozytorium.\n"
-#: svnlook/main.c:220
+#: svnlook/main.c:223
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -8613,52 +8752,52 @@
"\n"
"Wypisuje numer najnowszej wersji obecnej w repozytorium.\n"
-#: svnlook/main.c:815
+#: svnlook/main.c:819
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Skopiowane: %s (z wersji %ld, %s)\n"
-#: svnlook/main.c:884
+#: svnlook/main.c:888
msgid "Added"
msgstr "Dodano"
-#: svnlook/main.c:885
+#: svnlook/main.c:889
msgid "Deleted"
msgstr "Usunięto"
-#: svnlook/main.c:886
+#: svnlook/main.c:890
msgid "Modified"
msgstr "Zmieniono"
-#: svnlook/main.c:887
+#: svnlook/main.c:891
msgid "Index"
msgstr "Indeks"
-#: svnlook/main.c:899
+#: svnlook/main.c:903
#, c-format
msgid "(Binary files differ)\n"
msgstr "(Binarne pliki różnią się)\n"
-#: svnlook/main.c:1028
+#: svnlook/main.c:1036
msgid "unknown"
msgstr "nieznany"
-#: svnlook/main.c:1171 svnlook/main.c:1264 svnlook/main.c:1293
+#: svnlook/main.c:1183 svnlook/main.c:1276 svnlook/main.c:1305
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "Transakcja '%s' nie jest oparta na wersji; dziwne"
-#: svnlook/main.c:1201
+#: svnlook/main.c:1213
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "'%s' jest URLem a prawdopodobnie powinien być ścieżką"
-#: svnlook/main.c:1228
+#: svnlook/main.c:1240
#, c-format
msgid "Path '%s' is not a file"
msgstr "Ścieżka '%s' nie jest plikiem"
-#: svnlook/main.c:1367
+#: svnlook/main.c:1379
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -8667,7 +8806,7 @@
" WERSJA ŚCIEŻKA<ID>\n"
"-------- -----------\n"
-#: svnlook/main.c:1372
+#: svnlook/main.c:1384
#, c-format
msgid ""
"REVISION PATH\n"
@@ -8676,27 +8815,27 @@
" WERSJA ŚCIEŻKA\n"
"-------- -------\n"
-#: svnlook/main.c:1419
+#: svnlook/main.c:1431
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Atrybutu '%s' nie znaleziono w wersji '%ld'"
-#: svnlook/main.c:1426
+#: svnlook/main.c:1438
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "Atrybutu '%s' nie znaleziono w ścieżce '%s' w wersji %ld"
-#: svnlook/main.c:1431
+#: svnlook/main.c:1443
#, fuzzy, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "Atrybutu '%s' nie znaleziono w ścieżce '%s' w wersji %ld"
-#: svnlook/main.c:1603 svnlook/main.c:1818
+#: svnlook/main.c:1616 svnlook/main.c:1831
#, c-format
msgid "Missing repository path argument"
msgstr "Brak parametru podającego ścieżkę w repozytorium"
-#: svnlook/main.c:1664
+#: svnlook/main.c:1677
#, fuzzy
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
@@ -8717,11 +8856,11 @@
"\n"
"Dostępne polecenia:\n"
-#: svnlook/main.c:1720
+#: svnlook/main.c:1733
msgid "Missing path argument"
msgstr "Brak parametru podającego ścieżkę"
-#: svnlook/main.c:1745
+#: svnlook/main.c:1758
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8730,7 +8869,7 @@
"Komentarz (%i linie):\n"
"%s\n"
-#: svnlook/main.c:1746
+#: svnlook/main.c:1759
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8739,42 +8878,42 @@
"Komentarz (%i linia):\n"
"%s\n"
-#: svnlook/main.c:1792
+#: svnlook/main.c:1805
#, c-format
msgid "Missing propname argument"
msgstr "Brak parametru podającego nazwę atrybutu"
-#: svnlook/main.c:1793
+#: svnlook/main.c:1806
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Brak nazwy atrybutu i ścieżki obiektu w repozytorium."
-#: svnlook/main.c:1799
+#: svnlook/main.c:1812
msgid "Missing propname or repository path argument"
msgstr "Brak nazwy atrybutu lub ścieżki obiektu w repozytorium."
-#: svnlook/main.c:1957
+#: svnlook/main.c:1971
msgid "Invalid revision number supplied"
msgstr "Podano błędny numer wersji"
-#: svnlook/main.c:2018
+#: svnlook/main.c:2036
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr ""
"Opcje '--transaction' (-t) i '--revision' (-r) nie mogą występować "
"równocześnie"
-#: svnlook/main.c:2100
+#: svnlook/main.c:2118
#, c-format
msgid "Repository argument required\n"
msgstr "Parametr podający repozytorium jest wymagany\n"
-#: svnlook/main.c:2109
+#: svnlook/main.c:2127
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "'%s' jest URLem a powinien być ścieżką\n"
-#: svnlook/main.c:2160
+#: svnlook/main.c:2178
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8783,75 +8922,95 @@
"Polecenie '%s' nie obsługuje opcji '%s'\n"
"Użyj 'svnlook help %s' by uzyskać więcej informacji\n"
-#: svnlook/main.c:2203
+#: svnlook/main.c:2221
msgid "Try 'svnlook help' for more info"
msgstr ""
-#: svnserve/main.c:141
+#: svnserve/cyrus_auth.c:243
+#, fuzzy, c-format
+msgid "Can't get hostname"
+msgstr "Nie można dostać nazwy pliku"
+
+#: svnserve/cyrus_auth.c:311
+msgid "Could not obtain the list of SASL mechanisms"
+msgstr ""
+
+#: svnserve/cyrus_auth.c:351
+#, fuzzy
+msgid "Couldn't obtain the authenticated username"
+msgstr "Nie można zdjąć blokady ścieżki '%s', brak zautoryzowanego użytkownika"
+
+#: svnserve/main.c:142
msgid "daemon mode"
msgstr "tryb demon"
-#: svnserve/main.c:143
+#: svnserve/main.c:144
msgid "listen port (for daemon mode)"
msgstr "port nasłuchu (dla pracy w trybie demon)"
-#: svnserve/main.c:145
+#: svnserve/main.c:146
msgid "listen hostname or IP address (for daemon mode)"
msgstr "nazwa hosta nasłuchu lub jego adres IP (dla trybu demon)"
-#: svnserve/main.c:147
+#: svnserve/main.c:148
msgid "run in foreground (useful for debugging)"
msgstr ""
"uruchom jako zadanie pierwszoplanowe (użyteczne przy poszukiwaniu błędów)"
-#: svnserve/main.c:148 svnversion/main.c:123
+#: svnserve/main.c:149 svnversion/main.c:123
msgid "display this help"
msgstr "wyświetl tekst pomocy"
-#: svnserve/main.c:151
+#: svnserve/main.c:152
msgid "inetd mode"
msgstr "tryb inetd"
-#: svnserve/main.c:152
+#: svnserve/main.c:153
msgid "root of directory to serve"
msgstr "katalog, w którym ma być uruchomiony serwer"
-#: svnserve/main.c:154
+#: svnserve/main.c:155
#, fuzzy
msgid "force read only, overriding repository config file"
msgstr "przestarzałe; użyj pliku konfiguracyjnego repozytorium"
-#: svnserve/main.c:155
+#: svnserve/main.c:156
msgid "tunnel mode"
msgstr "tryb tunnel"
-#: svnserve/main.c:157
+#: svnserve/main.c:158
msgid "tunnel username (default is current uid's name)"
msgstr ""
"nazwa użytkownika dla trybu demon (domyślnie jest to bieżąca nazwa uid)"
-#: svnserve/main.c:159
+#: svnserve/main.c:160
msgid "use threads instead of fork"
msgstr "użyj wątków zamiast tworzenia procesów za pomocą fork"
-#: svnserve/main.c:161
+#: svnserve/main.c:162
msgid "listen once (useful for debugging)"
msgstr "nasłuchuj tylko raz (użyteczne przy poszukiwaniu błędów)"
-#: svnserve/main.c:163
-msgid "write server process ID to file arg"
-msgstr "zapisz ID procesu serwera do pliku arg"
+#: svnserve/main.c:164
+#, fuzzy
+msgid "read configuration from file ARG"
+msgstr "pobierz konfigurację użytkownika z katalogu ARG"
#: svnserve/main.c:166
+#, fuzzy
+msgid "write server process ID to file ARG"
+msgstr "zapisz ID procesu serwera do pliku arg"
+
+#: svnserve/main.c:169
msgid "run as a windows service (SCM only)"
msgstr "uruchom jako serwis Windows (tylko SCM)"
-#: svnserve/main.c:178
+#: svnserve/main.c:181
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Użyj '%s --help' by otrzymać podstawowe instrukcje.\n"
-#: svnserve/main.c:187
+#: svnserve/main.c:190
#, fuzzy
msgid ""
"usage: svnserve [options]\n"
@@ -8862,75 +9021,66 @@
"\n"
"Poprawne opcje:\n"
-#: svnserve/main.c:450
+#: svnserve/main.c:444
#, fuzzy, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "Ścieżka kopii roboczej '%s' nie istnieje w repozytorium"
-#: svnserve/main.c:492
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Musisz podać dokładnie jedną z opcji -d, -i, -t lub -X.\n"
-#: svnserve/main.c:502
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "Opcja --tunnel-user jest poprawna jedynie w trybie tunnel.\n"
-#: svnserve/main.c:571
+#: svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
"Service Control Manager.\n"
msgstr ""
-#: svnserve/main.c:607
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "Nie można uzyskać informacji o adresie"
-#: svnserve/main.c:623
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "Nie udało się utworzyć gniazda"
-#: svnserve/main.c:636
+#: svnserve/main.c:637
#, fuzzy, c-format
msgid "Can't bind server socket"
msgstr "Nie można zbindować gniazda serwera: %s\n"
-#: svnserve/main.c:704
+#: svnserve/main.c:703
#, fuzzy, c-format
msgid "Can't accept client connection"
msgstr "Nie można zezwolić na połączenia klienta: %s\n"
-#: svnserve/main.c:758
+#: svnserve/main.c:755
#, fuzzy, c-format
msgid "Can't create threadattr"
msgstr "Nie można utworzyć atrybutów wątku: %s\n"
-#: svnserve/main.c:766
+#: svnserve/main.c:763
#, fuzzy, c-format
msgid "Can't set detached state"
msgstr "Nie można ustawić informacji o czasie dostępu do '%s'"
-#: svnserve/main.c:779
+#: svnserve/main.c:776
#, fuzzy, c-format
msgid "Can't create thread"
msgstr "Nie udało się utworzyć wątku: %s\n"
-#: svnserve/sasl_auth.c:243
-#, fuzzy, c-format
-msgid "Can't get hostname"
-msgstr "Nie można dostać nazwy pliku"
-
-#: svnserve/sasl_auth.c:311
-msgid "Could not obtain the list of SASL mechanisms"
-msgstr ""
-
-#: svnserve/sasl_auth.c:351
+#: svnserve/serve.c:1437
#, fuzzy
-msgid "Couldn't obtain the authenticated username"
-msgstr "Nie można zdjąć blokady ścieżki '%s', brak zautoryzowanego użytkownika"
+msgid "Path is not a string"
+msgstr "Ścieżka nie wskazuje na plik w ramach kopii roboczej"
#: svnserve/winservice.c:341
#, c-format
@@ -8954,7 +9104,7 @@
"service"
msgstr "Uruchomienie usługi nie powiodło się; wystapił błąd wewnętrzny"
-#: svnsync/main.c:56
+#: svnsync/main.c:64
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -8971,22 +9121,33 @@
"mirror of the source repository.\n"
msgstr ""
-#: svnsync/main.c:71
+#: svnsync/main.c:79
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
-"Transfer all pending revisions from source to destination.\n"
+"Transfer all pending revisions to the destination from the source\n"
+"with which it was initialized.\n"
msgstr ""
-#: svnsync/main.c:76
+#: svnsync/main.c:85
msgid ""
-"usage: svnsync copy-revprops DEST_URL REV\n"
+"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
-"Copy all revision properties for revision REV from source to\n"
+"Copy the revision properties in a given range of revisions to the\n"
+"destination from the source with which it was initialized.\n"
+"\n"
+"If REV and REV2 are provided, copy properties for the revisions\n"
+"specified by that range, inclusively. If only REV is provided,\n"
+"copy properties for that revision alone. If REV is not provided,\n"
+"copy properties for all revisions previously transferred to the\n"
"destination.\n"
+"\n"
+"REV and REV2 must be revisions which were previously transferred\n"
+"to the destination. You may use \"HEAD\" for either revision to\n"
+"mean \"the last revision transferred\".\n"
msgstr ""
-#: svnsync/main.c:82
+#: svnsync/main.c:101
#, fuzzy
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
@@ -8997,64 +9158,92 @@
"\n"
"Opisuje działanie podanego polecenia.\n"
-#: svnsync/main.c:184
+#: svnsync/main.c:115
+msgid ""
+"specify a username ARG (deprecated;\n"
+" see --source-username and --sync-username)"
+msgstr ""
+
+#: svnsync/main.c:119
+msgid ""
+"specify a password ARG (deprecated;\n"
+" see --source-password and --sync-password)"
+msgstr ""
+
+#: svnsync/main.c:123
+msgid "connect to source repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:125
+msgid "connect to source repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:127
+msgid "connect to sync repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:129
+msgid "connect to sync repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:218
#, fuzzy, c-format
msgid "Can't get local hostname"
msgstr "Nie można dostać nazwy pliku"
-#: svnsync/main.c:206
+#: svnsync/main.c:241
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr ""
-#: svnsync/main.c:301
+#: svnsync/main.c:336
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr ""
-#: svnsync/main.c:368
+#: svnsync/main.c:403
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr ""
-#: svnsync/main.c:373
+#: svnsync/main.c:408
#, fuzzy, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Atrybuty nie podlegające zarządzaniu wersjami w wersji %ld:\n"
-#: svnsync/main.c:414
+#: svnsync/main.c:450
msgid "Cannot initialize a repository with content in it"
msgstr ""
-#: svnsync/main.c:425
+#: svnsync/main.c:461
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr ""
-#: svnsync/main.c:489 svnsync/main.c:492 svnsync/main.c:1159
-#: svnsync/main.c:1250
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, fuzzy, c-format
msgid "Path '%s' is not a URL"
msgstr "Ścieżka '%s' nie jest plikiem"
-#: svnsync/main.c:874
+#: svnsync/main.c:914
#, fuzzy, c-format
msgid "Committed revision %ld.\n"
msgstr ""
"\n"
"Zatwierdzona wersja %ld.\n"
-#: svnsync/main.c:913
+#: svnsync/main.c:954
msgid "Destination repository has not been initialized"
msgstr "Docelowe repozytorium nie zostało zainicjowane"
-#: svnsync/main.c:928
+#: svnsync/main.c:969
#, fuzzy, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
msgstr ""
"UUID docelowego repozytorium (%s) nie zgadza się z oczekiwanym UUID (%s)"
-#: svnsync/main.c:990
+#: svnsync/main.c:1032
#, c-format
msgid ""
"Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -9062,29 +9251,36 @@
"destination without using svnsync?"
msgstr ""
-#: svnsync/main.c:1028
+#: svnsync/main.c:1070
#, c-format
msgid ""
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
"committed to the destination without using svnsync?"
msgstr ""
-#: svnsync/main.c:1105
+#: svnsync/main.c:1148
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr ""
"Zatwierdzanie zmian stworzyło wersję o numerze %ld a powinno stworzyć %ld"
-#: svnsync/main.c:1214
-msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+#: svnsync/main.c:1275 svnsync/main.c:1280
+#, c-format
+msgid ""
+"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr ""
-#: svnsync/main.c:1253
-#, fuzzy
-msgid "Invalid revision number"
+#: svnsync/main.c:1332
+#, fuzzy, c-format
+msgid "'%s' is not a valid revision range"
+msgstr "Obiekt '%s' jest nieznanego rodzaju"
+
+#: svnsync/main.c:1346 svnsync/main.c:1366
+#, fuzzy, c-format
+msgid "Invalid revision number (%ld)"
msgstr "Podano błędny numer wersji"
-#: svnsync/main.c:1289
+#: svnsync/main.c:1423
#, fuzzy
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
@@ -9099,16 +9295,22 @@
"\n"
"Dostępne polecenia:\n"
-#: svnsync/main.c:1479
+#: svnsync/main.c:1581
+msgid ""
+"Cannot use --username or --password with any of --source-username, --source-"
+"password, --sync-username, or --sync-password.\n"
+msgstr ""
+
+#: svnsync/main.c:1661
#, fuzzy, c-format
msgid ""
-"subcommand '%s' doesn't accept option '%s'\n"
+"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnsync help %s' for usage.\n"
msgstr ""
"Polecenie '%s' nie obsługuje opcji '%s'.\n"
"Użyj 'svn help %s' by otrzymać informacje o sposobie jego używania.\n"
-#: svnsync/main.c:1541
+#: svnsync/main.c:1733
#, fuzzy
msgid "Try 'svnsync help' for more info"
msgstr "Brakuje argumentów; użyj 'svn help' aby uzyskać więcej informacji"
@@ -9187,16 +9389,59 @@
msgid "last changed rather than current revisions"
msgstr "ostatnia zmieniona a nie aktualna wersja"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "wyeksportowano%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "%s' nie podlegające zarządzaniu wersjami i nie eksportowane\n"
+#~ msgid "'%s' is not under version control or doesn't exist"
+#~ msgstr "'%s' nie podlega zarządzaniu wersjami lub nie istnieje"
+
+#~ msgid "No support for repos <--> working copy moves"
+#~ msgstr "Przenoszenie repozytorium <--> kopia robocza nie jest obsługiwane"
+
+#~ msgid "Cannot read entry for '%s'"
+#~ msgstr "Nie można czytać elementu dla '%s'"
+
+#~ msgid "Lock comment has illegal characters"
+#~ msgstr "Opis zakładanej blokady zawiera nieprawidłowe znaki"
+
+#~ msgid "Can't find entry for '%s'"
+#~ msgstr "Nie można znaleźć elementu dla '%s'"
+
+#, fuzzy
+#~ msgid "Can't get user name"
+#~ msgstr "Nie można dostać nazwy pliku"
+
+#~ msgid " arg"
+#~ msgstr " ARG"
+
+#, fuzzy
+#~ msgid "'%s' has unsupported special file type '%s'"
+#~ msgstr "'%s' nie jest plikiem w systemie plików '%s'"
+
+#~ msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
+#~ msgstr "Błąd sumy kontrolnej dla '%s'; oczekiwana: '%s', faktyczna: '%s'"
+
+#~ msgid "No entry for '%s'"
+#~ msgstr "Brak wpisu dla '%s'"
+
+#~ msgid "Cannot revert: '%s' is not under version control"
+#~ msgstr "Nie można wycofać zmian: '%s' nie podlega zarządzaniu wersjami"
+
+#~ msgid "Cannot copy or move '%s': it's not under version control"
+#~ msgstr ""
+#~ "Nie można skopiować lub przenieść '%s': obiekt nie podlega zarządzaniu\n"
+#~ "wersjami"
+
+#~ msgid "descend recursively"
+#~ msgstr "przetwarzaj katalogi wraz z podkatalogami"
+
#~ msgid "Not enough arguments provided; try 'svn help' for more info"
#~ msgstr "Brakuje argumentów; użyj 'svn help' aby uzyskać więcej informacji"
diff --git a/subversion/po/pt_BR.po b/subversion/po/pt_BR.po
index b037019..4688984 100644
--- a/subversion/po/pt_BR.po
+++ b/subversion/po/pt_BR.po
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: subversion 1.1.0\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2006-12-25 18:32-0200\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2004-07-26 19:19-300\n"
"Last-Translator: dev@subversion.tigris.org\n"
"Language-Team: Brazilian Portuguese <dev@subversion.tigris.org>\n"
@@ -83,7 +83,7 @@
msgstr "Erro de leitura em pipe"
#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
-#: libsvn_subr/cmdline.c:316 svn/util.c:742
+#: libsvn_subr/cmdline.c:316 svn/util.c:758
#, c-format
msgid "Write error"
msgstr "Erro de escrita"
@@ -234,590 +234,608 @@
msgid "Invalid switch"
msgstr "Troca inválida"
-#: include/svn_error_codes.h:398
+#: include/svn_error_codes.h:397
+#, fuzzy
+msgid "Changelist doesn't match"
+msgstr "Changelist: %s\n"
+
+#: include/svn_error_codes.h:403
msgid "General filesystem error"
msgstr "Erro genérico do sistema de arquivos"
-#: include/svn_error_codes.h:402
+#: include/svn_error_codes.h:407
msgid "Error closing filesystem"
msgstr "Erro fechando o sistema de arquivos"
-#: include/svn_error_codes.h:406
+#: include/svn_error_codes.h:411
msgid "Filesystem is already open"
msgstr "Sistema de arquivos já está aberto"
-#: include/svn_error_codes.h:410
+#: include/svn_error_codes.h:415
msgid "Filesystem is not open"
msgstr "Sistema de arquivos não está aberto"
-#: include/svn_error_codes.h:414
+#: include/svn_error_codes.h:419
msgid "Filesystem is corrupt"
msgstr "Sistema de arquivos está corrompido"
-#: include/svn_error_codes.h:418
+#: include/svn_error_codes.h:423
msgid "Invalid filesystem path syntax"
msgstr "Sintaxe inválida para o caminho do sistema de arquivos"
-#: include/svn_error_codes.h:422
+#: include/svn_error_codes.h:427
msgid "Invalid filesystem revision number"
msgstr "Número de revisão do sistema de arquivos inválido"
-#: include/svn_error_codes.h:426
+#: include/svn_error_codes.h:431
msgid "Invalid filesystem transaction name"
msgstr "Nome da transação do sistema de arquivos inválido"
-#: include/svn_error_codes.h:430
+#: include/svn_error_codes.h:435
msgid "Filesystem directory has no such entry"
msgstr "Sistema de arquivos não possui esta entrada"
-#: include/svn_error_codes.h:434
+#: include/svn_error_codes.h:439
msgid "Filesystem has no such representation"
msgstr "Sistema de arquivos não possui esta representação"
-#: include/svn_error_codes.h:438
+#: include/svn_error_codes.h:443
msgid "Filesystem has no such string"
msgstr "Sistema de arquivos não possui tal string"
-#: include/svn_error_codes.h:442
+#: include/svn_error_codes.h:447
msgid "Filesystem has no such copy"
msgstr "Sistema de arquivos não possui tal cópia"
-#: include/svn_error_codes.h:446
+#: include/svn_error_codes.h:451
msgid "The specified transaction is not mutable"
msgstr "A transação especificada não é mutável"
-#: include/svn_error_codes.h:450
+#: include/svn_error_codes.h:455
msgid "Filesystem has no item"
msgstr "Sistema de arquivos não possui item"
-#: include/svn_error_codes.h:454
+#: include/svn_error_codes.h:459
msgid "Filesystem has no such node-rev-id"
msgstr "Sistema de arquivos não possui tal node-rev-id"
-#: include/svn_error_codes.h:458
+#: include/svn_error_codes.h:463
msgid "String does not represent a node or node-rev-id"
msgstr "String não representa nó ou node-rev-id"
-#: include/svn_error_codes.h:462
+#: include/svn_error_codes.h:467
msgid "Name does not refer to a filesystem directory"
msgstr "Nome não se refere a um diretório do sistema de arquivos"
-#: include/svn_error_codes.h:466
+#: include/svn_error_codes.h:471
msgid "Name does not refer to a filesystem file"
msgstr "Nome não se refere a um arquivo do sistema de arquivos"
-#: include/svn_error_codes.h:470
+#: include/svn_error_codes.h:475
msgid "Name is not a single path component"
msgstr "Nome não é um componente de caminho simples"
-#: include/svn_error_codes.h:474
+#: include/svn_error_codes.h:479
msgid "Attempt to change immutable filesystem node"
msgstr "Tentativa de mudar nó imutável de sistema de arquivos"
-#: include/svn_error_codes.h:478
+#: include/svn_error_codes.h:483
msgid "Item already exists in filesystem"
msgstr "item já existe no sistema de arquivos"
-#: include/svn_error_codes.h:482
+#: include/svn_error_codes.h:487
msgid "Attempt to remove or recreate fs root dir"
msgstr "Tentativa de remover ou recriar diretório raiz de sistema de arquivos"
-#: include/svn_error_codes.h:486
+#: include/svn_error_codes.h:491
msgid "Object is not a transaction root"
msgstr "Objeto não é uma raiz de transação"
-#: include/svn_error_codes.h:490
+#: include/svn_error_codes.h:495
msgid "Object is not a revision root"
msgstr "Objeto não é uma raiz de revisão"
-#: include/svn_error_codes.h:494
+#: include/svn_error_codes.h:499
msgid "Merge conflict during commit"
msgstr "Conflito de mesclagem durante commit"
-#: include/svn_error_codes.h:498
+#: include/svn_error_codes.h:503
msgid "A representation vanished or changed between reads"
msgstr "Uma representação desapareceu ou mudou entre leituras"
-#: include/svn_error_codes.h:502
+#: include/svn_error_codes.h:507
msgid "Tried to change an immutable representation"
msgstr "Tentativa de mudar uma representação imutável"
-#: include/svn_error_codes.h:506
+#: include/svn_error_codes.h:511
msgid "Malformed skeleton data"
msgstr "Dado skeleton mal formado"
-#: include/svn_error_codes.h:510
+#: include/svn_error_codes.h:515
msgid "Transaction is out of date"
msgstr "Transação está desatualizada"
-#: include/svn_error_codes.h:514
+#: include/svn_error_codes.h:519
msgid "Berkeley DB error"
msgstr "Erro Berkeley DB"
-#: include/svn_error_codes.h:518
+#: include/svn_error_codes.h:523
msgid "Berkeley DB deadlock error"
msgstr "Erro de deadlock Berkeley DB"
-#: include/svn_error_codes.h:522
+#: include/svn_error_codes.h:527
msgid "Transaction is dead"
msgstr "Transação está morta"
-#: include/svn_error_codes.h:526
+#: include/svn_error_codes.h:531
msgid "Transaction is not dead"
msgstr "Transação não está morta"
-#: include/svn_error_codes.h:531
+#: include/svn_error_codes.h:536
msgid "Unknown FS type"
msgstr "Sistema de arquivos desconhecido"
-#: include/svn_error_codes.h:536
+#: include/svn_error_codes.h:541
msgid "No user associated with filesystem"
msgstr "Nenhum usuário associado com o sistema de arquivos"
-#: include/svn_error_codes.h:541
+#: include/svn_error_codes.h:546
msgid "Path is already locked"
msgstr "Caminho já está travado"
-#: include/svn_error_codes.h:546 include/svn_error_codes.h:678
+#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
msgid "Path is not locked"
msgstr "Caminho está travado"
-#: include/svn_error_codes.h:551
+#: include/svn_error_codes.h:556
msgid "Lock token is incorrect"
msgstr "Token de trava está incorreto"
-#: include/svn_error_codes.h:556
+#: include/svn_error_codes.h:561
msgid "No lock token provided"
msgstr "Nenhum token de trava fornecido"
-#: include/svn_error_codes.h:561
+#: include/svn_error_codes.h:566
msgid "Username does not match lock owner"
msgstr "Nome do usuário não bate com dono da trava"
-#: include/svn_error_codes.h:566
+#: include/svn_error_codes.h:571
msgid "Filesystem has no such lock"
msgstr "Sistema de arquivos não possui esta trava"
-#: include/svn_error_codes.h:571
+#: include/svn_error_codes.h:576
msgid "Lock has expired"
msgstr "Trava expirou"
-#: include/svn_error_codes.h:576
+#: include/svn_error_codes.h:581
msgid "Item is out of date"
msgstr "Item está desatualizado"
-#: include/svn_error_codes.h:588
+#: include/svn_error_codes.h:586
+#, fuzzy
+msgid "SQLite error"
+msgstr "Erro de escrita"
+
+#: include/svn_error_codes.h:598
msgid "Unsupported FS format"
msgstr "Formato de SA não suportado"
-#: include/svn_error_codes.h:593
+#: include/svn_error_codes.h:603
msgid "Representation is being written"
msgstr "Representação está sendo escrita"
-#: include/svn_error_codes.h:599
+#: include/svn_error_codes.h:609
msgid "The repository is locked, perhaps for db recovery"
msgstr "O repositório está travado, talvez para recuperação de bd"
-#: include/svn_error_codes.h:603
+#: include/svn_error_codes.h:613
msgid "A repository hook failed"
msgstr "Um 'hook' de repositório falhou"
-#: include/svn_error_codes.h:607
+#: include/svn_error_codes.h:617
msgid "Incorrect arguments supplied"
msgstr "Argumentos incorretos fornecidos"
-#: include/svn_error_codes.h:611
+#: include/svn_error_codes.h:621
msgid "A report cannot be generated because no data was supplied"
msgstr "Um relatório não pode ser gerado porque nenhum dado foi fornecido"
-#: include/svn_error_codes.h:615
+#: include/svn_error_codes.h:625
msgid "Bogus revision report"
msgstr "Relatório de revisão estranho"
-#: include/svn_error_codes.h:624
+#: include/svn_error_codes.h:634
msgid "Unsupported repository version"
msgstr "Versão de repositório não suportada"
-#: include/svn_error_codes.h:628
+#: include/svn_error_codes.h:638
msgid "Disabled repository feature"
msgstr "Funcionalidade de repositório desabilitada"
-#: include/svn_error_codes.h:632
+#: include/svn_error_codes.h:642
msgid "Error running post-commit hook"
msgstr "Erro executando 'hook' post-commit"
-#: include/svn_error_codes.h:637
+#: include/svn_error_codes.h:647
msgid "Error running post-lock hook"
msgstr "Erro executando 'hook' post-lock"
-#: include/svn_error_codes.h:642
+#: include/svn_error_codes.h:652
msgid "Error running post-unlock hook"
msgstr "Erro executando 'hook' post-unlock"
-#: include/svn_error_codes.h:649
+#: include/svn_error_codes.h:659
msgid "Bad URL passed to RA layer"
msgstr "URL ruim passada à camada RA"
-#: include/svn_error_codes.h:653
+#: include/svn_error_codes.h:663
msgid "Authorization failed"
msgstr "Autorização falhou"
-#: include/svn_error_codes.h:657
+#: include/svn_error_codes.h:667
msgid "Unknown authorization method"
msgstr "Método de autorização desconhecido"
-#: include/svn_error_codes.h:661
+#: include/svn_error_codes.h:671
msgid "Repository access method not implemented"
msgstr "Método de acesso ao repositório não implementado"
-#: include/svn_error_codes.h:665
+#: include/svn_error_codes.h:675
msgid "Item is out-of-date"
msgstr "item desatualizado"
-#: include/svn_error_codes.h:669
+#: include/svn_error_codes.h:679
msgid "Repository has no UUID"
msgstr "Repositório não possui UUID"
-#: include/svn_error_codes.h:673
+#: include/svn_error_codes.h:683
msgid "Unsupported RA plugin ABI version"
msgstr "Versão ABI de plugin RA não suportada"
-#: include/svn_error_codes.h:685
+#: include/svn_error_codes.h:695
msgid "RA layer failed to init socket layer"
msgstr "Camada RA falhou ao inicializar camada socket"
-#: include/svn_error_codes.h:689
+#: include/svn_error_codes.h:699
msgid "RA layer failed to create HTTP request"
msgstr "Camada RA falhou ao criar requisição HTTP"
-#: include/svn_error_codes.h:693
+#: include/svn_error_codes.h:703
msgid "RA layer request failed"
msgstr "Requisição de camada RA falhou"
-#: include/svn_error_codes.h:697
+#: include/svn_error_codes.h:707
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "Camada RA não recebeu informações de requisição OPTIONS"
-#: include/svn_error_codes.h:701
+#: include/svn_error_codes.h:711
msgid "RA layer failed to fetch properties"
msgstr "Camada RA falhou ao buscar propriedades"
-#: include/svn_error_codes.h:705
+#: include/svn_error_codes.h:715
msgid "RA layer file already exists"
msgstr "Arquivo de camada RA já existe"
-#: include/svn_error_codes.h:709
+#: include/svn_error_codes.h:719
msgid "Invalid configuration value"
msgstr "Valor de configuração inválido"
-#: include/svn_error_codes.h:713
+#: include/svn_error_codes.h:723
msgid "HTTP Path Not Found"
msgstr "Caminho HTTP não encontrado"
-#: include/svn_error_codes.h:717
+#: include/svn_error_codes.h:727
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Falhou ao executar WebDAV PROPPATCH"
-#: include/svn_error_codes.h:722 include/svn_error_codes.h:763
-#: libsvn_ra_svn/marshal.c:612 libsvn_ra_svn/marshal.c:720
-#: libsvn_ra_svn/marshal.c:747
+#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
+#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
+#: libsvn_ra_svn/marshal.c:774
msgid "Malformed network data"
msgstr "Dado de rede mal formado"
-#: include/svn_error_codes.h:727
+#: include/svn_error_codes.h:737
msgid "Unable to extract data from response header"
msgstr "Não foi possível extrair dados do cabeçalho de resposta"
-#: include/svn_error_codes.h:732
+#: include/svn_error_codes.h:742
msgid "Repository has been moved"
msgstr "Repositório foi movido"
-#: include/svn_error_codes.h:738 include/svn_error_codes.h:767
+#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
msgid "Couldn't find a repository"
msgstr "Não foi possível encontrar um repositório"
-#: include/svn_error_codes.h:742
+#: include/svn_error_codes.h:752
msgid "Couldn't open a repository"
msgstr "Não foi possível abrir um repositório"
-#: include/svn_error_codes.h:747
+#: include/svn_error_codes.h:757
msgid "Special code for wrapping server errors to report to client"
msgstr ""
"Código especial para empacotar erros de servidor para reportar ao cliente"
-#: include/svn_error_codes.h:751
+#: include/svn_error_codes.h:761
msgid "Unknown svn protocol command"
msgstr "Comando de protocolo svn desconhecido"
-#: include/svn_error_codes.h:755
+#: include/svn_error_codes.h:765
msgid "Network connection closed unexpectedly"
msgstr "Conexão de rede fechou inesperadamente"
-#: include/svn_error_codes.h:759
+#: include/svn_error_codes.h:769
msgid "Network read/write error"
msgstr "Erro de leitura/escrita na rede"
-#: include/svn_error_codes.h:771
+#: include/svn_error_codes.h:781
msgid "Client/server version mismatch"
msgstr "Versões de cliente/servidor não batem"
-#: include/svn_error_codes.h:779
+#: include/svn_error_codes.h:786
+msgid "Cannot negotiate authentication mechanism"
+msgstr "Não foi possível negociar mecanismo de autenticação"
+
+#: include/svn_error_codes.h:795
msgid "Credential data unavailable"
msgstr "Dados credenciais não disponíveis"
-#: include/svn_error_codes.h:783
+#: include/svn_error_codes.h:799
msgid "No authentication provider available"
msgstr "Nenhum provedor de autenticação disponível"
-#: include/svn_error_codes.h:787 include/svn_error_codes.h:791
+#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
msgid "All authentication providers exhausted"
msgstr "Se esgotaram os provedores de autenticação"
-#: include/svn_error_codes.h:797
+#: include/svn_error_codes.h:813
msgid "Read access denied for root of edit"
msgstr "Acesso de leitura recusado para a raiz da edição"
-#: include/svn_error_codes.h:802
+#: include/svn_error_codes.h:818
msgid "Item is not readable"
msgstr "item não é legível"
-#: include/svn_error_codes.h:807
+#: include/svn_error_codes.h:823
msgid "Item is partially readable"
msgstr "item é parcialmente legível"
-#: include/svn_error_codes.h:811
+#: include/svn_error_codes.h:827
msgid "Invalid authz configuration"
msgstr "Configuração authz inválida"
-#: include/svn_error_codes.h:816
+#: include/svn_error_codes.h:832
msgid "Item is not writable"
msgstr "Item não é para ser escrito"
-#: include/svn_error_codes.h:822
+#: include/svn_error_codes.h:838
msgid "Svndiff data has invalid header"
msgstr "Dados de svndiff possui cabeçalho inválido"
-#: include/svn_error_codes.h:826
+#: include/svn_error_codes.h:842
msgid "Svndiff data contains corrupt window"
msgstr "Dados de svndiff possui janela corrompida"
-#: include/svn_error_codes.h:830
+#: include/svn_error_codes.h:846
msgid "Svndiff data contains backward-sliding source view"
msgstr "Dado svndiff contém vizão de código ao contrário"
-#: include/svn_error_codes.h:834
+#: include/svn_error_codes.h:850
msgid "Svndiff data contains invalid instruction"
msgstr "Dado svndiff contém instrução inválida"
-#: include/svn_error_codes.h:838
+#: include/svn_error_codes.h:854
msgid "Svndiff data ends unexpectedly"
msgstr "Dado svndiff termina inesperadamente"
-#: include/svn_error_codes.h:842
+#: include/svn_error_codes.h:858
msgid "Svndiff compressed data is invalid"
msgstr "Dados comprimidos de svndiff são inválidos"
-#: include/svn_error_codes.h:848
+#: include/svn_error_codes.h:864
msgid "Diff data source modified unexpectedly"
msgstr "Dados fonte de svndiff modificados inesperadamente"
-#: include/svn_error_codes.h:854
+#: include/svn_error_codes.h:870
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache não possui um caminho para um sistema de arquivos SVN"
-#: include/svn_error_codes.h:858
+#: include/svn_error_codes.h:874
msgid "Apache got a malformed URI"
msgstr "Apache recebeu uma URI mal formada"
-#: include/svn_error_codes.h:862
+#: include/svn_error_codes.h:878
msgid "Activity not found"
msgstr "Atividade não encontrada"
-#: include/svn_error_codes.h:866
+#: include/svn_error_codes.h:882
msgid "Baseline incorrect"
msgstr "Baseline incorreto"
-#: include/svn_error_codes.h:870
+#: include/svn_error_codes.h:886
msgid "Input/output error"
msgstr "Erro de entrada/saída"
-#: include/svn_error_codes.h:876
+#: include/svn_error_codes.h:892
msgid "A path under version control is needed for this operation"
msgstr "Um caminho sobre controle de versão é necessário para esta operação"
-#: include/svn_error_codes.h:880
+#: include/svn_error_codes.h:896
msgid "Repository access is needed for this operation"
msgstr "Acesso ao repositório é necessário para esta operação"
-#: include/svn_error_codes.h:884
+#: include/svn_error_codes.h:900
msgid "Bogus revision information given"
msgstr "Informação de revisão estranha fornecida"
-#: include/svn_error_codes.h:888
+#: include/svn_error_codes.h:904
msgid "Attempting to commit to a URL more than once"
msgstr "Tentativa de commit em uma URL mais de uma vez"
-#: include/svn_error_codes.h:892
+#: include/svn_error_codes.h:908
msgid "Operation does not apply to binary file"
msgstr "Operação não se aplica a arquivo binário"
-#: include/svn_error_codes.h:898
+#: include/svn_error_codes.h:914
msgid "Format of an svn:externals property was invalid"
msgstr "Formato de uma propriedade svn:externals era inválido"
-#: include/svn_error_codes.h:902
+#: include/svn_error_codes.h:918
msgid "Attempting restricted operation for modified resource"
msgstr "Tentativa de executar operação restrita para recurso modificado"
-#: include/svn_error_codes.h:906
+#: include/svn_error_codes.h:922
msgid "Operation does not apply to directory"
msgstr "Operação não se aplica a diretório"
-#: include/svn_error_codes.h:910
+#: include/svn_error_codes.h:926
msgid "Revision range is not allowed"
msgstr "Faixa de revisão não é permitida"
-#: include/svn_error_codes.h:914
+#: include/svn_error_codes.h:930
msgid "Inter-repository relocation not allowed"
msgstr "Relocação inter-repositório não permitida"
-#: include/svn_error_codes.h:918
+#: include/svn_error_codes.h:934
msgid "Author name cannot contain a newline"
msgstr "Nome do autor não pode conter 'newline'"
-#: include/svn_error_codes.h:922
+#: include/svn_error_codes.h:938
msgid "Bad property name"
msgstr "Nome ruim de propriedade"
-#: include/svn_error_codes.h:927
+#: include/svn_error_codes.h:943
msgid "Two versioned resources are unrelated"
msgstr "Dois recursos versionados não são relacionados"
-#: include/svn_error_codes.h:932
+#: include/svn_error_codes.h:948
msgid "Path has no lock token"
msgstr "Caminho não possui token de trava"
-#: include/svn_error_codes.h:937
+#: include/svn_error_codes.h:953
msgid "Operation does not support multiple sources"
msgstr "Operação suporta várias fontes"
-#: include/svn_error_codes.h:943
+#: include/svn_error_codes.h:959
msgid "A problem occurred; see later errors for details"
msgstr "Um problema ocorreu; veja próximos erros para mais detalhes"
-#: include/svn_error_codes.h:947
+#: include/svn_error_codes.h:963
msgid "Failure loading plugin"
msgstr "Falha ao carregar 'plugin'"
-#: include/svn_error_codes.h:951
+#: include/svn_error_codes.h:967
msgid "Malformed file"
msgstr "Arquivo mal formado"
-#: include/svn_error_codes.h:955
+#: include/svn_error_codes.h:971
msgid "Incomplete data"
msgstr "Dado incompleto"
-#: include/svn_error_codes.h:959
+#: include/svn_error_codes.h:975
msgid "Incorrect parameters given"
msgstr "Parâmetro incorreto fornecido"
-#: include/svn_error_codes.h:963
+#: include/svn_error_codes.h:979
msgid "Tried a versioning operation on an unversioned resource"
msgstr "Tentoou uma operação de versionamento em um recurso não versionado"
-#: include/svn_error_codes.h:967
+#: include/svn_error_codes.h:983
msgid "Test failed"
msgstr "Teste falhou"
-#: include/svn_error_codes.h:971
+#: include/svn_error_codes.h:987
msgid "Trying to use an unsupported feature"
msgstr "Tentando usar uma funcionalidade não suportada"
-#: include/svn_error_codes.h:975
+#: include/svn_error_codes.h:991
msgid "Unexpected or unknown property kind"
msgstr "Tipo de propriedade não esperado ou desconhecido"
-#: include/svn_error_codes.h:979
+#: include/svn_error_codes.h:995
msgid "Illegal target for the requested operation"
msgstr "Alvo ilegal para a operação requisitada"
-#: include/svn_error_codes.h:983
+#: include/svn_error_codes.h:999
msgid "MD5 checksum is missing"
msgstr "Está faltando checksun MD5"
-#: include/svn_error_codes.h:987
+#: include/svn_error_codes.h:1003
msgid "Directory needs to be empty but is not"
msgstr "Diretório precisa estar vazio mas não está"
-#: include/svn_error_codes.h:991
+#: include/svn_error_codes.h:1007
msgid "Error calling external program"
msgstr "Erro chamando programa externo"
-#: include/svn_error_codes.h:995
+#: include/svn_error_codes.h:1011
msgid "Python exception has been set with the error"
msgstr "Exceção Python foi setada com o erro"
-#: include/svn_error_codes.h:999
+#: include/svn_error_codes.h:1015
msgid "A checksum mismatch occurred"
msgstr "Um erro de checksum ocorreu"
-#: include/svn_error_codes.h:1003
+#: include/svn_error_codes.h:1019
msgid "The operation was interrupted"
msgstr "A operação foi interrompida"
-#: include/svn_error_codes.h:1007
+#: include/svn_error_codes.h:1023
msgid "The specified diff option is not supported"
msgstr "A opção de diff especificada não é suportada"
-#: include/svn_error_codes.h:1011
+#: include/svn_error_codes.h:1027
msgid "Property not found"
msgstr "Propriedade não encontrada"
-#: include/svn_error_codes.h:1015
+#: include/svn_error_codes.h:1031
msgid "No auth file path available"
msgstr "Não há caminho de arquivo de autorização disponível"
-#: include/svn_error_codes.h:1020
+#: include/svn_error_codes.h:1035
+msgid "Merge info parse error"
+msgstr ""
+
+#: include/svn_error_codes.h:1040
msgid "Incompatible library version"
msgstr "Versão incompatível de biblioteca"
-#: include/svn_error_codes.h:1026
+#: include/svn_error_codes.h:1046
msgid "Error parsing arguments"
msgstr "Erro ao realizar parsing de argumentos"
-#: include/svn_error_codes.h:1030
+#: include/svn_error_codes.h:1050
msgid "Not enough arguments provided"
msgstr "Poucos argumentos fornecidos"
-#: include/svn_error_codes.h:1034
+#: include/svn_error_codes.h:1054
msgid "Mutually exclusive arguments specified"
msgstr "Argumentos mutualmente exclusivos especificados"
-#: include/svn_error_codes.h:1038
+#: include/svn_error_codes.h:1058
msgid "Attempted command in administrative dir"
msgstr "Tentativa de comando em diretório administrativo"
-#: include/svn_error_codes.h:1042
+#: include/svn_error_codes.h:1062
msgid "The log message file is under version control"
msgstr "O arquivo de log de mensagem está sobre controle de versão"
-#: include/svn_error_codes.h:1046
+#: include/svn_error_codes.h:1066
msgid "The log message is a pathname"
msgstr "A mensagem de log é um caminho"
-#: include/svn_error_codes.h:1050
+#: include/svn_error_codes.h:1070
msgid "Committing in directory scheduled for addition"
msgstr "Executando commit em diretório agendado para inclusão"
-#: include/svn_error_codes.h:1054
+#: include/svn_error_codes.h:1074
msgid "No external editor available"
msgstr "Nenhum editor externo disponível"
-#: include/svn_error_codes.h:1058
+#: include/svn_error_codes.h:1078
msgid "Something is wrong with the log message's contents"
msgstr "Algo está errado com o conteúdo do log de mensagens"
-#: include/svn_error_codes.h:1062
+#: include/svn_error_codes.h:1082
msgid "A log message was given where none was necessary"
msgstr "Uma mensagem de log foi fornecida onde nenhuma é necessária"
@@ -844,7 +862,7 @@
msgid "Start revision must precede end revision"
msgstr "Revisão de início deve preceder revisão de final"
-#: libsvn_client/blame.c:725 libsvn_client/cat.c:208
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL '%s' refere-se a um diretório"
@@ -855,21 +873,16 @@
msgstr ""
"Ação de revisão '%c' para revisão %ld de '%s' não possui revisão anterior"
-#: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "'%s' não está sobre controle de versão ou não existe"
-
-#: libsvn_client/cat.c:79
+#: libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "'%s' refere-se a um diretório"
-#: libsvn_client/cat.c:131 libsvn_client/export.c:183
+#: libsvn_client/cat.c:126 libsvn_client/export.c:183
msgid "(local)"
msgstr "(local)"
-#: libsvn_client/checkout.c:91 libsvn_client/export.c:895
+#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL '%s' não existe"
@@ -879,16 +892,16 @@
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL '%s' se refere a um arquivo, não a um diretório"
-#: libsvn_client/checkout.c:166
+#: libsvn_client/checkout.c:168
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "'%s' já é uma cópia de trabalho para uma URL diferente"
-#: libsvn_client/checkout.c:170
+#: libsvn_client/checkout.c:172
msgid "; run 'svn update' to complete it"
msgstr "; rode 'svn update' para completar"
-#: libsvn_client/checkout.c:180
+#: libsvn_client/checkout.c:182
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' já existe e não é um diretório"
@@ -902,119 +915,98 @@
msgid "New entry name required when importing a file"
msgstr "Novo nome de entrada requerido ao importar um arquivo"
-#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1010
-#: libsvn_wc/questions.c:91
+#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1016
+#: libsvn_wc/questions.c:92
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' não existe"
-#: libsvn_client/commit.c:606 libsvn_client/copy.c:283 svnlook/main.c:1204
+#: libsvn_client/commit.c:607 libsvn_client/copy.c:286 svnlook/main.c:1216
#, c-format
msgid "Path '%s' does not exist"
msgstr "Caminho '%s' não existe"
-#: libsvn_client/commit.c:737 libsvn_client/copy.c:292
-#: libsvn_client/copy.c:617 libsvn_client/copy.c:868 libsvn_client/copy.c:1194
+#: libsvn_client/commit.c:741 libsvn_client/copy.c:295
+#: libsvn_client/copy.c:759 libsvn_client/copy.c:1025
+#: libsvn_client/copy.c:1417
#, c-format
msgid "Path '%s' already exists"
msgstr "Caminho '%s' já existe"
-#: libsvn_client/commit.c:752
+#: libsvn_client/commit.c:756
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' é um nome reservado e não pode ser importado"
-#: libsvn_client/commit.c:868 libsvn_client/copy.c:760
+#: libsvn_client/commit.c:872 libsvn_client/copy.c:909
msgid "Commit failed (details follow):"
msgstr "Commit falhou (detalhes a seguir):"
-#: libsvn_client/commit.c:876 libsvn_client/copy.c:768
+#: libsvn_client/commit.c:880 libsvn_client/copy.c:917
msgid "Commit succeeded, but other errors follow:"
msgstr "Commit completou com sucesso, mas outros erros a seguir:"
-#: libsvn_client/commit.c:883 libsvn_client/copy.c:775
+#: libsvn_client/commit.c:887 libsvn_client/copy.c:924
msgid "Error unlocking locked dirs (details follow):"
msgstr "Erro destravando diretórios travados (detalhes a seguir):"
-#: libsvn_client/commit.c:894
+#: libsvn_client/commit.c:898
msgid "Error bumping revisions post-commit (details follow):"
msgstr "Erro gerando pós-commit de revisão (detalhes a seguir):"
-#: libsvn_client/commit.c:905 libsvn_client/copy.c:786
+#: libsvn_client/commit.c:909 libsvn_client/copy.c:935
msgid "Error in post-commit clean-up (details follow):"
msgstr "Erro em limpeza pós-commit (detalhes a seguir):"
-#: libsvn_client/commit.c:1189
+#: libsvn_client/commit.c:1193
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "'%s' é uma URL, mas URLs não podem ter commit de alvos"
-#: libsvn_client/commit.c:1388
+#: libsvn_client/commit.c:1392
msgid "Are all the targets part of the same working copy?"
msgstr "São todos os alvos partes de uma mesma cópia de trabalho?"
-#: libsvn_client/commit.c:1403
+#: libsvn_client/commit.c:1407
msgid "Cannot non-recursively commit a directory deletion"
msgstr "Não é possível commit não recursivo de remoção de diretório"
-#: libsvn_client/commit_util.c:252 libsvn_client/commit_util.c:263
+#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "Tipo de entrada desconhecido para '%s'"
-#: libsvn_client/commit_util.c:280
+#: libsvn_client/commit_util.c:284
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "Entrada '%s' inesperadamente teve um estado especial modificado"
-#: libsvn_client/commit_util.c:331
+#: libsvn_client/commit_util.c:335
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "Abortando commit: '%s' continua em conflito"
-#: libsvn_client/commit_util.c:397
+#: libsvn_client/commit_util.c:401
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "Não esperava que '%s' fosse a raiz de uma cópia de trabalho"
-#: libsvn_client/commit_util.c:415 libsvn_client/commit_util.c:1065
+#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "item de commit '%s' possui flag de cópia mas não copyfrom URL"
-#: libsvn_client/commit_util.c:705 libsvn_client/commit_util.c:853
-#: libsvn_client/copy.c:1486 libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1468 libsvn_client/diff.c:2198
-#: libsvn_client/diff.c:2793 libsvn_client/diff.c:2921
-#: libsvn_client/locking_commands.c:259 libsvn_client/log.c:133
-#: libsvn_client/prop_commands.c:354 libsvn_client/prop_commands.c:608
-#: libsvn_client/prop_commands.c:772 libsvn_client/prop_commands.c:1108
-#: libsvn_client/ra.c:181 libsvn_client/revisions.c:89
-#: libsvn_client/status.c:256 libsvn_client/switch.c:107
-#: libsvn_wc/adm_crawler.c:453 libsvn_wc/adm_crawler.c:477
-#: libsvn_wc/adm_ops.c:1363 libsvn_wc/adm_ops.c:2652 libsvn_wc/adm_ops.c:2678
-#: libsvn_wc/adm_ops.c:2714 libsvn_wc/adm_ops.c:2773 libsvn_wc/copy.c:307
-#: libsvn_wc/copy.c:663 libsvn_wc/copy.c:785 libsvn_wc/copy.c:792
-#: libsvn_wc/diff.c:1793 libsvn_wc/entries.c:2276 libsvn_wc/entries.c:2872
-#: libsvn_wc/props.c:496 libsvn_wc/props.c:1104 libsvn_wc/props.c:1555
-#: libsvn_wc/questions.c:186 libsvn_wc/questions.c:300 libsvn_wc/status.c:729
-#: libsvn_wc/translate.c:269 libsvn_wc/update_editor.c:2386
-#: libsvn_wc/update_editor.c:3229
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "'%s' não está sobre controle de versão"
-
-#: libsvn_client/commit_util.c:708
+#: libsvn_client/commit_util.c:709
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "Entrada para '%s' não possui URL"
-#: libsvn_client/commit_util.c:741
+#: libsvn_client/commit_util.c:742
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr "'%s' está agendado para inclusão dentro de pai não versionado"
-#: libsvn_client/commit_util.c:761
+#: libsvn_client/commit_util.c:762
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1026,7 +1018,7 @@
"que\n"
"está dentro de um diretório não versionado (ou não ainda versionado)?"
-#: libsvn_client/commit_util.c:802
+#: libsvn_client/commit_util.c:803
#, c-format
msgid ""
"'%s' is not under version control and is not part of the commit, yet its "
@@ -1035,25 +1027,29 @@
"'%s' não está sobre controle de versão e não é parte do commit, porém seu "
"filho '%s' é parte do commit"
-#: libsvn_client/commit_util.c:920
+#: libsvn_client/commit_util.c:907
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr ""
"Não é possível executar commit em '%s' e '%s' porque ambos referem ao mesmo "
"URL"
-#: libsvn_client/commit_util.c:1070
+#: libsvn_client/commit_util.c:1057
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "item de commit '%s' possui flag de cópia mas uma revisão inválida"
-#: libsvn_client/copy.c:302 libsvn_client/copy.c:1204
-#: libsvn_client/update.c:78
+#: libsvn_client/commit_util.c:1822
+msgid "Standard properties can't be set explicitly as revision properties"
+msgstr ""
+
+#: libsvn_client/copy.c:305 libsvn_client/copy.c:1427
+#: libsvn_client/update.c:98
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Caminho '%s' não é um diretório"
-#: libsvn_client/copy.c:516
+#: libsvn_client/copy.c:658
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
@@ -1062,68 +1058,67 @@
"Origem e destino parecem não estar no mesmo repositório (orig: '%s'; dest: '%"
"s')"
-#: libsvn_client/copy.c:598
+#: libsvn_client/copy.c:740
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Não é possível mover URL '%s' para si mesmo"
-#: libsvn_client/copy.c:607 libsvn_client/prop_commands.c:226
+#: libsvn_client/copy.c:749 libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Caminho '%s' não existe na revisão %ld"
-#: libsvn_client/copy.c:1043
+#: libsvn_client/copy.c:1259
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr ""
"URL fonte '%s' é de um repositório estrangeiro; deixando-o como uma cópia de "
"trabalho disjunta"
-#: libsvn_client/copy.c:1181
+#: libsvn_client/copy.c:1404
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Caminho '%s' não encontrado na revisão %ld"
-#: libsvn_client/copy.c:1186
+#: libsvn_client/copy.c:1409
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Caminho '%s' não encontrado na revisão head"
-#: libsvn_client/copy.c:1229
+#: libsvn_client/copy.c:1452
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr ""
"Entrada para '%s' existe (embora o arquivo de trabalho esteja faltando)"
-#: libsvn_client/copy.c:1323 libsvn_client/log.c:86
+#: libsvn_client/copy.c:1546 libsvn_client/log.c:87
msgid "Revision type requires a working copy path, not a URL"
msgstr "Tipo de revisão requer uma cópia de trabalho, não uma URL"
-#: libsvn_client/copy.c:1357
+#: libsvn_client/copy.c:1581
msgid "Cannot mix repository and working copy sources"
-msgstr ""
-"Não é possível misturar fontes de repositório e de cópia de trabalho"
+msgstr "Não é possível misturar fontes de repositório e de cópia de trabalho"
-#: libsvn_client/copy.c:1398
+#: libsvn_client/copy.c:1623
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Não é possível copiar caimho '%s' para seu próprio filho '%s'"
-#: libsvn_client/copy.c:1418
+#: libsvn_client/copy.c:1643
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Não se pode mover '%s' para si mesmo"
-#: libsvn_client/copy.c:1427
+#: libsvn_client/copy.c:1652
msgid "Moves between the working copy and the repository are not supported"
msgstr "Mudanças entre cópia de trabalho e repositório não são permitidas"
-#: libsvn_client/copy.c:1492
+#: libsvn_client/copy.c:1710
#, c-format
msgid "'%s' does not seem to have a URL associated with it"
msgstr "'%s' não parece ter uma URL associada consigo"
-#: libsvn_client/copy.c:1830 svn/move-cmd.c:60
+#: libsvn_client/copy.c:2048 svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr ""
"Não é possível especificar revisões (exceto HEAD) com operações de mudança"
@@ -1133,88 +1128,77 @@
msgid "'%s' is in the way of the resource actually under version control"
msgstr "'%s' está no caminho do recurso atualmente sobre controle de versão"
+#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2781 libsvn_wc/entries.c:1256
+#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2969
+#: libsvn_wc/update_editor.c:2178
+#, c-format
+msgid "'%s' is not under version control"
+msgstr "'%s' não está sobre controle de versão"
+
#: libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "'%s' possui modificações locais"
-#: libsvn_client/diff.c:99
+#: libsvn_client/diff.c:135
+#, fuzzy, c-format
+msgid " Reverted %s:r%s%s"
+msgstr "Revertido '%s'\n"
+
+#: libsvn_client/diff.c:153
+#, c-format
+msgid " Merged %s:r%s%s"
+msgstr ""
+
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sMudanças de propriedades em: %s%s"
-#: libsvn_client/diff.c:127
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "Nome: %s%s"
-#: libsvn_client/diff.c:203
-#, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr "URLs não possuem esquema ('%s' e '%s')"
-
-#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
-#, c-format
-msgid "URL has no scheme: '%s'"
-msgstr "URL não possui esquema: '%s'"
-
-#: libsvn_client/diff.c:222
-#, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "Acesso às partes de um esquema ainda não suportado ('%s' e '%s')"
-
-#: libsvn_client/diff.c:287
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revisão %ld)"
-#: libsvn_client/diff.c:289
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(cópia de trabalho)"
-#: libsvn_client/diff.c:432
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Não é possível mostrar: arquivo marcado como tipo binário.%s"
-#. xgettext: the '.working', '.merge-left.r%ld' and
-#. '.merge-right.r%ld' strings are used to tag onto a file
-#. name in case of a merge conflict
-#: libsvn_client/diff.c:887
-msgid ".working"
-msgstr ".trabalho"
-
-#: libsvn_client/diff.c:889
-#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".mesclagem-esquerda.r%ld"
-
-#: libsvn_client/diff.c:892
-#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".mesclagem-direita.r%ld"
-
-#: libsvn_client/diff.c:1533 libsvn_client/diff.c:1737
+#. -----------------------------------------------------------------------
+#. ** Utilities. **
+#. Sanity check -- ensure that we have valid revisions to look at.
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "Não estão especificadas todas as revisões requeridas"
-#: libsvn_client/diff.c:1548
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr "Ao menos uma revisão deve ser não local para um diff marcado"
-#: libsvn_client/diff.c:1660 libsvn_client/diff.c:1672
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' não foi encontrado no repositório na revisão %ld"
-#: libsvn_client/diff.c:2018
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+#: libsvn_client/diff.c:1025
+#, fuzzy
+msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr ""
"Desculpe, svn_client_diff3 foi chamado de uma maneira que ainda não é "
"suportada"
-#: libsvn_client/diff.c:2057
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1222,179 +1206,213 @@
"Somente diferenças entre um caminho de texto-base e seus arquivos de "
"trabalho são suportados neste momento"
-#: libsvn_client/diff.c:2202 libsvn_client/switch.c:111
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Diretório '%s' não possui URL"
-#: libsvn_client/diff.c:2409
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr "diff sumarizado só pode comparar repositório com repositório"
-#: libsvn_client/diff.c:2766 libsvn_client/diff.c:2772
-#: libsvn_client/diff.c:2906 libsvn_client/locking_commands.c:263
-#: libsvn_client/ra.c:382 libsvn_client/ra.c:748 libsvn_client/ra.c:885
-#, c-format
-msgid "'%s' has no URL"
-msgstr "'%s' não possui URL"
-
#: libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s' não é um valor válido de EOL"
-#: libsvn_client/export.c:271
+#: libsvn_client/export.c:260
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr ""
"Diretório de destino existe, e não será sobrescrito a menos que forçado"
-#: libsvn_client/export.c:369 libsvn_client/export.c:512
+#: libsvn_client/export.c:358 libsvn_client/export.c:501
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s' existe e não é um diretório"
-#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#: libsvn_client/export.c:362 libsvn_client/export.c:505
#, c-format
msgid "'%s' already exists"
msgstr "'%s' já existe"
-#: libsvn_client/export.c:687 libsvn_wc/adm_crawler.c:908
-#: libsvn_wc/update_editor.c:1871 libsvn_wc/update_editor.c:2516
+#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Checksum não bate para '%s'; esperado: '%s', obtido: '%s'"
-#: libsvn_client/info.c:244
-#, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "Não foi possível ler entrada para '%s'"
-
-#: libsvn_client/info.c:380 libsvn_client/info.c:405 libsvn_client/info.c:415
+#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL '%s' não existente na revisão %ld"
-#: libsvn_client/list.c:226
+#: libsvn_client/list.c:222
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL '%s' não existente nesta revisão"
-#: libsvn_client/locking_commands.c:198
+#: libsvn_client/locking_commands.c:199
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr ""
"Nenhum pai comum encontrado, não é possível operar em argumentos desunidos"
-#: libsvn_client/locking_commands.c:287
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
+#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
+#, c-format
+msgid "'%s' has no URL"
+msgstr "'%s' não possui URL"
+
+#: libsvn_client/locking_commands.c:284
msgid "Unable to lock/unlock across multiple repositories"
msgstr "Não é possível travar/destravar entre vários repositórios"
-#: libsvn_client/locking_commands.c:328
+#: libsvn_client/locking_commands.c:325
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' não está travado nesta cópia de trabalho"
-#: libsvn_client/locking_commands.c:376
+#: libsvn_client/locking_commands.c:373
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' não está travado"
-#: libsvn_client/locking_commands.c:409 libsvn_fs/fs-loader.c:901
-#: libsvn_ra/ra_loader.c:625
+#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:932
+#: libsvn_ra/ra_loader.c:863
msgid "Lock comment contains illegal characters"
msgstr "Comentário de trava contém caracteres ilegais"
-#: libsvn_client/log.c:73
+#: libsvn_client/log.c:74
msgid "Missing required revision specification"
msgstr "Faltando a especificação de revisão requerida"
-#: libsvn_client/log.c:139 libsvn_client/status.c:261
-#: libsvn_client/update.c:92
+#: libsvn_client/log.c:137 libsvn_client/status.c:271
+#: libsvn_client/update.c:112
#, c-format
msgid "Entry '%s' has no URL"
msgstr "Entrada '%s' não possui URL"
-#: libsvn_client/log.c:370
+#: libsvn_client/log.c:368
msgid "No commits in repository"
msgstr "Não há commits no repositório"
-#: libsvn_client/prop_commands.c:71
+#: libsvn_client/merge.c:87
+#, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
+msgstr "URLs não possuem esquema ('%s' e '%s')"
+
+#: libsvn_client/merge.c:93 libsvn_client/merge.c:99
+#, c-format
+msgid "URL has no scheme: '%s'"
+msgstr "URL não possui esquema: '%s'"
+
+#: libsvn_client/merge.c:106
+#, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr "Acesso às partes de um esquema ainda não suportado ('%s' e '%s')"
+
+#. xgettext: the '.working', '.merge-left.r%ld' and
+#. '.merge-right.r%ld' strings are used to tag onto a file
+#. name in case of a merge conflict
+#: libsvn_client/merge.c:328
+msgid ".working"
+msgstr ".trabalho"
+
+#: libsvn_client/merge.c:330
+#, c-format
+msgid ".merge-left.r%ld"
+msgstr ".mesclagem-esquerda.r%ld"
+
+#: libsvn_client/merge.c:333
+#, c-format
+msgid ".merge-right.r%ld"
+msgstr ".mesclagem-direita.r%ld"
+
+#: libsvn_client/merge.c:1164
+#, c-format
+msgid ""
+"Path '%s' is in conflict, and must be resolved before the remainder of the "
+"requested merge can be applied"
+msgstr ""
+
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
+msgid "Use of two URLs is not compatible with merge info modification"
+msgstr ""
+
+#: libsvn_client/prop_commands.c:73
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s' é uma wcprop, portanto não acessível a clientes"
-#: libsvn_client/prop_commands.c:213
+#: libsvn_client/prop_commands.c:216
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "Propriedade '%s' é uma propriedade regular"
-#: libsvn_client/prop_commands.c:315
+#: libsvn_client/prop_commands.c:320
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "Propriedade de revisão '%s' não permitida neste contexto"
-#: libsvn_client/prop_commands.c:323 libsvn_client/prop_commands.c:442
+#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
#, c-format
msgid "Bad property name: '%s'"
msgstr "Nome ruim de propriedade: '%s'"
-#: libsvn_client/prop_commands.c:334
+#: libsvn_client/prop_commands.c:339
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr "Setar propriedade em alvo não local '%s' requer uma revisão base"
-#: libsvn_client/prop_commands.c:340
+#: libsvn_client/prop_commands.c:345
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr ""
"Setar propriedade recursivamente em alvo não local '%s' não é suportado"
-#: libsvn_client/prop_commands.c:438
+#: libsvn_client/prop_commands.c:439
msgid "Value will not be set unless forced"
msgstr "Valor não será setado a menos que seja forçado"
-#: libsvn_client/prop_commands.c:661
+#: libsvn_client/prop_commands.c:659
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "'%s' não existe na revisão %ld"
-#: libsvn_client/prop_commands.c:668 libsvn_client/prop_commands.c:932
+#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:948
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "Tipo de nó desconhecido para '%s'"
-#: libsvn_client/ra.c:132
+#: libsvn_client/ra.c:133
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr ""
"Tentativa de setar propriedade de ct '%s' em '%s' em uma operação não commit"
-#: libsvn_client/ra.c:359
-#, c-format
-msgid "Can't find entry for '%s'"
-msgstr "Não foi possível encontrar entrada para '%s'"
-
-#: libsvn_client/ra.c:503
+#: libsvn_client/ra.c:496
#, c-format
msgid "Missing changed-path information for '%s' in revision %ld"
msgstr "Faltando informação para diretório modificado '%s' na revisão %ld"
-#: libsvn_client/ra.c:623
+#: libsvn_client/ra.c:616
+#, c-format
msgid "Path '%s' doesn't exist in revision %ld"
msgstr "Caminho '%s' não existe na revisão %ld"
-#: libsvn_client/ra.c:670 libsvn_client/ra.c:833
+#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr ""
"Não foi possível encontrar localização de repositório para '%s' na revisão %"
"ld"
-#: libsvn_client/ra.c:681
+#: libsvn_client/ra.c:674
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "'%s' na revisão %ld é um objeto não relacionado"
-#: libsvn_client/ra.c:838
+#: libsvn_client/ra.c:831
#, c-format
msgid ""
"The location for '%s' for revision %ld does not exist in the repository or "
@@ -1413,16 +1431,26 @@
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
msgstr "O repositório em '%s' tem uuid '%s', mas a CT tem '%s'"
-#: libsvn_client/revisions.c:99
+#: libsvn_client/revisions.c:93
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "Caminho '%s' não possui revisão com commit"
-#: libsvn_client/revisions.c:109
+#: libsvn_client/revisions.c:103
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "Tipo de revisão não reconhecido requisitado por '%s'"
+#: libsvn_client/update.c:138 libsvn_wc/log.c:2573
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr "'%s' não é um diretório de cópia de trabalho"
+
+#: libsvn_client/update.c:146
+#, fuzzy, c-format
+msgid "'%s' is neither a file nor a directory"
+msgstr "'%s' não é o nome de um arquivo ou de um diretório"
+
#: libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
msgstr "Compressão de dados de svndiff falhou"
@@ -1558,7 +1586,7 @@
msgid "Can't ungrab FS mutex"
msgstr "Não foi possível disponibilizar mutex FS"
-#: libsvn_fs/fs-loader.c:907
+#: libsvn_fs/fs-loader.c:938
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Data de expiração negativa passada para svn_fs_lock"
@@ -1575,15 +1603,15 @@
msgid "deleting changes"
msgstr "apagando mudanças"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2385
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "Faltando ID de revisão de nó requerido"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2395
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "Ordem de mudança inválida: novo ID de revisão de nó sem delete"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2406
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "Ordem de mudança inválida: mudança não-add em caminho removido"
@@ -1702,114 +1730,114 @@
msgid "set repository uuid"
msgstr "seta uuid de repositório"
-#: libsvn_fs_base/dag.c:217
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"BD corrompido: id da transactions inicial não é '0' no sistema de arquivos '%"
"s'"
-#: libsvn_fs_base/dag.c:225
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr ""
"BD corrompido: id de cópia inicial não é '0' no sistema de arquivos '%s'"
-#: libsvn_fs_base/dag.c:234
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr ""
"BD corrompido: número de revisão inicial não é '0' no sistema de arquivos '%"
"s'"
-#: libsvn_fs_base/dag.c:282 libsvn_fs_base/dag.c:458 libsvn_fs_fs/dag.c:334
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "Tentativa de criar entrada em pai não-diretório"
-#: libsvn_fs_base/dag.c:452 libsvn_fs_fs/dag.c:328
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Tentativa de criar um nó com um nome ilegal '%s'"
-#: libsvn_fs_base/dag.c:464 libsvn_fs_base/dag.c:698 libsvn_fs_fs/dag.c:340
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "Tentativa de clonar filho de nó não-mutável"
-#: libsvn_fs_base/dag.c:471
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Tentativa de criar entrada que já existe"
-#: libsvn_fs_base/dag.c:522 libsvn_fs_fs/dag.c:402
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "Tentativa de setar entrada em nó não-diretório"
-#: libsvn_fs_base/dag.c:528 libsvn_fs_fs/dag.c:408
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "Tentativa de setar entrada em nó imutável"
-#: libsvn_fs_base/dag.c:592
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "Não foi possível setar proplist em um nó-revisão *imutável* %s"
-#: libsvn_fs_base/dag.c:704
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "Tentativa de criar um clone filho com um nome ilegal '%s'"
-#: libsvn_fs_base/dag.c:830
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "Tentativa de apagar entrada '%s' de nó *não*-diretório"
-#: libsvn_fs_base/dag.c:836
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "Tentativa de apagar entrada '%s' de nó diretório imutável"
-#: libsvn_fs_base/dag.c:843
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Tentativa de apagar um nó com um nome ilegal '%s'"
-#: libsvn_fs_base/dag.c:858 libsvn_fs_base/dag.c:891
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Remoção falhou: diretório não possui entrada '%s'"
-#: libsvn_fs_base/dag.c:940
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Tentativa de remoção de nó imutável"
-#: libsvn_fs_base/dag.c:1060
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "Tentativa de obter contexto textual de um nó *não*-arquivo"
-#: libsvn_fs_base/dag.c:1095
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Tentativa de obter o comprimento de um nó *não*-arquivo"
-#: libsvn_fs_base/dag.c:1121
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "Tentativa de obter checksum de um nó *não*-arquivo"
-#: libsvn_fs_base/dag.c:1152 libsvn_fs_base/dag.c:1206
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "Tentativa de setar conteúdo textual em nó *não*-arquivo"
-#: libsvn_fs_base/dag.c:1158 libsvn_fs_base/dag.c:1212
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Tentativa de setar conteúdo textual em nó imutável"
-#: libsvn_fs_base/dag.c:1235
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1820,12 +1848,12 @@
" esperado: %s\n"
" obtido: %s\n"
-#: libsvn_fs_base/dag.c:1290
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Tentativa de abrir um nó filho não-existente '%s'"
-#: libsvn_fs_base/dag.c:1296
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Tentativa de abrir nó com um nome ilegal '%s'"
@@ -1939,43 +1967,43 @@
msgstr ""
"Caminho '%s' já está travado pelo usuário '%s' no sistema de arquivos '%s'"
-#: libsvn_fs_base/fs.c:79
+#: libsvn_fs_base/fs.c:80
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr ""
"Versão de banco de dados ruim: obteve %d.%d.%d, deve ser ao menos %d.%d.%d"
-#: libsvn_fs_base/fs.c:90
+#: libsvn_fs_base/fs.c:91
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr ""
"Versão de banco de dados ruim: compilado com %d.%d.%d, rodando em %d.%d.%d"
-#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:54
+#: libsvn_fs_base/fs.c:109 libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "Objeto sistema de arquivos já está aberto"
-#: libsvn_fs_base/fs.c:189
+#: libsvn_fs_base/fs.c:190
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr "Erro Berkeley DB para sistema de arquivos '%s' ao fechar ambiente\n"
-#: libsvn_fs_base/fs.c:539
+#: libsvn_fs_base/fs.c:540
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr "Erro Berkeley DB para sistema de arquivos '%s' ao criar ambiente:\n"
-#: libsvn_fs_base/fs.c:545
+#: libsvn_fs_base/fs.c:546
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr "Erro Berkeley DB para sistema de arquivos '%s' ao abrir ambiente:\n"
-#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:631
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Esperado formato de SA '%d'; encontrado formato '%d'"
-#: libsvn_fs_base/fs.c:1094
+#: libsvn_fs_base/fs.c:1112
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
"may be interfering with the hotcopy algorithm. If \n"
@@ -1986,7 +2014,7 @@
"pode estar interferindo com o algorítmo hotcopy. Se o problema\n"
"persistir, tente desativar esta funcionalidade em DB_CONFIG"
-#: libsvn_fs_base/fs.c:1113
+#: libsvn_fs_base/fs.c:1131
msgid ""
"Error running catastrophic recovery on hotcopy; the \n"
"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
@@ -1998,29 +2026,29 @@
"algorítmo hotcopy. Se o problema persistir, tente desativar esta\n"
"funcionalidade em DB_CONFIG"
-#: libsvn_fs_base/fs.c:1222
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr "Módulo para se trabalhar com um repositório Berkeley DB"
-#: libsvn_fs_base/fs.c:1255
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Versão de FS loader (%d) não suportada para bdb"
-#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr ""
"Não foi possível verificar trava no caminho '%s'; nenhum nome de usuário "
"disponível"
-#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr ""
"Usuário %s não possui trava no caminho '%s' (atualmente travado por %s)"
-#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr ""
@@ -2105,17 +2133,17 @@
msgid "Failed to calculate MD5 digest for '%s'"
msgstr "Falhou ao calcular código MD5 para '%s'"
-#: libsvn_fs_base/revs-txns.c:65
+#: libsvn_fs_base/revs-txns.c:67
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "Transação não está morta: '%s'"
-#: libsvn_fs_base/revs-txns.c:68
+#: libsvn_fs_base/revs-txns.c:70
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "Transação está morta: '%s'"
-#: libsvn_fs_base/revs-txns.c:981
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "Transação abortada, mas limpeza falhou"
@@ -2125,87 +2153,87 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:389 libsvn_fs_fs/tree.c:309
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "Arquivo não encontrado: transação '%s', caminho '%s'"
-#: libsvn_fs_base/tree.c:394 libsvn_fs_fs/tree.c:314
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "Arquivo não encontrado: revisão %ld, caminho '%s'"
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:404 libsvn_fs_fs/tree.c:329
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr ""
"Arquivo já existe: sistema de arquivos '%s', transação '%s', caminho '%s'"
-#: libsvn_fs_base/tree.c:409 libsvn_fs_fs/tree.c:335
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "Arquivo já existe: sistema de arquivos '%s', revisão %ld, caminho '%s'"
-#: libsvn_fs_base/tree.c:417 libsvn_fs_fs/tree.c:345
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "Objeto raiz tem que ser uma raiz de transação"
-#: libsvn_fs_base/tree.c:832 libsvn_fs_fs/tree.c:754
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "Falha ao abrir '%s'"
-#: libsvn_fs_base/tree.c:1402 libsvn_fs_fs/tree.c:1152
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr ""
"Não é possível comparar valores de propriedades de dois sistemas arquivos "
"diferentes"
-#: libsvn_fs_base/tree.c:1735
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "BD corrompido: contador de predecessores incorreto"
-#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1189
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Nó imutável inesperado em '%s'"
-#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1212
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "Conflito em '%s'"
-#: libsvn_fs_base/tree.c:1861 libsvn_fs_base/tree.c:2566
-#: libsvn_fs_fs/tree.c:1261 libsvn_fs_fs/tree.c:1748
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr "Merge ruim; ancestral, fonte, e alvo não estão em mesmo sa"
-#: libsvn_fs_base/tree.c:1877 libsvn_fs_fs/tree.c:1277
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr "Merge ruim; alvo '%s' tem id '%s', mesmo que ancestral"
-#: libsvn_fs_base/tree.c:2373
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "Transação '%s' desatualizada em relação à revisão '%s'"
-#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1887
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "A raiz do diretório não pode ser apagada"
-#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1959
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr ""
"Não é possível copiar entre dois sistemas arquivos diferentes ('%s' e '%s')"
-#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1965
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "Cópia de árvore mutável não é suportada atualmente"
-#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2389
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2216,24 +2244,24 @@
" esperado: %s\n"
" obtido: %s\n"
-#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2625
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr ""
"Não é possível comparar conteúdos de arquivos entre dois sistemas arquivos "
"diferentes"
-#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
-#: libsvn_fs_fs/tree.c:2634 libsvn_fs_fs/tree.c:2639
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
msgstr "'%s' não é um arquivo"
-#: libsvn_fs_fs/dag.c:384
+#: libsvn_fs_fs/dag.c:383
msgid "Can't get entries of non-directory"
msgstr "Não é possível obter entradas de um não-diretório"
-#: libsvn_fs_fs/dag.c:931
+#: libsvn_fs_fs/dag.c:930
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2250,68 +2278,68 @@
msgstr ""
"Arquivo de trava corrompido para o caminho '%s' no sistema de arquvos '%s'"
-#: libsvn_fs_fs/fs.c:89
+#: libsvn_fs_fs/fs.c:88
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Não foi possível buscar dados FSFS compartilhados"
-#: libsvn_fs_fs/fs.c:105
+#: libsvn_fs_fs/fs.c:104
#, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "Não é possível criar mutex FSFS de escrita"
-#: libsvn_fs_fs/fs.c:113
+#: libsvn_fs_fs/fs.c:112
#, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "Não é possível criar mutex FSFS de txn"
-#: libsvn_fs_fs/fs.c:119
+#: libsvn_fs_fs/fs.c:118
#, c-format
msgid "Can't store FSFS shared data"
msgstr "Não foi possível armazenar dado compartilhado FSFS"
-#: libsvn_fs_fs/fs.c:345
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr "Módulo para se trabalhar com um repositório de arquivo simples (FSFS)"
-#: libsvn_fs_fs/fs.c:378
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Versão (%d) de FS loader não suportada para fsfs"
-#: libsvn_fs_fs/fs_fs.c:340
+#: libsvn_fs_fs/fs_fs.c:352
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "Não foi possível obter mutex FSFS de lista de txn"
-#: libsvn_fs_fs/fs_fs.c:348
+#: libsvn_fs_fs/fs_fs.c:360
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "Não foi possível disponibilizar mutex FSFS de lista de txn"
-#: libsvn_fs_fs/fs_fs.c:374
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Não foi possível destravar transação desconhecida '%s'"
-#: libsvn_fs_fs/fs_fs.c:378
+#: libsvn_fs_fs/fs_fs.c:390
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "Não foi possível destravar transação não travada '%s'"
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr "Não foi possível destravar o arquivo de travas para revisão '%s'"
-#: libsvn_fs_fs/fs_fs.c:391
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr ""
"Não foi possível fechar o arquivo protótipo de trava de revisão para "
"transação '%s'"
-#: libsvn_fs_fs/fs_fs.c:453
+#: libsvn_fs_fs/fs_fs.c:465
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2321,7 +2349,7 @@
"transação '%s' porque uma representação prévia está sendo escrita por este "
"processo"
-#: libsvn_fs_fs/fs_fs.c:489
+#: libsvn_fs_fs/fs_fs.c:501
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2331,93 +2359,94 @@
"transação '%s' porque uma representação prévia está sendo escrita por outro "
"processo"
-#: libsvn_fs_fs/fs_fs.c:496 libsvn_subr/io.c:1511
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Não foi possível obter trava exclusiva no arquivo '%s'"
-#: libsvn_fs_fs/fs_fs.c:825 libsvn_fs_fs/fs_fs.c:839
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "Cabeçalho mal formado encontrado em arquivo de revisão"
-#: libsvn_fs_fs/fs_fs.c:941 libsvn_fs_fs/fs_fs.c:955 libsvn_fs_fs/fs_fs.c:962
-#: libsvn_fs_fs/fs_fs.c:969 libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "Linha de texto de rep mal formada em node-rev"
-#: libsvn_fs_fs/fs_fs.c:1054
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "Faltando o campo kind em node-rev"
-#: libsvn_fs_fs/fs_fs.c:1085
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "Faltando cpath em node-rev"
-#: libsvn_fs_fs/fs_fs.c:1112 libsvn_fs_fs/fs_fs.c:1118
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "copyroot mal formada em linha node-rev"
-#: libsvn_fs_fs/fs_fs.c:1136 libsvn_fs_fs/fs_fs.c:1142
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "copyfrom mal formada em linha node-rev"
-#: libsvn_fs_fs/fs_fs.c:1251 libsvn_fs_fs/fs_fs.c:3613
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "Tentativa de escrever em não transacional"
-#: libsvn_fs_fs/fs_fs.c:1335
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "Cabeçalho de representação mal formado"
-#: libsvn_fs_fs/fs_fs.c:1359
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "Faltando node-id em node-rev"
-#: libsvn_fs_fs/fs_fs.c:1365
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "node-id corrompido em node-rev"
-#: libsvn_fs_fs/fs_fs.c:1410
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "Arquivo de revisão não possui 'newline' final"
-#: libsvn_fs_fs/fs_fs.c:1422
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "Linha final em arquivo de revisão possui mais de 64 caracteres"
-#: libsvn_fs_fs/fs_fs.c:1437
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "Faltando espaço na linha final do arquivo de revisão"
-#: libsvn_fs_fs/fs_fs.c:1466 libsvn_fs_fs/fs_fs.c:1524 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "Não há revisão %ld"
-#: libsvn_fs_fs/fs_fs.c:1584
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "Dado svndiff mal formado em dado de representação"
-#: libsvn_fs_fs/fs_fs.c:1727 libsvn_fs_fs/fs_fs.c:1740
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "Lendo uma janela de leitura svndiff além do fim da representação"
-#: libsvn_fs_fs/fs_fs.c:1876
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "Dado de svndiff requer fonte não existente"
-#: libsvn_fs_fs/fs_fs.c:1882
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "svndiff requeriu posição além do final da cadeia"
-#: libsvn_fs_fs/fs_fs.c:1905 libsvn_fs_fs/fs_fs.c:1922
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "Tamanho da janela svndiff está corrompido"
-#: libsvn_fs_fs/fs_fs.c:1970
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2428,136 +2457,155 @@
" esperado: %s\n"
" obtido: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2193 libsvn_fs_fs/fs_fs.c:2206
-#: libsvn_fs_fs/fs_fs.c:2212
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "Entrada de diretório corrompida"
-#: libsvn_fs_fs/fs_fs.c:2551 libsvn_fs_fs/fs_fs.c:2559
-#: libsvn_fs_fs/fs_fs.c:2591 libsvn_fs_fs/fs_fs.c:2611
-#: libsvn_fs_fs/fs_fs.c:2645 libsvn_fs_fs/fs_fs.c:2650
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "Linha de mudança inválida em rev-file"
-#: libsvn_fs_fs/fs_fs.c:2584
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "Tipo de mudança inválido em arquivo rev"
-#: libsvn_fs_fs/fs_fs.c:2604
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "Flag text-mod inválida em rev-file"
-#: libsvn_fs_fs/fs_fs.c:2624
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "Flag prop-mod inválida em rev-file"
-#: libsvn_fs_fs/fs_fs.c:2808
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "Não é permitido copiar de transações"
-#: libsvn_fs_fs/fs_fs.c:2864
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr ""
"Não foi possível criar diretório de transação em '%s' para a revisão %ld"
-#: libsvn_fs_fs/fs_fs.c:3045 libsvn_fs_fs/fs_fs.c:3052
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "Arquivo next-id corrompido"
-#: libsvn_fs_fs/fs_fs.c:3139
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "Limpesa de transação falhou"
-#: libsvn_fs_fs/fs_fs.c:3307
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "Tipo de mudança inválido"
-#: libsvn_fs_fs/fs_fs.c:3632
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "Não pode setar conteúdo de texto de um diretório"
-#: libsvn_fs_fs/fs_fs.c:3722 libsvn_fs_fs/fs_fs.c:3727
-#: libsvn_fs_fs/fs_fs.c:3734
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "Arquivo corrente corrompido"
-#: libsvn_fs_fs/fs_fs.c:4023 libsvn_subr/io.c:2753 svn/util.c:236
-#: svn/util.c:251 svn/util.c:275
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
+#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "Não é possível executar stat '%s'"
-#: libsvn_fs_fs/fs_fs.c:4027
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "Não é possível aplicar chmod a '%s'"
-#: libsvn_fs_fs/fs_fs.c:4167
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "Não foi possível obter mutex de repositório FSFS"
-#: libsvn_fs_fs/fs_fs.c:4181
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "Não foi possível disponibilizar mutex de repositório FSFS"
-#: libsvn_fs_fs/fs_fs.c:4299
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "Transação desatualizada"
-#: libsvn_fs_fs/fs_fs.c:4599
+#: libsvn_fs_fs/fs_fs.c:4807
+#, fuzzy
+msgid "Recovery encountered a non-directory node"
+msgstr "Tentativa de setar entrada em nó não-diretório"
+
+#: libsvn_fs_fs/fs_fs.c:4829
+msgid "Recovery encountered a deltified directory representation"
+msgstr ""
+
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "Não existe tal transação"
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "Não é possível escrever hash de trava/entradas '%s'"
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "Não é possível executar parse de hash de trava/entradas '%s'"
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "caminho '%s' não existe na revisão HEAD"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "Trava falhou: nova versão de '%s' existe"
+#: libsvn_fs_util/merge-info-sqlite-index.c:102
+msgid "Merge Tracking schema format not set"
+msgstr ""
+
+#: libsvn_fs_util/merge-info-sqlite-index.c:107
+#, c-format
+msgid "Merge Tracking schema format %d not recognized"
+msgstr ""
+
#: libsvn_ra/ra_loader.c:213
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr ""
"Versão de RA não bate para '%s': encontrado %d.%d.%d%s, esperado %d.%d.%d%s"
-#: libsvn_ra/ra_loader.c:285
+#: libsvn_ra/ra_loader.c:397
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Esquema URL não reconhecido para '%s'"
-#: libsvn_ra/ra_loader.c:336
+#: libsvn_ra/ra_loader.c:448
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "'%s' não está no mesmo repositório de '%s'"
-#: libsvn_ra/ra_loader.c:707
+#: libsvn_ra/ra_loader.c:945
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - trata esquema '%s'\n"
-#: libsvn_ra/ra_loader.c:793
+#: libsvn_ra/ra_loader.c:1031
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Esquema URL não reconhecido '%s'"
-#: libsvn_ra_dav/commit.c:225
+#: libsvn_ra_dav/commit.c:222
msgid ""
"Could not fetch the Version Resource URL (needed during an import or when it "
"is missing from the local, cached props)"
@@ -2565,22 +2613,22 @@
"Não foi possível obter o Version Resource URL (necessário durante uma "
"importação ou quando está faltando do props em cache e local)"
-#: libsvn_ra_dav/commit.c:462 libsvn_ra_serf/commit.c:374
+#: libsvn_ra_dav/commit.c:459 libsvn_ra_serf/commit.c:374
#: libsvn_ra_serf/commit.c:435
#, c-format
msgid "Your file or directory '%s' is probably out-of-date"
msgstr "Seu arquivo ou diretório '%s' provavelmente está desatualizado"
-#: libsvn_ra_dav/commit.c:470
+#: libsvn_ra_dav/commit.c:467
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "A resposta CHECKOUT não contém o cabeçalho 'Location:'"
-#: libsvn_ra_dav/commit.c:997 libsvn_ra_serf/commit.c:1403
+#: libsvn_ra_dav/commit.c:994 libsvn_ra_serf/commit.c:1427
#, c-format
msgid "File '%s' already exists"
msgstr "Arquivo '%s' já existe"
-#: libsvn_ra_dav/commit.c:1115
+#: libsvn_ra_dav/commit.c:1112
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "Não foi possível escrever svndiff para arquivo temporário"
@@ -2597,7 +2645,7 @@
msgid "Could not save file"
msgstr "Não foi possível gravar arquivo"
-#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:909
+#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:920
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2660,7 +2708,7 @@
msgid "Unknown XML encoding: '%s'"
msgstr "Codificação XML desconhecida: '%s'"
-#: libsvn_ra_dav/fetch.c:2940
+#: libsvn_ra_dav/fetch.c:2952
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr ""
@@ -2857,22 +2905,22 @@
msgid "SSL is not supported"
msgstr "SLL não é suportado"
-#: libsvn_ra_dav/session.c:819
+#: libsvn_ra_dav/session.c:825
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr ""
"Config inválido: não foi possível carregar arquivo de certificados '%s'"
-#: libsvn_ra_dav/session.c:928
+#: libsvn_ra_dav/session.c:934
msgid "The UUID property was not found on the resource or any of its parents"
msgstr ""
"A propriedade UUID não foi encontrada no recurso ou em nenhum de seus pais"
-#: libsvn_ra_dav/session.c:936
+#: libsvn_ra_dav/session.c:942
msgid "Please upgrade the server to 0.19 or later"
msgstr "Por favor atualize o servidor para 0.19 ou superior"
-#: libsvn_ra_dav/session.c:1002
+#: libsvn_ra_dav/session.c:1009
#, c-format
msgid "Unsupported RA loader version (%d) for ra_dav"
msgstr "Versão de loader RA (%d) não suportada para ra_dav"
@@ -2948,8 +2996,8 @@
msgid "%s request failed on '%s'"
msgstr "Requisição %s falhou em '%s'"
-#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:588
-#: libsvn_wc/update_editor.c:2681
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -2962,15 +3010,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "Módulo para acessar um repositório em disco local"
-#: libsvn_ra_local/ra_plugin.c:285
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "Não foi possível abrir uma sessão ra_local para URL"
-#: libsvn_ra_local/ra_plugin.c:1392
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Versão de loader RA (%d) não suportada para ra_local"
@@ -2996,7 +3044,7 @@
msgstr "Não foi possível abrir repositório '%s'"
#: libsvn_ra_serf/commit.c:367 libsvn_ra_serf/commit.c:428
-#: libsvn_repos/commit.c:393
+#: libsvn_repos/commit.c:375
#, c-format
msgid "Path '%s' not present"
msgstr "Caminho '%s' não presente"
@@ -3006,7 +3054,8 @@
msgid "Failed writing updated file"
msgstr "Falhou ao gravar arquivo atualizado"
-#: libsvn_ra_serf/commit.c:1216
+#: libsvn_ra_serf/commit.c:1240
+#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr "Falhou ao incluir diretório: %s em %s (%d)"
@@ -3077,203 +3126,226 @@
msgid "Access repository via WebDAV protocol through serf."
msgstr "Acessa repositório via protocolo WebDAV através de serf."
-#: libsvn_ra_serf/serf.c:155
+#: libsvn_ra_serf/serf.c:161
#, c-format
msgid "Could not lookup hostname: %s://%s"
msgstr "Não foi possível localizar nome do host: %s://%s"
-#: libsvn_ra_serf/serf.c:732
+#: libsvn_ra_serf/serf.c:737
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Versão de RA loader (%d) não suportada para ra_serf"
-#: libsvn_ra_serf/update.c:2116
+#: libsvn_ra_serf/update.c:2155
#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "Error buscando REPORT (%d)"
-#: libsvn_ra_serf/util.c:755
+#: libsvn_ra_serf/util.c:874
msgid "Unspecified error message"
msgstr "Mensagem de error não especificada"
-#: libsvn_ra_serf/util.c:816
+#: libsvn_ra_serf/util.c:935
msgid "Premature EOF seen from server"
msgstr "EOF prematuro visto para servidor"
-#: libsvn_ra_svn/client.c:115
+#: libsvn_ra_svn/client.c:124
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Nome de servidor '%s' desconhecido"
-#: libsvn_ra_svn/client.c:127
+#: libsvn_ra_svn/client.c:136
#, c-format
msgid "Can't create socket"
msgstr "Não foi possível criar socket"
-#: libsvn_ra_svn/client.c:131
+#: libsvn_ra_svn/client.c:140
#, c-format
msgid "Can't connect to host '%s'"
msgstr "Não foi possível conectar ao servidor '%s'"
-#: libsvn_ra_svn/client.c:152
-msgid "Proplist element not a list"
-msgstr "Elemento proplist não é uma lista"
-
-#: libsvn_ra_svn/client.c:176
+#: libsvn_ra_svn/client.c:163
msgid "Prop diffs element not a list"
msgstr "Elemento prop diff não é uma lista"
-#: libsvn_ra_svn/client.c:214
+#: libsvn_ra_svn/client.c:201
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "Tipo de nó '%s' não reconhecido do servidor"
-#: libsvn_ra_svn/client.c:365
+#: libsvn_ra_svn/client.c:357
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Esquema de túnel '%s' não definido"
-#: libsvn_ra_svn/client.c:382
+#: libsvn_ra_svn/client.c:374
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "Esquema de túnel %s requer que variável de ambiente %s seja definida"
-#: libsvn_ra_svn/client.c:393
+#: libsvn_ra_svn/client.c:385
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Não é possível separar comando '%s' em tokens"
-#: libsvn_ra_svn/client.c:424
+#: libsvn_ra_svn/client.c:416
#, c-format
msgid "Error in child process: %s"
msgstr "Erro no processo filho: %s"
-#: libsvn_ra_svn/client.c:448
+#: libsvn_ra_svn/client.c:440
#, c-format
msgid "Can't create tunnel"
msgstr "Não é possível criar túnel"
-#: libsvn_ra_svn/client.c:486
+#: libsvn_ra_svn/client.c:478
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "Repositório svn ilegal '%s'"
-#: libsvn_ra_svn/client.c:543
+#: libsvn_ra_svn/client.c:535
#, c-format
msgid "Server requires minimum version %d"
msgstr "Servidor requer versão mínima %d"
-#: libsvn_ra_svn/client.c:589
+#: libsvn_ra_svn/client.c:584
msgid "Impossibly long repository root from server"
msgstr "Raiz de repositório impossivelmente longa do servidor"
-#: libsvn_ra_svn/client.c:600
+#: libsvn_ra_svn/client.c:595
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Módulo para acessar um repositório usando o protocolo de rede svn."
-#: libsvn_ra_svn/client.c:748
+#: libsvn_ra_svn/client.c:743
msgid "Server did not send repository root"
msgstr "Servidor não enviou a raiz do repositório"
-#: libsvn_ra_svn/client.c:889
+#: libsvn_ra_svn/client.c:816
+msgid ""
+"Server doesn't support setting arbitrary revision properties during commit"
+msgstr ""
+
+#: libsvn_ra_svn/client.c:900
msgid "Non-string as part of file contents"
msgstr "Não-string como parte de conteúdo de arquivo"
-#: libsvn_ra_svn/client.c:988
+#: libsvn_ra_svn/client.c:999
msgid "Dirlist element not a list"
msgstr "Elemento dirlist não é uma lista"
-#: libsvn_ra_svn/client.c:1145
+#: libsvn_ra_svn/client.c:1060
+#, fuzzy
+msgid "Merge info element is not a list"
+msgstr "Elemento prop diff não é uma lista"
+
+#: libsvn_ra_svn/client.c:1219
msgid "Log entry not a list"
msgstr "Entrada de log não é uma lista"
-#: libsvn_ra_svn/client.c:1158
+#: libsvn_ra_svn/client.c:1232
msgid "Changed-path entry not a list"
msgstr "Entrada changed-path não é uma lista"
-#: libsvn_ra_svn/client.c:1234
+#: libsvn_ra_svn/client.c:1308
msgid "'stat' not implemented"
msgstr "'stat' não implementado"
-#: libsvn_ra_svn/client.c:1291
+#: libsvn_ra_svn/client.c:1365
msgid "'get-locations' not implemented"
msgstr "'get-locations' não implementado"
-#: libsvn_ra_svn/client.c:1303
+#: libsvn_ra_svn/client.c:1377
msgid "Location entry not a list"
msgstr "Entrada location não é uma lista"
-#: libsvn_ra_svn/client.c:1353
+#: libsvn_ra_svn/client.c:1427
msgid "'get-file-revs' not implemented"
msgstr "'get-file-revs' não implementado"
-#: libsvn_ra_svn/client.c:1366
+#: libsvn_ra_svn/client.c:1440
msgid "Revision entry not a list"
msgstr "Entreada de revisão não é uma lista"
-#: libsvn_ra_svn/client.c:1379 libsvn_ra_svn/client.c:1404
+#: libsvn_ra_svn/client.c:1453 libsvn_ra_svn/client.c:1478
msgid "Text delta chunk not a string"
msgstr "Bloco delta de texto não é uma lista"
-#: libsvn_ra_svn/client.c:1416
+#: libsvn_ra_svn/client.c:1490
msgid "The get-file-revs command didn't return any revisions"
msgstr "O comando get-file-revs não retornou nenhuma revisão"
-#: libsvn_ra_svn/client.c:1464
+#: libsvn_ra_svn/client.c:1538
msgid "Server doesn't support the lock command"
msgstr "Servidor não suporta o comando de travamento (lock)"
-#: libsvn_ra_svn/client.c:1528
+#: libsvn_ra_svn/client.c:1602
msgid "Server doesn't support the unlock command"
msgstr "Servidor não suporta o comando de destravamento (unlock)"
-#: libsvn_ra_svn/client.c:1625
+#: libsvn_ra_svn/client.c:1699
msgid "Lock response not a list"
msgstr "Resposta de travar não é uma lista"
-#: libsvn_ra_svn/client.c:1639
+#: libsvn_ra_svn/client.c:1713
msgid "Unknown status for lock command"
msgstr "Estado desconhecido para comando de trava"
-#: libsvn_ra_svn/client.c:1661
+#: libsvn_ra_svn/client.c:1735
msgid "Didn't receive end marker for lock responses"
msgstr "Marca de fim não foi recebida para resposta de travar"
-#: libsvn_ra_svn/client.c:1748
+#: libsvn_ra_svn/client.c:1822
msgid "Unlock response not a list"
msgstr "Resposta de destravar não é uma lista"
-#: libsvn_ra_svn/client.c:1762
+#: libsvn_ra_svn/client.c:1836
msgid "Unknown status for unlock command"
msgstr "Estado desconhecido para comando destravar"
-#: libsvn_ra_svn/client.c:1783
+#: libsvn_ra_svn/client.c:1857
msgid "Didn't receive end marker for unlock responses"
msgstr "Marca de fim não foi recebida para resposta de destravar"
-#: libsvn_ra_svn/client.c:1807 libsvn_ra_svn/client.c:1835
+#: libsvn_ra_svn/client.c:1881 libsvn_ra_svn/client.c:1909
msgid "Server doesn't support the get-lock command"
msgstr "Servidor não suporta o comando get-lock"
-#: libsvn_ra_svn/client.c:1848
+#: libsvn_ra_svn/client.c:1922
msgid "Lock element not a list"
msgstr "Elemento de trava não é uma lista"
-#: libsvn_ra_svn/client.c:1871
+#: libsvn_ra_svn/client.c:1945
msgid "Server doesn't support the replay command"
msgstr "Servidor não suporta o comando replay"
-#: libsvn_ra_svn/client.c:1935
+#: libsvn_ra_svn/client.c:2010
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Versão (%d) de RA loader não suportada para ra_svn"
#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/sasl_auth.c:389 libsvn_ra_svn/sasl_auth.c:444
-#: libsvn_ra_svn/simple_auth.c:61
+#: libsvn_ra_svn/cyrus_auth.c:437 libsvn_ra_svn/cyrus_auth.c:484
+#: libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "Resposta do servidor não esperada para autenticação"
+#: libsvn_ra_svn/cyrus_auth.c:171 svnserve/cyrus_auth.c:104
+#: svnserve/cyrus_auth.c:114
+#, c-format
+msgid "Could not initialize the SASL library"
+msgstr "Não foi possível inicializar a biblioteca SASL"
+
+#: libsvn_ra_svn/cyrus_auth.c:824 libsvn_ra_svn/internal_auth.c:57
+#: libsvn_ra_svn/internal_auth.c:110
+#, c-format
+msgid "Authentication error from server: %s"
+msgstr "Erro de autenticação do servidor: %s"
+
+#: libsvn_ra_svn/cyrus_auth.c:828
+#, fuzzy
+msgid "Can't get username or password"
+msgstr "Não foi possível obter senha"
+
#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
msgstr "Token de arquivo ou diretório inválidos durante edição"
@@ -3299,11 +3371,16 @@
msgid "Apply-textdelta not active"
msgstr "Apply-textdelta não ativo"
-#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:845
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:896
#, c-format
msgid "Unknown command '%s'"
msgstr "Comando desconhecido '%s'"
+#: libsvn_ra_svn/internal_auth.c:97 libsvn_subr/prompt.c:156
+#, c-format
+msgid "Can't get password"
+msgstr "Não foi possível obter senha"
+
#: libsvn_ra_svn/marshal.c:86
msgid "Capability entry is not a word"
msgstr "Entrada de capacidade não é uma palavra"
@@ -3313,61 +3390,35 @@
msgid "Connection closed unexpectedly"
msgstr "Conexão fechada inesperadamente"
-#: libsvn_ra_svn/marshal.c:509
+#: libsvn_ra_svn/marshal.c:536
msgid "String length larger than maximum"
msgstr "Tamanho da string maior que o máximo"
-#: libsvn_ra_svn/marshal.c:546
+#: libsvn_ra_svn/marshal.c:573
msgid "Too many nested items"
msgstr "Muitos itens aninhados"
-#: libsvn_ra_svn/marshal.c:565
+#: libsvn_ra_svn/marshal.c:592
msgid "Number is larger than maximum"
msgstr "Número é maior que o máximo"
-#: libsvn_ra_svn/marshal.c:768
+#: libsvn_ra_svn/marshal.c:796
+msgid "Proplist element not a list"
+msgstr "Elemento proplist não é uma lista"
+
+#: libsvn_ra_svn/marshal.c:819
msgid "Empty error list"
msgstr "Lista de erro vazia"
-#: libsvn_ra_svn/marshal.c:777
+#: libsvn_ra_svn/marshal.c:828
msgid "Malformed error list"
msgstr "Lista de erro mal formada"
-#: libsvn_ra_svn/marshal.c:816
+#: libsvn_ra_svn/marshal.c:867
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "Status '%s' desconhecido em resposta de comando"
-#: libsvn_ra_svn/sasl_auth.c:179 svnserve/sasl_auth.c:104
-#: svnserve/sasl_auth.c:114
-#, c-format
-msgid "Could not initialize the SASL library"
-msgstr "Não foi possível inicializar a biblioteca SASL"
-
-#: libsvn_ra_svn/sasl_auth.c:279
-msgid "Can't get user name"
-msgstr "Não foi possível obter o nome do usuário"
-
-#: libsvn_ra_svn/sasl_auth.c:286 libsvn_ra_svn/simple_auth.c:97
-#: libsvn_subr/prompt.c:156
-#, c-format
-msgid "Can't get password"
-msgstr "Não foi possível obter senha"
-
-#: libsvn_ra_svn/sasl_auth.c:293
-msgid "Unhandled SASL interaction"
-msgstr "Iteração SASL não tratada"
-
-#: libsvn_ra_svn/sasl_auth.c:761 libsvn_ra_svn/simple_auth.c:58
-#: libsvn_ra_svn/simple_auth.c:110
-#, c-format
-msgid "Authentication error from server: %s"
-msgstr "Erro de autenticação do servidor: %s"
-
-#: libsvn_ra_svn/simple_auth.c:117
-msgid "Cannot negotiate authentication mechanism"
-msgstr "Não foi possível negociar mecanismo de autenticação"
-
#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
@@ -3383,22 +3434,22 @@
msgid "Can't get socket timeout"
msgstr "Não foi possível obter timeout de socket"
-#: libsvn_repos/commit.c:128
+#: libsvn_repos/commit.c:125
#, c-format
msgid "Out of date: '%s' in transaction '%s'"
msgstr "Desatualizado: '%s' na transação '%s'"
-#: libsvn_repos/commit.c:292 libsvn_repos/commit.c:453
+#: libsvn_repos/commit.c:274 libsvn_repos/commit.c:435
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "Obteve caminho fonte mas nenhuma revisão fonte para '%s'"
-#: libsvn_repos/commit.c:324 libsvn_repos/commit.c:484
+#: libsvn_repos/commit.c:306 libsvn_repos/commit.c:466
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "URL fonte '%s' é de um repositório diferente"
-#: libsvn_repos/commit.c:609
+#: libsvn_repos/commit.c:591
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3462,7 +3513,7 @@
msgid "Commit succeeded, but post-commit hook failed"
msgstr "Commit completou com sucesso, mas hook post-commit falhou"
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_repos/fs-wrap.c:183
#, c-format
msgid ""
"Storage of non-regular property '%s' is disallowed through the repository "
@@ -3471,19 +3522,19 @@
"Armazenamento de propiedade não regular '%s' não é permitida através da "
"interface do repositório, e pode indicar um bug em seu cliente"
-#: libsvn_repos/fs-wrap.c:303
+#: libsvn_repos/fs-wrap.c:329
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "Escrita não permitida: não autorizado a ler todas as revisões %ld"
-#: libsvn_repos/fs-wrap.c:507
+#: libsvn_repos/fs-wrap.c:533
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr ""
"Não foi possível destravar o caminho '%s', nenhum nome de usuário para "
"autenticação disponível"
-#: libsvn_repos/fs-wrap.c:521
+#: libsvn_repos/fs-wrap.c:547
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr "Destravamento completou com sucesso, mas hook post-unlock falhou"
@@ -3663,7 +3714,7 @@
msgid " done.\n"
msgstr " pronto.\n"
-#: libsvn_repos/load.c:1231
+#: libsvn_repos/load.c:1233
#, c-format
msgid ""
"\n"
@@ -3674,7 +3725,7 @@
"------- Committ de revisão %ld >>>\n"
"\n"
-#: libsvn_repos/load.c:1237
+#: libsvn_repos/load.c:1239
#, c-format
msgid ""
"\n"
@@ -3696,31 +3747,41 @@
msgstr ""
"Caminho de sistema de arquivos '%s' não é nem um arquivo nem um diretório"
-#: libsvn_repos/reporter.c:602
+#: libsvn_repos/reporter.c:222
+#, fuzzy, c-format
+msgid "Invalid depth (%s) for path '%s'"
+msgstr "Caminho de origem de cópia inválido '%s'"
+
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "Caminho de cópia de trabalho '%s' não existe no repositório"
-#: libsvn_repos/reporter.c:836
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "Não autorizado a abrir a raiz da operação de edição"
-#: libsvn_repos/reporter.c:855
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "Caminho destino não existe"
-#: libsvn_repos/reporter.c:862
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "Não é possível modificar um diretório de dentro dele mesmo"
-#: libsvn_repos/reporter.c:905
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "Relatório inválido para nível topo de cópia de trabalho"
-#: libsvn_repos/reporter.c:920
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "Dois relatórios top-level sem alvos"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "Tipo de nó não suportado para caminho '%s'"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -3766,35 +3827,35 @@
msgid "Creating conf directory"
msgstr "Criando diretório conf"
-#: libsvn_repos/repos.c:1482
+#: libsvn_repos/repos.c:1484
msgid "Creating svnserve.conf file"
msgstr "Criando arquivo svnserve.conf"
-#: libsvn_repos/repos.c:1507
+#: libsvn_repos/repos.c:1509
msgid "Creating passwd file"
msgstr "Criando arquivo de senhas"
-#: libsvn_repos/repos.c:1567
+#: libsvn_repos/repos.c:1579
msgid "Creating authz file"
msgstr "Criando arquivo authz"
-#: libsvn_repos/repos.c:1600
+#: libsvn_repos/repos.c:1612
msgid "Could not create top-level directory"
msgstr "Não foi possivel criar diretório de nível topo"
-#: libsvn_repos/repos.c:1604
+#: libsvn_repos/repos.c:1616
msgid "Creating DAV sandbox dir"
msgstr "Criando diretório sandbox DAV"
-#: libsvn_repos/repos.c:1685
+#: libsvn_repos/repos.c:1697
msgid "Error opening db lockfile"
msgstr "Erro abrindo arquivo de trava de bd"
-#: libsvn_repos/repos.c:1722
+#: libsvn_repos/repos.c:1734
msgid "Repository creation failed"
msgstr "Falhou a criação do repostitório"
-#: libsvn_repos/repos.c:1803
+#: libsvn_repos/repos.c:1815
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "Esperado formato de repositório '%d' ou '%d'; encontrado formato '%d'"
@@ -3818,7 +3879,7 @@
msgid "Unreadable path encountered; access denied"
msgstr "Caminho ilegível encontrado; acesso negado"
-#: libsvn_subr/cmdline.c:489
+#: libsvn_subr/cmdline.c:493
#, c-format
msgid "Error initializing command line arguments"
msgstr "Erro inicializando argumentos de linha de comando"
@@ -3894,236 +3955,247 @@
msgid "Can't check path '%s'"
msgstr "Não foi possível verificar o caminho '%s'"
-#: libsvn_subr/io.c:377 libsvn_subr/io.c:508
+#: libsvn_subr/io.c:377
#, c-format
msgid "Can't open '%s'"
msgstr "Não é abrir '%s'"
-#: libsvn_subr/io.c:399 libsvn_subr/io.c:521
+#: libsvn_subr/io.c:399 libsvn_subr/io.c:522
#, c-format
msgid "Unable to make name for '%s'"
msgstr "Não foi possível criar o nome para '%s'"
-#: libsvn_subr/io.c:525 libsvn_subr/io.c:579 libsvn_subr/io.c:607
+#: libsvn_subr/io.c:509
+#, fuzzy, c-format
+msgid "Can't create symbolic link '%s'"
+msgstr "Não foi possível criar diretório '%s'"
+
+#: libsvn_subr/io.c:526 libsvn_subr/io.c:580 libsvn_subr/io.c:608
msgid "Symbolic links are not supported on this platform"
msgstr "'Symbolic links' não são suportados nesta plataforma"
-#: libsvn_subr/io.c:558
+#: libsvn_subr/io.c:559
#, c-format
msgid "Can't read contents of link"
msgstr "Não é possível ler o conteúdo do link"
-#: libsvn_subr/io.c:620
+#: libsvn_subr/io.c:621
#, c-format
msgid "Can't find a temporary directory"
msgstr "Não foi possivel encontrar um diretório temporário"
-#: libsvn_subr/io.c:714
+#: libsvn_subr/io.c:715
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "Não foi possível copiar '%s' para '%s'"
-#: libsvn_subr/io.c:766
+#: libsvn_subr/io.c:767
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "Não foi possível setar permissão em '%s'"
-#: libsvn_subr/io.c:788
+#: libsvn_subr/io.c:789
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "Não foi possível colar '%s' ao final de '%s'"
-#: libsvn_subr/io.c:822
+#: libsvn_subr/io.c:823
#, c-format
msgid "Source '%s' is not a directory"
msgstr "Fonte '%s' não é um diretório"
-#: libsvn_subr/io.c:828
+#: libsvn_subr/io.c:829
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "Destino '%s' não é um diretório"
-#: libsvn_subr/io.c:834
+#: libsvn_subr/io.c:835
#, c-format
msgid "Destination '%s' already exists"
msgstr "Destino '%s' já existe"
-#: libsvn_subr/io.c:903 libsvn_subr/io.c:1814 libsvn_subr/io.c:1865
-#: libsvn_subr/io.c:1928
+#: libsvn_subr/io.c:904 libsvn_subr/io.c:1830 libsvn_subr/io.c:1881
+#: libsvn_subr/io.c:1944
#, c-format
msgid "Can't read directory '%s'"
msgstr "Não foi possível ler o diretório '%s'"
-#: libsvn_subr/io.c:908 libsvn_subr/io.c:1819 libsvn_subr/io.c:1870
-#: libsvn_subr/io.c:1933 libsvn_subr/io.c:3077
+#: libsvn_subr/io.c:909 libsvn_subr/io.c:1835 libsvn_subr/io.c:1886
+#: libsvn_subr/io.c:1949 libsvn_subr/io.c:3114
#, c-format
msgid "Error closing directory '%s'"
msgstr "Erro fechando o diretório '%s'"
-#: libsvn_subr/io.c:934
+#: libsvn_subr/io.c:935
#, c-format
msgid "Can't make directory '%s'"
msgstr "Não foi possível criar diretório '%s'"
-#: libsvn_subr/io.c:1021
+#: libsvn_subr/io.c:1022
#, c-format
msgid "Can't set access time of '%s'"
msgstr "Não foi possível setar hora de acesso de '%s'"
-#: libsvn_subr/io.c:1161
+#: libsvn_subr/io.c:1162
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr ""
"Não foi possível obter permissões padrões de arquivo para o arquivo em '%"
"s' (erro de início de arquivo)"
-#: libsvn_subr/io.c:1172
+#: libsvn_subr/io.c:1173
#, c-format
msgid "Can't open file at '%s'"
msgstr "Não foi possível abrir o arquivo em '%s'"
-#: libsvn_subr/io.c:1176
+#: libsvn_subr/io.c:1177
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr ""
"Não foi possível obter permissões de arquivo para o arquivo em '%s' (erro de "
"início de arquivo)"
-#: libsvn_subr/io.c:1215 libsvn_subr/io.c:1310
+#: libsvn_subr/io.c:1216 libsvn_subr/io.c:1311
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "Não foi possível modificar as permissões do arquivo '%s'"
-#: libsvn_subr/io.c:1350
+#: libsvn_subr/io.c:1351
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "Não foi possível setar o arquivo '%s' como somente para leitura"
-#: libsvn_subr/io.c:1382
+#: libsvn_subr/io.c:1383
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "Não foi possível setar o arquivo '%s' como para leitura e escrita"
-#: libsvn_subr/io.c:1426
+#: libsvn_subr/io.c:1427
#, c-format
msgid "Error getting UID of process"
msgstr "Erro obtendo UID do processo"
-#: libsvn_subr/io.c:1507
+#: libsvn_subr/io.c:1508
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "Não é possível obter trava compartilhada no arquivo '%s'"
-#: libsvn_subr/io.c:1542
+#: libsvn_subr/io.c:1543
#, c-format
msgid "Can't flush file '%s'"
msgstr "Não foi possível descarregar o buffer do arquivo '%s'"
-#: libsvn_subr/io.c:1543
+#: libsvn_subr/io.c:1544
#, c-format
msgid "Can't flush stream"
msgstr "Não foi possível descarregar o buffer da cadeia"
-#: libsvn_subr/io.c:1555 libsvn_subr/io.c:1572
+#: libsvn_subr/io.c:1556 libsvn_subr/io.c:1573
#, c-format
msgid "Can't flush file to disk"
msgstr "Não foi possível descarregar o buffer do arquivo pro disco"
-#: libsvn_subr/io.c:1593
-msgid "Reading from stdin is currently broken, so disabled"
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#, c-format
+msgid "Can't open stdin"
+msgstr "Não foi possível abrir stdin"
+
+#: libsvn_subr/io.c:1616
+#, fuzzy
+msgid "Reading from stdin is disallowed"
msgstr "Leitura de stdin está atualmente quebrada, então está desabilitada"
-#: libsvn_subr/io.c:1614
+#: libsvn_subr/io.c:1630
#, c-format
msgid "Can't get file name"
msgstr "Não foi possível obter o nome do arquivo"
-#: libsvn_subr/io.c:1682
+#: libsvn_subr/io.c:1698
#, c-format
msgid "Can't remove file '%s'"
msgstr "Não é possível remover o arquivo '%s'"
-#: libsvn_subr/io.c:1749 libsvn_subr/io.c:2928 libsvn_subr/io.c:3014
+#: libsvn_subr/io.c:1765 libsvn_subr/io.c:2965 libsvn_subr/io.c:3051
#, c-format
msgid "Can't open directory '%s'"
msgstr "Não foi possível abrir o diretório '%s'"
-#: libsvn_subr/io.c:1795 libsvn_subr/io.c:1825
+#: libsvn_subr/io.c:1811 libsvn_subr/io.c:1841
#, c-format
msgid "Can't remove '%s'"
msgstr "Não é remover '%s'"
-#: libsvn_subr/io.c:1805
+#: libsvn_subr/io.c:1821
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "Não foi possível reiniciar o diretório '%s'"
-#: libsvn_subr/io.c:1997
+#: libsvn_subr/io.c:2013
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "Não foi possível criar atributos do processo '%s'"
-#: libsvn_subr/io.c:2003
+#: libsvn_subr/io.c:2019
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "Não foi possível setar cmdtype do processo '%s'"
-#: libsvn_subr/io.c:2015
+#: libsvn_subr/io.c:2031
#, c-format
msgid "Can't set process '%s' directory"
msgstr "Não foi possível setar diretório do processo '%s'"
-#: libsvn_subr/io.c:2028
+#: libsvn_subr/io.c:2044
#, c-format
msgid "Can't set process '%s' child input"
msgstr "Não foi possível setar entrada filha do processo '%s'"
-#: libsvn_subr/io.c:2035
+#: libsvn_subr/io.c:2051
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "Não foi possível setar arquivo de saída filho do processo '%s'"
-#: libsvn_subr/io.c:2042
+#: libsvn_subr/io.c:2058
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "Não foi possível setar arquivo de erro filho do processo '%s'"
-#: libsvn_subr/io.c:2049
+#: libsvn_subr/io.c:2065
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr "Não foi possível setar arquivo errfile filho '%s' do handler de erro"
-#: libsvn_subr/io.c:2055
+#: libsvn_subr/io.c:2071
#, c-format
msgid "Can't set process '%s' error handler"
msgstr "Não foi possível setar handler de erro do processo '%s'"
-#: libsvn_subr/io.c:2078
+#: libsvn_subr/io.c:2094
#, c-format
msgid "Can't start process '%s'"
msgstr "Não é possível iniciar o processo '%s'"
-#: libsvn_subr/io.c:2102
+#: libsvn_subr/io.c:2118
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Erro esperando pelo processo '%s'"
-#: libsvn_subr/io.c:2110
+#: libsvn_subr/io.c:2126
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "Processo '%s' falhou (exitwhy %d)"
-#: libsvn_subr/io.c:2117
+#: libsvn_subr/io.c:2133
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "Processo '%s' retornou código de erro de saída %d"
-#: libsvn_subr/io.c:2228
+#: libsvn_subr/io.c:2244
#, c-format
msgid "'%s' returned %d"
msgstr "'%s' retornou %d"
-#: libsvn_subr/io.c:2351
+#: libsvn_subr/io.c:2367
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4138,130 +4210,158 @@
"%s\n"
"%s"
-#: libsvn_subr/io.c:2478
+#: libsvn_subr/io.c:2494
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "Não é possível detectar o tipo MIME do não-arquivo '%s'"
-#: libsvn_subr/io.c:2568
+#: libsvn_subr/io.c:2584
#, c-format
msgid "Can't open file '%s'"
msgstr "Não foi possível abrir o arquivo '%s'"
-#: libsvn_subr/io.c:2604
+#: libsvn_subr/io.c:2620
#, c-format
msgid "Can't close file '%s'"
msgstr "Não foi possível fechar o arquivo '%s'"
-#: libsvn_subr/io.c:2605
+#: libsvn_subr/io.c:2621
#, c-format
msgid "Can't close stream"
msgstr "Não foi possível fechar a cadeia"
-#: libsvn_subr/io.c:2615 libsvn_subr/io.c:2639 libsvn_subr/io.c:2652
+#: libsvn_subr/io.c:2631 libsvn_subr/io.c:2655 libsvn_subr/io.c:2668
#, c-format
msgid "Can't read file '%s'"
msgstr "Não é possível ler o arquivo '%s'"
-#: libsvn_subr/io.c:2616 libsvn_subr/io.c:2640 libsvn_subr/io.c:2653
+#: libsvn_subr/io.c:2632 libsvn_subr/io.c:2656 libsvn_subr/io.c:2669
#, c-format
msgid "Can't read stream"
msgstr "Não foi possível ler a cadeia"
-#: libsvn_subr/io.c:2627
+#: libsvn_subr/io.c:2643
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "Não foi possível obter informações de atributo do arquivo '%s'"
-#: libsvn_subr/io.c:2628
+#: libsvn_subr/io.c:2644
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Não foi possível obter informações de atributo da cadeia"
-#: libsvn_subr/io.c:2664
+#: libsvn_subr/io.c:2680
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "Não foi possível setar ponteiro de posição no arquivo '%s'"
-#: libsvn_subr/io.c:2665
+#: libsvn_subr/io.c:2681
#, c-format
msgid "Can't set position pointer in stream"
msgstr "Não foi possível setar ponteiro de posição na cadeia"
-#: libsvn_subr/io.c:2676 libsvn_subr/io.c:2689
+#: libsvn_subr/io.c:2692 libsvn_subr/io.c:2726
#, c-format
msgid "Can't write to file '%s'"
msgstr "Não é possível escrever no arquivo '%s'"
-#: libsvn_subr/io.c:2677 libsvn_subr/io.c:2690
+#: libsvn_subr/io.c:2693 libsvn_subr/io.c:2727
#, c-format
msgid "Can't write to stream"
msgstr "Não é possível escrever na cadeia"
-#: libsvn_subr/io.c:2730
+#: libsvn_subr/io.c:2767
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "Não é possível ler o comprimento de uma linha no arquivo '%s'"
-#: libsvn_subr/io.c:2734
+#: libsvn_subr/io.c:2771
msgid "Can't read length line in stream"
msgstr "Não foi possível ler o comprimento de uma linha na cadeia"
-#: libsvn_subr/io.c:2781
+#: libsvn_subr/io.c:2818
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Não é possível mover '%s' para '%s'"
-#: libsvn_subr/io.c:2859
+#: libsvn_subr/io.c:2896
#, c-format
msgid "Can't create directory '%s'"
msgstr "Não foi possível criar diretório '%s'"
-#: libsvn_subr/io.c:2870 libsvn_wc/copy.c:519
+#: libsvn_subr/io.c:2907 libsvn_wc/copy.c:509
#, c-format
msgid "Can't hide directory '%s'"
msgstr "Não foi possível esconder o diretório '%s'"
-#: libsvn_subr/io.c:2882
+#: libsvn_subr/io.c:2919
#, c-format
msgid "Can't stat directory '%s'"
msgstr "Não foi possível executar 'stat' no diretório '%s'"
-#: libsvn_subr/io.c:2946
+#: libsvn_subr/io.c:2983
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Não foi possível remover o diretório '%s'"
-#: libsvn_subr/io.c:2964
+#: libsvn_subr/io.c:3001
#, c-format
msgid "Can't read directory"
msgstr "Não foi possível ler o diretório"
-#: libsvn_subr/io.c:3033
+#: libsvn_subr/io.c:3070
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "Não foi possível ler a entrada de diretório em '%s'"
-#: libsvn_subr/io.c:3158
+#: libsvn_subr/io.c:3195
#, c-format
msgid "Can't check directory '%s'"
msgstr "Não foi possível verificar o diretório '%s'"
-#: libsvn_subr/io.c:3180
+#: libsvn_subr/io.c:3217
#, c-format
msgid "Version %d is not non-negative"
msgstr "Versão %d não é não-negativa"
-#: libsvn_subr/io.c:3230
+#: libsvn_subr/io.c:3267
#, c-format
msgid "Reading '%s'"
msgstr "Lendo '%s'"
-#: libsvn_subr/io.c:3246
+#: libsvn_subr/io.c:3283
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "Primeira linha de '%s' contém um não-dígito"
+#: libsvn_subr/mergeinfo.c:67
+msgid "Invalid revision number"
+msgstr "Número de revisão inválido"
+
+#: libsvn_subr/mergeinfo.c:125
+#, fuzzy
+msgid "No revision list found "
+msgstr "Não há revisão %ld"
+
+#: libsvn_subr/mergeinfo.c:135 libsvn_subr/mergeinfo.c:163
+#, fuzzy
+msgid "Invalid character found in revision list"
+msgstr "Revisão final inválida %ld"
+
+#: libsvn_subr/mergeinfo.c:169
+#, fuzzy
+msgid "Revision list parsing ended before hitting newline"
+msgstr "Arquivo de revisão não possui 'newline' final"
+
+#: libsvn_subr/mergeinfo.c:187
+msgid "Pathname not terminated by ':'"
+msgstr ""
+
+#: libsvn_subr/mergeinfo.c:195
+#, fuzzy
+msgid "Could not find end of line in revision line"
+msgstr "Falhou ao encontrar a hora na revisão %ld"
+
#: libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
@@ -4298,27 +4398,27 @@
"\"%s\": commando desconhecido.\n"
"\n"
-#: libsvn_subr/opt.c:760
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Erro de sintaxe ao fazer parse de revisão '%s'"
-#: libsvn_subr/opt.c:837
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL '%s' não está codificada como URI corretamente"
-#: libsvn_subr/opt.c:843
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL '%s' contém um elemento '..'"
-#: libsvn_subr/opt.c:872
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Erro resolvendo caixa de '%s'"
-#: libsvn_subr/opt.c:974
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4329,7 +4429,7 @@
" compilado %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:977
+#: libsvn_subr/opt.c:998
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4344,36 +4444,31 @@
"Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1028 libsvn_subr/opt.c:1069
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Digite '%s help' para uso.\n"
-#: libsvn_subr/path.c:1182
+#: libsvn_subr/path.c:1107
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "Não foi possível determinar o caminho absoluto de '%s'"
-#: libsvn_subr/path.c:1220
+#: libsvn_subr/path.c:1145
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "'%s' não é o nome de um arquivo ou de um diretório"
-#: libsvn_subr/path.c:1335
+#: libsvn_subr/path.c:1251
#, c-format
msgid "Can't determine the native path encoding"
msgstr "Não foi possível determinar a codificação do caminho nativo"
-#: libsvn_subr/path.c:1389
+#: libsvn_subr/path.c:1305
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Caracter de controle '0x%02x' inválido no caminho '%s'"
-#: libsvn_subr/prompt.c:97 svnserve/main.c:514
-#, c-format
-msgid "Can't open stdin"
-msgstr "Não foi possível abrir stdin"
-
#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
@@ -4454,12 +4549,7 @@
msgid "Passphrase for '%s': "
msgstr "Frase-chave para '%s': "
-#: libsvn_subr/subst.c:1599
-#, c-format
-msgid "'%s' has unsupported special file type '%s'"
-msgstr "'%s' possui tipo de arquivo especial não suportado '%s'"
-
-#: libsvn_subr/subst.c:1737 libsvn_wc/props.c:1511
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Arquivo '%s' possui newlines inconsistentes"
@@ -4497,27 +4587,27 @@
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "Não foi possível criar um conversor de caracteres de '%i' para '%i'"
-#: libsvn_subr/utf.c:515
+#: libsvn_subr/utf.c:522
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "Não foi possível converter string de codificação nativa para '%s':"
-#: libsvn_subr/utf.c:519
+#: libsvn_subr/utf.c:526
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "Não foi possível converter string de '%s' para codificação nativa:"
-#: libsvn_subr/utf.c:523
+#: libsvn_subr/utf.c:530
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "Não foi possível converter string de '%s' para '%s'"
-#: libsvn_subr/utf.c:529
+#: libsvn_subr/utf.c:536
#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "Não foi possível converter string de CCSID '%i' para CCSID '%i'"
-#: libsvn_subr/utf.c:574
+#: libsvn_subr/utf.c:581
#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
@@ -4526,7 +4616,7 @@
"Dado seguro '%s' era seguido de byte não-ASCII %d: não foi possível convertê-"
"lo de/para UTF-8"
-#: libsvn_subr/utf.c:582
+#: libsvn_subr/utf.c:589
#, c-format
msgid ""
"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
@@ -4534,7 +4624,7 @@
"Caracter não-ASCII (código %d) detectado, e não é possível convertê-lo de/"
"para UTF-8"
-#: libsvn_subr/utf.c:624
+#: libsvn_subr/utf.c:631
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -4572,11 +4662,11 @@
msgid "Malformed XML: %s at line %d"
msgstr "XML mal formado: %s na linha %d"
-#: libsvn_wc/adm_crawler.c:605
+#: libsvn_wc/adm_crawler.c:635
msgid "Error aborting report"
msgstr "Erro abortando relatório"
-#: libsvn_wc/adm_crawler.c:919
+#: libsvn_wc/adm_crawler.c:1059
#, c-format
msgid "While preparing '%s' for commit"
msgstr "Ao preparar '%s' para commit"
@@ -4612,47 +4702,42 @@
msgid "No such thing as 'base' working copy properties!"
msgstr "Não existe propriedade 'base' de cópia de trabalho!"
-#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:51
+#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:52
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' não é um diretório"
-#: libsvn_wc/adm_files.c:1035
-#, c-format
-msgid "No entry for '%s'"
-msgstr "Não há entradas para '%s'"
-
-#: libsvn_wc/adm_files.c:1048
+#: libsvn_wc/adm_files.c:1044
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "Revisão %ld não bate com revisão existente %ld em '%s'"
-#: libsvn_wc/adm_files.c:1056
+#: libsvn_wc/adm_files.c:1052
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "URL '%s' não bate com URL existente '%s' em '%s'"
-#: libsvn_wc/adm_ops.c:272
+#: libsvn_wc/adm_ops.c:278
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "Tipo de nó não reconhecido: '%s'"
-#: libsvn_wc/adm_ops.c:1401
+#: libsvn_wc/adm_ops.c:1403
#, c-format
msgid "'%s' not found"
msgstr "'%s' não encontrado"
-#: libsvn_wc/adm_ops.c:1405
+#: libsvn_wc/adm_ops.c:1407
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Tipo de nó não suportado para caminho '%s'"
-#: libsvn_wc/adm_ops.c:1435
+#: libsvn_wc/adm_ops.c:1437
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s' já está sobre controle de versão"
-#: libsvn_wc/adm_ops.c:1447
+#: libsvn_wc/adm_ops.c:1449
#, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
@@ -4661,44 +4746,39 @@
"Não é possível substituir '%s' com um nó de diferente tipo; deve haver "
"commit da remoção e o pai atualizado antes de adicionar '%s'"
-#: libsvn_wc/adm_ops.c:1464
+#: libsvn_wc/adm_ops.c:1466
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr ""
"Não foi possível encontrar entrada de diretório pai ao tentar adicionar '%s'"
-#: libsvn_wc/adm_ops.c:1469
+#: libsvn_wc/adm_ops.c:1471
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr "Não é possível adicionar '%s' ao diretório pai agendado para remoção"
-#: libsvn_wc/adm_ops.c:1485
+#: libsvn_wc/adm_ops.c:1487
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr "A URL '%s' possui uma raiz de repositório diferente de seu pai"
-#: libsvn_wc/adm_ops.c:1818
+#: libsvn_wc/adm_ops.c:1820
#, c-format
msgid "Error restoring text for '%s'"
msgstr "Erro restaurando texto para '%s'"
-#: libsvn_wc/adm_ops.c:1949
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "Não é possível reverter: '%s' não está sobre controle de versão"
-
-#: libsvn_wc/adm_ops.c:1977
+#: libsvn_wc/adm_ops.c:1990
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr "Não é possível reverter '%s': tipo de nó de entrada não suportado"
-#: libsvn_wc/adm_ops.c:1988
+#: libsvn_wc/adm_ops.c:2001
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr ""
"Não é possível reverter '%s': tipo de nó não suportado na cópia de trabalho"
-#: libsvn_wc/adm_ops.c:2035
+#: libsvn_wc/adm_ops.c:2048
msgid ""
"Cannot revert addition of current directory; please try again from the "
"parent directory"
@@ -4706,37 +4786,37 @@
"Não é possível reverter inclusão do diretório corrente; por favor tente "
"novamente de um diretório pai"
-#: libsvn_wc/adm_ops.c:2057
+#: libsvn_wc/adm_ops.c:2070
#, c-format
msgid "Unknown or unexpected kind for path '%s'"
msgstr "Tipo para o caminho '%s' desconhecido ou inesperado"
-#: libsvn_wc/adm_ops.c:2219
+#: libsvn_wc/adm_ops.c:2232
#, c-format
msgid "File '%s' has local modifications"
msgstr "Arquivo '%s' possui modificações locais"
+#: libsvn_wc/adm_ops.c:2802
+#, fuzzy, c-format
+msgid "'%s' is not currently a member of changelist '%s'."
+msgstr "Caminho '%s' agora é parte da lista de mudanças '%s'.\n"
+
#: libsvn_wc/copy.c:197
#, c-format
msgid "Error during recursive copy of '%s'"
msgstr "Erro durante cópia recursiva de '%s'"
-#: libsvn_wc/copy.c:362
+#: libsvn_wc/copy.c:356
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "'%s' já existe e está no caminho"
-#: libsvn_wc/copy.c:374
+#: libsvn_wc/copy.c:368
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "Já existe um item versionado '%s'"
-#: libsvn_wc/copy.c:384
-#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr "Não é possível copiar ou mover '%s': não está sobre controle de versão"
-
-#: libsvn_wc/copy.c:393
+#: libsvn_wc/copy.c:383
#, c-format
msgid ""
"Cannot copy or move '%s': it's not in the repository yet; try committing "
@@ -4745,7 +4825,7 @@
"Não é possível copiar ou mover '%s': ainda não está no repositório; tente "
"commit primeiro"
-#: libsvn_wc/copy.c:672
+#: libsvn_wc/copy.c:658
#, c-format
msgid ""
"Cannot copy or move '%s': it is not in the repository yet; try committing "
@@ -4754,105 +4834,105 @@
"Não é possível copiar ou mover '%s': ainda não está no repositório; tente "
"commit primeiro"
-#: libsvn_wc/copy.c:799
+#: libsvn_wc/copy.c:776
#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
msgstr ""
"Não é possível copiar para '%s', pois não é do repositório '%s'; é de '%s'"
-#: libsvn_wc/copy.c:806
+#: libsvn_wc/copy.c:783
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr "Não é possível copiar para '%s' por estar agendado para remoção"
-#: libsvn_wc/entries.c:91 libsvn_wc/entries.c:349 libsvn_wc/entries.c:561
-#: libsvn_wc/entries.c:822
+#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:352 libsvn_wc/entries.c:588
+#: libsvn_wc/entries.c:849
#, c-format
msgid "Entry '%s' has invalid '%s' value"
msgstr "Entrada '%s' possui um valor '%s' inválido"
-#: libsvn_wc/entries.c:111
+#: libsvn_wc/entries.c:114
msgid "Invalid escape sequence"
msgstr "Seqüência de escape inválida"
-#: libsvn_wc/entries.c:118
+#: libsvn_wc/entries.c:121
msgid "Invalid escaped character"
msgstr "Caracter de escape inválido"
-#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
-#: libsvn_wc/entries.c:203
+#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:194
+#: libsvn_wc/entries.c:206
msgid "Unexpected end of entry"
msgstr "Fim inesperado de entrada"
-#: libsvn_wc/entries.c:225
+#: libsvn_wc/entries.c:228
#, c-format
msgid "Invalid value for field '%s'"
msgstr "Valor inválido para campo '%s'"
-#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:536
+#: libsvn_wc/entries.c:310 libsvn_wc/entries.c:563
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "Entrada '%s' possui um tipo de nó inválido"
-#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:513
+#: libsvn_wc/entries.c:331 libsvn_wc/entries.c:540
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "Entrada para '%s' possui raiz de repositório inválida"
-#: libsvn_wc/entries.c:947
+#: libsvn_wc/entries.c:995
#, c-format
msgid "XML parser failed in '%s'"
msgstr "Parser de XML falhou em '%s'"
-#: libsvn_wc/entries.c:1006
+#: libsvn_wc/entries.c:1054
msgid "Missing default entry"
msgstr "Faltando entrada padrão"
-#: libsvn_wc/entries.c:1011
+#: libsvn_wc/entries.c:1059
msgid "Default entry has no revision number"
msgstr "Entrada padrão não possui número de revisão"
-#: libsvn_wc/entries.c:1016
+#: libsvn_wc/entries.c:1064
msgid "Default entry is missing URL"
msgstr "Entrada padrão não possui URL"
-#: libsvn_wc/entries.c:1092
+#: libsvn_wc/entries.c:1140
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "Linha de versão inválida em entradas do arquivo '%s'"
-#: libsvn_wc/entries.c:1109
+#: libsvn_wc/entries.c:1157
msgid "Missing entry terminator"
msgstr "Faltando finalizador de entrada"
-#: libsvn_wc/entries.c:1112
+#: libsvn_wc/entries.c:1160
msgid "Invalid entry terminator"
msgstr "Finalizador de entrada inválido"
-#: libsvn_wc/entries.c:1116
+#: libsvn_wc/entries.c:1164
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "Erro na entrada %d em arquivo de entradas para '%s'"
-#: libsvn_wc/entries.c:1212
+#: libsvn_wc/entries.c:1287
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "Cópia de trabalho corrompida: '%s' não possui entrada padrão"
-#: libsvn_wc/entries.c:1229
+#: libsvn_wc/entries.c:1304
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
msgstr ""
"Cópia de trabalho corrompida: diretório '%s' possui um agendamento inválido"
-#: libsvn_wc/entries.c:1263
+#: libsvn_wc/entries.c:1338
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
msgstr ""
"Cópia de trabalho corrompida: '%s' no diretório '%s' possui um esquema "
"inválido"
-#: libsvn_wc/entries.c:1272
+#: libsvn_wc/entries.c:1347
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4861,7 +4941,7 @@
"Cópia de trabalho corrompida: '%s' no diretório '%s' (que está agendado para "
"inclusão) não está agendado para inclusão"
-#: libsvn_wc/entries.c:1280
+#: libsvn_wc/entries.c:1355
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4870,7 +4950,7 @@
"Cópia de trabalho corrompida: '%s' no diretório '%s' (que está agendado para "
"remoção) não está agendado para remoção"
-#: libsvn_wc/entries.c:1288
+#: libsvn_wc/entries.c:1363
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4879,17 +4959,17 @@
"Cópia de trabalho corrompida: '%s' no diretório '%s' (que está agendado para "
"substituição) possui um agendamento inválido"
-#: libsvn_wc/entries.c:1925
+#: libsvn_wc/entries.c:2010
#, c-format
msgid "No default entry in directory '%s'"
msgstr "Não há entrada padrão no diretório '%s'"
-#: libsvn_wc/entries.c:1980
+#: libsvn_wc/entries.c:2065
#, c-format
msgid "Error writing to '%s'"
msgstr "Erro escrevendo em '%s'"
-#: libsvn_wc/entries.c:2303
+#: libsvn_wc/entries.c:2394
#, c-format
msgid ""
"Can't add '%s' to deleted directory; try undeleting its parent directory "
@@ -4898,7 +4978,7 @@
"Não é possível adicionar '%s' ao diretório apagado; tente desapagar seu "
"diretório pai primeiro"
-#: libsvn_wc/entries.c:2309
+#: libsvn_wc/entries.c:2400
#, c-format
msgid ""
"Can't replace '%s' in deleted directory; try undeleting its parent directory "
@@ -4907,43 +4987,43 @@
"Não é possível substituir '%s' no diretório apagado; tente desapagar seu "
"diretório pai primeiro"
-#: libsvn_wc/entries.c:2318
+#: libsvn_wc/entries.c:2409
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr ""
"'%s' está marcado como ausente, então não pode ser agendado para inclusão"
-#: libsvn_wc/entries.c:2347
+#: libsvn_wc/entries.c:2438
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "Entrada '%s' já está sobre controle de versão"
-#: libsvn_wc/entries.c:2444
+#: libsvn_wc/entries.c:2535
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "Entrada '%s' possui agendamento ilegal"
-#: libsvn_wc/entries.c:2590
+#: libsvn_wc/entries.c:2681
#, c-format
msgid "No such entry: '%s'"
msgstr "Não existe tal entrada: '%s'"
-#: libsvn_wc/entries.c:2717
+#: libsvn_wc/entries.c:2814
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "Erro ao escrever arquivo de entradas para '%s'"
-#: libsvn_wc/entries.c:2759
+#: libsvn_wc/entries.c:2856
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "Diretório '%s' não possui entrada THIS_DIR"
-#: libsvn_wc/entries.c:2888
+#: libsvn_wc/entries.c:2985
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "'%s' possui um tipo de nó não reconhecido"
-#: libsvn_wc/entries.c:2925
+#: libsvn_wc/entries.c:3022
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "Inesperadamente encontrou '%s': caminho está marcado como 'faltando'"
@@ -5009,7 +5089,7 @@
msgid "Lock file '%s' is not a regular file"
msgstr "Arquivo de trava '%s' não é um arquivo regular"
-#: libsvn_wc/log.c:353
+#: libsvn_wc/log.c:355
msgid "Can't move source to dest"
msgstr "Não é possível mover origem para destino"
@@ -5017,146 +5097,146 @@
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:516
+#: libsvn_wc/log.c:518
#, c-format
msgid "In directory '%s'"
msgstr "No diretório '%s'"
-#: libsvn_wc/log.c:541
+#: libsvn_wc/log.c:543
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "Falntando atributo 'esquerda' em '%s'"
-#: libsvn_wc/log.c:548
+#: libsvn_wc/log.c:550
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "Falntando atributo 'direita' em '%s'"
-#: libsvn_wc/log.c:616
+#: libsvn_wc/log.c:618
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "Falntando atributo 'destino' em '%s'"
-#: libsvn_wc/log.c:697
+#: libsvn_wc/log.c:699
#, c-format
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "Falntando atributo 'timestamp' em '%s'"
-#: libsvn_wc/log.c:793 libsvn_wc/log.c:833
+#: libsvn_wc/log.c:795 libsvn_wc/log.c:835
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "Erro obtendo 'affected time' em '%s'"
-#: libsvn_wc/log.c:844
+#: libsvn_wc/log.c:868
+#, fuzzy, c-format
+msgid "Error getting file size on '%s'"
+msgstr "Erro obtendo 'affected time' em '%s'"
+
+#: libsvn_wc/log.c:886
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "Erro modificando entrada para '%s'"
-#: libsvn_wc/log.c:870
+#: libsvn_wc/log.c:912
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "Erro removendo trava da entrada para '%s'"
-#: libsvn_wc/log.c:893
+#: libsvn_wc/log.c:935
#, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "Erro removendo lista de mudanças da entrada '%s'"
-#: libsvn_wc/log.c:1025
+#: libsvn_wc/log.c:1067
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "Faltando atributo 'revisão' para '%s'"
-#: libsvn_wc/log.c:1049
+#: libsvn_wc/log.c:1091
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "Comando de log para diretório '%s' está mal localizado"
-#: libsvn_wc/log.c:1245
+#: libsvn_wc/log.c:1287
#, c-format
msgid "Error checking existence of '%s'"
msgstr "Erro verificando a existência de '%s'"
-#: libsvn_wc/log.c:1302
+#: libsvn_wc/log.c:1353
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "Erro substituindo texto-base de '%s'"
-#: libsvn_wc/log.c:1307
+#: libsvn_wc/log.c:1358
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "Erro obtendo 'affected time' de '%s'"
-#: libsvn_wc/log.c:1348
+#: libsvn_wc/log.c:1381
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "Erro obtendo 'affected time' para '%s'"
-#: libsvn_wc/log.c:1363
+#: libsvn_wc/log.c:1401
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "Erro comparando '%s' e '%s'"
-#: libsvn_wc/log.c:1408 libsvn_wc/log.c:1475
+#: libsvn_wc/log.c:1450 libsvn_wc/log.c:1517
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "Erro modificando entrada de '%s'"
-#: libsvn_wc/log.c:1530
+#: libsvn_wc/log.c:1572
msgid "Invalid 'format' attribute"
msgstr "Atributo 'format' inválido"
-#: libsvn_wc/log.c:1565
+#: libsvn_wc/log.c:1607
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr ""
"Atributo 'nome' faltando de entrada de log (entrada '%s' para diretório '%s')"
-#: libsvn_wc/log.c:1636
+#: libsvn_wc/log.c:1678
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "Elemento de arquivo de log '%s' não reconhecido em '%s'"
-#: libsvn_wc/log.c:1647
+#: libsvn_wc/log.c:1689
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "Erro processando comando '%s' em '%s'"
-#: libsvn_wc/log.c:1829
+#: libsvn_wc/log.c:1871
msgid "Couldn't open log"
msgstr "Não foi possível abrir log"
-#: libsvn_wc/log.c:1840
+#: libsvn_wc/log.c:1882
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "Erro lendo arquivo de log administrativo em '%s'"
-#: libsvn_wc/log.c:2454
+#: libsvn_wc/log.c:2524
#, c-format
msgid "Error writing log for '%s'"
msgstr "Erro escrevendo log para '%s'"
-#: libsvn_wc/log.c:2503
-#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "'%s' não é um diretório de cópia de trabalho"
-
-#: libsvn_wc/props.c:92
+#: libsvn_wc/props.c:95
#, c-format
msgid "Can't parse '%s'"
msgstr "Não é possível fazer parse de '%s'"
-#: libsvn_wc/props.c:123
+#: libsvn_wc/props.c:126
#, c-format
msgid "Can't write property hash to '%s'"
msgstr "Não é possível escrever hash de propriedade para '%s'"
-#: libsvn_wc/props.c:218
+#: libsvn_wc/props.c:221
#, c-format
msgid "Can't find entry '%s' in '%s'"
msgstr "Não é possível encontrar entrada '%s' em '%s'"
-#: libsvn_wc/props.c:645
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5165,7 +5245,7 @@
"Tentando adicionar nova propriedade '%s' com valor '%s',\n"
"mas a propriedade já existe com valor '%s'."
-#: libsvn_wc/props.c:668
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5174,14 +5254,14 @@
"Tentando modificar propriedade '%s' de '%s' para '%s',\n"
"mas a propriedade não existe."
-#: libsvn_wc/props.c:696
+#: libsvn_wc/props.c:808
#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
msgstr ""
"Tentando apagar propriedade '%s' mas valor foi modificado de '%s' para '%s'."
-#: libsvn_wc/props.c:714
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5190,52 +5270,52 @@
"Tentando mudar a propriedade '%s' de '%s' para '%s',\n"
"mas a propriedade já existe com valor '%s'."
-#: libsvn_wc/props.c:897
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Faltando final de linha em arquivo wcprops para '%s'"
-#: libsvn_wc/props.c:1080 libsvn_wc/props.c:1116 libsvn_wc/props.c:1386
-#: libsvn_wc/props.c:1638
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "Falhou ao carregar propriedades do disco"
-#: libsvn_wc/props.c:1144
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Não é possível escrever hash de propriedade para '%s'"
-#: libsvn_wc/props.c:1378 libsvn_wc/props.c:1547
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "Propriedade '%s' é uma propriedade de entrada"
-#: libsvn_wc/props.c:1425
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Não é possível setar '%s' em um diretório ('%s')"
-#: libsvn_wc/props.c:1433
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Não é possível setar '%s' em um arquivo ('%s')"
-#: libsvn_wc/props.c:1439
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' não é um arquivo ou diretório"
-#: libsvn_wc/props.c:1520
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Arquivo '%s' possui propriedade de tipo mime binária"
-#: libsvn_wc/props.c:2181
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Erro ao fazer parse de propriedade %s em '%s': '%s'"
-#: libsvn_wc/props.c:2194
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
@@ -5244,7 +5324,7 @@
"Propriedade %s inválida em '%s': alvo involve '.' ou '..' ou é um caminho "
"absoluto"
-#: libsvn_wc/questions.c:120
+#: libsvn_wc/questions.c:121
#, c-format
msgid ""
"Working copy format of '%s' is too old (%d); please check out your working "
@@ -5253,7 +5333,7 @@
"Formato de cópia de trabalho de '%s' é muito antigo (%d); por favor gere sua "
"cópia de trabalho novamente"
-#: libsvn_wc/questions.c:128
+#: libsvn_wc/questions.c:129
#, c-format
msgid ""
"This client is too old to work with working copy '%s'; please get a newer "
@@ -5262,7 +5342,7 @@
"Este cliente é muito velho para trablhar com a cópia de trabalho '%s'; por "
"favor obtenha um novo cliente Subversion"
-#: libsvn_wc/questions.c:346
+#: libsvn_wc/questions.c:336
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5273,26 +5353,26 @@
" esperado: %s\n"
" obtido: %s\n"
-#: libsvn_wc/relocate.c:69
+#: libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr "Relocação só pode mudar a parte repositório de uma URL"
-#: libsvn_wc/update_editor.c:438
+#: libsvn_wc/update_editor.c:440
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "Não há entrada '.' em: '%s'"
-#: libsvn_wc/update_editor.c:964
+#: libsvn_wc/update_editor.c:963
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "Diretório localmente modificado '%s' não será apagado"
-#: libsvn_wc/update_editor.c:1038
+#: libsvn_wc/update_editor.c:1037
#, c-format
msgid "Error writing log file for '%s'"
msgstr "Erro gravando arquivo de log para '%s'"
-#: libsvn_wc/update_editor.c:1145
+#: libsvn_wc/update_editor.c:1144
#, c-format
msgid ""
"Failed to add directory '%s': a non-directory object of the same name "
@@ -5301,7 +5381,7 @@
"Falhou ao adicionar diretório '%s': objeto não-diretório com o mesmo nome já "
"existe"
-#: libsvn_wc/update_editor.c:1178
+#: libsvn_wc/update_editor.c:1177
#, c-format
msgid ""
"Failed to add directory '%s': an unversioned directory of the same name "
@@ -5310,7 +5390,7 @@
"Falhou ao adicionar diretório '%s': um diretório não versionado com o mesmo "
"nome já existe"
-#: libsvn_wc/update_editor.c:1200
+#: libsvn_wc/update_editor.c:1199
#, c-format
msgid ""
"Failed to add directory '%s': a versioned directory of the same name already "
@@ -5319,7 +5399,7 @@
"Falhou ao adicionar diretório '%s': um diretório versionado com o mesmo nome "
"já existe"
-#: libsvn_wc/update_editor.c:1211
+#: libsvn_wc/update_editor.c:1210
#, c-format
msgid ""
"Failed to add directory '%s': object of the same name as the administrative "
@@ -5328,17 +5408,17 @@
"Falhou ao adicionar o diretório '%s': objeto do mesmo nome como diretório "
"administrativo"
-#: libsvn_wc/update_editor.c:1225
+#: libsvn_wc/update_editor.c:1224
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr ""
"Falhou ao adicionar diretório '%s': argumentos copyfrom ainda não suportados"
-#: libsvn_wc/update_editor.c:1512
+#: libsvn_wc/update_editor.c:1521
msgid "Couldn't do property merge"
msgstr "Não foi possível mesclar propriedades"
-#: libsvn_wc/update_editor.c:1581
+#: libsvn_wc/update_editor.c:1590
#, c-format
msgid ""
"Failed to mark '%s' absent: item of the same name is already scheduled for "
@@ -5347,7 +5427,7 @@
"Falhou ao marcar '%s' ausente: item com o mesmo nome está agendado para "
"inclusão"
-#: libsvn_wc/update_editor.c:1681
+#: libsvn_wc/update_editor.c:1690
#, c-format
msgid ""
"Failed to add file '%s': a file of the same name is already scheduled for "
@@ -5356,7 +5436,7 @@
"Falhou ao adicionar arquivo '%s': um arquivo com o mesmo nome já está "
"agendado para inclusão"
-#: libsvn_wc/update_editor.c:1693
+#: libsvn_wc/update_editor.c:1702
#, c-format
msgid ""
"Failed to add file '%s': a non-file object of the same name already exists"
@@ -5364,32 +5444,32 @@
"Falhou ao adicionar arquivo '%s': um objeto não-arquivo com o mesmo nome já "
"existe"
-#: libsvn_wc/update_editor.c:1708
+#: libsvn_wc/update_editor.c:1717
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr "Falhou ao adicionar arquivo '%s': objeto com o mesmo nome já existe"
-#: libsvn_wc/update_editor.c:1725
+#: libsvn_wc/update_editor.c:1734
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "Arquivo '%s' no diretório '%s' não é um recurso versionado"
-#: libsvn_wc/update_editor.c:1879
+#: libsvn_wc/update_editor.c:1883
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Checksum não bate para '%s'; gravado: '%s', obtido: '%s'"
-#: libsvn_wc/update_editor.c:3074
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s' não possui informação de ancestral"
-#: libsvn_wc/update_editor.c:3237
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Copyfrom-url '%s' possui raiz de repositório diferente de '%s'"
-#: libsvn_wc/util.c:83
+#: libsvn_wc/util.c:84
msgid "Unable to make any directories"
msgstr "Não foi possível criar quaisquer diretórios"
@@ -5397,27 +5477,35 @@
msgid "'verbose' option invalid in XML mode"
msgstr "Opção 'verbose' inválida no modo XML"
-#: svn/blame-cmd.c:218 svn/info-cmd.c:482 svn/list-cmd.c:239
-#: svn/status-cmd.c:244
+#: svn/blame-cmd.c:218 svn/info-cmd.c:511 svn/list-cmd.c:239
+#: svn/status-cmd.c:249
msgid "'incremental' option only valid in XML mode"
msgstr "Opção 'incremental' somente é válida no modo XML"
-#: svn/blame-cmd.c:285
+#: svn/blame-cmd.c:280
#, c-format
msgid "Skipping binary file: '%s'\n"
msgstr "Omitindo arquivo binário: '%s'\n"
-#: svn/checkout-cmd.c:129 svn/switch-cmd.c:127
+#: svn/changelist-cmd.c:61 svn/info-cmd.c:477 svn/log-cmd.c:410
+#: svn/revert-cmd.c:58
+#, c-format
+msgid "no such changelist '%s'"
+msgstr "Não existe estas lista de mudanças: '%s'"
+
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "'%s' não parece ser uma URL"
#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66 svn/move-cmd.c:76
-#: svn/propedit-cmd.c:200
-msgid "Local, non-commit operations do not take a log message"
+#: svn/propedit-cmd.c:201
+#, fuzzy
+msgid ""
+"Local, non-commit operations do not take a log message or revision properties"
msgstr "Operações locais e de não-commit não requerem mensagem de log"
-#: svn/diff-cmd.c:117 svnserve/main.c:523
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "Não é possível abrir stdout"
@@ -5438,7 +5526,7 @@
"Listas de alvos para diff não podem conter caminhos de cópia de trabalho e "
"URLs ao mesmo tempo"
-#: svn/export-cmd.c:84
+#: svn/export-cmd.c:87
msgid ""
"Destination directory exists; please remove the directory or use --force to "
"overwrite"
@@ -5482,7 +5570,7 @@
"Subversion é uma ferramenta para controle de versão.\n"
"Para mais informações, veja http://subversion.tigris.org/\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1296
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -5503,157 +5591,178 @@
msgid "Invalid URL '%s'"
msgstr "URL inválida '%s'"
-#: svn/info-cmd.c:86
+#: svn/info-cmd.c:88
#, c-format
msgid "'%s' has invalid revision"
msgstr "'%s' possui revisão inválida"
-#: svn/info-cmd.c:242 svnadmin/main.c:1116
+#: svn/info-cmd.c:250 svnadmin/main.c:1118
#, c-format
msgid "Path: %s\n"
msgstr "Caminho: %s\n"
-#: svn/info-cmd.c:248 svnlook/main.c:734
+#: svn/info-cmd.c:256 svnlook/main.c:738
#, c-format
msgid "Name: %s\n"
msgstr "Nome: %s\n"
-#: svn/info-cmd.c:252
+#: svn/info-cmd.c:260
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: svn/info-cmd.c:255
+#: svn/info-cmd.c:263
#, c-format
msgid "Repository Root: %s\n"
msgstr "Raiz do Repositório: %s\n"
-#: svn/info-cmd.c:259
+#: svn/info-cmd.c:267
#, c-format
msgid "Repository UUID: %s\n"
msgstr "UUID do repositório: %s\n"
-#: svn/info-cmd.c:263
+#: svn/info-cmd.c:271
#, c-format
msgid "Revision: %ld\n"
msgstr "Revisão: %ld\n"
-#: svn/info-cmd.c:268
+#: svn/info-cmd.c:276
#, c-format
msgid "Node Kind: file\n"
msgstr "Tipo de Nó: arquivo\n"
-#: svn/info-cmd.c:272
+#: svn/info-cmd.c:280
#, c-format
msgid "Node Kind: directory\n"
msgstr "Tipo de Nó: diretório\n"
-#: svn/info-cmd.c:276
+#: svn/info-cmd.c:284
#, c-format
msgid "Node Kind: none\n"
msgstr "Tipo de Nó: nenhum\n"
-#: svn/info-cmd.c:281
+#: svn/info-cmd.c:289
#, c-format
msgid "Node Kind: unknown\n"
msgstr "Tipo de Nó: desconhecido\n"
-#: svn/info-cmd.c:290
+#: svn/info-cmd.c:298
#, c-format
msgid "Schedule: normal\n"
msgstr "Agendado: normal\n"
-#: svn/info-cmd.c:294
+#: svn/info-cmd.c:302
#, c-format
msgid "Schedule: add\n"
msgstr "Agendado: incluir\n"
-#: svn/info-cmd.c:298
+#: svn/info-cmd.c:306
#, c-format
msgid "Schedule: delete\n"
msgstr "Agendado: apagar\n"
-#: svn/info-cmd.c:302
+#: svn/info-cmd.c:310
#, c-format
msgid "Schedule: replace\n"
msgstr "Agendado: substituir\n"
-#: svn/info-cmd.c:310
+#: svn/info-cmd.c:326
+#, c-format
+msgid "Depth: empty\n"
+msgstr ""
+
+#: svn/info-cmd.c:330
+#, c-format
+msgid "Depth: files\n"
+msgstr ""
+
+#: svn/info-cmd.c:334
+#, c-format
+msgid "Depth: immediates\n"
+msgstr ""
+
+#. Other depths should never happen here.
+#: svn/info-cmd.c:345
+#, c-format
+msgid "Depth: INVALID\n"
+msgstr ""
+
+#: svn/info-cmd.c:349
#, c-format
msgid "Copied From URL: %s\n"
msgstr "Copiado De URL: %s\n"
-#: svn/info-cmd.c:314
+#: svn/info-cmd.c:353
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "Copiado De Rev: %ld\n"
-#: svn/info-cmd.c:319
+#: svn/info-cmd.c:358
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "Autor da Última Mudança: %s\n"
-#: svn/info-cmd.c:323
+#: svn/info-cmd.c:362
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "Revisão da Última Mudança: %ld\n"
-#: svn/info-cmd.c:328
+#: svn/info-cmd.c:367
msgid "Last Changed Date"
msgstr "Data da Última Mudança"
-#: svn/info-cmd.c:334
+#: svn/info-cmd.c:373
msgid "Text Last Updated"
msgstr "Texto da Última Mudança"
-#: svn/info-cmd.c:338
+#: svn/info-cmd.c:377
msgid "Properties Last Updated"
msgstr "Propriedades da Última Mudança"
-#: svn/info-cmd.c:341
+#: svn/info-cmd.c:380
#, c-format
msgid "Checksum: %s\n"
msgstr "Checksum: %s\n"
-#: svn/info-cmd.c:346
+#: svn/info-cmd.c:385
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "Arquivo Base Anterior ao Conflito: %s\n"
-#: svn/info-cmd.c:352
+#: svn/info-cmd.c:391
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "Arquivo de Trabalho Anterior ao Conflito: %s\n"
-#: svn/info-cmd.c:357
+#: svn/info-cmd.c:396
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "Arquivo Base Atual do Conflito: %s\n"
-#: svn/info-cmd.c:362
+#: svn/info-cmd.c:401
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "Arquivo de Propriedades do Conflito: %s\n"
-#: svn/info-cmd.c:370
+#: svn/info-cmd.c:409
#, c-format
msgid "Lock Token: %s\n"
msgstr "Token de Trava: %s\n"
-#: svn/info-cmd.c:374
+#: svn/info-cmd.c:413
#, c-format
msgid "Lock Owner: %s\n"
msgstr "Dono da Trava: %s\n"
-#: svn/info-cmd.c:379
+#: svn/info-cmd.c:418
msgid "Lock Created"
msgstr "Trava Criada"
-#: svn/info-cmd.c:383
+#: svn/info-cmd.c:422
msgid "Lock Expires"
msgstr "Trava Expira"
-#: svn/info-cmd.c:392
+#: svn/info-cmd.c:431
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -5662,7 +5771,7 @@
"Comentário da Trava (%i linhas):\n"
"%s\n"
-#: svn/info-cmd.c:393
+#: svn/info-cmd.c:432
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -5671,24 +5780,19 @@
"Comentário da Trava (%i linha):\n"
"%s\n"
-#: svn/info-cmd.c:400
+#: svn/info-cmd.c:439
#, c-format
msgid "Changelist: %s\n"
msgstr "Changelist: %s\n"
-#: svn/info-cmd.c:452 svn/revert-cmd.c:59
-#, c-format
-msgid "no such changelist '%s'"
-msgstr "Não existe estas lista de mudanças: '%s'"
-
-#: svn/info-cmd.c:514
+#: svn/info-cmd.c:547
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
"\n"
msgstr "%s: (Não é um recurso versionado)\n"
-#: svn/info-cmd.c:523
+#: svn/info-cmd.c:556
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -5717,13 +5821,13 @@
msgid " (from %s:%ld)"
msgstr " (de %s:%ld)"
-#: svn/log-cmd.c:450
+#: svn/log-cmd.c:475
msgid "When specifying working copy paths, only one target may be given"
msgstr ""
"Ao especificar caminhos de cópia de trabalho, somente um alvo\n"
"deve ser fornecido"
-#: svn/log-cmd.c:462
+#: svn/log-cmd.c:487
msgid "Only relative paths can be specified after a URL"
msgstr "Somente caminhos relativos podem ser especificados depois de uma URL"
@@ -5737,7 +5841,7 @@
#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:230 svnadmin/main.c:233
#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
-#: svnlook/main.c:93 svnsync/main.c:104 svnsync/main.c:106
+#: svnlook/main.c:102 svnsync/main.c:135 svnsync/main.c:137
msgid "show help on a subcommand"
msgstr "mostra ajuda em um sub-comando"
@@ -5750,12 +5854,12 @@
msgstr "imprime o mínimo possível"
#: svn/main.c:67
-msgid "descend recursively"
-msgstr "descende recursivamente"
+msgid "descend recursively, same as --depth=infinity"
+msgstr ""
#: svn/main.c:68
-msgid "operate on single directory only"
-msgstr "opera somente em um diretório"
+msgid "obsolete; try --depth=files or --depth=immediates"
+msgstr ""
#: svn/main.c:70
msgid ""
@@ -5802,7 +5906,7 @@
msgstr "tratar valor como estando na codificação de conjunto de caracteres ARG"
#: svn/main.c:92 svnadmin/main.c:236 svndumpfilter/main.c:786
-#: svnlook/main.c:96 svnserve/main.c:150 svnsync/main.c:102
+#: svnlook/main.c:129 svnserve/main.c:151 svnsync/main.c:133
#: svnversion/main.c:125
msgid "show program version information"
msgstr "mostra informação de versão do programa"
@@ -5815,11 +5919,11 @@
msgid "display update information"
msgstr "mostra informações de atualização"
-#: svn/main.c:96 svnsync/main.c:96
+#: svn/main.c:96
msgid "specify a username ARG"
msgstr "especifica um nome de usuário ARG"
-#: svn/main.c:98 svnsync/main.c:98
+#: svn/main.c:98
msgid "specify a password ARG"
msgstr "especifica uma senha ARG"
@@ -5867,91 +5971,102 @@
msgid "pass contents of file ARG as additional args"
msgstr "passa o conteúdo do arquivo ARG como argumentos adicionais"
-#: svn/main.c:131
+#: svn/main.c:132
+msgid ""
+"pass depth ('empty', 'files', 'immediates', or\n"
+" 'infinity') as ARG"
+msgstr ""
+
+#: svn/main.c:135
msgid "output in XML"
msgstr "saída em XML"
-#: svn/main.c:132
+#: svn/main.c:136
msgid "use strict semantics"
msgstr "usa semântica estrita"
-#: svn/main.c:134
+#: svn/main.c:138
msgid "do not cross copies while traversing history"
msgstr "não cruzar cópias ao percorrer o histórico"
-#: svn/main.c:136
+#: svn/main.c:140
msgid "disregard default and svn:ignore property ignores"
msgstr "desconsidera o ignorar padrão e a propriedade svn:ignore"
-#: svn/main.c:138 svnsync/main.c:94
+#: svn/main.c:142 svnsync/main.c:113
msgid "do not cache authentication tokens"
msgstr "não guarda tokens de autenticação em cache"
-#: svn/main.c:140 svnsync/main.c:92
+#: svn/main.c:144 svnsync/main.c:111
msgid "do no interactive prompting"
msgstr "não usa prompt interativo"
-#: svn/main.c:142
+#: svn/main.c:146
msgid "try operation but make no changes"
msgstr "tenta a operação mas não faz mudanças"
-#: svn/main.c:144 svnlook/main.c:111
+#: svn/main.c:148 svnlook/main.c:108
msgid "do not print differences for deleted files"
msgstr "não imprime diferenças para arquivos apagados"
-#: svn/main.c:146
+#: svn/main.c:150
msgid "notice ancestry when calculating differences"
msgstr "considera ancestral ao calcular diferenças"
-#: svn/main.c:148
+#: svn/main.c:152
msgid "ignore ancestry when calculating merges"
msgstr "ignora ancestral ao calcular mesclagem"
-#: svn/main.c:150
+#: svn/main.c:154
msgid "ignore externals definitions"
msgstr "ignora definições externas"
-#: svn/main.c:153
+#: svn/main.c:157
msgid "use ARG as diff command"
msgstr "usa ARG como comando diff"
-#: svn/main.c:155
+#: svn/main.c:159
msgid "use ARG as merge command"
msgstr "usa ARG como comando merge"
-#: svn/main.c:157
+#: svn/main.c:161
msgid "use ARG as external editor"
msgstr "usa ARG como editor externo"
-#: svn/main.c:160
-msgid "use ARG as the older target"
-msgstr "usa ARG como alvo antigo"
-
-#: svn/main.c:162
-msgid "use ARG as the newer target"
-msgstr "usa ARG como novo alvo"
-
#: svn/main.c:164
-msgid "operate on a revision property (use with -r)"
+#, fuzzy
+msgid "mark revisions as merged (use with -r)"
msgstr "opera em uma propriedade de revisão (use com -r)"
#: svn/main.c:166
+msgid "use ARG as the older target"
+msgstr "usa ARG como alvo antigo"
+
+#: svn/main.c:168
+msgid "use ARG as the newer target"
+msgstr "usa ARG como novo alvo"
+
+#: svn/main.c:170
+msgid "operate on a revision property (use with -r)"
+msgstr "opera em uma propriedade de revisão (use com -r)"
+
+#: svn/main.c:172
msgid "relocate via URL-rewriting"
msgstr "relocar via regravação de URL"
-#: svn/main.c:168 svnadmin/main.c:272 svnsync/main.c:100
+#: svn/main.c:174 svnadmin/main.c:272 svnsync/main.c:131
msgid "read user configuration files from directory ARG"
msgstr "lê arquivos de configuração do usuário do diretório ARG"
-#: svn/main.c:170
+#: svn/main.c:176
msgid "enable automatic properties"
msgstr "habilita propriedades automáticas"
-#: svn/main.c:172
+#: svn/main.c:178
msgid "disable automatic properties"
msgstr "desabilita propriedades automáticas"
-#: svn/main.c:174
+#: svn/main.c:180
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -5963,35 +6078,41 @@
"propriedade svn:eol-style setada para 'nativa'.\n"
" ARG pode ser um entre 'LF', 'CR', 'CRLF'"
-#: svn/main.c:182
+#: svn/main.c:188
msgid "maximum number of log entries"
msgstr "número máximos de entrada de log"
-#: svn/main.c:184
+#: svn/main.c:190
msgid "don't unlock the targets"
msgstr "não destrava os alvos"
-#: svn/main.c:186
+#: svn/main.c:192
msgid "show a summary of the results"
msgstr "mostra um sumário dos resultados"
-#: svn/main.c:188
+#: svn/main.c:194
msgid "remove changelist association"
msgstr "remove associação de lista de mudanças"
-#: svn/main.c:190
+#: svn/main.c:196
msgid "operate only on members of changelist ARG"
msgstr "opera somente em membros da lista de mudanças ARG"
-#: svn/main.c:192
+#: svn/main.c:198
msgid "don't delete changelist after commit"
msgstr "não apaga lista de mudanças após commit"
-#: svn/main.c:194
+#: svn/main.c:200
msgid "keep path in working copy"
msgstr "mantém caminho na cópia de trabalho"
-#: svn/main.c:233
+#: svn/main.c:202
+msgid ""
+"set revision property ARG in new revision\n"
+" using the name=value format"
+msgstr ""
+
+#: svn/main.c:244
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -6000,7 +6121,7 @@
"Coloca arquivos e diretórios sobre controle de versão, agendando-os para\n"
"serem incluídos no repositório. Estes serão incluídos no próximo commit.\n"
-#: svn/main.c:241
+#: svn/main.c:252
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -6016,7 +6137,7 @@
" Se especificado, REV determina qual revisão o alvo é primeiramente\n"
" considerada.\n"
-#: svn/main.c:251
+#: svn/main.c:262
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -6030,17 +6151,18 @@
" Se especificado, REV determina qual revisão o alvo é primeiramente\n"
" considerada.\n"
-#: svn/main.c:259
+#: svn/main.c:270
+#, fuzzy
msgid ""
"Associate (or deassociate) local paths with changelist CLNAME.\n"
"usage: 1. changelist CLNAME TARGET...\n"
-" 2. changelist --clear TARGET...\n"
+" 2. changelist --remove TARGET...\n"
msgstr ""
"Associa (ou desassocia) caminho local com lista de mudanças NOMELM.\n"
"uso: 1. changelist NOMELM ALVO...\n"
" 2. changelist --clear ALVO...\n"
-#: svn/main.c:265
+#: svn/main.c:277
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6087,7 +6209,7 @@
" Todas as propriedades de um repositório são aplicadas ao caminho "
"obstruído.\n"
-#: svn/main.c:290
+#: svn/main.c:302
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6097,7 +6219,7 @@
"operações não terminadas, etc.\n"
"uso: cleanup [CAMINHO...]\n"
-#: svn/main.c:297
+#: svn/main.c:309
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6115,7 +6237,7 @@
" Se qualquer alvo estão (ou contém) itens travados, estes serão\n"
" destravados após um commit com sucesso.\n"
-#: svn/main.c:305
+#: svn/main.c:317
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6134,7 +6256,7 @@
" deve ser usado. Se qualquer alvo estão (ou contém) itens travados,\n"
" estes serão destravados após um commit com sucesso.\n"
-#: svn/main.c:320
+#: svn/main.c:332
msgid ""
"Duplicate something in working copy or repository, remembering history.\n"
"usage: copy SRC[@REV]... DST\n"
@@ -6164,7 +6286,7 @@
"tag\n"
" Todas as FONTEs devem ser do mesmo tipo.\n"
-#: svn/main.c:336
+#: svn/main.c:348
msgid ""
"Remove files and directories from version control.\n"
"usage: 1. delete PATH...\n"
@@ -6194,7 +6316,7 @@
" 2. Cada item especificado por uma URL é apagado do repositório via commit\n"
" imediato.\n"
-#: svn/main.c:354
+#: svn/main.c:366
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -6255,7 +6377,7 @@
" Use simplesmente 'svn diff' para mostrar modificações locais na sua \n"
" cópia de trabalho.\n"
-#: svn/main.c:384
+#: svn/main.c:396
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6295,7 +6417,7 @@
" Se especificado, PEGREV determina qual revisão o alvo é primeiramente\n"
" considerada.\n"
-#: svn/main.c:407
+#: svn/main.c:419
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -6303,7 +6425,7 @@
"Descreve o uso deste programa ou seus sub-comandos.\n"
"uso: help [SUB-COMANDO...]\n"
-#: svn/main.c:413
+#: svn/main.c:425
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -6323,7 +6445,7 @@
" Se CAMINHO é um diretório, seu conteúdo será adicionado diretamente\n"
" abaixo de URL.\n"
-#: svn/main.c:426
+#: svn/main.c:438
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -6340,7 +6462,7 @@
" fornecida, URL determina em qual revisão o alvo é primeiramente\n"
" considerada.\n"
-#: svn/main.c:436
+#: svn/main.c:449
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -6380,7 +6502,7 @@
" Tamanho (em bytes)\n"
" Data e hora do último commit\n"
-#: svn/main.c:458
+#: svn/main.c:471
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -6394,15 +6516,15 @@
"\n"
" Use --force para roubar a trava de outro usuário ou cópia de trabalho.\n"
-#: svn/main.c:466
+#: svn/main.c:479
msgid "read lock comment from file ARG"
msgstr "ler comentários de trava do arquivo ARG"
-#: svn/main.c:467
+#: svn/main.c:480
msgid "specify lock comment ARG"
msgstr "especifica comentário de trava ARG"
-#: svn/main.c:470
+#: svn/main.c:483
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -6459,7 +6581,7 @@
" svn log http://www.example.com/repo/project/foo.c\n"
" svn log http://www.example.com/repo/project foo.c bar.c\n"
-#: svn/main.c:500
+#: svn/main.c:513
msgid ""
"Apply the differences between two sources to a working copy path.\n"
"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -6511,7 +6633,7 @@
" as fontes tenham nomes-base idênticos que batam com um arquivo dentro\n"
" de '.': neste caso, as diferenças serão aplicadas ao arquivo.\n"
-#: svn/main.c:529
+#: svn/main.c:543
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -6541,7 +6663,7 @@
"\n"
" Em ambos os casos, todos os diretórios intermediários devem já existir.\n"
-#: svn/main.c:546
+#: svn/main.c:560
msgid ""
"Move and/or rename something in working copy or repository.\n"
"usage: move SRC... DST\n"
@@ -6572,7 +6694,7 @@
" URL -> URL: renomeação completa no lado-servidor.\n"
" Todas as FONTEs devem ser do mesmo tipo.\n"
-#: svn/main.c:563
+#: svn/main.c:577
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6590,7 +6712,7 @@
" 2. Remove propriedades não versionadas remotas da revisão do repositório.\n"
" ALVO só determina qual repositório a acessar.\n"
-#: svn/main.c:575
+#: svn/main.c:589
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -6608,7 +6730,7 @@
" 2. Edita propriedades não versionadas remotas em revisão de repositório.\n"
" ALVO só determina qual repositório a acessar.\n"
-#: svn/main.c:588
+#: svn/main.c:602
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6642,7 +6764,7 @@
" opção --strict para desabilitar estas modificações (útil, por exemplo,\n"
" quando redirecionando valores binários de propriedades para um arquivo).\n"
-#: svn/main.c:607
+#: svn/main.c:621
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6662,7 +6784,7 @@
" 2. Lista propriedades não versionadas remotas da revisão do repositório.\n"
" ALVO só determina qual repositório a acessar.\n"
-#: svn/main.c:619
+#: svn/main.c:633
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -6750,11 +6872,11 @@
" tentativa não recursiva irá falhar, e uma tentativa recursiva setará a\n"
" propriedade somente nos arquivos filhos do diretório.\n"
-#: svn/main.c:661
+#: svn/main.c:675
msgid "read property value from file ARG"
msgstr "ler valor de propriedade do arquivo ARG"
-#: svn/main.c:664
+#: svn/main.c:678
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -6771,7 +6893,7 @@
"relacionados\n"
" ao conflito e permite executar commit de CAMINHO novamente.\n"
-#: svn/main.c:673
+#: svn/main.c:688
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -6786,7 +6908,7 @@
" Nota: este sub-comando não requer acesso à rede, e resolve qualquer\n"
" estado de conflito. Entretanto, não restaura diretórios removidos.\n"
-#: svn/main.c:682
+#: svn/main.c:697
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -6939,7 +7061,7 @@
" 965 687 joe ct/zig.c\n"
" Status contra revisão: 981\n"
-#: svn/main.c:758
+#: svn/main.c:773
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL [PATH]\n"
@@ -6991,7 +7113,7 @@
" Todas as propriedades de um repositório são aplicadas ao caminho "
"obstruído.\n"
-#: svn/main.c:785
+#: svn/main.c:801
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -7003,7 +7125,7 @@
"\n"
" Use --force para quebrar a trava.\n"
-#: svn/main.c:793
+#: svn/main.c:809
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -7075,19 +7197,24 @@
"obstruído.\n"
" Caminhos obstruídos são reportados na primeira coluna com o código 'E'.\n"
-#: svn/main.c:869 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
+#: svn/main.c:885 svnadmin/main.c:78 svnlook/main.c:289 svnsync/main.c:180
msgid "Caught signal"
msgstr "Sinal pego"
-#: svn/main.c:981
+#: svn/main.c:904
+#, fuzzy
+msgid "Revision property pair is empty"
+msgstr "Entreada de revisão não é uma lista"
+
+#: svn/main.c:1034
msgid "Non-numeric limit argument given"
msgstr "Argumento limite não numérico fornecido"
-#: svn/main.c:987
+#: svn/main.c:1040
msgid "Argument to --limit must be positive"
msgstr "Argumento para --limit deve ser positivo"
-#: svn/main.c:1007
+#: svn/main.c:1060
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
@@ -7095,19 +7222,19 @@
"Múltiplos argumentos de revisão encontrados; não é possível especificar -c "
"duas vezes, ou ambos -c e -r"
-#: svn/main.c:1015 svn/main.c:1206
+#: svn/main.c:1068 svn/main.c:1290
msgid "Can't specify -c with --old"
msgstr "Não é possível especificar -c com --old"
-#: svn/main.c:1022
+#: svn/main.c:1075
msgid "Non-numeric change argument given to -c"
msgstr "Argumento de mudança não numérico fornecido para -c"
-#: svn/main.c:1028
+#: svn/main.c:1081
msgid "There is no change 0"
msgstr "Não há mudança 0"
-#: svn/main.c:1055
+#: svn/main.c:1108
msgid ""
"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
"N:M' instead of '-r N -r M'"
@@ -7115,32 +7242,42 @@
"Múltiplos argumentos de revisão encontrados; não é possível especificar -r e "
"-c, ou tente '-r M:N' ao invés de '-r M -r N'"
-#: svn/main.c:1068 svnadmin/main.c:1314
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Erro de sintaxe no argumento de revisão '%s'"
-#: svn/main.c:1222 svn/main.c:1232
+#: svn/main.c:1194
+#, c-format
+msgid "Error converting depth from locale to UTF8"
+msgstr ""
+
+#: svn/main.c:1214
+#, fuzzy, c-format
+msgid "'%s' is not a valid depth; try 0, 1, or 2"
+msgstr "'%s' não é um nome válido de propriedade Subversion"
+
+#: svn/main.c:1306 svn/main.c:1316
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props e --no-auto-props são mutualmente exclusivos"
-#: svn/main.c:1248
+#: svn/main.c:1332
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Erro de sintaxe no argumento de fim de linha nativo '%s'"
-#: svn/main.c:1324 svndumpfilter/main.c:1207 svnlook/main.c:2048
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "Argumento do sub-comando requerido\n"
-#: svn/main.c:1343 svnadmin/main.c:1443 svndumpfilter/main.c:1226
-#: svnlook/main.c:2067
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
+#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Comando desconhecido: '%s'\n"
-#: svn/main.c:1376
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7149,19 +7286,19 @@
"Sub-comando '%s' não aceita a opção '%s'\n"
"Digite 'svn help %s' para uso.\n"
-#: svn/main.c:1413
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"Arquivo de mensagem de log é um arquivo versionado; use '--force-log' para "
"sobrescrever"
-#: svn/main.c:1420
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"Arquivo de comentário de trava é um arquivo versionado; use '--force-log' "
"para sobrescrever"
-#: svn/main.c:1440
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7169,7 +7306,7 @@
"A mensagem de log é um caminho de arquivo (a intenção era -F?); use '--force-"
"log' para sobrescrever"
-#: svn/main.c:1447
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
@@ -7177,11 +7314,11 @@
"O comentário da trava é um caminho de arquivo (a intenção era -F?); use '--"
"force-log' para sobrescrever"
-#: svn/main.c:1582
+#: svn/main.c:1668
msgid "Try 'svn help' for more info"
msgstr "Tente 'svn help' para mais informações"
-#: svn/main.c:1592
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -7203,7 +7340,7 @@
"A fonte de mesclagem de uma cópia de trabalho precisa de uma revisão "
"explícita"
-#: svn/mkdir-cmd.c:84
+#: svn/mkdir-cmd.c:87
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "Tentar 'svn add' ou 'svn add --non-recursive' ao invés?"
@@ -7371,12 +7508,13 @@
msgstr "'%s' destravado.\n"
#: svn/notify.c:394
-msgid "Path '%s' is now part of changelist '%s'.\n"
+#, fuzzy, c-format
+msgid "Path '%s' is now a member of changelist '%s'.\n"
msgstr "Caminho '%s' agora é parte da lista de mudanças '%s'.\n"
-#: svn/notify.c:401
-#, c-format
-msgid "Path '%s' is no longer associated with a changelist.\n"
+#: svn/notify.c:402
+#, fuzzy, c-format
+msgid "Path '%s' is no longer a member of a changelist.\n"
msgstr "Caminho '%s' não está mais associado com a lista de mudanças.\n"
#: svn/propdel-cmd.c:77
@@ -7390,12 +7528,12 @@
msgstr ""
"Não é possível especificar revisão para propriedade versionada apagada '%s'"
-#: svn/propdel-cmd.c:116
+#: svn/propdel-cmd.c:124
#, c-format
msgid "property '%s' deleted (recursively) from '%s'.\n"
msgstr "propriedade '%s' apagada (recursivamente) de '%s'.\n"
-#: svn/propdel-cmd.c:117
+#: svn/propdel-cmd.c:125
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "propriedade '%s' apagada de '%s'.\n"
@@ -7405,7 +7543,7 @@
msgid "'%s' is not a valid Subversion property name"
msgstr "'%s' não é um nome válido de propriedade Subversion"
-#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:241 svn/propset-cmd.c:85
+#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:243 svn/propset-cmd.c:85
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr "Opção de codificação ruim: valor de prop não armaz. como UTF8"
@@ -7425,21 +7563,21 @@
msgstr ""
"Não é possível especificar revisão para editar propriedade versionada '%s'"
-#: svn/propedit-cmd.c:154 svn/propset-cmd.c:158
+#: svn/propedit-cmd.c:154 svn/propset-cmd.c:161
msgid "Explicit target argument required"
msgstr "Alvo explícito requerido como argumento"
-#: svn/propedit-cmd.c:211 svn/switch-cmd.c:140
+#: svn/propedit-cmd.c:213 svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "'%s' não parece ser o caminho de uma cópia de trabalho"
-#: svn/propedit-cmd.c:264
+#: svn/propedit-cmd.c:268
#, c-format
msgid "Set new value for property '%s' on '%s'\n"
msgstr "Seta novo valor para propriedade '%s' em '%s'\n"
-#: svn/propedit-cmd.c:274
+#: svn/propedit-cmd.c:278
#, c-format
msgid "No changes to property '%s' on '%s'\n"
msgstr "Sem mudanças na propriedade '%s' em '%s'\n"
@@ -7481,26 +7619,26 @@
msgstr ""
"Não é possível especificar revisão para setar propriedade versionada '%s'"
-#: svn/propset-cmd.c:151
+#: svn/propset-cmd.c:154
#, c-format
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr "Alvo explícito requerido ('%s' interpretado como valor de propriedade)"
-#: svn/propset-cmd.c:184
+#: svn/propset-cmd.c:191
#, c-format
msgid "property '%s' set (recursively) on '%s'\n"
msgstr "propriedade '%s' setada (recursivamente) em '%s'\n"
-#: svn/propset-cmd.c:185
+#: svn/propset-cmd.c:192
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "propriedade '%s' setada em '%s'\n"
-#: svn/revert-cmd.c:86
+#: svn/revert-cmd.c:93
msgid "Try 'svn revert --recursive' instead?"
msgstr "Tentar 'svn revert --recursive' ao invés?"
-#: svn/status-cmd.c:293
+#: svn/status-cmd.c:298
#, c-format
msgid ""
"\n"
@@ -7519,7 +7657,7 @@
msgid "'%s' to '%s' is not a valid relocation"
msgstr "'%s' para '%s' não é uma relocação válida"
-#: svn/util.c:60
+#: svn/util.c:61
#, c-format
msgid ""
"\n"
@@ -7528,7 +7666,7 @@
"\n"
"Commit da revisão %ld.\n"
-#: svn/util.c:68
+#: svn/util.c:69
#, c-format
msgid ""
"\n"
@@ -7537,7 +7675,14 @@
"\n"
"Aviso: %s\n"
-#: svn/util.c:136
+#: svn/util.c:145
+msgid ""
+"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
+"time configuration option is empty or consists solely of whitespace. "
+"Expected a shell command."
+msgstr ""
+
+#: svn/util.c:152
msgid ""
"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
"no 'editor-cmd' run-time configuration option was found"
@@ -7546,52 +7691,52 @@
"e a opção de configuração de tempo de execução 'editor-cmd' não foi "
"encontrada"
-#: svn/util.c:162
+#: svn/util.c:178
#, c-format
msgid "Can't get working directory"
msgstr "Não é possível obter diretório de trabalho"
-#: svn/util.c:173 svn/util.c:196
+#: svn/util.c:189 svn/util.c:212
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "Não é possível mudar diretório de trabalho para '%s'"
-#: svn/util.c:221
+#: svn/util.c:237
#, c-format
msgid "Can't write to '%s'"
msgstr "Não é possível escrever em '%s'"
-#: svn/util.c:266
+#: svn/util.c:282
#, c-format
msgid "system('%s') returned %d"
msgstr "system('%s') retornou %d"
-#: svn/util.c:307
+#: svn/util.c:323
msgid "Error normalizing edited contents to internal format"
msgstr "Erro normalizando conteúdos editados para formato interno"
-#: svn/util.c:338
+#: svn/util.c:354
#, c-format
msgid "Can't restore working directory"
msgstr "Não é possível restaurar diretório de trabalho"
-#: svn/util.c:380
+#: svn/util.c:396
msgid "Log message contains a zero byte"
msgstr "Mensagem de log contém um byte zero"
-#: svn/util.c:440
+#: svn/util.c:456
msgid "Your commit message was left in a temporary file:"
msgstr "Sua mensagem de commit foi deixada em um arquivo temporário:"
-#: svn/util.c:492
+#: svn/util.c:508
msgid "--This line, and those below, will be ignored--"
msgstr "--Esta linha, e as abaixo, serão ignoradas--"
-#: svn/util.c:517
+#: svn/util.c:533
msgid "Error normalizing log message to internal format"
msgstr "Erro normalizando mensagem de log para formato interno"
-#: svn/util.c:532
+#: svn/util.c:548
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
@@ -7599,13 +7744,13 @@
"O uso de um editor externo para buscar mensagens de log não suportado em "
"OS400; considere usar as opções --message (-m) ou --file (-F)"
-#: svn/util.c:618
+#: svn/util.c:634
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr ""
"Não foi possível chamar o editor para obter a mensagem de log estando em "
"modo não-interativo"
-#: svn/util.c:631
+#: svn/util.c:647
msgid ""
"Could not use external editor to fetch log message; consider setting the "
"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
@@ -7615,7 +7760,7 @@
"considere setar a variável de ambiente $SVN_EDITOR ou usar as opções --"
"message (-m) ou --file (-F)"
-#: svn/util.c:667
+#: svn/util.c:683
msgid ""
"\n"
"Log message unchanged or not specified\n"
@@ -7625,7 +7770,7 @@
"Mensagem de log não modificada ou não especificada\n"
"a)bortar, c)ontinuar, e)ditar\n"
-#: svn/util.c:720
+#: svn/util.c:736
msgid "Use --force to override this restriction"
msgstr "Use --force para sobrescrever esta restrição"
@@ -7875,12 +8020,13 @@
"Mostra os nomes de todas as transações sem commit.\n"
#: svnadmin/main.c:381
+#, fuzzy
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
-"Run the Berkeley DB recovery procedure on a repository. Do\n"
-"this if you've been getting errors indicating that recovery\n"
-"ought to be run. Recovery requires exclusive access and will\n"
+"Run the recovery procedure on a repository. Do this if you've\n"
+"been getting errors indicating that recovery ought to be run.\n"
+"Berkeley DB recovery requires exclusive access and will\n"
"exit if the repository is in use by another process.\n"
msgstr ""
"uso: svnadmin recover CAMINHO_REP\n"
@@ -8008,7 +8154,7 @@
"\n"
"Sub-comandos disponíveis:\n"
-#: svnadmin/main.c:698 svnlook/main.c:1674 svnserve/main.c:204
+#: svnadmin/main.c:698 svnlook/main.c:1687 svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -8025,7 +8171,7 @@
"Trava de repositório adquirida.Por favor aguarde; recuperar o repositório "
"pode levar algum tempo...\n"
-#: svnadmin/main.c:810
+#: svnadmin/main.c:811
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -8033,13 +8179,13 @@
"Falha ao obter acesso exclusivo ao repositório; talvez outro processo\n"
"como httpd, svnserve ou svn o tenha aberto?"
-#: svnadmin/main.c:815
+#: svnadmin/main.c:816
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr ""
"Esperando pela trava de repositório; talvez outro processo a tenha aberto?\n"
-#: svnadmin/main.c:822
+#: svnadmin/main.c:824
#, c-format
msgid ""
"\n"
@@ -8048,57 +8194,57 @@
"\n"
"Recuperação completa.\n"
-#: svnadmin/main.c:829
+#: svnadmin/main.c:831
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "A última revisão do respositório é %ld.\n"
-#: svnadmin/main.c:939
+#: svnadmin/main.c:941
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "Transação '%s' removida.\n"
-#: svnadmin/main.c:1007 svnadmin/main.c:1034
+#: svnadmin/main.c:1009 svnadmin/main.c:1036
#, c-format
msgid "Missing revision"
msgstr "Faltando revisão"
-#: svnadmin/main.c:1010 svnadmin/main.c:1037
+#: svnadmin/main.c:1012 svnadmin/main.c:1039
#, c-format
msgid "Only one revision allowed"
msgstr "Somente uma revisão permitida"
-#: svnadmin/main.c:1016
+#: svnadmin/main.c:1018
#, c-format
msgid "Exactly one property name and one file argument required"
msgstr "Somente um nome de propriedade e argumento de arquivo requeridos"
-#: svnadmin/main.c:1043
+#: svnadmin/main.c:1045
#, c-format
msgid "Exactly one file argument required"
msgstr "Somente um argumento de arquivo requerido"
-#: svnadmin/main.c:1117 svnlook/main.c:1739
+#: svnadmin/main.c:1119 svnlook/main.c:1752
#, c-format
msgid "UUID Token: %s\n"
msgstr "Token UUID: %s\n"
-#: svnadmin/main.c:1118 svnlook/main.c:1740
+#: svnadmin/main.c:1120 svnlook/main.c:1753
#, c-format
msgid "Owner: %s\n"
msgstr "Dono: %s\n"
-#: svnadmin/main.c:1119 svnlook/main.c:1741
+#: svnadmin/main.c:1121 svnlook/main.c:1754
#, c-format
msgid "Created: %s\n"
msgstr "Criado: %s\n"
-#: svnadmin/main.c:1120 svnlook/main.c:1742
+#: svnadmin/main.c:1122 svnlook/main.c:1755
#, c-format
msgid "Expires: %s\n"
msgstr "Expira: %s\n"
-#: svnadmin/main.c:1122
+#: svnadmin/main.c:1124
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8109,7 +8255,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1123
+#: svnadmin/main.c:1125
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8120,29 +8266,30 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1180
+#: svnadmin/main.c:1182
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "Caminho '%s' não está travado.\n"
-#: svnadmin/main.c:1192
+#: svnadmin/main.c:1194
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "Removida trava de '%s'.\n"
-#: svnadmin/main.c:1300
+#: svnadmin/main.c:1303
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Múltiplos argumentos de revisão encontrados; tente '-r N:M' ao invés de\n"
"'-r N -r M'"
-#: svnadmin/main.c:1425
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "argumento de sub-comando requerido\n"
-#: svnadmin/main.c:1510
+#: svnadmin/main.c:1502
+#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnadmin help %s' for usage.\n"
@@ -8150,7 +8297,7 @@
"Sub-comando '%s' não aceita opção '%s'\n"
"Digite 'svnadmin help %s' para uso.\n"
-#: svnadmin/main.c:1543
+#: svnadmin/main.c:1535
msgid "Try 'svnadmin help' for more info"
msgstr "Tente 'svnadmin help' para mais informações"
@@ -8299,43 +8446,47 @@
msgid "Try 'svndumpfilter help' for more info"
msgstr "Tente 'svndumpfilter help' para mais informações"
-#: svnlook/main.c:99
-msgid "specify revision number ARG"
-msgstr "especifica revisão número ARG"
-
-#: svnlook/main.c:102
-msgid "specify transaction name ARG"
-msgstr "especifica transação número ARG"
-
-#: svnlook/main.c:105
-msgid "be verbose"
-msgstr "seja 'verbose'"
-
-#: svnlook/main.c:108
-msgid "show node revision ids for each path"
-msgstr "mostra ids de revisões de nó em cada caminho"
-
-#: svnlook/main.c:114
-msgid "do not print differences for added files"
-msgstr "não imprime diferenças para arquivos incluídos"
-
-#: svnlook/main.c:117
-msgid "print differences against the copy source"
-msgstr "imprime diferenças contra a cópia de origem"
-
-#: svnlook/main.c:120
-msgid "operate on a revision property (use with -r or -t)"
-msgstr "opera em uma propriedade de revisão (use com -r ou -t)"
-
-#: svnlook/main.c:123
-msgid "show full paths instead of indenting them"
-msgstr "mostra caminhos completos ao invés de indentá-los"
-
-#: svnlook/main.c:126
+#: svnlook/main.c:93
msgid "show details for copies"
msgstr "mostra detalhes de cópias"
-#: svnlook/main.c:138
+#: svnlook/main.c:96
+msgid "print differences against the copy source"
+msgstr "imprime diferenças contra a cópia de origem"
+
+#: svnlook/main.c:99
+msgid "show full paths instead of indenting them"
+msgstr "mostra caminhos completos ao invés de indentá-los"
+
+#: svnlook/main.c:105
+msgid "do not print differences for added files"
+msgstr "não imprime diferenças para arquivos incluídos"
+
+#: svnlook/main.c:111
+msgid "operate on single directory only"
+msgstr "opera somente em um diretório"
+
+#: svnlook/main.c:114
+msgid "specify revision number ARG"
+msgstr "especifica revisão número ARG"
+
+#: svnlook/main.c:117
+msgid "operate on a revision property (use with -r or -t)"
+msgstr "opera em uma propriedade de revisão (use com -r ou -t)"
+
+#: svnlook/main.c:120
+msgid "show node revision ids for each path"
+msgstr "mostra ids de revisões de nó em cada caminho"
+
+#: svnlook/main.c:123
+msgid "specify transaction name ARG"
+msgstr "especifica transação número ARG"
+
+#: svnlook/main.c:126
+msgid "be verbose"
+msgstr "seja 'verbose'"
+
+#: svnlook/main.c:141
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -8345,7 +8496,7 @@
"\n"
"Mostra o autor.\n"
-#: svnlook/main.c:143
+#: svnlook/main.c:146
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -8355,7 +8506,7 @@
"\n"
"Mostra o conteúdo de um arquivo. Iniciar CAMINHO_ARQ com '/' é opcional.\n"
-#: svnlook/main.c:148
+#: svnlook/main.c:151
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -8365,7 +8516,7 @@
"\n"
"Mostra os caminhos que foram mudados.\n"
-#: svnlook/main.c:153
+#: svnlook/main.c:156
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -8375,7 +8526,7 @@
"\n"
"Mostra a identificação de data ('datestamp').\n"
-#: svnlook/main.c:158
+#: svnlook/main.c:161
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -8385,7 +8536,7 @@
"\n"
"Mostra diff no estilo GNU dos arquivos e propriedades mofidicadas.\n"
-#: svnlook/main.c:164
+#: svnlook/main.c:167
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -8397,7 +8548,7 @@
"Mostra os diretórios que foram eles mesmos modificados (edição de\n"
"propriedades) ou aqueles cujos arquivos filho foram modificados.\n"
-#: svnlook/main.c:170
+#: svnlook/main.c:173
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -8407,7 +8558,7 @@
"\n"
"Descreve o uso deste programa ou seus sub-comandos.\n"
-#: svnlook/main.c:175
+#: svnlook/main.c:178
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8419,7 +8570,7 @@
"Mostra informações sobre o histórico de um caminho no repositório (ou o\n"
"diretório raiz se o caminho não for informado).\n"
-#: svnlook/main.c:181
+#: svnlook/main.c:184
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -8429,7 +8580,7 @@
"\n"
"Mostra o autor, data/hora, tamanho da mensagem de log, e a mensagem de log.\n"
-#: svnlook/main.c:186
+#: svnlook/main.c:189
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -8439,7 +8590,7 @@
"\n"
"Se uma trava existe no caminho no repositório, a descreve.\n"
-#: svnlook/main.c:191
+#: svnlook/main.c:194
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -8449,7 +8600,7 @@
"\n"
"Mostra a mensagem de log.\n"
-#: svnlook/main.c:196
+#: svnlook/main.c:199
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -8461,7 +8612,7 @@
"Mostra o valor puro de uma propriedade em um caminho no repositório.\n"
"Com --revprop, mostra o valor puro de uma propriedade de revisão.\n"
-#: svnlook/main.c:202
+#: svnlook/main.c:205
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8475,7 +8626,7 @@
"com a opção --revprop, propriedades de revisões.\n"
"Com -v, também mostra os valores das propriedades.\n"
-#: svnlook/main.c:209
+#: svnlook/main.c:212
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8487,7 +8638,7 @@
"Mostra a árvore, começando em CAMINHO_NO_REP (se informado, ou na raiz da\n"
"árvore caso contrário), opcionalmente mostrando os ids de revisão dos nós.\n"
-#: svnlook/main.c:215
+#: svnlook/main.c:218
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -8497,7 +8648,7 @@
"\n"
"Mostra o UUID do repositório.\n"
-#: svnlook/main.c:220
+#: svnlook/main.c:223
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -8507,52 +8658,52 @@
"\n"
"Mostra o número da revisão mais nova.\n"
-#: svnlook/main.c:815
+#: svnlook/main.c:819
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Copiado: %s (de rev %ld, %s)\n"
-#: svnlook/main.c:884
+#: svnlook/main.c:888
msgid "Added"
msgstr "Incluído"
-#: svnlook/main.c:885
+#: svnlook/main.c:889
msgid "Deleted"
msgstr "Apagado"
-#: svnlook/main.c:886
+#: svnlook/main.c:890
msgid "Modified"
msgstr "Modificado"
-#: svnlook/main.c:887
+#: svnlook/main.c:891
msgid "Index"
msgstr "Índice"
-#: svnlook/main.c:899
+#: svnlook/main.c:903
#, c-format
msgid "(Binary files differ)\n"
msgstr "(Arquivos binários são diferentes)\n"
-#: svnlook/main.c:1028
+#: svnlook/main.c:1036
msgid "unknown"
msgstr "desconhecido"
-#: svnlook/main.c:1171 svnlook/main.c:1264 svnlook/main.c:1293
+#: svnlook/main.c:1183 svnlook/main.c:1276 svnlook/main.c:1305
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "Transação '%s' não é baseada em uma revisão; que estranho"
-#: svnlook/main.c:1201
+#: svnlook/main.c:1213
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "'%s' é uma URL, provavelmente deveria ser um caminho"
-#: svnlook/main.c:1228
+#: svnlook/main.c:1240
#, c-format
msgid "Path '%s' is not a file"
msgstr "Caminho '%s' não é um arquivo"
-#: svnlook/main.c:1367
+#: svnlook/main.c:1379
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -8561,7 +8712,7 @@
"REVISÃO CAMINHO <ID>\n"
"-------- ---------\n"
-#: svnlook/main.c:1372
+#: svnlook/main.c:1384
#, c-format
msgid ""
"REVISION PATH\n"
@@ -8570,27 +8721,27 @@
"REVISÃO CAMINHO\n"
"-------- ----\n"
-#: svnlook/main.c:1419
+#: svnlook/main.c:1431
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Propriedade '%s' não encontrada na revisão %ld"
-#: svnlook/main.c:1426
+#: svnlook/main.c:1438
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "Propriedade '%s' não encontrada no caminho '%s' na revisão %ld"
-#: svnlook/main.c:1431
+#: svnlook/main.c:1443
#, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "Propriedade '%s' não encontrada no caminho '%s' na transação %s"
-#: svnlook/main.c:1603 svnlook/main.c:1818
+#: svnlook/main.c:1616 svnlook/main.c:1831
#, c-format
msgid "Missing repository path argument"
msgstr "Faltando argumento de caminho de repositório"
-#: svnlook/main.c:1664
+#: svnlook/main.c:1677
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -8611,11 +8762,11 @@
"\n"
"Sub-comandos disponíveis:\n"
-#: svnlook/main.c:1720
+#: svnlook/main.c:1733
msgid "Missing path argument"
msgstr "Faltando argumento caminho"
-#: svnlook/main.c:1745
+#: svnlook/main.c:1758
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8624,7 +8775,7 @@
"Comentário (%i linhas):\n"
"%s\n"
-#: svnlook/main.c:1746
+#: svnlook/main.c:1759
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8633,41 +8784,41 @@
"Comentário (%i linha):\n"
"%s\n"
-#: svnlook/main.c:1792
+#: svnlook/main.c:1805
#, c-format
msgid "Missing propname argument"
msgstr "Faltando argumento propname"
-#: svnlook/main.c:1793
+#: svnlook/main.c:1806
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Faltando argumentos propname e caminho do repositório"
-#: svnlook/main.c:1799
+#: svnlook/main.c:1812
msgid "Missing propname or repository path argument"
msgstr "Faltando argumentos propname ou caminho do repositório"
-#: svnlook/main.c:1957
+#: svnlook/main.c:1971
msgid "Invalid revision number supplied"
msgstr "Número de revisão informado inválido"
-#: svnlook/main.c:2018
+#: svnlook/main.c:2036
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr ""
"Os argumentos '--transaction' (-t) e '--revision' (-r) não podem co-existir"
-#: svnlook/main.c:2100
+#: svnlook/main.c:2118
#, c-format
msgid "Repository argument required\n"
msgstr "Argumento do repositório requerido\n"
-#: svnlook/main.c:2109
+#: svnlook/main.c:2127
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "'%s' é uma URL quando deveria ser um caminho\n"
-#: svnlook/main.c:2160
+#: svnlook/main.c:2178
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8676,74 +8827,92 @@
"Sub-comando '%s' não aceita opção '%s'\n"
"Digite 'svnlook help %s' para uso.\n"
-#: svnlook/main.c:2203
+#: svnlook/main.c:2221
msgid "Try 'svnlook help' for more info"
msgstr "Tente 'svnlook help' para mais informações"
-#: svnserve/main.c:141
+#: svnserve/cyrus_auth.c:243
+#, c-format
+msgid "Can't get hostname"
+msgstr "Não foi possível obter o nome do servidor"
+
+#: svnserve/cyrus_auth.c:311
+msgid "Could not obtain the list of SASL mechanisms"
+msgstr "Não foi possível obter a lista de mecanismos SASL"
+
+#: svnserve/cyrus_auth.c:351
+msgid "Couldn't obtain the authenticated username"
+msgstr "Não foi possível obter o nome do usuário autenticado"
+
+#: svnserve/main.c:142
msgid "daemon mode"
msgstr "mode daemon"
-#: svnserve/main.c:143
+#: svnserve/main.c:144
msgid "listen port (for daemon mode)"
msgstr "porta para escuta (para modo daemon)"
-#: svnserve/main.c:145
+#: svnserve/main.c:146
msgid "listen hostname or IP address (for daemon mode)"
msgstr "servidor ou IP para escuta (para modo daemon)"
-#: svnserve/main.c:147
+#: svnserve/main.c:148
msgid "run in foreground (useful for debugging)"
msgstr "executa em primeiro plano (uso para debugging)"
-#: svnserve/main.c:148 svnversion/main.c:123
+#: svnserve/main.c:149 svnversion/main.c:123
msgid "display this help"
msgstr "mostra esta ajuda"
-#: svnserve/main.c:151
+#: svnserve/main.c:152
msgid "inetd mode"
msgstr "modo inetd"
-#: svnserve/main.c:152
+#: svnserve/main.c:153
msgid "root of directory to serve"
msgstr "raiz do diretório a servir"
-#: svnserve/main.c:154
+#: svnserve/main.c:155
msgid "force read only, overriding repository config file"
msgstr ""
"força somente para leitura, ignorando o arquivo de configuração de "
"repositório"
-#: svnserve/main.c:155
+#: svnserve/main.c:156
msgid "tunnel mode"
msgstr "modo tunnel"
-#: svnserve/main.c:157
+#: svnserve/main.c:158
msgid "tunnel username (default is current uid's name)"
msgstr "nome de usuário para tunnel (padrão é o nome do uid corrente)"
-#: svnserve/main.c:159
+#: svnserve/main.c:160
msgid "use threads instead of fork"
msgstr "use threads ao invés de fork"
-#: svnserve/main.c:161
+#: svnserve/main.c:162
msgid "listen once (useful for debugging)"
msgstr "escutar uma única vez (útil para debugging)"
-#: svnserve/main.c:163
+#: svnserve/main.c:164
+#, fuzzy
+msgid "read configuration from file ARG"
+msgstr "lê arquivos de configuração do usuário do diretório ARG"
+
+#: svnserve/main.c:166
msgid "write server process ID to file ARG"
msgstr "escreve ID de processo do servidor no arquivo ARG"
-#: svnserve/main.c:166
+#: svnserve/main.c:169
msgid "run as a windows service (SCM only)"
msgstr "roda como um serviço windows (somente SCM)"
-#: svnserve/main.c:178
+#: svnserve/main.c:181
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Digite '%s --help' para uso.\n"
-#: svnserve/main.c:187
+#: svnserve/main.c:190
msgid ""
"usage: svnserve [options]\n"
"\n"
@@ -8753,21 +8922,21 @@
"\n"
"Opções válidas:\n"
-#: svnserve/main.c:450
+#: svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "svnserve: Caminho raiz '%s' não existe ou não é um diretório.\n"
-#: svnserve/main.c:492
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Você deve especificar exatamente um entre -d, -i, -t ou -X.\n"
-#: svnserve/main.c:502
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "Opção --tunnel-user somente é válida no modo tunnel.\n"
-#: svnserve/main.c:571
+#: svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
@@ -8776,53 +8945,45 @@
"svnserve: A flag --service somente é válida se o processo é iniciado pelo "
"Service Control Manager.\n"
-#: svnserve/main.c:607
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "Não foi possível obter informação de endereço"
-#: svnserve/main.c:623
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "Não foi possível criar socket de servidor"
-#: svnserve/main.c:636
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "Não foi possível executar bind de socket de servidor"
-#: svnserve/main.c:704
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "Não foi possível aceitar conexão de cliente"
-#: svnserve/main.c:758
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "Não foi possível criar threadattr"
-#: svnserve/main.c:766
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "Não foi possível setar estado detached"
-#: svnserve/main.c:779
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "Não foi possível criar thread"
-#: svnserve/sasl_auth.c:243
-#, c-format
-msgid "Can't get hostname"
-msgstr "Não foi possível obter o nome do servidor"
-
-#: svnserve/sasl_auth.c:311
-msgid "Could not obtain the list of SASL mechanisms"
-msgstr "Não foi possível obter a lista de mecanismos SASL"
-
-#: svnserve/sasl_auth.c:351
-msgid "Couldn't obtain the authenticated username"
-msgstr "Não foi possível obter o nome do usuário autenticado"
+#: svnserve/serve.c:1437
+#, fuzzy
+msgid "Path is not a string"
+msgstr "Caminho não é um arquivo de trabalho"
#: svnserve/winservice.c:341
#, c-format
@@ -8847,7 +9008,7 @@
msgstr ""
"O serviço falhou ao iniciar; um erro interno ocorreu ao iniciar o serviço"
-#: svnsync/main.c:56
+#: svnsync/main.c:64
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -8877,29 +9038,37 @@
"Em outras palavras, o repositório destino deve ser uma cópia espelhada\n"
"somente para leitura do repositório fonte.\n"
-#: svnsync/main.c:71
+#: svnsync/main.c:79
+#, fuzzy
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
-"Transfer all pending revisions from source to destination.\n"
+"Transfer all pending revisions to the destination from the source\n"
+"with which it was initialized.\n"
msgstr ""
"uso: svnsync synchronize URL_DEST\n"
"\n"
"Transfere todas as revisões pendentes de origem para destino.\n"
-#: svnsync/main.c:76
+#: svnsync/main.c:85
msgid ""
-"usage: svnsync copy-revprops DEST_URL REV\n"
+"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
-"Copy all revision properties for revision REV from source to\n"
+"Copy the revision properties in a given range of revisions to the\n"
+"destination from the source with which it was initialized.\n"
+"\n"
+"If REV and REV2 are provided, copy properties for the revisions\n"
+"specified by that range, inclusively. If only REV is provided,\n"
+"copy properties for that revision alone. If REV is not provided,\n"
+"copy properties for all revisions previously transferred to the\n"
"destination.\n"
-msgstr ""
-"uso: svnsync copy-revprops URL_DEST REV\n"
"\n"
-"Copia todas as propriedades de revisão da revisão REV de origem para "
-"destino.\n"
+"REV and REV2 must be revisions which were previously transferred\n"
+"to the destination. You may use \"HEAD\" for either revision to\n"
+"mean \"the last revision transferred\".\n"
+msgstr ""
-#: svnsync/main.c:82
+#: svnsync/main.c:101
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -8909,61 +9078,89 @@
"\n"
"Descreve o uso deste programa ou seus sub-comandos.\n"
-#: svnsync/main.c:184
+#: svnsync/main.c:115
+msgid ""
+"specify a username ARG (deprecated;\n"
+" see --source-username and --sync-username)"
+msgstr ""
+
+#: svnsync/main.c:119
+msgid ""
+"specify a password ARG (deprecated;\n"
+" see --source-password and --sync-password)"
+msgstr ""
+
+#: svnsync/main.c:123
+msgid "connect to source repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:125
+msgid "connect to source repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:127
+msgid "connect to sync repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:129
+msgid "connect to sync repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:218
#, c-format
msgid "Can't get local hostname"
msgstr "Não foi possível obter o nome do servidor local"
-#: svnsync/main.c:206
+#: svnsync/main.c:241
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr "Falha ao obter trava no repositório destino, atualmente de '%s'\n"
-#: svnsync/main.c:301
+#: svnsync/main.c:336
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "Sessão tem raiz em '%s' mas a raiz do repositório é '%s'"
-#: svnsync/main.c:368
+#: svnsync/main.c:403
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr "Propriedades copiadas para revisão %ld (%s* propriedades omitidas).\n"
-#: svnsync/main.c:373
+#: svnsync/main.c:408
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Propriedades copiadas para revisão %ld.\n"
-#: svnsync/main.c:414
+#: svnsync/main.c:450
msgid "Cannot initialize a repository with content in it"
msgstr "Não foi possível inicializar um repositório com conteúdo"
-#: svnsync/main.c:425
+#: svnsync/main.c:461
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Repositório destino já está sincronizado de '%s'"
-#: svnsync/main.c:489 svnsync/main.c:492 svnsync/main.c:1159
-#: svnsync/main.c:1250
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Caminho '%s' não é uma URL"
-#: svnsync/main.c:874
+#: svnsync/main.c:914
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Commit da revisão %ld.\n"
-#: svnsync/main.c:913
+#: svnsync/main.c:954
msgid "Destination repository has not been initialized"
msgstr "Repositório destino não foi inicializado"
-#: svnsync/main.c:928
+#: svnsync/main.c:969
#, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
msgstr "UUID de repositório origem (%s) não bate com UUID esperado (%s)"
-#: svnsync/main.c:990
+#: svnsync/main.c:1032
#, c-format
msgid ""
"Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -8974,7 +9171,7 @@
"destino HEAD (%ld) são inconsistentes; você fez commit para o destino sem "
"usar svnsync?"
-#: svnsync/main.c:1028
+#: svnsync/main.c:1070
#, c-format
msgid ""
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
@@ -8983,22 +9180,30 @@
"Destino HEAD (%ld) não é a última revisão com merge (%ld); você fez commit "
"para o destino sem usar svnsync?"
-#: svnsync/main.c:1105
+#: svnsync/main.c:1148
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr "Commit criou revisão %ld mas deveria ter criado %ld"
-#: svnsync/main.c:1214
-msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+#: svnsync/main.c:1275 svnsync/main.c:1280
+#, fuzzy, c-format
+msgid ""
+"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr ""
"Não é possível copiar revprops para uma revisão que não foi sincronizada "
"ainda"
-#: svnsync/main.c:1253
-msgid "Invalid revision number"
+#: svnsync/main.c:1332
+#, fuzzy, c-format
+msgid "'%s' is not a valid revision range"
+msgstr "'%s' possui revisão inválida"
+
+#: svnsync/main.c:1346 svnsync/main.c:1366
+#, fuzzy, c-format
+msgid "Invalid revision number (%ld)"
msgstr "Número de revisão inválido"
-#: svnsync/main.c:1289
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -9013,7 +9218,14 @@
"\n"
"Sub-comandos disponíveis:\n"
-#: svnsync/main.c:1479
+#: svnsync/main.c:1581
+msgid ""
+"Cannot use --username or --password with any of --source-username, --source-"
+"password, --sync-username, or --sync-password.\n"
+msgstr ""
+
+#: svnsync/main.c:1661
+#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnsync help %s' for usage.\n"
@@ -9021,7 +9233,7 @@
"Sub-comando '%s' não aceita a opção '%s'\n"
"Digite 'svnsync help %s' para uso.\n"
-#: svnsync/main.c:1541
+#: svnsync/main.c:1733
msgid "Try 'svnsync help' for more info"
msgstr "Tente 'svnsync help' para mais informações"
@@ -9095,12 +9307,54 @@
msgid "last changed rather than current revisions"
msgstr "último modificado ao invés de revisão atual"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "exportado%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "'%s' não versionado, e não exportado\n"
+
+#~ msgid "'%s' is not under version control or doesn't exist"
+#~ msgstr "'%s' não está sobre controle de versão ou não existe"
+
+#~ msgid "Cannot read entry for '%s'"
+#~ msgstr "Não foi possível ler entrada para '%s'"
+
+#~ msgid "Can't find entry for '%s'"
+#~ msgstr "Não foi possível encontrar entrada para '%s'"
+
+#~ msgid "Can't get user name"
+#~ msgstr "Não foi possível obter o nome do usuário"
+
+#~ msgid "Unhandled SASL interaction"
+#~ msgstr "Iteração SASL não tratada"
+
+#~ msgid "'%s' has unsupported special file type '%s'"
+#~ msgstr "'%s' possui tipo de arquivo especial não suportado '%s'"
+
+#~ msgid "No entry for '%s'"
+#~ msgstr "Não há entradas para '%s'"
+
+#~ msgid "Cannot revert: '%s' is not under version control"
+#~ msgstr "Não é possível reverter: '%s' não está sobre controle de versão"
+
+#~ msgid "Cannot copy or move '%s': it's not under version control"
+#~ msgstr ""
+#~ "Não é possível copiar ou mover '%s': não está sobre controle de versão"
+
+#~ msgid "descend recursively"
+#~ msgstr "descende recursivamente"
+
+#~ msgid ""
+#~ "usage: svnsync copy-revprops DEST_URL REV\n"
+#~ "\n"
+#~ "Copy all revision properties for revision REV from source to\n"
+#~ "destination.\n"
+#~ msgstr ""
+#~ "uso: svnsync copy-revprops URL_DEST REV\n"
+#~ "\n"
+#~ "Copia todas as propriedades de revisão da revisão REV de origem para "
+#~ "destino.\n"
diff --git a/subversion/po/sv.po b/subversion/po/sv.po
index 4ad77b7..69baef5 100644
--- a/subversion/po/sv.po
+++ b/subversion/po/sv.po
@@ -42,7 +42,7 @@
msgstr ""
"Project-Id-Version: subversion 1.3\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-01-22 11:09+0800\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2006-10-25 09:19+0200\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -119,8 +119,8 @@
msgid "Read error in pipe"
msgstr "Läsfel i rör"
-#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:291
-#: libsvn_subr/cmdline.c:308 svn/util.c:742
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
+#: libsvn_subr/cmdline.c:316 svn/util.c:758
#, c-format
msgid "Write error"
msgstr "Fel vid skrivning"
@@ -270,603 +270,621 @@
msgid "Invalid switch"
msgstr "Ogiltig flagga"
-#: include/svn_error_codes.h:398
+#: include/svn_error_codes.h:397
+#, fuzzy
+msgid "Changelist doesn't match"
+msgstr "Ändringslista: %s\n"
+
+#: include/svn_error_codes.h:403
msgid "General filesystem error"
msgstr "Allmänt filsystemsfel"
-#: include/svn_error_codes.h:402
+#: include/svn_error_codes.h:407
msgid "Error closing filesystem"
msgstr "Fel vid stängning av filsystem"
-#: include/svn_error_codes.h:406
+#: include/svn_error_codes.h:411
msgid "Filesystem is already open"
msgstr "Filsystemet är redan öppet"
-#: include/svn_error_codes.h:410
+#: include/svn_error_codes.h:415
msgid "Filesystem is not open"
msgstr "Filsystemet är ej öppet"
-#: include/svn_error_codes.h:414
+#: include/svn_error_codes.h:419
msgid "Filesystem is corrupt"
msgstr "Förstört filsystem"
-#: include/svn_error_codes.h:418
+#: include/svn_error_codes.h:423
msgid "Invalid filesystem path syntax"
msgstr "Ogiltig syntax för sökväg i filsystem"
-#: include/svn_error_codes.h:422
+#: include/svn_error_codes.h:427
msgid "Invalid filesystem revision number"
msgstr "Ogiltigt revisionsnummer för filsystem"
-#: include/svn_error_codes.h:426
+#: include/svn_error_codes.h:431
msgid "Invalid filesystem transaction name"
msgstr "Ogiltigt transaktionsnamn för filsystem"
-#: include/svn_error_codes.h:430
+#: include/svn_error_codes.h:435
msgid "Filesystem directory has no such entry"
msgstr "Katalog i filsystem saknar post med det namnet"
-#: include/svn_error_codes.h:434
+#: include/svn_error_codes.h:439
msgid "Filesystem has no such representation"
msgstr "Representation saknas i filsystem"
-#: include/svn_error_codes.h:438
+#: include/svn_error_codes.h:443
msgid "Filesystem has no such string"
msgstr "Sträng saknas i filsystem"
-#: include/svn_error_codes.h:442
+#: include/svn_error_codes.h:447
msgid "Filesystem has no such copy"
msgstr "Kopia saknas i filsystem"
-#: include/svn_error_codes.h:446
+#: include/svn_error_codes.h:451
msgid "The specified transaction is not mutable"
msgstr "Angiven transaktion går ej att ändra"
-#: include/svn_error_codes.h:450
+#: include/svn_error_codes.h:455
msgid "Filesystem has no item"
msgstr "Filsystem saknar objekt"
-#: include/svn_error_codes.h:454
+#: include/svn_error_codes.h:459
msgid "Filesystem has no such node-rev-id"
msgstr "node-rev-id saknas i filsystem"
-#: include/svn_error_codes.h:458
+#: include/svn_error_codes.h:463
msgid "String does not represent a node or node-rev-id"
msgstr "Strängen representerar ingen nod eller node-erv-id"
-#: include/svn_error_codes.h:462
+#: include/svn_error_codes.h:467
msgid "Name does not refer to a filesystem directory"
msgstr "Namnet refererar ej till en katalog i filsystemet"
-#: include/svn_error_codes.h:466
+#: include/svn_error_codes.h:471
msgid "Name does not refer to a filesystem file"
msgstr "Namnet refererar ej till en fil i filsystemet"
-#: include/svn_error_codes.h:470
+#: include/svn_error_codes.h:475
msgid "Name is not a single path component"
msgstr "Namnet är ej en ensam sökvägskomponent"
-#: include/svn_error_codes.h:474
+#: include/svn_error_codes.h:479
msgid "Attempt to change immutable filesystem node"
msgstr "Försök att ändra filsystemsnod som ej får ändras"
-#: include/svn_error_codes.h:478
+#: include/svn_error_codes.h:483
msgid "Item already exists in filesystem"
msgstr "Objektet finns redan i filsystemet"
-#: include/svn_error_codes.h:482
+#: include/svn_error_codes.h:487
msgid "Attempt to remove or recreate fs root dir"
msgstr "Försök att ta bort eller omskapa filsystemets rotkatalog"
-#: include/svn_error_codes.h:486
+#: include/svn_error_codes.h:491
msgid "Object is not a transaction root"
msgstr "Objektet är ingen transaktionsrot"
-#: include/svn_error_codes.h:490
+#: include/svn_error_codes.h:495
msgid "Object is not a revision root"
msgstr "Objektet är ingen revisionsrot"
-#: include/svn_error_codes.h:494
+#: include/svn_error_codes.h:499
msgid "Merge conflict during commit"
msgstr "Sammanslagningskonflikt vid arkivering"
-#: include/svn_error_codes.h:498
+#: include/svn_error_codes.h:503
msgid "A representation vanished or changed between reads"
msgstr "Representation försvann eller ändrades mellan läsningar"
-#: include/svn_error_codes.h:502
+#: include/svn_error_codes.h:507
msgid "Tried to change an immutable representation"
msgstr "Försök att ändra representation som ej får ädnras"
-#: include/svn_error_codes.h:506
+#: include/svn_error_codes.h:511
msgid "Malformed skeleton data"
msgstr "Felaktig skelettdata"
-#: include/svn_error_codes.h:510
+#: include/svn_error_codes.h:515
msgid "Transaction is out of date"
msgstr "Transaktionen är inaktuell"
-#: include/svn_error_codes.h:514
+#: include/svn_error_codes.h:519
msgid "Berkeley DB error"
msgstr "Fel i Berkeley DB"
-#: include/svn_error_codes.h:518
+#: include/svn_error_codes.h:523
msgid "Berkeley DB deadlock error"
msgstr "\"Deadlock\" i Berkeley DB"
-#: include/svn_error_codes.h:522
+#: include/svn_error_codes.h:527
msgid "Transaction is dead"
msgstr "Transaktionen är död"
-#: include/svn_error_codes.h:526
+#: include/svn_error_codes.h:531
msgid "Transaction is not dead"
msgstr "Transaktionen är inte död"
-#: include/svn_error_codes.h:531
+#: include/svn_error_codes.h:536
msgid "Unknown FS type"
msgstr "Okänd filsystemstyp"
-#: include/svn_error_codes.h:536
+#: include/svn_error_codes.h:541
msgid "No user associated with filesystem"
msgstr "Ingen användare kopplad till filsystemet"
-#: include/svn_error_codes.h:541
+#: include/svn_error_codes.h:546
msgid "Path is already locked"
msgstr "Sökvägen är redan låst"
-#: include/svn_error_codes.h:546 include/svn_error_codes.h:678
+#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
msgid "Path is not locked"
msgstr "Sökvägen är inte låst"
-#: include/svn_error_codes.h:551
+#: include/svn_error_codes.h:556
msgid "Lock token is incorrect"
msgstr "Låsidentifieraren är felaktig"
-#: include/svn_error_codes.h:556
+#: include/svn_error_codes.h:561
msgid "No lock token provided"
msgstr "Ingen låsidentifierare tillhandahölls"
-#: include/svn_error_codes.h:561
+#: include/svn_error_codes.h:566
msgid "Username does not match lock owner"
msgstr "Användarnamnet matchar inte låsägaren"
-#: include/svn_error_codes.h:566
+#: include/svn_error_codes.h:571
msgid "Filesystem has no such lock"
msgstr "Låset saknas i filsystemet"
-#: include/svn_error_codes.h:571
+#: include/svn_error_codes.h:576
msgid "Lock has expired"
msgstr "Låset har gått ut"
-#: include/svn_error_codes.h:576
+#: include/svn_error_codes.h:581
msgid "Item is out of date"
msgstr "Objektet är inaktuellt"
-#: include/svn_error_codes.h:588
+#: include/svn_error_codes.h:586
+#, fuzzy
+msgid "SQLite error"
+msgstr "Fel vid skrivning"
+
+#: include/svn_error_codes.h:598
msgid "Unsupported FS format"
msgstr "Formatet på filsystemet stöds ej"
-#: include/svn_error_codes.h:593
+#: include/svn_error_codes.h:603
msgid "Representation is being written"
msgstr "Representationen håller på att skrivas"
-#: include/svn_error_codes.h:599
+#: include/svn_error_codes.h:609
msgid "The repository is locked, perhaps for db recovery"
msgstr "Arkivet är låst, kanske för reparation"
-#: include/svn_error_codes.h:603
+#: include/svn_error_codes.h:613
msgid "A repository hook failed"
msgstr "Arkivhookskript misslyckades"
-#: include/svn_error_codes.h:607
+#: include/svn_error_codes.h:617
msgid "Incorrect arguments supplied"
msgstr "Felaktiga argument"
-#: include/svn_error_codes.h:611
+#: include/svn_error_codes.h:621
msgid "A report cannot be generated because no data was supplied"
msgstr "Rapport kan ej skapas, då data ej tillhandahölls"
-#: include/svn_error_codes.h:615
+#: include/svn_error_codes.h:625
msgid "Bogus revision report"
msgstr "Felaktig revisionsrapport"
-#: include/svn_error_codes.h:624
+#: include/svn_error_codes.h:634
msgid "Unsupported repository version"
msgstr "Arkivversionen stöds ej"
-#: include/svn_error_codes.h:628
+#: include/svn_error_codes.h:638
msgid "Disabled repository feature"
msgstr "Funktionen är avslagen i arkivet"
-#: include/svn_error_codes.h:632
+#: include/svn_error_codes.h:642
msgid "Error running post-commit hook"
msgstr "Fel vid körning av post-commit-hookskript"
-#: include/svn_error_codes.h:637
+#: include/svn_error_codes.h:647
msgid "Error running post-lock hook"
msgstr "Fel vid körning av post-lock-hookskript"
-#: include/svn_error_codes.h:642
+#: include/svn_error_codes.h:652
msgid "Error running post-unlock hook"
msgstr "Fel vid körning av post-unlock-hookskript"
-#: include/svn_error_codes.h:649
+#: include/svn_error_codes.h:659
msgid "Bad URL passed to RA layer"
msgstr "Felaktig URL skickad till RA-skiktet"
-#: include/svn_error_codes.h:653
+#: include/svn_error_codes.h:663
msgid "Authorization failed"
msgstr "Behörighetskontroll misslyckades"
-#: include/svn_error_codes.h:657
+#: include/svn_error_codes.h:667
msgid "Unknown authorization method"
msgstr "Okänd metod för behörighetskontroll"
-#: include/svn_error_codes.h:661
+#: include/svn_error_codes.h:671
msgid "Repository access method not implemented"
msgstr "Metod för arkivåtkomst ej implementerad"
-#: include/svn_error_codes.h:665
+#: include/svn_error_codes.h:675
msgid "Item is out-of-date"
msgstr "Objektet är inaktuellt"
-#: include/svn_error_codes.h:669
+#: include/svn_error_codes.h:679
msgid "Repository has no UUID"
msgstr "Arkivet saknar unik identifierare (UUID)"
-#: include/svn_error_codes.h:673
+#: include/svn_error_codes.h:683
msgid "Unsupported RA plugin ABI version"
msgstr "ABI-versionen för insticksmodulen för arkivåtkomst stöds ej"
-#: include/svn_error_codes.h:685
+#: include/svn_error_codes.h:695
msgid "RA layer failed to init socket layer"
msgstr "RA-skiktet kunde inte initiera uttagsskiktet (socket layer)"
-#: include/svn_error_codes.h:689
+#: include/svn_error_codes.h:699
msgid "RA layer failed to create HTTP request"
msgstr "RA-skiktet kunde inte skapa en HTTP-förfrågan"
-#: include/svn_error_codes.h:693
+#: include/svn_error_codes.h:703
msgid "RA layer request failed"
msgstr "Förfrågan misslyckad i RA-skiktet"
-#: include/svn_error_codes.h:697
+#: include/svn_error_codes.h:707
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA-skiktet mottog ej begärd OPTIONS-information"
-#: include/svn_error_codes.h:701
+#: include/svn_error_codes.h:711
msgid "RA layer failed to fetch properties"
msgstr "RA-skiktet misslyckades med att erhålla egenskaper"
-#: include/svn_error_codes.h:705
+#: include/svn_error_codes.h:715
msgid "RA layer file already exists"
msgstr "RA-skiktsfil finns redan"
-#: include/svn_error_codes.h:709
+#: include/svn_error_codes.h:719
msgid "Invalid configuration value"
msgstr "Ogiltigt konfigurationsvärde"
-#: include/svn_error_codes.h:713
+#: include/svn_error_codes.h:723
msgid "HTTP Path Not Found"
msgstr "HTTP-sökväg finns inte"
-#: include/svn_error_codes.h:717
+#: include/svn_error_codes.h:727
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Misslyckades med att utföra WebDAV PROPPATCH"
-#: include/svn_error_codes.h:722 include/svn_error_codes.h:763
-#: libsvn_ra_svn/marshal.c:612 libsvn_ra_svn/marshal.c:720
-#: libsvn_ra_svn/marshal.c:747
+#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
+#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
+#: libsvn_ra_svn/marshal.c:774
msgid "Malformed network data"
msgstr "Felaktig nätverksdata"
-#: include/svn_error_codes.h:727
+#: include/svn_error_codes.h:737
msgid "Unable to extract data from response header"
msgstr "Kunde inte läsa data från responshuvud"
-#: include/svn_error_codes.h:732
+#: include/svn_error_codes.h:742
msgid "Repository has been moved"
msgstr "Arkivet har flyttats"
-#: include/svn_error_codes.h:738 include/svn_error_codes.h:767
+#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
msgid "Couldn't find a repository"
msgstr "Kunde inte hitta något arkiv"
-#: include/svn_error_codes.h:742
+#: include/svn_error_codes.h:752
msgid "Couldn't open a repository"
msgstr "Kunde inte öppna arkivet"
-#: include/svn_error_codes.h:747
+#: include/svn_error_codes.h:757
msgid "Special code for wrapping server errors to report to client"
msgstr "Specialkod för att rapportera serverfel till klienten"
-#: include/svn_error_codes.h:751
+#: include/svn_error_codes.h:761
msgid "Unknown svn protocol command"
msgstr "Okänt kommando i svn-protokollet"
-#: include/svn_error_codes.h:755
+#: include/svn_error_codes.h:765
msgid "Network connection closed unexpectedly"
msgstr "Nätverksanslutningen stängdes oväntat"
-#: include/svn_error_codes.h:759
+#: include/svn_error_codes.h:769
msgid "Network read/write error"
msgstr "Läs/skrivfel till nätverket"
-#: include/svn_error_codes.h:771
+#: include/svn_error_codes.h:781
msgid "Client/server version mismatch"
msgstr "Klient- och serverversion stämmer ej överens"
-#: include/svn_error_codes.h:779
+#: include/svn_error_codes.h:786
+msgid "Cannot negotiate authentication mechanism"
+msgstr "Kan inte förhandla om autentiseringsmekanism"
+
+#: include/svn_error_codes.h:795
msgid "Credential data unavailable"
msgstr "Klientreferenser otillgängliga"
-#: include/svn_error_codes.h:783
+#: include/svn_error_codes.h:799
msgid "No authentication provider available"
msgstr "Ingen tillhandahållare av autentisering tillgänglig"
-#: include/svn_error_codes.h:787 include/svn_error_codes.h:791
+#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
msgid "All authentication providers exhausted"
msgstr "Alla tillhandahållare av autentisering förbrukade"
-#: include/svn_error_codes.h:797
+#: include/svn_error_codes.h:813
msgid "Read access denied for root of edit"
msgstr "Läsning nekas till roten för editeringen"
-#: include/svn_error_codes.h:802
+#: include/svn_error_codes.h:818
msgid "Item is not readable"
msgstr "Objektet är inte läsbart"
-#: include/svn_error_codes.h:807
+#: include/svn_error_codes.h:823
msgid "Item is partially readable"
msgstr "Objektet är delvis läsbart"
-#: include/svn_error_codes.h:811
+#: include/svn_error_codes.h:827
msgid "Invalid authz configuration"
msgstr "Ogiltig auktorisationskonfiguration"
-#: include/svn_error_codes.h:816
+#: include/svn_error_codes.h:832
msgid "Item is not writable"
msgstr "Objektet är inte skrivbart"
-#: include/svn_error_codes.h:822
+#: include/svn_error_codes.h:838
msgid "Svndiff data has invalid header"
msgstr "Svndiff-data har ogiltigt huvud"
-#: include/svn_error_codes.h:826
+#: include/svn_error_codes.h:842
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff-data innehåller trasigt fönster"
-#: include/svn_error_codes.h:830
+#: include/svn_error_codes.h:846
msgid "Svndiff data contains backward-sliding source view"
msgstr "Svndiff-data innehåller källvyer med förflyttningar baklänges"
-#: include/svn_error_codes.h:834
+#: include/svn_error_codes.h:850
msgid "Svndiff data contains invalid instruction"
msgstr "Ogiltig instruktion i svndiff-data"
-#: include/svn_error_codes.h:838
+#: include/svn_error_codes.h:854
msgid "Svndiff data ends unexpectedly"
msgstr "Svndiff-data tog oväntat slut"
-#: include/svn_error_codes.h:842
+#: include/svn_error_codes.h:858
msgid "Svndiff compressed data is invalid"
msgstr "Komprimerad svndiff-data är ogiltig"
-#: include/svn_error_codes.h:848
+#: include/svn_error_codes.h:864
msgid "Diff data source modified unexpectedly"
msgstr "Datakälla för diff ändrades oväntat"
-#: include/svn_error_codes.h:854
+#: include/svn_error_codes.h:870
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache saknar sökväg till SVN-filsystem"
-#: include/svn_error_codes.h:858
+#: include/svn_error_codes.h:874
msgid "Apache got a malformed URI"
msgstr "Apache fick en felaktig URI"
-#: include/svn_error_codes.h:862
+#: include/svn_error_codes.h:878
msgid "Activity not found"
msgstr "Aktiviteten hittades ej"
-#: include/svn_error_codes.h:866
+#: include/svn_error_codes.h:882
msgid "Baseline incorrect"
msgstr "Felaktig baseline"
-#: include/svn_error_codes.h:870
+#: include/svn_error_codes.h:886
msgid "Input/output error"
msgstr "In/ut-fel"
-#: include/svn_error_codes.h:876
+#: include/svn_error_codes.h:892
msgid "A path under version control is needed for this operation"
msgstr "Operationen kräver en versionshanterad sökväg"
-#: include/svn_error_codes.h:880
+#: include/svn_error_codes.h:896
msgid "Repository access is needed for this operation"
msgstr "Operationen kräver åtkomst till ett arkiv"
-#: include/svn_error_codes.h:884
+#: include/svn_error_codes.h:900
msgid "Bogus revision information given"
msgstr "Felaktig revisionsinformation angiven"
-#: include/svn_error_codes.h:888
+#: include/svn_error_codes.h:904
msgid "Attempting to commit to a URL more than once"
msgstr "Försöker arkivera till en URL mer än en gång"
-#: include/svn_error_codes.h:892
+#: include/svn_error_codes.h:908
msgid "Operation does not apply to binary file"
msgstr "Operationen kan ej utföras på binär fil"
-#: include/svn_error_codes.h:898
+#: include/svn_error_codes.h:914
msgid "Format of an svn:externals property was invalid"
msgstr "Felaktigt format på svn:externals-egenskap"
-#: include/svn_error_codes.h:902
+#: include/svn_error_codes.h:918
msgid "Attempting restricted operation for modified resource"
msgstr "Operationen tillåter ej att källan är modifierad"
-#: include/svn_error_codes.h:906
+#: include/svn_error_codes.h:922
msgid "Operation does not apply to directory"
msgstr "Operationen kan ej utföras på en katalog"
-#: include/svn_error_codes.h:910
+#: include/svn_error_codes.h:926
msgid "Revision range is not allowed"
msgstr "Revisionsområde otillåtet"
-#: include/svn_error_codes.h:914
+#: include/svn_error_codes.h:930
msgid "Inter-repository relocation not allowed"
msgstr "Omlokalisering mellan arkiv otillåten"
-#: include/svn_error_codes.h:918
+#: include/svn_error_codes.h:934
msgid "Author name cannot contain a newline"
msgstr "Författarnamn kan ej innehålla radslut"
-#: include/svn_error_codes.h:922
+#: include/svn_error_codes.h:938
msgid "Bad property name"
msgstr "Felaktigt egenskapsnamn"
-#: include/svn_error_codes.h:927
+#: include/svn_error_codes.h:943
msgid "Two versioned resources are unrelated"
msgstr "Två orelaterade versionshanterade resurser"
-#: include/svn_error_codes.h:932
+#: include/svn_error_codes.h:948
msgid "Path has no lock token"
msgstr "Sökvägen saknar låsidentifierare"
-#: include/svn_error_codes.h:937
+#: include/svn_error_codes.h:953
#, fuzzy
msgid "Operation does not support multiple sources"
msgstr "Operationen kan ej utföras på en katalog"
-#: include/svn_error_codes.h:943
+#: include/svn_error_codes.h:959
msgid "A problem occurred; see later errors for details"
msgstr "Ett problem har inträffat; se vidare fel för mer information"
-#: include/svn_error_codes.h:947
+#: include/svn_error_codes.h:963
msgid "Failure loading plugin"
msgstr "Fel vid inladdning av insticksmodul"
-#: include/svn_error_codes.h:951
+#: include/svn_error_codes.h:967
msgid "Malformed file"
msgstr "Felaktig fil"
-#: include/svn_error_codes.h:955
+#: include/svn_error_codes.h:971
msgid "Incomplete data"
msgstr "Ofullständig data"
-#: include/svn_error_codes.h:959
+#: include/svn_error_codes.h:975
msgid "Incorrect parameters given"
msgstr "Felaktiga parametrar angivna"
-#: include/svn_error_codes.h:963
+#: include/svn_error_codes.h:979
msgid "Tried a versioning operation on an unversioned resource"
msgstr ""
"Försökte utföra en versionshanteringsoperation på en resurs som ej är "
"versionshanterad"
-#: include/svn_error_codes.h:967
+#: include/svn_error_codes.h:983
msgid "Test failed"
msgstr "Test misslyckades"
-#: include/svn_error_codes.h:971
+#: include/svn_error_codes.h:987
msgid "Trying to use an unsupported feature"
msgstr "Försöker använda en funktion som ej stöds"
-#: include/svn_error_codes.h:975
+#: include/svn_error_codes.h:991
msgid "Unexpected or unknown property kind"
msgstr "Oväntad eller okänd egenskapstyp"
-#: include/svn_error_codes.h:979
+#: include/svn_error_codes.h:995
msgid "Illegal target for the requested operation"
msgstr "Felaktigt mål för begärd operation"
-#: include/svn_error_codes.h:983
+#: include/svn_error_codes.h:999
msgid "MD5 checksum is missing"
msgstr "MD5-kontrollsumma saknas"
-#: include/svn_error_codes.h:987
+#: include/svn_error_codes.h:1003
msgid "Directory needs to be empty but is not"
msgstr "Katalogen måste vara tom, men det är den inte"
-#: include/svn_error_codes.h:991
+#: include/svn_error_codes.h:1007
msgid "Error calling external program"
msgstr "Fel vid anrop av externt program"
-#: include/svn_error_codes.h:995
+#: include/svn_error_codes.h:1011
msgid "Python exception has been set with the error"
msgstr "Python-undantag har satts för felet"
-#: include/svn_error_codes.h:999
+#: include/svn_error_codes.h:1015
msgid "A checksum mismatch occurred"
msgstr "Felaktig kontrollsumma"
-#: include/svn_error_codes.h:1003
+#: include/svn_error_codes.h:1019
msgid "The operation was interrupted"
msgstr "Operationen avbröts"
-#: include/svn_error_codes.h:1007
+#: include/svn_error_codes.h:1023
msgid "The specified diff option is not supported"
msgstr "Den angivna diff-flaggan stöds ej"
-#: include/svn_error_codes.h:1011
+#: include/svn_error_codes.h:1027
msgid "Property not found"
msgstr "Egenskapen finns ej"
-#: include/svn_error_codes.h:1015
+#: include/svn_error_codes.h:1031
msgid "No auth file path available"
msgstr "Sökväg för auth-fil ej tillgänglig"
-#: include/svn_error_codes.h:1020
+#: include/svn_error_codes.h:1035
+msgid "Merge info parse error"
+msgstr ""
+
+#: include/svn_error_codes.h:1040
msgid "Incompatible library version"
msgstr "Biblioteksversioner inte kompatibla"
-#: include/svn_error_codes.h:1026
+#: include/svn_error_codes.h:1046
#, fuzzy
msgid "Error parsing arguments"
msgstr "Klientfel vid tolkning av argument"
-#: include/svn_error_codes.h:1030
+#: include/svn_error_codes.h:1050
#, fuzzy
msgid "Not enough arguments provided"
msgstr "För få argument; använd \"svn --help\" för mer information"
-#: include/svn_error_codes.h:1034
+#: include/svn_error_codes.h:1054
msgid "Mutually exclusive arguments specified"
msgstr "De angivna argumenten kan inte användas samtidigt"
-#: include/svn_error_codes.h:1038
+#: include/svn_error_codes.h:1058
msgid "Attempted command in administrative dir"
msgstr "Försökte utföra kommando i administrativ katalog"
-#: include/svn_error_codes.h:1042
+#: include/svn_error_codes.h:1062
msgid "The log message file is under version control"
msgstr "Filen med loggmeddelandet är versionshanterad"
-#: include/svn_error_codes.h:1046
+#: include/svn_error_codes.h:1066
msgid "The log message is a pathname"
msgstr "Logmeddelandet är en sökväg"
-#: include/svn_error_codes.h:1050
+#: include/svn_error_codes.h:1070
msgid "Committing in directory scheduled for addition"
msgstr "Arkiverar i katalog schemalagd att läggas till"
-#: include/svn_error_codes.h:1054
+#: include/svn_error_codes.h:1074
msgid "No external editor available"
msgstr "Ingen extern editor tillgänglig"
-#: include/svn_error_codes.h:1058
+#: include/svn_error_codes.h:1078
msgid "Something is wrong with the log message's contents"
msgstr "Fel i loggmeddelandets innehåll"
-#: include/svn_error_codes.h:1062
+#: include/svn_error_codes.h:1082
msgid "A log message was given where none was necessary"
msgstr "Ett loggmeddelande angavs utan att det var nödvändigt"
-#: libsvn_client/add.c:344 libsvn_wc/copy.c:188
+#: libsvn_client/add.c:345 libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "Kan inte stänga katalogen \"%s\""
-#: libsvn_client/add.c:352
+#: libsvn_client/add.c:353
#, c-format
msgid "Error during recursive add of '%s'"
msgstr "Fel vid rekursivt tillägg av \"%s\""
@@ -884,7 +902,7 @@
msgid "Start revision must precede end revision"
msgstr "Startrevisionen måste komma före slutrevisionen"
-#: libsvn_client/blame.c:725 libsvn_client/cat.c:208
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL:en \"%s\" pekar på en katalog"
@@ -894,40 +912,35 @@
msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
msgstr "Saknar tidigare revision för åtgärden \"%c\" i revision %ld av \"%s\""
-#: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "\"%s\" är inte versionshanterad eller finns inte"
-
-#: libsvn_client/cat.c:79
+#: libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "\"%s\" pekar på en katalog"
-#: libsvn_client/cat.c:131 libsvn_client/export.c:183
+#: libsvn_client/cat.c:126 libsvn_client/export.c:183
msgid "(local)"
msgstr "(lokal)"
-#: libsvn_client/checkout.c:92
+#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL:en \"%s\" finns inte"
-#: libsvn_client/checkout.c:96
+#: libsvn_client/checkout.c:95
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL:en \"%s\" pekar på en fil och ingen katalog"
-#: libsvn_client/checkout.c:167
+#: libsvn_client/checkout.c:168
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "\"%s\" är redan en arbetskopia för en annan URL"
-#: libsvn_client/checkout.c:171
+#: libsvn_client/checkout.c:172
msgid "; run 'svn update' to complete it"
msgstr "; kör \"svn update\" för att slutföra"
-#: libsvn_client/checkout.c:181
+#: libsvn_client/checkout.c:182
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "\"%s\" finns redan och är ingen katalog"
@@ -941,124 +954,104 @@
msgid "New entry name required when importing a file"
msgstr "Nytt postnamn krävs vid import av en fil"
-#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:997 libsvn_wc/questions.c:91
+#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1016
+#: libsvn_wc/questions.c:92
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" finns inte"
-#: libsvn_client/commit.c:606 libsvn_client/copy.c:283 svnlook/main.c:1204
+#: libsvn_client/commit.c:607 libsvn_client/copy.c:286 svnlook/main.c:1216
#, c-format
msgid "Path '%s' does not exist"
msgstr "Sökvägen \"%s\" finns inte"
-#: libsvn_client/commit.c:737 libsvn_client/copy.c:292
-#: libsvn_client/copy.c:617 libsvn_client/copy.c:868 libsvn_client/copy.c:1194
+#: libsvn_client/commit.c:741 libsvn_client/copy.c:295
+#: libsvn_client/copy.c:759 libsvn_client/copy.c:1025
+#: libsvn_client/copy.c:1417
#, c-format
msgid "Path '%s' already exists"
msgstr "Sökvägen \"%s\" finns redan"
-#: libsvn_client/commit.c:752
+#: libsvn_client/commit.c:756
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "\"%s\" är ett reserverat namn och kan inte importeras"
-#: libsvn_client/commit.c:868 libsvn_client/copy.c:760
+#: libsvn_client/commit.c:872 libsvn_client/copy.c:909
msgid "Commit failed (details follow):"
msgstr "Arkiveringen misslyckades (mer information följer):"
-#: libsvn_client/commit.c:876 libsvn_client/copy.c:768
+#: libsvn_client/commit.c:880 libsvn_client/copy.c:917
msgid "Commit succeeded, but other errors follow:"
msgstr "Arkiveringen lyckades, men andra fel följer:"
-#: libsvn_client/commit.c:883 libsvn_client/copy.c:775
+#: libsvn_client/commit.c:887 libsvn_client/copy.c:924
msgid "Error unlocking locked dirs (details follow):"
msgstr "Fel vid upplåsning av låsta kataloger (mer information följer):"
-#: libsvn_client/commit.c:894
+#: libsvn_client/commit.c:898
msgid "Error bumping revisions post-commit (details follow):"
msgstr ""
"Fel vid höjning av revisionsnummer efter arkivering (mer information följer):"
-#: libsvn_client/commit.c:905 libsvn_client/copy.c:786
+#: libsvn_client/commit.c:909 libsvn_client/copy.c:935
msgid "Error in post-commit clean-up (details follow):"
msgstr "Fel vid städning efter arkivering (mer information följer):"
-#: libsvn_client/commit.c:1189
+#: libsvn_client/commit.c:1193
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "\"%s\" är en URL, men URL:er kan inte vara mål vid arkivering"
-#: libsvn_client/commit.c:1388
+#: libsvn_client/commit.c:1392
msgid "Are all the targets part of the same working copy?"
msgstr "Ingår samtliga mål i samma arbetskopia?"
-#: libsvn_client/commit.c:1403
+#: libsvn_client/commit.c:1407
msgid "Cannot non-recursively commit a directory deletion"
msgstr ""
"Kan inte arkivera en radering av en katalog utan att det görs rekursivt"
-#: libsvn_client/commit_util.c:252 libsvn_client/commit_util.c:263
+#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "Okänd posttyp för \"%s\""
-#: libsvn_client/commit_util.c:280
+#: libsvn_client/commit_util.c:284
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "På posten \"%s\" har specialstatus ändrats oväntat"
-#: libsvn_client/commit_util.c:331
+#: libsvn_client/commit_util.c:335
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "Arkiveringen avbryts: \"%s\" är fortfarande i konflikt"
-#: libsvn_client/commit_util.c:397
+#: libsvn_client/commit_util.c:401
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "Väntade inte att \"%s\" skulle vara en rot till en arbetskopia"
-#: libsvn_client/commit_util.c:415 libsvn_client/commit_util.c:1065
+#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr ""
"Arkiveringsobjektet \"%s\" har kopieringsflaggan satt, men saknar \"copyfrom"
"\"-URL"
-#: libsvn_client/commit_util.c:705 libsvn_client/commit_util.c:853
-#: libsvn_client/copy.c:1485 libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1468 libsvn_client/diff.c:2198
-#: libsvn_client/diff.c:2793 libsvn_client/diff.c:2921
-#: libsvn_client/locking_commands.c:259 libsvn_client/log.c:133
-#: libsvn_client/prop_commands.c:354 libsvn_client/prop_commands.c:608
-#: libsvn_client/prop_commands.c:772 libsvn_client/prop_commands.c:1131
-#: libsvn_client/ra.c:181 libsvn_client/revisions.c:89
-#: libsvn_client/status.c:256 libsvn_client/switch.c:107
-#: libsvn_wc/adm_crawler.c:453 libsvn_wc/adm_crawler.c:477
-#: libsvn_wc/adm_ops.c:1350 libsvn_wc/adm_ops.c:2638 libsvn_wc/adm_ops.c:2664
-#: libsvn_wc/adm_ops.c:2700 libsvn_wc/adm_ops.c:2759 libsvn_wc/copy.c:307
-#: libsvn_wc/copy.c:663 libsvn_wc/copy.c:785 libsvn_wc/copy.c:792
-#: libsvn_wc/diff.c:1793 libsvn_wc/entries.c:2276 libsvn_wc/entries.c:2872
-#: libsvn_wc/props.c:484 libsvn_wc/props.c:1092 libsvn_wc/props.c:1543
-#: libsvn_wc/questions.c:186 libsvn_wc/questions.c:300 libsvn_wc/status.c:729
-#: libsvn_wc/translate.c:269 libsvn_wc/update_editor.c:2299
-#: libsvn_wc/update_editor.c:3150
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "\"%s\" är inte versionshanterad"
-
-#: libsvn_client/commit_util.c:708
+#: libsvn_client/commit_util.c:709
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "Posten för \"%s\" saknar URL"
-#: libsvn_client/commit_util.c:741
+#: libsvn_client/commit_util.c:742
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr ""
"\"%s\" är schemalagd att läggas till i en förälder som inte är "
"versionshanterad"
-#: libsvn_client/commit_util.c:761
+#: libsvn_client/commit_util.c:762
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1069,7 +1062,7 @@
"att läggas till. Försöker du arkivera något som är inuti en icke (eller inte "
"ännu) versionshanterad katalog?"
-#: libsvn_client/commit_util.c:802
+#: libsvn_client/commit_util.c:803
#, c-format
msgid ""
"'%s' is not under version control and is not part of the commit, yet its "
@@ -1078,24 +1071,28 @@
"\"%s\" är inte versionshanterad och är ej heller delaktig i arkiveringen, "
"men trots det är dess barn \"%s\" en del av arkiveringen"
-#: libsvn_client/commit_util.c:920
+#: libsvn_client/commit_util.c:907
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr ""
"Kan inte arkivera både \"%s\" och \"%s\" eftersom de hänvisar till samma URL"
-#: libsvn_client/commit_util.c:1070
+#: libsvn_client/commit_util.c:1057
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "Arkiveringsobjektet \"%s\" har kopieringsflagga men ogiltig revision"
-#: libsvn_client/copy.c:302 libsvn_client/copy.c:1204
-#: libsvn_client/update.c:78
+#: libsvn_client/commit_util.c:1822
+msgid "Standard properties can't be set explicitly as revision properties"
+msgstr ""
+
+#: libsvn_client/copy.c:305 libsvn_client/copy.c:1427
+#: libsvn_client/update.c:98
#, c-format
msgid "Path '%s' is not a directory"
msgstr "Sökvägen \"%s\" är ingen katalog"
-#: libsvn_client/copy.c:516
+#: libsvn_client/copy.c:658
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
@@ -1104,66 +1101,67 @@
"Källan och destinationen verkar inte vara i samma arkiv (källa: \"%s\"; "
"destination: \"%s\")"
-#: libsvn_client/copy.c:598
+#: libsvn_client/copy.c:740
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Kan inte flytta URL:en \"%s\" till sig själv"
-#: libsvn_client/copy.c:607 libsvn_client/prop_commands.c:226
+#: libsvn_client/copy.c:749 libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "Sökvägen \"%s\" finns inte i revision %ld"
-#: libsvn_client/copy.c:1043
+#: libsvn_client/copy.c:1259
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr ""
"Käll-RUL:en \"%s\" är från ett annat arkiv, låter den vara en separat "
"arbetskopia"
-#: libsvn_client/copy.c:1181
+#: libsvn_client/copy.c:1404
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Sökvägen \"%s\" finns inte i revision %ld"
-#: libsvn_client/copy.c:1186
+#: libsvn_client/copy.c:1409
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "Sökvägen \"%s\" finns inte i den senaste revisionen"
-#: libsvn_client/copy.c:1229
+#: libsvn_client/copy.c:1452
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "Posten för \"%s\" finns (fast arbetsfilen saknas)"
-#: libsvn_client/copy.c:1323 libsvn_client/log.c:86
+#: libsvn_client/copy.c:1546 libsvn_client/log.c:87
msgid "Revision type requires a working copy path, not a URL"
msgstr "Revisionstypen kräver en sökväg till en arbetskopia; inte en URL"
-#: libsvn_client/copy.c:1357
-msgid "Cannot mix repository and working copy paths in source list"
-msgstr ""
+#: libsvn_client/copy.c:1581
+#, fuzzy
+msgid "Cannot mix repository and working copy sources"
+msgstr "Sökväg är inte en fil i en arbetskopia"
-#: libsvn_client/copy.c:1398
+#: libsvn_client/copy.c:1623
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "Kan inte kopiera sökvägen \"%s\" till dess eget barn \"%s\""
-#: libsvn_client/copy.c:1418
+#: libsvn_client/copy.c:1643
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "Kan inte flytta sökvägen \"%s\" till sig själv"
-#: libsvn_client/copy.c:1427
-msgid "No support for repos <--> working copy moves"
-msgstr "Flytt mellan arbetskipia och arkiv stöds ej"
+#: libsvn_client/copy.c:1652
+msgid "Moves between the working copy and the repository are not supported"
+msgstr ""
-#: libsvn_client/copy.c:1491
+#: libsvn_client/copy.c:1710
#, c-format
msgid "'%s' does not seem to have a URL associated with it"
msgstr "\"%s\" verkar inte ha någon URL associerad till sig"
-#: libsvn_client/copy.c:1817 svn/move-cmd.c:67
+#: libsvn_client/copy.c:2048 svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "Revisioner (förutom HEAD) kan ej anges vid flyttoperationer"
@@ -1172,86 +1170,75 @@
msgid "'%s' is in the way of the resource actually under version control"
msgstr "\"%s\" är i vägen för den versionshanterade resursen"
+#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2781 libsvn_wc/entries.c:1256
+#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2969
+#: libsvn_wc/update_editor.c:2178
+#, c-format
+msgid "'%s' is not under version control"
+msgstr "\"%s\" är inte versionshanterad"
+
#: libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "\"%s\" har lokala ändringar"
-#: libsvn_client/diff.c:99
+#: libsvn_client/diff.c:135
+#, fuzzy, c-format
+msgid " Reverted %s:r%s%s"
+msgstr "Återställde \"%s\"\n"
+
+#: libsvn_client/diff.c:153
+#, c-format
+msgid " Merged %s:r%s%s"
+msgstr ""
+
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sEgenskapsändringar för: %s%s"
-#: libsvn_client/diff.c:127
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "Namn: %s%s"
-#: libsvn_client/diff.c:203
-#, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr "URL:erna har inget schema (\"%s\" och \"%s\")"
-
-#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
-#, c-format
-msgid "URL has no scheme: '%s'"
-msgstr "URL:en har inget schema: \"%s\""
-
-#: libsvn_client/diff.c:222
-#, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "Blandning av åtkomstscheman stöds inte ännu (\"%s\" och \"%s\")"
-
-#: libsvn_client/diff.c:287
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revision %ld)"
-#: libsvn_client/diff.c:289
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(arbetskopia)"
-#: libsvn_client/diff.c:432
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "Kan inte visa: filen markerad som binär.%s"
-#. xgettext: the '.working', '.merge-left.r%ld' and
-#. '.merge-right.r%ld' strings are used to tag onto a file
-#. name in case of a merge conflict
-#: libsvn_client/diff.c:887
-msgid ".working"
-msgstr ".arbetskopia"
-
-#: libsvn_client/diff.c:889
-#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".sammanslagning-vänster.r%ld"
-
-#: libsvn_client/diff.c:892
-#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".sammanslagning-höger.r%ld"
-
-#: libsvn_client/diff.c:1533 libsvn_client/diff.c:1737
+#. -----------------------------------------------------------------------
+#. ** Utilities. **
+#. Sanity check -- ensure that we have valid revisions to look at.
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "Alla revisioner som krävs angavs inte"
-#: libsvn_client/diff.c:1548
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr "Åtminstone en revision måste vara icke-lokal för fixerad diff"
-#: libsvn_client/diff.c:1660 libsvn_client/diff.c:1672
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "\"%s\" fanns inte i revision %ld i arkivet"
-#: libsvn_client/diff.c:2018
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+#: libsvn_client/diff.c:1025
+#, fuzzy
+msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr "Tyvärr anropades svn_client_diff3 på ett sätt som inte stöds ännu"
-#: libsvn_client/diff.c:2057
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
@@ -1259,180 +1246,215 @@
"Endast skillnader mellan en arbetskopias textbas och arbetsfilerna stöds för "
"närvarande"
-#: libsvn_client/diff.c:2202 libsvn_client/switch.c:111
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "Katalogen \"%s\" saknar URL"
-#: libsvn_client/diff.c:2409
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr "Summerande diff kan endast jämföra arkiv med arkiv"
-#: libsvn_client/diff.c:2766 libsvn_client/diff.c:2772
-#: libsvn_client/diff.c:2906 libsvn_client/locking_commands.c:263
-#: libsvn_client/ra.c:382 libsvn_client/ra.c:748 libsvn_client/ra.c:885
-#, c-format
-msgid "'%s' has no URL"
-msgstr "\"%s\" saknar URL"
-
#: libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "\"%s\" är inte ett giltigt radslutsvärde"
-#: libsvn_client/export.c:271
+#: libsvn_client/export.c:260
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr ""
"Destinationskatalogen finns och kommer inte att skrivas över om det inte "
"framtvingas"
-#: libsvn_client/export.c:369 libsvn_client/export.c:512
+#: libsvn_client/export.c:358 libsvn_client/export.c:501
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "\"%s\" finns och är ingen katalog"
-#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#: libsvn_client/export.c:362 libsvn_client/export.c:505
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: libsvn_client/export.c:687 libsvn_wc/update_editor.c:1759
-#: libsvn_wc/update_editor.c:2429
+#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "Felaktig kontrollsumma för \"%s\"; väntade \"%s\", fick \"%s\""
-#: libsvn_client/info.c:244
-#, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "Kan inte läsa post för \"%s\""
-
-#: libsvn_client/info.c:380 libsvn_client/info.c:405 libsvn_client/info.c:415
+#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL:en \"%s\" finns inte i revision %ld"
-#: libsvn_client/list.c:225
+#: libsvn_client/list.c:222
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL:en \"%s\" finns inte i den revisionen"
-#: libsvn_client/locking_commands.c:198
+#: libsvn_client/locking_commands.c:199
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "Ingen gemensam förälder finns; kan inte arbeta med disjunkta argument"
-#: libsvn_client/locking_commands.c:287
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
+#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
+#, c-format
+msgid "'%s' has no URL"
+msgstr "\"%s\" saknar URL"
+
+#: libsvn_client/locking_commands.c:284
msgid "Unable to lock/unlock across multiple repositories"
msgstr "Kan inte låsa/låsa upp i flera arkiv samtidigt"
-#: libsvn_client/locking_commands.c:328
+#: libsvn_client/locking_commands.c:325
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "\"%s\" är inte låst i den här arbetskopian"
-#: libsvn_client/locking_commands.c:376
+#: libsvn_client/locking_commands.c:373
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: libsvn_client/locking_commands.c:409 libsvn_ra/ra_loader.c:625
-msgid "Lock comment has illegal characters"
+#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:932
+#: libsvn_ra/ra_loader.c:863
+#, fuzzy
+msgid "Lock comment contains illegal characters"
msgstr "Låskommentaren innehåller ogiltiga tecken"
-#: libsvn_client/log.c:73
+#: libsvn_client/log.c:74
msgid "Missing required revision specification"
msgstr "Revisionsspecifikation saknas"
-#: libsvn_client/log.c:139 libsvn_client/status.c:261
-#: libsvn_client/update.c:92
+#: libsvn_client/log.c:137 libsvn_client/status.c:271
+#: libsvn_client/update.c:112
#, c-format
msgid "Entry '%s' has no URL"
msgstr "Posten \"%s\" saknar URL"
-#: libsvn_client/log.c:370
+#: libsvn_client/log.c:368
msgid "No commits in repository"
msgstr "Intenting har arkiverats i arkivet"
-#: libsvn_client/prop_commands.c:71
+#: libsvn_client/merge.c:87
+#, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
+msgstr "URL:erna har inget schema (\"%s\" och \"%s\")"
+
+#: libsvn_client/merge.c:93 libsvn_client/merge.c:99
+#, c-format
+msgid "URL has no scheme: '%s'"
+msgstr "URL:en har inget schema: \"%s\""
+
+#: libsvn_client/merge.c:106
+#, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr "Blandning av åtkomstscheman stöds inte ännu (\"%s\" och \"%s\")"
+
+#. xgettext: the '.working', '.merge-left.r%ld' and
+#. '.merge-right.r%ld' strings are used to tag onto a file
+#. name in case of a merge conflict
+#: libsvn_client/merge.c:328
+msgid ".working"
+msgstr ".arbetskopia"
+
+#: libsvn_client/merge.c:330
+#, c-format
+msgid ".merge-left.r%ld"
+msgstr ".sammanslagning-vänster.r%ld"
+
+#: libsvn_client/merge.c:333
+#, c-format
+msgid ".merge-right.r%ld"
+msgstr ".sammanslagning-höger.r%ld"
+
+#: libsvn_client/merge.c:1164
+#, c-format
+msgid ""
+"Path '%s' is in conflict, and must be resolved before the remainder of the "
+"requested merge can be applied"
+msgstr ""
+
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
+msgid "Use of two URLs is not compatible with merge info modification"
+msgstr ""
+
+#: libsvn_client/prop_commands.c:73
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s' är en wcprop; ej tillgänglig för klienter"
-#: libsvn_client/prop_commands.c:213
+#: libsvn_client/prop_commands.c:216
#, c-format
msgid "Property '%s' is not a regular property"
msgstr "Egenskapen \"%s\" är inte en vanlig egenskap"
-#: libsvn_client/prop_commands.c:315
+#: libsvn_client/prop_commands.c:320
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "Revisionsegenskapen \"%s\" är inte tillåten här"
-#: libsvn_client/prop_commands.c:323 libsvn_client/prop_commands.c:442
+#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
#, c-format
msgid "Bad property name: '%s'"
msgstr "Felaktigt egenskapsnamn: \"%s\""
-#: libsvn_client/prop_commands.c:334
+#: libsvn_client/prop_commands.c:339
#, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr ""
"Att sätta en egenskap på målet \"%s\" som inte är lokalt kräver en "
"basrevision"
-#: libsvn_client/prop_commands.c:340
+#: libsvn_client/prop_commands.c:345
#, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr ""
"Att sätta en egenskap rekursivt på målet \"%s\" som inte är lokalt stöds inte"
-#: libsvn_client/prop_commands.c:438
+#: libsvn_client/prop_commands.c:439
msgid "Value will not be set unless forced"
msgstr "Värdet sätts inte utan att det framtvingas"
-#: libsvn_client/prop_commands.c:661
+#: libsvn_client/prop_commands.c:659
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "\"%s\" finns inte i revision %ld"
-#: libsvn_client/prop_commands.c:668 libsvn_client/prop_commands.c:936
+#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:948
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "Okänd nodtyp för \"%s\""
-#: libsvn_client/ra.c:132
+#: libsvn_client/ra.c:133
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr ""
"Försök att sätta wcporp \"%s\" på \"%s\" under en operation som ej är "
"arkivering"
-#: libsvn_client/ra.c:359
-#, c-format
-msgid "Can't find entry for '%s'"
-msgstr "Kan inte hitta post för \"%s\""
-
-#: libsvn_client/ra.c:503
+#: libsvn_client/ra.c:496
#, c-format
msgid "Missing changed-path information for '%s' in revision %ld"
msgstr "Saknar information om änrade sökvägar för \"%s\" i revision %ld"
-#: libsvn_client/ra.c:623
-#, c-format
-msgid "path '%s' doesn't exist in revision %ld"
+#: libsvn_client/ra.c:616
+#, fuzzy, c-format
+msgid "Path '%s' doesn't exist in revision %ld"
msgstr "Sökvägen \"%s\" finns inte i revision %ld"
-#: libsvn_client/ra.c:670 libsvn_client/ra.c:833
+#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "Kan inte hitta platsen i arkivet för \"%s\" i revision %ld"
-#: libsvn_client/ra.c:681
+#: libsvn_client/ra.c:674
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "\"%s\" i revision %ld är ett orelaterat objekt"
-#: libsvn_client/ra.c:838
+#: libsvn_client/ra.c:831
#, c-format
msgid ""
"The location for '%s' for revision %ld does not exist in the repository or "
@@ -1451,16 +1473,26 @@
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
msgstr "Arkivet på \"%s\" har uuid \"%s\", men arbetskopian har \"%s\""
-#: libsvn_client/revisions.c:99
+#: libsvn_client/revisions.c:93
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "Sökvägen \"%s\" saknar senaste arkiveringsrevision"
-#: libsvn_client/revisions.c:109
+#: libsvn_client/revisions.c:103
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "Okänd revisionstyp begärd för \"%s\""
+#: libsvn_client/update.c:138 libsvn_wc/log.c:2573
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr "\"%s\" är ingen katalog i en arbetskopia"
+
+#: libsvn_client/update.c:146
+#, fuzzy, c-format
+msgid "'%s' is neither a file nor a directory"
+msgstr "\"%s\" är varken ett fil- eller katalognamn"
+
#: libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
msgstr "Misslyckades med att komprimera svndiff-data"
@@ -1488,44 +1520,44 @@
msgid "Invalid diff stream: insn %d overflows the target view"
msgstr "Ogiltig diff-ström: instruktionen %d går utanför målet"
-#: libsvn_delta/svndiff.c:501
+#: libsvn_delta/svndiff.c:500
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr "Ogiltig diff-ström: [src] instruktion %d går utanför källan"
-#: libsvn_delta/svndiff.c:508
+#: libsvn_delta/svndiff.c:507
#, c-format
msgid ""
"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
msgstr "Ogiltig diff-ström: [tgt] instruktionen %d börjar efter målet"
-#: libsvn_delta/svndiff.c:515
+#: libsvn_delta/svndiff.c:514
#, c-format
msgid "Invalid diff stream: [new] insn %d overflows the new data section"
msgstr "Ogiltig diff-ström: [new] instruktionen %d går utanför ny data"
-#: libsvn_delta/svndiff.c:525
+#: libsvn_delta/svndiff.c:524
msgid "Delta does not fill the target window"
msgstr "Deltat fyller inte målfönstret"
-#: libsvn_delta/svndiff.c:528
+#: libsvn_delta/svndiff.c:527
msgid "Delta does not contain enough new data"
msgstr "Deltat innehåller inte tillräckligt med ny data"
-#: libsvn_delta/svndiff.c:634
+#: libsvn_delta/svndiff.c:633
msgid "Svndiff has invalid header"
msgstr "Svndiff har ogiltigt huvud"
-#: libsvn_delta/svndiff.c:689 libsvn_delta/svndiff.c:845
+#: libsvn_delta/svndiff.c:688 libsvn_delta/svndiff.c:844
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff innehåller trasigt fönsterhuvud"
-#: libsvn_delta/svndiff.c:698
+#: libsvn_delta/svndiff.c:697
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff innehåller källvyer med förflyttningar baklänges"
-#: libsvn_delta/svndiff.c:747 libsvn_delta/svndiff.c:794
-#: libsvn_delta/svndiff.c:867
+#: libsvn_delta/svndiff.c:746 libsvn_delta/svndiff.c:793
+#: libsvn_delta/svndiff.c:866
msgid "Unexpected end of svndiff input"
msgstr "Oväntat slut på svndiff"
@@ -1593,12 +1625,7 @@
msgid "Can't ungrab FS mutex"
msgstr "Kan inte släppa lås för FS"
-#: libsvn_fs/fs-loader.c:901
-#, fuzzy
-msgid "Lock comment contains illegal characters"
-msgstr "Låskommentaren innehåller ogiltiga tecken"
-
-#: libsvn_fs/fs-loader.c:907
+#: libsvn_fs/fs-loader.c:938
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Negativt utgånsgdatum till svn_fs_lock"
@@ -1615,15 +1642,15 @@
msgid "deleting changes"
msgstr "radering av ändringar"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2385
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "Nodrevisions-id saknas"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2395
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "Ogiltig ändringsordning: nytt nodrevisions-id utan radering"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2406
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "Ogiltig ändringsordning: ändring som inte är tillägg på raderad sökväg"
@@ -1742,110 +1769,110 @@
msgid "set repository uuid"
msgstr "sättande av arkivets uuid"
-#: libsvn_fs_base/dag.c:217
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr ""
"Trasig databas: första transaktions-idt är ej \"0\" i filsystemet \"%s\""
-#: libsvn_fs_base/dag.c:225
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "Trasig databas: första id för kopiering ej \"0\" i filsystemet \"%s\""
-#: libsvn_fs_base/dag.c:234
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr "Trasig databas: första revisionsnumret ej \"0\" i filsystemet \"%s\""
-#: libsvn_fs_base/dag.c:282 libsvn_fs_base/dag.c:458 libsvn_fs_fs/dag.c:334
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "Försök att skapa en post i en förälder som inte är en katalog"
-#: libsvn_fs_base/dag.c:452 libsvn_fs_fs/dag.c:328
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "Försök att skapa en nod med ogiltigt namn '%s'"
-#: libsvn_fs_base/dag.c:464 libsvn_fs_base/dag.c:698 libsvn_fs_fs/dag.c:340
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "Försök att stänga barn till nod som ej får ändras"
-#: libsvn_fs_base/dag.c:471
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "Försök att skapa en post som redan finns"
-#: libsvn_fs_base/dag.c:522 libsvn_fs_fs/dag.c:402
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "Försök att sätta post i nod som ej är katalog"
-#: libsvn_fs_base/dag.c:528 libsvn_fs_fs/dag.c:408
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "Försök att sätta post i nod som ej får ändras"
-#: libsvn_fs_base/dag.c:592
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "Kan inte sätta egenskapslista på *icke förändringsbar* nod-revision %s"
-#: libsvn_fs_base/dag.c:704
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "Försök att skapa en klon av ett barn med ogiltigt namn \"%s\""
-#: libsvn_fs_base/dag.c:830
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "Försök att ta bort posten \"%s\" från nod som *ej* är katalog"
-#: libsvn_fs_base/dag.c:836
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "Försök att ta bort posten \"%s\" från katalognod som ej är ändringsbar"
-#: libsvn_fs_base/dag.c:843
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "Försök att ta bort en nod med ogiltigt namn \"%s\""
-#: libsvn_fs_base/dag.c:858 libsvn_fs_base/dag.c:891
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "Radering misslyckades: katalogen har ingen post \"%s\""
-#: libsvn_fs_base/dag.c:940
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "Försök att ta bort icke ändringsbar nod"
-#: libsvn_fs_base/dag.c:1060
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "Försök att erhålla innehållet i en nod som ej är en fil"
-#: libsvn_fs_base/dag.c:1095
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "Försök att erhålla längden på en nod som ej är en fil"
-#: libsvn_fs_base/dag.c:1121
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "Försök att erhålla kontrollsumman för en nod som ej är en fil"
-#: libsvn_fs_base/dag.c:1152 libsvn_fs_base/dag.c:1206
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "Försök att sätta innehållet i en nod som ej är en fil"
-#: libsvn_fs_base/dag.c:1158 libsvn_fs_base/dag.c:1212
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "Försök att sätta innehållet på en icke ändringsbar nod"
-#: libsvn_fs_base/dag.c:1235
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1856,12 +1883,12 @@
" väntad kontrollsumma: %s\n"
" erhållen kontrollsumma: %s\n"
-#: libsvn_fs_base/dag.c:1290
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "Försök att öppna icke existerande barnnod \"%s\""
-#: libsvn_fs_base/dag.c:1296
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "Försök att öppna nod med ogiltigt namn \"%s\""
@@ -1972,41 +1999,41 @@
msgstr ""
"Sökvägen \"%s\" är redan låst av användaren \"%s\" i filsystemet \"%s\""
-#: libsvn_fs_base/fs.c:79
+#: libsvn_fs_base/fs.c:80
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr "Felaktig databasversion: %d.%d.%d, måste vara minst %d.%d.%d"
-#: libsvn_fs_base/fs.c:90
+#: libsvn_fs_base/fs.c:91
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr "Felaktig databasversion: kompilerad med %d.%d.%d, kör mot %d.%d.%d"
-#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:54
+#: libsvn_fs_base/fs.c:109 libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "Filsystemet redan öppet"
-#: libsvn_fs_base/fs.c:189
+#: libsvn_fs_base/fs.c:190
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr "Berkeley DB-fel i filsystemet '%s' då databasmiljön skulle stängas:\n"
-#: libsvn_fs_base/fs.c:539
+#: libsvn_fs_base/fs.c:540
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr "Berkeley DB-fel i filsystemet \"%s\" då databasmiljön skulle skapas:\n"
-#: libsvn_fs_base/fs.c:545
+#: libsvn_fs_base/fs.c:546
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr "Berkeley DB-fel i filsystemet \"%s\" då databasmiljön skulle öppnas:\n"
-#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:631
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "Förväntat format på filsystemet '%d'; hittade '%d'"
-#: libsvn_fs_base/fs.c:1094
+#: libsvn_fs_base/fs.c:1112
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
"may be interfering with the hotcopy algorithm. If \n"
@@ -2018,7 +2045,7 @@
"med hotcopy-algoritmen. OM problemet kvarstår, försök med att slå av\n"
"funktionen i DB_CONFIG."
-#: libsvn_fs_base/fs.c:1113
+#: libsvn_fs_base/fs.c:1131
msgid ""
"Error running catastrophic recovery on hotcopy; the \n"
"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
@@ -2030,27 +2057,27 @@
"kan vålla problem för \"hotcopy\"-algoritmen. Prova med att avaktivera\n"
"denna funktion i DB_CONFIG om problemet kvarstår."
-#: libsvn_fs_base/fs.c:1222
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr "Modul för att arbeta med ett Berkeley DB-arkiv."
-#: libsvn_fs_base/fs.c:1255
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Versionen för FS-laddaren (%d) stöds ej för bdb"
-#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr "Kan inte kontrollera låset för sökvägen '%s'; användarnamn saknas"
-#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr ""
"Användaren %s äger inget lås på sökvägen \"%s\" (för tillfället låst av %s)"
-#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr ""
@@ -2135,17 +2162,17 @@
msgid "Failed to calculate MD5 digest for '%s'"
msgstr "Kunde inte beräkna MD5-kntrollsumma för \"%s\""
-#: libsvn_fs_base/revs-txns.c:65
+#: libsvn_fs_base/revs-txns.c:67
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "Transaktionen är ej död: \"%s\""
-#: libsvn_fs_base/revs-txns.c:68
+#: libsvn_fs_base/revs-txns.c:70
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "Transaktionen är död: \"%s\""
-#: libsvn_fs_base/revs-txns.c:981
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "Transaktionen avbruten, men städning misslyckades"
@@ -2155,87 +2182,87 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:389 libsvn_fs_fs/tree.c:309
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "Filen finns inte: transaktion \"%s\", sökväg \"%s\""
-#: libsvn_fs_base/tree.c:394 libsvn_fs_fs/tree.c:314
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "Filen finns inte: revision %ld, sökväg \"%s\""
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:404 libsvn_fs_fs/tree.c:329
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "Filen finns redan: filsystem \"%s\", transaktion \"%s\", sökväg \"%s\""
-#: libsvn_fs_base/tree.c:409 libsvn_fs_fs/tree.c:335
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "Filen finns redan: filsystem \"%s\", revision %ld, sökväg \"%s\""
-#: libsvn_fs_base/tree.c:417 libsvn_fs_fs/tree.c:345
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "Rotobjektet måste vara en transaktionsrot"
-#: libsvn_fs_base/tree.c:832 libsvn_fs_fs/tree.c:754
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "Kan inte öppna \"%s\""
-#: libsvn_fs_base/tree.c:1402 libsvn_fs_fs/tree.c:1152
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr "Kan inte jämföra egenskapsvärde mellan två olika filsystem"
-#: libsvn_fs_base/tree.c:1735
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "Trasig databas: felaktigt föregångarantal"
-#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1189
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "Oväntad icke ändringsbar nod på \"%s\""
-#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1212
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "Konflikt på \"%s\""
-#: libsvn_fs_base/tree.c:1861 libsvn_fs_base/tree.c:2566
-#: libsvn_fs_fs/tree.c:1261 libsvn_fs_fs/tree.c:1748
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr ""
"Felaktig sammanslagning (merge); ursprung, källa och mål är inte samtliga i "
"samma filsystem"
-#: libsvn_fs_base/tree.c:1877 libsvn_fs_fs/tree.c:1277
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr ""
"Felaktig sammanslagning (merge) målet \"%s\" har id \"%s\", samma som "
"ursprunget"
-#: libsvn_fs_base/tree.c:2373
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "Transaktionen \"%s\" är inaktuell jämfört med revision \"%s\""
-#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1887
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "Rotkatalogen kan inte raderas"
-#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1959
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "Kan inte kopiera mellan två olika filsystem (\"%s\" och \"%s\")"
-#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1965
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "Kopiering från ändringsbart träd stöds ej för närvarande"
-#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2389
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2246,22 +2273,22 @@
" väntade: %s\n"
" erhållen: %s\n"
-#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2625
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr "Kan inte jämföra filinnehåll mellan två olika filsystem"
-#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
-#: libsvn_fs_fs/tree.c:2634 libsvn_fs_fs/tree.c:2639
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
msgstr "\"%s\" är ingen fil"
-#: libsvn_fs_fs/dag.c:384
+#: libsvn_fs_fs/dag.c:383
msgid "Can't get entries of non-directory"
msgstr "Kan inte erhålla poster för något som ej är en katalog"
-#: libsvn_fs_fs/dag.c:931
+#: libsvn_fs_fs/dag.c:930
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2277,67 +2304,67 @@
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
msgstr "Trasig låsfil för säkvägen \"%s\" i filsystemet \"%s\""
-#: libsvn_fs_fs/fs.c:89
+#: libsvn_fs_fs/fs.c:88
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Kan inte hämta delad data i FSFS"
-#: libsvn_fs_fs/fs.c:105
+#: libsvn_fs_fs/fs.c:104
#, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "Kan inte skapa skrivlås+mutex i FSFS"
-#: libsvn_fs_fs/fs.c:113
+#: libsvn_fs_fs/fs.c:112
#, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "Kan inte skapa mutex för transaktionslista i FSFS"
-#: libsvn_fs_fs/fs.c:119
+#: libsvn_fs_fs/fs.c:118
#, c-format
msgid "Can't store FSFS shared data"
msgstr "Kan inte lagra delad data i FSFS"
-#: libsvn_fs_fs/fs.c:345
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr "Modul för att arbeta med ett arkiv bestående av vanliga filer (FSFS)."
-#: libsvn_fs_fs/fs.c:378
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Versionen för FS-laddaren (%d) stöds ej för fsfs"
-#: libsvn_fs_fs/fs_fs.c:340
+#: libsvn_fs_fs/fs_fs.c:352
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "Kan inte låsa mutex för transaktionslistan i FSFS"
-#: libsvn_fs_fs/fs_fs.c:348
+#: libsvn_fs_fs/fs_fs.c:360
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "Kan inte låsa upp mutex för transaktionslistan i FSFS"
-#: libsvn_fs_fs/fs_fs.c:374
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "Kan inte låsa upp okänd transaktion \"%s\""
-#: libsvn_fs_fs/fs_fs.c:378
+#: libsvn_fs_fs/fs_fs.c:390
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "Kan inte låsa upp olåst transaktion \"%s\""
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
"Kan inte låsa upp låsfilen för revisionsprototypfilen i transaktionen \"%s\""
-#: libsvn_fs_fs/fs_fs.c:391
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr "Kan inte stänga revisionsprototypfilens låsfil i transaktionen \"%s\""
-#: libsvn_fs_fs/fs_fs.c:453
+#: libsvn_fs_fs/fs_fs.c:465
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2346,7 +2373,7 @@
"Kan inte skriva till revisionsprototypfilen i transaktionen \"%s\" då en\n"
"tidigare representation just skrivs av denna process"
-#: libsvn_fs_fs/fs_fs.c:489
+#: libsvn_fs_fs/fs_fs.c:501
#, c-format
msgid ""
"Cannot write to the prototype revision file of transaction '%s' because a "
@@ -2355,94 +2382,95 @@
"Kan inte skriva till revisionsprototypfilen i transaktionen \"%s\" då en\n"
"tidigare representation just skrivs av en annan process<"
-#: libsvn_fs_fs/fs_fs.c:496 libsvn_subr/io.c:1532
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "Kan inte ta ut exklusivt lås på filen \"%s\""
-#: libsvn_fs_fs/fs_fs.c:825 libsvn_fs_fs/fs_fs.c:839
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "Hittade felaktigt huvud i revisionsfil"
-#: libsvn_fs_fs/fs_fs.c:941 libsvn_fs_fs/fs_fs.c:955 libsvn_fs_fs/fs_fs.c:962
-#: libsvn_fs_fs/fs_fs.c:969 libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "Felaktig rad med textrep-position i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1054
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "Typfält saknas i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1085
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "cpath saknas i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1112 libsvn_fs_fs/fs_fs.c:1118
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "Felaktig copyroot-rad i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1136 libsvn_fs_fs/fs_fs.c:1142
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "Felaktig copyfrom-rad i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1251 libsvn_fs_fs/fs_fs.c:3613
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "Försök att skriva i något som inte är en transaktion"
-#: libsvn_fs_fs/fs_fs.c:1335
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "Felaktigt representationshuvud"
-#: libsvn_fs_fs/fs_fs.c:1359
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "node-id saknas i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1365
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "Trasig node-id i node-rev"
-#: libsvn_fs_fs/fs_fs.c:1410
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "Avslutande radslut saknas i revisionsfil"
-#: libsvn_fs_fs/fs_fs.c:1422
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "Den sista raden i en revisionsfil är längre än 64 tecken"
-#: libsvn_fs_fs/fs_fs.c:1437
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "Den sista raden i en revisionsfil saknar mellanslag"
-#: libsvn_fs_fs/fs_fs.c:1466 libsvn_fs_fs/fs_fs.c:1524 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "Revisionen %ld finns inte"
-#: libsvn_fs_fs/fs_fs.c:1584
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "Felaktigt svndiff-data i representation"
-#: libsvn_fs_fs/fs_fs.c:1727 libsvn_fs_fs/fs_fs.c:1740
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr ""
"Hamnade efter slutet på representationen vid läsning av ett svndiff-fönster"
-#: libsvn_fs_fs/fs_fs.c:1876
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "svndiff-data krävde icke existerande källdata"
-#: libsvn_fs_fs/fs_fs.c:1882
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "svndiff krävde data efter slutet av strömmen"
-#: libsvn_fs_fs/fs_fs.c:1905 libsvn_fs_fs/fs_fs.c:1922
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "Fönsterlängd i svndiff är trasig"
-#: libsvn_fs_fs/fs_fs.c:1970
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2453,108 +2481,127 @@
" väntade: %s\n"
" fick: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2193 libsvn_fs_fs/fs_fs.c:2206
-#: libsvn_fs_fs/fs_fs.c:2212
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "Katalogpost trasig"
-#: libsvn_fs_fs/fs_fs.c:2551 libsvn_fs_fs/fs_fs.c:2559
-#: libsvn_fs_fs/fs_fs.c:2591 libsvn_fs_fs/fs_fs.c:2611
-#: libsvn_fs_fs/fs_fs.c:2645 libsvn_fs_fs/fs_fs.c:2650
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "Ogiltig changes-rad i rev-fil"
-#: libsvn_fs_fs/fs_fs.c:2584
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "Ogiltig ändringstyp i rev-fil"
-#: libsvn_fs_fs/fs_fs.c:2604
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "Ogiltig text-mod-flagga i rev-fil"
-#: libsvn_fs_fs/fs_fs.c:2624
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "Ogiltig prop-mod-flagga i rev-fil"
-#: libsvn_fs_fs/fs_fs.c:2808
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "Det är inte tillåtet att kopiera från transaktioner"
-#: libsvn_fs_fs/fs_fs.c:2864
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "Kan inte skapa transaktionskatalog i \"%s\" för revision %ld"
-#: libsvn_fs_fs/fs_fs.c:3045 libsvn_fs_fs/fs_fs.c:3052
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "next-id-filen är trasig"
-#: libsvn_fs_fs/fs_fs.c:3139
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "Städning efter transaktion misslyckades"
-#: libsvn_fs_fs/fs_fs.c:3307
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "Ogiltig ändringstyp"
-#: libsvn_fs_fs/fs_fs.c:3632
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "Kan inte sätta textinnehåll i en katalog"
-#: libsvn_fs_fs/fs_fs.c:3722 libsvn_fs_fs/fs_fs.c:3727
-#: libsvn_fs_fs/fs_fs.c:3734
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "current-filen är trasig"
-#: libsvn_fs_fs/fs_fs.c:4023 libsvn_subr/io.c:2663 svn/util.c:236
-#: svn/util.c:251 svn/util.c:275
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
+#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "Kan inte ta status på \"%s\""
-#: libsvn_fs_fs/fs_fs.c:4027
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "Kan inte göra chmod på \"%s\""
-#: libsvn_fs_fs/fs_fs.c:4167
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "Kan inte låsa arkivlås för FSFS"
-#: libsvn_fs_fs/fs_fs.c:4181
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "Kan inte låsa upp arkivlås för FSFS"
-#: libsvn_fs_fs/fs_fs.c:4299
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "Transaktionen är inaktuell"
-#: libsvn_fs_fs/fs_fs.c:4599
+#: libsvn_fs_fs/fs_fs.c:4807
+#, fuzzy
+msgid "Recovery encountered a non-directory node"
+msgstr "Försök att sätta post i nod som ej är katalog"
+
+#: libsvn_fs_fs/fs_fs.c:4829
+msgid "Recovery encountered a deltified directory representation"
+msgstr ""
+
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "Transaktionen finns inte"
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "Kan inte skriva fil med låsinformation och poster \"%s\""
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "Kan inte anaylsera fil med lås och poster \"%s\""
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "Sökvägen \"%s\" finns inte i huvudrevision"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "Låsning misslyckades: nyare version av '%s' finns"
+#: libsvn_fs_util/merge-info-sqlite-index.c:102
+msgid "Merge Tracking schema format not set"
+msgstr ""
+
+#: libsvn_fs_util/merge-info-sqlite-index.c:107
+#, c-format
+msgid "Merge Tracking schema format %d not recognized"
+msgstr ""
+
#: libsvn_ra/ra_loader.c:213
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
@@ -2562,27 +2609,27 @@
"Versioner stämmer ej i insticksmodulen '%s' för RA: hittade %d.%d.%d%s, "
"väntade %d.%d.%d%s"
-#: libsvn_ra/ra_loader.c:285
+#: libsvn_ra/ra_loader.c:397
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Okänt URL-schema för \"%s\""
-#: libsvn_ra/ra_loader.c:336
+#: libsvn_ra/ra_loader.c:448
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "\"%s\" är inte i samma arkiv som \"%s\""
-#: libsvn_ra/ra_loader.c:707
+#: libsvn_ra/ra_loader.c:945
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - hanterar schemat \"%s\"\n"
-#: libsvn_ra/ra_loader.c:793
+#: libsvn_ra/ra_loader.c:1031
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Okänt URL-schema \"%s\""
-#: libsvn_ra_dav/commit.c:225
+#: libsvn_ra_dav/commit.c:222
msgid ""
"Could not fetch the Version Resource URL (needed during an import or when it "
"is missing from the local, cached props)"
@@ -2590,22 +2637,22 @@
"Kunde inte hämta versionsresurs-URL:en (den vehövs vid import, eller då den "
"saknas i den lokala egenskapscachen)"
-#: libsvn_ra_dav/commit.c:462 libsvn_ra_serf/commit.c:374
+#: libsvn_ra_dav/commit.c:459 libsvn_ra_serf/commit.c:374
#: libsvn_ra_serf/commit.c:435
#, c-format
msgid "Your file or directory '%s' is probably out-of-date"
msgstr "Filen eller katalogen \"%s\" är troligen inaktuell"
-#: libsvn_ra_dav/commit.c:470
+#: libsvn_ra_dav/commit.c:467
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "Svaret för CHECKOUT innehåll inget \"Location:\"-huvud"
-#: libsvn_ra_dav/commit.c:997 libsvn_ra_serf/commit.c:1403
+#: libsvn_ra_dav/commit.c:994 libsvn_ra_serf/commit.c:1427
#, c-format
msgid "File '%s' already exists"
msgstr "Filen \"%s\" finns redan"
-#: libsvn_ra_dav/commit.c:1115
+#: libsvn_ra_dav/commit.c:1112
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "Kunde inte skriva svndiff till temporär fil"
@@ -2622,7 +2669,7 @@
msgid "Could not save file"
msgstr "Kunde inte spara filen"
-#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:909
+#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:920
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2685,7 +2732,7 @@
msgid "Unknown XML encoding: '%s'"
msgstr "Okänd XML-kodning: \"%s\""
-#: libsvn_ra_dav/fetch.c:2940
+#: libsvn_ra_dav/fetch.c:2952
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr ""
@@ -2885,21 +2932,21 @@
msgid "SSL is not supported"
msgstr "SSL stöds ej"
-#: libsvn_ra_dav/session.c:819
+#: libsvn_ra_dav/session.c:825
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "Felaktig konfiguration: kan inte ladda certifikatfilen \"%s\""
-#: libsvn_ra_dav/session.c:928
+#: libsvn_ra_dav/session.c:934
msgid "The UUID property was not found on the resource or any of its parents"
msgstr ""
"UUID-egenskapen hittades inte på resursen eller någon av dess föräldrar"
-#: libsvn_ra_dav/session.c:936
+#: libsvn_ra_dav/session.c:942
msgid "Please upgrade the server to 0.19 or later"
msgstr "Var vänlig uppgradera servern till version 0.19 eller senare"
-#: libsvn_ra_dav/session.c:1002
+#: libsvn_ra_dav/session.c:1009
#, c-format
msgid "Unsupported RA loader version (%d) for ra_dav"
msgstr "Versionen för RA-laddaren (%d) stöds ej för ra_dav"
@@ -2971,8 +3018,8 @@
msgid "%s request failed on '%s'"
msgstr "%s-förfrågan misslyckades till \"%s\""
-#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:588
-#: libsvn_wc/update_editor.c:2603
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -2985,15 +3032,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "Modul för åtkomst av arkiv på disk lokalt."
-#: libsvn_ra_local/ra_plugin.c:285
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "Kunde inte öppna en ra_local-session till URL:en"
-#: libsvn_ra_local/ra_plugin.c:1392
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Versionen för RA-laddaren (%d) stöds ej för ra_local"
@@ -3020,7 +3067,7 @@
msgstr "Kunde inte öppna arkivet \"%s\""
#: libsvn_ra_serf/commit.c:367 libsvn_ra_serf/commit.c:428
-#: libsvn_repos/commit.c:393
+#: libsvn_repos/commit.c:375
#, c-format
msgid "Path '%s' not present"
msgstr "Sökvägen \"%s\" finns inte"
@@ -3030,7 +3077,7 @@
msgid "Failed writing updated file"
msgstr "MIsslyckades att skriva uppdaterad fil"
-#: libsvn_ra_serf/commit.c:1216
+#: libsvn_ra_serf/commit.c:1240
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr ""
@@ -3102,204 +3149,227 @@
msgid "Access repository via WebDAV protocol through serf."
msgstr "Modul för åtkomst av arkiv via protokollet WebDAV med serf."
-#: libsvn_ra_serf/serf.c:155
+#: libsvn_ra_serf/serf.c:161
#, c-format
msgid "Could not lookup hostname: %s://%s"
msgstr "Kunde inte hitta värdnamn: %s://%s"
-#: libsvn_ra_serf/serf.c:732
+#: libsvn_ra_serf/serf.c:737
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Versionen för RA-laddaren (%d) stöds ej för ra_serf"
-#: libsvn_ra_serf/update.c:2116
+#: libsvn_ra_serf/update.c:2155
#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "Fel vid hämtning av rapport (%d)"
-#: libsvn_ra_serf/util.c:755
+#: libsvn_ra_serf/util.c:874
#, fuzzy
msgid "Unspecified error message"
msgstr "ange loggmeddelande ARG"
-#: libsvn_ra_serf/util.c:816
+#: libsvn_ra_serf/util.c:935
msgid "Premature EOF seen from server"
msgstr "För tidigt filslut från server"
-#: libsvn_ra_svn/client.c:115
+#: libsvn_ra_svn/client.c:124
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Okänt värdnamn \"%s\""
-#: libsvn_ra_svn/client.c:127
+#: libsvn_ra_svn/client.c:136
#, c-format
msgid "Can't create socket"
msgstr "Kan inte skapa uttag (socket)"
-#: libsvn_ra_svn/client.c:131
+#: libsvn_ra_svn/client.c:140
#, c-format
msgid "Can't connect to host '%s'"
msgstr "Kan inte ansluta till värden \"%s\""
-#: libsvn_ra_svn/client.c:152
-msgid "Proplist element not a list"
-msgstr "Element med egenskaper är ingen lista"
-
-#: libsvn_ra_svn/client.c:176
+#: libsvn_ra_svn/client.c:163
msgid "Prop diffs element not a list"
msgstr "Element med egenskapsskillnader är ingen lista"
-#: libsvn_ra_svn/client.c:214
+#: libsvn_ra_svn/client.c:201
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "Okänd nodtyp \"%s\" från servern"
-#: libsvn_ra_svn/client.c:365
+#: libsvn_ra_svn/client.c:357
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Odefinierat tunnelschema \"%s\""
-#: libsvn_ra_svn/client.c:382
+#: libsvn_ra_svn/client.c:374
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "Tunnelschemat %s kräver att miljövariabeln %s är definierad"
-#: libsvn_ra_svn/client.c:393
+#: libsvn_ra_svn/client.c:385
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Kan inte dela upp kommandosträngen \"%s\""
-#: libsvn_ra_svn/client.c:424
+#: libsvn_ra_svn/client.c:416
#, c-format
msgid "Error in child process: %s"
msgstr "Fel i barnprocess: %s"
-#: libsvn_ra_svn/client.c:448
+#: libsvn_ra_svn/client.c:440
#, c-format
msgid "Can't create tunnel"
msgstr "Kan inte skapa tunnel"
-#: libsvn_ra_svn/client.c:486
+#: libsvn_ra_svn/client.c:478
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "Ogiltig svn-arkiv-URL \"%s\""
-#: libsvn_ra_svn/client.c:543
+#: libsvn_ra_svn/client.c:535
#, c-format
msgid "Server requires minimum version %d"
msgstr "Servern kräver minst version %d"
-#: libsvn_ra_svn/client.c:589
+#: libsvn_ra_svn/client.c:584
msgid "Impossibly long repository root from server"
msgstr "För lång arkivrot från servern"
-#: libsvn_ra_svn/client.c:600
+#: libsvn_ra_svn/client.c:595
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Modul för åtkomst av ett arkiv över nätverk via protokollet svn."
-#: libsvn_ra_svn/client.c:748
+#: libsvn_ra_svn/client.c:743
msgid "Server did not send repository root"
msgstr "Servern skickade ingen arkivrot"
-#: libsvn_ra_svn/client.c:889
+#: libsvn_ra_svn/client.c:816
+msgid ""
+"Server doesn't support setting arbitrary revision properties during commit"
+msgstr ""
+
+#: libsvn_ra_svn/client.c:900
msgid "Non-string as part of file contents"
msgstr "Icke-sträng var del av filinnehåll"
-#: libsvn_ra_svn/client.c:988
+#: libsvn_ra_svn/client.c:999
msgid "Dirlist element not a list"
msgstr "Element med kataloglista är ingen lista"
-#: libsvn_ra_svn/client.c:1145
+#: libsvn_ra_svn/client.c:1060
+#, fuzzy
+msgid "Merge info element is not a list"
+msgstr "Element med egenskapsskillnader är ingen lista"
+
+#: libsvn_ra_svn/client.c:1219
msgid "Log entry not a list"
msgstr "Loggposten är ej en lista"
-#: libsvn_ra_svn/client.c:1158
+#: libsvn_ra_svn/client.c:1232
msgid "Changed-path entry not a list"
msgstr "Post med ändrade sökvägar är ingen lista"
-#: libsvn_ra_svn/client.c:1234
+#: libsvn_ra_svn/client.c:1308
msgid "'stat' not implemented"
msgstr "\"stat\" ej implementerat"
-#: libsvn_ra_svn/client.c:1291
+#: libsvn_ra_svn/client.c:1365
msgid "'get-locations' not implemented"
msgstr "\"get-locations\" ej implementerat"
-#: libsvn_ra_svn/client.c:1303
+#: libsvn_ra_svn/client.c:1377
msgid "Location entry not a list"
msgstr "Post med information om plats är ingen lista"
-#: libsvn_ra_svn/client.c:1353
+#: libsvn_ra_svn/client.c:1427
msgid "'get-file-revs' not implemented"
msgstr "\"get-file-revs\" ej implementerat"
-#: libsvn_ra_svn/client.c:1366
+#: libsvn_ra_svn/client.c:1440
msgid "Revision entry not a list"
msgstr "Revisionsposten är ej en lista"
-#: libsvn_ra_svn/client.c:1379 libsvn_ra_svn/client.c:1404
+#: libsvn_ra_svn/client.c:1453 libsvn_ra_svn/client.c:1478
msgid "Text delta chunk not a string"
msgstr "Textdeltadel är inte en sträng"
-#: libsvn_ra_svn/client.c:1416
+#: libsvn_ra_svn/client.c:1490
msgid "The get-file-revs command didn't return any revisions"
msgstr "get-file-revs-kommandot returnerade inga revisioner"
-#: libsvn_ra_svn/client.c:1464
+#: libsvn_ra_svn/client.c:1538
msgid "Server doesn't support the lock command"
msgstr "Servern stöder ej lock-kommandot"
-#: libsvn_ra_svn/client.c:1528
+#: libsvn_ra_svn/client.c:1602
msgid "Server doesn't support the unlock command"
msgstr "Servern stöder ej unlock-kommandot"
-#: libsvn_ra_svn/client.c:1625
+#: libsvn_ra_svn/client.c:1699
msgid "Lock response not a list"
msgstr "Svar på lock-kommandot är ingen lista"
-#: libsvn_ra_svn/client.c:1639
+#: libsvn_ra_svn/client.c:1713
msgid "Unknown status for lock command"
msgstr "Okänd statusindikering för lock-kommandot"
-#: libsvn_ra_svn/client.c:1661
+#: libsvn_ra_svn/client.c:1735
msgid "Didn't receive end marker for lock responses"
msgstr "Erhöll ingen slutmarkör i svaret på lock-kommandot"
-#: libsvn_ra_svn/client.c:1748
+#: libsvn_ra_svn/client.c:1822
msgid "Unlock response not a list"
msgstr "Svar på unlock-kommandot är ingen lista"
-#: libsvn_ra_svn/client.c:1762
+#: libsvn_ra_svn/client.c:1836
msgid "Unknown status for unlock command"
msgstr "Okänd statusindikation för unlock-kommandot"
-#: libsvn_ra_svn/client.c:1783
+#: libsvn_ra_svn/client.c:1857
msgid "Didn't receive end marker for unlock responses"
msgstr "Erhöll ingen slutmarkör i svaret på unlock-kommandot"
-#: libsvn_ra_svn/client.c:1807 libsvn_ra_svn/client.c:1835
+#: libsvn_ra_svn/client.c:1881 libsvn_ra_svn/client.c:1909
msgid "Server doesn't support the get-lock command"
msgstr "Servern stöder ej get-lock-kommandot"
-#: libsvn_ra_svn/client.c:1848
+#: libsvn_ra_svn/client.c:1922
msgid "Lock element not a list"
msgstr "Element med lås är ingen lista"
-#: libsvn_ra_svn/client.c:1871
+#: libsvn_ra_svn/client.c:1945
msgid "Server doesn't support the replay command"
msgstr "Servern stöder ej replay-kommandot"
-#: libsvn_ra_svn/client.c:1935
+#: libsvn_ra_svn/client.c:2010
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Versionen för RA-laddaren (%d) stöds ej för ra_svn"
#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/sasl_auth.c:389 libsvn_ra_svn/sasl_auth.c:444
-#: libsvn_ra_svn/simple_auth.c:61
+#: libsvn_ra_svn/cyrus_auth.c:437 libsvn_ra_svn/cyrus_auth.c:484
+#: libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "Oväntat svar från servern på autentisiering"
+#: libsvn_ra_svn/cyrus_auth.c:171 svnserve/cyrus_auth.c:104
+#: svnserve/cyrus_auth.c:114
+#, c-format
+msgid "Could not initialize the SASL library"
+msgstr "Kunde inte initiera SASL-biblioteket"
+
+#: libsvn_ra_svn/cyrus_auth.c:824 libsvn_ra_svn/internal_auth.c:57
+#: libsvn_ra_svn/internal_auth.c:110
+#, c-format
+msgid "Authentication error from server: %s"
+msgstr "Autentiseringsfel från servern: %s"
+
+#: libsvn_ra_svn/cyrus_auth.c:828
+#, fuzzy
+msgid "Can't get username or password"
+msgstr "Kan inte erhålla lösenord"
+
#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
msgstr "Ogiltig fil- eller katalogidentifierare vid editering"
@@ -3325,11 +3395,16 @@
msgid "Apply-textdelta not active"
msgstr "Apply-textdelta inte aktiv"
-#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:845
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:896
#, c-format
msgid "Unknown command '%s'"
msgstr "Okänt kommando \"%s\""
+#: libsvn_ra_svn/internal_auth.c:97 libsvn_subr/prompt.c:156
+#, c-format
+msgid "Can't get password"
+msgstr "Kan inte erhålla lösenord"
+
#: libsvn_ra_svn/marshal.c:86
msgid "Capability entry is not a word"
msgstr "Capability-post är inte ett ord"
@@ -3339,64 +3414,35 @@
msgid "Connection closed unexpectedly"
msgstr "Nätverksanslutningen stängdes oväntat"
-#: libsvn_ra_svn/marshal.c:509
+#: libsvn_ra_svn/marshal.c:536
msgid "String length larger than maximum"
msgstr "Stränglängden är större än vad som maximalt är tillåtet"
-#: libsvn_ra_svn/marshal.c:546
+#: libsvn_ra_svn/marshal.c:573
msgid "Too many nested items"
msgstr "För många nästlade objekt"
-#: libsvn_ra_svn/marshal.c:565
+#: libsvn_ra_svn/marshal.c:592
msgid "Number is larger than maximum"
msgstr "Talet är större än vad som maximalt är tillåtet"
-#: libsvn_ra_svn/marshal.c:768
+#: libsvn_ra_svn/marshal.c:796
+msgid "Proplist element not a list"
+msgstr "Element med egenskaper är ingen lista"
+
+#: libsvn_ra_svn/marshal.c:819
msgid "Empty error list"
msgstr "Tom fellista"
-#: libsvn_ra_svn/marshal.c:777
+#: libsvn_ra_svn/marshal.c:828
msgid "Malformed error list"
msgstr "Felaktig lista med information om fel"
-#: libsvn_ra_svn/marshal.c:816
+#: libsvn_ra_svn/marshal.c:867
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "Okänd status \"%s\" i kommandorespons"
-#: libsvn_ra_svn/sasl_auth.c:179 svnserve/sasl_auth.c:104
-#: svnserve/sasl_auth.c:114
-#, c-format
-msgid "Could not initialize the SASL library"
-msgstr "Kunde inte initiera SASL-biblioteket"
-
-#: libsvn_ra_svn/sasl_auth.c:279
-#, fuzzy
-msgid "Can't get user name"
-msgstr "Kan inte erhålla filnamn"
-
-#: libsvn_ra_svn/sasl_auth.c:286 libsvn_ra_svn/simple_auth.c:97
-#: libsvn_subr/prompt.c:156
-#, c-format
-msgid "Can't get password"
-msgstr "Kan inte erhålla lösenord"
-
-# Don't spend time on improving this, since the code says it should never
-# happen anyway:-)
-#: libsvn_ra_svn/sasl_auth.c:293
-msgid "Unhandled SASL interaction"
-msgstr "Ej hanterad SASL-interaktion"
-
-#: libsvn_ra_svn/sasl_auth.c:761 libsvn_ra_svn/simple_auth.c:58
-#: libsvn_ra_svn/simple_auth.c:110
-#, c-format
-msgid "Authentication error from server: %s"
-msgstr "Autentiseringsfel från servern: %s"
-
-#: libsvn_ra_svn/simple_auth.c:117
-msgid "Cannot negotiate authentication mechanism"
-msgstr "Kan inte förhandla om autentiseringsmekanism"
-
#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
@@ -3412,22 +3458,22 @@
msgid "Can't get socket timeout"
msgstr "Kan inte skapa uttag (socket)"
-#: libsvn_repos/commit.c:128
+#: libsvn_repos/commit.c:125
#, c-format
msgid "Out of date: '%s' in transaction '%s'"
msgstr "\"%s\" i transaktionen \"%s\" är inaktuell"
-#: libsvn_repos/commit.c:292 libsvn_repos/commit.c:453
+#: libsvn_repos/commit.c:274 libsvn_repos/commit.c:435
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "Erhöll källsökväg men ingen källrevision för \"%s\""
-#: libsvn_repos/commit.c:324 libsvn_repos/commit.c:484
+#: libsvn_repos/commit.c:306 libsvn_repos/commit.c:466
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "Käll-RUL:en \"%s\" är från ett annat arkiv"
-#: libsvn_repos/commit.c:609
+#: libsvn_repos/commit.c:591
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3491,7 +3537,7 @@
msgid "Commit succeeded, but post-commit hook failed"
msgstr "Arkiveringen lyckades, men post-commit-hookskript misslyckades"
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_repos/fs-wrap.c:183
#, c-format
msgid ""
"Storage of non-regular property '%s' is disallowed through the repository "
@@ -3500,18 +3546,18 @@
"Lagring av egenskapen \"%s\" som ej är \"vanlig\" är inte tillåtet via "
"arkivets gränssnitt och kan tyda på en bugg i din klient"
-#: libsvn_repos/fs-wrap.c:303
+#: libsvn_repos/fs-wrap.c:329
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "Skrivning nekad: ej behörig att läsa allt i revision %ld"
-#: libsvn_repos/fs-wrap.c:507
+#: libsvn_repos/fs-wrap.c:533
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr ""
"Kan inte låsa upp sökvägen '%s', inget autentiserat användarnamn tillgängligt"
-#: libsvn_repos/fs-wrap.c:521
+#: libsvn_repos/fs-wrap.c:547
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr "Upplåsningen lyckades, men post-unlock-hookskript misslyckades"
@@ -3688,7 +3734,7 @@
msgid " done.\n"
msgstr " klart.\n"
-#: libsvn_repos/load.c:1231
+#: libsvn_repos/load.c:1233
#, c-format
msgid ""
"\n"
@@ -3699,7 +3745,7 @@
"------- Arkiverade revision %ld >>>\n"
"\n"
-#: libsvn_repos/load.c:1237
+#: libsvn_repos/load.c:1239
#, c-format
msgid ""
"\n"
@@ -3715,36 +3761,46 @@
msgid "'%s' not found in filesystem"
msgstr "\"%s\" finns inte i filsystemet"
-#: libsvn_repos/replay.c:367
+#: libsvn_repos/replay.c:387
#, c-format
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "Sökvägen \"%s\" i filsystemet är varken en fil eller katalog"
-#: libsvn_repos/reporter.c:602
+#: libsvn_repos/reporter.c:222
+#, fuzzy, c-format
+msgid "Invalid depth (%s) for path '%s'"
+msgstr "Ogiltig sökväg som källa för kopiering \"%s\""
+
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "Sökvägen \"%s\" finns i arbetskopian men ej i arkivet"
-#: libsvn_repos/reporter.c:836
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "Ej behörig att öppna editeringens rot"
-#: libsvn_repos/reporter.c:855
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "Målsökvägen finns inte"
-#: libsvn_repos/reporter.c:862
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "Kan inte ersätta en katalog från inuti sig själv"
-#: libsvn_repos/reporter.c:905
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "Ogiltig rapport arbetskopians toppnivå"
-#: libsvn_repos/reporter.c:920
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "Två toppnivårapporter utan mål"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "Nodtypen för sökvägen \"%s\" stöds inte"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -3790,35 +3846,35 @@
msgid "Creating conf directory"
msgstr "Skapar conf-katalog"
-#: libsvn_repos/repos.c:1482
+#: libsvn_repos/repos.c:1484
msgid "Creating svnserve.conf file"
msgstr "Skapar filen svnserve.conf"
-#: libsvn_repos/repos.c:1507
+#: libsvn_repos/repos.c:1509
msgid "Creating passwd file"
msgstr "Skapar filen passwd"
-#: libsvn_repos/repos.c:1567
+#: libsvn_repos/repos.c:1579
msgid "Creating authz file"
msgstr "Skapar fil för behörighetskontroll"
-#: libsvn_repos/repos.c:1600
+#: libsvn_repos/repos.c:1612
msgid "Could not create top-level directory"
msgstr "Kunde inte skapa toppkatalog"
-#: libsvn_repos/repos.c:1604
+#: libsvn_repos/repos.c:1616
msgid "Creating DAV sandbox dir"
msgstr "Skapar katalog för DAV"
-#: libsvn_repos/repos.c:1685
+#: libsvn_repos/repos.c:1697
msgid "Error opening db lockfile"
msgstr "Fel då låsfil för db skulle öppnas"
-#: libsvn_repos/repos.c:1722
+#: libsvn_repos/repos.c:1734
msgid "Repository creation failed"
msgstr "Kunde inte skapa arkiv"
-#: libsvn_repos/repos.c:1803
+#: libsvn_repos/repos.c:1815
#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "Förväntat format på arkivet \"%d\" eller \"%d\"; hittade \"%d\""
@@ -3842,7 +3898,7 @@
msgid "Unreadable path encountered; access denied"
msgstr "En sökväg som ej är läsbar har påträffats; åtkomst nekas"
-#: libsvn_subr/cmdline.c:481
+#: libsvn_subr/cmdline.c:493
#, c-format
msgid "Error initializing command line arguments"
msgstr "Fel vid initiering av kommandoradsargument"
@@ -3918,233 +3974,244 @@
msgid "Can't check path '%s'"
msgstr "Kan inte kontrollera sökvägen \"%s\""
-#: libsvn_subr/io.c:377 libsvn_subr/io.c:508
+#: libsvn_subr/io.c:377
#, c-format
msgid "Can't open '%s'"
msgstr "Kan inte öppna \"%s\""
-#: libsvn_subr/io.c:399 libsvn_subr/io.c:521
+#: libsvn_subr/io.c:399 libsvn_subr/io.c:522
#, c-format
msgid "Unable to make name for '%s'"
msgstr "Kunde inte skapa namn för \"%s\""
-#: libsvn_subr/io.c:525 libsvn_subr/io.c:579 libsvn_subr/io.c:607
+#: libsvn_subr/io.c:509
+#, fuzzy, c-format
+msgid "Can't create symbolic link '%s'"
+msgstr "Kan inte skapa katalogen \"%s\""
+
+#: libsvn_subr/io.c:526 libsvn_subr/io.c:580 libsvn_subr/io.c:608
msgid "Symbolic links are not supported on this platform"
msgstr "Symboliska länkar stöds inte på denna platform"
-#: libsvn_subr/io.c:558
+#: libsvn_subr/io.c:559
#, c-format
msgid "Can't read contents of link"
msgstr "Kan inte läsa innehållet i länk"
-#: libsvn_subr/io.c:620
+#: libsvn_subr/io.c:621
#, c-format
msgid "Can't find a temporary directory"
msgstr "Kan inte hitta temporär katalog"
-#: libsvn_subr/io.c:753
+#: libsvn_subr/io.c:715
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "Kan inte kopiera \"%s\" till \"%s\""
-#: libsvn_subr/io.c:787
+#: libsvn_subr/io.c:767
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "Kan inte sätta rättigheter på \"%s\""
-#: libsvn_subr/io.c:809
+#: libsvn_subr/io.c:789
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "Kan inte lägga till \"%s\" till \"%s\""
-#: libsvn_subr/io.c:843
+#: libsvn_subr/io.c:823
#, c-format
msgid "Source '%s' is not a directory"
msgstr "Källan \"%s\" är ingen katalog"
-#: libsvn_subr/io.c:849
+#: libsvn_subr/io.c:829
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "Destinationen \"%s\" är ingen katalog"
-#: libsvn_subr/io.c:855
+#: libsvn_subr/io.c:835
#, c-format
msgid "Destination '%s' already exists"
msgstr "Destinationen \"%s\" finns redan"
-#: libsvn_subr/io.c:924 libsvn_subr/io.c:1821 libsvn_subr/io.c:1872
-#: libsvn_subr/io.c:1935
+#: libsvn_subr/io.c:904 libsvn_subr/io.c:1830 libsvn_subr/io.c:1881
+#: libsvn_subr/io.c:1944
#, c-format
msgid "Can't read directory '%s'"
msgstr "Kan inte läsa katalogen \"%s\""
-#: libsvn_subr/io.c:929 libsvn_subr/io.c:1826 libsvn_subr/io.c:1877
-#: libsvn_subr/io.c:1940 libsvn_subr/io.c:2987
+#: libsvn_subr/io.c:909 libsvn_subr/io.c:1835 libsvn_subr/io.c:1886
+#: libsvn_subr/io.c:1949 libsvn_subr/io.c:3114
#, c-format
msgid "Error closing directory '%s'"
msgstr "Fel vid stängning av katalogen \"%s\""
-#: libsvn_subr/io.c:955
+#: libsvn_subr/io.c:935
#, c-format
msgid "Can't make directory '%s'"
msgstr "Kan inte skapa katalogen \"%s\""
-#: libsvn_subr/io.c:1042
+#: libsvn_subr/io.c:1022
#, c-format
msgid "Can't set access time of '%s'"
msgstr "Kan inte sätta åtkomsttiden på \"%s\""
-#: libsvn_subr/io.c:1182
+#: libsvn_subr/io.c:1162
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr "Kan inte erhålla rättigheter för filen \"%s\" (fel vid stat)"
-#: libsvn_subr/io.c:1193
+#: libsvn_subr/io.c:1173
#, c-format
msgid "Can't open file at '%s'"
msgstr "Kan inte öppna filen \"%s\""
-#: libsvn_subr/io.c:1197
+#: libsvn_subr/io.c:1177
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr "Kan inte erhålla rättigheter för filen \"%s\" (fel vid stat)"
-#: libsvn_subr/io.c:1236 libsvn_subr/io.c:1331
+#: libsvn_subr/io.c:1216 libsvn_subr/io.c:1311
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "Kan inte ändra rättigheter på filen \"%s\""
-#: libsvn_subr/io.c:1371
+#: libsvn_subr/io.c:1351
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "Kan inte göra \"%s\" skrivskyddad"
-#: libsvn_subr/io.c:1403
+#: libsvn_subr/io.c:1383
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "Kan inte ta bort skrivskyddet på \"%s\""
-#: libsvn_subr/io.c:1447
+#: libsvn_subr/io.c:1427
#, c-format
msgid "Error getting UID of process"
msgstr "Fel vid läsning av processens användarid"
-#: libsvn_subr/io.c:1528
+#: libsvn_subr/io.c:1508
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "Kan inte ta ut delat lås på filen \"%s\""
-#: libsvn_subr/io.c:1563
+#: libsvn_subr/io.c:1543
#, c-format
msgid "Can't flush file '%s'"
msgstr "Kan inte tömma buffertar för filen \"%s\""
-#: libsvn_subr/io.c:1564
+#: libsvn_subr/io.c:1544
#, c-format
msgid "Can't flush stream"
msgstr "Kan inte tömma buffertar för ström"
-#: libsvn_subr/io.c:1576 libsvn_subr/io.c:1593
+#: libsvn_subr/io.c:1556 libsvn_subr/io.c:1573
#, c-format
msgid "Can't flush file to disk"
msgstr "Kan inte tömma filbuffertar till disk"
-#: libsvn_subr/io.c:1614
-msgid "Reading from stdin is currently broken, so disabled"
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#, c-format
+msgid "Can't open stdin"
+msgstr "Kan inte öppna standard in"
+
+#: libsvn_subr/io.c:1616
+#, fuzzy
+msgid "Reading from stdin is disallowed"
msgstr ""
"Att läsa från standard in fungerar inte för närvarande och är därför avslaget"
-#: libsvn_subr/io.c:1635
+#: libsvn_subr/io.c:1630
#, c-format
msgid "Can't get file name"
msgstr "Kan inte erhålla filnamn"
-#: libsvn_subr/io.c:1703
+#: libsvn_subr/io.c:1698
#, c-format
msgid "Can't remove file '%s'"
msgstr "Kan inte radera filen \"%s\""
-#: libsvn_subr/io.c:1757 libsvn_subr/io.c:2838 libsvn_subr/io.c:2924
+#: libsvn_subr/io.c:1765 libsvn_subr/io.c:2965 libsvn_subr/io.c:3051
#, c-format
msgid "Can't open directory '%s'"
msgstr "Kan inte öppna katalogen \"%s\""
-#: libsvn_subr/io.c:1802 libsvn_subr/io.c:1832
+#: libsvn_subr/io.c:1811 libsvn_subr/io.c:1841
#, c-format
msgid "Can't remove '%s'"
msgstr "Kan inte radera \"%s\""
-#: libsvn_subr/io.c:1812
+#: libsvn_subr/io.c:1821
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "Kan inte återspola katalogen \"%s\""
-#: libsvn_subr/io.c:2004
+#: libsvn_subr/io.c:2013
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "Kan inte skapa attribut för processen \"%s\""
-#: libsvn_subr/io.c:2010
+#: libsvn_subr/io.c:2019
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "Kan inte sätta cmdtype för processen \"%s\""
-#: libsvn_subr/io.c:2022
+#: libsvn_subr/io.c:2031
#, c-format
msgid "Can't set process '%s' directory"
msgstr "Kan inte sätta katalog för processen \"%s\""
-#: libsvn_subr/io.c:2035
+#: libsvn_subr/io.c:2044
#, c-format
msgid "Can't set process '%s' child input"
msgstr "Kan inte sätta standard in för processen \"%s\""
-#: libsvn_subr/io.c:2042
+#: libsvn_subr/io.c:2051
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "Kan inte sätta standard ut för processen \"%s\""
-#: libsvn_subr/io.c:2049
+#: libsvn_subr/io.c:2058
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "Kan inte sätta standard fel för processen \"%s\""
-#: libsvn_subr/io.c:2056
+#: libsvn_subr/io.c:2065
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr "Kan inte sätta standard fel för processen \"%s\" för felhanteraren"
-#: libsvn_subr/io.c:2062
+#: libsvn_subr/io.c:2071
#, c-format
msgid "Can't set process '%s' error handler"
msgstr "Kan inte sätta felhanterare för processen \"%s\""
-#: libsvn_subr/io.c:2085
+#: libsvn_subr/io.c:2094
#, c-format
msgid "Can't start process '%s'"
msgstr "Kan inte starta processen \"%s\""
-#: libsvn_subr/io.c:2109
+#: libsvn_subr/io.c:2118
#, c-format
msgid "Error waiting for process '%s'"
msgstr "Fel då processen \"%s\" inväntades"
-#: libsvn_subr/io.c:2117
+#: libsvn_subr/io.c:2126
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "Processen '%s' misslyckades (orsak %d)"
-#: libsvn_subr/io.c:2124
+#: libsvn_subr/io.c:2133
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "Processen \"%s\" returnerade felstatus %d"
-#: libsvn_subr/io.c:2235
+#: libsvn_subr/io.c:2244
#, c-format
msgid "'%s' returned %d"
msgstr "\"%s\" returnerade %d"
-#: libsvn_subr/io.c:2358
+#: libsvn_subr/io.c:2367
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4159,130 +4226,158 @@
"%s\n"
"%s"
-#: libsvn_subr/io.c:2411
+#: libsvn_subr/io.c:2494
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "Kan inte känna av MIME-typ på \"%s\", som inte är en fil"
-#: libsvn_subr/io.c:2478
+#: libsvn_subr/io.c:2584
#, c-format
msgid "Can't open file '%s'"
msgstr "Kan inte öppna filen \"%s\""
-#: libsvn_subr/io.c:2514
+#: libsvn_subr/io.c:2620
#, c-format
msgid "Can't close file '%s'"
msgstr "Kan inte stänga filen \"%s\""
-#: libsvn_subr/io.c:2515
+#: libsvn_subr/io.c:2621
#, c-format
msgid "Can't close stream"
msgstr "Kan inte stänga ström"
-#: libsvn_subr/io.c:2525 libsvn_subr/io.c:2549 libsvn_subr/io.c:2562
+#: libsvn_subr/io.c:2631 libsvn_subr/io.c:2655 libsvn_subr/io.c:2668
#, c-format
msgid "Can't read file '%s'"
msgstr "Kan inte läsa filen \"%s\""
-#: libsvn_subr/io.c:2526 libsvn_subr/io.c:2550 libsvn_subr/io.c:2563
+#: libsvn_subr/io.c:2632 libsvn_subr/io.c:2656 libsvn_subr/io.c:2669
#, c-format
msgid "Can't read stream"
msgstr "Kan inte läsa från ström"
-#: libsvn_subr/io.c:2537
+#: libsvn_subr/io.c:2643
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "Kan inte erhålla attributinformation från filen \"%s\""
-#: libsvn_subr/io.c:2538
+#: libsvn_subr/io.c:2644
#, c-format
msgid "Can't get attribute information from stream"
msgstr "Kan inte erhålla attributinformation från ström"
-#: libsvn_subr/io.c:2574
+#: libsvn_subr/io.c:2680
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "Kan inte sätta filpekaren i filen \"%s\""
-#: libsvn_subr/io.c:2575
+#: libsvn_subr/io.c:2681
#, c-format
msgid "Can't set position pointer in stream"
msgstr "Kan inte sätta filpekaren i ström"
-#: libsvn_subr/io.c:2586 libsvn_subr/io.c:2599
+#: libsvn_subr/io.c:2692 libsvn_subr/io.c:2726
#, c-format
msgid "Can't write to file '%s'"
msgstr "Kan inte skriva till filen \"%s\""
-#: libsvn_subr/io.c:2587 libsvn_subr/io.c:2600
+#: libsvn_subr/io.c:2693 libsvn_subr/io.c:2727
#, c-format
msgid "Can't write to stream"
msgstr "Kan inte skriva till ström"
-#: libsvn_subr/io.c:2640
+#: libsvn_subr/io.c:2767
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "Kan inte läsa längdrad i filen \"%s\""
-#: libsvn_subr/io.c:2644
+#: libsvn_subr/io.c:2771
msgid "Can't read length line in stream"
msgstr "Kan inte läsa längdrad i ström"
-#: libsvn_subr/io.c:2691
+#: libsvn_subr/io.c:2818
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "Kan inte flytta \"%s\" till \"%s\""
-#: libsvn_subr/io.c:2769
+#: libsvn_subr/io.c:2896
#, c-format
msgid "Can't create directory '%s'"
msgstr "Kan inte skapa katalogen \"%s\""
-#: libsvn_subr/io.c:2780 libsvn_wc/copy.c:519
+#: libsvn_subr/io.c:2907 libsvn_wc/copy.c:509
#, c-format
msgid "Can't hide directory '%s'"
msgstr "Kan inte dölja katalogen \"%s\""
-#: libsvn_subr/io.c:2792
+#: libsvn_subr/io.c:2919
#, c-format
msgid "Can't stat directory '%s'"
msgstr "Kan inte ta status på katalogen \"%s\""
-#: libsvn_subr/io.c:2856
+#: libsvn_subr/io.c:2983
#, c-format
msgid "Can't remove directory '%s'"
msgstr "Kan inte radera katalogen \"%s\""
-#: libsvn_subr/io.c:2874
+#: libsvn_subr/io.c:3001
#, c-format
msgid "Can't read directory"
msgstr "Kan inte läsa katalog"
-#: libsvn_subr/io.c:2943
+#: libsvn_subr/io.c:3070
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "Kan inte läsa katalogpost i \"%s\""
-#: libsvn_subr/io.c:3068
+#: libsvn_subr/io.c:3195
#, c-format
msgid "Can't check directory '%s'"
msgstr "Kan inte kontrollera katalogen \"%s\""
-#: libsvn_subr/io.c:3090
+#: libsvn_subr/io.c:3217
#, c-format
msgid "Version %d is not non-negative"
msgstr "Versionsnumret %d är negativt"
-#: libsvn_subr/io.c:3140
+#: libsvn_subr/io.c:3267
#, c-format
msgid "Reading '%s'"
msgstr "Läser \"%s\""
-#: libsvn_subr/io.c:3156
+#: libsvn_subr/io.c:3283
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "Första raden i \"%s\" innehåller något som inte är en siffra"
+#: libsvn_subr/mergeinfo.c:67
+msgid "Invalid revision number"
+msgstr "Ogiltigt revisionsnummer"
+
+#: libsvn_subr/mergeinfo.c:125
+#, fuzzy
+msgid "No revision list found "
+msgstr "Revisionen %ld finns inte"
+
+#: libsvn_subr/mergeinfo.c:135 libsvn_subr/mergeinfo.c:163
+#, fuzzy
+msgid "Invalid character found in revision list"
+msgstr "Ogiltig slutrevision %ld"
+
+#: libsvn_subr/mergeinfo.c:169
+#, fuzzy
+msgid "Revision list parsing ended before hitting newline"
+msgstr "Avslutande radslut saknas i revisionsfil"
+
+#: libsvn_subr/mergeinfo.c:187
+msgid "Pathname not terminated by ':'"
+msgstr ""
+
+#: libsvn_subr/mergeinfo.c:195
+#, fuzzy
+msgid "Could not find end of line in revision line"
+msgstr "Kunde inte hitta tiden för revision %ld"
+
#: libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
@@ -4306,8 +4401,8 @@
"Giltiga flaggor:\n"
#: libsvn_subr/opt.c:424
-msgid " arg"
-msgstr " arg"
+msgid " ARG"
+msgstr ""
#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
#, c-format
@@ -4316,27 +4411,27 @@
"\n"
msgstr "\"%s\": okänt kommando.\n"
-#: libsvn_subr/opt.c:760
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "Syntaxfel i revisionsargumentet \"%s\""
-#: libsvn_subr/opt.c:837
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL:en \"%s\" är inte korrekt URI-kodad"
-#: libsvn_subr/opt.c:843
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL:en \"%s\" innehåller ett \"..\"-element"
-#: libsvn_subr/opt.c:872
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "Kunde inte ta reda på skiftläge för \"%s\""
-#: libsvn_subr/opt.c:974
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4347,7 +4442,7 @@
" kompilerad %s, %s\n"
"\n"
-#: libsvn_subr/opt.c:977
+#: libsvn_subr/opt.c:998
#, fuzzy
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
@@ -4362,36 +4457,31 @@
"(http://www.Collab.Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1028 libsvn_subr/opt.c:1069
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Skriv \"%s help\" för användning.\n"
-#: libsvn_subr/path.c:1182
+#: libsvn_subr/path.c:1107
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "Kunde inte ta reda på absolut sökväg för '%s'"
-#: libsvn_subr/path.c:1220
+#: libsvn_subr/path.c:1145
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "\"%s\" är varken ett fil- eller katalognamn"
-#: libsvn_subr/path.c:1335
+#: libsvn_subr/path.c:1251
#, c-format
msgid "Can't determine the native path encoding"
msgstr "Kan inte hitta den teckenkodning som ditt system använder för sökvägar"
-#: libsvn_subr/path.c:1389
+#: libsvn_subr/path.c:1305
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Ogiltigt kontrolltecken \"0x%02x\" i sökvägen \"%s\""
-#: libsvn_subr/prompt.c:97 svnserve/main.c:514
-#, c-format
-msgid "Can't open stdin"
-msgstr "Kan inte öppna standard in"
-
#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
@@ -4473,12 +4563,7 @@
msgid "Passphrase for '%s': "
msgstr "Lösenordsfras för \"%s\": "
-#: libsvn_subr/subst.c:1599
-#, c-format
-msgid "'%s' has unsupported special file type '%s'"
-msgstr "\"%s\" har en specialfiltyp som inte stöds: \"%s\""
-
-#: libsvn_subr/subst.c:1737 libsvn_wc/props.c:1499
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Filen \"%s\" har inkonsekventa radslut"
@@ -4511,27 +4596,27 @@
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "Kan inte skapa teckenkonverterare från \"%i\" till \"%i\""
-#: libsvn_subr/utf.c:515
+#: libsvn_subr/utf.c:522
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "Kan inte konvertera sträng från systemets kodning till \"%s\":"
-#: libsvn_subr/utf.c:519
+#: libsvn_subr/utf.c:526
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "Kan inte konvertera sträng från \"%s\" till systemets kodning:"
-#: libsvn_subr/utf.c:523
+#: libsvn_subr/utf.c:530
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "Kan inte konvertera sträng från \"%s\" till \"%s\""
-#: libsvn_subr/utf.c:529
+#: libsvn_subr/utf.c:536
#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "Kan inte konvertera sträng från CCSID \"%i\" till CCSID \"%i\""
-#: libsvn_subr/utf.c:574
+#: libsvn_subr/utf.c:581
#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
@@ -4540,7 +4625,7 @@
"Giltig data '%s' följdes av icke-ASCII-byte %d: kan inte konvertera till/"
"från UTF-8"
-#: libsvn_subr/utf.c:582
+#: libsvn_subr/utf.c:589
#, c-format
msgid ""
"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
@@ -4548,7 +4633,7 @@
"Tecken som ej tillhör ASCII (kod %d) hittades; kan inte konvertera till/från "
"UTF-8"
-#: libsvn_subr/utf.c:624
+#: libsvn_subr/utf.c:631
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -4586,16 +4671,11 @@
msgid "Malformed XML: %s at line %d"
msgstr "Felaktig XML: %s på rad %d"
-#: libsvn_wc/adm_crawler.c:605
+#: libsvn_wc/adm_crawler.c:635
msgid "Error aborting report"
msgstr "Fel när rapportering avbröts"
-#: libsvn_wc/adm_crawler.c:908
-#, c-format
-msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
-msgstr "Felaktig kontrollsumma för \"%s\"; väntade \"%s\", fick \"%s\""
-
-#: libsvn_wc/adm_crawler.c:919
+#: libsvn_wc/adm_crawler.c:1059
#, c-format
msgid "While preparing '%s' for commit"
msgstr ""
@@ -4631,47 +4711,42 @@
msgid "No such thing as 'base' working copy properties!"
msgstr "Det finns inget som heter \"base\"-egenskaper för en arbetskopia!"
-#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:51
+#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:52
#, c-format
msgid "'%s' is not a directory"
msgstr "\"%s\" är ingen katalog"
-#: libsvn_wc/adm_files.c:1035
-#, c-format
-msgid "No entry for '%s'"
-msgstr "Ingen post för \"%s\""
-
-#: libsvn_wc/adm_files.c:1048
+#: libsvn_wc/adm_files.c:1044
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "Revisionen %ld matchar inte den existerande revisionen %ld i \"%s\""
-#: libsvn_wc/adm_files.c:1056
+#: libsvn_wc/adm_files.c:1052
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "URL:en \"%s\" matchar inte den existerande URL:en \"%s\" i \"%s\""
-#: libsvn_wc/adm_ops.c:259
+#: libsvn_wc/adm_ops.c:278
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "Okänd nodtyp: \"%s\""
-#: libsvn_wc/adm_ops.c:1388
+#: libsvn_wc/adm_ops.c:1403
#, c-format
msgid "'%s' not found"
msgstr "\"%s\" finns inte"
-#: libsvn_wc/adm_ops.c:1392
+#: libsvn_wc/adm_ops.c:1407
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Nodtypen för sökvägen \"%s\" stöds inte"
-#: libsvn_wc/adm_ops.c:1422
+#: libsvn_wc/adm_ops.c:1437
#, c-format
msgid "'%s' is already under version control"
msgstr "\"%s\" är redan versionshanterad"
-#: libsvn_wc/adm_ops.c:1434
+#: libsvn_wc/adm_ops.c:1449
#, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
@@ -4680,44 +4755,39 @@
"Kan inte ersätta \"%s\" med en nod av en annan typ; raderingen måste "
"arkiveras och föräldern uppdateras innann \"%s\" kan läggas till"
-#: libsvn_wc/adm_ops.c:1451
+#: libsvn_wc/adm_ops.c:1466
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr "Kunde inte hitta föräldrakatalogens post när \"%s\" skulle läggas till"
-#: libsvn_wc/adm_ops.c:1456
+#: libsvn_wc/adm_ops.c:1471
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr ""
"Kan inte lägga till \"%s\" i en föräldrakatalog som är schemalagd för "
"radering"
-#: libsvn_wc/adm_ops.c:1472
+#: libsvn_wc/adm_ops.c:1487
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr "URL:en \"%s\" har annan arkivrot än sin förälder"
-#: libsvn_wc/adm_ops.c:1804
+#: libsvn_wc/adm_ops.c:1820
#, c-format
msgid "Error restoring text for '%s'"
msgstr "Fel vid återställande av texten för \"%s\""
-#: libsvn_wc/adm_ops.c:1935
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "Kan inte återställa: \"%s\" är inte versionshanterad"
-
-#: libsvn_wc/adm_ops.c:1963
+#: libsvn_wc/adm_ops.c:1990
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr "Kan inte återställa \"%s\": nodtypen stöds inte"
-#: libsvn_wc/adm_ops.c:1974
+#: libsvn_wc/adm_ops.c:2001
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr "Kan inte återställa \"%s\": nodtyp som inte stöds i arbetskopian"
-#: libsvn_wc/adm_ops.c:2021
+#: libsvn_wc/adm_ops.c:2048
msgid ""
"Cannot revert addition of current directory; please try again from the "
"parent directory"
@@ -4725,37 +4795,37 @@
"Kan inte återställa tillägg av aktuell katalog; försök igen från "
"föräldrakatalogen"
-#: libsvn_wc/adm_ops.c:2043
+#: libsvn_wc/adm_ops.c:2070
#, c-format
msgid "Unknown or unexpected kind for path '%s'"
msgstr "Okänd eller oväntad typ för sökvägen \"%s\""
-#: libsvn_wc/adm_ops.c:2205
+#: libsvn_wc/adm_ops.c:2232
#, c-format
msgid "File '%s' has local modifications"
msgstr "Filen \"%s\" har lokala ändringar"
+#: libsvn_wc/adm_ops.c:2802
+#, fuzzy, c-format
+msgid "'%s' is not currently a member of changelist '%s'."
+msgstr "Sökvägen \"%s\" är inte en fil"
+
#: libsvn_wc/copy.c:197
#, c-format
msgid "Error during recursive copy of '%s'"
msgstr "Fel vid rekursiv kopiering av \"%s\""
-#: libsvn_wc/copy.c:362
+#: libsvn_wc/copy.c:356
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "\"%s\" finns redan och är i vägen"
-#: libsvn_wc/copy.c:374
+#: libsvn_wc/copy.c:368
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "Det finns redan ett versionshanterat objekt \"%s\""
-#: libsvn_wc/copy.c:384
-#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr "Kan inte kopiera eller flytta \"%s\": den är inte versionshanterad"
-
-#: libsvn_wc/copy.c:393
+#: libsvn_wc/copy.c:383
#, c-format
msgid ""
"Cannot copy or move '%s': it's not in the repository yet; try committing "
@@ -4764,7 +4834,7 @@
"Kan inte kopiera eller flytta \"%s\": den är inte i arkivet ännu; arkivera "
"den först"
-#: libsvn_wc/copy.c:672
+#: libsvn_wc/copy.c:658
#, c-format
msgid ""
"Cannot copy or move '%s': it is not in the repository yet; try committing "
@@ -4773,106 +4843,106 @@
"Kan inte kopiera eller flytta \"%s\": den är inte i arkivet ännu; arkivera "
"den först"
-#: libsvn_wc/copy.c:799
+#: libsvn_wc/copy.c:776
#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
msgstr ""
"Kan inte kopiera till \"%s\", då den inte är från arkivet \"%s\", utan från "
"\"%s\""
-#: libsvn_wc/copy.c:806
+#: libsvn_wc/copy.c:783
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr "Kan inte kopiera till \"%s\", då den är schemalagd att raderas"
-#: libsvn_wc/entries.c:91 libsvn_wc/entries.c:349 libsvn_wc/entries.c:561
-#: libsvn_wc/entries.c:822
+#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:352 libsvn_wc/entries.c:588
+#: libsvn_wc/entries.c:849
#, c-format
msgid "Entry '%s' has invalid '%s' value"
msgstr "Posten \"%s\" har ogiltigt värde för \"%s\""
# ### Better wording!
-#: libsvn_wc/entries.c:111
+#: libsvn_wc/entries.c:114
msgid "Invalid escape sequence"
msgstr "Ogiltig \"escape-sekvens\""
# ### inpresice
-#: libsvn_wc/entries.c:118
+#: libsvn_wc/entries.c:121
msgid "Invalid escaped character"
msgstr "Ogiltigt tecken"
-#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
-#: libsvn_wc/entries.c:203
+#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:194
+#: libsvn_wc/entries.c:206
msgid "Unexpected end of entry"
msgstr "Oväntat slut på post"
-#: libsvn_wc/entries.c:225
+#: libsvn_wc/entries.c:228
#, c-format
msgid "Invalid value for field '%s'"
msgstr "Ogiltigt värde för fältet \"%s\""
-#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:536
+#: libsvn_wc/entries.c:310 libsvn_wc/entries.c:563
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "Posten \"%s\" har ogiltig nodtyp"
-#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:513
+#: libsvn_wc/entries.c:331 libsvn_wc/entries.c:540
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "Posten för \"%s\" har ogiltig arkivrot"
-#: libsvn_wc/entries.c:947
+#: libsvn_wc/entries.c:995
#, c-format
msgid "XML parser failed in '%s'"
msgstr "XML-tolken misslyckades i \"%s\""
-#: libsvn_wc/entries.c:1006
+#: libsvn_wc/entries.c:1054
msgid "Missing default entry"
msgstr "Normalpost saknas"
-#: libsvn_wc/entries.c:1011
+#: libsvn_wc/entries.c:1059
msgid "Default entry has no revision number"
msgstr "Normalposten saknar revisionsnummer"
-#: libsvn_wc/entries.c:1016
+#: libsvn_wc/entries.c:1064
msgid "Default entry is missing URL"
msgstr "Normalposten saknar URL"
-#: libsvn_wc/entries.c:1092
+#: libsvn_wc/entries.c:1140
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "Felaktig versionsrad i postfilen för \"%s\""
-#: libsvn_wc/entries.c:1109
+#: libsvn_wc/entries.c:1157
msgid "Missing entry terminator"
msgstr "Avslutningstecken för posten saknas"
-#: libsvn_wc/entries.c:1112
+#: libsvn_wc/entries.c:1160
msgid "Invalid entry terminator"
msgstr "Ogiltigt avslutningstecken för post"
-#: libsvn_wc/entries.c:1116
+#: libsvn_wc/entries.c:1164
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "Fel vid post %d i postfilen för \"%s\":"
-#: libsvn_wc/entries.c:1212
+#: libsvn_wc/entries.c:1287
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "Trasig arbetskopia: \"%s\" saknar normalpost"
-#: libsvn_wc/entries.c:1229
+#: libsvn_wc/entries.c:1304
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
msgstr "Trasig arbetskopia: katalogen \"%s\" har felaktig schemaläggning"
-#: libsvn_wc/entries.c:1263
+#: libsvn_wc/entries.c:1338
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
msgstr ""
"Trasig arbetskopia: \"%s\" i katalogen \"%s\" har felaktig schemaläggning"
-#: libsvn_wc/entries.c:1272
+#: libsvn_wc/entries.c:1347
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4881,7 +4951,7 @@
"Trasig arbetskopia: \"%s\" i katalogen \"%s\" (som är schemalagd att läggas "
"till) är inte själv schemalagd att läggas till"
-#: libsvn_wc/entries.c:1280
+#: libsvn_wc/entries.c:1355
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4890,7 +4960,7 @@
"Trasig arbetskopia: \"%s\" i katalogen \"%s\" (som är schemalagd att "
"raderas) är inte själv schemalagd att raderas"
-#: libsvn_wc/entries.c:1288
+#: libsvn_wc/entries.c:1363
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4899,17 +4969,17 @@
"Trasig arbetskopia: \"%s\" i katalogen \"%s\" (som är schemalagd att "
"ersättas) har ogiltig schemaläggning"
-#: libsvn_wc/entries.c:1925
+#: libsvn_wc/entries.c:2010
#, c-format
msgid "No default entry in directory '%s'"
msgstr "Ingen normalpost i katalogen \"%s\""
-#: libsvn_wc/entries.c:1980
+#: libsvn_wc/entries.c:2065
#, c-format
msgid "Error writing to '%s'"
msgstr "Fel vid skrivning till \"%s\""
-#: libsvn_wc/entries.c:2303
+#: libsvn_wc/entries.c:2394
#, c-format
msgid ""
"Can't add '%s' to deleted directory; try undeleting its parent directory "
@@ -4918,7 +4988,7 @@
"Kan inte lägga till \"%s\" i en raderad katalog; försök återställa den "
"raderade föräldrakatalogen först"
-#: libsvn_wc/entries.c:2309
+#: libsvn_wc/entries.c:2400
#, c-format
msgid ""
"Can't replace '%s' in deleted directory; try undeleting its parent directory "
@@ -4927,43 +4997,43 @@
"Kan inte ersätta \"%s\" i en raderad katalog; försök återställa "
"föräldrakatalogen först"
-#: libsvn_wc/entries.c:2318
+#: libsvn_wc/entries.c:2409
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr ""
"\"%s\" är markerad som saknad, så den kan inte schemaläggas att läggas till"
-#: libsvn_wc/entries.c:2347
+#: libsvn_wc/entries.c:2438
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "Posten \"%s\" är redan versionshanterad"
-#: libsvn_wc/entries.c:2444
+#: libsvn_wc/entries.c:2535
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "Posten \"%s\" har ogiltig schemaläggning"
-#: libsvn_wc/entries.c:2590
+#: libsvn_wc/entries.c:2681
#, c-format
msgid "No such entry: '%s'"
msgstr "Ingen post med namnet: \"%s\""
-#: libsvn_wc/entries.c:2717
+#: libsvn_wc/entries.c:2814
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "Fel när postfilen för \"%s\" skulle skrivas"
-#: libsvn_wc/entries.c:2759
+#: libsvn_wc/entries.c:2856
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "Katalogen \"%s\" saknar THIS_DIR-post"
-#: libsvn_wc/entries.c:2888
+#: libsvn_wc/entries.c:2985
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "\"%s\" har okänd nodtyp"
-#: libsvn_wc/entries.c:2925
+#: libsvn_wc/entries.c:3022
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr ""
@@ -5030,7 +5100,7 @@
msgid "Lock file '%s' is not a regular file"
msgstr "Låsfilen \"%s\" är ingen normal fil"
-#: libsvn_wc/log.c:339
+#: libsvn_wc/log.c:355
msgid "Can't move source to dest"
msgstr "Kan inte flytta källa till mål"
@@ -5038,146 +5108,146 @@
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:502
+#: libsvn_wc/log.c:518
#, c-format
msgid "In directory '%s'"
msgstr "I katalogen \"%s\""
-#: libsvn_wc/log.c:527
+#: libsvn_wc/log.c:543
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "Attributet \"left\" saknas i \"%s\""
-#: libsvn_wc/log.c:534
+#: libsvn_wc/log.c:550
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "Attributet \"right\" saknas i \"%s\""
-#: libsvn_wc/log.c:602
+#: libsvn_wc/log.c:618
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "Attributet \"dest\" saknas i \"%s\""
-#: libsvn_wc/log.c:683
+#: libsvn_wc/log.c:699
#, c-format
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "Attributet \"timestamp\" saknas i \"%s\""
-#: libsvn_wc/log.c:779 libsvn_wc/log.c:819
+#: libsvn_wc/log.c:795 libsvn_wc/log.c:835
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "Fel vid hämtning av senaste modifieringstid från \"%s\""
-#: libsvn_wc/log.c:830
+#: libsvn_wc/log.c:868
+#, fuzzy, c-format
+msgid "Error getting file size on '%s'"
+msgstr "Fel vid hämtning av senaste modifieringstid från \"%s\""
+
+#: libsvn_wc/log.c:886
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "Fel vid ändring av posten för \"%s\""
-#: libsvn_wc/log.c:856
+#: libsvn_wc/log.c:912
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "Fel vid borttagning av lås från posten för \"%s\""
-#: libsvn_wc/log.c:879
+#: libsvn_wc/log.c:935
#, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "Fel vid borttagning av ändringslista för posten \"%s\""
-#: libsvn_wc/log.c:1011
+#: libsvn_wc/log.c:1067
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "Attributet \"revision\" saknas för \"%s\""
-#: libsvn_wc/log.c:1035
+#: libsvn_wc/log.c:1091
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "Loggkommando för katalogen \"%s\" är felplacerat"
-#: libsvn_wc/log.c:1231
+#: libsvn_wc/log.c:1287
#, c-format
msgid "Error checking existence of '%s'"
msgstr "Fel vid kontroll om \"%s\" finns"
-#: libsvn_wc/log.c:1288
+#: libsvn_wc/log.c:1353
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "Fel när textbasen för \"%s\" ersattes"
-#: libsvn_wc/log.c:1293
+#: libsvn_wc/log.c:1358
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "Fel vid hämtning av senaste modifieringstid från \"%s\""
-#: libsvn_wc/log.c:1334
+#: libsvn_wc/log.c:1381
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "Fel vid hämtning av senaste modifieringstid från \"%s\""
-#: libsvn_wc/log.c:1349
+#: libsvn_wc/log.c:1401
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "Fel då \"%s\" och \"%s\" jämfördes"
-#: libsvn_wc/log.c:1394 libsvn_wc/log.c:1461
+#: libsvn_wc/log.c:1450 libsvn_wc/log.c:1517
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "Fel när posten för \"%s\" ändrades"
-#: libsvn_wc/log.c:1516
+#: libsvn_wc/log.c:1572
msgid "Invalid 'format' attribute"
msgstr "Ogiltigt format-attribut"
-#: libsvn_wc/log.c:1551
+#: libsvn_wc/log.c:1607
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr ""
"Loggposten saknar attributet \"name\" (post \"%s\" för katalogen \"%s\")"
-#: libsvn_wc/log.c:1622
+#: libsvn_wc/log.c:1678
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "Okänt element \"%s\" i loggfilen \"%s\""
-#: libsvn_wc/log.c:1633
+#: libsvn_wc/log.c:1689
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "Fel när kommandot \"%s\" i \"%s\" utfördes"
-#: libsvn_wc/log.c:1815
+#: libsvn_wc/log.c:1871
msgid "Couldn't open log"
msgstr "Kunde inte öppna logg"
-#: libsvn_wc/log.c:1826
+#: libsvn_wc/log.c:1882
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "Fel vid läsning av administrativ loggfil i \"%s\""
-#: libsvn_wc/log.c:2440
+#: libsvn_wc/log.c:2524
#, c-format
msgid "Error writing log for '%s'"
msgstr "Fel vid skrivning av logg för \"%s\""
-#: libsvn_wc/log.c:2489
-#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "\"%s\" är ingen katalog i en arbetskopia"
-
-#: libsvn_wc/props.c:92
+#: libsvn_wc/props.c:95
#, c-format
msgid "Can't parse '%s'"
msgstr "Kan inte tolka \"%s\""
-#: libsvn_wc/props.c:123
+#: libsvn_wc/props.c:126
#, c-format
msgid "Can't write property hash to '%s'"
msgstr "Kan inte skriva egenskapstabell till \"%s\""
-#: libsvn_wc/props.c:218
+#: libsvn_wc/props.c:221
#, c-format
msgid "Can't find entry '%s' in '%s'"
msgstr "Kan inte hitta posten \"%s\" i \"%s\""
-#: libsvn_wc/props.c:633
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5186,7 +5256,7 @@
"Försöker lägga till egenskapen \"%s\" med värdet \"%s\",\n"
"men egenskapen finns redan med värdet \"%s\"."
-#: libsvn_wc/props.c:656
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5195,7 +5265,7 @@
"Försöker ändra egenskapen \"%s\" från \"%s\" till \"%s\",\n"
"men egenskapen finns inte."
-#: libsvn_wc/props.c:684
+#: libsvn_wc/props.c:808
#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
@@ -5203,7 +5273,7 @@
"Försöker radera egenskapen \"%s\" men värdet har ändrats från \"%s\" till \"%"
"s\""
-#: libsvn_wc/props.c:702
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5212,52 +5282,52 @@
"Försöker ändra egenskapen \"%s\" från \"%s\" till \"%s\",\n"
"men egenskapen finns redan och har värdet \"%s\"."
-#: libsvn_wc/props.c:885
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "Radslut saknas i wcprops-filen för \"%s\""
-#: libsvn_wc/props.c:1068 libsvn_wc/props.c:1104 libsvn_wc/props.c:1374
-#: libsvn_wc/props.c:1626
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "Misslyckades med att läsa egenskaper från disk"
-#: libsvn_wc/props.c:1132
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "Kan inte skriva egenskapstabell för \"%s\""
-#: libsvn_wc/props.c:1366 libsvn_wc/props.c:1535
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "Egenskapen \"%s\" är en postegenskap"
-#: libsvn_wc/props.c:1413
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "Kan inte sätta \"%s\" på en katalog (\"%s\")"
-#: libsvn_wc/props.c:1421
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "Kan inte sätta \"%s\" på en fil (\"%s\")"
-#: libsvn_wc/props.c:1427
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "\"%s\" är ingen fil eller katalog"
-#: libsvn_wc/props.c:1508
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "Filen \"%s\" har binär mime-typsegenskap"
-#: libsvn_wc/props.c:2169
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Fel vid tolkning av egenskapen %s på \"%s\": \"%s\""
-#: libsvn_wc/props.c:2182
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
@@ -5266,7 +5336,7 @@
"Ogiltig egenskap %s på %s: målet innehåller \".\" eller \"..\" eller är en "
"absolut sökväg"
-#: libsvn_wc/questions.c:120
+#: libsvn_wc/questions.c:121
#, c-format
msgid ""
"Working copy format of '%s' is too old (%d); please check out your working "
@@ -5275,7 +5345,7 @@
"Arbetskopian \"%s\" har för gammalt format (%d); checka ut din arbetskopia "
"igen"
-#: libsvn_wc/questions.c:128
+#: libsvn_wc/questions.c:129
#, c-format
msgid ""
"This client is too old to work with working copy '%s'; please get a newer "
@@ -5284,7 +5354,7 @@
"Den här klienten är för gammal för att arbeta med arbetskopian \"%s\"; "
"skaffa en nyare Subversion-klient"
-#: libsvn_wc/questions.c:346
+#: libsvn_wc/questions.c:336
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5295,27 +5365,27 @@
" väntade: %s\n"
" fick: %s\n"
-#: libsvn_wc/relocate.c:69
+#: libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr ""
"Vid omlokalisering kan endast den del av URL:en ändras som anger arkivet"
-#: libsvn_wc/update_editor.c:399
+#: libsvn_wc/update_editor.c:440
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "Ingen post för \".\" i: \"%s\""
-#: libsvn_wc/update_editor.c:923
+#: libsvn_wc/update_editor.c:963
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "Raderar inte den lokalt ändrade katalogen \"%s\""
-#: libsvn_wc/update_editor.c:997
+#: libsvn_wc/update_editor.c:1037
#, c-format
msgid "Error writing log file for '%s'"
msgstr "Fel när loggfilen för \"%s\" skrevs"
-#: libsvn_wc/update_editor.c:1101
+#: libsvn_wc/update_editor.c:1144
#, c-format
msgid ""
"Failed to add directory '%s': a non-directory object of the same name "
@@ -5324,7 +5394,7 @@
"Kunde inte lägga till katalogen \"%s\": ett objekt med samma namn, som inte "
"är en katalog, finns redan"
-#: libsvn_wc/update_editor.c:1134
+#: libsvn_wc/update_editor.c:1177
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': an unversioned directory of the same name "
@@ -5333,7 +5403,7 @@
"Kunde inte tvingande lägga till katalogen \"%s\": ett versionshanterat "
"objekt med samma namn finns redan"
-#: libsvn_wc/update_editor.c:1156
+#: libsvn_wc/update_editor.c:1199
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': a versioned directory of the same name already "
@@ -5342,7 +5412,7 @@
"Kunde inte tvingande lägga till katalogen \"%s\": ett versionshanterat "
"objekt med samma namn finns redan"
-#: libsvn_wc/update_editor.c:1167
+#: libsvn_wc/update_editor.c:1210
#, c-format
msgid ""
"Failed to add directory '%s': object of the same name as the administrative "
@@ -5351,17 +5421,17 @@
"Kunde inte lägga till katalogen \"%s\": objektet har samma namn som "
"administrationskatalogen"
-#: libsvn_wc/update_editor.c:1181
+#: libsvn_wc/update_editor.c:1224
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr ""
"Kunde inte lägga till katalogen \"%s\": \"copyfrom\"-argument stöds inte ännu"
-#: libsvn_wc/update_editor.c:1435
+#: libsvn_wc/update_editor.c:1521
msgid "Couldn't do property merge"
msgstr "Kunde inte slå ihop egenskaper"
-#: libsvn_wc/update_editor.c:1505
+#: libsvn_wc/update_editor.c:1590
#, c-format
msgid ""
"Failed to mark '%s' absent: item of the same name is already scheduled for "
@@ -5370,7 +5440,7 @@
"Kunde inte markera \"%s\" som saknad: ett objekt med det namnet är redan "
"schemalagd att läggas till"
-#: libsvn_wc/update_editor.c:1605
+#: libsvn_wc/update_editor.c:1690
#, fuzzy, c-format
msgid ""
"Failed to add file '%s': a file of the same name is already scheduled for "
@@ -5379,7 +5449,7 @@
"Kunde inte lägga till filen \"%s\": ett objekt med samma namn är redan "
"schemalagt att läggas till"
-#: libsvn_wc/update_editor.c:1617
+#: libsvn_wc/update_editor.c:1702
#, c-format
msgid ""
"Failed to add file '%s': a non-file object of the same name already exists"
@@ -5387,62 +5457,70 @@
"Kunde inte lägga till filen \"%s\": ett objekt med samma namn, som inte är "
"en fil, finns redan"
-#: libsvn_wc/update_editor.c:1632
+#: libsvn_wc/update_editor.c:1717
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr ""
"Kunde inte lägga till filen \"%s\": ett objekt med samma namn finns redan"
-#: libsvn_wc/update_editor.c:1649
+#: libsvn_wc/update_editor.c:1734
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "Filen \"%s\" i katalogen \"%s\" är inte en versionshanterad resurs"
-#: libsvn_wc/update_editor.c:1767
+#: libsvn_wc/update_editor.c:1883
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "Felaktig kontrollsumma för \"%s\"; lagrad: \"%s\", verklig: \"%s\""
-#: libsvn_wc/update_editor.c:2995
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "\"%s\" saknar information om ursprung"
-#: libsvn_wc/update_editor.c:3158
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Käll-RUL:en \"%s\" har annan arkivrot än \"%s\""
-#: libsvn_wc/util.c:83
+#: libsvn_wc/util.c:84
msgid "Unable to make any directories"
msgstr "Kan inte skapa några kataloger över huvud taget"
-#: svn/blame-cmd.c:234 svn/list-cmd.c:252
+#: svn/blame-cmd.c:206 svn/list-cmd.c:227
msgid "'verbose' option invalid in XML mode"
msgstr "Flaggan \"verbose\" är inte tillåten i XML-läge"
-#: svn/blame-cmd.c:246 svn/info-cmd.c:507 svn/list-cmd.c:264
-#: svn/status-cmd.c:268
+#: svn/blame-cmd.c:218 svn/info-cmd.c:511 svn/list-cmd.c:239
+#: svn/status-cmd.c:249
msgid "'incremental' option only valid in XML mode"
msgstr "Flaggan \"incremental\" är endast tillåten i XML-läge"
-#: svn/blame-cmd.c:313
+#: svn/blame-cmd.c:280
#, c-format
msgid "Skipping binary file: '%s'\n"
msgstr "Hoppar över binär fil: \"%s\"\n"
-#: svn/checkout-cmd.c:129 svn/switch-cmd.c:127
+#: svn/changelist-cmd.c:61 svn/info-cmd.c:477 svn/log-cmd.c:410
+#: svn/revert-cmd.c:58
+#, c-format
+msgid "no such changelist '%s'"
+msgstr "ingen ändringslista med namnet: \"%s\""
+
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "\"%s\" verkar inte vara en URL"
-#: svn/copy-cmd.c:126 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66
-#: svn/propedit-cmd.c:200
-msgid "Local, non-commit operations do not take a log message"
+#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66 svn/move-cmd.c:76
+#: svn/propedit-cmd.c:201
+#, fuzzy
+msgid ""
+"Local, non-commit operations do not take a log message or revision properties"
msgstr ""
"Lokala operationer, som ej medför arkivering, behöver inget loggmeddelande"
-#: svn/diff-cmd.c:117 svnserve/main.c:523
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "Kan inte öppna standard ut"
@@ -5463,7 +5541,7 @@
"Mållistor till diff kan inte innehålla både sökvägar till arbetskopior och "
"URL:er"
-#: svn/export-cmd.c:84
+#: svn/export-cmd.c:87
msgid ""
"Destination directory exists; please remove the directory or use --force to "
"overwrite"
@@ -5508,7 +5586,7 @@
"Subversion är ett verktyg för versionshantering.\n"
"Se http://subversion.tigris.org/ för ytterligare information.\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1296
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -5529,158 +5607,179 @@
msgid "Invalid URL '%s'"
msgstr "Ogiltig URL \"%s\""
-#: svn/info-cmd.c:111
+#: svn/info-cmd.c:88
#, c-format
msgid "'%s' has invalid revision"
msgstr "\"%s\" har ogiltig revision"
-#: svn/info-cmd.c:267 svnadmin/main.c:1116
+#: svn/info-cmd.c:250 svnadmin/main.c:1118
#, c-format
msgid "Path: %s\n"
msgstr "Sökväg: %s\n"
-#: svn/info-cmd.c:273 svnlook/main.c:734
+#: svn/info-cmd.c:256 svnlook/main.c:738
#, c-format
msgid "Name: %s\n"
msgstr "Namn: %s\n"
-#: svn/info-cmd.c:277
+#: svn/info-cmd.c:260
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: svn/info-cmd.c:280
+#: svn/info-cmd.c:263
#, c-format
msgid "Repository Root: %s\n"
msgstr "Arkivrot: %s\n"
-#: svn/info-cmd.c:284
+#: svn/info-cmd.c:267
#, c-format
msgid "Repository UUID: %s\n"
msgstr "Arkivets UUID: %s\n"
-#: svn/info-cmd.c:288
+#: svn/info-cmd.c:271
#, c-format
msgid "Revision: %ld\n"
msgstr "Revision: %ld\n"
-#: svn/info-cmd.c:293
+#: svn/info-cmd.c:276
#, c-format
msgid "Node Kind: file\n"
msgstr "Nodtyp: fil\n"
-#: svn/info-cmd.c:297
+#: svn/info-cmd.c:280
#, c-format
msgid "Node Kind: directory\n"
msgstr "Nodtyp: katalog\n"
-#: svn/info-cmd.c:301
+#: svn/info-cmd.c:284
#, c-format
msgid "Node Kind: none\n"
msgstr "Nodtyp: ingen\n"
-#: svn/info-cmd.c:306
+#: svn/info-cmd.c:289
#, c-format
msgid "Node Kind: unknown\n"
msgstr "Nodtyp: okänd\n"
-#: svn/info-cmd.c:315
+#: svn/info-cmd.c:298
#, c-format
msgid "Schedule: normal\n"
msgstr "Schemalagd: normal\n"
-#: svn/info-cmd.c:319
+#: svn/info-cmd.c:302
#, c-format
msgid "Schedule: add\n"
msgstr "Schemalagd: att läggas till\n"
-#: svn/info-cmd.c:323
+#: svn/info-cmd.c:306
#, c-format
msgid "Schedule: delete\n"
msgstr "Schemalagd: att raderas\n"
-#: svn/info-cmd.c:327
+#: svn/info-cmd.c:310
#, c-format
msgid "Schedule: replace\n"
msgstr "Schemalagd: att ersättas\n"
-#: svn/info-cmd.c:335
+#: svn/info-cmd.c:326
+#, c-format
+msgid "Depth: empty\n"
+msgstr ""
+
+#: svn/info-cmd.c:330
+#, c-format
+msgid "Depth: files\n"
+msgstr ""
+
+#: svn/info-cmd.c:334
+#, c-format
+msgid "Depth: immediates\n"
+msgstr ""
+
+#. Other depths should never happen here.
+#: svn/info-cmd.c:345
+#, c-format
+msgid "Depth: INVALID\n"
+msgstr ""
+
+#: svn/info-cmd.c:349
#, c-format
msgid "Copied From URL: %s\n"
msgstr "Kopierad från URL: %s\n"
-#: svn/info-cmd.c:339
+#: svn/info-cmd.c:353
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "Kopierad från Revision: %ld\n"
-#: svn/info-cmd.c:344
+#: svn/info-cmd.c:358
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "Författare till senaste ändringen: %s\n"
-#: svn/info-cmd.c:348
+#: svn/info-cmd.c:362
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "Senast ändrad i revision: %ld\n"
-#: svn/info-cmd.c:353
+#: svn/info-cmd.c:367
msgid "Last Changed Date"
msgstr "Datum för senaste ändringen"
-#: svn/info-cmd.c:359
+#: svn/info-cmd.c:373
msgid "Text Last Updated"
msgstr "Innehållet senast uppdaterat"
-#: svn/info-cmd.c:363
+#: svn/info-cmd.c:377
msgid "Properties Last Updated"
msgstr "Egenskaper senast uppdaterade"
-#: svn/info-cmd.c:366
+#: svn/info-cmd.c:380
#, c-format
msgid "Checksum: %s\n"
msgstr "Kontrollsumma: %s\n"
-#: svn/info-cmd.c:371
+#: svn/info-cmd.c:385
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "Konflikt: föregående basfil: %s\n"
-#: svn/info-cmd.c:377
+#: svn/info-cmd.c:391
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "Konflikt: föregående arbetsfil: %s\n"
-#: svn/info-cmd.c:382
+#: svn/info-cmd.c:396
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "Konflikt: nuvarande basfil: %s\n"
-#: svn/info-cmd.c:387
+#: svn/info-cmd.c:401
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "Konfliktegenskapsfil: %s\n"
# ###
-#: svn/info-cmd.c:395
+#: svn/info-cmd.c:409
#, c-format
msgid "Lock Token: %s\n"
msgstr "Låsidentifierare: %s\n"
-#: svn/info-cmd.c:399
+#: svn/info-cmd.c:413
#, c-format
msgid "Lock Owner: %s\n"
msgstr "Låsägare: %s\n"
-#: svn/info-cmd.c:404
+#: svn/info-cmd.c:418
msgid "Lock Created"
msgstr "Lås skapat"
-#: svn/info-cmd.c:408
+#: svn/info-cmd.c:422
msgid "Lock Expires"
msgstr "Låset går ut"
-#: svn/info-cmd.c:417
+#: svn/info-cmd.c:431
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -5689,7 +5788,7 @@
"Låskommentar (%i rader):\n"
"%s\n"
-#: svn/info-cmd.c:418
+#: svn/info-cmd.c:432
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -5698,17 +5797,12 @@
"Låskommentar (%i rad):\n"
"%s\n"
-#: svn/info-cmd.c:425
+#: svn/info-cmd.c:439
#, c-format
msgid "Changelist: %s\n"
msgstr "Ändringslista: %s\n"
-#: svn/info-cmd.c:477 svn/revert-cmd.c:59
-#, c-format
-msgid "no such changelist '%s'"
-msgstr "ingen ändringslista med namnet: \"%s\""
-
-#: svn/info-cmd.c:539
+#: svn/info-cmd.c:547
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
@@ -5717,7 +5811,7 @@
"%s: (Inte en versionshanterad resurs)\n"
"\n"
-#: svn/info-cmd.c:548
+#: svn/info-cmd.c:556
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -5746,11 +5840,11 @@
msgid " (from %s:%ld)"
msgstr " (från %s:%ld)"
-#: svn/log-cmd.c:450
+#: svn/log-cmd.c:475
msgid "When specifying working copy paths, only one target may be given"
msgstr "Endast ett mål kan anges då sökvägar till arbetskopiro anges"
-#: svn/log-cmd.c:462
+#: svn/log-cmd.c:487
msgid "Only relative paths can be specified after a URL"
msgstr "Endast relativa sökvägar kan anges efter en URL"
@@ -5764,7 +5858,7 @@
#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:230 svnadmin/main.c:233
#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
-#: svnlook/main.c:93 svnsync/main.c:104 svnsync/main.c:106
+#: svnlook/main.c:102 svnsync/main.c:135 svnsync/main.c:137
msgid "show help on a subcommand"
msgstr "visa hjälp för ett underkommando"
@@ -5777,12 +5871,12 @@
msgstr "visa så lite information som möjligt"
#: svn/main.c:67
-msgid "descend recursively"
-msgstr "gå ned rekursivt"
+msgid "descend recursively, same as --depth=infinity"
+msgstr ""
#: svn/main.c:68
-msgid "operate on single directory only"
-msgstr "arbeta endast med en katalog"
+msgid "obsolete; try --depth=files or --depth=immediates"
+msgstr ""
#: svn/main.c:70
msgid ""
@@ -5835,7 +5929,7 @@
" teckenkodningen ARG"
#: svn/main.c:92 svnadmin/main.c:236 svndumpfilter/main.c:786
-#: svnlook/main.c:96 svnserve/main.c:150 svnsync/main.c:102
+#: svnlook/main.c:129 svnserve/main.c:151 svnsync/main.c:133
#: svnversion/main.c:125
msgid "show program version information"
msgstr "visa programversionsinformation"
@@ -5848,11 +5942,11 @@
msgid "display update information"
msgstr "visa uppdateringsinformation"
-#: svn/main.c:96 svnsync/main.c:96
+#: svn/main.c:96
msgid "specify a username ARG"
msgstr "ange ett användarnamn ARG"
-#: svn/main.c:98 svnsync/main.c:98
+#: svn/main.c:98
msgid "specify a password ARG"
msgstr "ange ett lösenord ARG"
@@ -5901,93 +5995,104 @@
"använd innehållet i filen ARG som ytterligare\n"
" argument"
-#: svn/main.c:131
+#: svn/main.c:132
+msgid ""
+"pass depth ('empty', 'files', 'immediates', or\n"
+" 'infinity') as ARG"
+msgstr ""
+
+#: svn/main.c:135
msgid "output in XML"
msgstr "visa information som XML"
-#: svn/main.c:132
+#: svn/main.c:136
msgid "use strict semantics"
msgstr "använd strikt semantik"
-#: svn/main.c:134
+#: svn/main.c:138
msgid "do not cross copies while traversing history"
msgstr "följ inte kopieringar när historiken gås igenom"
-#: svn/main.c:136
+#: svn/main.c:140
msgid "disregard default and svn:ignore property ignores"
msgstr "bortse ifrån svn:ignore och standarduteslutningar"
-#: svn/main.c:138 svnsync/main.c:94
+#: svn/main.c:142 svnsync/main.c:113
msgid "do not cache authentication tokens"
msgstr "cacha inte autentiseringsinformation"
-#: svn/main.c:140 svnsync/main.c:92
+#: svn/main.c:144 svnsync/main.c:111
msgid "do no interactive prompting"
msgstr "ställ inga interaktiva frågor"
-#: svn/main.c:142
+#: svn/main.c:146
msgid "try operation but make no changes"
msgstr "testa operationen, men gör inga ändringar"
-#: svn/main.c:144 svnlook/main.c:111
+#: svn/main.c:148 svnlook/main.c:108
msgid "do not print differences for deleted files"
msgstr "visa inte skillnader för raderade filer"
-#: svn/main.c:146
+#: svn/main.c:150
msgid "notice ancestry when calculating differences"
msgstr "ta hänsyn till ursprung när skillnader beräknas"
-#: svn/main.c:148
+#: svn/main.c:152
msgid "ignore ancestry when calculating merges"
msgstr "bortse ifrån ursprung när sammanslagningar beräknas"
-#: svn/main.c:150
+#: svn/main.c:154
msgid "ignore externals definitions"
msgstr "bortse ifrån externals-definitioner"
-#: svn/main.c:153
+#: svn/main.c:157
msgid "use ARG as diff command"
msgstr "använd ARG som diff-kommando"
-#: svn/main.c:155
+#: svn/main.c:159
msgid "use ARG as merge command"
msgstr "använd ARG som merge-kommando"
-#: svn/main.c:157
+#: svn/main.c:161
msgid "use ARG as external editor"
msgstr "använd ARG som extern editor"
-#: svn/main.c:160
-msgid "use ARG as the older target"
-msgstr "använd ARG som det äldre målet"
-
-#: svn/main.c:162
-msgid "use ARG as the newer target"
-msgstr "använd ARG som det nyare målet"
-
#: svn/main.c:164
-msgid "operate on a revision property (use with -r)"
+#, fuzzy
+msgid "mark revisions as merged (use with -r)"
msgstr "arbeta med en revisionsegenskap (används med -r)"
#: svn/main.c:166
+msgid "use ARG as the older target"
+msgstr "använd ARG som det äldre målet"
+
+#: svn/main.c:168
+msgid "use ARG as the newer target"
+msgstr "använd ARG som det nyare målet"
+
+#: svn/main.c:170
+msgid "operate on a revision property (use with -r)"
+msgstr "arbeta med en revisionsegenskap (används med -r)"
+
+#: svn/main.c:172
msgid "relocate via URL-rewriting"
msgstr "omlokalisera genom att skriva om URL:er"
-#: svn/main.c:168 svnadmin/main.c:272 svnsync/main.c:100
+#: svn/main.c:174 svnadmin/main.c:272 svnsync/main.c:131
msgid "read user configuration files from directory ARG"
msgstr ""
"läs användarens konfigurationsfiler från katalogen\n"
" ARG"
-#: svn/main.c:170
+#: svn/main.c:176
msgid "enable automatic properties"
msgstr "aktivera automatiska egenskaper"
-#: svn/main.c:172
+#: svn/main.c:178
msgid "disable automatic properties"
msgstr "deaktivera automatiska egenskaper"
-#: svn/main.c:174
+#: svn/main.c:180
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -6000,36 +6105,42 @@
"vara\n"
" något av \"LF\", \"CR\" och \"CRLF\""
-#: svn/main.c:182
+#: svn/main.c:188
msgid "maximum number of log entries"
msgstr "maximalt antal loggposter"
-#: svn/main.c:184
+#: svn/main.c:190
msgid "don't unlock the targets"
msgstr "lås inte upp målen"
-#: svn/main.c:186
+#: svn/main.c:192
msgid "show a summary of the results"
msgstr "visa en sammanfattning av resultatet"
-#: svn/main.c:188
+#: svn/main.c:194
msgid "remove changelist association"
msgstr "ta bort koppling till ändringslista"
-#: svn/main.c:190
+#: svn/main.c:196
msgid "operate only on members of changelist ARG"
msgstr "arbeta endast med medlemmar av ändringslistan ARG"
-#: svn/main.c:192
+#: svn/main.c:198
msgid "don't delete changelist after commit"
msgstr "ta inte bort ändringslistan efter arkivering"
-#: svn/main.c:194
+#: svn/main.c:200
#, fuzzy
msgid "keep path in working copy"
msgstr "Sökväg är inte en fil i en arbetskopia"
-#: svn/main.c:233
+#: svn/main.c:202
+msgid ""
+"set revision property ARG in new revision\n"
+" using the name=value format"
+msgstr ""
+
+#: svn/main.c:244
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -6039,7 +6150,7 @@
"läggas till i arkivet. De kommer att läggas till vid nästa arkivering.\n"
"användning: add PATH...\n"
-#: svn/main.c:241
+#: svn/main.c:252
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -6054,7 +6165,7 @@
"\n"
"Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
-#: svn/main.c:251
+#: svn/main.c:262
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -6067,14 +6178,14 @@
"\n"
"Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
-#: svn/main.c:259
+#: svn/main.c:270
msgid ""
"Associate (or deassociate) local paths with changelist CLNAME.\n"
"usage: 1. changelist CLNAME TARGET...\n"
-" 2. changelist --clear TARGET...\n"
+" 2. changelist --remove TARGET...\n"
msgstr ""
-#: svn/main.c:265
+#: svn/main.c:277
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6121,7 +6232,7 @@
" ändringar i arbetskopian. Samtliga egenskaper i arkivet läggs till för\n"
" sökvägar som är i vägen.\n"
-#: svn/main.c:290
+#: svn/main.c:302
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6131,7 +6242,7 @@
"avbrutna operationer återupptas o.s.v.\n"
"användning: cleanup [SÖKVÄG...]\n"
-#: svn/main.c:297
+#: svn/main.c:309
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6149,7 +6260,7 @@
" Om något mål är låst (eller innehåller låsta objekt), kommer dessa att\n"
" låsas upp efter en lyckad arkivering.\n"
-#: svn/main.c:305
+#: svn/main.c:317
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6168,7 +6279,7 @@
" Om något mål är låst (eller innehåller låsta objekt), kommer dessa att\n"
" låsas upp efter en lyckad arkivering.\n"
-#: svn/main.c:320
+#: svn/main.c:332
#, fuzzy
msgid ""
"Duplicate something in working copy or repository, remembering history.\n"
@@ -6195,7 +6306,7 @@
" URL -> URL: kopiering på servern; används för att förgrena och skapa\n"
" märken\n"
-#: svn/main.c:336
+#: svn/main.c:348
#, fuzzy
msgid ""
"Remove files and directories from version control.\n"
@@ -6225,7 +6336,7 @@
" 2. Varje objekt som anges med en URL raderas från arkivet genom en\n"
" omedelbar arkivering.\n"
-#: svn/main.c:354
+#: svn/main.c:366
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -6281,7 +6392,7 @@
"\n"
" Använd endast \"svn diff\" för att se lokala ändringar i en arbetskopia.\n"
-#: svn/main.c:384
+#: svn/main.c:396
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6319,7 +6430,7 @@
"\n"
" Om FIXREV är angiven, anger den i vilken revision målet först letas upp.\n"
-#: svn/main.c:407
+#: svn/main.c:419
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -6327,7 +6438,7 @@
"Visa hur detta program eller dess underkommandon används.\n"
"användning: help [UNDERKOMMANDO...]\n"
-#: svn/main.c:413
+#: svn/main.c:425
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -6347,7 +6458,7 @@
" i arkivet.\n"
" Om SÖKVÄG är en katalog, läggs katalogens innehåll till direkt under URL.\n"
-#: svn/main.c:426
+#: svn/main.c:438
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -6363,7 +6474,7 @@
" MÅL kan antingen vara en arbertskopia eller en URL. Om REV anges, avgör\n"
" den i vilken revision målet letas upp.\n"
-#: svn/main.c:436
+#: svn/main.c:449
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -6403,7 +6514,7 @@
" Storlek (i byte)\n"
" Datum och tid för senaste arkiveringen\n"
-#: svn/main.c:458
+#: svn/main.c:471
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -6419,15 +6530,15 @@
"eller\n"
" arbetskopia.\n"
-#: svn/main.c:466
+#: svn/main.c:479
msgid "read lock comment from file ARG"
msgstr "läs låskommentar från filen ARG"
-#: svn/main.c:467
+#: svn/main.c:480
msgid "specify lock comment ARG"
msgstr "ange låskommentar ARG"
-#: svn/main.c:470
+#: svn/main.c:483
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -6483,7 +6594,7 @@
" svn log http://www.example.com/repo/project/foo.c\n"
" svn log http://www.example.com/repo/project foo.c bar.c\n"
-#: svn/main.c:500
+#: svn/main.c:513
msgid ""
"Apply the differences between two sources to a working copy path.\n"
"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -6538,7 +6649,7 @@
" källorna har ett gemensamt basnamn som matchar en fil i \".\";\n"
" i så fall införs skillnaderna i den filen.\n"
-#: svn/main.c:529
+#: svn/main.c:543
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -6568,7 +6679,7 @@
"\n"
" I båda fallen måste katalogerna ovanför de angivna redan finnas.\n"
-#: svn/main.c:546
+#: svn/main.c:560
#, fuzzy
msgid ""
"Move and/or rename something in working copy or repository.\n"
@@ -6600,7 +6711,7 @@
" AK -> AK: flytta och schemalägg för tillägg (med historik)\n"
" URL -> URL: namnbyte på servern\n"
-#: svn/main.c:563
+#: svn/main.c:577
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6619,7 +6730,7 @@
" arkivet.\n"
" MÅL används endast för att avgöra vilket arkiv som ska användas.\n"
-#: svn/main.c:575
+#: svn/main.c:589
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME TARGET...\n"
@@ -6638,7 +6749,7 @@
" arkivet.\n"
" MÅL används endast för att avgöra vilket arkiv som ska användas.\n"
-#: svn/main.c:588
+#: svn/main.c:602
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6674,7 +6785,7 @@
"binära\n"
" egenskaper skickas till en fil).\n"
-#: svn/main.c:607
+#: svn/main.c:621
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6697,7 +6808,7 @@
" ett arkiv.\n"
" MÅL används endast för att avgöra vilket arkiv som ska användas.\n"
-#: svn/main.c:619
+#: svn/main.c:633
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -6793,11 +6904,11 @@
"egenskaperna\n"
" på de av katalogens barn som är filer.\n"
-#: svn/main.c:661
+#: svn/main.c:675
msgid "read property value from file ARG"
msgstr "läs egenskapsvärde från filen ARG"
-#: svn/main.c:664
+#: svn/main.c:678
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -6814,7 +6925,7 @@
" konfliktmarkörer; det tar endast bort filerna som skapades då konflikten\n"
" uppstod och gör så att det går att arkivera SÖKVÄG igen.\n"
-#: svn/main.c:673
+#: svn/main.c:688
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -6828,7 +6939,7 @@
" Anmärkning: Detta underkommando kräver ingen nätverksåtkomst och\n"
" löser konflikttillstånd. Dock återställs inte borttagna kataloger.\n"
-#: svn/main.c:682
+#: svn/main.c:697
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -6980,7 +7091,7 @@
" 965 687 joe wc/zig.c\n"
" Status gentemot revision: 981\n"
-#: svn/main.c:758
+#: svn/main.c:773
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL [PATH]\n"
@@ -7035,7 +7146,7 @@
" ändringar i arbetskopian. Samtliga egenskaper i arkivet läggs till för\n"
" sökvägar som är i vägen.\n"
-#: svn/main.c:785
+#: svn/main.c:801
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -7047,7 +7158,7 @@
"\n"
"Använd --force för att \"bryta upp\" ett låset.\n"
-#: svn/main.c:793
+#: svn/main.c:809
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -7119,19 +7230,24 @@
" sökvägar som är i vägen. Sökvägar som är i vägen rapporteras i första\n"
" kolumnen med ett \"E\".\n"
-#: svn/main.c:869 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
+#: svn/main.c:885 svnadmin/main.c:78 svnlook/main.c:289 svnsync/main.c:180
msgid "Caught signal"
msgstr "Fångade signal"
-#: svn/main.c:981
+#: svn/main.c:904
+#, fuzzy
+msgid "Revision property pair is empty"
+msgstr "Revisionsposten är ej en lista"
+
+#: svn/main.c:1034
msgid "Non-numeric limit argument given"
msgstr "Argumentet till limit-flaggan är inget tal"
-#: svn/main.c:987
+#: svn/main.c:1040
msgid "Argument to --limit must be positive"
msgstr "Argumentet till --limit måste vara positivt"
-#: svn/main.c:1007
+#: svn/main.c:1060
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
@@ -7139,19 +7255,19 @@
"Flera revisionsargument påträffades; -c kan inte anges flera gåner; -c och -"
"r kan inte användas samtidigt"
-#: svn/main.c:1015 svn/main.c:1206
+#: svn/main.c:1068 svn/main.c:1290
msgid "Can't specify -c with --old"
msgstr "Kan inte ange -c med --old"
-#: svn/main.c:1022
+#: svn/main.c:1075
msgid "Non-numeric change argument given to -c"
msgstr "Argumentet till -c-flaggan är inget tal"
-#: svn/main.c:1028
+#: svn/main.c:1081
msgid "There is no change 0"
msgstr "ändring 0 finns inte"
-#: svn/main.c:1055
+#: svn/main.c:1108
msgid ""
"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
"N:M' instead of '-r N -r M'"
@@ -7159,32 +7275,42 @@
"Flera revisionsargument påträffades; -r och -c kan inte anges samtidigt, "
"eller försök med \"-r M:N\" istället för \"-r M -r N\""
-#: svn/main.c:1068 svnadmin/main.c:1314
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Syntaxfel i revisionsargumentet \"%s\""
-#: svn/main.c:1222 svn/main.c:1232
+#: svn/main.c:1194
+#, c-format
+msgid "Error converting depth from locale to UTF8"
+msgstr ""
+
+#: svn/main.c:1214
+#, fuzzy, c-format
+msgid "'%s' is not a valid depth; try 0, 1, or 2"
+msgstr "\"%s\" är inget giltigt namn på en Subversion-egenskap"
+
+#: svn/main.c:1306 svn/main.c:1316
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props och --no-auto-props kan inte användas samtidigt"
-#: svn/main.c:1248
+#: svn/main.c:1332
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Syntaxfel i native-eol-argumentet \"%s\""
-#: svn/main.c:1324 svndumpfilter/main.c:1207 svnlook/main.c:2048
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "Argument för underkommando krävs\n"
-#: svn/main.c:1343 svnadmin/main.c:1443 svndumpfilter/main.c:1226
-#: svnlook/main.c:2067
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
+#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "Okänt kommando: \"%s\"\n"
-#: svn/main.c:1376
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7193,38 +7319,38 @@
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svn help %s\" för användning.\n"
-#: svn/main.c:1413
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr ""
"Filen med loggmeddelandet är versionshanterad; använd --force-log för att "
"kringgå"
-#: svn/main.c:1420
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr ""
"Filen med låskommentaren är versionshanterad; använd --force-log för att "
"kringgå"
-#: svn/main.c:1440
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
msgstr ""
"Loggmeddelandet är en sökväg (avsågs -F?); använd --force-log för att kringgå"
-#: svn/main.c:1447
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
msgstr ""
"Låskommentaren är en sökväg (avsågs -F?); använd --force-log för att kringgå"
-#: svn/main.c:1570
+#: svn/main.c:1668
#, fuzzy
msgid "Try 'svn help' for more info"
msgstr "Skriv \"%s help\" för användning.\n"
-#: svn/main.c:1580
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -7246,7 +7372,7 @@
"En källa för sammanslagning (merge) som är en arbetskopia kräver att en "
"revision anges"
-#: svn/mkdir-cmd.c:84
+#: svn/mkdir-cmd.c:87
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "Försök med \"svn add\" eller \"svn add --non-recursive\" istället?"
@@ -7415,13 +7541,13 @@
#: svn/notify.c:394
#, fuzzy, c-format
-msgid "Path '%s' is now part of changelist '%s'.\n"
+msgid "Path '%s' is now a member of changelist '%s'.\n"
msgstr "Sökvägen \"%s\" är inte en fil"
-#: svn/notify.c:401
-#, c-format
-msgid "Path '%s' is no longer associated with a changelist.\n"
-msgstr ""
+#: svn/notify.c:402
+#, fuzzy, c-format
+msgid "Path '%s' is no longer a member of a changelist.\n"
+msgstr "Sökvägen \"%s\" är inte en fil"
#: svn/propdel-cmd.c:77
#, c-format
@@ -7433,12 +7559,12 @@
msgid "Cannot specify revision for deleting versioned property '%s'"
msgstr "Revision kan ej anges vid radering av versionshanterad egenskap \"%s\""
-#: svn/propdel-cmd.c:116
+#: svn/propdel-cmd.c:124
#, c-format
msgid "property '%s' deleted (recursively) from '%s'.\n"
msgstr "egenskapen \"%s\" raderades (rekursivt) från \"%s\".\n"
-#: svn/propdel-cmd.c:117
+#: svn/propdel-cmd.c:125
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "egenskapen \"%s\" raderades från \"%s\".\n"
@@ -7448,7 +7574,7 @@
msgid "'%s' is not a valid Subversion property name"
msgstr "\"%s\" är inget giltigt namn på en Subversion-egenskap"
-#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:241 svn/propset-cmd.c:85
+#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:243 svn/propset-cmd.c:85
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr "Felaktig kodningsflagga: egenskapsvärdet lagras ej som UTF8"
@@ -7468,36 +7594,36 @@
msgstr ""
"Revision kan ej anges vid editering av versionshanterad egenskap \"%s\""
-#: svn/propedit-cmd.c:154 svn/propset-cmd.c:158
+#: svn/propedit-cmd.c:154 svn/propset-cmd.c:161
msgid "Explicit target argument required"
msgstr "Explicit argument för mål krävs"
-#: svn/propedit-cmd.c:211 svn/switch-cmd.c:140
+#: svn/propedit-cmd.c:213 svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "\"%s\" verkar inte vara en sökväg till en arbetskopia"
-#: svn/propedit-cmd.c:264
+#: svn/propedit-cmd.c:268
#, c-format
msgid "Set new value for property '%s' on '%s'\n"
msgstr "Satte nytt värde på egenskapen \"%s\" för \"%s\"\n"
-#: svn/propedit-cmd.c:274
+#: svn/propedit-cmd.c:278
#, c-format
msgid "No changes to property '%s' on '%s'\n"
msgstr "Egenskapen \"%s\" för \"%s\" ändrades ej\n"
-#: svn/proplist-cmd.c:71
-#, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "Ej versionshanterade egenskaper på revision %ld:\n"
-
-#: svn/proplist-cmd.c:119
+#: svn/proplist-cmd.c:95
#, c-format
msgid "Properties on '%s':\n"
msgstr "Egenskaper på \"%s\":\n"
-#: svn/props.c:51
+#: svn/proplist-cmd.c:156
+#, c-format
+msgid "Unversioned properties on revision %ld:\n"
+msgstr "Ej versionshanterade egenskaper på revision %ld:\n"
+
+#: svn/props.c:53
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
@@ -7505,11 +7631,11 @@
"Revision måste anges som ett tal, datum eller som \"HEAD\" vid arbete med "
"revisionsegenskaper"
-#: svn/props.c:58
+#: svn/props.c:60
msgid "Wrong number of targets specified"
msgstr "Fel antal mål"
-#: svn/props.c:67
+#: svn/props.c:69
msgid "Either a URL or versioned item is required"
msgstr "En URL eller ett versionshanterat objekt krävs"
@@ -7523,26 +7649,26 @@
msgid "Cannot specify revision for setting versioned property '%s'"
msgstr "Revision kan ej anges vid ändring av versionshanterad egenskap \"%s\""
-#: svn/propset-cmd.c:151
+#: svn/propset-cmd.c:154
#, c-format
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr "Mål måste anges (\"%s\" tolkas som egenskapsvärde)"
-#: svn/propset-cmd.c:184
+#: svn/propset-cmd.c:191
#, c-format
msgid "property '%s' set (recursively) on '%s'\n"
msgstr "satte egenskapen \"%s\" (rekursivt) på \"%s\"\n"
-#: svn/propset-cmd.c:185
+#: svn/propset-cmd.c:192
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "satte egenskapen \"%s\" på \"%s\"\n"
-#: svn/revert-cmd.c:86
+#: svn/revert-cmd.c:93
msgid "Try 'svn revert --recursive' instead?"
msgstr "Försök med \"svn revert --recursive\" istället?"
-#: svn/status-cmd.c:317
+#: svn/status-cmd.c:298
#, c-format
msgid ""
"\n"
@@ -7561,7 +7687,7 @@
msgid "'%s' to '%s' is not a valid relocation"
msgstr "\"%s\" till \"%s\" är ingen giltig omlokalisering"
-#: svn/util.c:60
+#: svn/util.c:61
#, c-format
msgid ""
"\n"
@@ -7570,7 +7696,7 @@
"\n"
"Arkiverade revision %ld.\n"
-#: svn/util.c:68
+#: svn/util.c:69
#, c-format
msgid ""
"\n"
@@ -7579,7 +7705,14 @@
"\n"
"Varning: %s\n"
-#: svn/util.c:136
+#: svn/util.c:145
+msgid ""
+"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
+"time configuration option is empty or consists solely of whitespace. "
+"Expected a shell command."
+msgstr ""
+
+#: svn/util.c:152
msgid ""
"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
"no 'editor-cmd' run-time configuration option was found"
@@ -7587,53 +7720,53 @@
"Ingen av miljövariablerna SVN_EDITOR, VISUAL eller EDITOR är satt och ingen "
"editor-cmd-inställning hittades"
-#: svn/util.c:162
+#: svn/util.c:178
#, c-format
msgid "Can't get working directory"
msgstr "Kan inte erhålla aktuell katalog"
-#: svn/util.c:173 svn/util.c:196
+#: svn/util.c:189 svn/util.c:212
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "Kan inte byta aktuell katalog till \"%s\""
-#: svn/util.c:221
+#: svn/util.c:237
#, c-format
msgid "Can't write to '%s'"
msgstr "Kan inte skriva till \"%s\""
-#: svn/util.c:266
+#: svn/util.c:282
#, c-format
msgid "system('%s') returned %d"
msgstr "system(\"%s\") returnerade %d"
-#: svn/util.c:307
+#: svn/util.c:323
msgid "Error normalizing edited contents to internal format"
msgstr ""
"Fel vid normalisering av det redigerade innehållet till det interna formatet"
-#: svn/util.c:338
+#: svn/util.c:354
#, c-format
msgid "Can't restore working directory"
msgstr "Kan inte återställa aktuell katalog"
-#: svn/util.c:380
+#: svn/util.c:396
msgid "Log message contains a zero byte"
msgstr "Loggmeddelandet innehåller en noll-byte"
-#: svn/util.c:440
+#: svn/util.c:456
msgid "Your commit message was left in a temporary file:"
msgstr "Ditt loggmeddelande lämnades i en temporär fil:"
-#: svn/util.c:492
+#: svn/util.c:508
msgid "--This line, and those below, will be ignored--"
msgstr "--Denna och nedanstående rader kommer inte med i loggmeddelandet--"
-#: svn/util.c:517
+#: svn/util.c:533
msgid "Error normalizing log message to internal format"
msgstr "Fel vid normalisering av loggmeddelande till det interna formatet"
-#: svn/util.c:532
+#: svn/util.c:548
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
@@ -7641,12 +7774,12 @@
"Användning av en extern editor för att erhålla et loggmeddelande stöds ej på "
"OS400; använd en av flaggorna --message (-m) eller --file (-F)"
-#: svn/util.c:618
+#: svn/util.c:634
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr ""
"Kan inte köra editorn för att erhålla loggmeddelande i icke-interaktivt läge"
-#: svn/util.c:631
+#: svn/util.c:647
msgid ""
"Could not use external editor to fetch log message; consider setting the "
"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
@@ -7656,7 +7789,7 @@
"sätt miljövariabeln $SVN_EDITOR eller använd en av flaggorna --message (-m) "
"eller --file (-F)"
-#: svn/util.c:667
+#: svn/util.c:683
msgid ""
"\n"
"Log message unchanged or not specified\n"
@@ -7666,7 +7799,7 @@
"Loggmeddelandet oförändrat eller inte angivet\n"
"avbryt (a), fortsätt (c), editera (e)\n"
-#: svn/util.c:720
+#: svn/util.c:736
msgid "Use --force to override this restriction"
msgstr "Använd --force för att komma runt denna begränsning"
@@ -7924,12 +8057,13 @@
"Visa namnen på alla transaktioner som inte är införda.\n"
#: svnadmin/main.c:381
+#, fuzzy
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
-"Run the Berkeley DB recovery procedure on a repository. Do\n"
-"this if you've been getting errors indicating that recovery\n"
-"ought to be run. Recovery requires exclusive access and will\n"
+"Run the recovery procedure on a repository. Do this if you've\n"
+"been getting errors indicating that recovery ought to be run.\n"
+"Berkeley DB recovery requires exclusive access and will\n"
"exit if the repository is in use by another process.\n"
msgstr ""
"användning: svnadmin recover ARKIV_SÖKVÄG\n"
@@ -8058,7 +8192,7 @@
"\n"
"Tillgängliga underkommandon:\n"
-#: svnadmin/main.c:698 svnlook/main.c:1674 svnserve/main.c:204
+#: svnadmin/main.c:698 svnlook/main.c:1687 svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -8075,7 +8209,7 @@
"Arkivlåset har erhållits.\n"
"Vänta; det kan ta tid att återskapa arkivet...\n"
-#: svnadmin/main.c:810
+#: svnadmin/main.c:811
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -8084,12 +8218,12 @@
"process,\n"
"såsom httpd, svnserve eller svn har det öppet?"
-#: svnadmin/main.c:815
+#: svnadmin/main.c:816
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr "Väntar på arkivlås; kanske någon anna process har arkivet öppen?\n"
-#: svnadmin/main.c:822
+#: svnadmin/main.c:824
#, c-format
msgid ""
"\n"
@@ -8098,57 +8232,57 @@
"\n"
"Återskapande klart.\n"
-#: svnadmin/main.c:829
+#: svnadmin/main.c:831
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "Den senaste revisionen i arkivet är %ld.\n"
-#: svnadmin/main.c:939
+#: svnadmin/main.c:941
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "Transaktionen \"%s\" borttagen.\n"
-#: svnadmin/main.c:1007 svnadmin/main.c:1034
+#: svnadmin/main.c:1009 svnadmin/main.c:1036
#, c-format
msgid "Missing revision"
msgstr "Revision saknas"
-#: svnadmin/main.c:1010 svnadmin/main.c:1037
+#: svnadmin/main.c:1012 svnadmin/main.c:1039
#, c-format
msgid "Only one revision allowed"
msgstr "Endast en revision tillåts"
-#: svnadmin/main.c:1016
+#: svnadmin/main.c:1018
#, c-format
msgid "Exactly one property name and one file argument required"
msgstr "Det krävs exakt ett revisionsnamn och ett filargument"
-#: svnadmin/main.c:1043
+#: svnadmin/main.c:1045
#, c-format
msgid "Exactly one file argument required"
msgstr "Det krävs exakt ett filargument"
-#: svnadmin/main.c:1117 svnlook/main.c:1739
+#: svnadmin/main.c:1119 svnlook/main.c:1752
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID-identifierare: %s\n"
-#: svnadmin/main.c:1118 svnlook/main.c:1740
+#: svnadmin/main.c:1120 svnlook/main.c:1753
#, c-format
msgid "Owner: %s\n"
msgstr "Ägare: %s\n"
-#: svnadmin/main.c:1119 svnlook/main.c:1741
+#: svnadmin/main.c:1121 svnlook/main.c:1754
#, c-format
msgid "Created: %s\n"
msgstr "Skapat: %s\n"
-#: svnadmin/main.c:1120 svnlook/main.c:1742
+#: svnadmin/main.c:1122 svnlook/main.c:1755
#, c-format
msgid "Expires: %s\n"
msgstr "Går ut: %s\n"
-#: svnadmin/main.c:1122
+#: svnadmin/main.c:1124
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8159,7 +8293,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1123
+#: svnadmin/main.c:1125
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8170,38 +8304,38 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1180
+#: svnadmin/main.c:1182
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "Sökvägen \"%s\" är inte låst.\n"
-#: svnadmin/main.c:1192
+#: svnadmin/main.c:1194
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "Tog bort lås på \"%s\".\n"
-#: svnadmin/main.c:1300
+#: svnadmin/main.c:1303
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr ""
"Flera revisionsargument påträffades; försök med \"-r M:N\" istället för \"-r "
"M -r N\""
-#: svnadmin/main.c:1425
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "argument för underkommando krävs\n"
-#: svnadmin/main.c:1510
-#, c-format
+#: svnadmin/main.c:1502
+#, fuzzy, c-format
msgid ""
-"subcommand '%s' doesn't accept option '%s'\n"
+"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnadmin help %s' for usage.\n"
msgstr ""
"underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnadmin help %s\" för användning.\n"
-#: svnadmin/main.c:1543
+#: svnadmin/main.c:1535
#, fuzzy
msgid "Try 'svnadmin help' for more info"
msgstr "Skriv \"svnversion --help\" för användning.\n"
@@ -8355,43 +8489,47 @@
msgid "Try 'svndumpfilter help' for more info"
msgstr ""
-#: svnlook/main.c:99
-msgid "specify revision number ARG"
-msgstr "ange revisionsnummer ARG"
-
-#: svnlook/main.c:102
-msgid "specify transaction name ARG"
-msgstr "ange transaktionsnamn ARG"
-
-#: svnlook/main.c:105
-msgid "be verbose"
-msgstr "var utförlig"
-
-#: svnlook/main.c:108
-msgid "show node revision ids for each path"
-msgstr "visa nodrevisions-ID:n för varje sökväg"
-
-#: svnlook/main.c:114
-msgid "do not print differences for added files"
-msgstr "visa inte skillnader för tillagda filer"
-
-#: svnlook/main.c:117
-msgid "print differences against the copy source"
-msgstr "visa skillnad gentemot kopians ursprung"
-
-#: svnlook/main.c:120
-msgid "operate on a revision property (use with -r or -t)"
-msgstr "arbeta med en revisionsegenskap (används med -r eller -t)"
-
-#: svnlook/main.c:123
-msgid "show full paths instead of indenting them"
-msgstr "visa fullständiga sökvägar istället för indrag"
-
-#: svnlook/main.c:126
+#: svnlook/main.c:93
msgid "show details for copies"
msgstr "visa detaljer för kopior"
-#: svnlook/main.c:138
+#: svnlook/main.c:96
+msgid "print differences against the copy source"
+msgstr "visa skillnad gentemot kopians ursprung"
+
+#: svnlook/main.c:99
+msgid "show full paths instead of indenting them"
+msgstr "visa fullständiga sökvägar istället för indrag"
+
+#: svnlook/main.c:105
+msgid "do not print differences for added files"
+msgstr "visa inte skillnader för tillagda filer"
+
+#: svnlook/main.c:111
+msgid "operate on single directory only"
+msgstr "arbeta endast med en katalog"
+
+#: svnlook/main.c:114
+msgid "specify revision number ARG"
+msgstr "ange revisionsnummer ARG"
+
+#: svnlook/main.c:117
+msgid "operate on a revision property (use with -r or -t)"
+msgstr "arbeta med en revisionsegenskap (används med -r eller -t)"
+
+#: svnlook/main.c:120
+msgid "show node revision ids for each path"
+msgstr "visa nodrevisions-ID:n för varje sökväg"
+
+#: svnlook/main.c:123
+msgid "specify transaction name ARG"
+msgstr "ange transaktionsnamn ARG"
+
+#: svnlook/main.c:126
+msgid "be verbose"
+msgstr "var utförlig"
+
+#: svnlook/main.c:141
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -8401,7 +8539,7 @@
"\n"
"Visa författaren.\n"
-#: svnlook/main.c:143
+#: svnlook/main.c:146
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -8411,7 +8549,7 @@
"\n"
"Visa innehållet i en fil. Inledande \"/\" är valfritt för FIL_SÖKVÄG.\n"
-#: svnlook/main.c:148
+#: svnlook/main.c:151
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -8421,7 +8559,7 @@
"\n"
"Visa vilka sökvägar som har ändrats.\n"
-#: svnlook/main.c:153
+#: svnlook/main.c:156
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -8431,7 +8569,7 @@
"\n"
"Visa datumstämpel.\n"
-#: svnlook/main.c:158
+#: svnlook/main.c:161
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -8441,7 +8579,7 @@
"\n"
"Visa diffar i GNU-stil för ändrade filer och egenskaper.\n"
-#: svnlook/main.c:164
+#: svnlook/main.c:167
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -8453,7 +8591,7 @@
"Visa kataloger som själva har ändrats (egenskapsändringar) eller vars\n"
"barnfiler har ändrats.\n"
-#: svnlook/main.c:170
+#: svnlook/main.c:173
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -8463,7 +8601,7 @@
"\n"
"Beskriv användningen av detta program eller dess underkommandon.\n"
-#: svnlook/main.c:175
+#: svnlook/main.c:178
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8475,7 +8613,7 @@
"Visa information om historiken för en sökväg i arkivet (eller rotkatalogen\n"
"om ingen sökväg anges).\n"
-#: svnlook/main.c:181
+#: svnlook/main.c:184
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -8486,7 +8624,7 @@
"Visa författaren, datumstämpeln, loggmeddelandets storlek samt\n"
"själva loggmeddelandet.\n"
-#: svnlook/main.c:186
+#: svnlook/main.c:189
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -8496,7 +8634,7 @@
"\n"
"Om ett lås finns på en sökväg i arkivet, visa information om det.\n"
-#: svnlook/main.c:191
+#: svnlook/main.c:194
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -8506,7 +8644,7 @@
"\n"
"Visa loggmeddelandet.\n"
-#: svnlook/main.c:196
+#: svnlook/main.c:199
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -8519,7 +8657,7 @@
"Skriv ut det råa värdet för en egenskap på en sökväg i arkivet.\n"
"Om --revprop används, skriv ut det råa värdet på en revisionsegenskap.\n"
-#: svnlook/main.c:202
+#: svnlook/main.c:205
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8532,7 +8670,7 @@
"Lista egenskaperna för en sökväg i arkivet eller, om --revprop anges,\n"
"visa revisionsegenskaper. -v visar även egenskapernas värden.\n"
-#: svnlook/main.c:209
+#: svnlook/main.c:212
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8545,7 +8683,7 @@
"trädets\n"
"rot). Visa även nodrevisions-ID:n om så önskas.\n"
-#: svnlook/main.c:215
+#: svnlook/main.c:218
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -8555,7 +8693,7 @@
"\n"
"Visa arkivets UUID.\n"
-#: svnlook/main.c:220
+#: svnlook/main.c:223
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -8565,52 +8703,52 @@
"\n"
"Visa det yngsta revisionsnumret.\n"
-#: svnlook/main.c:815
+#: svnlook/main.c:819
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "Kopierad: %s (från revision %ld, %s)\n"
-#: svnlook/main.c:884
+#: svnlook/main.c:888
msgid "Added"
msgstr "Tillagd"
-#: svnlook/main.c:885
+#: svnlook/main.c:889
msgid "Deleted"
msgstr "Raderad"
-#: svnlook/main.c:886
+#: svnlook/main.c:890
msgid "Modified"
msgstr "Ändrad"
-#: svnlook/main.c:887
+#: svnlook/main.c:891
msgid "Index"
msgstr "Index"
-#: svnlook/main.c:899
+#: svnlook/main.c:903
#, c-format
msgid "(Binary files differ)\n"
msgstr "(Binära filer skiljer sig åt)\n"
-#: svnlook/main.c:1028
+#: svnlook/main.c:1036
msgid "unknown"
msgstr "okänd"
-#: svnlook/main.c:1171 svnlook/main.c:1264 svnlook/main.c:1293
+#: svnlook/main.c:1183 svnlook/main.c:1276 svnlook/main.c:1305
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "Transaktionen \"%s\" är inte baserad på en revision; skumt"
-#: svnlook/main.c:1201
+#: svnlook/main.c:1213
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "\"%s\" är en URL; ska troligen vara en sökväg"
-#: svnlook/main.c:1228
+#: svnlook/main.c:1240
#, c-format
msgid "Path '%s' is not a file"
msgstr "Sökvägen \"%s\" är inte en fil"
-#: svnlook/main.c:1367
+#: svnlook/main.c:1379
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -8619,7 +8757,7 @@
"REVISION SÖKVÄG <ID>\n"
"-------- -----------\n"
-#: svnlook/main.c:1372
+#: svnlook/main.c:1384
#, c-format
msgid ""
"REVISION PATH\n"
@@ -8628,27 +8766,27 @@
"REVISION SÖKVÄG\n"
"-------- ------\n"
-#: svnlook/main.c:1419
+#: svnlook/main.c:1431
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "Egenskapen \"%s\" finns inte för revision %ld"
-#: svnlook/main.c:1426
+#: svnlook/main.c:1438
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "Egenskapen \"%s\" finns inte på sökvägen \"%s\" i revision %ld"
-#: svnlook/main.c:1431
+#: svnlook/main.c:1443
#, fuzzy, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "Egenskapen \"%s\" finns inte på sökvägen \"%s\" i revision %ld"
-#: svnlook/main.c:1603 svnlook/main.c:1818
+#: svnlook/main.c:1616 svnlook/main.c:1831
#, c-format
msgid "Missing repository path argument"
msgstr "Arkivargument saknas"
-#: svnlook/main.c:1664
+#: svnlook/main.c:1677
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -8670,11 +8808,11 @@
"\n"
"Tillgängliga underkommandon:\n"
-#: svnlook/main.c:1720
+#: svnlook/main.c:1733
msgid "Missing path argument"
msgstr "Sökvägsargument saknas"
-#: svnlook/main.c:1745
+#: svnlook/main.c:1758
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8683,7 +8821,7 @@
"Kommentarommentar (%i rader):\n"
"%s\n"
-#: svnlook/main.c:1746
+#: svnlook/main.c:1759
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8692,40 +8830,40 @@
"Kommentar (%i rad):\n"
"%s\n"
-#: svnlook/main.c:1792
+#: svnlook/main.c:1805
#, c-format
msgid "Missing propname argument"
msgstr "Egenskapsargument saknas"
-#: svnlook/main.c:1793
+#: svnlook/main.c:1806
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "Egenskapsnamns- och arkivsökvägsargument saknas"
-#: svnlook/main.c:1799
+#: svnlook/main.c:1812
msgid "Missing propname or repository path argument"
msgstr "Egenskapsnamns- eller arkivsökvägsargument saknas"
-#: svnlook/main.c:1957
+#: svnlook/main.c:1971
msgid "Invalid revision number supplied"
msgstr "Ogiltigt revisionsnummer angivet"
-#: svnlook/main.c:2018
+#: svnlook/main.c:2036
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr "Flaggorna --transaction och --revision kan inte anges samtidigt"
-#: svnlook/main.c:2100
+#: svnlook/main.c:2118
#, c-format
msgid "Repository argument required\n"
msgstr "Arkivargument krävs\n"
-#: svnlook/main.c:2109
+#: svnlook/main.c:2127
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "\"%s\" är en URL när den skulle vara en sökväg\n"
-#: svnlook/main.c:2160
+#: svnlook/main.c:2178
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8734,78 +8872,99 @@
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnlook help %s\" för användning.\n"
-#: svnlook/main.c:2203
+#: svnlook/main.c:2221
msgid "Try 'svnlook help' for more info"
msgstr ""
-#: svnserve/main.c:141
+#: svnserve/cyrus_auth.c:243
+#, c-format
+msgid "Can't get hostname"
+msgstr "Kan inte erhålla värdnamn"
+
+#: svnserve/cyrus_auth.c:311
+msgid "Could not obtain the list of SASL mechanisms"
+msgstr "Kunde inte erhålla listan med SASL-mekanismer"
+
+#: svnserve/cyrus_auth.c:351
+msgid "Couldn't obtain the authenticated username"
+msgstr "Kan inte erhålla autenticerat användarnamn"
+
+#: svnserve/main.c:142
msgid "daemon mode"
msgstr "daemon-läge"
-#: svnserve/main.c:143
+#: svnserve/main.c:144
msgid "listen port (for daemon mode)"
msgstr "lyssningsport (för daemon-läge)"
-#: svnserve/main.c:145
+#: svnserve/main.c:146
msgid "listen hostname or IP address (for daemon mode)"
msgstr ""
"värdnamn eller IP-address att lyssna på\n"
" (daemon-läge)"
-#: svnserve/main.c:147
+#: svnserve/main.c:148
msgid "run in foreground (useful for debugging)"
msgstr "kör i förgrunden (användbart för felsökning)"
-#: svnserve/main.c:148 svnversion/main.c:123
+#: svnserve/main.c:149 svnversion/main.c:123
msgid "display this help"
msgstr "visa denna hjälp"
-#: svnserve/main.c:151
+#: svnserve/main.c:152
msgid "inetd mode"
msgstr "inetd-läge"
-#: svnserve/main.c:152
+#: svnserve/main.c:153
msgid "root of directory to serve"
msgstr "serverns rotkatalog"
-#: svnserve/main.c:154
+#: svnserve/main.c:155
msgid "force read only, overriding repository config file"
msgstr ""
"tillåt endast läsning; överskuggar värdet i\n"
" arkivets konfigurationsfil"
-#: svnserve/main.c:155
+#: svnserve/main.c:156
msgid "tunnel mode"
msgstr "tunnel-läge"
-#: svnserve/main.c:157
+#: svnserve/main.c:158
msgid "tunnel username (default is current uid's name)"
msgstr ""
"användarnamn för tunnel (standard är aktuell\n"
" användares namn)"
-#: svnserve/main.c:159
+#: svnserve/main.c:160
msgid "use threads instead of fork"
msgstr "använd trådar istället för att skapa nya processer"
-#: svnserve/main.c:161
+#: svnserve/main.c:162
msgid "listen once (useful for debugging)"
msgstr "lyssna en gång (användbart för felsökning)"
-#: svnserve/main.c:163
-msgid "write server process ID to file arg"
-msgstr "skriv serverns process-ID till filen arg"
+#: svnserve/main.c:164
+#, fuzzy
+msgid "read configuration from file ARG"
+msgstr ""
+"läs användarens konfigurationsfiler från katalogen\n"
+" ARG"
#: svnserve/main.c:166
+#, fuzzy
+msgid "write server process ID to file ARG"
+msgstr "skriv serverns process-ID till filen arg"
+
+#: svnserve/main.c:169
msgid "run as a windows service (SCM only)"
msgstr "kör som en Windows-tjänst (enacst från SCM)"
-#: svnserve/main.c:178
+#: svnserve/main.c:181
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Skriv \"%s --help\" för användning.\n"
-#: svnserve/main.c:187
+#: svnserve/main.c:190
msgid ""
"usage: svnserve [options]\n"
"\n"
@@ -8815,21 +8974,21 @@
"\n"
"Giltiga flaggor:\n"
-#: svnserve/main.c:450
+#: svnserve/main.c:444
#, fuzzy, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "Sökvägen \"%s\" finns i arbetskopian men ej i arkivet"
-#: svnserve/main.c:492
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "Du måste ange precis en av -d, -i, -t eller -X.\n"
-#: svnserve/main.c:502
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "Flaggan --tunnel-user är endast giltig i tunnel-läge.\n"
-#: svnserve/main.c:571
+#: svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
@@ -8838,53 +8997,45 @@
"svnserve: Flaggan --service är endast tillåten om processen startas av "
"tjänsthanteraren (SCM).\n"
-#: svnserve/main.c:607
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "Kan inte erhålla adressinfo"
-#: svnserve/main.c:623
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "Kan inte skapa uttag (socket) för servern"
-#: svnserve/main.c:636
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "Kan inte knyta adress till serveruttaget (socket)"
-#: svnserve/main.c:704
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "Kan inte acceptera anslutning från klient"
-#: svnserve/main.c:758
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "Kan inte skapa trådattribut"
-#: svnserve/main.c:766
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "Kan inte koppla låss tråd"
-#: svnserve/main.c:779
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "Kan inte skapa tråd"
-#: svnserve/sasl_auth.c:243
-#, c-format
-msgid "Can't get hostname"
-msgstr "Kan inte erhålla värdnamn"
-
-#: svnserve/sasl_auth.c:311
-msgid "Could not obtain the list of SASL mechanisms"
-msgstr "Kunde inte erhålla listan med SASL-mekanismer"
-
-#: svnserve/sasl_auth.c:351
-msgid "Couldn't obtain the authenticated username"
-msgstr "Kan inte erhålla autenticerat användarnamn"
+#: svnserve/serve.c:1437
+#, fuzzy
+msgid "Path is not a string"
+msgstr "Sökväg är inte en fil i en arbetskopia"
#: svnserve/winservice.c:341
#, c-format
@@ -8910,7 +9061,7 @@
"Tjänsten kunde inte starta; ett internt fel inträffade då tjänsten skulle "
"startas"
-#: svnsync/main.c:56
+#: svnsync/main.c:64
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -8927,27 +9078,36 @@
"mirror of the source repository.\n"
msgstr ""
-#: svnsync/main.c:71
+#: svnsync/main.c:79
+#, fuzzy
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
-"Transfer all pending revisions from source to destination.\n"
+"Transfer all pending revisions to the destination from the source\n"
+"with which it was initialized.\n"
msgstr ""
"användning: svnsync synchronize DEST_URL\n"
"Överför väntande revisioner från källa till destination.\n"
-#: svnsync/main.c:76
+#: svnsync/main.c:85
msgid ""
-"usage: svnsync copy-revprops DEST_URL REV\n"
+"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
-"Copy all revision properties for revision REV from source to\n"
+"Copy the revision properties in a given range of revisions to the\n"
+"destination from the source with which it was initialized.\n"
+"\n"
+"If REV and REV2 are provided, copy properties for the revisions\n"
+"specified by that range, inclusively. If only REV is provided,\n"
+"copy properties for that revision alone. If REV is not provided,\n"
+"copy properties for all revisions previously transferred to the\n"
"destination.\n"
+"\n"
+"REV and REV2 must be revisions which were previously transferred\n"
+"to the destination. You may use \"HEAD\" for either revision to\n"
+"mean \"the last revision transferred\".\n"
msgstr ""
-"användning: svnsync copy-revprops DEST_URL REV\n"
-"Kopiera alla revisionsegenskaper för revisionen REV från källan till\n"
-"destinationen.\n"
-#: svnsync/main.c:82
+#: svnsync/main.c:101
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
@@ -8957,63 +9117,91 @@
"\n"
"Visa hur detta program eller dess underkommandon används.\n"
-#: svnsync/main.c:184
+#: svnsync/main.c:115
+msgid ""
+"specify a username ARG (deprecated;\n"
+" see --source-username and --sync-username)"
+msgstr ""
+
+#: svnsync/main.c:119
+msgid ""
+"specify a password ARG (deprecated;\n"
+" see --source-password and --sync-password)"
+msgstr ""
+
+#: svnsync/main.c:123
+msgid "connect to source repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:125
+msgid "connect to source repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:127
+msgid "connect to sync repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:129
+msgid "connect to sync repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:218
#, c-format
msgid "Can't get local hostname"
msgstr "Kan inte erhålla lokalt värdnamn"
-#: svnsync/main.c:206
+#: svnsync/main.c:241
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr ""
"Kunde inte låsa destinationsarkivet; det är för närvarande låst av \"%s\"\n"
-#: svnsync/main.c:301
+#: svnsync/main.c:336
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "Sessionens rot är \"%s\", men arkivets rot är \"%s\""
-#: svnsync/main.c:368
+#: svnsync/main.c:403
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr ""
"Kopierade egenskaper för revision %ld (%s*-egenskaper hoppades över).\n"
-#: svnsync/main.c:373
+#: svnsync/main.c:408
#, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "Kopierade egenskaper för revision %ld.\n"
-#: svnsync/main.c:414
+#: svnsync/main.c:450
msgid "Cannot initialize a repository with content in it"
msgstr "Kan inte initiera ett arkiv som redan har innehåll"
-#: svnsync/main.c:425
+#: svnsync/main.c:461
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "Destinationsarkivet synkroniseras redan från \"%s\""
-#: svnsync/main.c:489 svnsync/main.c:492 svnsync/main.c:1159
-#: svnsync/main.c:1250
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "Sökvägen \"%s\" är inte en URL"
-#: svnsync/main.c:874
+#: svnsync/main.c:914
#, c-format
msgid "Committed revision %ld.\n"
msgstr "Arkiverade revision %ld.\n"
-#: svnsync/main.c:913
+#: svnsync/main.c:954
msgid "Destination repository has not been initialized"
msgstr "Destinationsarkivet har ej initierats"
-#: svnsync/main.c:928
+#: svnsync/main.c:969
#, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
msgstr "UUID:n på källarkivet (%s) matchar inte den förväntade UUID:n (%s)"
-#: svnsync/main.c:990
+#: svnsync/main.c:1032
#, c-format
msgid ""
"Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -9021,29 +9209,37 @@
"destination without using svnsync?"
msgstr ""
-#: svnsync/main.c:1028
+#: svnsync/main.c:1070
#, c-format
msgid ""
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
"committed to the destination without using svnsync?"
msgstr ""
-#: svnsync/main.c:1105
+#: svnsync/main.c:1148
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr "Arkiveringen skapade revision %ld, men den borde ha skapat %ld"
-#: svnsync/main.c:1214
-msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+#: svnsync/main.c:1275 svnsync/main.c:1280
+#, fuzzy, c-format
+msgid ""
+"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr ""
"Kan inte kopiera revisionsegenskaper för en revision som ej har "
"synkroniserats"
-#: svnsync/main.c:1253
-msgid "Invalid revision number"
+#: svnsync/main.c:1332
+#, fuzzy, c-format
+msgid "'%s' is not a valid revision range"
+msgstr "\"%s\" har ogiltig revision"
+
+#: svnsync/main.c:1346 svnsync/main.c:1366
+#, fuzzy, c-format
+msgid "Invalid revision number (%ld)"
msgstr "Ogiltigt revisionsnummer"
-#: svnsync/main.c:1289
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -9059,16 +9255,22 @@
"\n"
"Tillgängliga underkommandon:\n"
-#: svnsync/main.c:1479
-#, c-format
+#: svnsync/main.c:1581
msgid ""
-"subcommand '%s' doesn't accept option '%s'\n"
+"Cannot use --username or --password with any of --source-username, --source-"
+"password, --sync-username, or --sync-password.\n"
+msgstr ""
+
+#: svnsync/main.c:1661
+#, fuzzy, c-format
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnsync help %s' for usage.\n"
msgstr ""
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnsync help %s\" för användning.\n"
-#: svnsync/main.c:1541
+#: svnsync/main.c:1733
#, fuzzy
msgid "Try 'svnsync help' for more info"
msgstr "För få argument; försök med \"svnsync --help\" för mer information"
@@ -9145,16 +9347,71 @@
msgid "last changed rather than current revisions"
msgstr "senast ändrade istället för aktuella revisioner"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "exporterad%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "\"%s\" är varken versionshanterad eller exporterad\n"
+#~ msgid "'%s' is not under version control or doesn't exist"
+#~ msgstr "\"%s\" är inte versionshanterad eller finns inte"
+
+#~ msgid "No support for repos <--> working copy moves"
+#~ msgstr "Flytt mellan arbetskipia och arkiv stöds ej"
+
+#~ msgid "Cannot read entry for '%s'"
+#~ msgstr "Kan inte läsa post för \"%s\""
+
+#~ msgid "Lock comment has illegal characters"
+#~ msgstr "Låskommentaren innehåller ogiltiga tecken"
+
+#~ msgid "Can't find entry for '%s'"
+#~ msgstr "Kan inte hitta post för \"%s\""
+
+#, fuzzy
+#~ msgid "Can't get user name"
+#~ msgstr "Kan inte erhålla filnamn"
+
+# Don't spend time on improving this, since the code says it should never
+# happen anyway:-)
+#~ msgid "Unhandled SASL interaction"
+#~ msgstr "Ej hanterad SASL-interaktion"
+
+#~ msgid " arg"
+#~ msgstr " arg"
+
+#~ msgid "'%s' has unsupported special file type '%s'"
+#~ msgstr "\"%s\" har en specialfiltyp som inte stöds: \"%s\""
+
+#~ msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
+#~ msgstr "Felaktig kontrollsumma för \"%s\"; väntade \"%s\", fick \"%s\""
+
+#~ msgid "No entry for '%s'"
+#~ msgstr "Ingen post för \"%s\""
+
+#~ msgid "Cannot revert: '%s' is not under version control"
+#~ msgstr "Kan inte återställa: \"%s\" är inte versionshanterad"
+
+#~ msgid "Cannot copy or move '%s': it's not under version control"
+#~ msgstr "Kan inte kopiera eller flytta \"%s\": den är inte versionshanterad"
+
+#~ msgid "descend recursively"
+#~ msgstr "gå ned rekursivt"
+
+#~ msgid ""
+#~ "usage: svnsync copy-revprops DEST_URL REV\n"
+#~ "\n"
+#~ "Copy all revision properties for revision REV from source to\n"
+#~ "destination.\n"
+#~ msgstr ""
+#~ "användning: svnsync copy-revprops DEST_URL REV\n"
+#~ "Kopiera alla revisionsegenskaper för revisionen REV från källan till\n"
+#~ "destinationen.\n"
+
#~ msgid "Could not create a request (%s '%s')"
#~ msgstr "Kunde inte skapa en förfrågan (%s \"%s\")"
diff --git a/subversion/po/zh_CN.po b/subversion/po/zh_CN.po
index 7bc6f2e..e88e800 100644
--- a/subversion/po/zh_CN.po
+++ b/subversion/po/zh_CN.po
@@ -6,9 +6,9 @@
msgstr ""
"Project-Id-Version: subversion 1.5.0\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-03-31 20:46+0800\n"
-"PO-Revision-Date: 2007-03-31 20:48+0800\n"
-"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
+"POT-Creation-Date: 2007-04-06 09:21+0800\n"
+"PO-Revision-Date: 2007-04-06 09:23+0800\n"
+"Last-Translator: Dongsheng Song <dongsheng.song@gmail.com>\n"
"Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -82,10 +82,8 @@
msgid "Read error in pipe"
msgstr "管道读取错误"
-#: include/svn_error_codes.h:231
-#: libsvn_subr/cmdline.c:299
-#: libsvn_subr/cmdline.c:316
-#: svn/util.c:758
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
+#: libsvn_subr/cmdline.c:316 svn/util.c:758
#, c-format
msgid "Write error"
msgstr "写入错误"
@@ -382,8 +380,7 @@
msgid "Path is already locked"
msgstr "已经锁定路径"
-#: include/svn_error_codes.h:551
-#: include/svn_error_codes.h:688
+#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
msgid "Path is not locked"
msgstr "路径没有加锁"
@@ -527,10 +524,8 @@
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "执行WebDAV PROPPATCH失败"
-#: include/svn_error_codes.h:732
-#: include/svn_error_codes.h:773
-#: libsvn_ra_svn/marshal.c:639
-#: libsvn_ra_svn/marshal.c:747
+#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
+#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
#: libsvn_ra_svn/marshal.c:774
msgid "Malformed network data"
msgstr "非法网络数据"
@@ -543,8 +538,7 @@
msgid "Repository has been moved"
msgstr "仓库已经移动"
-#: include/svn_error_codes.h:748
-#: include/svn_error_codes.h:777
+#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
msgid "Couldn't find a repository"
msgstr "无法找到仓库"
@@ -584,8 +578,7 @@
msgid "No authentication provider available"
msgstr "没有可用的认证提供者"
-#: include/svn_error_codes.h:803
-#: include/svn_error_codes.h:807
+#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
msgid "All authentication providers exhausted"
msgstr "所有的认证提供者都不可用"
@@ -841,8 +834,7 @@
msgid "A log message was given where none was necessary"
msgstr "在不需要时给出日志信息"
-#: libsvn_client/add.c:345
-#: libsvn_wc/copy.c:188
+#: libsvn_client/add.c:345 libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "无法关闭目录“%s”"
@@ -852,8 +844,7 @@
msgid "Error during recursive add of '%s'"
msgstr "进行递归增加“%s”时出错"
-#: libsvn_client/blame.c:368
-#: libsvn_client/blame.c:838
+#: libsvn_client/blame.c:368 libsvn_client/blame.c:838
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "无法为二进制文件“%s”计算谴责信息"
@@ -866,8 +857,7 @@
msgid "Start revision must precede end revision"
msgstr "起始版本必须小于结束版本"
-#: libsvn_client/blame.c:725
-#: libsvn_client/cat.c:205
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL“%s”指向目录"
@@ -882,13 +872,11 @@
msgid "'%s' refers to a directory"
msgstr "“%s”引用一个目录"
-#: libsvn_client/cat.c:126
-#: libsvn_client/export.c:183
+#: libsvn_client/cat.c:126 libsvn_client/export.c:183
msgid "(local)"
msgstr "(本地)"
-#: libsvn_client/checkout.c:91
-#: libsvn_client/export.c:886
+#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL“%s”不存在"
@@ -921,24 +909,19 @@
msgid "New entry name required when importing a file"
msgstr "导入文件时，需要一个新的条目名称"
-#: libsvn_client/commit.c:546
-#: libsvn_wc/adm_ops.c:1016
+#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1016
#: libsvn_wc/questions.c:92
#, c-format
msgid "'%s' does not exist"
msgstr "“%s”不存在"
-#: libsvn_client/commit.c:607
-#: libsvn_client/copy.c:286
-#: svnlook/main.c:1216
+#: libsvn_client/commit.c:607 libsvn_client/copy.c:286 svnlook/main.c:1216
#, c-format
msgid "Path '%s' does not exist"
msgstr "路径“%s”不存在"
-#: libsvn_client/commit.c:741
-#: libsvn_client/copy.c:295
-#: libsvn_client/copy.c:759
-#: libsvn_client/copy.c:1025
+#: libsvn_client/commit.c:741 libsvn_client/copy.c:295
+#: libsvn_client/copy.c:759 libsvn_client/copy.c:1025
#: libsvn_client/copy.c:1417
#, c-format
msgid "Path '%s' already exists"
@@ -949,18 +932,15 @@
msgid "'%s' is a reserved name and cannot be imported"
msgstr "“%s”是保留名称，无法被导入"
-#: libsvn_client/commit.c:872
-#: libsvn_client/copy.c:909
+#: libsvn_client/commit.c:872 libsvn_client/copy.c:909
msgid "Commit failed (details follow):"
msgstr "提交失败(细节如下): "
-#: libsvn_client/commit.c:880
-#: libsvn_client/copy.c:917
+#: libsvn_client/commit.c:880 libsvn_client/copy.c:917
msgid "Commit succeeded, but other errors follow:"
msgstr "提交成功，但是发生了其它错误，细节如下: "
-#: libsvn_client/commit.c:887
-#: libsvn_client/copy.c:924
+#: libsvn_client/commit.c:887 libsvn_client/copy.c:924
msgid "Error unlocking locked dirs (details follow):"
msgstr "解除锁定目录出错(细节如下): "
@@ -968,8 +948,7 @@
msgid "Error bumping revisions post-commit (details follow):"
msgstr "执行post-commit出错 (细节如下): "
-#: libsvn_client/commit.c:909
-#: libsvn_client/copy.c:935
+#: libsvn_client/commit.c:909 libsvn_client/copy.c:935
msgid "Error in post-commit clean-up (details follow):"
msgstr "清理post-commit出错 (细节如下): "
@@ -986,8 +965,7 @@
msgid "Cannot non-recursively commit a directory deletion"
msgstr "无法以非递归提交方式删除目录"
-#: libsvn_client/commit_util.c:256
-#: libsvn_client/commit_util.c:267
+#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "“%s”有未知的条目类型"
@@ -1007,8 +985,7 @@
msgid "Did not expect '%s' to be a working copy root"
msgstr "不期望“%s”是工作副本根目录"
-#: libsvn_client/commit_util.c:419
-#: libsvn_client/commit_util.c:1052
+#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "提交项目“%s”有复制标记，但是没有源地址(copyfrom URL)"
@@ -1052,8 +1029,7 @@
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "标准属性不能设置为版本属性"
-#: libsvn_client/copy.c:305
-#: libsvn_client/copy.c:1427
+#: libsvn_client/copy.c:305 libsvn_client/copy.c:1427
#: libsvn_client/update.c:98
#, c-format
msgid "Path '%s' is not a directory"
@@ -1069,8 +1045,7 @@
msgid "Cannot move URL '%s' into itself"
msgstr "无法移动URL“%s”到本身"
-#: libsvn_client/copy.c:749
-#: libsvn_client/prop_commands.c:229
+#: libsvn_client/copy.c:749 libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "版本 %2$ld 中不存在路径“%1$s”"
@@ -1095,8 +1070,7 @@
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "“%s”的入口存在(尽管丢失了工作文件)"
-#: libsvn_client/copy.c:1546
-#: libsvn_client/log.c:87
+#: libsvn_client/copy.c:1546 libsvn_client/log.c:87
msgid "Revision type requires a working copy path, not a URL"
msgstr "版本类型需要工作目录，不是URL"
@@ -1123,8 +1097,7 @@
msgid "'%s' does not seem to have a URL associated with it"
msgstr "“%s”似乎没有关联的URL"
-#: libsvn_client/copy.c:2048
-#: svn/move-cmd.c:60
+#: libsvn_client/copy.c:2048 svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "移动操作不能指定版本"
@@ -1133,11 +1106,8 @@
msgid "'%s' is in the way of the resource actually under version control"
msgstr "“%s”阻碍资源纳入版本控制"
-#: libsvn_client/delete.c:67
-#: libsvn_wc/adm_ops.c:2781
-#: libsvn_wc/entries.c:1256
-#: libsvn_wc/entries.c:2367
-#: libsvn_wc/entries.c:2969
+#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2781 libsvn_wc/entries.c:1256
+#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2969
#: libsvn_wc/update_editor.c:2178
#, c-format
msgid "'%s' is not under version control"
@@ -1148,37 +1118,37 @@
msgid "'%s' has local modifications"
msgstr "“%s”已有本地修改"
-#: libsvn_client/diff.c:136
+#: libsvn_client/diff.c:135
#, c-format
msgid " Reverted %s:r%s%s"
msgstr " 已恢复 %s:r%s%s"
-#: libsvn_client/diff.c:154
+#: libsvn_client/diff.c:153
#, c-format
msgid " Merged %s:r%s%s"
msgstr " 已合并 %s:r%s%s"
-#: libsvn_client/diff.c:176
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%s 属性改变: %s%s"
-#: libsvn_client/diff.c:204
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "名字: %s%s"
-#: libsvn_client/diff.c:323
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t（版本 %ld）"
-#: libsvn_client/diff.c:325
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t（工作副本）"
-#: libsvn_client/diff.c:468
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "无法显示: 文件标记为二进制类型。%s"
@@ -1186,36 +1156,33 @@
#. -----------------------------------------------------------------------
#. ** Utilities. **
#. Sanity check -- ensure that we have valid revisions to look at.
-#: libsvn_client/diff.c:828
-#: libsvn_client/merge.c:61
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "没有全部提供需要的版本"
-#: libsvn_client/diff.c:843
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr "对于peg差异，必须至少有一个非本地版本"
-#: libsvn_client/diff.c:955
-#: libsvn_client/diff.c:967
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "在仓库的版本 %2$ld 中找不到“%1$s”"
-#: libsvn_client/diff.c:1026
+#: libsvn_client/diff.c:1025
msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr "抱歉，svn_client_diff4 尚不支持这种调用方式"
-#: libsvn_client/diff.c:1068
+#: libsvn_client/diff.c:1067
msgid "Only diffs between a path's text-base and its working files are supported at this time"
msgstr "当前diff只支持参考文件与其工作文件比较"
-#: libsvn_client/diff.c:1213
-#: libsvn_client/switch.c:107
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "目录“%s”没有URL"
-#: libsvn_client/diff.c:1422
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr "只有仓库和仓库才能比较差异概要"
@@ -1228,29 +1195,23 @@
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr "目的目录已存在，除非强迫为之，否则不会覆盖"
-#: libsvn_client/export.c:358
-#: libsvn_client/export.c:501
+#: libsvn_client/export.c:358 libsvn_client/export.c:501
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "“%s”已存在且不是目录"
-#: libsvn_client/export.c:362
-#: libsvn_client/export.c:505
+#: libsvn_client/export.c:362 libsvn_client/export.c:505
#, c-format
msgid "'%s' already exists"
msgstr "“%s”已存在"
-#: libsvn_client/export.c:676
-#: libsvn_wc/adm_crawler.c:1048
-#: libsvn_wc/update_editor.c:1873
-#: libsvn_wc/update_editor.c:2463
+#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "“%s”的校验和不匹配；期望: “%s”，实际: “%s”"
-#: libsvn_client/info.c:377
-#: libsvn_client/info.c:402
-#: libsvn_client/info.c:412
+#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "版本“%2$ld”不存在 URL“%1$s”"
@@ -1264,14 +1225,9 @@
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "没有找到公共父节点，不能在分离的参数上操作"
-#: libsvn_client/locking_commands.c:260
-#: libsvn_client/merge.c:2054
-#: libsvn_client/merge.c:2060
-#: libsvn_client/merge.c:2238
-#: libsvn_client/merge.c:2401
-#: libsvn_client/ra.c:375
-#: libsvn_client/ra.c:741
-#: libsvn_client/ra.c:878
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
+#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
#, c-format
msgid "'%s' has no URL"
msgstr "“%s”没有URL"
@@ -1290,8 +1246,7 @@
msgid "'%s' is not locked"
msgstr "“%s”没有被锁定"
-#: libsvn_client/locking_commands.c:406
-#: libsvn_fs/fs-loader.c:932
+#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:932
#: libsvn_ra/ra_loader.c:863
msgid "Lock comment contains illegal characters"
msgstr "锁定注释包含非法字符"
@@ -1300,8 +1255,7 @@
msgid "Missing required revision specification"
msgstr "未提供请求的版本"
-#: libsvn_client/log.c:137
-#: libsvn_client/status.c:271
+#: libsvn_client/log.c:137 libsvn_client/status.c:271
#: libsvn_client/update.c:112
#, c-format
msgid "Entry '%s' has no URL"
@@ -1316,8 +1270,7 @@
msgid "URLs have no scheme ('%s' and '%s')"
msgstr "URL中没有方案(一般需要svn://，http://，file://等开头) (“%s”与“%s”)"
-#: libsvn_client/merge.c:93
-#: libsvn_client/merge.c:99
+#: libsvn_client/merge.c:93 libsvn_client/merge.c:99
#, c-format
msgid "URL has no scheme: '%s'"
msgstr "URL中没有方案(一般需要svn://，http://，file://等开头): “%s”"
@@ -1344,13 +1297,12 @@
msgid ".merge-right.r%ld"
msgstr ".merge-right.r%ld"
-#: libsvn_client/merge.c:1156
+#: libsvn_client/merge.c:1164
#, c-format
msgid "Path '%s' is in conflict, and must be resolved before the remainder of the requested merge can be applied"
msgstr "路径 “%s” 冲突，必须在应用剩余的合并请求之前解决"
-#: libsvn_client/merge.c:1449
-#: libsvn_client/merge.c:1762
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
msgid "Use of two URLs is not compatible with merge info modification"
msgstr "使用两个 URL 不与合并信息修改兼容"
@@ -1369,8 +1321,7 @@
msgid "Revision property '%s' not allowed in this context"
msgstr "此上下文中不允许版本属性“%s”"
-#: libsvn_client/prop_commands.c:328
-#: libsvn_client/prop_commands.c:443
+#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
#, c-format
msgid "Bad property name: '%s'"
msgstr "属性名称错误: “%s”"
@@ -1394,8 +1345,7 @@
msgid "'%s' does not exist in revision %ld"
msgstr "版本 %2$ld 中没有路径“%1$s”"
-#: libsvn_client/prop_commands.c:666
-#: libsvn_client/prop_commands.c:948
+#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:948
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "“%s”是未知的节点类型"
@@ -1415,8 +1365,7 @@
msgid "Path '%s' doesn't exist in revision %ld"
msgstr "版本 %2$ld 中不存在路径“%1$s”"
-#: libsvn_client/ra.c:663
-#: libsvn_client/ra.c:826
+#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "版本 %2$ld 中无法找到“%1$s”的仓库位置"
@@ -1451,8 +1400,7 @@
msgid "Unrecognized revision type requested for '%s'"
msgstr "“%s”的请求版本类型无法识别"
-#: libsvn_client/update.c:138
-#: libsvn_wc/log.c:2573
+#: libsvn_client/update.c:138 libsvn_wc/log.c:2573
#, c-format
msgid "'%s' is not a working copy directory"
msgstr "“%s”不是工作副本目录"
@@ -1516,8 +1464,7 @@
msgid "Svndiff has invalid header"
msgstr "Svndiff 数据包含无效头"
-#: libsvn_delta/svndiff.c:688
-#: libsvn_delta/svndiff.c:844
+#: libsvn_delta/svndiff.c:688 libsvn_delta/svndiff.c:844
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff 数据包含无效窗口"
@@ -1525,8 +1472,7 @@
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff 数据包含向后变化的资源视图"
-#: libsvn_delta/svndiff.c:746
-#: libsvn_delta/svndiff.c:793
+#: libsvn_delta/svndiff.c:746 libsvn_delta/svndiff.c:793
#: libsvn_delta/svndiff.c:866
msgid "Unexpected end of svndiff input"
msgstr "svndiff 输入意料结束"
@@ -1556,8 +1502,7 @@
msgid "Failed to delete mmap '%s'"
msgstr "删除 mmap“%s”失败"
-#: libsvn_fs/fs-loader.c:105
-#: libsvn_ra/ra_loader.c:158
+#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:158
#: libsvn_ra/ra_loader.c:171
#, c-format
msgid "'%s' does not define '%s()'"
@@ -1610,18 +1555,15 @@
msgid "deleting changes"
msgstr "正在删除修改"
-#: libsvn_fs_base/bdb/changes-table.c:145
-#: libsvn_fs_fs/fs_fs.c:2393
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "缺少必须的节点版本 ID"
-#: libsvn_fs_base/bdb/changes-table.c:156
-#: libsvn_fs_fs/fs_fs.c:2403
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "无效的改变顺序: 有新的节点版本 ID 而没删除"
-#: libsvn_fs_base/bdb/changes-table.c:166
-#: libsvn_fs_fs/fs_fs.c:2414
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "无效的改变顺序: 对删除路径进行非增加的改变"
@@ -1692,8 +1634,7 @@
msgid "storing node revision"
msgstr "正在存储节点版本"
-#: libsvn_fs_base/bdb/reps-table.c:93
-#: libsvn_fs_base/bdb/reps-table.c:200
+#: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
#, c-format
msgid "No such representation '%s'"
msgstr "没有修订版“%s”"
@@ -1741,119 +1682,109 @@
msgid "set repository uuid"
msgstr "设置仓库 UUID"
-#: libsvn_fs_base/dag.c:219
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr "损坏的数据库: 初始的事务编号在文件系统“%s”中不是“0”"
-#: libsvn_fs_base/dag.c:227
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "损坏的数据库: 初始的副本编号在文件系统“%s”中不是“0”"
-#: libsvn_fs_base/dag.c:236
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr "损坏的数据库: 初始的版本号在文件系统“%s”中不是“0”"
-#: libsvn_fs_base/dag.c:284
-#: libsvn_fs_base/dag.c:460
-#: libsvn_fs_fs/dag.c:333
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "试图在非目录的父节点创建条目"
-#: libsvn_fs_base/dag.c:454
-#: libsvn_fs_fs/dag.c:327
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "试图用非法的名字“%s”创建节点"
-#: libsvn_fs_base/dag.c:466
-#: libsvn_fs_base/dag.c:700
-#: libsvn_fs_fs/dag.c:339
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "试图克隆非可变节点的子节点"
-#: libsvn_fs_base/dag.c:473
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "试图创建已经存在的条目"
-#: libsvn_fs_base/dag.c:524
-#: libsvn_fs_fs/dag.c:401
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "试图在非目录节点中设置条目"
-#: libsvn_fs_base/dag.c:530
-#: libsvn_fs_fs/dag.c:407
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "试图在不变节点设置条目"
-#: libsvn_fs_base/dag.c:594
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "不能在*不变*节点版本 %s 设置属性列表"
-#: libsvn_fs_base/dag.c:706
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "试图以非法名字“%s”创建子克隆"
-#: libsvn_fs_base/dag.c:832
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "试图从*非*目录节点删除条目“%s”"
-#: libsvn_fs_base/dag.c:838
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "试图从不变目录节点删除条目“%s”"
-#: libsvn_fs_base/dag.c:845
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "试图删除一个非法名字“%s”的节点"
-#: libsvn_fs_base/dag.c:860
-#: libsvn_fs_base/dag.c:893
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "删除失败: 目录没有条目“%s”"
-#: libsvn_fs_base/dag.c:942
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "试图删除不变节点"
-#: libsvn_fs_base/dag.c:1062
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "试图获取*非*文件节点的文本内容"
-#: libsvn_fs_base/dag.c:1097
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "试图获取*非*文件节点的长度"
-#: libsvn_fs_base/dag.c:1123
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "试图获取*非*文件节点的校验和"
-#: libsvn_fs_base/dag.c:1154
-#: libsvn_fs_base/dag.c:1208
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "试图设置*非*文件节点的文本内容"
-#: libsvn_fs_base/dag.c:1160
-#: libsvn_fs_base/dag.c:1214
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "试图设置不变节点的文本内容"
-#: libsvn_fs_base/dag.c:1237
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1864,18 +1795,17 @@
" 期望: %s\n"
" 实际: %s\n"
-#: libsvn_fs_base/dag.c:1292
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "试图打开不存在的子节点“%s”"
-#: libsvn_fs_base/dag.c:1298
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "试图以非法名字“%s”打开节点"
-#: libsvn_fs_base/err.c:38
-#: libsvn_fs_fs/err.c:38
+#: libsvn_fs_base/err.c:38 libsvn_fs_fs/err.c:38
msgid "Filesystem object has not been opened yet"
msgstr "文件系统对象尚未打开"
@@ -1884,8 +1814,7 @@
msgid "Corrupt filesystem revision %ld in filesystem '%s'"
msgstr "在文件系统“%2$s”中的版本 %1$ld 损坏"
-#: libsvn_fs_base/err.c:62
-#: libsvn_fs_fs/err.c:52
+#: libsvn_fs_base/err.c:62 libsvn_fs_fs/err.c:52
#, c-format
msgid "Reference to non-existent node '%s' in filesystem '%s'"
msgstr "在文件系统“%2$s”中引用不存在的节点“%1$s”"
@@ -1905,8 +1834,7 @@
msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
msgstr "文件系统“%2$s”中“%1$s”的“copies”表有无效入口"
-#: libsvn_fs_base/err.c:106
-#: libsvn_fs_fs/err.c:63
+#: libsvn_fs_base/err.c:106 libsvn_fs_fs/err.c:63
#, c-format
msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
msgstr "文件不能修改: 文件系统“%s”，版本 %ld，路径“%s”"
@@ -1916,8 +1844,7 @@
msgid "No transaction named '%s' in filesystem '%s'"
msgstr "在文件系统“%2$s”中不存在事务“%1$s”"
-#: libsvn_fs_base/err.c:128
-#: libsvn_fs_fs/err.c:74
+#: libsvn_fs_base/err.c:128 libsvn_fs_fs/err.c:74
#, c-format
msgid "Cannot modify transaction named '%s' in filesystem '%s'"
msgstr "无法在文件系统“%2$s”中修改名为“%1$s”的事务"
@@ -1927,14 +1854,12 @@
msgid "No copy with id '%s' in filesystem '%s'"
msgstr "文件系统“%2$s”中没有编号“%1$s”的副本"
-#: libsvn_fs_base/err.c:149
-#: libsvn_fs_fs/err.c:85
+#: libsvn_fs_base/err.c:149 libsvn_fs_fs/err.c:85
#, c-format
msgid "'%s' is not a directory in filesystem '%s'"
msgstr "“%s”不是文件系统“%s”的目录"
-#: libsvn_fs_base/err.c:160
-#: libsvn_fs_fs/err.c:96
+#: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
#, c-format
msgid "'%s' is not a file in filesystem '%s'"
msgstr "“%s”不是文件系统“%s”的文件"
@@ -1954,32 +1879,27 @@
msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
msgstr "文件系统“%2$s”中“%1$s”的“locks”表锁损坏"
-#: libsvn_fs_base/err.c:200
-#: libsvn_fs_fs/err.c:117
+#: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
#, c-format
msgid "No lock on path '%s' in filesystem '%s'"
msgstr "文件系统“%2$s”中的路径“%1$s”中没有锁"
-#: libsvn_fs_base/err.c:211
-#: libsvn_fs_fs/err.c:128
+#: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
#, c-format
msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
msgstr "锁已过期: 文件系统“%2$s”中的锁标识“%1$s”"
-#: libsvn_fs_base/err.c:222
-#: libsvn_fs_fs/err.c:139
+#: libsvn_fs_base/err.c:222 libsvn_fs_fs/err.c:139
#, c-format
msgid "No username is currently associated with filesystem '%s'"
msgstr "文件系统“%s”当前没有用户名关联"
-#: libsvn_fs_base/err.c:235
-#: libsvn_fs_fs/err.c:152
+#: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
#, c-format
msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
msgstr "用户“%1$s”试图使用文件系统“%3$s”中属于“%2$s”的锁"
-#: libsvn_fs_base/err.c:247
-#: libsvn_fs_fs/err.c:164
+#: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
#, c-format
msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
msgstr "路径“%1$s”已经在文件系统“%3$s”中被用户“%2$s”锁定"
@@ -1994,8 +1914,7 @@
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr "不正确的数据库版本: 用 %d.%d.%d 版本编译，正在运行版本 %d.%d.%d"
-#: libsvn_fs_base/fs.c:109
-#: libsvn_fs_fs/fs.c:53
+#: libsvn_fs_base/fs.c:109 libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "文件系统对象已经打开"
@@ -2014,8 +1933,7 @@
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr "打开文件系统“%s”的BDB环境句柄时出错: \n"
-#: libsvn_fs_base/fs.c:674
-#: libsvn_fs_fs/fs_fs.c:642
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "期望文件系统格式“%d”；发现格式“%d”"
@@ -2040,29 +1958,26 @@
"热复制时执行灾难恢复出错；DB_LOG_AUTOREMOVE 特性可能妨碍热复制。\n"
"如果问题依旧存在，请尝试在 DB_CONFIG 中禁用此特性。"
-#: libsvn_fs_base/fs.c:1240
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr "模块只能操作BDB版本库。"
-#: libsvn_fs_base/fs.c:1274
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "不支持的BDB之FS加载器版本 (%d)"
-#: libsvn_fs_base/lock.c:444
-#: libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr "不能校验路径“%s”上的锁；没有用户名"
-#: libsvn_fs_base/lock.c:450
-#: libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr "用户 %s 不是路径“%s”的锁的所有者(当前由用户 %s 锁定)"
-#: libsvn_fs_base/lock.c:457
-#: libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr "不能校验路径“%s”的锁；没有匹配的可用锁令牌"
@@ -2102,8 +2017,7 @@
msgid "Failure reading rep '%s'"
msgstr "读取版本“%s”失败"
-#: libsvn_fs_base/reps-strings.c:811
-#: libsvn_fs_base/reps-strings.c:897
+#: libsvn_fs_base/reps-strings.c:811 libsvn_fs_base/reps-strings.c:897
#, c-format
msgid ""
"Checksum mismatch on rep '%s':\n"
@@ -2118,8 +2032,7 @@
msgid "Null rep, but offset past zero already"
msgstr "空的版本，但是偏移已经大于零"
-#: libsvn_fs_base/reps-strings.c:1024
-#: libsvn_fs_base/reps-strings.c:1220
+#: libsvn_fs_base/reps-strings.c:1024 libsvn_fs_base/reps-strings.c:1220
#, c-format
msgid "Rep '%s' is not mutable"
msgstr "版本“%s”是不可变的"
@@ -2153,7 +2066,7 @@
msgid "Transaction is dead: '%s'"
msgstr "事务已结束: “%s”"
-#: libsvn_fs_base/revs-txns.c:1078
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "事务终止，但清除失败"
@@ -2163,99 +2076,83 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:391
-#: libsvn_fs_fs/tree.c:310
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "文件找不到: 事务“%s” ，路径“%s”"
-#: libsvn_fs_base/tree.c:396
-#: libsvn_fs_fs/tree.c:315
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "文件找不到: 版本 %ld，路径“%s”"
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:406
-#: libsvn_fs_fs/tree.c:330
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "文件已存在: 文件系统“%s”，事务 “%s”，路径“%s”"
-#: libsvn_fs_base/tree.c:411
-#: libsvn_fs_fs/tree.c:336
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "文件已存在: 文件系统“%s”，版本 %ld，路径“%s”"
-#: libsvn_fs_base/tree.c:419
-#: libsvn_fs_fs/tree.c:346
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "根对象必须是一个根事务"
-#: libsvn_fs_base/tree.c:834
-#: libsvn_fs_fs/tree.c:755
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "打开“%s”失败"
-#: libsvn_fs_base/tree.c:1466
-#: libsvn_fs_fs/tree.c:1202
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr "不能在两个不同的文件系统之间比较属性值"
-#: libsvn_fs_base/tree.c:1799
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "损坏的数据库: 先前的数目不完整"
-#: libsvn_fs_base/tree.c:1854
-#: libsvn_fs_fs/tree.c:1239
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "“%s”有意外的不变节点"
-#: libsvn_fs_base/tree.c:1875
-#: libsvn_fs_fs/tree.c:1262
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "在“%s”冲突"
-#: libsvn_fs_base/tree.c:1925
-#: libsvn_fs_base/tree.c:2637
-#: libsvn_fs_fs/tree.c:1311
-#: libsvn_fs_fs/tree.c:1803
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr "错误的合并；初始，原始，目标不在同一个文件系统"
-#: libsvn_fs_base/tree.c:1941
-#: libsvn_fs_fs/tree.c:1327
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr "错误的合并: 目标“%s”拥有标识“%s”，与初始相同"
-#: libsvn_fs_base/tree.c:2444
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "版本“%2$s”的事务“%1$s”过时"
-#: libsvn_fs_base/tree.c:2820
-#: libsvn_fs_fs/tree.c:1942
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "不能删除根目录"
-#: libsvn_fs_base/tree.c:3000
-#: libsvn_fs_fs/tree.c:2014
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "不能在两个不同的文件系统（“%s”和“%s”）之间复制"
-#: libsvn_fs_base/tree.c:3009
-#: libsvn_fs_fs/tree.c:2020
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "当前不支持从可变的树复制"
-#: libsvn_fs_base/tree.c:3504
-#: libsvn_fs_fs/tree.c:2444
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2266,15 +2163,12 @@
" 期望: %s\n"
" 实际: %s\n"
-#: libsvn_fs_base/tree.c:3757
-#: libsvn_fs_fs/tree.c:2680
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr "不能在两个不同的文件系统间比较文件内容"
-#: libsvn_fs_base/tree.c:3766
-#: libsvn_fs_base/tree.c:3771
-#: libsvn_fs_fs/tree.c:2689
-#: libsvn_fs_fs/tree.c:2694
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
@@ -2320,155 +2214,143 @@
msgid "Can't store FSFS shared data"
msgstr "不能存储文件系统共享数据"
-#: libsvn_fs_fs/fs.c:352
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr "模块与文本文件(FSFS)仓库一起工作。"
-#: libsvn_fs_fs/fs.c:386
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "不支持的FSFS之FS加载器版本 (%d)"
-#: libsvn_fs_fs/fs_fs.c:351
+#: libsvn_fs_fs/fs_fs.c:352
#, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "不能获取文件系统事务列表互斥体"
-#: libsvn_fs_fs/fs_fs.c:359
+#: libsvn_fs_fs/fs_fs.c:360
#, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "不能释放文件系统事务列表互斥体"
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:386
#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "不能解锁未知事务“%s”"
-#: libsvn_fs_fs/fs_fs.c:389
+#: libsvn_fs_fs/fs_fs.c:390
#, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "不能解锁未锁事务“%s”"
-#: libsvn_fs_fs/fs_fs.c:396
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr "不能为事务“%s”解锁原型版本锁文件"
-#: libsvn_fs_fs/fs_fs.c:402
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr "不能为事务“%s”关闭原型版本锁文件"
-#: libsvn_fs_fs/fs_fs.c:464
+#: libsvn_fs_fs/fs_fs.c:465
#, 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 "因为当前进程正在写入以前版本，所以不能为事务 '%s' 写入原型版本文件。"
-#: libsvn_fs_fs/fs_fs.c:500
+#: libsvn_fs_fs/fs_fs.c:501
#, 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 "因为其它进程正在写入以前版本，所以不能为事务 '%s' 写入原型版本文件。"
-#: libsvn_fs_fs/fs_fs.c:507
-#: libsvn_subr/io.c:1512
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "不能获取文件“%s”的排它锁"
-#: libsvn_fs_fs/fs_fs.c:833
-#: libsvn_fs_fs/fs_fs.c:847
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "在版本文件中找到非法文件头"
-#: libsvn_fs_fs/fs_fs.c:949
-#: libsvn_fs_fs/fs_fs.c:963
-#: libsvn_fs_fs/fs_fs.c:970
-#: libsvn_fs_fs/fs_fs.c:977
-#: libsvn_fs_fs/fs_fs.c:985
-#: libsvn_fs_fs/fs_fs.c:993
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "node-rev 中有非法的文本版本偏移行"
-#: libsvn_fs_fs/fs_fs.c:1062
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "node-rev 中没有 kind"
-#: libsvn_fs_fs/fs_fs.c:1093
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "node-rev 中没有 cpath"
-#: libsvn_fs_fs/fs_fs.c:1120
-#: libsvn_fs_fs/fs_fs.c:1126
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "node-rev 中的 copyroot 行非法"
-#: libsvn_fs_fs/fs_fs.c:1144
-#: libsvn_fs_fs/fs_fs.c:1150
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "node-rev 中的 copyfrom 行非法"
-#: libsvn_fs_fs/fs_fs.c:1259
-#: libsvn_fs_fs/fs_fs.c:3674
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "试图写至非事务"
-#: libsvn_fs_fs/fs_fs.c:1343
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "非法的修订版头"
-#: libsvn_fs_fs/fs_fs.c:1367
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "node-rev 中没有 node-id"
-#: libsvn_fs_fs/fs_fs.c:1373
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "node-rev 中的 node-id 损坏"
-#: libsvn_fs_fs/fs_fs.c:1418
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "版本文件缺少结尾换行"
-#: libsvn_fs_fs/fs_fs.c:1430
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "版本文件的最后一行大于 64 个字符"
-#: libsvn_fs_fs/fs_fs.c:1445
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "版本文件的最后一行缺少空白字符"
-#: libsvn_fs_fs/fs_fs.c:1474
-#: libsvn_fs_fs/fs_fs.c:1532
-#: libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "没有版本 %ld"
-#: libsvn_fs_fs/fs_fs.c:1592
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "修订版的svndiff 数据非法"
-#: libsvn_fs_fs/fs_fs.c:1735
-#: libsvn_fs_fs/fs_fs.c:1748
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "读svndiff窗口时超出了结尾"
-#: libsvn_fs_fs/fs_fs.c:1884
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "svndiff 数据请求不存在的来源"
-#: libsvn_fs_fs/fs_fs.c:1890
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "svndiff 请求的位置超出了流的结尾"
-#: libsvn_fs_fs/fs_fs.c:1913
-#: libsvn_fs_fs/fs_fs.c:1930
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "svndiff 的窗体长度已损坏"
-#: libsvn_fs_fs/fs_fs.c:1978
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2479,125 +2361,113 @@
" 期望: %s\n"
" 实际: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2201
-#: libsvn_fs_fs/fs_fs.c:2214
-#: libsvn_fs_fs/fs_fs.c:2220
-#: libsvn_fs_fs/fs_fs.c:4765
-#: libsvn_fs_fs/fs_fs.c:4774
-#: libsvn_fs_fs/fs_fs.c:4780
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "目录条目损坏"
-#: libsvn_fs_fs/fs_fs.c:2559
-#: libsvn_fs_fs/fs_fs.c:2567
-#: libsvn_fs_fs/fs_fs.c:2599
-#: libsvn_fs_fs/fs_fs.c:2619
-#: libsvn_fs_fs/fs_fs.c:2653
-#: libsvn_fs_fs/fs_fs.c:2658
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "rev-file 中有非法修改行"
-#: libsvn_fs_fs/fs_fs.c:2592
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "rev 文件中有无效的改变种类"
-#: libsvn_fs_fs/fs_fs.c:2612
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "rev-file 中有无效的 text-mod 标志"
-#: libsvn_fs_fs/fs_fs.c:2632
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "rev-file 中有无效的 prop-mod 标志"
-#: libsvn_fs_fs/fs_fs.c:2816
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "不允许从事务复制"
-#: libsvn_fs_fs/fs_fs.c:2872
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "无法在“%s”中为版本 %ld 创建事务目录"
-#: libsvn_fs_fs/fs_fs.c:3106
-#: libsvn_fs_fs/fs_fs.c:3113
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "next-id 文件损坏"
-#: libsvn_fs_fs/fs_fs.c:3200
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "事务清理失败"
-#: libsvn_fs_fs/fs_fs.c:3368
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "无效的修改类型"
-#: libsvn_fs_fs/fs_fs.c:3693
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "无法设定目录的文本内容"
-#: libsvn_fs_fs/fs_fs.c:3783
-#: libsvn_fs_fs/fs_fs.c:3788
-#: libsvn_fs_fs/fs_fs.c:3795
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "当前文件损坏"
-#: libsvn_fs_fs/fs_fs.c:4084
-#: libsvn_subr/io.c:2790
-#: svn/util.c:252
-#: svn/util.c:267
-#: svn/util.c:291
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
+#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "不能取得“%s”的状态"
-#: libsvn_fs_fs/fs_fs.c:4088
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "无法修改“%s”的存取权限"
-#: libsvn_fs_fs/fs_fs.c:4237
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "不能获取FSFS版本库互斥体"
-#: libsvn_fs_fs/fs_fs.c:4251
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "不能释放FSFS版本库互斥体"
-#: libsvn_fs_fs/fs_fs.c:4370
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "事务过时"
-#: libsvn_fs_fs/fs_fs.c:4706
+#: libsvn_fs_fs/fs_fs.c:4807
msgid "Recovery encountered a non-directory node"
msgstr "修复时遇到非目录节点"
-#: libsvn_fs_fs/fs_fs.c:4728
+#: libsvn_fs_fs/fs_fs.c:4829
msgid "Recovery encountered a deltified directory representation"
msgstr "修复时遇到差异目录表示"
-#: libsvn_fs_fs/fs_fs.c:4991
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "无此事务"
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "无法写入锁/条目的哈希文件“%s”"
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "不能解析锁/条目的哈希文件“%s“"
-#: libsvn_fs_fs/lock.c:715
-#: libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "HEAD中没有路径“%s”"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "加锁失败: “%s”的新版本已经存在"
@@ -2640,8 +2510,7 @@
msgid "Could not fetch the Version Resource URL (needed during an import or when it is missing from the local, cached props)"
msgstr "不能获取版本资源URL(导入时需要或本地缓存属性中缺少)"
-#: libsvn_ra_dav/commit.c:459
-#: libsvn_ra_serf/commit.c:374
+#: libsvn_ra_dav/commit.c:459 libsvn_ra_serf/commit.c:374
#: libsvn_ra_serf/commit.c:435
#, c-format
msgid "Your file or directory '%s' is probably out-of-date"
@@ -2651,8 +2520,7 @@
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "检出(CHECKOUT)响应没有包含“Location:”头信息"
-#: libsvn_ra_dav/commit.c:994
-#: libsvn_ra_serf/commit.c:1427
+#: libsvn_ra_dav/commit.c:994 libsvn_ra_serf/commit.c:1427
#, c-format
msgid "File '%s' already exists"
msgstr "文件“%s”已存在"
@@ -2674,8 +2542,7 @@
msgid "Could not save file"
msgstr "无法保存文件"
-#: libsvn_ra_dav/fetch.c:778
-#: libsvn_ra_svn/client.c:920
+#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:920
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2715,8 +2582,7 @@
msgid "Got unrecognized encoding '%s'"
msgstr "得到不能识别的编码“%s”"
-#: libsvn_ra_dav/fetch.c:1705
-#: libsvn_ra_dav/fetch.c:1709
+#: libsvn_ra_dav/fetch.c:1705 libsvn_ra_dav/fetch.c:1709
#: libsvn_ra_serf/locks.c:527
msgid "Server does not support locking features"
msgstr "服务器不支持加锁"
@@ -2764,8 +2630,7 @@
msgid "Failed to parse URI"
msgstr "解析地址(URI)失败"
-#: libsvn_ra_dav/lock.c:392
-#: libsvn_ra_serf/locks.c:683
+#: libsvn_ra_dav/lock.c:392 libsvn_ra_serf/locks.c:683
#, c-format
msgid "'%s' is not locked in the repository"
msgstr "仓库中的“%s”没有被锁定"
@@ -2826,8 +2691,7 @@
msgid "No part of path '%s' was found in repository HEAD"
msgstr "路径“%s”的任何部分都不在仓库的 HEAD 中"
-#: libsvn_ra_dav/props.c:758
-#: libsvn_ra_dav/props.c:813
+#: libsvn_ra_dav/props.c:758 libsvn_ra_dav/props.c:813
msgid "The VCC property was not found on the resource"
msgstr "资源没有 VCC 属性"
@@ -2843,8 +2707,7 @@
msgid "'DAV:version-name' was not present on the baseline resource"
msgstr "基线资源没有“DAV:version-name”"
-#: libsvn_ra_dav/props.c:1117
-#: libsvn_ra_serf/commit.c:718
+#: libsvn_ra_dav/props.c:1117 libsvn_ra_serf/commit.c:718
msgid "At least one property change failed; repository is unchanged"
msgstr "至少有一个属性变更失败；仓库未改变"
@@ -2860,8 +2723,7 @@
msgid "Got close-directory element without ever opening a directory"
msgstr "在没有打开目录的情况下发现了close-directory元素"
-#: libsvn_ra_dav/replay.c:432
-#: libsvn_ra_serf/replay.c:498
+#: libsvn_ra_dav/replay.c:432 libsvn_ra_serf/replay.c:498
#, c-format
msgid "Error writing stream: unexpected EOF"
msgstr "写入流出错: 意外的 EOF"
@@ -2999,9 +2861,8 @@
msgid "%s request failed on '%s'"
msgstr "对“%2$s”的请求 %1$s 失败"
-#: libsvn_ra_local/ra_plugin.c:106
-#: libsvn_ra_local/ra_plugin.c:595
-#: libsvn_wc/update_editor.c:2605
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -3015,15 +2876,15 @@
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:248
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "访问本地磁盘的仓库模块。"
-#: libsvn_ra_local/ra_plugin.c:288
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "无法为URL打开ra_local会话"
-#: libsvn_ra_local/ra_plugin.c:1440
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "不支持ra_local RA加载器版本 %d"
@@ -3043,14 +2904,12 @@
msgid "Local URL '%s' contains unsupported hostname"
msgstr "本地URL“%s”包含不支持的主机名称"
-#: libsvn_ra_local/split_url.c:127
-#: libsvn_ra_local/split_url.c:134
+#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
#, c-format
msgid "Unable to open repository '%s'"
msgstr "无法打开仓库“%s”"
-#: libsvn_ra_serf/commit.c:367
-#: libsvn_ra_serf/commit.c:428
+#: libsvn_ra_serf/commit.c:367 libsvn_ra_serf/commit.c:428
#: libsvn_repos/commit.c:375
#, c-format
msgid "Path '%s' not present"
@@ -3271,8 +3130,7 @@
msgid "Revision entry not a list"
msgstr "版本条目不是列表"
-#: libsvn_ra_svn/client.c:1453
-#: libsvn_ra_svn/client.c:1478
+#: libsvn_ra_svn/client.c:1453 libsvn_ra_svn/client.c:1478
msgid "Text delta chunk not a string"
msgstr "文本差异块不是字符串"
@@ -3312,8 +3170,7 @@
msgid "Didn't receive end marker for unlock responses"
msgstr "解锁响应没有结束标记"
-#: libsvn_ra_svn/client.c:1881
-#: libsvn_ra_svn/client.c:1909
+#: libsvn_ra_svn/client.c:1881 libsvn_ra_svn/client.c:1909
msgid "Server doesn't support the get-lock command"
msgstr "服务器不支持命令 get-lock"
@@ -3330,23 +3187,19 @@
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "不支持ra_svn RA加载器版本 %d"
-#: libsvn_ra_svn/cram.c:194
-#: libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/cyrus_auth.c:437
-#: libsvn_ra_svn/cyrus_auth.c:484
+#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
+#: libsvn_ra_svn/cyrus_auth.c:437 libsvn_ra_svn/cyrus_auth.c:484
#: libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "服务器意外响应认证请求"
-#: libsvn_ra_svn/cyrus_auth.c:171
-#: svnserve/cyrus_auth.c:104
+#: libsvn_ra_svn/cyrus_auth.c:171 svnserve/cyrus_auth.c:104
#: svnserve/cyrus_auth.c:114
#, c-format
msgid "Could not initialize the SASL library"
msgstr "不能初始化 SASL 库"
-#: libsvn_ra_svn/cyrus_auth.c:824
-#: libsvn_ra_svn/internal_auth.c:57
+#: libsvn_ra_svn/cyrus_auth.c:824 libsvn_ra_svn/internal_auth.c:57
#: libsvn_ra_svn/internal_auth.c:110
#, c-format
msgid "Authentication error from server: %s"
@@ -3356,8 +3209,7 @@
msgid "Can't get username or password"
msgstr "无法取得用户名称或密码"
-#: libsvn_ra_svn/editor.c:387
-#: libsvn_ra_svn/editorp.c:456
+#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
msgstr "编辑时遇到无效的文件或目录令牌"
@@ -3365,8 +3217,7 @@
msgid "Non-string as part of text delta"
msgstr "部分文件差异不是字符串"
-#: libsvn_ra_svn/editor.c:717
-#: libsvn_ra_svn/editorp.c:800
+#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
#, c-format
msgid "Command 'finish-replay' invalid outside of replays"
msgstr "finish-replay命令只在重放时有效"
@@ -3379,19 +3230,16 @@
msgid "Apply-textdelta already active"
msgstr "已经激活 Apply-textdelta"
-#: libsvn_ra_svn/editorp.c:687
-#: libsvn_ra_svn/editorp.c:705
+#: libsvn_ra_svn/editorp.c:687 libsvn_ra_svn/editorp.c:705
msgid "Apply-textdelta not active"
msgstr "没有激活 Apply-textdelta"
-#: libsvn_ra_svn/editorp.c:891
-#: libsvn_ra_svn/marshal.c:896
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:896
#, c-format
msgid "Unknown command '%s'"
msgstr "未知命令: “%s”"
-#: libsvn_ra_svn/internal_auth.c:97
-#: libsvn_subr/prompt.c:156
+#: libsvn_ra_svn/internal_auth.c:97 libsvn_subr/prompt.c:156
#, c-format
msgid "Can't get password"
msgstr "无法取得密码"
@@ -3400,8 +3248,7 @@
msgid "Capability entry is not a word"
msgstr "容量类型不是 word "
-#: libsvn_ra_svn/marshal.c:253
-#: libsvn_ra_svn/streams.c:80
+#: libsvn_ra_svn/marshal.c:253 libsvn_ra_svn/streams.c:80
#: libsvn_ra_svn/streams.c:155
msgid "Connection closed unexpectedly"
msgstr "连接意外关闭"
@@ -3435,14 +3282,12 @@
msgid "Unknown status '%s' in command response"
msgstr "命令响应中的状态“%s”未知"
-#: libsvn_ra_svn/streams.c:77
-#: libsvn_ra_svn/streams.c:152
+#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
msgstr "无法读取连接"
-#: libsvn_ra_svn/streams.c:91
-#: libsvn_ra_svn/streams.c:166
+#: libsvn_ra_svn/streams.c:91 libsvn_ra_svn/streams.c:166
#, c-format
msgid "Can't write to connection"
msgstr "无法写入连接"
@@ -3457,14 +3302,12 @@
msgid "Out of date: '%s' in transaction '%s'"
msgstr "过期: ”%s“在事务“%s”"
-#: libsvn_repos/commit.c:274
-#: libsvn_repos/commit.c:435
+#: libsvn_repos/commit.c:274 libsvn_repos/commit.c:435
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "获得源路径，但“%s”没有源版本"
-#: libsvn_repos/commit.c:306
-#: libsvn_repos/commit.c:466
+#: libsvn_repos/commit.c:306 libsvn_repos/commit.c:466
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "源URL“%s”来自其它仓库"
@@ -3524,8 +3367,7 @@
msgid "* Verified revision %ld.\n"
msgstr "* 已校验版本 %ld。\n"
-#: libsvn_repos/fs-wrap.c:57
-#: libsvn_repos/load.c:1209
+#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1209
msgid "Commit succeeded, but post-commit hook failed"
msgstr "提交成功，但是后置提交钩子(post-commit)失败"
@@ -3660,8 +3502,7 @@
msgid "Malformed dumpfile header"
msgstr "非法的转存文件头"
-#: libsvn_repos/load.c:446
-#: libsvn_repos/load.c:488
+#: libsvn_repos/load.c:446 libsvn_repos/load.c:488
#, c-format
msgid "Unsupported dumpfile version: %d"
msgstr "不支持的转存文件版本: %d"
@@ -3749,36 +3590,41 @@
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "文件系统中路径“%s”既不是文件也不是目录"
-#: libsvn_repos/reporter.c:218
+#: libsvn_repos/reporter.c:222
#, c-format
msgid "Invalid depth (%s) for path '%s'"
msgstr "路径 “%2$s” 的深度 (%1$s) 非法"
-#: libsvn_repos/reporter.c:649
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "工作副本路径“%s”不在仓库中"
-#: libsvn_repos/reporter.c:944
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "无权打开根进行编辑操作"
-#: libsvn_repos/reporter.c:963
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "目标路径不存在"
-#: libsvn_repos/reporter.c:970
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "不能在子目录中替换目录"
-#: libsvn_repos/reporter.c:1013
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "最上层工作副本报告无效"
-#: libsvn_repos/reporter.c:1028
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "两个最上层报告没有目标"
+#: libsvn_repos/reporter.c:1063
+#, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "不支持路径“%2$s”的报告深度“%1$s”"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -3862,14 +3708,12 @@
msgid "Failed to find time on revision %ld"
msgstr "无法找到版本 %ld 的时间"
-#: libsvn_repos/rev_hunt.c:219
-#: libsvn_repos/rev_hunt.c:321
+#: libsvn_repos/rev_hunt.c:219 libsvn_repos/rev_hunt.c:321
#, c-format
msgid "Invalid start revision %ld"
msgstr "无效起始版本 %ld"
-#: libsvn_repos/rev_hunt.c:223
-#: libsvn_repos/rev_hunt.c:325
+#: libsvn_repos/rev_hunt.c:223 libsvn_repos/rev_hunt.c:325
#, c-format
msgid "Invalid end revision %ld"
msgstr "无效结束版本 %ld"
@@ -3920,8 +3764,7 @@
msgid "Can't manipulate current date"
msgstr "不能获得当前日期"
-#: libsvn_subr/date.c:278
-#: libsvn_subr/date.c:286
+#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
#, c-format
msgid "Can't calculate requested date"
msgstr "无法计算被请求的日期"
@@ -3936,9 +3779,7 @@
msgid "Can't grab DSO mutex"
msgstr "无法获取DSO互斥体"
-#: libsvn_subr/dso.c:85
-#: libsvn_subr/dso.c:107
-#: libsvn_subr/dso.c:122
+#: libsvn_subr/dso.c:85 libsvn_subr/dso.c:107 libsvn_subr/dso.c:122
#, c-format
msgid "Can't ungrab DSO mutex"
msgstr "不能释放DSO互斥体"
@@ -3962,8 +3803,7 @@
msgid "Can't open '%s'"
msgstr "不能打开“%s”"
-#: libsvn_subr/io.c:399
-#: libsvn_subr/io.c:522
+#: libsvn_subr/io.c:399 libsvn_subr/io.c:522
#, c-format
msgid "Unable to make name for '%s'"
msgstr "不能为“%s”产生名字"
@@ -3973,9 +3813,7 @@
msgid "Can't create symbolic link '%s'"
msgstr "无法创建符号连接“%s”"
-#: libsvn_subr/io.c:526
-#: libsvn_subr/io.c:580
-#: libsvn_subr/io.c:608
+#: libsvn_subr/io.c:526 libsvn_subr/io.c:580 libsvn_subr/io.c:608
msgid "Symbolic links are not supported on this platform"
msgstr "此平台不支持符号链接"
@@ -4019,19 +3857,14 @@
msgid "Destination '%s' already exists"
msgstr "目的“%s”已存在"
-#: libsvn_subr/io.c:904
-#: libsvn_subr/io.c:1830
-#: libsvn_subr/io.c:1881
+#: libsvn_subr/io.c:904 libsvn_subr/io.c:1830 libsvn_subr/io.c:1881
#: libsvn_subr/io.c:1944
#, c-format
msgid "Can't read directory '%s'"
msgstr "无法读取目录“%s”"
-#: libsvn_subr/io.c:909
-#: libsvn_subr/io.c:1835
-#: libsvn_subr/io.c:1886
-#: libsvn_subr/io.c:1949
-#: libsvn_subr/io.c:3114
+#: libsvn_subr/io.c:909 libsvn_subr/io.c:1835 libsvn_subr/io.c:1886
+#: libsvn_subr/io.c:1949 libsvn_subr/io.c:3114
#, c-format
msgid "Error closing directory '%s'"
msgstr "关闭目录“%s”出错"
@@ -4061,8 +3894,7 @@
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr "不能获取“%s”文件的权限(文件 stat 错误)"
-#: libsvn_subr/io.c:1216
-#: libsvn_subr/io.c:1311
+#: libsvn_subr/io.c:1216 libsvn_subr/io.c:1311
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "不能改变文件“%s”的权限"
@@ -4097,15 +3929,12 @@
msgid "Can't flush stream"
msgstr "不能刷新流"
-#: libsvn_subr/io.c:1556
-#: libsvn_subr/io.c:1573
+#: libsvn_subr/io.c:1556 libsvn_subr/io.c:1573
#, c-format
msgid "Can't flush file to disk"
msgstr "不能刷新文件到磁盘"
-#: libsvn_subr/io.c:1595
-#: libsvn_subr/prompt.c:97
-#: svnserve/main.c:537
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
#, c-format
msgid "Can't open stdin"
msgstr "无法打开标准输入"
@@ -4124,15 +3953,12 @@
msgid "Can't remove file '%s'"
msgstr "不能移动文件“%s”"
-#: libsvn_subr/io.c:1765
-#: libsvn_subr/io.c:2965
-#: libsvn_subr/io.c:3051
+#: libsvn_subr/io.c:1765 libsvn_subr/io.c:2965 libsvn_subr/io.c:3051
#, c-format
msgid "Can't open directory '%s'"
msgstr "无法打开目录“%s”"
-#: libsvn_subr/io.c:1811
-#: libsvn_subr/io.c:1841
+#: libsvn_subr/io.c:1811 libsvn_subr/io.c:1841
#, c-format
msgid "Can't remove '%s'"
msgstr "无法删除“%s”"
@@ -4242,16 +4068,12 @@
msgid "Can't close stream"
msgstr "无法关闭流"
-#: libsvn_subr/io.c:2631
-#: libsvn_subr/io.c:2655
-#: libsvn_subr/io.c:2668
+#: libsvn_subr/io.c:2631 libsvn_subr/io.c:2655 libsvn_subr/io.c:2668
#, c-format
msgid "Can't read file '%s'"
msgstr "不能读取文件“%s”"
-#: libsvn_subr/io.c:2632
-#: libsvn_subr/io.c:2656
-#: libsvn_subr/io.c:2669
+#: libsvn_subr/io.c:2632 libsvn_subr/io.c:2656 libsvn_subr/io.c:2669
#, c-format
msgid "Can't read stream"
msgstr "无法读取流"
@@ -4276,14 +4098,12 @@
msgid "Can't set position pointer in stream"
msgstr "无法在流中设置定位指针"
-#: libsvn_subr/io.c:2692
-#: libsvn_subr/io.c:2726
+#: libsvn_subr/io.c:2692 libsvn_subr/io.c:2726
#, c-format
msgid "Can't write to file '%s'"
msgstr "无法写入文件“%s”"
-#: libsvn_subr/io.c:2693
-#: libsvn_subr/io.c:2727
+#: libsvn_subr/io.c:2693 libsvn_subr/io.c:2727
#, c-format
msgid "Can't write to stream"
msgstr "无法写入流"
@@ -4307,8 +4127,7 @@
msgid "Can't create directory '%s'"
msgstr "无法创建目录“%s”"
-#: libsvn_subr/io.c:2907
-#: libsvn_wc/copy.c:509
+#: libsvn_subr/io.c:2907 libsvn_wc/copy.c:509
#, c-format
msgid "Can't hide directory '%s'"
msgstr "无法隐藏目录“%s”"
@@ -4361,8 +4180,7 @@
msgid "No revision list found "
msgstr "没有发现版本列表"
-#: libsvn_subr/mergeinfo.c:135
-#: libsvn_subr/mergeinfo.c:163
+#: libsvn_subr/mergeinfo.c:135 libsvn_subr/mergeinfo.c:163
msgid "Invalid character found in revision list"
msgstr "在版本列表中发现无效字符"
@@ -4392,8 +4210,7 @@
msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
msgstr "不能把模块路径从UCS-2转换为UTF-8: “%s”"
-#: libsvn_subr/opt.c:217
-#: libsvn_subr/opt.c:295
+#: libsvn_subr/opt.c:217 libsvn_subr/opt.c:295
msgid ""
"\n"
"Valid options:\n"
@@ -4405,8 +4222,7 @@
msgid " ARG"
msgstr " ARG"
-#: libsvn_subr/opt.c:447
-#: libsvn_subr/opt.c:470
+#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
#, c-format
msgid ""
"\"%s\": unknown command.\n"
@@ -4415,27 +4231,27 @@
"“%s”: 未知命令。\n"
"\n"
-#: libsvn_subr/opt.c:788
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "解析版本“%s”时发生语法错误"
-#: libsvn_subr/opt.c:865
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL“%s”不是正确的URI编码"
-#: libsvn_subr/opt.c:871
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL“%s”包含“..”元素"
-#: libsvn_subr/opt.c:900
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "解析“%s”出错"
-#: libsvn_subr/opt.c:1002
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4446,7 +4262,7 @@
" 编译于 %s，%s\n"
"\n"
-#: libsvn_subr/opt.c:1005
+#: libsvn_subr/opt.c:998
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4458,8 +4274,7 @@
"此产品包含由 CollabNet (http://www.Collab.Net/)开发的软件。\n"
"\n"
-#: libsvn_subr/opt.c:1056
-#: libsvn_subr/opt.c:1097
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "使用“%s help”得到用法。\n"
@@ -4484,8 +4299,7 @@
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "在路径“%2$s”存在无效控制字符“0x%1$02x”"
-#: libsvn_subr/prompt.c:115
-#: libsvn_subr/prompt.c:119
+#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
msgstr "无法读取标准输入"
@@ -4495,8 +4309,7 @@
msgid "Authentication realm: %s\n"
msgstr "认证领域: %s\n"
-#: libsvn_subr/prompt.c:204
-#: libsvn_subr/prompt.c:227
+#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
msgid "Username: "
msgstr "用户名: "
@@ -4564,8 +4377,7 @@
msgid "Passphrase for '%s': "
msgstr "“%s”的密码: "
-#: libsvn_subr/subst.c:1745
-#: libsvn_wc/props.c:1633
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "文件“%s”内的换行符不一致"
@@ -4574,8 +4386,7 @@
msgid "Can't lock charset translation mutex"
msgstr "不能锁定字符转换互斥体"
-#: libsvn_subr/utf.c:212
-#: libsvn_subr/utf.c:319
+#: libsvn_subr/utf.c:212 libsvn_subr/utf.c:319
msgid "Can't unlock charset translation mutex"
msgstr "不能解锁字符转换互斥体"
@@ -4693,21 +4504,17 @@
msgid "Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try again"
msgstr "你的 .svn/tmp 目录可能丢失或损坏；请执行“svn cleanup”，然后重试"
-#: libsvn_wc/adm_files.c:767
-#: libsvn_wc/lock.c:592
-#: libsvn_wc/lock.c:857
+#: libsvn_wc/adm_files.c:767 libsvn_wc/lock.c:592 libsvn_wc/lock.c:857
#, c-format
msgid "'%s' is not a working copy"
msgstr "“%s”不是工作副本"
-#: libsvn_wc/adm_files.c:774
-#: libsvn_wc/adm_files.c:842
+#: libsvn_wc/adm_files.c:774 libsvn_wc/adm_files.c:842
#: libsvn_wc/adm_files.c:904
msgid "No such thing as 'base' working copy properties!"
msgstr "没有“base”工作副本属性"
-#: libsvn_wc/adm_files.c:973
-#: libsvn_wc/util.c:52
+#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:52
#, c-format
msgid "'%s' is not a directory"
msgstr "“%s”不是目录"
@@ -4831,9 +4638,7 @@
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr "无法复制到“%s”，因为它已调度删除"
-#: libsvn_wc/entries.c:94
-#: libsvn_wc/entries.c:352
-#: libsvn_wc/entries.c:588
+#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:352 libsvn_wc/entries.c:588
#: libsvn_wc/entries.c:849
#, c-format
msgid "Entry '%s' has invalid '%s' value"
@@ -4847,9 +4652,7 @@
msgid "Invalid escaped character"
msgstr "无效的转义字符"
-#: libsvn_wc/entries.c:139
-#: libsvn_wc/entries.c:168
-#: libsvn_wc/entries.c:194
+#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:194
#: libsvn_wc/entries.c:206
msgid "Unexpected end of entry"
msgstr "入口意外结束"
@@ -4859,14 +4662,12 @@
msgid "Invalid value for field '%s'"
msgstr "“%s”域的值无效"
-#: libsvn_wc/entries.c:310
-#: libsvn_wc/entries.c:563
+#: libsvn_wc/entries.c:310 libsvn_wc/entries.c:563
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "入口“%s”有无效的节点种类"
-#: libsvn_wc/entries.c:331
-#: libsvn_wc/entries.c:540
+#: libsvn_wc/entries.c:331 libsvn_wc/entries.c:540
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "“%s”条目的仓库根目录无效"
@@ -4996,8 +4797,7 @@
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "意外发现“%s”: 路径被标记为“丢失”"
-#: libsvn_wc/lock.c:356
-#: libsvn_wc/lock.c:562
+#: libsvn_wc/lock.c:356 libsvn_wc/lock.c:562
#, c-format
msgid "Working copy '%s' locked"
msgstr "工作副本“%s”已经锁定"
@@ -5007,8 +4807,7 @@
msgid "Path '%s' ends in '%s', which is unsupported for this operation"
msgstr "路径“%s”以“%s”结束，此操作不支持"
-#: libsvn_wc/lock.c:929
-#: libsvn_wc/lock.c:968
+#: libsvn_wc/lock.c:929 libsvn_wc/lock.c:968
#, c-format
msgid "Unable to check path existence for '%s'"
msgstr "无法检查路径“%s”是否存在"
@@ -5091,8 +4890,7 @@
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "“%s”丢失“timestamp”属性"
-#: libsvn_wc/log.c:795
-#: libsvn_wc/log.c:835
+#: libsvn_wc/log.c:795 libsvn_wc/log.c:835
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "取得“%s”的“affected time”出错"
@@ -5152,8 +4950,7 @@
msgid "Error comparing '%s' and '%s'"
msgstr "比较“%s”与“%s”出错"
-#: libsvn_wc/log.c:1450
-#: libsvn_wc/log.c:1517
+#: libsvn_wc/log.c:1450 libsvn_wc/log.c:1517
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "修改“%s”的入口出错"
@@ -5206,7 +5003,7 @@
msgid "Can't find entry '%s' in '%s'"
msgstr "无法在“%2$s”中找到项目“%1$s”"
-#: libsvn_wc/props.c:726
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5215,7 +5012,7 @@
"试图增加值为“%2$s”的新属性“%1$s”，\n"
"但是属性已经存在，值为“%3$s”。"
-#: libsvn_wc/props.c:764
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5224,12 +5021,12 @@
"试图把属性“%s”的值从“%s”改为“%s”，\n"
"但是属性并不存在。"
-#: libsvn_wc/props.c:809
+#: libsvn_wc/props.c:808
#, c-format
msgid "Trying to delete property '%s' but value has been modified from '%s' to '%s'."
msgstr "试图删除属性“%s”，但是它的值已经从“%s”改为“%s”。"
-#: libsvn_wc/props.c:838
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5238,55 +5035,52 @@
"试图把属性“%s”的值从“%s”改为“%s”，\n"
"但是属性的值已经是“%s”了。"
-#: libsvn_wc/props.c:1023
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "wcprops文件“%s”丢失了行结束符"
-#: libsvn_wc/props.c:1206
-#: libsvn_wc/props.c:1238
-#: libsvn_wc/props.c:1508
-#: libsvn_wc/props.c:1756
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "无法从磁盘装载属性"
-#: libsvn_wc/props.c:1266
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "无法写入“%s”的属性哈系"
-#: libsvn_wc/props.c:1500
-#: libsvn_wc/props.c:1669
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "属性“%s”是项属性"
-#: libsvn_wc/props.c:1547
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "无法设定“%s”于目录 (“%s”)"
-#: libsvn_wc/props.c:1555
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "无法设定“%s”于文件 (“%s”)"
-#: libsvn_wc/props.c:1561
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "“%s”不是文件或目录"
-#: libsvn_wc/props.c:1642
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "文件“%s”有二进制的 mime 类型属性"
-#: libsvn_wc/props.c:2508
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "解析 %s 属性于“%s”出错: “%s”"
-#: libsvn_wc/props.c:2521
+#: libsvn_wc/props.c:2520
#, c-format
msgid "Invalid %s property on '%s': target involves '.' or '..' or is an absolute path"
msgstr "无效属性 %s 于“%s”: 目标包含“.”或“..”或是绝对路径"
@@ -5390,12 +5184,12 @@
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "“%s”的校验和不匹配；记录: “%s”，实际: “%s”"
-#: libsvn_wc/update_editor.c:3003
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "“%s”没有演进历程信息"
-#: libsvn_wc/update_editor.c:3162
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Copyfrom-url“%s”与“%s”的仓库根目录不相同"
@@ -5404,14 +5198,11 @@
msgid "Unable to make any directories"
msgstr "无法创建任何目录"
-#: svn/blame-cmd.c:206
-#: svn/list-cmd.c:227
+#: svn/blame-cmd.c:206 svn/list-cmd.c:227
msgid "'verbose' option invalid in XML mode"
msgstr "在XML模式中“verbose”选项无效"
-#: svn/blame-cmd.c:218
-#: svn/info-cmd.c:511
-#: svn/list-cmd.c:239
+#: svn/blame-cmd.c:218 svn/info-cmd.c:511 svn/list-cmd.c:239
#: svn/status-cmd.c:249
msgid "'incremental' option only valid in XML mode"
msgstr "只有在XML模式“incremental”选项才有效"
@@ -5421,30 +5212,23 @@
msgid "Skipping binary file: '%s'\n"
msgstr "略过二进制文件: “%s”\n"
-#: svn/changelist-cmd.c:61
-#: svn/info-cmd.c:477
-#: svn/log-cmd.c:410
+#: svn/changelist-cmd.c:61 svn/info-cmd.c:477 svn/log-cmd.c:410
#: svn/revert-cmd.c:58
#, c-format
msgid "no such changelist '%s'"
msgstr "没有修改列表“%s”"
-#: svn/checkout-cmd.c:129
-#: svn/switch-cmd.c:135
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "“%s”不像是URL"
-#: svn/copy-cmd.c:124
-#: svn/delete-cmd.c:64
-#: svn/mkdir-cmd.c:66
-#: svn/move-cmd.c:76
+#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66 svn/move-cmd.c:76
#: svn/propedit-cmd.c:201
msgid "Local, non-commit operations do not take a log message or revision properties"
msgstr "本地操作，非提交操作无须日志信息或版本属性"
-#: svn/diff-cmd.c:117
-#: svnserve/main.c:546
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "无法打开标准输出"
@@ -5501,8 +5285,7 @@
"Subversion 是版本控制工具。\n"
"欲取得详细资料，请参见 http://subversion.tigris.org/\n"
-#: svn/help-cmd.c:65
-#: svnsync/main.c:1429
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -5528,14 +5311,12 @@
msgid "'%s' has invalid revision"
msgstr "“%s”的版本无效"
-#: svn/info-cmd.c:250
-#: svnadmin/main.c:1118
+#: svn/info-cmd.c:250 svnadmin/main.c:1118
#, c-format
msgid "Path: %s\n"
msgstr "路径: %s\n"
-#: svn/info-cmd.c:256
-#: svnlook/main.c:738
+#: svn/info-cmd.c:256 svnlook/main.c:738
#, c-format
msgid "Name: %s\n"
msgstr "名称: %s\n"
@@ -5775,16 +5556,9 @@
msgid "force validity of log message source"
msgstr "强制校验日志信息资源"
-#: svn/main.c:63
-#: svn/main.c:64
-#: svnadmin/main.c:230
-#: svnadmin/main.c:233
-#: svndumpfilter/main.c:780
-#: svndumpfilter/main.c:783
-#: svnlook/main.c:90
-#: svnlook/main.c:102
-#: svnsync/main.c:135
-#: svnsync/main.c:137
+#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:230 svnadmin/main.c:233
+#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
+#: svnlook/main.c:102 svnsync/main.c:135 svnsync/main.c:137
msgid "show help on a subcommand"
msgstr "显示子命令帮助信息"
@@ -5844,12 +5618,8 @@
msgid "treat value as being in charset encoding ARG"
msgstr "将ARG的值视为字符编码"
-#: svn/main.c:92
-#: svnadmin/main.c:236
-#: svndumpfilter/main.c:786
-#: svnlook/main.c:129
-#: svnserve/main.c:151
-#: svnsync/main.c:133
+#: svn/main.c:92 svnadmin/main.c:236 svndumpfilter/main.c:786
+#: svnlook/main.c:129 svnserve/main.c:151 svnsync/main.c:133
#: svnversion/main.c:125
msgid "show program version information"
msgstr "显示程序版本信息"
@@ -5927,13 +5697,11 @@
msgid "disregard default and svn:ignore property ignores"
msgstr "忽略默认值和 svn:ignore 属性"
-#: svn/main.c:142
-#: svnsync/main.c:113
+#: svn/main.c:142 svnsync/main.c:113
msgid "do not cache authentication tokens"
msgstr "不要缓存用户认证令牌"
-#: svn/main.c:144
-#: svnsync/main.c:111
+#: svn/main.c:144 svnsync/main.c:111
msgid "do no interactive prompting"
msgstr "不要交互提示"
@@ -5941,8 +5709,7 @@
msgid "try operation but make no changes"
msgstr "尝试操作但没有修改"
-#: svn/main.c:148
-#: svnlook/main.c:108
+#: svn/main.c:148 svnlook/main.c:108
msgid "do not print differences for deleted files"
msgstr "不要输出删除文件造成的差异"
@@ -5990,9 +5757,7 @@
msgid "relocate via URL-rewriting"
msgstr "通过URL改写重新定位"
-#: svn/main.c:174
-#: svnadmin/main.c:272
-#: svnsync/main.c:131
+#: svn/main.c:174 svnadmin/main.c:272 svnsync/main.c:131
msgid "read user configuration files from directory ARG"
msgstr "从目录 ARG 读取用户配置文件"
@@ -7023,10 +6788,7 @@
" 作副本发生本地修改。仓库中的所有属性都应用于障碍路径。用第一列字符“E”\n"
" 来报告障碍路径。\n"
-#: svn/main.c:885
-#: svnadmin/main.c:78
-#: svnlook/main.c:289
-#: svnsync/main.c:180
+#: svn/main.c:885 svnadmin/main.c:78 svnlook/main.c:289 svnsync/main.c:180
msgid "Caught signal"
msgstr "捕捉到信号"
@@ -7046,8 +6808,7 @@
msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r"
msgstr "遇到了多个版本参数；不能指定 -c 两次或者同时使用 -c 和 -r"
-#: svn/main.c:1068
-#: svn/main.c:1290
+#: svn/main.c:1068 svn/main.c:1290
msgid "Can't specify -c with --old"
msgstr "不能同时指定-c和--old"
@@ -7063,8 +6824,7 @@
msgid "Multiple revision arguments encountered; can't specify -r and -c, or try '-r N:M' instead of '-r N -r M'"
msgstr "遇到了多个版本参数；不能同时指定 -r 和 -c，请使用“-r N:M”代替“-r N -r M"
-#: svn/main.c:1121
-#: svnadmin/main.c:1316
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "版本参数“%s”中有语法错误"
@@ -7079,8 +6839,7 @@
msgid "'%s' is not a valid depth; try 0, 1, or 2"
msgstr "“%s”不是有效的深度；尝试 0，1，或 2"
-#: svn/main.c:1306
-#: svn/main.c:1316
+#: svn/main.c:1306 svn/main.c:1316
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props 与 --no-auto-props 是互相排斥的"
@@ -7089,22 +6848,18 @@
msgid "Syntax error in native-eol argument '%s'"
msgstr "原生换行符号参数“%s”中有语法错误"
-#: svn/main.c:1413
-#: svndumpfilter/main.c:1207
-#: svnlook/main.c:2066
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "必须提供子命令参数\n"
-#: svn/main.c:1432
-#: svnadmin/main.c:1445
-#: svndumpfilter/main.c:1226
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "未知命令: “%s”\n"
-#: svn/main.c:1465
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7113,27 +6868,27 @@
"子命令“%s”不接受选项“%s”\n"
"输入“svn help %s”得到用法。\n"
-#: svn/main.c:1502
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr "日志信息文件受版本控制；请使用“--force-log”强制执行"
-#: svn/main.c:1509
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr "锁注释文件受版本控制；请使用“--force-log”强制执行"
-#: svn/main.c:1529
+#: svn/main.c:1526
msgid "The log message is a pathname (was -F intended?); use '--force-log' to override"
msgstr "日志信息是路径名称 (本来想用 -F 选项的吗？)；请使用“--force-log”强制执行"
-#: svn/main.c:1536
+#: svn/main.c:1533
msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override"
msgstr "锁注释是路径名称 (本来想用-F 选项的吗？)；请使用“--force-log”强制执行"
-#: svn/main.c:1671
+#: svn/main.c:1668
msgid "Try 'svn help' for more info"
msgstr "请使用“svn help”以得到更多信息"
-#: svn/main.c:1681
+#: svn/main.c:1678
msgid "svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)\n"
msgstr "svn: 运行“svn cleanup”删除锁定 (输入“svn help cleanup”得到用法)\n"
@@ -7141,8 +6896,7 @@
msgid "Second revision required"
msgstr "需要第二个版本"
-#: svn/merge-cmd.c:73
-#: svn/merge-cmd.c:97
+#: svn/merge-cmd.c:73 svn/merge-cmd.c:97
msgid "Too many arguments given"
msgstr "参数过多"
@@ -7352,9 +7106,7 @@
msgid "'%s' is not a valid Subversion property name"
msgstr "“%s”不是有效的 Subversion 属性名称"
-#: svn/propedit-cmd.c:105
-#: svn/propedit-cmd.c:243
-#: svn/propset-cmd.c:85
+#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:243 svn/propset-cmd.c:85
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr "不良编码选项: 属性取值未以 UTF8 储存"
@@ -7373,13 +7125,11 @@
msgid "Cannot specify revision for editing versioned property '%s'"
msgstr "编辑纳入版本控制的属性“%s”时不可指定版本"
-#: svn/propedit-cmd.c:154
-#: svn/propset-cmd.c:161
+#: svn/propedit-cmd.c:154 svn/propset-cmd.c:161
msgid "Explicit target argument required"
msgstr "必须明确地提供目标参数"
-#: svn/propedit-cmd.c:213
-#: svn/switch-cmd.c:148
+#: svn/propedit-cmd.c:213 svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "“%s”不像是工作副本路径"
@@ -7495,8 +7245,7 @@
msgid "Can't get working directory"
msgstr "无法取得工作目录"
-#: svn/util.c:189
-#: svn/util.c:212
+#: svn/util.c:189 svn/util.c:212
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "无法改变工作目录到“%s”"
@@ -7562,8 +7311,7 @@
msgid "Use --force to override this restriction"
msgstr "请使用 --force 选项强制执行"
-#: svnadmin/main.c:95
-#: svndumpfilter/main.c:62
+#: svnadmin/main.c:95 svndumpfilter/main.c:62
#, c-format
msgid "Can't open stdio file"
msgstr "无法打开标准输出/入文件"
@@ -7888,8 +7636,7 @@
msgid "Revisions must not be greater than the youngest revision (%ld)"
msgstr "版本号不能大于最新的版本号(%ld)"
-#: svnadmin/main.c:556
-#: svnadmin/main.c:655
+#: svnadmin/main.c:556 svnadmin/main.c:655
msgid "First revision cannot be higher than second"
msgstr "第一个版本不可大于第二个"
@@ -7917,9 +7664,7 @@
"\n"
"可用的子命令: \n"
-#: svnadmin/main.c:698
-#: svnlook/main.c:1687
-#: svnserve/main.c:207
+#: svnadmin/main.c:698 svnlook/main.c:1687 svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -7968,14 +7713,12 @@
msgid "Transaction '%s' removed.\n"
msgstr "事务“%s”被删除。\n"
-#: svnadmin/main.c:1009
-#: svnadmin/main.c:1036
+#: svnadmin/main.c:1009 svnadmin/main.c:1036
#, c-format
msgid "Missing revision"
msgstr "丢失版本"
-#: svnadmin/main.c:1012
-#: svnadmin/main.c:1039
+#: svnadmin/main.c:1012 svnadmin/main.c:1039
#, c-format
msgid "Only one revision allowed"
msgstr "只允许一个版本"
@@ -7990,26 +7733,22 @@
msgid "Exactly one file argument required"
msgstr "必须恰好提供一个文件参数"
-#: svnadmin/main.c:1119
-#: svnlook/main.c:1752
+#: svnadmin/main.c:1119 svnlook/main.c:1752
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID 标识: %s\n"
-#: svnadmin/main.c:1120
-#: svnlook/main.c:1753
+#: svnadmin/main.c:1120 svnlook/main.c:1753
#, c-format
msgid "Owner: %s\n"
msgstr "所有者: %s\n"
-#: svnadmin/main.c:1121
-#: svnlook/main.c:1754
+#: svnadmin/main.c:1121 svnlook/main.c:1754
#, c-format
msgid "Created: %s\n"
msgstr "已创建: %s\n"
-#: svnadmin/main.c:1122
-#: svnlook/main.c:1755
+#: svnadmin/main.c:1122 svnlook/main.c:1755
#, c-format
msgid "Expires: %s\n"
msgstr "过期: %s\n"
@@ -8046,16 +7785,16 @@
msgid "Removed lock on '%s'.\n"
msgstr "删除“%s”上的锁。\n"
-#: svnadmin/main.c:1302
+#: svnadmin/main.c:1303
msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr "遇到了多个版本参数；请使用“-r N:M”代替“-r M -r N”"
-#: svnadmin/main.c:1427
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "必须提供子命令参数\n"
-#: svnadmin/main.c:1512
+#: svnadmin/main.c:1502
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8064,7 +7803,7 @@
"子命令“%s”不接受选项“%s”\n"
"使用“svnadmin help %s”得到用法。\n"
-#: svnadmin/main.c:1545
+#: svnadmin/main.c:1535
msgid "Try 'svnadmin help' for more info"
msgstr "请使用“svnadmin help”以得到更多信息"
@@ -8455,9 +8194,7 @@
msgid "unknown"
msgstr "未知"
-#: svnlook/main.c:1183
-#: svnlook/main.c:1276
-#: svnlook/main.c:1305
+#: svnlook/main.c:1183 svnlook/main.c:1276 svnlook/main.c:1305
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "事务“%s”并非基于某个版本；多神秘啊！"
@@ -8505,8 +8242,7 @@
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "事务‘%3$s’中的路径‘%2$s’没有属性‘%1$s’"
-#: svnlook/main.c:1616
-#: svnlook/main.c:1831
+#: svnlook/main.c:1616 svnlook/main.c:1831
#, c-format
msgid "Missing repository path argument"
msgstr "未提供仓库路径参数"
@@ -8626,8 +8362,7 @@
msgid "run in foreground (useful for debugging)"
msgstr "在前台运行（调试用）"
-#: svnserve/main.c:149
-#: svnversion/main.c:123
+#: svnserve/main.c:149 svnversion/main.c:123
msgid "display this help"
msgstr "显示本帮助"
@@ -8686,61 +8421,61 @@
"\n"
"有效选项: \n"
-#: svnserve/main.c:458
+#: svnserve/main.c:444
#, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "svnserve: 根路径“%s”不存在，或者不是目录。\n"
-#: svnserve/main.c:507
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "您必须指定 -d, -i, -t 或 -X 中的一个。\n"
-#: svnserve/main.c:525
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "选项 --tunnel-user 只在隧道模式有效。\n"
-#: svnserve/main.c:594
+#: svnserve/main.c:576
#, c-format
msgid "svnserve: The --service flag is only valid if the process is started by the Service Control Manager.\n"
msgstr "svnserve: 只有被服务控制管理器启动时 --service 选项才有效。\n"
-#: svnserve/main.c:630
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "不能获取地址信息"
-#: svnserve/main.c:646
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "无法创建服务器套接字"
-#: svnserve/main.c:659
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "不能绑定服务器套接字"
-#: svnserve/main.c:727
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "无法接受客户连接"
-#: svnserve/main.c:781
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "无法创建线程属性"
-#: svnserve/main.c:789
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "不能设置分离的状态"
-#: svnserve/main.c:802
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "无法创建线程"
-#: svnserve/serve.c:1463
+#: svnserve/serve.c:1437
msgid "Path is not a string"
msgstr "路径不是字符串"
@@ -8905,10 +8640,8 @@
msgid "Destination repository is already synchronizing from '%s'"
msgstr "目标仓库已经与“%s”同步"
-#: svnsync/main.c:525
-#: svnsync/main.c:528
-#: svnsync/main.c:1202
-#: svnsync/main.c:1381
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, c-format
msgid "Path '%s' is not a URL"
msgstr "路径“%s”不是URL"
@@ -8942,24 +8675,22 @@
msgid "Commit created rev %ld but should have created %ld"
msgstr "提交创建版本 %ld，应该创建版本 %ld"
-#: svnsync/main.c:1274
-#: svnsync/main.c:1279
+#: svnsync/main.c:1275 svnsync/main.c:1280
#, c-format
msgid "Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr "不能在尚未同步时复制版本(%ld)的 revprops"
-#: svnsync/main.c:1331
+#: svnsync/main.c:1332
#, c-format
msgid "'%s' is not a valid revision range"
msgstr "“%s”不是有效的版本范围"
-#: svnsync/main.c:1345
-#: svnsync/main.c:1365
+#: svnsync/main.c:1346 svnsync/main.c:1366
#, c-format
msgid "Invalid revision number (%ld)"
msgstr "无效的版本号 (%ld)"
-#: svnsync/main.c:1422
+#: svnsync/main.c:1423
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -8973,11 +8704,11 @@
"\n"
"可用的子命令: \n"
-#: svnsync/main.c:1586
+#: svnsync/main.c:1581
msgid "Cannot use --username or --password with any of --source-username, --source-password, --sync-username, or --sync-password.\n"
msgstr "不能将 --username 或 --password 与 --source-username, --source-password, --sync-username, 或 --sync-password 一起使用。\n"
-#: svnsync/main.c:1666
+#: svnsync/main.c:1661
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8986,7 +8717,7 @@
"子命令“%s”不接受选项“%s”\n"
"使用“svnsync help %s”得到用法。\n"
-#: svnsync/main.c:1738
+#: svnsync/main.c:1733
msgid "Try 'svnsync help' for more info"
msgstr "请使用“svnsync help”以得到更多信息"
@@ -9059,13 +8790,12 @@
msgid "last changed rather than current revisions"
msgstr "最近一次改变的，而不是目前的版本"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "已导出 %s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "“%s”未纳入版本控制，并未导出\n"
-
diff --git a/subversion/po/zh_TW.po b/subversion/po/zh_TW.po
index 9772062..46f6933 100644
--- a/subversion/po/zh_TW.po
+++ b/subversion/po/zh_TW.po
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: subversion 1.1.0\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-01-22 11:09+0800\n"
+"POT-Creation-Date: 2007-04-06 09:20+0800\n"
"PO-Revision-Date: 2004-09-12 22:05+0800\n"
"Last-Translator: Subversion <dev@subversion.tigris.org>\n"
"Language-Team: Traditional Chinese <dev@subversion.tigris.org>\n"
@@ -86,8 +86,8 @@
msgid "Read error in pipe"
msgstr "管道發生讀取錯誤"
-#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:291
-#: libsvn_subr/cmdline.c:308 svn/util.c:742
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
+#: libsvn_subr/cmdline.c:316 svn/util.c:758
#, c-format
msgid "Write error"
msgstr "寫入錯誤"
@@ -239,609 +239,627 @@
msgid "Invalid switch"
msgstr "無效的切換"
-#: include/svn_error_codes.h:398
+#: include/svn_error_codes.h:397
+#, fuzzy
+msgid "Changelist doesn't match"
+msgstr "總和檢查值: %s\n"
+
+#: include/svn_error_codes.h:403
msgid "General filesystem error"
msgstr "一般性檔案系統錯誤"
-#: include/svn_error_codes.h:402
+#: include/svn_error_codes.h:407
msgid "Error closing filesystem"
msgstr "關閉檔案系統發生錯誤"
-#: include/svn_error_codes.h:406
+#: include/svn_error_codes.h:411
msgid "Filesystem is already open"
msgstr "檔案系統已開啟"
-#: include/svn_error_codes.h:410
+#: include/svn_error_codes.h:415
msgid "Filesystem is not open"
msgstr "檔案系檔未開啟"
-#: include/svn_error_codes.h:414
+#: include/svn_error_codes.h:419
msgid "Filesystem is corrupt"
msgstr "檔案系統損毀"
-#: include/svn_error_codes.h:418
+#: include/svn_error_codes.h:423
msgid "Invalid filesystem path syntax"
msgstr "無效的檔案系統路徑語法"
-#: include/svn_error_codes.h:422
+#: include/svn_error_codes.h:427
msgid "Invalid filesystem revision number"
msgstr "無效的檔案系統修訂版號碼"
-#: include/svn_error_codes.h:426
+#: include/svn_error_codes.h:431
msgid "Invalid filesystem transaction name"
msgstr "無效的檔案系統異動名稱"
-#: include/svn_error_codes.h:430
+#: include/svn_error_codes.h:435
msgid "Filesystem directory has no such entry"
msgstr "檔案系統目錄沒有這樣的項目"
-#: include/svn_error_codes.h:434
+#: include/svn_error_codes.h:439
msgid "Filesystem has no such representation"
msgstr "檔案系統沒有這樣的表現 (representation)"
-#: include/svn_error_codes.h:438
+#: include/svn_error_codes.h:443
msgid "Filesystem has no such string"
msgstr "檔案系統沒有這樣的字串"
-#: include/svn_error_codes.h:442
+#: include/svn_error_codes.h:447
msgid "Filesystem has no such copy"
msgstr "檔案系統沒有這樣的複本"
-#: include/svn_error_codes.h:446
+#: include/svn_error_codes.h:451
msgid "The specified transaction is not mutable"
msgstr "指定的異動不可更動"
-#: include/svn_error_codes.h:450
+#: include/svn_error_codes.h:455
msgid "Filesystem has no item"
msgstr "檔案系統沒有項目"
-#: include/svn_error_codes.h:454
+#: include/svn_error_codes.h:459
msgid "Filesystem has no such node-rev-id"
msgstr "檔案系統沒有這樣的 node-rev-id"
-#: include/svn_error_codes.h:458
+#: include/svn_error_codes.h:463
msgid "String does not represent a node or node-rev-id"
msgstr "字串並未表示一個節點或 node-rev-id"
-#: include/svn_error_codes.h:462
+#: include/svn_error_codes.h:467
msgid "Name does not refer to a filesystem directory"
msgstr "名稱沒有指向檔案系統目錄"
-#: include/svn_error_codes.h:466
+#: include/svn_error_codes.h:471
msgid "Name does not refer to a filesystem file"
msgstr "名稱沒有指向檔案系統檔案"
-#: include/svn_error_codes.h:470
+#: include/svn_error_codes.h:475
msgid "Name is not a single path component"
msgstr "名稱不是一個單一路徑元件"
-#: include/svn_error_codes.h:474
+#: include/svn_error_codes.h:479
msgid "Attempt to change immutable filesystem node"
msgstr "企圖要修改不可更動的檔案系統節點"
-#: include/svn_error_codes.h:478
+#: include/svn_error_codes.h:483
msgid "Item already exists in filesystem"
msgstr "該項目已存在於檔案系統中"
-#: include/svn_error_codes.h:482
+#: include/svn_error_codes.h:487
msgid "Attempt to remove or recreate fs root dir"
msgstr "企圖要移除或再次建立檔案系統的根目錄"
-#: include/svn_error_codes.h:486
+#: include/svn_error_codes.h:491
msgid "Object is not a transaction root"
msgstr "物件不是一個異動的根物件"
-#: include/svn_error_codes.h:490
+#: include/svn_error_codes.h:495
msgid "Object is not a revision root"
msgstr "物件不是一個修訂版的根物件"
-#: include/svn_error_codes.h:494
+#: include/svn_error_codes.h:499
msgid "Merge conflict during commit"
msgstr "送交時發生合併衝突"
# as-is
-#: include/svn_error_codes.h:498
+#: include/svn_error_codes.h:503
msgid "A representation vanished or changed between reads"
msgstr "A representation vanished or changed between reads"
-#: include/svn_error_codes.h:502
+#: include/svn_error_codes.h:507
msgid "Tried to change an immutable representation"
msgstr "嘗試變更一個不可更動的表現 (representation)"
-#: include/svn_error_codes.h:506
+#: include/svn_error_codes.h:511
msgid "Malformed skeleton data"
msgstr "有缺陷的骨架資料"
-#: include/svn_error_codes.h:510
+#: include/svn_error_codes.h:515
msgid "Transaction is out of date"
msgstr "異動已過時"
-#: include/svn_error_codes.h:514
+#: include/svn_error_codes.h:519
msgid "Berkeley DB error"
msgstr "Berkeley DB 錯誤"
-#: include/svn_error_codes.h:518
+#: include/svn_error_codes.h:523
msgid "Berkeley DB deadlock error"
msgstr "Berkeley DB 發生死結錯誤"
-#: include/svn_error_codes.h:522
+#: include/svn_error_codes.h:527
msgid "Transaction is dead"
msgstr "異動掛點"
-#: include/svn_error_codes.h:526
+#: include/svn_error_codes.h:531
msgid "Transaction is not dead"
msgstr "異動未結束"
-#: include/svn_error_codes.h:531
+#: include/svn_error_codes.h:536
msgid "Unknown FS type"
msgstr "未知的 FS 類別"
# as-is
-#: include/svn_error_codes.h:536
+#: include/svn_error_codes.h:541
msgid "No user associated with filesystem"
msgstr "No user associated with filesystem"
-#: include/svn_error_codes.h:541
+#: include/svn_error_codes.h:546
msgid "Path is already locked"
msgstr "路徑已被鎖定"
-#: include/svn_error_codes.h:546 include/svn_error_codes.h:678
+#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
msgid "Path is not locked"
msgstr "路徑未被鎖定"
-#: include/svn_error_codes.h:551
+#: include/svn_error_codes.h:556
msgid "Lock token is incorrect"
msgstr "鎖定符記不正確"
-#: include/svn_error_codes.h:556
+#: include/svn_error_codes.h:561
msgid "No lock token provided"
msgstr "未提供鎖定符記"
-#: include/svn_error_codes.h:561
+#: include/svn_error_codes.h:566
msgid "Username does not match lock owner"
msgstr "使用者名稱不符合鎖定擁有者"
-#: include/svn_error_codes.h:566
+#: include/svn_error_codes.h:571
msgid "Filesystem has no such lock"
msgstr "檔案系統沒有這樣的鎖定"
-#: include/svn_error_codes.h:571
+#: include/svn_error_codes.h:576
msgid "Lock has expired"
msgstr "鎖定已過期"
-#: include/svn_error_codes.h:576
+#: include/svn_error_codes.h:581
msgid "Item is out of date"
msgstr "項目已過時"
-#: include/svn_error_codes.h:588
+#: include/svn_error_codes.h:586
+#, fuzzy
+msgid "SQLite error"
+msgstr "寫入錯誤"
+
+#: include/svn_error_codes.h:598
msgid "Unsupported FS format"
msgstr "不支援的 FS 格式"
-#: include/svn_error_codes.h:593
+#: include/svn_error_codes.h:603
#, fuzzy
msgid "Representation is being written"
msgstr "表現不是 'delta' 類別"
-#: include/svn_error_codes.h:599
+#: include/svn_error_codes.h:609
msgid "The repository is locked, perhaps for db recovery"
msgstr "檔案庫被鎖定, 也許正在作資料庫修復"
-#: include/svn_error_codes.h:603
+#: include/svn_error_codes.h:613
msgid "A repository hook failed"
msgstr "檔案庫掛勾錯誤"
-#: include/svn_error_codes.h:607
+#: include/svn_error_codes.h:617
msgid "Incorrect arguments supplied"
msgstr "使用不正確的引數"
-#: include/svn_error_codes.h:611
+#: include/svn_error_codes.h:621
msgid "A report cannot be generated because no data was supplied"
msgstr "無法產生回報, 因為沒有提供任何資料"
-#: include/svn_error_codes.h:615
+#: include/svn_error_codes.h:625
msgid "Bogus revision report"
msgstr "有問題的修訂版回報"
-#: include/svn_error_codes.h:624
+#: include/svn_error_codes.h:634
msgid "Unsupported repository version"
msgstr "不支援的檔案庫版本"
-#: include/svn_error_codes.h:628
+#: include/svn_error_codes.h:638
msgid "Disabled repository feature"
msgstr "關閉了的檔案庫功能"
-#: include/svn_error_codes.h:632
+#: include/svn_error_codes.h:642
msgid "Error running post-commit hook"
msgstr "執行 post-commit 掛勾時發生錯誤"
-#: include/svn_error_codes.h:637
+#: include/svn_error_codes.h:647
msgid "Error running post-lock hook"
msgstr "執行 post-lock 掛勾時發生錯誤"
-#: include/svn_error_codes.h:642
+#: include/svn_error_codes.h:652
msgid "Error running post-unlock hook"
msgstr "執行 post-unlock 掛勾時發生錯誤"
-#: include/svn_error_codes.h:649
+#: include/svn_error_codes.h:659
msgid "Bad URL passed to RA layer"
msgstr "傳遞至 RA 層的 URL 有問題"
-#: include/svn_error_codes.h:653
+#: include/svn_error_codes.h:663
msgid "Authorization failed"
msgstr "授權失敗"
-#: include/svn_error_codes.h:657
+#: include/svn_error_codes.h:667
msgid "Unknown authorization method"
msgstr "未知的授權方法"
-#: include/svn_error_codes.h:661
+#: include/svn_error_codes.h:671
msgid "Repository access method not implemented"
msgstr "該檔案庫存取方法未實作"
-#: include/svn_error_codes.h:665
+#: include/svn_error_codes.h:675
msgid "Item is out-of-date"
msgstr "項目已過時"
-#: include/svn_error_codes.h:669
+#: include/svn_error_codes.h:679
msgid "Repository has no UUID"
msgstr "檔案庫沒有 UUID"
-#: include/svn_error_codes.h:673
+#: include/svn_error_codes.h:683
msgid "Unsupported RA plugin ABI version"
msgstr "不支援的 RA 外掛 ABI 版本"
-#: include/svn_error_codes.h:685
+#: include/svn_error_codes.h:695
msgid "RA layer failed to init socket layer"
msgstr "RA 層無法起始 socket 層"
-#: include/svn_error_codes.h:689
+#: include/svn_error_codes.h:699
msgid "RA layer failed to create HTTP request"
msgstr "RA 層建立 HTTP 要求失敗"
-#: include/svn_error_codes.h:693
+#: include/svn_error_codes.h:703
msgid "RA layer request failed"
msgstr "RA 層要求失敗"
-#: include/svn_error_codes.h:697
+#: include/svn_error_codes.h:707
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA 層無法取得要求的 OPTIONS 資訊"
-#: include/svn_error_codes.h:701
+#: include/svn_error_codes.h:711
msgid "RA layer failed to fetch properties"
msgstr "RA 層無法取得性質"
-#: include/svn_error_codes.h:705
+#: include/svn_error_codes.h:715
msgid "RA layer file already exists"
msgstr "RA 層檔案已存在"
-#: include/svn_error_codes.h:709
+#: include/svn_error_codes.h:719
msgid "Invalid configuration value"
msgstr "無效的配置值"
-#: include/svn_error_codes.h:713
+#: include/svn_error_codes.h:723
msgid "HTTP Path Not Found"
msgstr "找不到 HTTP 路徑"
-#: include/svn_error_codes.h:717
+#: include/svn_error_codes.h:727
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "執行 WebDAV PROPPATCH 失敗"
-#: include/svn_error_codes.h:722 include/svn_error_codes.h:763
-#: libsvn_ra_svn/marshal.c:612 libsvn_ra_svn/marshal.c:720
-#: libsvn_ra_svn/marshal.c:747
+#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
+#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
+#: libsvn_ra_svn/marshal.c:774
msgid "Malformed network data"
msgstr "有缺陷的網路資料"
-#: include/svn_error_codes.h:727
+#: include/svn_error_codes.h:737
msgid "Unable to extract data from response header"
msgstr "無法自回應檔頭取得資料"
-#: include/svn_error_codes.h:732
+#: include/svn_error_codes.h:742
#, fuzzy
msgid "Repository has been moved"
msgstr "檔案庫沒有 UUID"
-#: include/svn_error_codes.h:738 include/svn_error_codes.h:767
+#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
msgid "Couldn't find a repository"
msgstr "無法找到檔案庫"
-#: include/svn_error_codes.h:742
+#: include/svn_error_codes.h:752
msgid "Couldn't open a repository"
msgstr "無法開啟檔案庫"
# as-is
-#: include/svn_error_codes.h:747
+#: include/svn_error_codes.h:757
msgid "Special code for wrapping server errors to report to client"
msgstr "Special code for wrapping server errors to report to client"
-#: include/svn_error_codes.h:751
+#: include/svn_error_codes.h:761
msgid "Unknown svn protocol command"
msgstr "未知的 svn 通訊協定命令"
-#: include/svn_error_codes.h:755
+#: include/svn_error_codes.h:765
msgid "Network connection closed unexpectedly"
msgstr "網路連線無預期地關閉"
-#: include/svn_error_codes.h:759
+#: include/svn_error_codes.h:769
msgid "Network read/write error"
msgstr "網路讀寫錯誤"
-#: include/svn_error_codes.h:771
+#: include/svn_error_codes.h:781
msgid "Client/server version mismatch"
msgstr "用戶端/伺服器版本不匹配"
-#: include/svn_error_codes.h:779
+#: include/svn_error_codes.h:786
+msgid "Cannot negotiate authentication mechanism"
+msgstr "無法協商出認識機制"
+
+#: include/svn_error_codes.h:795
msgid "Credential data unavailable"
msgstr "無法取得憑證資料"
-#: include/svn_error_codes.h:783
+#: include/svn_error_codes.h:799
msgid "No authentication provider available"
msgstr "無可用的認證供給者"
-#: include/svn_error_codes.h:787 include/svn_error_codes.h:791
+#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
msgid "All authentication providers exhausted"
msgstr "所有的認證供給者已耗盡"
-#: include/svn_error_codes.h:797
+#: include/svn_error_codes.h:813
msgid "Read access denied for root of edit"
msgstr "編輯的根目錄讀取拒絕"
-#: include/svn_error_codes.h:802
+#: include/svn_error_codes.h:818
msgid "Item is not readable"
msgstr "項目無法讀取"
-#: include/svn_error_codes.h:807
+#: include/svn_error_codes.h:823
msgid "Item is partially readable"
msgstr "項目只有部份可讀取"
-#: include/svn_error_codes.h:811
+#: include/svn_error_codes.h:827
msgid "Invalid authz configuration"
msgstr "無效的 authz 設定"
-#: include/svn_error_codes.h:816
+#: include/svn_error_codes.h:832
msgid "Item is not writable"
msgstr "項目無法寫入"
-#: include/svn_error_codes.h:822
+#: include/svn_error_codes.h:838
msgid "Svndiff data has invalid header"
msgstr "svndiff 資料包含了無效的檔頭"
# as-is
-#: include/svn_error_codes.h:826
+#: include/svn_error_codes.h:842
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff data contains corrupt window"
# as-is
-#: include/svn_error_codes.h:830
+#: include/svn_error_codes.h:846
msgid "Svndiff data contains backward-sliding source view"
msgstr "Svndiff data contains backward-sliding source view"
-#: include/svn_error_codes.h:834
+#: include/svn_error_codes.h:850
msgid "Svndiff data contains invalid instruction"
msgstr "svndiff 資料包含了無效的指令"
-#: include/svn_error_codes.h:838
+#: include/svn_error_codes.h:854
msgid "Svndiff data ends unexpectedly"
msgstr "svndiff 資料無預期地結束"
-#: include/svn_error_codes.h:842
+#: include/svn_error_codes.h:858
msgid "Svndiff compressed data is invalid"
msgstr "無效的 svndiff 壓縮資料"
-#: include/svn_error_codes.h:848
+#: include/svn_error_codes.h:864
msgid "Diff data source modified unexpectedly"
msgstr "差異的資料來源被無預期地更改"
-#: include/svn_error_codes.h:854
+#: include/svn_error_codes.h:870
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache 沒有指向 SVN 檔案系統的路徑"
-#: include/svn_error_codes.h:858
+#: include/svn_error_codes.h:874
msgid "Apache got a malformed URI"
msgstr "Apache 得到一個有缺陷的 URI"
# as-is
-#: include/svn_error_codes.h:862
+#: include/svn_error_codes.h:878
msgid "Activity not found"
msgstr "Activity not found"
-#: include/svn_error_codes.h:866
+#: include/svn_error_codes.h:882
msgid "Baseline incorrect"
msgstr "基線不正確"
-#: include/svn_error_codes.h:870
+#: include/svn_error_codes.h:886
msgid "Input/output error"
msgstr "輸出入錯誤"
-#: include/svn_error_codes.h:876
+#: include/svn_error_codes.h:892
msgid "A path under version control is needed for this operation"
msgstr "本動作僅能作用於納入版本控制的路徑"
-#: include/svn_error_codes.h:880
+#: include/svn_error_codes.h:896
msgid "Repository access is needed for this operation"
msgstr "本動作需要對檔案庫進行存取"
-#: include/svn_error_codes.h:884
+#: include/svn_error_codes.h:900
msgid "Bogus revision information given"
msgstr "使用了有問題的修訂版資訊"
-#: include/svn_error_codes.h:888
+#: include/svn_error_codes.h:904
msgid "Attempting to commit to a URL more than once"
msgstr "企圖對 URL 進行一次以上的送交"
-#: include/svn_error_codes.h:892
+#: include/svn_error_codes.h:908
msgid "Operation does not apply to binary file"
msgstr "本動作不適用於二進制檔案"
-#: include/svn_error_codes.h:898
+#: include/svn_error_codes.h:914
msgid "Format of an svn:externals property was invalid"
msgstr "svn:externals 性質的格式是無效的"
-#: include/svn_error_codes.h:902
+#: include/svn_error_codes.h:918
msgid "Attempting restricted operation for modified resource"
msgstr "企圖對已修改的資源進行受限的作業"
-#: include/svn_error_codes.h:906
+#: include/svn_error_codes.h:922
msgid "Operation does not apply to directory"
msgstr "本動作不適用於目錄"
-#: include/svn_error_codes.h:910
+#: include/svn_error_codes.h:926
msgid "Revision range is not allowed"
msgstr "不允許的修訂版範圍"
-#: include/svn_error_codes.h:914
+#: include/svn_error_codes.h:930
msgid "Inter-repository relocation not allowed"
msgstr "不支援不同檔案庫之間的重新安置 (relocation)"
-#: include/svn_error_codes.h:918
+#: include/svn_error_codes.h:934
msgid "Author name cannot contain a newline"
msgstr "作者名稱不可包含換列字元"
-#: include/svn_error_codes.h:922
+#: include/svn_error_codes.h:938
msgid "Bad property name"
msgstr "有問題的性質名稱"
-#: include/svn_error_codes.h:927
+#: include/svn_error_codes.h:943
msgid "Two versioned resources are unrelated"
msgstr "兩個納入版本控制的資源沒有相關性"
-#: include/svn_error_codes.h:932
+#: include/svn_error_codes.h:948
msgid "Path has no lock token"
msgstr "路徑無鎖定符記"
-#: include/svn_error_codes.h:937
+#: include/svn_error_codes.h:953
#, fuzzy
msgid "Operation does not support multiple sources"
msgstr "本動作不適用於目錄"
-#: include/svn_error_codes.h:943
+#: include/svn_error_codes.h:959
msgid "A problem occurred; see later errors for details"
msgstr "有問題發生; 請參閱隨附的細節"
-#: include/svn_error_codes.h:947
+#: include/svn_error_codes.h:963
msgid "Failure loading plugin"
msgstr "載入外掛失敗"
-#: include/svn_error_codes.h:951
+#: include/svn_error_codes.h:967
msgid "Malformed file"
msgstr "有缺陷的檔案"
-#: include/svn_error_codes.h:955
+#: include/svn_error_codes.h:971
msgid "Incomplete data"
msgstr "不完全的資料"
-#: include/svn_error_codes.h:959
+#: include/svn_error_codes.h:975
msgid "Incorrect parameters given"
msgstr "使用不正確的參數"
-#: include/svn_error_codes.h:963
+#: include/svn_error_codes.h:979
msgid "Tried a versioning operation on an unversioned resource"
msgstr "試著對未納入版本控制的資源進行版本控制動作"
-#: include/svn_error_codes.h:967
+#: include/svn_error_codes.h:983
msgid "Test failed"
msgstr "測試失敗"
-#: include/svn_error_codes.h:971
+#: include/svn_error_codes.h:987
msgid "Trying to use an unsupported feature"
msgstr "試著要使用不支援的功能"
-#: include/svn_error_codes.h:975
+#: include/svn_error_codes.h:991
msgid "Unexpected or unknown property kind"
msgstr "不預期或未知的性質種類"
-#: include/svn_error_codes.h:979
+#: include/svn_error_codes.h:995
msgid "Illegal target for the requested operation"
msgstr "對要求的動作來說是不合法的目標"
-#: include/svn_error_codes.h:983
+#: include/svn_error_codes.h:999
msgid "MD5 checksum is missing"
msgstr "沒有 MD5 檢查值"
-#: include/svn_error_codes.h:987
+#: include/svn_error_codes.h:1003
msgid "Directory needs to be empty but is not"
msgstr "目錄必須為空的, 但是結果並非如此"
-#: include/svn_error_codes.h:991
+#: include/svn_error_codes.h:1007
msgid "Error calling external program"
msgstr "呼叫外部程式時發生錯誤"
-#: include/svn_error_codes.h:995
+#: include/svn_error_codes.h:1011
msgid "Python exception has been set with the error"
msgstr "Python 例外已被設定為錯誤"
-#: include/svn_error_codes.h:999
+#: include/svn_error_codes.h:1015
msgid "A checksum mismatch occurred"
msgstr "總和檢查值不符"
-#: include/svn_error_codes.h:1003
+#: include/svn_error_codes.h:1019
msgid "The operation was interrupted"
msgstr "動作被中斷"
-#: include/svn_error_codes.h:1007
+#: include/svn_error_codes.h:1023
msgid "The specified diff option is not supported"
msgstr "指定的 diff 選項不支援"
-#: include/svn_error_codes.h:1011
+#: include/svn_error_codes.h:1027
msgid "Property not found"
msgstr "找不到性質"
-#: include/svn_error_codes.h:1015
+#: include/svn_error_codes.h:1031
msgid "No auth file path available"
msgstr "未提供 auth 檔案路徑"
-#: include/svn_error_codes.h:1020
+#: include/svn_error_codes.h:1035
+msgid "Merge info parse error"
+msgstr ""
+
+#: include/svn_error_codes.h:1040
msgid "Incompatible library version"
msgstr "不相容的程式庫版本"
-#: include/svn_error_codes.h:1026
+#: include/svn_error_codes.h:1046
#, fuzzy
msgid "Error parsing arguments"
msgstr "用戶端於剖析引數時發生錯誤"
-#: include/svn_error_codes.h:1030
+#: include/svn_error_codes.h:1050
#, fuzzy
msgid "Not enough arguments provided"
msgstr "未提供足夠的引數"
-#: include/svn_error_codes.h:1034
+#: include/svn_error_codes.h:1054
msgid "Mutually exclusive arguments specified"
msgstr "指定了互斥的引數"
-#: include/svn_error_codes.h:1038
+#: include/svn_error_codes.h:1058
msgid "Attempted command in administrative dir"
msgstr "企圖於管理目錄中執行命令"
-#: include/svn_error_codes.h:1042
+#: include/svn_error_codes.h:1062
msgid "The log message file is under version control"
msgstr "紀錄訊息檔於版本控制之下"
-#: include/svn_error_codes.h:1046
+#: include/svn_error_codes.h:1066
msgid "The log message is a pathname"
msgstr "紀錄訊息是路徑名"
-#: include/svn_error_codes.h:1050
+#: include/svn_error_codes.h:1070
msgid "Committing in directory scheduled for addition"
msgstr "於預計新增的目錄中進行送交"
-#: include/svn_error_codes.h:1054
+#: include/svn_error_codes.h:1074
msgid "No external editor available"
msgstr "無法使用外部編輯器"
-#: include/svn_error_codes.h:1058
+#: include/svn_error_codes.h:1078
msgid "Something is wrong with the log message's contents"
msgstr "紀錄訊息的內容有不妥的地方"
-#: include/svn_error_codes.h:1062
+#: include/svn_error_codes.h:1082
msgid "A log message was given where none was necessary"
msgstr "給了一個送交訊息, 但是根本不需要"
-#: libsvn_client/add.c:344 libsvn_wc/copy.c:188
+#: libsvn_client/add.c:345 libsvn_wc/copy.c:188
#, c-format
msgid "Can't close directory '%s'"
msgstr "無法關閉目錄 '%s'"
-#: libsvn_client/add.c:352
+#: libsvn_client/add.c:353
#, c-format
msgid "Error during recursive add of '%s'"
msgstr "進行 '%s' 的遞迴式新增時發生錯誤"
@@ -859,7 +877,7 @@
msgid "Start revision must precede end revision"
msgstr "起始修訂版必須大於結束修訂版"
-#: libsvn_client/blame.c:725 libsvn_client/cat.c:208
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL '%s' 指向一個目錄"
@@ -869,41 +887,36 @@
msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
msgstr "修訂版動作 '%c' 對修訂版 %ld 於 '%s' 缺少前一個修訂版"
-#: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "'%s' 尚未納入版本控制或不存在"
-
-#: libsvn_client/cat.c:79
+#: libsvn_client/cat.c:74
#, c-format
msgid "'%s' refers to a directory"
msgstr "'%s' 指向一個目錄"
# as-is
-#: libsvn_client/cat.c:131 libsvn_client/export.c:183
+#: libsvn_client/cat.c:126 libsvn_client/export.c:183
msgid "(local)"
msgstr "(local)"
-#: libsvn_client/checkout.c:92
+#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL '%s' 不存在"
-#: libsvn_client/checkout.c:96
+#: libsvn_client/checkout.c:95
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL '%s' 指向一個檔案, 而非目錄"
-#: libsvn_client/checkout.c:167
+#: libsvn_client/checkout.c:168
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "'%s' 已是不同 URL 的工作複本"
-#: libsvn_client/checkout.c:171
+#: libsvn_client/checkout.c:172
msgid "; run 'svn update' to complete it"
msgstr "; 請執行 'svn update' 以完成目前的動作"
-#: libsvn_client/checkout.c:181
+#: libsvn_client/checkout.c:182
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "'%s' 已存在, 但不是目錄"
@@ -917,118 +930,98 @@
msgid "New entry name required when importing a file"
msgstr "匯入檔案時, 需要一個新的項目名稱"
-#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:997 libsvn_wc/questions.c:91
+#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1016
+#: libsvn_wc/questions.c:92
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: libsvn_client/commit.c:606 libsvn_client/copy.c:283 svnlook/main.c:1204
+#: libsvn_client/commit.c:607 libsvn_client/copy.c:286 svnlook/main.c:1216
#, c-format
msgid "Path '%s' does not exist"
msgstr "路徑 '%s' 不存在"
-#: libsvn_client/commit.c:737 libsvn_client/copy.c:292
-#: libsvn_client/copy.c:617 libsvn_client/copy.c:868 libsvn_client/copy.c:1194
+#: libsvn_client/commit.c:741 libsvn_client/copy.c:295
+#: libsvn_client/copy.c:759 libsvn_client/copy.c:1025
+#: libsvn_client/copy.c:1417
#, c-format
msgid "Path '%s' already exists"
msgstr "路徑 '%s' 已存在"
-#: libsvn_client/commit.c:752
+#: libsvn_client/commit.c:756
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "'%s' 是一個保留的名稱, 無法被匯入"
-#: libsvn_client/commit.c:868 libsvn_client/copy.c:760
+#: libsvn_client/commit.c:872 libsvn_client/copy.c:909
msgid "Commit failed (details follow):"
msgstr "送交失敗 (細節隨附):"
-#: libsvn_client/commit.c:876 libsvn_client/copy.c:768
+#: libsvn_client/commit.c:880 libsvn_client/copy.c:917
msgid "Commit succeeded, but other errors follow:"
msgstr "送交成功, 但是發生了其它的錯誤, 如後:"
-#: libsvn_client/commit.c:883 libsvn_client/copy.c:775
+#: libsvn_client/commit.c:887 libsvn_client/copy.c:924
msgid "Error unlocking locked dirs (details follow):"
msgstr "解除鎖定目錄時發生錯誤 (細節隨附):"
-#: libsvn_client/commit.c:894
+#: libsvn_client/commit.c:898
msgid "Error bumping revisions post-commit (details follow):"
msgstr "post-commit 增加修訂版時發生錯誤 (細節隨附):"
-#: libsvn_client/commit.c:905 libsvn_client/copy.c:786
+#: libsvn_client/commit.c:909 libsvn_client/copy.c:935
msgid "Error in post-commit clean-up (details follow):"
msgstr "post-commit 清除時發生錯誤 (細節隨附):"
-#: libsvn_client/commit.c:1189
+#: libsvn_client/commit.c:1193
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "'%s' 是 URL, 但是 URL 不可為送交的目標"
-#: libsvn_client/commit.c:1388
+#: libsvn_client/commit.c:1392
msgid "Are all the targets part of the same working copy?"
msgstr "是否所有的目標都是同一個工作複本的一部份?"
-#: libsvn_client/commit.c:1403
+#: libsvn_client/commit.c:1407
msgid "Cannot non-recursively commit a directory deletion"
msgstr "無法以非遞迴式送交目錄刪除"
-#: libsvn_client/commit_util.c:252 libsvn_client/commit_util.c:263
+#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
#, c-format
msgid "Unknown entry kind for '%s'"
msgstr "未知的項目類型 '%s'"
-#: libsvn_client/commit_util.c:280
+#: libsvn_client/commit_util.c:284
#, c-format
msgid "Entry '%s' has unexpectedly changed special status"
msgstr "項目 '%s' 不預期地變換特殊狀態"
-#: libsvn_client/commit_util.c:331
+#: libsvn_client/commit_util.c:335
#, c-format
msgid "Aborting commit: '%s' remains in conflict"
msgstr "中止送交: '%s' 仍處於衝突狀態"
-#: libsvn_client/commit_util.c:397
+#: libsvn_client/commit_util.c:401
#, c-format
msgid "Did not expect '%s' to be a working copy root"
msgstr "並未預期 '%s' 是工作複本的根目錄"
-#: libsvn_client/commit_util.c:415 libsvn_client/commit_util.c:1065
+#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "送交項目 '%s' 有複製旗標, 但是沒有 copyfrom URL"
-#: libsvn_client/commit_util.c:705 libsvn_client/commit_util.c:853
-#: libsvn_client/copy.c:1485 libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1468 libsvn_client/diff.c:2198
-#: libsvn_client/diff.c:2793 libsvn_client/diff.c:2921
-#: libsvn_client/locking_commands.c:259 libsvn_client/log.c:133
-#: libsvn_client/prop_commands.c:354 libsvn_client/prop_commands.c:608
-#: libsvn_client/prop_commands.c:772 libsvn_client/prop_commands.c:1131
-#: libsvn_client/ra.c:181 libsvn_client/revisions.c:89
-#: libsvn_client/status.c:256 libsvn_client/switch.c:107
-#: libsvn_wc/adm_crawler.c:453 libsvn_wc/adm_crawler.c:477
-#: libsvn_wc/adm_ops.c:1350 libsvn_wc/adm_ops.c:2638 libsvn_wc/adm_ops.c:2664
-#: libsvn_wc/adm_ops.c:2700 libsvn_wc/adm_ops.c:2759 libsvn_wc/copy.c:307
-#: libsvn_wc/copy.c:663 libsvn_wc/copy.c:785 libsvn_wc/copy.c:792
-#: libsvn_wc/diff.c:1793 libsvn_wc/entries.c:2276 libsvn_wc/entries.c:2872
-#: libsvn_wc/props.c:484 libsvn_wc/props.c:1092 libsvn_wc/props.c:1543
-#: libsvn_wc/questions.c:186 libsvn_wc/questions.c:300 libsvn_wc/status.c:729
-#: libsvn_wc/translate.c:269 libsvn_wc/update_editor.c:2299
-#: libsvn_wc/update_editor.c:3150
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "'%s' 尚未納入版本控制"
-
-#: libsvn_client/commit_util.c:708
+#: libsvn_client/commit_util.c:709
#, c-format
msgid "Entry for '%s' has no URL"
msgstr "'%s' 的項目沒有 URL"
-#: libsvn_client/commit_util.c:741
+#: libsvn_client/commit_util.c:742
#, c-format
msgid "'%s' is scheduled for addition within unversioned parent"
msgstr "'%s' 於未納入版本控制的父路徑中被排入新增時程"
-#: libsvn_client/commit_util.c:761
+#: libsvn_client/commit_util.c:762
#, c-format
msgid ""
"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
@@ -1038,7 +1031,7 @@
"'%s' 項目被標示為 '已複製', 但是本身尚未排入新增時程. 也許你送交的\n"
"目標是位於未納入版本控制 (或尚未納入) 的目錄中?"
-#: libsvn_client/commit_util.c:802
+#: libsvn_client/commit_util.c:803
#, c-format
msgid ""
"'%s' is not under version control and is not part of the commit, yet its "
@@ -1046,87 +1039,92 @@
msgstr ""
"'%s' 尚未納入版本控制, 也不是送交的一部份, 但是它的子路徑 '%s' 是送交的一部份"
-#: libsvn_client/commit_util.c:920
+#: libsvn_client/commit_util.c:907
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr "無法送交 '%s' 與 '%s', 因為它們都指向同一個 URL"
-#: libsvn_client/commit_util.c:1070
+#: libsvn_client/commit_util.c:1057
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "送交項目 '%s' 有複製旗標, 但是修訂版無效"
-#: libsvn_client/copy.c:302 libsvn_client/copy.c:1204
-#: libsvn_client/update.c:78
+#: libsvn_client/commit_util.c:1822
+msgid "Standard properties can't be set explicitly as revision properties"
+msgstr ""
+
+#: libsvn_client/copy.c:305 libsvn_client/copy.c:1427
+#: libsvn_client/update.c:98
#, c-format
msgid "Path '%s' is not a directory"
msgstr "路徑 '%s' 不是目錄"
-#: libsvn_client/copy.c:516
+#: libsvn_client/copy.c:658
#, c-format
msgid ""
"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
"s')"
msgstr "來源與目的似乎不在同一個檔案庫中 (來源: '%s'; 目的: '%s')"
-#: libsvn_client/copy.c:598
+#: libsvn_client/copy.c:740
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "無法移動 URL '%s' 至本身"
-#: libsvn_client/copy.c:607 libsvn_client/prop_commands.c:226
+#: libsvn_client/copy.c:749 libsvn_client/prop_commands.c:229
#, c-format
msgid "Path '%s' does not exist in revision %ld"
msgstr "路徑 '%s' 不存在於修訂版 %ld"
-#: libsvn_client/copy.c:1043
+#: libsvn_client/copy.c:1259
#, c-format
msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
msgstr "來源 URL '%s' 來自其它的檔案庫; 把它當作是脫離的 WC"
-#: libsvn_client/copy.c:1181
+#: libsvn_client/copy.c:1404
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "路徑 '%s' 於修訂版 %ld 中找不到"
-#: libsvn_client/copy.c:1186
+#: libsvn_client/copy.c:1409
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "路徑 '%s' 於 HEAD 修訂版中找不到"
-#: libsvn_client/copy.c:1229
+#: libsvn_client/copy.c:1452
#, c-format
msgid "Entry for '%s' exists (though the working file is missing)"
msgstr "存在 '%s' 的項目 (不過工作檔案已消失)"
-#: libsvn_client/copy.c:1323 libsvn_client/log.c:86
+#: libsvn_client/copy.c:1546 libsvn_client/log.c:87
msgid "Revision type requires a working copy path, not a URL"
msgstr "修訂版類別使用工作複本路徑, 而非 URL"
-#: libsvn_client/copy.c:1357
-msgid "Cannot mix repository and working copy paths in source list"
-msgstr ""
+#: libsvn_client/copy.c:1581
+#, fuzzy
+msgid "Cannot mix repository and working copy sources"
+msgstr "路徑不是工作複本檔案"
-#: libsvn_client/copy.c:1398
+#: libsvn_client/copy.c:1623
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "無法複製路徑 '%s' 至其子目錄 '%s' 中"
-#: libsvn_client/copy.c:1418
+#: libsvn_client/copy.c:1643
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "無法移動路徑 '%s' 至其本身"
-#: libsvn_client/copy.c:1427
-msgid "No support for repos <--> working copy moves"
-msgstr "不支援檔案庫 <--> 工作複本移動"
+#: libsvn_client/copy.c:1652
+msgid "Moves between the working copy and the repository are not supported"
+msgstr ""
-#: libsvn_client/copy.c:1491
+#: libsvn_client/copy.c:1710
#, c-format
msgid "'%s' does not seem to have a URL associated with it"
msgstr "'%s' 似乎沒有關聯的 URL"
-#: libsvn_client/copy.c:1817 svn/move-cmd.c:67
+#: libsvn_client/copy.c:2048 svn/move-cmd.c:60
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "移動動作不可指定修訂版 (HEAD 除外)"
@@ -1135,266 +1133,290 @@
msgid "'%s' is in the way of the resource actually under version control"
msgstr "'%s' 擋了實際納入版本控制資源的路"
+#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2781 libsvn_wc/entries.c:1256
+#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2969
+#: libsvn_wc/update_editor.c:2178
+#, c-format
+msgid "'%s' is not under version control"
+msgstr "'%s' 尚未納入版本控制"
+
#: libsvn_client/delete.c:77
#, c-format
msgid "'%s' has local modifications"
msgstr "'%s' 已有本地修改"
+#: libsvn_client/diff.c:135
+#, fuzzy, c-format
+msgid " Reverted %s:r%s%s"
+msgstr "已復原 '%s'\n"
+
+#: libsvn_client/diff.c:153
+#, c-format
+msgid " Merged %s:r%s%s"
+msgstr ""
+
# as-is
-#: libsvn_client/diff.c:99
+#: libsvn_client/diff.c:175
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%sProperty changes on: %s%s"
# as-is
-#: libsvn_client/diff.c:127
+#: libsvn_client/diff.c:203
#, c-format
msgid "Name: %s%s"
msgstr "Name: %s%s"
-#: libsvn_client/diff.c:203
-#, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr "URL 中沒有綱要 ('%s' 與 '%s')"
-
-#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
-#, c-format
-msgid "URL has no scheme: '%s'"
-msgstr "URL 中沒有綱要: '%s'"
-
-#: libsvn_client/diff.c:222
-#, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "尚不支援混合的存取綱要 ('%s' 與 '%s')"
-
# as-is
-#: libsvn_client/diff.c:287
+#: libsvn_client/diff.c:322
#, c-format
msgid "%s\t(revision %ld)"
msgstr "%s\t(revision %ld)"
# as-is
-#: libsvn_client/diff.c:289
+#: libsvn_client/diff.c:324
#, c-format
msgid "%s\t(working copy)"
msgstr "%s\t(working copy)"
-#: libsvn_client/diff.c:432
+#: libsvn_client/diff.c:467
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "無法顯示: 檔案標示為二進制類型. %s"
-# as-is
-#. 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/diff.c:887
-msgid ".working"
-msgstr ".working"
-
-# as-is
-#: libsvn_client/diff.c:889
-#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".merge-left.r%ld"
-
-# as-is
-#: libsvn_client/diff.c:892
-#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".merge-right.r%ld"
-
-#: libsvn_client/diff.c:1533 libsvn_client/diff.c:1737
+#. -----------------------------------------------------------------------
+#. ** Utilities. **
+#. Sanity check -- ensure that we have valid revisions to look at.
+#: libsvn_client/diff.c:827 libsvn_client/merge.c:61
msgid "Not all required revisions are specified"
msgstr "並未提供全部所需的修訂版"
-#: libsvn_client/diff.c:1548
+#: libsvn_client/diff.c:842
msgid "At least one revision must be non-local for a pegged diff"
msgstr "對於 peg 差異, 必須至少有一個非本地端的修訂版"
-#: libsvn_client/diff.c:1660 libsvn_client/diff.c:1672
+#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
#, c-format
msgid "'%s' was not found in the repository at revision %ld"
msgstr "'%s' 於檔案庫的修訂版 %ld 找不到"
-#: libsvn_client/diff.c:2018
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+#: libsvn_client/diff.c:1025
+#, fuzzy
+msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
msgstr "抱歉, svn_client_diff3 以尚不支援的方式被叫用"
-#: libsvn_client/diff.c:2057
+#: libsvn_client/diff.c:1067
msgid ""
"Only diffs between a path's text-base and its working files are supported at "
"this time"
msgstr "目前只支援路徑的文件參考基礎與其工作檔案之間的檔案差異"
-#: libsvn_client/diff.c:2202 libsvn_client/switch.c:111
+#: libsvn_client/diff.c:1212 libsvn_client/switch.c:107
#, c-format
msgid "Directory '%s' has no URL"
msgstr "目錄 '%s' 沒有 URL"
# as-is
-#: libsvn_client/diff.c:2409
+#: libsvn_client/diff.c:1421
msgid "Summarizing diff can only compare repository to repository"
msgstr "Summarizing diff can only compare repository to repository"
-#: libsvn_client/diff.c:2766 libsvn_client/diff.c:2772
-#: libsvn_client/diff.c:2906 libsvn_client/locking_commands.c:263
-#: libsvn_client/ra.c:382 libsvn_client/ra.c:748 libsvn_client/ra.c:885
-#, c-format
-msgid "'%s' has no URL"
-msgstr "'%s' 沒有 URL"
-
#: libsvn_client/export.c:87
#, c-format
msgid "'%s' is not a valid EOL value"
msgstr "'%s' 不是一個有效的 EOL 值"
-#: libsvn_client/export.c:271
+#: libsvn_client/export.c:260
msgid "Destination directory exists, and will not be overwritten unless forced"
msgstr "目的目錄已存在, 除非強迫為之, 否則不會複寫過去"
-#: libsvn_client/export.c:369 libsvn_client/export.c:512
+#: libsvn_client/export.c:358 libsvn_client/export.c:501
#, c-format
msgid "'%s' exists and is not a directory"
msgstr "'%s' 已存在, 但不是目錄"
-#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#: libsvn_client/export.c:362 libsvn_client/export.c:505
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已存在"
-#: libsvn_client/export.c:687 libsvn_wc/update_editor.c:1759
-#: libsvn_wc/update_editor.c:2429
+#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
+#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
#, c-format
msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
msgstr "'%s' 的總和檢查值不符合; 預期: '%s', 實際: '%s'"
-#: libsvn_client/info.c:244
-#, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "無法讀取項目 '%s'"
-
-#: libsvn_client/info.c:380 libsvn_client/info.c:405 libsvn_client/info.c:415
+#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL '%s' 並不存在於修訂版 %ld 中"
-#: libsvn_client/list.c:225
+#: libsvn_client/list.c:222
#, c-format
msgid "URL '%s' non-existent in that revision"
msgstr "URL '%s' 並不存在於該修訂版中"
-#: libsvn_client/locking_commands.c:198
+#: libsvn_client/locking_commands.c:199
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "找不到共同的父路徑, 無法對不相交的引數進行處理"
-#: libsvn_client/locking_commands.c:287
+#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2062
+#: libsvn_client/merge.c:2068 libsvn_client/merge.c:2246
+#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
+#, c-format
+msgid "'%s' has no URL"
+msgstr "'%s' 沒有 URL"
+
+#: libsvn_client/locking_commands.c:284
msgid "Unable to lock/unlock across multiple repositories"
msgstr "無法在多個檔案庫之間進行鎖定/解鎖"
-#: libsvn_client/locking_commands.c:328
+#: libsvn_client/locking_commands.c:325
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "'%s' 未於這個工作複本中鎖定"
-#: libsvn_client/locking_commands.c:376
+#: libsvn_client/locking_commands.c:373
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被鎖定"
-#: libsvn_client/locking_commands.c:409 libsvn_ra/ra_loader.c:625
-msgid "Lock comment has illegal characters"
+#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:932
+#: libsvn_ra/ra_loader.c:863
+#, fuzzy
+msgid "Lock comment contains illegal characters"
msgstr "鎖定註解含有不合法的字元"
-#: libsvn_client/log.c:73
+#: libsvn_client/log.c:74
msgid "Missing required revision specification"
msgstr "未提供要求的修訂版規格"
-#: libsvn_client/log.c:139 libsvn_client/status.c:261
-#: libsvn_client/update.c:92
+#: libsvn_client/log.c:137 libsvn_client/status.c:271
+#: libsvn_client/update.c:112
#, c-format
msgid "Entry '%s' has no URL"
msgstr "項目 '%s' 沒有 URL"
-#: libsvn_client/log.c:370
+#: libsvn_client/log.c:368
msgid "No commits in repository"
msgstr "檔案庫中沒有任何送交"
-#: libsvn_client/prop_commands.c:71
+#: libsvn_client/merge.c:87
+#, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
+msgstr "URL 中沒有綱要 ('%s' 與 '%s')"
+
+#: libsvn_client/merge.c:93 libsvn_client/merge.c:99
+#, c-format
+msgid "URL has no scheme: '%s'"
+msgstr "URL 中沒有綱要: '%s'"
+
+#: libsvn_client/merge.c:106
+#, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr "尚不支援混合的存取綱要 ('%s' 與 '%s')"
+
+# as-is
+#. 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:328
+msgid ".working"
+msgstr ".working"
+
+# as-is
+#: libsvn_client/merge.c:330
+#, c-format
+msgid ".merge-left.r%ld"
+msgstr ".merge-left.r%ld"
+
+# as-is
+#: libsvn_client/merge.c:333
+#, c-format
+msgid ".merge-right.r%ld"
+msgstr ".merge-right.r%ld"
+
+#: libsvn_client/merge.c:1164
+#, c-format
+msgid ""
+"Path '%s' is in conflict, and must be resolved before the remainder of the "
+"requested merge can be applied"
+msgstr ""
+
+#: libsvn_client/merge.c:1457 libsvn_client/merge.c:1770
+msgid "Use of two URLs is not compatible with merge info modification"
+msgstr ""
+
+#: libsvn_client/prop_commands.c:73
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "'%s' 是工作複本性質, 因此無法供用戶端存取"
-#: libsvn_client/prop_commands.c:213
+#: libsvn_client/prop_commands.c:216
#, fuzzy, c-format
msgid "Property '%s' is not a regular property"
msgstr "性質 '%s' 是項目性質"
-#: libsvn_client/prop_commands.c:315
+#: libsvn_client/prop_commands.c:320
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "修訂版性質 '%s' 在此文脈中並不允許"
-#: libsvn_client/prop_commands.c:323 libsvn_client/prop_commands.c:442
+#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
#, c-format
msgid "Bad property name: '%s'"
msgstr "有問題的性質名稱: '%s'"
-#: libsvn_client/prop_commands.c:334
+#: libsvn_client/prop_commands.c:339
#, fuzzy, c-format
msgid "Setting property on non-local target '%s' needs a base revision"
msgstr "設定非本地目標 '%s' 的性質尚不支援"
-#: libsvn_client/prop_commands.c:340
+#: libsvn_client/prop_commands.c:345
#, fuzzy, c-format
msgid "Setting property recursively on non-local target '%s' is not supported"
msgstr "設定非本地目標 '%s' 的性質尚不支援"
-#: libsvn_client/prop_commands.c:438
+#: libsvn_client/prop_commands.c:439
msgid "Value will not be set unless forced"
msgstr "除非強迫為之, 否則其值不會被設定"
-#: libsvn_client/prop_commands.c:661
+#: libsvn_client/prop_commands.c:659
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "'%s' 不存在於修訂版 %ld"
-#: libsvn_client/prop_commands.c:668 libsvn_client/prop_commands.c:936
+#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:948
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "'%s' 為未知的節點類型"
-#: libsvn_client/ra.c:132
+#: libsvn_client/ra.c:133
#, c-format
msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
msgstr "企圖在非送交動作中, 設定工作複本性質 '%s' 於 '%s'"
-#: libsvn_client/ra.c:359
-#, c-format
-msgid "Can't find entry for '%s'"
-msgstr "無法找到 '%s' 的項目"
-
-#: libsvn_client/ra.c:503
+#: libsvn_client/ra.c:496
#, c-format
msgid "Missing changed-path information for '%s' in revision %ld"
msgstr "未提供 '%s' 於修訂版 %ld 的 changed-path 資訊"
-#: libsvn_client/ra.c:623
-#, c-format
-msgid "path '%s' doesn't exist in revision %ld"
+#: libsvn_client/ra.c:616
+#, fuzzy, c-format
+msgid "Path '%s' doesn't exist in revision %ld"
msgstr "路徑 '%s' 不存在於修訂版 %ld 中"
-#: libsvn_client/ra.c:670 libsvn_client/ra.c:833
+#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "無法找到 '%s' 的檔案庫位置於修訂版 %ld"
-#: libsvn_client/ra.c:681
+#: libsvn_client/ra.c:674
#, c-format
msgid "'%s' in revision %ld is an unrelated object"
msgstr "'%s' 於修訂版 %ld 是一個無關的物件"
-#: libsvn_client/ra.c:838
+#: libsvn_client/ra.c:831
#, c-format
msgid ""
"The location for '%s' for revision %ld does not exist in the repository or "
@@ -1412,16 +1434,26 @@
msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
msgstr "於 '%s' 的檔案庫有 uuid '%s', 但是工作複本的是 '%s'"
-#: libsvn_client/revisions.c:99
+#: libsvn_client/revisions.c:93
#, c-format
msgid "Path '%s' has no committed revision"
msgstr "路徑 '%s' 沒有被送交的修訂版"
-#: libsvn_client/revisions.c:109
+#: libsvn_client/revisions.c:103
#, c-format
msgid "Unrecognized revision type requested for '%s'"
msgstr "無法辨識要求的 '%s' 的修訂版類別"
+#: libsvn_client/update.c:138 libsvn_wc/log.c:2573
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr "'%s' 並不是工作複本目錄"
+
+#: libsvn_client/update.c:146
+#, fuzzy, c-format
+msgid "'%s' is neither a file nor a directory"
+msgstr "'%s' 不是檔案或目錄名稱"
+
#: libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
msgstr "svndiff 資料壓縮失敗"
@@ -1453,13 +1485,13 @@
msgstr "Invalid diff stream: insn %d overflows the target view"
# as-is
-#: libsvn_delta/svndiff.c:501
+#: libsvn_delta/svndiff.c:500
#, c-format
msgid "Invalid diff stream: [src] insn %d overflows the source view"
msgstr "Invalid diff stream: [src] insn %d overflows the source view"
# as-is
-#: libsvn_delta/svndiff.c:508
+#: libsvn_delta/svndiff.c:507
#, c-format
msgid ""
"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
@@ -1467,38 +1499,38 @@
"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
# as-is
-#: libsvn_delta/svndiff.c:515
+#: libsvn_delta/svndiff.c:514
#, c-format
msgid "Invalid diff stream: [new] insn %d overflows the new data section"
msgstr "Invalid diff stream: [new] insn %d overflows the new data section"
# as-is
-#: libsvn_delta/svndiff.c:525
+#: libsvn_delta/svndiff.c:524
msgid "Delta does not fill the target window"
msgstr "Delta does not fill the target window"
# as-is
-#: libsvn_delta/svndiff.c:528
+#: libsvn_delta/svndiff.c:527
msgid "Delta does not contain enough new data"
msgstr "Delta does not contain enough new data"
-#: libsvn_delta/svndiff.c:634
+#: libsvn_delta/svndiff.c:633
msgid "Svndiff has invalid header"
msgstr "Svndiff 資料包含了無效的檔頭"
# as-is
-#: libsvn_delta/svndiff.c:689 libsvn_delta/svndiff.c:845
+#: libsvn_delta/svndiff.c:688 libsvn_delta/svndiff.c:844
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff contains corrupt window header"
# as-is
-#: libsvn_delta/svndiff.c:698
+#: libsvn_delta/svndiff.c:697
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff has backwards-sliding source views"
# as-is
-#: libsvn_delta/svndiff.c:747 libsvn_delta/svndiff.c:794
-#: libsvn_delta/svndiff.c:867
+#: libsvn_delta/svndiff.c:746 libsvn_delta/svndiff.c:793
+#: libsvn_delta/svndiff.c:866
msgid "Unexpected end of svndiff input"
msgstr "Unexpected end of svndiff input"
@@ -1564,12 +1596,7 @@
msgid "Can't ungrab FS mutex"
msgstr "無法釋放 FS mutex"
-#: libsvn_fs/fs-loader.c:901
-#, fuzzy
-msgid "Lock comment contains illegal characters"
-msgstr "鎖定註解含有不合法的字元"
-
-#: libsvn_fs/fs-loader.c:907
+#: libsvn_fs/fs-loader.c:938
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "負的過期日期傳遞至 svn_fs_lock"
@@ -1586,15 +1613,15 @@
msgid "deleting changes"
msgstr "刪除更動"
-#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2385
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2504
msgid "Missing required node revision ID"
msgstr "未提供必須的節點修訂版 ID"
-#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2395
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2514
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "無效的更動順序: 有新的節點修訂版 ID 而沒刪除"
-#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2406
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2525
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "無效的更動順序: 對刪除路徑進行非新增的更動"
@@ -1713,109 +1740,109 @@
msgid "set repository uuid"
msgstr "設定檔案庫 uuid"
-#: libsvn_fs_base/dag.c:217
+#: libsvn_fs_base/dag.c:221
#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr "毀損的 DB: 檔案系統 '%s' 中的初始異動編號不為 '0'"
-#: libsvn_fs_base/dag.c:225
+#: libsvn_fs_base/dag.c:229
#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
msgstr "毀損的 DB: 檔案系統 '%s' 中的初始複本編號不為 '0'"
-#: libsvn_fs_base/dag.c:234
+#: libsvn_fs_base/dag.c:238
#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr "毀損的 DB: 檔案系統 '%s' 中的初始修訂版號不為 '0'"
-#: libsvn_fs_base/dag.c:282 libsvn_fs_base/dag.c:458 libsvn_fs_fs/dag.c:334
+#: libsvn_fs_base/dag.c:286 libsvn_fs_base/dag.c:462 libsvn_fs_fs/dag.c:333
msgid "Attempted to create entry in non-directory parent"
msgstr "企圖在非目錄的父項目建立一個項目"
-#: libsvn_fs_base/dag.c:452 libsvn_fs_fs/dag.c:328
+#: libsvn_fs_base/dag.c:456 libsvn_fs_fs/dag.c:327
#, c-format
msgid "Attempted to create a node with an illegal name '%s'"
msgstr "企圖以不合法的名稱 '%s' 建立一個節點"
-#: libsvn_fs_base/dag.c:464 libsvn_fs_base/dag.c:698 libsvn_fs_fs/dag.c:340
+#: libsvn_fs_base/dag.c:468 libsvn_fs_base/dag.c:702 libsvn_fs_fs/dag.c:339
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "企圖建立不可更動的節點的複本"
-#: libsvn_fs_base/dag.c:471
+#: libsvn_fs_base/dag.c:475
#, c-format
msgid "Attempted to create entry that already exists"
msgstr "企圖建立一個已存在的項目"
-#: libsvn_fs_base/dag.c:522 libsvn_fs_fs/dag.c:402
+#: libsvn_fs_base/dag.c:526 libsvn_fs_fs/dag.c:401
msgid "Attempted to set entry in non-directory node"
msgstr "企圖設定非目錄節點中的項目"
-#: libsvn_fs_base/dag.c:528 libsvn_fs_fs/dag.c:408
+#: libsvn_fs_base/dag.c:532 libsvn_fs_fs/dag.c:407
msgid "Attempted to set entry in immutable node"
msgstr "企圖在不可更動的節點中設定項目"
-#: libsvn_fs_base/dag.c:592
+#: libsvn_fs_base/dag.c:596
#, c-format
msgid "Can't set proplist on *immutable* node-revision %s"
msgstr "無法對 *不可更動* 的節點編號 %s 設定 proplist"
-#: libsvn_fs_base/dag.c:704
+#: libsvn_fs_base/dag.c:708
#, c-format
msgid "Attempted to make a child clone with an illegal name '%s'"
msgstr "企圖以不合法的名稱 '%s' 建立一個子複本"
-#: libsvn_fs_base/dag.c:830
+#: libsvn_fs_base/dag.c:834
#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "企圖自 *非* 目錄節點中刪除項目 '%s'"
-#: libsvn_fs_base/dag.c:836
+#: libsvn_fs_base/dag.c:840
#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "企圖自不可更動的節點刪除項目 '%s'"
-#: libsvn_fs_base/dag.c:843
+#: libsvn_fs_base/dag.c:847
#, c-format
msgid "Attempted to delete a node with an illegal name '%s'"
msgstr "企圖刪除一個有不合法名稱 '%s' 的節點"
-#: libsvn_fs_base/dag.c:858 libsvn_fs_base/dag.c:891
+#: libsvn_fs_base/dag.c:862 libsvn_fs_base/dag.c:895
#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "刪除失敗: 目錄沒有項目 '%s'"
-#: libsvn_fs_base/dag.c:940
+#: libsvn_fs_base/dag.c:944
#, c-format
msgid "Attempted removal of immutable node"
msgstr "企圖刪除不可更動的節點"
-#: libsvn_fs_base/dag.c:1060
+#: libsvn_fs_base/dag.c:1064
#, c-format
msgid "Attempted to get textual contents of a *non*-file node"
msgstr "企圖取得 *非* 檔案節點的文字內容"
-#: libsvn_fs_base/dag.c:1095
+#: libsvn_fs_base/dag.c:1099
#, c-format
msgid "Attempted to get length of a *non*-file node"
msgstr "企圖取得 *非* 檔案節點的長度"
-#: libsvn_fs_base/dag.c:1121
+#: libsvn_fs_base/dag.c:1125
#, c-format
msgid "Attempted to get checksum of a *non*-file node"
msgstr "企圖取得 *非* 檔案節點的總和檢查值"
-#: libsvn_fs_base/dag.c:1152 libsvn_fs_base/dag.c:1206
+#: libsvn_fs_base/dag.c:1156 libsvn_fs_base/dag.c:1210
#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
msgstr "企圖設定 *非* 文字節點的文字內容"
-#: libsvn_fs_base/dag.c:1158 libsvn_fs_base/dag.c:1212
+#: libsvn_fs_base/dag.c:1162 libsvn_fs_base/dag.c:1216
#, c-format
msgid "Attempted to set textual contents of an immutable node"
msgstr "企圖設定不可更動節點的文字內容"
-#: libsvn_fs_base/dag.c:1235
+#: libsvn_fs_base/dag.c:1239
#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
@@ -1826,12 +1853,12 @@
" 預期的: %s\n"
" 實際的: %s\n"
-#: libsvn_fs_base/dag.c:1290
+#: libsvn_fs_base/dag.c:1294
#, c-format
msgid "Attempted to open non-existent child node '%s'"
msgstr "企圖開啟一個不存在的子節點 '%s'"
-#: libsvn_fs_base/dag.c:1296
+#: libsvn_fs_base/dag.c:1300
#, c-format
msgid "Attempted to open node with an illegal name '%s'"
msgstr "企圖開啟一個有不合法名稱 '%s' 的節點"
@@ -1935,41 +1962,41 @@
msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
msgstr "路徑 '%s' 已經被使用者 '%s' 鎖定於檔案系統 '%s' 中"
-#: libsvn_fs_base/fs.c:79
+#: libsvn_fs_base/fs.c:80
#, c-format
msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
msgstr "不良的資料庫版本: 取得 %d.%d.%d, 應至少為 %d.%d.%d"
-#: libsvn_fs_base/fs.c:90
+#: libsvn_fs_base/fs.c:91
#, c-format
msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
msgstr "不良的資料庫版本: 與 %d.%d.%d 編譯, 與 %d.%d.%d 執行"
-#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:54
+#: libsvn_fs_base/fs.c:109 libsvn_fs_fs/fs.c:53
msgid "Filesystem object already open"
msgstr "檔案系統物件已開啟"
-#: libsvn_fs_base/fs.c:189
+#: libsvn_fs_base/fs.c:190
#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
msgstr "檔案系統 '%s' 的 Berkeley DB 錯誤, 當關閉環境時:\n"
-#: libsvn_fs_base/fs.c:539
+#: libsvn_fs_base/fs.c:540
#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
msgstr "檔案系統 '%s' 的 Berkeley DB 錯誤, 當建立環境時:\n"
-#: libsvn_fs_base/fs.c:545
+#: libsvn_fs_base/fs.c:546
#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
msgstr "檔案系統 '%s' 的 Berkeley DB 錯誤, 當開啟環境時:\n"
-#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:631
+#: libsvn_fs_base/fs.c:674 libsvn_fs_fs/fs_fs.c:643
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "預期 FS 格式 '%d'; 找到格式 '%d'"
-#: libsvn_fs_base/fs.c:1094
+#: libsvn_fs_base/fs.c:1112
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
"may be interfering with the hotcopy algorithm. If \n"
@@ -1980,7 +2007,7 @@
"即時複本的演算法有所影響. 如果問題依舊存在, 請試著\n"
"在 DB_CONFIG 中取消這個功能."
-#: libsvn_fs_base/fs.c:1113
+#: libsvn_fs_base/fs.c:1131
msgid ""
"Error running catastrophic recovery on hotcopy; the \n"
"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
@@ -1991,26 +2018,26 @@
"可能對製作即時複本的演算法有所影響. 如果問題依舊存在, 請\n"
"試著在 DB_CONFIG 中取消這個功能."
-#: libsvn_fs_base/fs.c:1222
+#: libsvn_fs_base/fs.c:1178
msgid "Module for working with a Berkeley DB repository."
msgstr "與 Berkeley DB 檔案庫使用的模組"
-#: libsvn_fs_base/fs.c:1255
+#: libsvn_fs_base/fs.c:1212
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "不支援的 bdb 的 FS 載入器版本 (%d)"
-#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#: libsvn_fs_base/lock.c:445 libsvn_fs_fs/lock.c:616
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr "無法驗證路徑 '%s' 的鎖定; 無法取得使用者名稱"
-#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#: libsvn_fs_base/lock.c:451 libsvn_fs_fs/lock.c:622
#, c-format
msgid "User %s does not own lock on path '%s' (currently locked by %s)"
msgstr "使用者 %s 未擁有路徑 '%s' 的鎖定 (目前被 %s 鎖定)"
-#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#: libsvn_fs_base/lock.c:458 libsvn_fs_fs/lock.c:629
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr "無法驗証路徑 '%s' 的鎖定; 找不到符合的鎖定符記"
@@ -2094,17 +2121,17 @@
msgid "Failed to calculate MD5 digest for '%s'"
msgstr "無法計算 '%s' 的 MD5"
-#: libsvn_fs_base/revs-txns.c:65
+#: libsvn_fs_base/revs-txns.c:67
#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "異動未終結: '%s'"
-#: libsvn_fs_base/revs-txns.c:68
+#: libsvn_fs_base/revs-txns.c:70
#, c-format
msgid "Transaction is dead: '%s'"
msgstr "異動已終結: '%s'"
-#: libsvn_fs_base/revs-txns.c:981
+#: libsvn_fs_base/revs-txns.c:1065
msgid "Transaction aborted, but cleanup failed"
msgstr "異動已取消, 但是清除失敗."
@@ -2114,83 +2141,83 @@
#. Constructing nice error messages for roots.
#. Return the error SVN_ERR_FS_NOT_FOUND, with a detailed error text,
#. for PATH in ROOT.
-#: libsvn_fs_base/tree.c:389 libsvn_fs_fs/tree.c:309
+#: libsvn_fs_base/tree.c:392 libsvn_fs_fs/tree.c:311
#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "檔案找不到: 修訂版 '%s', 路徑 '%s'"
-#: libsvn_fs_base/tree.c:394 libsvn_fs_fs/tree.c:314
+#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:316
#, c-format
msgid "File not found: revision %ld, path '%s'"
msgstr "檔案找不到: 修訂版 %ld, 路徑 '%s'"
#. Build a detailed `file already exists' message for PATH in ROOT.
-#: libsvn_fs_base/tree.c:404 libsvn_fs_fs/tree.c:329
+#: libsvn_fs_base/tree.c:407 libsvn_fs_fs/tree.c:331
#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "檔案已存在: 檔案系統 '%s', 修訂版 '%s', 路徑 '%s'"
-#: libsvn_fs_base/tree.c:409 libsvn_fs_fs/tree.c:335
+#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:337
#, c-format
msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
msgstr "檔案已存在: 檔案系統 '%s', 修訂版 %ld, 路徑 '%s'"
-#: libsvn_fs_base/tree.c:417 libsvn_fs_fs/tree.c:345
+#: libsvn_fs_base/tree.c:420 libsvn_fs_fs/tree.c:347
msgid "Root object must be a transaction root"
msgstr "根物件必須為異動的根"
-#: libsvn_fs_base/tree.c:832 libsvn_fs_fs/tree.c:754
+#: libsvn_fs_base/tree.c:835 libsvn_fs_fs/tree.c:756
#, c-format
msgid "Failure opening '%s'"
msgstr "無法開啟 '%s'"
-#: libsvn_fs_base/tree.c:1402 libsvn_fs_fs/tree.c:1152
+#: libsvn_fs_base/tree.c:1467 libsvn_fs_fs/tree.c:1203
msgid "Cannot compare property value between two different filesystems"
msgstr "無法比較兩個不同檔案系統中的性質內容"
-#: libsvn_fs_base/tree.c:1735
+#: libsvn_fs_base/tree.c:1800
msgid "Corrupt DB: faulty predecessor count"
msgstr "毀損的資料庫: 有問題的前導計數"
-#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1189
+#: libsvn_fs_base/tree.c:1855 libsvn_fs_fs/tree.c:1240
#, c-format
msgid "Unexpected immutable node at '%s'"
msgstr "路徑 '%s' 有不可更動的種類"
-#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1212
+#: libsvn_fs_base/tree.c:1876 libsvn_fs_fs/tree.c:1263
#, c-format
msgid "Conflict at '%s'"
msgstr "'%s' 有衝突"
-#: libsvn_fs_base/tree.c:1861 libsvn_fs_base/tree.c:2566
-#: libsvn_fs_fs/tree.c:1261 libsvn_fs_fs/tree.c:1748
+#: libsvn_fs_base/tree.c:1926 libsvn_fs_base/tree.c:2638
+#: libsvn_fs_fs/tree.c:1312 libsvn_fs_fs/tree.c:1804
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr "不良的合併: 演進源頭, 來源與目錄不是全都在同一個檔案系統"
-#: libsvn_fs_base/tree.c:1877 libsvn_fs_fs/tree.c:1277
+#: libsvn_fs_base/tree.c:1942 libsvn_fs_fs/tree.c:1328
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr "不良的合併: 目標 '%s' 的 id 為 '%s', 與演進源頭一樣"
-#: libsvn_fs_base/tree.c:2373
+#: libsvn_fs_base/tree.c:2445
#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
msgstr "異動 '%s' 對修訂版 '%s' 已過時"
-#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1887
+#: libsvn_fs_base/tree.c:2821 libsvn_fs_fs/tree.c:1943
msgid "The root directory cannot be deleted"
msgstr "根目錄無法被刪除"
-#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1959
+#: libsvn_fs_base/tree.c:3001 libsvn_fs_fs/tree.c:2015
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "無法在兩個不同檔案系統 ('%s' 與 '%s') 之間進行複製"
-#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1965
+#: libsvn_fs_base/tree.c:3010 libsvn_fs_fs/tree.c:2021
msgid "Copy from mutable tree not currently supported"
msgstr "複製自可更動的樹目前尚不支援"
-#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2389
+#: libsvn_fs_base/tree.c:3505 libsvn_fs_fs/tree.c:2445
#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
@@ -2201,22 +2228,22 @@
" 預期的: %s\n"
" 實際的: %s\n"
-#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2625
+#: libsvn_fs_base/tree.c:3758 libsvn_fs_fs/tree.c:2681
msgid "Cannot compare file contents between two different filesystems"
msgstr "無法比較兩個不同檔案系統中的檔案內容"
-#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
-#: libsvn_fs_fs/tree.c:2634 libsvn_fs_fs/tree.c:2639
+#: libsvn_fs_base/tree.c:3767 libsvn_fs_base/tree.c:3772
+#: libsvn_fs_fs/tree.c:2690 libsvn_fs_fs/tree.c:2695
#: libsvn_repos/rev_hunt.c:804
#, c-format
msgid "'%s' is not a file"
msgstr "'%s' 不是檔案"
-#: libsvn_fs_fs/dag.c:384
+#: libsvn_fs_fs/dag.c:383
msgid "Can't get entries of non-directory"
msgstr "無法取得非目錄的項目"
-#: libsvn_fs_fs/dag.c:931
+#: libsvn_fs_fs/dag.c:930
#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
@@ -2232,167 +2259,168 @@
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
msgstr "路徑 '%s' 於檔案系統 '%s' 中的鎖定檔損毀"
-#: libsvn_fs_fs/fs.c:89
+#: libsvn_fs_fs/fs.c:88
#, fuzzy, c-format
msgid "Can't fetch FSFS shared data"
msgstr "無法取得 FSFS mutex"
-#: libsvn_fs_fs/fs.c:105
+#: libsvn_fs_fs/fs.c:104
#, fuzzy, c-format
msgid "Can't create FSFS write-lock mutex"
msgstr "無法建立 FSFS mutex"
-#: libsvn_fs_fs/fs.c:113
+#: libsvn_fs_fs/fs.c:112
#, fuzzy, c-format
msgid "Can't create FSFS txn list mutex"
msgstr "無法建立 FSFS mutex"
-#: libsvn_fs_fs/fs.c:119
+#: libsvn_fs_fs/fs.c:118
#, fuzzy, c-format
msgid "Can't store FSFS shared data"
msgstr "無法儲存 FSFS mutex"
-#: libsvn_fs_fs/fs.c:345
+#: libsvn_fs_fs/fs.c:290
msgid "Module for working with a plain file (FSFS) repository."
msgstr "用於與普通檔案 (FSFS) 檔案庫的模組"
-#: libsvn_fs_fs/fs.c:378
+#: libsvn_fs_fs/fs.c:324
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "不支援的 fsfs 的 FS 載入器版本 (%d)"
-#: libsvn_fs_fs/fs_fs.c:340
+#: libsvn_fs_fs/fs_fs.c:352
#, fuzzy, c-format
msgid "Can't grab FSFS txn list mutex"
msgstr "無法取得 FS mutex"
-#: libsvn_fs_fs/fs_fs.c:348
+#: libsvn_fs_fs/fs_fs.c:360
#, fuzzy, c-format
msgid "Can't ungrab FSFS txn list mutex"
msgstr "無法釋放 FS mutex"
-#: libsvn_fs_fs/fs_fs.c:374
+#: libsvn_fs_fs/fs_fs.c:386
#, fuzzy, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "無法解鎖字元轉譯 mutex"
-#: libsvn_fs_fs/fs_fs.c:378
+#: libsvn_fs_fs/fs_fs.c:390
#, fuzzy, c-format
msgid "Can't unlock nonlocked transaction '%s'"
msgstr "無法解鎖字元轉譯 mutex"
-#: libsvn_fs_fs/fs_fs.c:385
+#: libsvn_fs_fs/fs_fs.c:397
#, c-format
msgid "Can't unlock prototype revision lockfile for transaction '%s'"
msgstr ""
-#: libsvn_fs_fs/fs_fs.c:391
+#: libsvn_fs_fs/fs_fs.c:403
#, c-format
msgid "Can't close prototype revision lockfile for transaction '%s'"
msgstr ""
-#: libsvn_fs_fs/fs_fs.c:453
+#: libsvn_fs_fs/fs_fs.c:465
#, 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 ""
-#: libsvn_fs_fs/fs_fs.c:489
+#: libsvn_fs_fs/fs_fs.c:501
#, 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 ""
-#: libsvn_fs_fs/fs_fs.c:496 libsvn_subr/io.c:1532
+#: libsvn_fs_fs/fs_fs.c:508 libsvn_subr/io.c:1512
#, c-format
msgid "Can't get exclusive lock on file '%s'"
msgstr "無法取得檔案 '%s' 的獨佔鎖定"
-#: libsvn_fs_fs/fs_fs.c:825 libsvn_fs_fs/fs_fs.c:839
+#: libsvn_fs_fs/fs_fs.c:921 libsvn_fs_fs/fs_fs.c:935
msgid "Found malformed header in revision file"
msgstr "在修訂版檔案中找到有缺陷的檔頭"
-#: libsvn_fs_fs/fs_fs.c:941 libsvn_fs_fs/fs_fs.c:955 libsvn_fs_fs/fs_fs.c:962
-#: libsvn_fs_fs/fs_fs.c:969 libsvn_fs_fs/fs_fs.c:977 libsvn_fs_fs/fs_fs.c:985
+#: libsvn_fs_fs/fs_fs.c:1037 libsvn_fs_fs/fs_fs.c:1051
+#: libsvn_fs_fs/fs_fs.c:1058 libsvn_fs_fs/fs_fs.c:1065
+#: libsvn_fs_fs/fs_fs.c:1073 libsvn_fs_fs/fs_fs.c:1081
msgid "Malformed text rep offset line in node-rev"
msgstr "node-rev 中沒有 text rep offset 列"
-#: libsvn_fs_fs/fs_fs.c:1054
+#: libsvn_fs_fs/fs_fs.c:1150
msgid "Missing kind field in node-rev"
msgstr "node-rev 中沒有 kind 欄位"
-#: libsvn_fs_fs/fs_fs.c:1085
+#: libsvn_fs_fs/fs_fs.c:1181
msgid "Missing cpath in node-rev"
msgstr "node-rev 中沒有 cpath"
-#: libsvn_fs_fs/fs_fs.c:1112 libsvn_fs_fs/fs_fs.c:1118
+#: libsvn_fs_fs/fs_fs.c:1208 libsvn_fs_fs/fs_fs.c:1214
msgid "Malformed copyroot line in node-rev"
msgstr "node-rev 中的 copyroot 列有缺陷"
-#: libsvn_fs_fs/fs_fs.c:1136 libsvn_fs_fs/fs_fs.c:1142
+#: libsvn_fs_fs/fs_fs.c:1232 libsvn_fs_fs/fs_fs.c:1238
msgid "Malformed copyfrom line in node-rev"
msgstr "node-rev 中的 copyfrom 列有缺陷"
-#: libsvn_fs_fs/fs_fs.c:1251 libsvn_fs_fs/fs_fs.c:3613
+#: libsvn_fs_fs/fs_fs.c:1347 libsvn_fs_fs/fs_fs.c:3785
msgid "Attempted to write to non-transaction"
msgstr "企圖寫至非異動"
-#: libsvn_fs_fs/fs_fs.c:1335
+#: libsvn_fs_fs/fs_fs.c:1431
msgid "Malformed representation header"
msgstr "有缺陷的表現檔頭"
-#: libsvn_fs_fs/fs_fs.c:1359
+#: libsvn_fs_fs/fs_fs.c:1455
msgid "Missing node-id in node-rev"
msgstr "node-rev 中沒有 node-id"
-#: libsvn_fs_fs/fs_fs.c:1365
+#: libsvn_fs_fs/fs_fs.c:1461
msgid "Corrupt node-id in node-rev"
msgstr "node-rev 中的 node-id 損毀"
-#: libsvn_fs_fs/fs_fs.c:1410
+#: libsvn_fs_fs/fs_fs.c:1506
#, c-format
msgid "Revision file lacks trailing newline"
msgstr "修訂版檔案缺少結尾換列字元"
-#: libsvn_fs_fs/fs_fs.c:1422
+#: libsvn_fs_fs/fs_fs.c:1518
#, c-format
msgid "Final line in revision file longer than 64 characters"
msgstr "修訂版檔案的最後一列大於 64 個字元長"
-#: libsvn_fs_fs/fs_fs.c:1437
+#: libsvn_fs_fs/fs_fs.c:1533
msgid "Final line in revision file missing space"
msgstr "修訂版檔案的最後一列少掉空白字元"
-#: libsvn_fs_fs/fs_fs.c:1466 libsvn_fs_fs/fs_fs.c:1524 libsvn_repos/log.c:514
-#: libsvn_repos/log.c:518
+#: libsvn_fs_fs/fs_fs.c:1562 libsvn_fs_fs/fs_fs.c:1633 libsvn_repos/log.c:517
+#: libsvn_repos/log.c:521
#, c-format
msgid "No such revision %ld"
msgstr "沒有這個修訂版 %ld"
-#: libsvn_fs_fs/fs_fs.c:1584
+#: libsvn_fs_fs/fs_fs.c:1703
msgid "Malformed svndiff data in representation"
msgstr "svndiff 資料的表現有缺陷"
# as-is
-#: libsvn_fs_fs/fs_fs.c:1727 libsvn_fs_fs/fs_fs.c:1740
+#: libsvn_fs_fs/fs_fs.c:1846 libsvn_fs_fs/fs_fs.c:1859
msgid "Reading one svndiff window read beyond the end of the representation"
msgstr "Reading one svndiff window read beyond the end of the representation"
-#: libsvn_fs_fs/fs_fs.c:1876
+#: libsvn_fs_fs/fs_fs.c:1995
msgid "svndiff data requested non-existent source"
msgstr "svndiff 資料要求不存在的來源"
-#: libsvn_fs_fs/fs_fs.c:1882
+#: libsvn_fs_fs/fs_fs.c:2001
msgid "svndiff requested position beyond end of stream"
msgstr "svndiff 要求的位置超出了串流的結尾"
-#: libsvn_fs_fs/fs_fs.c:1905 libsvn_fs_fs/fs_fs.c:1922
+#: libsvn_fs_fs/fs_fs.c:2024 libsvn_fs_fs/fs_fs.c:2041
msgid "svndiff window length is corrupt"
msgstr "svndiff 的窗格長度已毀損"
-#: libsvn_fs_fs/fs_fs.c:1970
+#: libsvn_fs_fs/fs_fs.c:2089
#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
@@ -2403,137 +2431,156 @@
" 預期的: %s\n"
" 實際的: %s\n"
-#: libsvn_fs_fs/fs_fs.c:2193 libsvn_fs_fs/fs_fs.c:2206
-#: libsvn_fs_fs/fs_fs.c:2212
+#: libsvn_fs_fs/fs_fs.c:2312 libsvn_fs_fs/fs_fs.c:2325
+#: libsvn_fs_fs/fs_fs.c:2331 libsvn_fs_fs/fs_fs.c:4866
+#: libsvn_fs_fs/fs_fs.c:4875 libsvn_fs_fs/fs_fs.c:4881
msgid "Directory entry corrupt"
msgstr "目錄項目損毀"
-#: libsvn_fs_fs/fs_fs.c:2551 libsvn_fs_fs/fs_fs.c:2559
-#: libsvn_fs_fs/fs_fs.c:2591 libsvn_fs_fs/fs_fs.c:2611
-#: libsvn_fs_fs/fs_fs.c:2645 libsvn_fs_fs/fs_fs.c:2650
+#: libsvn_fs_fs/fs_fs.c:2670 libsvn_fs_fs/fs_fs.c:2678
+#: libsvn_fs_fs/fs_fs.c:2710 libsvn_fs_fs/fs_fs.c:2730
+#: libsvn_fs_fs/fs_fs.c:2764 libsvn_fs_fs/fs_fs.c:2769
msgid "Invalid changes line in rev-file"
msgstr "rev-file 中有無效的更動列"
-#: libsvn_fs_fs/fs_fs.c:2584
+#: libsvn_fs_fs/fs_fs.c:2703
msgid "Invalid change kind in rev file"
msgstr "rev 檔案中有無效的更動種類"
-#: libsvn_fs_fs/fs_fs.c:2604
+#: libsvn_fs_fs/fs_fs.c:2723
msgid "Invalid text-mod flag in rev-file"
msgstr "rev-file 中有無效的 text-mod 旗標"
-#: libsvn_fs_fs/fs_fs.c:2624
+#: libsvn_fs_fs/fs_fs.c:2743
msgid "Invalid prop-mod flag in rev-file"
msgstr "rev-file 中有無效的 prop-mod 旗標"
-#: libsvn_fs_fs/fs_fs.c:2808
+#: libsvn_fs_fs/fs_fs.c:2927
msgid "Copying from transactions not allowed"
msgstr "自異動進行複製是不被允許的"
-#: libsvn_fs_fs/fs_fs.c:2864
+#: libsvn_fs_fs/fs_fs.c:2983
#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
msgstr "無法在 '%s' 建立更動目錄於修訂版 %ld"
-#: libsvn_fs_fs/fs_fs.c:3045 libsvn_fs_fs/fs_fs.c:3052
+#: libsvn_fs_fs/fs_fs.c:3217 libsvn_fs_fs/fs_fs.c:3224
msgid "next-id file corrupt"
msgstr "next-id 檔案損毀"
-#: libsvn_fs_fs/fs_fs.c:3139
+#: libsvn_fs_fs/fs_fs.c:3311
msgid "Transaction cleanup failed"
msgstr "異動清除失敗"
-#: libsvn_fs_fs/fs_fs.c:3307
+#: libsvn_fs_fs/fs_fs.c:3479
msgid "Invalid change type"
msgstr "無效的更動類型"
-#: libsvn_fs_fs/fs_fs.c:3632
+#: libsvn_fs_fs/fs_fs.c:3804
msgid "Can't set text contents of a directory"
msgstr "無法設定目錄的文字內容"
-#: libsvn_fs_fs/fs_fs.c:3722 libsvn_fs_fs/fs_fs.c:3727
-#: libsvn_fs_fs/fs_fs.c:3734
+#: libsvn_fs_fs/fs_fs.c:3888 libsvn_fs_fs/fs_fs.c:3893
+#: libsvn_fs_fs/fs_fs.c:3900
msgid "Corrupt current file"
msgstr "目前檔案損毀"
# as-is
-#: libsvn_fs_fs/fs_fs.c:4023 libsvn_subr/io.c:2663 svn/util.c:236
-#: svn/util.c:251 svn/util.c:275
+#: libsvn_fs_fs/fs_fs.c:4187 libsvn_subr/io.c:2790 svn/util.c:252
+#: svn/util.c:267 svn/util.c:291
#, c-format
msgid "Can't stat '%s'"
msgstr "Can't stat '%s'"
-#: libsvn_fs_fs/fs_fs.c:4027
+#: libsvn_fs_fs/fs_fs.c:4191
#, c-format
msgid "Can't chmod '%s'"
msgstr "無法 chmod '%s'"
-#: libsvn_fs_fs/fs_fs.c:4167
+#: libsvn_fs_fs/fs_fs.c:4340
#, c-format
msgid "Can't grab FSFS repository mutex"
msgstr "無法取得 FSFS 檔案庫 mutex"
-#: libsvn_fs_fs/fs_fs.c:4181
+#: libsvn_fs_fs/fs_fs.c:4354
#, c-format
msgid "Can't ungrab FSFS repository mutex"
msgstr "無法釋放 FSFS 檔案庫 mutex"
-#: libsvn_fs_fs/fs_fs.c:4299
+#: libsvn_fs_fs/fs_fs.c:4473
msgid "Transaction out of date"
msgstr "異動過時"
-#: libsvn_fs_fs/fs_fs.c:4599
+#: libsvn_fs_fs/fs_fs.c:4807
+#, fuzzy
+msgid "Recovery encountered a non-directory node"
+msgstr "企圖設定非目錄節點中的項目"
+
+#: libsvn_fs_fs/fs_fs.c:4829
+msgid "Recovery encountered a deltified directory representation"
+msgstr ""
+
+#: libsvn_fs_fs/fs_fs.c:5092
msgid "No such transaction"
msgstr "無此異動"
-#: libsvn_fs_fs/lock.c:230
+#: libsvn_fs_fs/lock.c:231
#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
msgstr "無法寫入 lock/entries 雜湊檔 '%s'"
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_fs_fs/lock.c:287
#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
msgstr "無法剖析 lock/entries 雜湊檔 '%s'"
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#: libsvn_fs_fs/lock.c:716 libsvn_fs_fs/lock.c:737
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "路徑 '%s' 不存在於 HEAD 修訂版中"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_fs_fs/lock.c:742
#, c-format
msgid "Lock failed: newer version of '%s' exists"
msgstr "鎖定失敗: 存在 '%s' 的新版本"
+#: libsvn_fs_util/merge-info-sqlite-index.c:102
+msgid "Merge Tracking schema format not set"
+msgstr ""
+
+#: libsvn_fs_util/merge-info-sqlite-index.c:107
+#, c-format
+msgid "Merge Tracking schema format %d not recognized"
+msgstr ""
+
#: libsvn_ra/ra_loader.c:213
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr "'%s' 的 RA 外掛版本不符合: 遇到 %d.%d.%d%s, 預期 %d.%d.%d%s"
-#: libsvn_ra/ra_loader.c:285
+#: libsvn_ra/ra_loader.c:397
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "無法辨識的 URL 綱要 '%s'"
-#: libsvn_ra/ra_loader.c:336
+#: libsvn_ra/ra_loader.c:448
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "'%s' 與 '%s' 並不在同一個檔案庫中"
# as-is
-#: libsvn_ra/ra_loader.c:707
+#: libsvn_ra/ra_loader.c:945
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - handles '%s' scheme\n"
-#: libsvn_ra/ra_loader.c:793
+#: libsvn_ra/ra_loader.c:1031
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "無法辨識的 URL 綱要 '%s'"
# as-is
-#: libsvn_ra_dav/commit.c:225
+#: libsvn_ra_dav/commit.c:222
msgid ""
"Could not fetch the Version Resource URL (needed during an import or when it "
"is missing from the local, cached props)"
@@ -2541,22 +2588,22 @@
"Could not fetch the Version Resource URL (needed during an import or when it "
"is missing from the local, cached props)"
-#: libsvn_ra_dav/commit.c:462 libsvn_ra_serf/commit.c:374
+#: libsvn_ra_dav/commit.c:459 libsvn_ra_serf/commit.c:374
#: libsvn_ra_serf/commit.c:435
#, c-format
msgid "Your file or directory '%s' is probably out-of-date"
msgstr "你的檔案或目錄 '%s' 可能已過時"
-#: libsvn_ra_dav/commit.c:470
+#: libsvn_ra_dav/commit.c:467
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "CHECKOUT 回應未包含一個 'Location:' 標頭"
-#: libsvn_ra_dav/commit.c:997 libsvn_ra_serf/commit.c:1403
+#: libsvn_ra_dav/commit.c:994 libsvn_ra_serf/commit.c:1427
#, c-format
msgid "File '%s' already exists"
msgstr "檔案 '%s' 已存在"
-#: libsvn_ra_dav/commit.c:1115
+#: libsvn_ra_dav/commit.c:1112
#, c-format
msgid "Could not write svndiff to temp file"
msgstr "無法寫 svndiff 至暫存檔"
@@ -2573,7 +2620,7 @@
msgid "Could not save file"
msgstr "無法儲存檔案"
-#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:909
+#: libsvn_ra_dav/fetch.c:778 libsvn_ra_svn/client.c:920
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -2637,7 +2684,7 @@
msgstr "未知的 XML 編碼: '%s'"
# as-is
-#: libsvn_ra_dav/fetch.c:2940
+#: libsvn_ra_dav/fetch.c:2952
#, c-format
msgid "REPORT response handling failed to complete the editor drive"
msgstr "REPORT response handling failed to complete the editor drive"
@@ -2835,21 +2882,21 @@
msgid "SSL is not supported"
msgstr "不支援 SSL"
-#: libsvn_ra_dav/session.c:819
+#: libsvn_ra_dav/session.c:825
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "無效的配置: 無法載入憑證檔 '%s'"
-#: libsvn_ra_dav/session.c:928
+#: libsvn_ra_dav/session.c:934
msgid "The UUID property was not found on the resource or any of its parents"
msgstr "無法在本資源或任何其父項目中找到 UUID 性質"
-#: libsvn_ra_dav/session.c:936
+#: libsvn_ra_dav/session.c:942
msgid "Please upgrade the server to 0.19 or later"
msgstr "請將伺服器昇級至 0.19 或更新的版本"
# as-is
-#: libsvn_ra_dav/session.c:1002
+#: libsvn_ra_dav/session.c:1009
#, c-format
msgid "Unsupported RA loader version (%d) for ra_dav"
msgstr "Unsupported RA loader version (%d) for ra_dav"
@@ -2921,8 +2968,8 @@
msgid "%s request failed on '%s'"
msgstr "%s 要求於 '%s' 的失敗"
-#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:588
-#: libsvn_wc/update_editor.c:2603
+#: libsvn_ra_local/ra_plugin.c:108 libsvn_ra_local/ra_plugin.c:597
+#: libsvn_wc/update_editor.c:2617
#, c-format
msgid ""
"'%s'\n"
@@ -2937,16 +2984,16 @@
# as-is
#. ----------------------------------------------------------------
#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
+#: libsvn_ra_local/ra_plugin.c:250
msgid "Module for accessing a repository on local disk."
msgstr "Module for accessing a repository on local disk."
-#: libsvn_ra_local/ra_plugin.c:285
+#: libsvn_ra_local/ra_plugin.c:290
msgid "Unable to open an ra_local session to URL"
msgstr "無法開啟 URL 的 ra_local session"
# as-is
-#: libsvn_ra_local/ra_plugin.c:1392
+#: libsvn_ra_local/ra_plugin.c:1443
#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
msgstr "Unsupported RA loader version (%d) for ra_local"
@@ -2972,7 +3019,7 @@
msgstr "無法開啟檔案庫 '%s'"
#: libsvn_ra_serf/commit.c:367 libsvn_ra_serf/commit.c:428
-#: libsvn_repos/commit.c:393
+#: libsvn_repos/commit.c:375
#, c-format
msgid "Path '%s' not present"
msgstr "路徑 '%s' 不存在"
@@ -2982,7 +3029,7 @@
msgid "Failed writing updated file"
msgstr "寫入更新檔案失敗"
-#: libsvn_ra_serf/commit.c:1216
+#: libsvn_ra_serf/commit.c:1240
#, c-format
msgid "Adding a directory failed: %s on %s (%d)"
msgstr ""
@@ -3067,223 +3114,246 @@
msgid "Access repository via WebDAV protocol through serf."
msgstr "Access repository via WebDAV protocol through serf."
-#: libsvn_ra_serf/serf.c:155
+#: libsvn_ra_serf/serf.c:161
#, c-format
msgid "Could not lookup hostname: %s://%s"
msgstr "無法查得主機名稱: %s://%s"
# as-is
-#: libsvn_ra_serf/serf.c:732
+#: libsvn_ra_serf/serf.c:737
#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
msgstr "Unsupported RA loader version (%d) for ra_serf"
# as-is
-#: libsvn_ra_serf/update.c:2116
+#: libsvn_ra_serf/update.c:2155
#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "Error retrieving REPORT (%d)"
-#: libsvn_ra_serf/util.c:755
+#: libsvn_ra_serf/util.c:874
#, fuzzy
msgid "Unspecified error message"
msgstr "指定送交訊息 ARG"
# as-is
-#: libsvn_ra_serf/util.c:816
+#: libsvn_ra_serf/util.c:935
msgid "Premature EOF seen from server"
msgstr "Premature EOF seen from server"
-#: libsvn_ra_svn/client.c:115
+#: libsvn_ra_svn/client.c:124
#, c-format
msgid "Unknown hostname '%s'"
msgstr "未知的主機名稱 '%s'"
-#: libsvn_ra_svn/client.c:127
+#: libsvn_ra_svn/client.c:136
#, c-format
msgid "Can't create socket"
msgstr "無法建立 socket"
-#: libsvn_ra_svn/client.c:131
+#: libsvn_ra_svn/client.c:140
#, c-format
msgid "Can't connect to host '%s'"
msgstr "無法連線至主機 '%s'"
# as-is
-#: libsvn_ra_svn/client.c:152
-msgid "Proplist element not a list"
-msgstr "Proplist element not a list"
-
-# as-is
-#: libsvn_ra_svn/client.c:176
+#: libsvn_ra_svn/client.c:163
msgid "Prop diffs element not a list"
msgstr "Prop diffs element not a list"
-#: libsvn_ra_svn/client.c:214
+#: libsvn_ra_svn/client.c:201
#, c-format
msgid "Unrecognized node kind '%s' from server"
msgstr "無法辨識來自伺服器的節點種類 '%s'"
-#: libsvn_ra_svn/client.c:365
+#: libsvn_ra_svn/client.c:357
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "無法辨識的 tunnel 綱要 '%s'"
-#: libsvn_ra_svn/client.c:382
+#: libsvn_ra_svn/client.c:374
#, c-format
msgid "Tunnel scheme %s requires environment variable %s to be defined"
msgstr "Tunnel 綱要 %s 需要設定環境變數 %s"
# as-is
-#: libsvn_ra_svn/client.c:393
+#: libsvn_ra_svn/client.c:385
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Can't tokenize command '%s'"
-#: libsvn_ra_svn/client.c:424
+#: libsvn_ra_svn/client.c:416
#, c-format
msgid "Error in child process: %s"
msgstr "子程序錯誤: %s"
-#: libsvn_ra_svn/client.c:448
+#: libsvn_ra_svn/client.c:440
#, c-format
msgid "Can't create tunnel"
msgstr "無法建立 tunnel"
-#: libsvn_ra_svn/client.c:486
+#: libsvn_ra_svn/client.c:478
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "不合法的 svn 檔案庫 URL '%s'"
-#: libsvn_ra_svn/client.c:543
+#: libsvn_ra_svn/client.c:535
#, c-format
msgid "Server requires minimum version %d"
msgstr "伺服器最低要求的版號為 %d"
-#: libsvn_ra_svn/client.c:589
+#: libsvn_ra_svn/client.c:584
msgid "Impossibly long repository root from server"
msgstr "伺服器回傳的檔案庫根路徑長得太誇張"
# as-is
-#: libsvn_ra_svn/client.c:600
+#: libsvn_ra_svn/client.c:595
msgid "Module for accessing a repository using the svn network protocol."
msgstr "Module for accessing a repository using the svn network protocol."
-#: libsvn_ra_svn/client.c:748
+#: libsvn_ra_svn/client.c:743
msgid "Server did not send repository root"
msgstr "伺服器沒有傳回檔案庫根路徑"
-#: libsvn_ra_svn/client.c:889
+#: libsvn_ra_svn/client.c:816
+msgid ""
+"Server doesn't support setting arbitrary revision properties during commit"
+msgstr ""
+
+#: libsvn_ra_svn/client.c:900
msgid "Non-string as part of file contents"
msgstr "檔案內容的一部份不是字串"
# as-is
-#: libsvn_ra_svn/client.c:988
+#: libsvn_ra_svn/client.c:999
msgid "Dirlist element not a list"
msgstr "Dirlist element not a list"
# as-is
-#: libsvn_ra_svn/client.c:1145
+#: libsvn_ra_svn/client.c:1060
+#, fuzzy
+msgid "Merge info element is not a list"
+msgstr "Prop diffs element not a list"
+
+# as-is
+#: libsvn_ra_svn/client.c:1219
msgid "Log entry not a list"
msgstr "Log entry not a list"
# as-is
-#: libsvn_ra_svn/client.c:1158
+#: libsvn_ra_svn/client.c:1232
msgid "Changed-path entry not a list"
msgstr "Changed-path entry not a list"
# as-is
-#: libsvn_ra_svn/client.c:1234
+#: libsvn_ra_svn/client.c:1308
msgid "'stat' not implemented"
msgstr "'stat' not implemented"
# as-is
-#: libsvn_ra_svn/client.c:1291
+#: libsvn_ra_svn/client.c:1365
msgid "'get-locations' not implemented"
msgstr "'get-locations' not implemented"
# as-is
-#: libsvn_ra_svn/client.c:1303
+#: libsvn_ra_svn/client.c:1377
msgid "Location entry not a list"
msgstr "Location entry not a list"
# as-is
-#: libsvn_ra_svn/client.c:1353
+#: libsvn_ra_svn/client.c:1427
msgid "'get-file-revs' not implemented"
msgstr "'get-file-revs' not implemented"
# as-is
-#: libsvn_ra_svn/client.c:1366
+#: libsvn_ra_svn/client.c:1440
msgid "Revision entry not a list"
msgstr "Revision entry not a list"
-#: libsvn_ra_svn/client.c:1379 libsvn_ra_svn/client.c:1404
+#: libsvn_ra_svn/client.c:1453 libsvn_ra_svn/client.c:1478
msgid "Text delta chunk not a string"
msgstr "文字差異區段並非字串"
-#: libsvn_ra_svn/client.c:1416
+#: libsvn_ra_svn/client.c:1490
msgid "The get-file-revs command didn't return any revisions"
msgstr "get-file-revs 命令沒有傳回任何修訂版"
-#: libsvn_ra_svn/client.c:1464
+#: libsvn_ra_svn/client.c:1538
msgid "Server doesn't support the lock command"
msgstr "伺服器不支援 lock 命令"
-#: libsvn_ra_svn/client.c:1528
+#: libsvn_ra_svn/client.c:1602
msgid "Server doesn't support the unlock command"
msgstr "伺服器不支援 unlock 命令"
# as-is
-#: libsvn_ra_svn/client.c:1625
+#: libsvn_ra_svn/client.c:1699
msgid "Lock response not a list"
msgstr "Lock response not a list"
-#: libsvn_ra_svn/client.c:1639
+#: libsvn_ra_svn/client.c:1713
msgid "Unknown status for lock command"
msgstr "鎖定命令的未知狀態"
-#: libsvn_ra_svn/client.c:1661
+#: libsvn_ra_svn/client.c:1735
msgid "Didn't receive end marker for lock responses"
msgstr "未收到鎖定回應的結束標記"
# as-is
-#: libsvn_ra_svn/client.c:1748
+#: libsvn_ra_svn/client.c:1822
msgid "Unlock response not a list"
msgstr "Unlock response not a list"
-#: libsvn_ra_svn/client.c:1762
+#: libsvn_ra_svn/client.c:1836
msgid "Unknown status for unlock command"
msgstr "解鎖命令的未知狀態"
-#: libsvn_ra_svn/client.c:1783
+#: libsvn_ra_svn/client.c:1857
msgid "Didn't receive end marker for unlock responses"
msgstr "未收到解鎖回應的結束標記"
-#: libsvn_ra_svn/client.c:1807 libsvn_ra_svn/client.c:1835
+#: libsvn_ra_svn/client.c:1881 libsvn_ra_svn/client.c:1909
msgid "Server doesn't support the get-lock command"
msgstr "伺服器不支援 get-lock 命令"
# as-is
-#: libsvn_ra_svn/client.c:1848
+#: libsvn_ra_svn/client.c:1922
msgid "Lock element not a list"
msgstr "Lock element not a list"
-#: libsvn_ra_svn/client.c:1871
+#: libsvn_ra_svn/client.c:1945
msgid "Server doesn't support the replay command"
msgstr "伺服器不支援 replay 命令"
# as-is
-#: libsvn_ra_svn/client.c:1935
+#: libsvn_ra_svn/client.c:2010
#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
msgstr "Unsupported RA loader version (%d) for ra_svn"
#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
-#: libsvn_ra_svn/sasl_auth.c:389 libsvn_ra_svn/sasl_auth.c:444
-#: libsvn_ra_svn/simple_auth.c:61
+#: libsvn_ra_svn/cyrus_auth.c:437 libsvn_ra_svn/cyrus_auth.c:484
+#: libsvn_ra_svn/internal_auth.c:60
msgid "Unexpected server response to authentication"
msgstr "不預期對認證的伺服器回應"
+#: libsvn_ra_svn/cyrus_auth.c:171 svnserve/cyrus_auth.c:104
+#: svnserve/cyrus_auth.c:114
+#, c-format
+msgid "Could not initialize the SASL library"
+msgstr ""
+
+#: libsvn_ra_svn/cyrus_auth.c:824 libsvn_ra_svn/internal_auth.c:57
+#: libsvn_ra_svn/internal_auth.c:110
+#, c-format
+msgid "Authentication error from server: %s"
+msgstr "來自伺服器的認證錯誤: %s"
+
+#: libsvn_ra_svn/cyrus_auth.c:828
+#, fuzzy
+msgid "Can't get username or password"
+msgstr "無法取得密碼"
+
# as-is
#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
msgid "Invalid file or dir token during edit"
@@ -3313,11 +3383,16 @@
msgid "Apply-textdelta not active"
msgstr "Apply-textdelta not active"
-#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:845
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:896
#, c-format
msgid "Unknown command '%s'"
msgstr "未知的命令: '%s'"
+#: libsvn_ra_svn/internal_auth.c:97 libsvn_subr/prompt.c:156
+#, c-format
+msgid "Can't get password"
+msgstr "無法取得密碼"
+
# as-is
#: libsvn_ra_svn/marshal.c:86
msgid "Capability entry is not a word"
@@ -3328,62 +3403,36 @@
msgid "Connection closed unexpectedly"
msgstr "網路連線無預期地關閉"
-#: libsvn_ra_svn/marshal.c:509
+#: libsvn_ra_svn/marshal.c:536
msgid "String length larger than maximum"
msgstr "字串長度超出上限"
-#: libsvn_ra_svn/marshal.c:546
+#: libsvn_ra_svn/marshal.c:573
msgid "Too many nested items"
msgstr "太多巢狀項目"
-#: libsvn_ra_svn/marshal.c:565
+#: libsvn_ra_svn/marshal.c:592
msgid "Number is larger than maximum"
msgstr "數字大小超過上限"
-#: libsvn_ra_svn/marshal.c:768
+# as-is
+#: libsvn_ra_svn/marshal.c:796
+msgid "Proplist element not a list"
+msgstr "Proplist element not a list"
+
+#: libsvn_ra_svn/marshal.c:819
msgid "Empty error list"
msgstr "空的錯誤列表"
-#: libsvn_ra_svn/marshal.c:777
+#: libsvn_ra_svn/marshal.c:828
msgid "Malformed error list"
msgstr "有缺陷的錯誤列表"
-#: libsvn_ra_svn/marshal.c:816
+#: libsvn_ra_svn/marshal.c:867
#, c-format
msgid "Unknown status '%s' in command response"
msgstr "命令回應中的未知狀態 '%s'"
-#: libsvn_ra_svn/sasl_auth.c:179 svnserve/sasl_auth.c:104
-#: svnserve/sasl_auth.c:114
-#, c-format
-msgid "Could not initialize the SASL library"
-msgstr ""
-
-#: libsvn_ra_svn/sasl_auth.c:279
-#, fuzzy
-msgid "Can't get user name"
-msgstr "無法取得檔案名稱"
-
-#: libsvn_ra_svn/sasl_auth.c:286 libsvn_ra_svn/simple_auth.c:97
-#: libsvn_subr/prompt.c:156
-#, c-format
-msgid "Can't get password"
-msgstr "無法取得密碼"
-
-#: libsvn_ra_svn/sasl_auth.c:293
-msgid "Unhandled SASL interaction"
-msgstr ""
-
-#: libsvn_ra_svn/sasl_auth.c:761 libsvn_ra_svn/simple_auth.c:58
-#: libsvn_ra_svn/simple_auth.c:110
-#, c-format
-msgid "Authentication error from server: %s"
-msgstr "來自伺服器的認證錯誤: %s"
-
-#: libsvn_ra_svn/simple_auth.c:117
-msgid "Cannot negotiate authentication mechanism"
-msgstr "無法協商出認識機制"
-
#: libsvn_ra_svn/streams.c:77 libsvn_ra_svn/streams.c:152
#, c-format
msgid "Can't read from connection"
@@ -3400,22 +3449,22 @@
msgstr "無法設定逾時"
# as-is
-#: libsvn_repos/commit.c:128
+#: libsvn_repos/commit.c:125
#, c-format
msgid "Out of date: '%s' in transaction '%s'"
msgstr "Out of date: '%s' in transaction '%s'"
-#: libsvn_repos/commit.c:292 libsvn_repos/commit.c:453
+#: libsvn_repos/commit.c:274 libsvn_repos/commit.c:435
#, c-format
msgid "Got source path but no source revision for '%s'"
msgstr "'%s' 中有來源路徑, 但是沒有來源修訂版"
-#: libsvn_repos/commit.c:324 libsvn_repos/commit.c:484
+#: libsvn_repos/commit.c:306 libsvn_repos/commit.c:466
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "來源 URL '%s' 來自其它的檔案庫"
-#: libsvn_repos/commit.c:609
+#: libsvn_repos/commit.c:591
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -3484,7 +3533,7 @@
msgid "Commit succeeded, but post-commit hook failed"
msgstr "送交成功, 但是 post-commit 掛勾失敗"
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_repos/fs-wrap.c:183
#, c-format
msgid ""
"Storage of non-regular property '%s' is disallowed through the repository "
@@ -3493,17 +3542,17 @@
"Storage of non-regular property '%s' is disallowed through the repository "
"interface, and could indicate a bug in your client"
-#: libsvn_repos/fs-wrap.c:303
+#: libsvn_repos/fs-wrap.c:329
#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
msgstr "拒絕寫入: 未授權讀取所有的修訂版 %ld"
-#: libsvn_repos/fs-wrap.c:507
+#: libsvn_repos/fs-wrap.c:533
#, c-format
msgid "Cannot unlock path '%s', no authenticated username available"
msgstr "無法解除路徑 '%s' 的鎖定, 沒有通過認證的使用者名稱"
-#: libsvn_repos/fs-wrap.c:521
+#: libsvn_repos/fs-wrap.c:547
msgid "Unlock succeeded, but post-unlock hook failed"
msgstr "送交成功, 但是 post-unlock 掛勾失敗"
@@ -3684,7 +3733,7 @@
msgstr " 完成.\n"
# as-is
-#: libsvn_repos/load.c:1231
+#: libsvn_repos/load.c:1233
#, c-format
msgid ""
"\n"
@@ -3696,7 +3745,7 @@
"\n"
# as-is
-#: libsvn_repos/load.c:1237
+#: libsvn_repos/load.c:1239
#, c-format
msgid ""
"\n"
@@ -3712,38 +3761,48 @@
msgid "'%s' not found in filesystem"
msgstr "檔案系統中找不到 '%s'"
-#: libsvn_repos/replay.c:367
+#: libsvn_repos/replay.c:387
#, c-format
msgid "Filesystem path '%s' is neither a file nor a directory"
msgstr "檔案系統路徑 '%s' 不是檔案或目錄"
-#: libsvn_repos/reporter.c:602
+#: libsvn_repos/reporter.c:222
+#, fuzzy, c-format
+msgid "Invalid depth (%s) for path '%s'"
+msgstr "無效的複製來源路徑 '%s'"
+
+#: libsvn_repos/reporter.c:653
#, c-format
msgid "Working copy path '%s' does not exist in repository"
msgstr "路徑 '%s' 不存在於檔案庫中"
# as-is
-#: libsvn_repos/reporter.c:836
+#: libsvn_repos/reporter.c:948
msgid "Not authorized to open root of edit operation"
msgstr "Not authorized to open root of edit operation"
-#: libsvn_repos/reporter.c:855
+#: libsvn_repos/reporter.c:967
msgid "Target path does not exist"
msgstr "目標路徑不存在"
-#: libsvn_repos/reporter.c:862
+#: libsvn_repos/reporter.c:974
msgid "Cannot replace a directory from within"
msgstr "無法在目錄中取代它"
-#: libsvn_repos/reporter.c:905
+#: libsvn_repos/reporter.c:1017
msgid "Invalid report for top level of working copy"
msgstr "這個回報對工作複本的最上層目錄無效"
# as-is
-#: libsvn_repos/reporter.c:920
+#: libsvn_repos/reporter.c:1032
msgid "Two top-level reports with no target"
msgstr "Two top-level reports with no target"
+#: libsvn_repos/reporter.c:1063
+#, fuzzy, c-format
+msgid "Unsupported report depth '%s' for path '%s'"
+msgstr "路徑 '%s' 為不支援的節點種類"
+
#: libsvn_repos/repos.c:176
#, c-format
msgid "'%s' exists and is non-empty"
@@ -3790,35 +3849,35 @@
msgid "Creating conf directory"
msgstr "建立 conf 目錄"
-#: libsvn_repos/repos.c:1482
+#: libsvn_repos/repos.c:1484
msgid "Creating svnserve.conf file"
msgstr "建立 svnserve.conf 檔案"
-#: libsvn_repos/repos.c:1507
+#: libsvn_repos/repos.c:1509
msgid "Creating passwd file"
msgstr "建立 passwd 檔案"
-#: libsvn_repos/repos.c:1567
+#: libsvn_repos/repos.c:1579
msgid "Creating authz file"
msgstr "建立 authz 檔案"
-#: libsvn_repos/repos.c:1600
+#: libsvn_repos/repos.c:1612
msgid "Could not create top-level directory"
msgstr "無法建立臨時目錄"
-#: libsvn_repos/repos.c:1604
+#: libsvn_repos/repos.c:1616
msgid "Creating DAV sandbox dir"
msgstr "建立 DAV 沙箱目錄"
-#: libsvn_repos/repos.c:1685
+#: libsvn_repos/repos.c:1697
msgid "Error opening db lockfile"
msgstr "開啟 db 鎖定檔時發生錯誤"
-#: libsvn_repos/repos.c:1722
+#: libsvn_repos/repos.c:1734
msgid "Repository creation failed"
msgstr "檔案庫建立失敗"
-#: libsvn_repos/repos.c:1803
+#: libsvn_repos/repos.c:1815
#, fuzzy, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
msgstr "預期 FS 格式 '%d'; 找到格式 '%d'"
@@ -3842,7 +3901,7 @@
msgid "Unreadable path encountered; access denied"
msgstr "遇到無法讀取的路徑; 拒絕存取"
-#: libsvn_subr/cmdline.c:481
+#: libsvn_subr/cmdline.c:493
#, c-format
msgid "Error initializing command line arguments"
msgstr "無法初始化命令列引數"
@@ -3918,244 +3977,255 @@
msgid "Can't check path '%s'"
msgstr "無法檢查路徑 '%s'"
-#: libsvn_subr/io.c:377 libsvn_subr/io.c:508
+#: libsvn_subr/io.c:377
#, c-format
msgid "Can't open '%s'"
msgstr "無法開啟 '%s'"
-#: libsvn_subr/io.c:399 libsvn_subr/io.c:521
+#: libsvn_subr/io.c:399 libsvn_subr/io.c:522
#, c-format
msgid "Unable to make name for '%s'"
msgstr "無法為 '%s' 產生名稱"
-#: libsvn_subr/io.c:525 libsvn_subr/io.c:579 libsvn_subr/io.c:607
+#: libsvn_subr/io.c:509
+#, fuzzy, c-format
+msgid "Can't create symbolic link '%s'"
+msgstr "無法建立目錄 '%s'"
+
+#: libsvn_subr/io.c:526 libsvn_subr/io.c:580 libsvn_subr/io.c:608
msgid "Symbolic links are not supported on this platform"
msgstr "本平台不支援符號連結"
-#: libsvn_subr/io.c:558
+#: libsvn_subr/io.c:559
#, c-format
msgid "Can't read contents of link"
msgstr "無法讀取連線的內容"
-#: libsvn_subr/io.c:620
+#: libsvn_subr/io.c:621
#, c-format
msgid "Can't find a temporary directory"
msgstr "無法找到臨時目錄"
-#: libsvn_subr/io.c:753
+#: libsvn_subr/io.c:715
#, c-format
msgid "Can't copy '%s' to '%s'"
msgstr "無法複製 '%s' 至 '%s'"
-#: libsvn_subr/io.c:787
+#: libsvn_subr/io.c:767
#, c-format
msgid "Can't set permissions on '%s'"
msgstr "無法設定 '%s' 的檔案權限"
-#: libsvn_subr/io.c:809
+#: libsvn_subr/io.c:789
#, c-format
msgid "Can't append '%s' to '%s'"
msgstr "無法附加 '%s' 至 '%s'"
-#: libsvn_subr/io.c:843
+#: libsvn_subr/io.c:823
#, c-format
msgid "Source '%s' is not a directory"
msgstr "來源 '%s' 不是目錄"
-#: libsvn_subr/io.c:849
+#: libsvn_subr/io.c:829
#, c-format
msgid "Destination '%s' is not a directory"
msgstr "目標 p'%s' 不是目錄"
-#: libsvn_subr/io.c:855
+#: libsvn_subr/io.c:835
#, c-format
msgid "Destination '%s' already exists"
msgstr "目標 '%s' 已存在"
-#: libsvn_subr/io.c:924 libsvn_subr/io.c:1821 libsvn_subr/io.c:1872
-#: libsvn_subr/io.c:1935
+#: libsvn_subr/io.c:904 libsvn_subr/io.c:1830 libsvn_subr/io.c:1881
+#: libsvn_subr/io.c:1944
#, c-format
msgid "Can't read directory '%s'"
msgstr "無法讀取目錄 '%s'"
-#: libsvn_subr/io.c:929 libsvn_subr/io.c:1826 libsvn_subr/io.c:1877
-#: libsvn_subr/io.c:1940 libsvn_subr/io.c:2987
+#: libsvn_subr/io.c:909 libsvn_subr/io.c:1835 libsvn_subr/io.c:1886
+#: libsvn_subr/io.c:1949 libsvn_subr/io.c:3114
#, c-format
msgid "Error closing directory '%s'"
msgstr "無法關閉目錄 '%s'"
-#: libsvn_subr/io.c:955
+#: libsvn_subr/io.c:935
#, c-format
msgid "Can't make directory '%s'"
msgstr "無法建立目錄 '%s'"
-#: libsvn_subr/io.c:1042
+#: libsvn_subr/io.c:1022
#, c-format
msgid "Can't set access time of '%s'"
msgstr "無法設定 '%s' 的存取時間"
-#: libsvn_subr/io.c:1182
+#: libsvn_subr/io.c:1162
#, c-format
msgid "Can't get default file perms for file at '%s' (file stat error)"
msgstr "無法取得 '%s' 的預設檔案權限 (檔案 stat 錯誤)"
-#: libsvn_subr/io.c:1193
+#: libsvn_subr/io.c:1173
#, c-format
msgid "Can't open file at '%s'"
msgstr "無法於 '%s' 開啟檔案"
-#: libsvn_subr/io.c:1197
+#: libsvn_subr/io.c:1177
#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
msgstr "無法於 '%s' 取得檔案的權限 (檔案 stat 錯誤)"
-#: libsvn_subr/io.c:1236 libsvn_subr/io.c:1331
+#: libsvn_subr/io.c:1216 libsvn_subr/io.c:1311
#, c-format
msgid "Can't change perms of file '%s'"
msgstr "無法變更檔案 '%s' 的權限"
-#: libsvn_subr/io.c:1371
+#: libsvn_subr/io.c:1351
#, c-format
msgid "Can't set file '%s' read-only"
msgstr "無法設定檔案 '%s' 為唯讀"
-#: libsvn_subr/io.c:1403
+#: libsvn_subr/io.c:1383
#, c-format
msgid "Can't set file '%s' read-write"
msgstr "無法設定檔案 '%s' 為讀寫"
-#: libsvn_subr/io.c:1447
+#: libsvn_subr/io.c:1427
#, c-format
msgid "Error getting UID of process"
msgstr "取得行程的 UID 時發生錯誤"
-#: libsvn_subr/io.c:1528
+#: libsvn_subr/io.c:1508
#, c-format
msgid "Can't get shared lock on file '%s'"
msgstr "無法取得檔案 '%s' 的共享鎖定"
# as-is
-#: libsvn_subr/io.c:1563
+#: libsvn_subr/io.c:1543
#, c-format
msgid "Can't flush file '%s'"
msgstr "無法清空檔案 '%s'"
-#: libsvn_subr/io.c:1564
+#: libsvn_subr/io.c:1544
#, c-format
msgid "Can't flush stream"
msgstr "無法清空串流"
-#: libsvn_subr/io.c:1576 libsvn_subr/io.c:1593
+#: libsvn_subr/io.c:1556 libsvn_subr/io.c:1573
#, c-format
msgid "Can't flush file to disk"
msgstr "無法將檔案清空至磁碟"
+#: libsvn_subr/io.c:1595 libsvn_subr/prompt.c:97 svnserve/main.c:523
+#, c-format
+msgid "Can't open stdin"
+msgstr "無法開啟標準輸入"
+
# as-is
-#: libsvn_subr/io.c:1614
-msgid "Reading from stdin is currently broken, so disabled"
+#: libsvn_subr/io.c:1616
+#, fuzzy
+msgid "Reading from stdin is disallowed"
msgstr "Reading from stdin is currently broken, so disabled"
-#: libsvn_subr/io.c:1635
+#: libsvn_subr/io.c:1630
#, c-format
msgid "Can't get file name"
msgstr "無法取得檔案名稱"
# as-is
-#: libsvn_subr/io.c:1703
+#: libsvn_subr/io.c:1698
#, c-format
msgid "Can't remove file '%s'"
msgstr "無法移除檔案 '%s'"
-#: libsvn_subr/io.c:1757 libsvn_subr/io.c:2838 libsvn_subr/io.c:2924
+#: libsvn_subr/io.c:1765 libsvn_subr/io.c:2965 libsvn_subr/io.c:3051
#, c-format
msgid "Can't open directory '%s'"
msgstr "無法開啟目錄 '%s'"
-#: libsvn_subr/io.c:1802 libsvn_subr/io.c:1832
+#: libsvn_subr/io.c:1811 libsvn_subr/io.c:1841
#, c-format
msgid "Can't remove '%s'"
msgstr "無法移除 '%s'"
# as-is
-#: libsvn_subr/io.c:1812
+#: libsvn_subr/io.c:1821
#, c-format
msgid "Can't rewind directory '%s'"
msgstr "Can't rewind directory '%s'"
# as-is
-#: libsvn_subr/io.c:2004
+#: libsvn_subr/io.c:2013
#, c-format
msgid "Can't create process '%s' attributes"
msgstr "Can't create process '%s' attributes"
# as-is
-#: libsvn_subr/io.c:2010
+#: libsvn_subr/io.c:2019
#, c-format
msgid "Can't set process '%s' cmdtype"
msgstr "Can't set process '%s' cmdtype"
# as-is
-#: libsvn_subr/io.c:2022
+#: libsvn_subr/io.c:2031
#, c-format
msgid "Can't set process '%s' directory"
msgstr "Can't set process '%s' directory"
# as-is
-#: libsvn_subr/io.c:2035
+#: libsvn_subr/io.c:2044
#, c-format
msgid "Can't set process '%s' child input"
msgstr "Can't set process '%s' child input"
# as-is
-#: libsvn_subr/io.c:2042
+#: libsvn_subr/io.c:2051
#, c-format
msgid "Can't set process '%s' child outfile"
msgstr "Can't set process '%s' child outfile"
# as-is
-#: libsvn_subr/io.c:2049
+#: libsvn_subr/io.c:2058
#, c-format
msgid "Can't set process '%s' child errfile"
msgstr "Can't set process '%s' child errfile"
# as-is
-#: libsvn_subr/io.c:2056
+#: libsvn_subr/io.c:2065
#, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr "Can't set process '%s' child errfile for error handler"
# as-is
-#: libsvn_subr/io.c:2062
+#: libsvn_subr/io.c:2071
#, c-format
msgid "Can't set process '%s' error handler"
msgstr "Can't set process '%s' error handler"
-#: libsvn_subr/io.c:2085
+#: libsvn_subr/io.c:2094
#, c-format
msgid "Can't start process '%s'"
msgstr "無法啟動行程 '%s'"
-#: libsvn_subr/io.c:2109
+#: libsvn_subr/io.c:2118
#, c-format
msgid "Error waiting for process '%s'"
msgstr "等待行程 '%s' 時發生錯誤"
-#: libsvn_subr/io.c:2117
+#: libsvn_subr/io.c:2126
#, c-format
msgid "Process '%s' failed (exitwhy %d)"
msgstr "行程 '%s' 失敗 (exitwhy %d)"
-#: libsvn_subr/io.c:2124
+#: libsvn_subr/io.c:2133
#, c-format
msgid "Process '%s' returned error exitcode %d"
msgstr "行程 '%s' 傳回錯誤結束代碼 %d"
-#: libsvn_subr/io.c:2235
+#: libsvn_subr/io.c:2244
#, c-format
msgid "'%s' returned %d"
msgstr "'%s' 傳回 %d"
-#: libsvn_subr/io.c:2358
+#: libsvn_subr/io.c:2367
#, c-format
msgid ""
"Error running '%s': exitcode was %d, args were:\n"
@@ -4170,130 +4240,159 @@
"%s\n"
"%s"
-#: libsvn_subr/io.c:2411
+#: libsvn_subr/io.c:2494
#, c-format
msgid "Can't detect MIME type of non-file '%s'"
msgstr "無法偵測非檔案的 '%s' 的 MIME 類別"
-#: libsvn_subr/io.c:2478
+#: libsvn_subr/io.c:2584
#, c-format
msgid "Can't open file '%s'"
msgstr "無法開啟檔案 '%s'"
-#: libsvn_subr/io.c:2514
+#: libsvn_subr/io.c:2620
#, c-format
msgid "Can't close file '%s'"
msgstr "無法關閉檔案 '%s'"
-#: libsvn_subr/io.c:2515
+#: libsvn_subr/io.c:2621
#, c-format
msgid "Can't close stream"
msgstr "無法開啟串流"
-#: libsvn_subr/io.c:2525 libsvn_subr/io.c:2549 libsvn_subr/io.c:2562
+#: libsvn_subr/io.c:2631 libsvn_subr/io.c:2655 libsvn_subr/io.c:2668
#, c-format
msgid "Can't read file '%s'"
msgstr "無法讀取檔案 '%s'"
-#: libsvn_subr/io.c:2526 libsvn_subr/io.c:2550 libsvn_subr/io.c:2563
+#: libsvn_subr/io.c:2632 libsvn_subr/io.c:2656 libsvn_subr/io.c:2669
#, c-format
msgid "Can't read stream"
msgstr "無法讀取串流"
-#: libsvn_subr/io.c:2537
+#: libsvn_subr/io.c:2643
#, c-format
msgid "Can't get attribute information from file '%s'"
msgstr "無法自檔案 '%s' 取得屬性資訊"
-#: libsvn_subr/io.c:2538
+#: libsvn_subr/io.c:2644
#, c-format
msgid "Can't get attribute information from stream"
msgstr "無法自串流取得屬性資訊"
-#: libsvn_subr/io.c:2574
+#: libsvn_subr/io.c:2680
#, c-format
msgid "Can't set position pointer in file '%s'"
msgstr "無法於檔案 '%s' 中設定位置指標"
-#: libsvn_subr/io.c:2575
+#: libsvn_subr/io.c:2681
#, c-format
msgid "Can't set position pointer in stream"
msgstr "無法於串流中設定位置指標"
-#: libsvn_subr/io.c:2586 libsvn_subr/io.c:2599
+#: libsvn_subr/io.c:2692 libsvn_subr/io.c:2726
#, c-format
msgid "Can't write to file '%s'"
msgstr "無法寫入至檔案 '%s'"
-#: libsvn_subr/io.c:2587 libsvn_subr/io.c:2600
+#: libsvn_subr/io.c:2693 libsvn_subr/io.c:2727
#, c-format
msgid "Can't write to stream"
msgstr "無法寫入至串流"
-#: libsvn_subr/io.c:2640
+#: libsvn_subr/io.c:2767
#, c-format
msgid "Can't read length line in file '%s'"
msgstr "無法讀取檔案 '%s' 中的長度列"
-#: libsvn_subr/io.c:2644
+#: libsvn_subr/io.c:2771
msgid "Can't read length line in stream"
msgstr "無法讀取串流中的長度列"
-#: libsvn_subr/io.c:2691
+#: libsvn_subr/io.c:2818
#, c-format
msgid "Can't move '%s' to '%s'"
msgstr "無法搬移 '%s' 至 '%s'"
-#: libsvn_subr/io.c:2769
+#: libsvn_subr/io.c:2896
#, c-format
msgid "Can't create directory '%s'"
msgstr "無法建立目錄 '%s'"
-#: libsvn_subr/io.c:2780 libsvn_wc/copy.c:519
+#: libsvn_subr/io.c:2907 libsvn_wc/copy.c:509
#, c-format
msgid "Can't hide directory '%s'"
msgstr "無法隱藏目錄 '%s'"
-#: libsvn_subr/io.c:2792
+#: libsvn_subr/io.c:2919
#, c-format
msgid "Can't stat directory '%s'"
msgstr "無法 stat 目錄 '%s'"
-#: libsvn_subr/io.c:2856
+#: libsvn_subr/io.c:2983
#, c-format
msgid "Can't remove directory '%s'"
msgstr "無法移除目錄 '%s'"
-#: libsvn_subr/io.c:2874
+#: libsvn_subr/io.c:3001
#, c-format
msgid "Can't read directory"
msgstr "無法讀取目錄"
-#: libsvn_subr/io.c:2943
+#: libsvn_subr/io.c:3070
#, c-format
msgid "Can't read directory entry in '%s'"
msgstr "無法於 '%s' 中讀取目錄項目"
-#: libsvn_subr/io.c:3068
+#: libsvn_subr/io.c:3195
#, c-format
msgid "Can't check directory '%s'"
msgstr "無法檢查目錄 '%s'"
-#: libsvn_subr/io.c:3090
+#: libsvn_subr/io.c:3217
#, c-format
msgid "Version %d is not non-negative"
msgstr "版號 %d 不是非負數"
-#: libsvn_subr/io.c:3140
+#: libsvn_subr/io.c:3267
#, c-format
msgid "Reading '%s'"
msgstr "讀取 '%s' 中"
-#: libsvn_subr/io.c:3156
+#: libsvn_subr/io.c:3283
#, c-format
msgid "First line of '%s' contains non-digit"
msgstr "'%s' 的第一行包含非數字字元"
+#: libsvn_subr/mergeinfo.c:67
+#, fuzzy
+msgid "Invalid revision number"
+msgstr "提供了無效的版本號碼"
+
+#: libsvn_subr/mergeinfo.c:125
+#, fuzzy
+msgid "No revision list found "
+msgstr "沒有這個修訂版 %ld"
+
+#: libsvn_subr/mergeinfo.c:135 libsvn_subr/mergeinfo.c:163
+#, fuzzy
+msgid "Invalid character found in revision list"
+msgstr "無效的結束修訂版 %ld"
+
+#: libsvn_subr/mergeinfo.c:169
+#, fuzzy
+msgid "Revision list parsing ended before hitting newline"
+msgstr "修訂版檔案缺少結尾換列字元"
+
+#: libsvn_subr/mergeinfo.c:187
+msgid "Pathname not terminated by ':'"
+msgstr ""
+
+#: libsvn_subr/mergeinfo.c:195
+#, fuzzy
+msgid "Could not find end of line in revision line"
+msgstr "無法找到修訂版 %ld 的時間"
+
#: libsvn_subr/nls.c:79
#, c-format
msgid "Can't convert string to UCS-2: '%s'"
@@ -4316,10 +4415,9 @@
"\n"
"有效選項:\n"
-# as-is
#: libsvn_subr/opt.c:424
-msgid " arg"
-msgstr " arg"
+msgid " ARG"
+msgstr ""
#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
#, c-format
@@ -4330,27 +4428,27 @@
"\"%s\": 未知的命令.\n"
"\n"
-#: libsvn_subr/opt.c:760
+#: libsvn_subr/opt.c:781
#, c-format
msgid "Syntax error parsing revision '%s'"
msgstr "剖析修訂版 '%s' 時發生語法錯誤"
-#: libsvn_subr/opt.c:837
+#: libsvn_subr/opt.c:858
#, c-format
msgid "URL '%s' is not properly URI-encoded"
msgstr "URL '%s' 不是正確地以 URI 編碼"
-#: libsvn_subr/opt.c:843
+#: libsvn_subr/opt.c:864
#, c-format
msgid "URL '%s' contains a '..' element"
msgstr "URL '%s' 包含 '..' 元素"
-#: libsvn_subr/opt.c:872
+#: libsvn_subr/opt.c:893
#, c-format
msgid "Error resolving case of '%s'"
msgstr "解析 '%s' 時發生錯誤"
-#: libsvn_subr/opt.c:974
+#: libsvn_subr/opt.c:995
#, c-format
msgid ""
"%s, version %s\n"
@@ -4362,7 +4460,7 @@
"\n"
# as-is
-#: libsvn_subr/opt.c:977
+#: libsvn_subr/opt.c:998
#, fuzzy
msgid ""
"Copyright (C) 2000-2007 CollabNet.\n"
@@ -4377,36 +4475,31 @@
"Net/).\n"
"\n"
-#: libsvn_subr/opt.c:1028 libsvn_subr/opt.c:1069
+#: libsvn_subr/opt.c:1049 libsvn_subr/opt.c:1090
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "請使用 '%s help' 以了解用法.\n"
-#: libsvn_subr/path.c:1182
+#: libsvn_subr/path.c:1107
#, c-format
msgid "Couldn't determine absolute path of '%s'"
msgstr "無法決定 '%s' 的絕對路徑"
-#: libsvn_subr/path.c:1220
+#: libsvn_subr/path.c:1145
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "'%s' 不是檔案或目錄名稱"
-#: libsvn_subr/path.c:1335
+#: libsvn_subr/path.c:1251
#, c-format
msgid "Can't determine the native path encoding"
msgstr "無法決定原生的路徑編碼"
-#: libsvn_subr/path.c:1389
+#: libsvn_subr/path.c:1305
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "無效的控制字元 '0x%02x' 出現在路徑 '%s'"
-#: libsvn_subr/prompt.c:97 svnserve/main.c:514
-#, c-format
-msgid "Can't open stdin"
-msgstr "無法開啟標準輸入"
-
#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
#, c-format
msgid "Can't read stdin"
@@ -4487,12 +4580,7 @@
msgid "Passphrase for '%s': "
msgstr "'%s' 的密碼: "
-#: libsvn_subr/subst.c:1599
-#, c-format
-msgid "'%s' has unsupported special file type '%s'"
-msgstr "'%s' 為不支援的特殊檔案格式 '%s'"
-
-#: libsvn_subr/subst.c:1737 libsvn_wc/props.c:1499
+#: libsvn_subr/subst.c:1745 libsvn_wc/props.c:1632
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "檔案 '%s' 內的換列字元不一致"
@@ -4525,40 +4613,40 @@
msgid "Can't create a character converter from '%i' to '%i'"
msgstr "無法建立自 '%i' 至 '%i' 的字元轉換器"
-#: libsvn_subr/utf.c:515
+#: libsvn_subr/utf.c:522
#, c-format
msgid "Can't convert string from native encoding to '%s':"
msgstr "無法將字串自原生編碼轉換至 '%s'"
-#: libsvn_subr/utf.c:519
+#: libsvn_subr/utf.c:526
#, c-format
msgid "Can't convert string from '%s' to native encoding:"
msgstr "無法將字串自 '%s' 轉換至原生編碼"
-#: libsvn_subr/utf.c:523
+#: libsvn_subr/utf.c:530
#, c-format
msgid "Can't convert string from '%s' to '%s':"
msgstr "無法將字串自 '%s' 轉換至 '%s'"
-#: libsvn_subr/utf.c:529
+#: libsvn_subr/utf.c:536
#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
msgstr "無法將字串自 CCSID '%i' 轉換至 CCSID '%i'"
-#: libsvn_subr/utf.c:574
+#: libsvn_subr/utf.c:581
#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
"UTF-8"
msgstr "安全資料 '%s' 跟著非 ASCII 位元 %d: 無法轉換自/至 UTF-8"
-#: libsvn_subr/utf.c:582
+#: libsvn_subr/utf.c:589
#, c-format
msgid ""
"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
msgstr "偵測到非 ASCII 字元 (字碼 %d), 無法轉換自/至 UTF-8"
-#: libsvn_subr/utf.c:624
+#: libsvn_subr/utf.c:631
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -4596,16 +4684,11 @@
msgid "Malformed XML: %s at line %d"
msgstr "有缺陷 XML: %s 於第 %d 列"
-#: libsvn_wc/adm_crawler.c:605
+#: libsvn_wc/adm_crawler.c:635
msgid "Error aborting report"
msgstr "取消回報時發生錯誤"
-#: libsvn_wc/adm_crawler.c:908
-#, c-format
-msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
-msgstr "'%s' 的總和檢查值不一致: 預期 '%s', 實際: '%s'"
-
-#: libsvn_wc/adm_crawler.c:919
+#: libsvn_wc/adm_crawler.c:1059
#, c-format
msgid "While preparing '%s' for commit"
msgstr ""
@@ -4640,234 +4723,224 @@
msgid "No such thing as 'base' working copy properties!"
msgstr "沒有 '基礎' 工作複本性質這樣的東西"
-#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:51
+#: libsvn_wc/adm_files.c:973 libsvn_wc/util.c:52
#, c-format
msgid "'%s' is not a directory"
msgstr "'%s' 不是目錄"
-#: libsvn_wc/adm_files.c:1035
-#, c-format
-msgid "No entry for '%s'"
-msgstr "沒有 '%s' 的項目"
-
-#: libsvn_wc/adm_files.c:1048
+#: libsvn_wc/adm_files.c:1044
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "修訂版 %ld 不符合現有的修訂版 %ld 於 '%s' 中"
-#: libsvn_wc/adm_files.c:1056
+#: libsvn_wc/adm_files.c:1052
#, c-format
msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
msgstr "URL '%s' 不符合現有的 URL '%s' 於 '%s' 中"
-#: libsvn_wc/adm_ops.c:259
+#: libsvn_wc/adm_ops.c:278
#, c-format
msgid "Unrecognized node kind: '%s'"
msgstr "無法確認的節點種類: '%s'"
-#: libsvn_wc/adm_ops.c:1388
+#: libsvn_wc/adm_ops.c:1403
#, c-format
msgid "'%s' not found"
msgstr "找不到 '%s'"
-#: libsvn_wc/adm_ops.c:1392
+#: libsvn_wc/adm_ops.c:1407
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "路徑 '%s' 為不支援的節點種類"
-#: libsvn_wc/adm_ops.c:1422
+#: libsvn_wc/adm_ops.c:1437
#, c-format
msgid "'%s' is already under version control"
msgstr "'%s' 已納入版本控制"
-#: libsvn_wc/adm_ops.c:1434
+#: libsvn_wc/adm_ops.c:1449
#, fuzzy, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
"committed and the parent updated before adding '%s'"
msgstr "無法以不同種類節點來取代 '%s': 請送交該刪除, 更新父項目, 再新增 '%s'"
-#: libsvn_wc/adm_ops.c:1451
+#: libsvn_wc/adm_ops.c:1466
#, c-format
msgid "Can't find parent directory's entry while trying to add '%s'"
msgstr "在試著新增 '%s' 時, 無法找到父目錄的項目"
-#: libsvn_wc/adm_ops.c:1456
+#: libsvn_wc/adm_ops.c:1471
#, c-format
msgid "Can't add '%s' to a parent directory scheduled for deletion"
msgstr "無法新增 '%s' 至已預定要刪除的父目錄"
-#: libsvn_wc/adm_ops.c:1472
+#: libsvn_wc/adm_ops.c:1487
#, c-format
msgid "The URL '%s' has a different repository root than its parent"
msgstr "URL '%s' 的檔案庫根路徑與其父目錄的不同"
-#: libsvn_wc/adm_ops.c:1804
+#: libsvn_wc/adm_ops.c:1820
#, c-format
msgid "Error restoring text for '%s'"
msgstr "還原 '%s' 文字時發生錯誤"
-#: libsvn_wc/adm_ops.c:1935
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "無法復原: '%s' 未納入版本控制"
-
-#: libsvn_wc/adm_ops.c:1963
+#: libsvn_wc/adm_ops.c:1990
#, c-format
msgid "Cannot revert '%s': unsupported entry node kind"
msgstr "無法復原 '%s': 不支援的項目節點種類"
-#: libsvn_wc/adm_ops.c:1974
+#: libsvn_wc/adm_ops.c:2001
#, c-format
msgid "Cannot revert '%s': unsupported node kind in working copy"
msgstr "無法復原 '%s': 工作複本中有不支援的節點種類"
-#: libsvn_wc/adm_ops.c:2021
+#: libsvn_wc/adm_ops.c:2048
msgid ""
"Cannot revert addition of current directory; please try again from the "
"parent directory"
msgstr "無法復原目前目錄的新增; 請從父目錄再試一次"
-#: libsvn_wc/adm_ops.c:2043
+#: libsvn_wc/adm_ops.c:2070
#, c-format
msgid "Unknown or unexpected kind for path '%s'"
msgstr "路徑 '%s' 有未知或不預期的種類"
-#: libsvn_wc/adm_ops.c:2205
+#: libsvn_wc/adm_ops.c:2232
#, c-format
msgid "File '%s' has local modifications"
msgstr "檔案 '%s' 有本地的修改"
+#: libsvn_wc/adm_ops.c:2802
+#, fuzzy, c-format
+msgid "'%s' is not currently a member of changelist '%s'."
+msgstr "路徑 '%s' 不是檔案"
+
#: libsvn_wc/copy.c:197
#, fuzzy, c-format
msgid "Error during recursive copy of '%s'"
msgstr "進行 '%s' 的遞迴式新增時發生錯誤"
-#: libsvn_wc/copy.c:362
+#: libsvn_wc/copy.c:356
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "'%s' 已存在, 變成路中間的大石頭"
-#: libsvn_wc/copy.c:374
+#: libsvn_wc/copy.c:368
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "已有納入版本控制項目 '%s'"
-#: libsvn_wc/copy.c:384
-#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr "無法複製或移動 '%s': 它尚未納入版本控制"
-
-#: libsvn_wc/copy.c:393
+#: libsvn_wc/copy.c:383
#, c-format
msgid ""
"Cannot copy or move '%s': it's not in the repository yet; try committing "
"first"
msgstr "無法複製或移動 '%s': 它尚未存在於檔案庫之中; 請試著先進行送交"
-#: libsvn_wc/copy.c:672
+#: libsvn_wc/copy.c:658
#, c-format
msgid ""
"Cannot copy or move '%s': it is not in the repository yet; try committing "
"first"
msgstr "無法複製或移動 '%s': 它尚未存在於檔案庫之中; 請試著先進行送交"
-#: libsvn_wc/copy.c:799
+#: libsvn_wc/copy.c:776
#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
msgstr "無法複製至 '%s', 因為它不是來自檔案庫 '%s'; 它是來自 '%s'"
-#: libsvn_wc/copy.c:806
+#: libsvn_wc/copy.c:783
#, c-format
msgid "Cannot copy to '%s' as it is scheduled for deletion"
msgstr "無法複製至 '%s', 因為它已預定要刪除"
-#: libsvn_wc/entries.c:91 libsvn_wc/entries.c:349 libsvn_wc/entries.c:561
-#: libsvn_wc/entries.c:822
+#: libsvn_wc/entries.c:94 libsvn_wc/entries.c:352 libsvn_wc/entries.c:588
+#: libsvn_wc/entries.c:849
#, c-format
msgid "Entry '%s' has invalid '%s' value"
msgstr "項目 '%s' 有無效的 '%s' 值"
-#: libsvn_wc/entries.c:111
+#: libsvn_wc/entries.c:114
msgid "Invalid escape sequence"
msgstr "無效的逸出序列"
-#: libsvn_wc/entries.c:118
+#: libsvn_wc/entries.c:121
msgid "Invalid escaped character"
msgstr "無效的逸出字元"
# as-is
-#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
-#: libsvn_wc/entries.c:203
+#: libsvn_wc/entries.c:139 libsvn_wc/entries.c:168 libsvn_wc/entries.c:194
+#: libsvn_wc/entries.c:206
msgid "Unexpected end of entry"
msgstr "Unexpected end of entry"
-#: libsvn_wc/entries.c:225
+#: libsvn_wc/entries.c:228
#, c-format
msgid "Invalid value for field '%s'"
msgstr "給欄位 '%s' 的無效數值"
-#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:536
+#: libsvn_wc/entries.c:310 libsvn_wc/entries.c:563
#, c-format
msgid "Entry '%s' has invalid node kind"
msgstr "項目 '%s' 有無效的節點種類"
-#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:513
+#: libsvn_wc/entries.c:331 libsvn_wc/entries.c:540
#, c-format
msgid "Entry for '%s' has invalid repository root"
msgstr "項目 '%s' 有無效的檔案庫根目錄"
-#: libsvn_wc/entries.c:947
+#: libsvn_wc/entries.c:995
#, c-format
msgid "XML parser failed in '%s'"
msgstr "XML 剖析器無法處理 '%s'"
-#: libsvn_wc/entries.c:1006
+#: libsvn_wc/entries.c:1054
msgid "Missing default entry"
msgstr "遺漏預設項目"
-#: libsvn_wc/entries.c:1011
+#: libsvn_wc/entries.c:1059
msgid "Default entry has no revision number"
msgstr "預設項目沒有修訂版編號"
-#: libsvn_wc/entries.c:1016
+#: libsvn_wc/entries.c:1064
msgid "Default entry is missing URL"
msgstr "預設項目沒有 URL"
-#: libsvn_wc/entries.c:1092
+#: libsvn_wc/entries.c:1140
#, c-format
msgid "Invalid version line in entries file of '%s'"
msgstr "項目檔案 '%s' 中有無效的版本列"
-#: libsvn_wc/entries.c:1109
+#: libsvn_wc/entries.c:1157
msgid "Missing entry terminator"
msgstr "遺漏項目終止符"
-#: libsvn_wc/entries.c:1112
+#: libsvn_wc/entries.c:1160
msgid "Invalid entry terminator"
msgstr "無效的項目終止符"
-#: libsvn_wc/entries.c:1116
+#: libsvn_wc/entries.c:1164
#, c-format
msgid "Error at entry %d in entries file for '%s':"
msgstr "項目 %d 於 '%s' 項目檔案中發生錯誤"
-#: libsvn_wc/entries.c:1212
+#: libsvn_wc/entries.c:1287
#, c-format
msgid "Corrupt working copy: '%s' has no default entry"
msgstr "損毀的工作複本: 目錄 '%s' 沒有預設的項目"
-#: libsvn_wc/entries.c:1229
+#: libsvn_wc/entries.c:1304
#, c-format
msgid "Corrupt working copy: directory '%s' has an invalid schedule"
msgstr "損毀的工作複本: 目錄 '%s' 有無效的時程"
-#: libsvn_wc/entries.c:1263
+#: libsvn_wc/entries.c:1338
#, c-format
msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
msgstr "損毀的工作複本: '%s' 於目錄 '%s' 中有無效的時程"
-#: libsvn_wc/entries.c:1272
+#: libsvn_wc/entries.c:1347
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4875,7 +4948,7 @@
msgstr ""
"損毀的工作複本: '%s' 於目錄 '%s' 中 (已排入新增時程) 與排入新增時程的不一致"
-#: libsvn_wc/entries.c:1280
+#: libsvn_wc/entries.c:1355
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
@@ -4883,73 +4956,73 @@
msgstr ""
"損毀的工作複本: '%s' 於目錄 '%s' 中 (已排入刪除時程) 與排入刪除時程的不一致"
-#: libsvn_wc/entries.c:1288
+#: libsvn_wc/entries.c:1363
#, c-format
msgid ""
"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
"replacement) has an invalid schedule"
msgstr "損毀的工作複本: '%s' 於目錄 '%s' 中 (已排入取代時程) 有無效的時程"
-#: libsvn_wc/entries.c:1925
+#: libsvn_wc/entries.c:2010
#, c-format
msgid "No default entry in directory '%s'"
msgstr "在目錄 '%s' 中沒有預設的項目"
-#: libsvn_wc/entries.c:1980
+#: libsvn_wc/entries.c:2065
#, c-format
msgid "Error writing to '%s'"
msgstr "寫至 '%s' 時發生錯誤"
-#: libsvn_wc/entries.c:2303
+#: libsvn_wc/entries.c:2394
#, c-format
msgid ""
"Can't add '%s' to deleted directory; try undeleting its parent directory "
"first"
msgstr "無法新增 '%s' 至已刪除的目錄; 請先嘗試回復其父目錄"
-#: libsvn_wc/entries.c:2309
+#: libsvn_wc/entries.c:2400
#, c-format
msgid ""
"Can't replace '%s' in deleted directory; try undeleting its parent directory "
"first"
msgstr "無法在已刪除的目錄中取代 '%s'; 請先嘗試回復其父目錄"
-#: libsvn_wc/entries.c:2318
+#: libsvn_wc/entries.c:2409
#, c-format
msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
msgstr "'%s' 被標示為不存在, 所以無法排入新增時程"
-#: libsvn_wc/entries.c:2347
+#: libsvn_wc/entries.c:2438
#, c-format
msgid "Entry '%s' is already under version control"
msgstr "項目 '%s' 已納入版本控制"
-#: libsvn_wc/entries.c:2444
+#: libsvn_wc/entries.c:2535
#, c-format
msgid "Entry '%s' has illegal schedule"
msgstr "項目 '%s' 有不合法的排程"
-#: libsvn_wc/entries.c:2590
+#: libsvn_wc/entries.c:2681
#, c-format
msgid "No such entry: '%s'"
msgstr "沒有這樣的項目: '%s'"
-#: libsvn_wc/entries.c:2717
+#: libsvn_wc/entries.c:2814
#, c-format
msgid "Error writing entries file for '%s'"
msgstr "寫入 '%s' 的項目檔案時發生錯誤"
-#: libsvn_wc/entries.c:2759
+#: libsvn_wc/entries.c:2856
#, c-format
msgid "Directory '%s' has no THIS_DIR entry"
msgstr "目錄 '%s' 沒有 THIS_DIR 項目"
-#: libsvn_wc/entries.c:2888
+#: libsvn_wc/entries.c:2985
#, c-format
msgid "'%s' has an unrecognized node kind"
msgstr "'%s' 的節點種類無法辨識"
-#: libsvn_wc/entries.c:2925
+#: libsvn_wc/entries.c:3022
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "不預期地找到了 '%s': 路徑已被標示為 '遺漏'"
@@ -5014,7 +5087,7 @@
msgid "Lock file '%s' is not a regular file"
msgstr "鎖定檔 '%s' 不是一般的檔案"
-#: libsvn_wc/log.c:339
+#: libsvn_wc/log.c:355
msgid "Can't move source to dest"
msgstr "無法移動來源至目的"
@@ -5022,145 +5095,145 @@
#.
#. This is implemented as a macro so that the error created has a useful
#. line number associated with it.
-#: libsvn_wc/log.c:502
+#: libsvn_wc/log.c:518
#, c-format
msgid "In directory '%s'"
msgstr "在目錄 '%s' 中"
-#: libsvn_wc/log.c:527
+#: libsvn_wc/log.c:543
#, c-format
msgid "Missing 'left' attribute in '%s'"
msgstr "'%s' 遺漏了 'left' 屬性"
-#: libsvn_wc/log.c:534
+#: libsvn_wc/log.c:550
#, c-format
msgid "Missing 'right' attribute in '%s'"
msgstr "'%s' 遺漏了 'right' 屬性"
-#: libsvn_wc/log.c:602
+#: libsvn_wc/log.c:618
#, c-format
msgid "Missing 'dest' attribute in '%s'"
msgstr "'%s' 遺漏了 'dest' 屬性"
-#: libsvn_wc/log.c:683
+#: libsvn_wc/log.c:699
#, c-format
msgid "Missing 'timestamp' attribute in '%s'"
msgstr "'%s' 遺漏 'timestamp' 屬性"
-#: libsvn_wc/log.c:779 libsvn_wc/log.c:819
+#: libsvn_wc/log.c:795 libsvn_wc/log.c:835
#, c-format
msgid "Error getting 'affected time' on '%s'"
msgstr "取得 '%s' 的 'affected time' 時發生錯誤"
-#: libsvn_wc/log.c:830
+#: libsvn_wc/log.c:868
+#, fuzzy, c-format
+msgid "Error getting file size on '%s'"
+msgstr "取得 '%s' 的 'affected time' 時發生錯誤"
+
+#: libsvn_wc/log.c:886
#, c-format
msgid "Error modifying entry for '%s'"
msgstr "修改 '%s' 的項目時發生錯誤"
-#: libsvn_wc/log.c:856
+#: libsvn_wc/log.c:912
#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "移除 '%s' 的鎖定時發生錯誤"
-#: libsvn_wc/log.c:879
+#: libsvn_wc/log.c:935
#, fuzzy, c-format
msgid "Error removing changelist from entry '%s'"
msgstr "讀取鍵值為 '%s' 的更動時發生錯誤"
-#: libsvn_wc/log.c:1011
+#: libsvn_wc/log.c:1067
#, c-format
msgid "Missing 'revision' attribute for '%s'"
msgstr "'%s' 遺漏了 'revision' 屬性"
-#: libsvn_wc/log.c:1035
+#: libsvn_wc/log.c:1091
#, c-format
msgid "Log command for directory '%s' is mislocated"
msgstr "對目錄 '%s' 的紀錄命令被錯置"
-#: libsvn_wc/log.c:1231
+#: libsvn_wc/log.c:1287
#, c-format
msgid "Error checking existence of '%s'"
msgstr "檢查 '%s' 是否存在時發生錯誤"
-#: libsvn_wc/log.c:1288
+#: libsvn_wc/log.c:1353
#, c-format
msgid "Error replacing text-base of '%s'"
msgstr "取代 '%s' 的文件參考基礎時發生錯誤"
-#: libsvn_wc/log.c:1293
+#: libsvn_wc/log.c:1358
#, c-format
msgid "Error getting 'affected time' of '%s'"
msgstr "取得 '%s' 的 'affected time' 時發生錯誤"
-#: libsvn_wc/log.c:1334
+#: libsvn_wc/log.c:1381
#, c-format
msgid "Error getting 'affected time' for '%s'"
msgstr "取得 '%s' 的 'affected time' 時發生錯誤"
-#: libsvn_wc/log.c:1349
+#: libsvn_wc/log.c:1401
#, c-format
msgid "Error comparing '%s' and '%s'"
msgstr "比較 '%s' 與 '%s' 時發生錯誤"
-#: libsvn_wc/log.c:1394 libsvn_wc/log.c:1461
+#: libsvn_wc/log.c:1450 libsvn_wc/log.c:1517
#, c-format
msgid "Error modifying entry of '%s'"
msgstr "修改 '%s' 的項目時發生錯誤"
-#: libsvn_wc/log.c:1516
+#: libsvn_wc/log.c:1572
msgid "Invalid 'format' attribute"
msgstr "無效的 'format' 屬性"
-#: libsvn_wc/log.c:1551
+#: libsvn_wc/log.c:1607
#, c-format
msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
msgstr "紀錄檔項目遺漏 'name' 屬性 (項目 '%s' 對應至目錄 '%s')"
-#: libsvn_wc/log.c:1622
+#: libsvn_wc/log.c:1678
#, c-format
msgid "Unrecognized logfile element '%s' in '%s'"
msgstr "無法確認的紀錄檔元素 '%s' 於 '%s' 中"
-#: libsvn_wc/log.c:1633
+#: libsvn_wc/log.c:1689
#, c-format
msgid "Error processing command '%s' in '%s'"
msgstr "處理命令 '%s' 於 '%s' 中時發生錯誤"
-#: libsvn_wc/log.c:1815
+#: libsvn_wc/log.c:1871
msgid "Couldn't open log"
msgstr "無法開啟紀錄檔"
-#: libsvn_wc/log.c:1826
+#: libsvn_wc/log.c:1882
#, c-format
msgid "Error reading administrative log file in '%s'"
msgstr "於 '%s' 中讀取管理紀錄檔時發生錯誤"
-#: libsvn_wc/log.c:2440
+#: libsvn_wc/log.c:2524
#, c-format
msgid "Error writing log for '%s'"
msgstr "為 '%s' 寫入紀錄時發生錯誤"
-#: libsvn_wc/log.c:2489
-#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "'%s' 並不是工作複本目錄"
-
-#: libsvn_wc/props.c:92
+#: libsvn_wc/props.c:95
#, c-format
msgid "Can't parse '%s'"
msgstr "無法剖析 '%s'"
-#: libsvn_wc/props.c:123
+#: libsvn_wc/props.c:126
#, c-format
msgid "Can't write property hash to '%s'"
msgstr "無法寫入性質雜湊至 '%s'"
-#: libsvn_wc/props.c:218
+#: libsvn_wc/props.c:221
#, c-format
msgid "Can't find entry '%s' in '%s'"
msgstr "無法找到項目 '%s' 於 '%s' 之中"
-#: libsvn_wc/props.c:633
+#: libsvn_wc/props.c:725
#, c-format
msgid ""
"Trying to add new property '%s' with value '%s',\n"
@@ -5169,7 +5242,7 @@
"預計新增性質 '%s', 其值為 '%s',\n"
"但是該性質已存在, 其值為 '%s'."
-#: libsvn_wc/props.c:656
+#: libsvn_wc/props.c:763
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5178,13 +5251,13 @@
"預計將性質 '%s' 自 '%s' 變更為 '%s',\n"
"但是該性質不存在."
-#: libsvn_wc/props.c:684
+#: libsvn_wc/props.c:808
#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
msgstr "預計刪除性質 '%s', 但是其值已自 '%s' 變更為 '%s'."
-#: libsvn_wc/props.c:702
+#: libsvn_wc/props.c:837
#, c-format
msgid ""
"Trying to change property '%s' from '%s' to '%s',\n"
@@ -5193,66 +5266,66 @@
"預計將性質 '%s' 自 '%s' 變更為 '%s',\n"
"但是該性質已存在, 其值為 '%s'."
-#: libsvn_wc/props.c:885
+#: libsvn_wc/props.c:1022
#, c-format
msgid "Missing end of line in wcprops file for '%s'"
msgstr "'%s' 的 wcprops 檔案缺少換列符號"
-#: libsvn_wc/props.c:1068 libsvn_wc/props.c:1104 libsvn_wc/props.c:1374
-#: libsvn_wc/props.c:1626
+#: libsvn_wc/props.c:1205 libsvn_wc/props.c:1237 libsvn_wc/props.c:1507
+#: libsvn_wc/props.c:1755
msgid "Failed to load properties from disk"
msgstr "無法自磁碟載入性質"
-#: libsvn_wc/props.c:1132
+#: libsvn_wc/props.c:1265
#, c-format
msgid "Cannot write property hash for '%s'"
msgstr "無法寫入 '%s' 的性質雜湊"
-#: libsvn_wc/props.c:1366 libsvn_wc/props.c:1535
+#: libsvn_wc/props.c:1499 libsvn_wc/props.c:1668
#, c-format
msgid "Property '%s' is an entry property"
msgstr "性質 '%s' 是項目性質"
-#: libsvn_wc/props.c:1413
+#: libsvn_wc/props.c:1546
#, c-format
msgid "Cannot set '%s' on a directory ('%s')"
msgstr "無法設定 '%s' 於目錄 ('%s')"
-#: libsvn_wc/props.c:1421
+#: libsvn_wc/props.c:1554
#, c-format
msgid "Cannot set '%s' on a file ('%s')"
msgstr "無法設定 '%s' 於檔案 ('%s')"
-#: libsvn_wc/props.c:1427
+#: libsvn_wc/props.c:1560
#, c-format
msgid "'%s' is not a file or directory"
msgstr "'%s' 不是檔案或目錄"
-#: libsvn_wc/props.c:1508
+#: libsvn_wc/props.c:1641
#, c-format
msgid "File '%s' has binary mime type property"
msgstr "檔案 '%s' 有二進制的 mime 型別性質"
-#: libsvn_wc/props.c:2169
+#: libsvn_wc/props.c:2507
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "剖析 %s 性質於 '%s' 發生錯誤: '%s'"
-#: libsvn_wc/props.c:2182
+#: libsvn_wc/props.c:2520
#, c-format
msgid ""
"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
"path"
msgstr "無效性質 %s 於 '%s': 目錄牽涉到 '.' 或 '..' 或是絕對路徑"
-#: libsvn_wc/questions.c:120
+#: libsvn_wc/questions.c:121
#, c-format
msgid ""
"Working copy format of '%s' is too old (%d); please check out your working "
"copy again"
msgstr "'%s' 的工作複本格式已過時 (%d); 請重新取出你的工作複本"
-#: libsvn_wc/questions.c:128
+#: libsvn_wc/questions.c:129
#, c-format
msgid ""
"This client is too old to work with working copy '%s'; please get a newer "
@@ -5260,7 +5333,7 @@
msgstr ""
"本用戶端已過時, 無法存取工作複本 '%s'; 請取得更新版的 Subversion 用戶端"
-#: libsvn_wc/questions.c:346
+#: libsvn_wc/questions.c:336
#, c-format
msgid ""
"Checksum mismatch indicates corrupt text base: '%s'\n"
@@ -5271,136 +5344,144 @@
" 預期: %s\n"
" 實際: %s\n"
-#: libsvn_wc/relocate.c:69
+#: libsvn_wc/relocate.c:78
msgid "Relocate can only change the repository part of an URL"
msgstr "重新安置只能能變更一個 URL 的檔案庫部份"
-#: libsvn_wc/update_editor.c:399
+#: libsvn_wc/update_editor.c:440
#, c-format
msgid "No '.' entry in: '%s'"
msgstr "不存在 '.' 項目: '%s'"
-#: libsvn_wc/update_editor.c:923
+#: libsvn_wc/update_editor.c:963
#, c-format
msgid "Won't delete locally modified directory '%s'"
msgstr "無法刪除本地修改的目錄 '%s'"
-#: libsvn_wc/update_editor.c:997
+#: libsvn_wc/update_editor.c:1037
#, c-format
msgid "Error writing log file for '%s'"
msgstr "寫入 '%s' 的紀錄檔時發生錯誤"
-#: libsvn_wc/update_editor.c:1101
+#: libsvn_wc/update_editor.c:1144
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': a non-directory object of the same name "
"already exists"
msgstr "無法新增目錄 '%s': 同名物件已存在"
-#: libsvn_wc/update_editor.c:1134
+#: libsvn_wc/update_editor.c:1177
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': an unversioned directory of the same name "
"already exists"
msgstr "無法新增目錄 '%s': 同名物件已存在"
-#: libsvn_wc/update_editor.c:1156
+#: libsvn_wc/update_editor.c:1199
#, fuzzy, c-format
msgid ""
"Failed to add directory '%s': a versioned directory of the same name already "
"exists"
msgstr "無法新增目錄 '%s': 同名物件已存在"
-#: libsvn_wc/update_editor.c:1167
+#: libsvn_wc/update_editor.c:1210
#, c-format
msgid ""
"Failed to add directory '%s': object of the same name as the administrative "
"directory"
msgstr "無法新增目錄 '%s': 物件與管理目錄同名"
-#: libsvn_wc/update_editor.c:1181
+#: libsvn_wc/update_editor.c:1224
#, c-format
msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
msgstr "無法新增檔案 '%s': copyfrom 參數尚不支援"
-#: libsvn_wc/update_editor.c:1435
+#: libsvn_wc/update_editor.c:1521
msgid "Couldn't do property merge"
msgstr "無法進行性質合併"
-#: libsvn_wc/update_editor.c:1505
+#: libsvn_wc/update_editor.c:1590
#, c-format
msgid ""
"Failed to mark '%s' absent: item of the same name is already scheduled for "
"addition"
msgstr "無法將 '%s' 標記為不存在: 同名項目已排入新增時程"
-#: libsvn_wc/update_editor.c:1605
+#: libsvn_wc/update_editor.c:1690
#, fuzzy, c-format
msgid ""
"Failed to add file '%s': a file of the same name is already scheduled for "
"addition with history"
msgstr "無法新增檔案 '%s': 同名物件已排入新增時程"
-#: libsvn_wc/update_editor.c:1617
+#: libsvn_wc/update_editor.c:1702
#, fuzzy, c-format
msgid ""
"Failed to add file '%s': a non-file object of the same name already exists"
msgstr "無法新增檔案 '%s': 同名物件已存在"
-#: libsvn_wc/update_editor.c:1632
+#: libsvn_wc/update_editor.c:1717
#, c-format
msgid "Failed to add file '%s': object of the same name already exists"
msgstr "無法新增檔案 '%s': 同名物件已存在"
-#: libsvn_wc/update_editor.c:1649
+#: libsvn_wc/update_editor.c:1734
#, c-format
msgid "File '%s' in directory '%s' is not a versioned resource"
msgstr "檔案 '%s' 於目錄 '%s' 中的並不是納入版本控制的資源"
-#: libsvn_wc/update_editor.c:1767
+#: libsvn_wc/update_editor.c:1883
#, c-format
msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
msgstr "'%s' 的總和檢查值不符合; 紀錄: '%s', 實際: '%s'"
-#: libsvn_wc/update_editor.c:2995
+#: libsvn_wc/update_editor.c:3015
#, c-format
msgid "'%s' has no ancestry information"
msgstr "'%s' 沒有演進歷程資訊"
-#: libsvn_wc/update_editor.c:3158
+#: libsvn_wc/update_editor.c:3174
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Copyfrom-url '%s' 與 '%s' 的檔案庫根目錄不同"
-#: libsvn_wc/util.c:83
+#: libsvn_wc/util.c:84
msgid "Unable to make any directories"
msgstr "無法建立任何目錄"
-#: svn/blame-cmd.c:234 svn/list-cmd.c:252
+#: svn/blame-cmd.c:206 svn/list-cmd.c:227
msgid "'verbose' option invalid in XML mode"
msgstr "'verbose' 選項在 XML 模式中無效"
-#: svn/blame-cmd.c:246 svn/info-cmd.c:507 svn/list-cmd.c:264
-#: svn/status-cmd.c:268
+#: svn/blame-cmd.c:218 svn/info-cmd.c:511 svn/list-cmd.c:239
+#: svn/status-cmd.c:249
msgid "'incremental' option only valid in XML mode"
msgstr "'incremental' 選項僅於 XML 模式中有效"
-#: svn/blame-cmd.c:313
+#: svn/blame-cmd.c:280
#, c-format
msgid "Skipping binary file: '%s'\n"
msgstr "略過二進制檔案: '%s'\n"
-#: svn/checkout-cmd.c:129 svn/switch-cmd.c:127
+#: svn/changelist-cmd.c:61 svn/info-cmd.c:477 svn/log-cmd.c:410
+#: svn/revert-cmd.c:58
+#, fuzzy, c-format
+msgid "no such changelist '%s'"
+msgstr "沒有這樣的項目: '%s'"
+
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:135
#, c-format
msgid "'%s' does not appear to be a URL"
msgstr "'%s' 不像是 URL"
-#: svn/copy-cmd.c:126 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66
-#: svn/propedit-cmd.c:200
-msgid "Local, non-commit operations do not take a log message"
+#: svn/copy-cmd.c:124 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66 svn/move-cmd.c:76
+#: svn/propedit-cmd.c:201
+#, fuzzy
+msgid ""
+"Local, non-commit operations do not take a log message or revision properties"
msgstr "本地非送交的動作不需要送交訊息"
-#: svn/diff-cmd.c:117 svnserve/main.c:523
+#: svn/diff-cmd.c:117 svnserve/main.c:530
#, c-format
msgid "Can't open stdout"
msgstr "無法開啟標準輸出 (stdout)"
@@ -5419,7 +5500,7 @@
msgid "Target lists to diff may not contain both working copy paths and URLs"
msgstr "差異比較目標不可同時包含工作複本路徑與 URL"
-#: svn/export-cmd.c:84
+#: svn/export-cmd.c:87
msgid ""
"Destination directory exists; please remove the directory or use --force to "
"overwrite"
@@ -5458,7 +5539,7 @@
"Subversion 是個版本控制系統的工具.\n"
"欲取得詳細資料, 請參考 http://subversion.tigris.org/\n"
-#: svn/help-cmd.c:65 svnsync/main.c:1296
+#: svn/help-cmd.c:65 svnsync/main.c:1430
msgid ""
"The following repository access (RA) modules are available:\n"
"\n"
@@ -5479,158 +5560,179 @@
msgid "Invalid URL '%s'"
msgstr "無效 URL '%s'"
-#: svn/info-cmd.c:111
+#: svn/info-cmd.c:88
#, c-format
msgid "'%s' has invalid revision"
msgstr "項目 '%s' 有無效的修訂版"
-#: svn/info-cmd.c:267 svnadmin/main.c:1116
+#: svn/info-cmd.c:250 svnadmin/main.c:1118
#, c-format
msgid "Path: %s\n"
msgstr "路徑: %s\n"
# this points to filename according to sunny256
-#: svn/info-cmd.c:273 svnlook/main.c:734
+#: svn/info-cmd.c:256 svnlook/main.c:738
#, c-format
msgid "Name: %s\n"
msgstr "檔案名: %s\n"
-#: svn/info-cmd.c:277
+#: svn/info-cmd.c:260
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: svn/info-cmd.c:280
+#: svn/info-cmd.c:263
#, c-format
msgid "Repository Root: %s\n"
msgstr "檔案庫根目錄: %s\n"
-#: svn/info-cmd.c:284
+#: svn/info-cmd.c:267
#, c-format
msgid "Repository UUID: %s\n"
msgstr "檔案庫 UUID: %s\n"
-#: svn/info-cmd.c:288
+#: svn/info-cmd.c:271
#, c-format
msgid "Revision: %ld\n"
msgstr "修訂版: %ld\n"
-#: svn/info-cmd.c:293
+#: svn/info-cmd.c:276
#, c-format
msgid "Node Kind: file\n"
msgstr "節點種類: 檔案\n"
-#: svn/info-cmd.c:297
+#: svn/info-cmd.c:280
#, c-format
msgid "Node Kind: directory\n"
msgstr "節點種類: 目錄\n"
-#: svn/info-cmd.c:301
+#: svn/info-cmd.c:284
#, c-format
msgid "Node Kind: none\n"
msgstr "節點種類: 無\n"
-#: svn/info-cmd.c:306
+#: svn/info-cmd.c:289
#, c-format
msgid "Node Kind: unknown\n"
msgstr "節點種類: 未知\n"
-#: svn/info-cmd.c:315
+#: svn/info-cmd.c:298
#, c-format
msgid "Schedule: normal\n"
msgstr "排程: 正常\n"
-#: svn/info-cmd.c:319
+#: svn/info-cmd.c:302
#, c-format
msgid "Schedule: add\n"
msgstr "排程: 新增\n"
-#: svn/info-cmd.c:323
+#: svn/info-cmd.c:306
#, c-format
msgid "Schedule: delete\n"
msgstr "排程: 刪除\n"
-#: svn/info-cmd.c:327
+#: svn/info-cmd.c:310
#, c-format
msgid "Schedule: replace\n"
msgstr "排程: 取代\n"
-#: svn/info-cmd.c:335
+#: svn/info-cmd.c:326
+#, c-format
+msgid "Depth: empty\n"
+msgstr ""
+
+#: svn/info-cmd.c:330
+#, c-format
+msgid "Depth: files\n"
+msgstr ""
+
+#: svn/info-cmd.c:334
+#, c-format
+msgid "Depth: immediates\n"
+msgstr ""
+
+#. Other depths should never happen here.
+#: svn/info-cmd.c:345
+#, c-format
+msgid "Depth: INVALID\n"
+msgstr ""
+
+#: svn/info-cmd.c:349
#, c-format
msgid "Copied From URL: %s\n"
msgstr "拷貝自 URL: %s\n"
-#: svn/info-cmd.c:339
+#: svn/info-cmd.c:353
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "拷貝自修訂版: %ld\n"
-#: svn/info-cmd.c:344
+#: svn/info-cmd.c:358
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "最後更新作者: %s\n"
-#: svn/info-cmd.c:348
+#: svn/info-cmd.c:362
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "最後修改修訂版: %ld\n"
-#: svn/info-cmd.c:353
+#: svn/info-cmd.c:367
msgid "Last Changed Date"
msgstr "最後修改日期"
-#: svn/info-cmd.c:359
+#: svn/info-cmd.c:373
msgid "Text Last Updated"
msgstr "文字最後更新"
-#: svn/info-cmd.c:363
+#: svn/info-cmd.c:377
msgid "Properties Last Updated"
msgstr "性質最後更新"
-#: svn/info-cmd.c:366
+#: svn/info-cmd.c:380
#, c-format
msgid "Checksum: %s\n"
msgstr "總和檢查值: %s\n"
-#: svn/info-cmd.c:371
+#: svn/info-cmd.c:385
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "衝突前的基礎檔案: %s\n"
-#: svn/info-cmd.c:377
+#: svn/info-cmd.c:391
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "衝突前的工作檔案: %s\n"
-#: svn/info-cmd.c:382
+#: svn/info-cmd.c:396
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "衝突後的基礎檔案: %s\n"
-#: svn/info-cmd.c:387
+#: svn/info-cmd.c:401
#, c-format
msgid "Conflict Properties File: %s\n"
msgstr "衝突性質的檔案: %s\n"
-#: svn/info-cmd.c:395
+#: svn/info-cmd.c:409
#, c-format
msgid "Lock Token: %s\n"
msgstr "鎖定符記: %s\n"
-#: svn/info-cmd.c:399
+#: svn/info-cmd.c:413
#, c-format
msgid "Lock Owner: %s\n"
msgstr "鎖定擁有者: %s\n"
-#: svn/info-cmd.c:404
+#: svn/info-cmd.c:418
msgid "Lock Created"
msgstr "鎖定建立於"
-#: svn/info-cmd.c:408
+#: svn/info-cmd.c:422
msgid "Lock Expires"
msgstr "鎖定過期於"
-#: svn/info-cmd.c:417
+#: svn/info-cmd.c:431
#, c-format
msgid ""
"Lock Comment (%i lines):\n"
@@ -5639,7 +5741,7 @@
"鎖定註解 (%i 列):\n"
"%s\n"
-#: svn/info-cmd.c:418
+#: svn/info-cmd.c:432
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -5648,18 +5750,13 @@
"鎖定註解 (%i 列):\n"
"%s\n"
-#: svn/info-cmd.c:425
+#: svn/info-cmd.c:439
#, fuzzy, c-format
msgid "Changelist: %s\n"
msgstr "總和檢查值: %s\n"
-#: svn/info-cmd.c:477 svn/revert-cmd.c:59
-#, fuzzy, c-format
-msgid "no such changelist '%s'"
-msgstr "沒有這樣的項目: '%s'"
-
# as-is
-#: svn/info-cmd.c:539
+#: svn/info-cmd.c:547
#, c-format
msgid ""
"%s: (Not a versioned resource)\n"
@@ -5669,7 +5766,7 @@
"\n"
# as-is
-#: svn/info-cmd.c:548
+#: svn/info-cmd.c:556
#, c-format
msgid ""
"%s: (Not a valid URL)\n"
@@ -5704,11 +5801,11 @@
msgid " (from %s:%ld)"
msgstr " (from %s:%ld)"
-#: svn/log-cmd.c:450
+#: svn/log-cmd.c:475
msgid "When specifying working copy paths, only one target may be given"
msgstr "指定工作複本路徑時, 只可提供一個目標"
-#: svn/log-cmd.c:462
+#: svn/log-cmd.c:487
msgid "Only relative paths can be specified after a URL"
msgstr "在 URL 之後只可指定相對路徑"
@@ -5722,7 +5819,7 @@
#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:230 svnadmin/main.c:233
#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
-#: svnlook/main.c:93 svnsync/main.c:104 svnsync/main.c:106
+#: svnlook/main.c:102 svnsync/main.c:135 svnsync/main.c:137
msgid "show help on a subcommand"
msgstr "顯示子命令的輔助說明"
@@ -5735,12 +5832,12 @@
msgstr "極簡輸出"
#: svn/main.c:67
-msgid "descend recursively"
-msgstr "遞迴式深入"
+msgid "descend recursively, same as --depth=infinity"
+msgstr ""
#: svn/main.c:68
-msgid "operate on single directory only"
-msgstr "只在單一目錄中進行作業"
+msgid "obsolete; try --depth=files or --depth=immediates"
+msgstr ""
#: svn/main.c:70
msgid ""
@@ -5784,7 +5881,7 @@
msgstr "把數值當以 ARG 字元集編碼的文字"
#: svn/main.c:92 svnadmin/main.c:236 svndumpfilter/main.c:786
-#: svnlook/main.c:96 svnserve/main.c:150 svnsync/main.c:102
+#: svnlook/main.c:129 svnserve/main.c:151 svnsync/main.c:133
#: svnversion/main.c:125
#, fuzzy
msgid "show program version information"
@@ -5798,11 +5895,11 @@
msgid "display update information"
msgstr "顯示更新資料"
-#: svn/main.c:96 svnsync/main.c:96
+#: svn/main.c:96
msgid "specify a username ARG"
msgstr "指定使用者名稱 ARG"
-#: svn/main.c:98 svnsync/main.c:98
+#: svn/main.c:98
msgid "specify a password ARG"
msgstr "指定密碼 ARG"
@@ -5832,91 +5929,102 @@
msgid "pass contents of file ARG as additional args"
msgstr "把檔案內容 ARG 當作附加引數"
-#: svn/main.c:131
+#: svn/main.c:132
+msgid ""
+"pass depth ('empty', 'files', 'immediates', or\n"
+" 'infinity') as ARG"
+msgstr ""
+
+#: svn/main.c:135
msgid "output in XML"
msgstr "以 XML 輸出"
-#: svn/main.c:132
+#: svn/main.c:136
msgid "use strict semantics"
msgstr "應用嚴格語意"
-#: svn/main.c:134
+#: svn/main.c:138
msgid "do not cross copies while traversing history"
msgstr "收集歷史記錄時, 不溯及複製點之前"
-#: svn/main.c:136
+#: svn/main.c:140
msgid "disregard default and svn:ignore property ignores"
msgstr "無視預設與 svn:ignore 性質的忽略設定"
-#: svn/main.c:138 svnsync/main.c:94
+#: svn/main.c:142 svnsync/main.c:113
msgid "do not cache authentication tokens"
msgstr "不記憶認證符"
-#: svn/main.c:140 svnsync/main.c:92
+#: svn/main.c:144 svnsync/main.c:111
msgid "do no interactive prompting"
msgstr "無互動式提示"
-#: svn/main.c:142
+#: svn/main.c:146
msgid "try operation but make no changes"
msgstr "嘗試作業, 但不做更改"
-#: svn/main.c:144 svnlook/main.c:111
+#: svn/main.c:148 svnlook/main.c:108
msgid "do not print differences for deleted files"
msgstr "不顯示已刪除檔案的差異"
-#: svn/main.c:146
+#: svn/main.c:150
msgid "notice ancestry when calculating differences"
msgstr "計算檔案差異時注意演進歷程"
-#: svn/main.c:148
+#: svn/main.c:152
msgid "ignore ancestry when calculating merges"
msgstr "計算檔案合併時忽略演進歷程"
-#: svn/main.c:150
+#: svn/main.c:154
msgid "ignore externals definitions"
msgstr "忽略外部定義"
-#: svn/main.c:153
+#: svn/main.c:157
msgid "use ARG as diff command"
msgstr "把 ARG 當檔案差異命令"
-#: svn/main.c:155
+#: svn/main.c:159
msgid "use ARG as merge command"
msgstr "把 ARG 當合併命令"
-#: svn/main.c:157
+#: svn/main.c:161
msgid "use ARG as external editor"
msgstr "把 ARG 當外部編輯器"
-#: svn/main.c:160
-msgid "use ARG as the older target"
-msgstr "將 ARG 視為較舊的目標"
-
-#: svn/main.c:162
-msgid "use ARG as the newer target"
-msgstr "將 ARG 視為較新的目標"
-
#: svn/main.c:164
-msgid "operate on a revision property (use with -r)"
+#, fuzzy
+msgid "mark revisions as merged (use with -r)"
msgstr "操作修訂版性質 (與 -r 一同使用)"
#: svn/main.c:166
+msgid "use ARG as the older target"
+msgstr "將 ARG 視為較舊的目標"
+
+#: svn/main.c:168
+msgid "use ARG as the newer target"
+msgstr "將 ARG 視為較新的目標"
+
+#: svn/main.c:170
+msgid "operate on a revision property (use with -r)"
+msgstr "操作修訂版性質 (與 -r 一同使用)"
+
+#: svn/main.c:172
msgid "relocate via URL-rewriting"
msgstr "透過改寫 URL 以進行工作複本重新安置"
-#: svn/main.c:168 svnadmin/main.c:272 svnsync/main.c:100
+#: svn/main.c:174 svnadmin/main.c:272 svnsync/main.c:131
msgid "read user configuration files from directory ARG"
msgstr "自目錄 ARG 讀取使用者設定檔"
-#: svn/main.c:170
+#: svn/main.c:176
msgid "enable automatic properties"
msgstr "啟動自動性質"
-#: svn/main.c:172
+#: svn/main.c:178
msgid "disable automatic properties"
msgstr "關閉自動性質"
-#: svn/main.c:174
+#: svn/main.c:180
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -5927,36 +6035,42 @@
" 使用異於系統標準列尾符號的換列符號. ARG 可為\n"
" 'LF', 'CR', 'CRLF' 之一."
-#: svn/main.c:182
+#: svn/main.c:188
msgid "maximum number of log entries"
msgstr "顯示紀錄訊息的上限值"
-#: svn/main.c:184
+#: svn/main.c:190
msgid "don't unlock the targets"
msgstr "無法對目錄解除鎖定"
-#: svn/main.c:186
+#: svn/main.c:192
msgid "show a summary of the results"
msgstr "顯示結果的摘要"
-#: svn/main.c:188
+#: svn/main.c:194
msgid "remove changelist association"
msgstr ""
-#: svn/main.c:190
+#: svn/main.c:196
msgid "operate only on members of changelist ARG"
msgstr ""
-#: svn/main.c:192
+#: svn/main.c:198
msgid "don't delete changelist after commit"
msgstr ""
-#: svn/main.c:194
+#: svn/main.c:200
#, fuzzy
msgid "keep path in working copy"
msgstr "路徑不是工作複本檔案"
-#: svn/main.c:233
+#: svn/main.c:202
+msgid ""
+"set revision property ARG in new revision\n"
+" using the name=value format"
+msgstr ""
+
+#: svn/main.c:244
msgid ""
"Put files and directories under version control, scheduling\n"
"them for addition to repository. They will be added in next commit.\n"
@@ -5966,7 +6080,7 @@
"下一次送交時新增進去.\n"
"用法: add PATH...\n"
-#: svn/main.c:241
+#: svn/main.c:252
msgid ""
"Output the content of specified files or\n"
"URLs with revision and author information in-line.\n"
@@ -5980,7 +6094,7 @@
"\n"
" 如果指定 REV 的話, 它會用來決定目標的哪一個版本會最先被檢閱.\n"
-#: svn/main.c:251
+#: svn/main.c:262
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -5993,14 +6107,14 @@
"\n"
" 如果指定 REV 的話, 它會用來決定目標的哪一個版本會最先被檢閱.\n"
-#: svn/main.c:259
+#: svn/main.c:270
msgid ""
"Associate (or deassociate) local paths with changelist CLNAME.\n"
"usage: 1. changelist CLNAME TARGET...\n"
-" 2. changelist --clear TARGET...\n"
+" 2. changelist --remove TARGET...\n"
msgstr ""
-#: svn/main.c:265
+#: svn/main.c:277
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -6025,7 +6139,7 @@
" to the obstructing path.\n"
msgstr ""
-#: svn/main.c:290
+#: svn/main.c:302
msgid ""
"Recursively clean up the working copy, removing locks, resuming\n"
"unfinished operations, etc.\n"
@@ -6034,7 +6148,7 @@
"遞迴式地清除工作複本, 移除未完成動作的鎖定, 繼續未完全的動作等等.\n"
"用法: cleanup [PATH...]\n"
-#: svn/main.c:297
+#: svn/main.c:309
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6051,7 +6165,7 @@
" 選項來指定, 就會啟動你的文字編輯器. 如果任何目錄都是 (或是包括)\n"
" 鎖定項目, 那麼在送交成功之後, 就會解除鎖定.\n"
-#: svn/main.c:305
+#: svn/main.c:317
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -6069,7 +6183,7 @@
" 必須使用 --message 或 --file 如果任何目錄都是 (或是包括)\n"
" 鎖定項目, 那麼在送交成功之後, 就會解除鎖定.\n"
-#: svn/main.c:320
+#: svn/main.c:332
#, fuzzy
msgid ""
"Duplicate something in working copy or repository, remembering history.\n"
@@ -6094,7 +6208,7 @@
" URL -> WC: 將 URL 取出至 WC, 並排定新增它\n"
" URL -> URL: 完成伺服器端的複製. 這通常是用來進行分支與標記\n"
-#: svn/main.c:336
+#: svn/main.c:348
#, fuzzy
msgid ""
"Remove files and directories from version control.\n"
@@ -6121,7 +6235,7 @@
"\n"
" 2. 以 URL 指定的項目, 會透過立即送交自檔案庫中刪除.\n"
-#: svn/main.c:354
+#: svn/main.c:366
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -6170,7 +6284,7 @@
"\n"
" 僅僅使用 'svn diff' 時, 會顯示工作複本中的本地修改.\n"
-#: svn/main.c:384
+#: svn/main.c:396
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6207,7 +6321,7 @@
"\n"
" 如果指定 PEGREV 的話, 它會用來決定目標的哪一個版本會最先被檢閱.\n"
-#: svn/main.c:407
+#: svn/main.c:419
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -6215,7 +6329,7 @@
"描述本程式或其子命令的用法.\n"
"用法: help [SUBCOMMAND...]\n"
-#: svn/main.c:413
+#: svn/main.c:425
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -6234,7 +6348,7 @@
" 父目錄會依需要於檔案庫內建立.\n"
" 如果 PATH 是個目錄, 那麼該目錄的內容會被直接新增至該 URL 下.\n"
-#: svn/main.c:426
+#: svn/main.c:438
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -6250,7 +6364,7 @@
" TARGET 可為工作複本路徑或是 URL. 如果指定 REV 的話,\n"
" 它會用來決定從哪個修訂版開始檢閱目標.\n"
-#: svn/main.c:436
+#: svn/main.c:449
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -6288,7 +6402,7 @@
" 大小 (以位元組為單位)\n"
" 前次送交的日期與時間\n"
-#: svn/main.c:458
+#: svn/main.c:471
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -6302,15 +6416,15 @@
"\n"
" 用 --force, 從其它使用者或工作複本偷走鎖定.\n"
-#: svn/main.c:466
+#: svn/main.c:479
msgid "read lock comment from file ARG"
msgstr "從檔案 ARG 讀取鎖定註解"
-#: svn/main.c:467
+#: svn/main.c:480
msgid "specify lock comment ARG"
msgstr "指定送交鎖定註解 ARG"
-#: svn/main.c:470
+#: svn/main.c:483
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -6362,7 +6476,7 @@
" svn log http://www.example.com/repo/project/foo.c\n"
" svn log http://www.example.com/repo/project foo.c bar.c\n"
-#: svn/main.c:500
+#: svn/main.c:513
msgid ""
"Apply the differences between two sources to a working copy path.\n"
"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -6410,7 +6524,7 @@
" '.', 除非來源的主檔名符合 '.' 裡的某個檔案; 在這種情況下, 檔案\n"
" 差異將會直接套用至該檔案去.\n"
-#: svn/main.c:529
+#: svn/main.c:543
msgid ""
"Create a new directory under version control.\n"
"usage: 1. mkdir PATH...\n"
@@ -6439,7 +6553,7 @@
"\n"
" 在這兩個情況下, 所有的中介目錄都必須事先存在.\n"
-#: svn/main.c:546
+#: svn/main.c:560
#, fuzzy
msgid ""
"Move and/or rename something in working copy or repository.\n"
@@ -6466,7 +6580,7 @@
" WC -> WC: 移動並排入新增時程 (連同歷史紀錄)\n"
" URL -> URL: 完全是伺服器端的更名.\n"
-#: svn/main.c:563
+#: svn/main.c:577
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6484,7 +6598,7 @@
" 2. 移除無版本控制的遠端檔案庫修訂版性質.\n"
" TARGET 只是用來決定存在哪個檔案庫\n"
-#: svn/main.c:575
+#: svn/main.c:589
#, fuzzy
msgid ""
"Edit a property with an external editor.\n"
@@ -6503,7 +6617,7 @@
" 2. 編輯無版本控制的遠端檔案庫修訂版性質更動.\n"
" TARGET 只是用來決定要存取哪一個檔案庫.\n"
-#: svn/main.c:588
+#: svn/main.c:602
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6535,7 +6649,7 @@
" 所對應到的路徑. 使用 --strict 選項以關閉這項美化行為 (舉例來說,\n"
" 將二進制性質內容重導至一個檔案時就很有用).\n"
-#: svn/main.c:607
+#: svn/main.c:621
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6555,7 +6669,7 @@
" 2. 列出無版本控制的遠端檔案庫修訂版性質更動.\n"
" TARGET 只是用來決定要存取哪一個檔案庫.\n"
-#: svn/main.c:619
+#: svn/main.c:633
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -6633,11 +6747,11 @@
" svn:needs-lock 性質都不可對目錄設定. 非遞迴式的設定會失敗, 而\n"
" 遞迴式的設定只會對目錄的子檔案產生效果.\n"
-#: svn/main.c:661
+#: svn/main.c:675
msgid "read property value from file ARG"
msgstr "從檔案 ARG 讀取性質內容"
-#: svn/main.c:664
+#: svn/main.c:678
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
"usage: resolved PATH...\n"
@@ -6652,7 +6766,7 @@
" 注意: 本子命令不會依語法來解決衝突或是移除衝突標記; 它只是移除衝突的\n"
" 相關檔案, 然後讓 PATH 可以再度送交.\n"
-#: svn/main.c:673
+#: svn/main.c:688
msgid ""
"Restore pristine working copy file (undo most local edits).\n"
"usage: revert PATH...\n"
@@ -6666,7 +6780,7 @@
" 注意: 本子命令不會存取網路, 並且會解除衝突的狀況. 但是它不會復原\n"
" 被刪除的目錄\n"
-#: svn/main.c:682
+#: svn/main.c:697
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -6812,7 +6926,7 @@
" 965 687 joe wc/zig.c\n"
" Status against revision: 981\n"
-#: svn/main.c:758
+#: svn/main.c:773
#, fuzzy
msgid ""
"Update the working copy to a different URL.\n"
@@ -6850,7 +6964,7 @@
" URL 變動 (像是綱要或是主機名稱變動), 但是工作複本仍舊對映到同一\n"
" 檔案庫的同一目錄時用之.\n"
-#: svn/main.c:785
+#: svn/main.c:801
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -6862,7 +6976,7 @@
"\n"
" 使用 --force 以打破該鎖定.\n"
-#: svn/main.c:793
+#: svn/main.c:809
#, fuzzy
msgid ""
"Bring changes from the repository into the working copy.\n"
@@ -6916,37 +7030,43 @@
" 第一欄的字元表示實際檔案的更新, 而檔案性質顯示在第二欄.\n"
" 第三欄的 'B' 表示該檔案的鎖定已經打破或被偷走.\n"
-#: svn/main.c:869 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
+#: svn/main.c:885 svnadmin/main.c:78 svnlook/main.c:289 svnsync/main.c:180
msgid "Caught signal"
msgstr "捕捉到信號"
-#: svn/main.c:981
+# as-is
+#: svn/main.c:904
+#, fuzzy
+msgid "Revision property pair is empty"
+msgstr "Revision entry not a list"
+
+#: svn/main.c:1034
msgid "Non-numeric limit argument given"
msgstr "使用了非數字的限制引數"
-#: svn/main.c:987
+#: svn/main.c:1040
msgid "Argument to --limit must be positive"
msgstr "--limit 的引數必須為正數"
-#: svn/main.c:1007
+#: svn/main.c:1060
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
msgstr "遇到了多個修訂版引數; 不可指定兩個 -c, 或同時指定 -c 與 -r"
-#: svn/main.c:1015 svn/main.c:1206
+#: svn/main.c:1068 svn/main.c:1290
msgid "Can't specify -c with --old"
msgstr "--old 無法與 -c 一同使用"
-#: svn/main.c:1022
+#: svn/main.c:1075
msgid "Non-numeric change argument given to -c"
msgstr "對 -c 使用了非數字的更動引數"
-#: svn/main.c:1028
+#: svn/main.c:1081
msgid "There is no change 0"
msgstr "沒有更動 0"
-#: svn/main.c:1055
+#: svn/main.c:1108
msgid ""
"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
"N:M' instead of '-r N -r M'"
@@ -6954,32 +7074,42 @@
"遇到了多個修訂版引數; 無法指定 -r 與 -c, 或請試著指定 '-r N:M' 而非 '-r N -r "
"M'"
-#: svn/main.c:1068 svnadmin/main.c:1314
+#: svn/main.c:1121 svnadmin/main.c:1317
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "修訂版引數 '%s' 中有語法錯誤"
-#: svn/main.c:1222 svn/main.c:1232
+#: svn/main.c:1194
+#, c-format
+msgid "Error converting depth from locale to UTF8"
+msgstr ""
+
+#: svn/main.c:1214
+#, fuzzy, c-format
+msgid "'%s' is not a valid depth; try 0, 1, or 2"
+msgstr "'%s' 不是有效的管理目錄名稱"
+
+#: svn/main.c:1306 svn/main.c:1316
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props 與 --no-auto-props 是互相排斥的"
-#: svn/main.c:1248
+#: svn/main.c:1332
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "原生換列符號引數 '%s' 中有語法錯誤"
-#: svn/main.c:1324 svndumpfilter/main.c:1207 svnlook/main.c:2048
+#: svn/main.c:1410 svndumpfilter/main.c:1207 svnlook/main.c:2066
#, c-format
msgid "Subcommand argument required\n"
msgstr "必須提供子命令引數\n"
-#: svn/main.c:1343 svnadmin/main.c:1443 svndumpfilter/main.c:1226
-#: svnlook/main.c:2067
+#: svn/main.c:1429 svnadmin/main.c:1446 svndumpfilter/main.c:1226
+#: svnlook/main.c:2085
#, c-format
msgid "Unknown command: '%s'\n"
msgstr "未知的命令: '%s'\n"
-#: svn/main.c:1376
+#: svn/main.c:1462
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -6988,34 +7118,34 @@
"子命令 '%s' 不接受選項 '%s'\n"
"請輸入 'svn help %s' 以取得用法.\n"
-#: svn/main.c:1413
+#: svn/main.c:1499
msgid "Log message file is a versioned file; use '--force-log' to override"
msgstr "紀錄訊息檔是一個版本控制中的檔案; 請使用 '--force-log' 以略過此限制"
-#: svn/main.c:1420
+#: svn/main.c:1506
msgid "Lock comment file is a versioned file; use '--force-log' to override"
msgstr "鎖定註解檔是一個版本控制中的檔案; 請使用 '--force-log' 以略過此限制"
-#: svn/main.c:1440
+#: svn/main.c:1526
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
msgstr ""
"紀錄訊息是一個路徑名稱 (確定要用 -F?); 請使用 '--force-log' 以略過此限制"
-#: svn/main.c:1447
+#: svn/main.c:1533
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
msgstr ""
"鎖定註解是一個路徑名稱 (確定要用 -F?); 請使用 '--force-log' 以略過此限制"
-#: svn/main.c:1570
+#: svn/main.c:1668
#, fuzzy
msgid "Try 'svn help' for more info"
msgstr "請使用 '%s help' 以了解用法.\n"
-#: svn/main.c:1580
+#: svn/main.c:1678
msgid ""
"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
"details)\n"
@@ -7035,7 +7165,7 @@
msgid "A working copy merge source needs an explicit revision"
msgstr "工作複本的合併來源需特別指定修訂版"
-#: svn/mkdir-cmd.c:84
+#: svn/mkdir-cmd.c:87
msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
msgstr "請改試 'svn add' 或 'svn add --non-recursive'?"
@@ -7204,13 +7334,13 @@
#: svn/notify.c:394
#, fuzzy, c-format
-msgid "Path '%s' is now part of changelist '%s'.\n"
+msgid "Path '%s' is now a member of changelist '%s'.\n"
msgstr "路徑 '%s' 不是檔案"
-#: svn/notify.c:401
-#, c-format
-msgid "Path '%s' is no longer associated with a changelist.\n"
-msgstr ""
+#: svn/notify.c:402
+#, fuzzy, c-format
+msgid "Path '%s' is no longer a member of a changelist.\n"
+msgstr "路徑 '%s' 不是檔案"
#: svn/propdel-cmd.c:77
#, c-format
@@ -7222,12 +7352,12 @@
msgid "Cannot specify revision for deleting versioned property '%s'"
msgstr "刪除納入版本控制的性質 '%s' 時不可指定修訂版"
-#: svn/propdel-cmd.c:116
+#: svn/propdel-cmd.c:124
#, c-format
msgid "property '%s' deleted (recursively) from '%s'.\n"
msgstr "性質 '%s' 自 '%s' 刪除 (遞迴式).\n"
-#: svn/propdel-cmd.c:117
+#: svn/propdel-cmd.c:125
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "性質 '%s' 自 '%s' 刪除.\n"
@@ -7237,7 +7367,7 @@
msgid "'%s' is not a valid Subversion property name"
msgstr "'%s' 不是有效的管理目錄名稱"
-#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:241 svn/propset-cmd.c:85
+#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:243 svn/propset-cmd.c:85
msgid "Bad encoding option: prop value not stored as UTF8"
msgstr "有問題的編碼選項: 性質內容未以 UTF8 儲存"
@@ -7256,46 +7386,46 @@
msgid "Cannot specify revision for editing versioned property '%s'"
msgstr "編輯納入版本控制的性質 '%s' 時不可指定修訂版"
-#: svn/propedit-cmd.c:154 svn/propset-cmd.c:158
+#: svn/propedit-cmd.c:154 svn/propset-cmd.c:161
msgid "Explicit target argument required"
msgstr "必須明確地提供目標"
-#: svn/propedit-cmd.c:211 svn/switch-cmd.c:140
+#: svn/propedit-cmd.c:213 svn/switch-cmd.c:148
#, c-format
msgid "'%s' does not appear to be a working copy path"
msgstr "'%s' 不像是工作複本路徑"
-#: svn/propedit-cmd.c:264
+#: svn/propedit-cmd.c:268
#, c-format
msgid "Set new value for property '%s' on '%s'\n"
msgstr "性質 '%s' 於 '%s' 設為新值\n"
-#: svn/propedit-cmd.c:274
+#: svn/propedit-cmd.c:278
#, c-format
msgid "No changes to property '%s' on '%s'\n"
msgstr "性質 '%s' 於 '%s' 沒有更動\n"
-#: svn/proplist-cmd.c:71
-#, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "修訂版 %ld 上的未納入版本控制的性質:\n"
-
-#: svn/proplist-cmd.c:119
+#: svn/proplist-cmd.c:95
#, c-format
msgid "Properties on '%s':\n"
msgstr "'%s' 的性質:\n"
-#: svn/props.c:51
+#: svn/proplist-cmd.c:156
+#, c-format
+msgid "Unversioned properties on revision %ld:\n"
+msgstr "修訂版 %ld 上的未納入版本控制的性質:\n"
+
+#: svn/props.c:53
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
msgstr "在操作修訂版性質時, 必須以數字, 日期或是 'HEAD' 來指定修訂版"
-#: svn/props.c:58
+#: svn/props.c:60
msgid "Wrong number of targets specified"
msgstr "指定了錯誤數目的目標"
-#: svn/props.c:67
+#: svn/props.c:69
msgid "Either a URL or versioned item is required"
msgstr "必須提供 URL 或納入版本控制的項目"
@@ -7309,26 +7439,26 @@
msgid "Cannot specify revision for setting versioned property '%s'"
msgstr "無法指定修訂版以設定版本控制下的性質 '%s'"
-#: svn/propset-cmd.c:151
+#: svn/propset-cmd.c:154
#, c-format
msgid "Explicit target required ('%s' interpreted as prop value)"
msgstr "必須明確地提供目的 ('%s' 解釋為性質內容)"
-#: svn/propset-cmd.c:184
+#: svn/propset-cmd.c:191
#, c-format
msgid "property '%s' set (recursively) on '%s'\n"
msgstr "性質 '%s' 設定 (遞迴式) 於 '%s'\n"
-#: svn/propset-cmd.c:185
+#: svn/propset-cmd.c:192
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "性質 '%s' 設定於 '%s'\n"
-#: svn/revert-cmd.c:86
+#: svn/revert-cmd.c:93
msgid "Try 'svn revert --recursive' instead?"
msgstr "請改試 'svn revert --recursive'?"
-#: svn/status-cmd.c:317
+#: svn/status-cmd.c:298
#, c-format
msgid ""
"\n"
@@ -7345,7 +7475,7 @@
msgid "'%s' to '%s' is not a valid relocation"
msgstr "'%s' 至 '%s' 不是有效的重新安置"
-#: svn/util.c:60
+#: svn/util.c:61
#, c-format
msgid ""
"\n"
@@ -7354,7 +7484,7 @@
"\n"
"送交修訂版 %ld.\n"
-#: svn/util.c:68
+#: svn/util.c:69
#, c-format
msgid ""
"\n"
@@ -7363,7 +7493,14 @@
"\n"
"警告: %s\n"
-#: svn/util.c:136
+#: svn/util.c:145
+msgid ""
+"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-"
+"time configuration option is empty or consists solely of whitespace. "
+"Expected a shell command."
+msgstr ""
+
+#: svn/util.c:152
msgid ""
"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
"no 'editor-cmd' run-time configuration option was found"
@@ -7371,53 +7508,53 @@
"沒有一個 SVN_EDITOR, VISUAL 或 EDITOR 環境變數被設定, 執行時期的設定中也沒有 "
"'editor-cmd' 選項"
-#: svn/util.c:162
+#: svn/util.c:178
#, c-format
msgid "Can't get working directory"
msgstr "無法取得工作目錄"
-#: svn/util.c:173 svn/util.c:196
+#: svn/util.c:189 svn/util.c:212
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "無法更改工作複本至 '%s'"
-#: svn/util.c:221
+#: svn/util.c:237
#, c-format
msgid "Can't write to '%s'"
msgstr "無法寫入至 '%s'"
-#: svn/util.c:266
+#: svn/util.c:282
#, c-format
msgid "system('%s') returned %d"
msgstr "system('%s') 傳回 %d"
-#: svn/util.c:307
+#: svn/util.c:323
msgid "Error normalizing edited contents to internal format"
msgstr ""
-#: svn/util.c:338
+#: svn/util.c:354
#, c-format
msgid "Can't restore working directory"
msgstr "無法還原工作目錄"
-#: svn/util.c:380
+#: svn/util.c:396
msgid "Log message contains a zero byte"
msgstr "紀錄訊息中有一個零位元組"
-#: svn/util.c:440
+#: svn/util.c:456
msgid "Your commit message was left in a temporary file:"
msgstr "你的送交訊息遺留在暫存檔中:"
# as-is
-#: svn/util.c:492
+#: svn/util.c:508
msgid "--This line, and those below, will be ignored--"
msgstr "--This line, and those below, will be ignored--"
-#: svn/util.c:517
+#: svn/util.c:533
msgid "Error normalizing log message to internal format"
msgstr ""
-#: svn/util.c:532
+#: svn/util.c:548
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
@@ -7425,11 +7562,11 @@
"OS400 無法使用外部編輯器來取得紀錄訊息; 請考慮使用 --message (-m)或 --file (-"
"F) 選項"
-#: svn/util.c:618
+#: svn/util.c:634
msgid "Cannot invoke editor to get log message when non-interactive"
msgstr "非互動操作, 無法叫用文字編輯器來取得送交訊息"
-#: svn/util.c:631
+#: svn/util.c:647
msgid ""
"Could not use external editor to fetch log message; consider setting the "
"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
@@ -7438,7 +7575,7 @@
"無法使用外部編輯器取得紀錄訊息; 請試著設定 $SVN_EDITOR 環境變數, 或是使用--"
"message (-m) 或 --file (-F) 選項"
-#: svn/util.c:667
+#: svn/util.c:683
msgid ""
"\n"
"Log message unchanged or not specified\n"
@@ -7448,7 +7585,7 @@
"紀錄訊息未更動, 或是未指定\n"
"a)中斷, c)繼續, e)編輯\n"
-#: svn/util.c:720
+#: svn/util.c:736
msgid "Use --force to override this restriction"
msgstr "請用 --force 來撤銷限制"
@@ -7689,12 +7826,13 @@
"顯示所有未處理異動的名稱.\n"
#: svnadmin/main.c:381
+#, fuzzy
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
-"Run the Berkeley DB recovery procedure on a repository. Do\n"
-"this if you've been getting errors indicating that recovery\n"
-"ought to be run. Recovery requires exclusive access and will\n"
+"Run the recovery procedure on a repository. Do this if you've\n"
+"been getting errors indicating that recovery ought to be run.\n"
+"Berkeley DB recovery requires exclusive access and will\n"
"exit if the repository is in use by another process.\n"
msgstr ""
"用法: svnadmin recover REPOS_PATH\n"
@@ -7818,7 +7956,7 @@
"\n"
"可用的子命令:\n"
-#: svnadmin/main.c:698 svnlook/main.c:1674 svnserve/main.c:204
+#: svnadmin/main.c:698 svnlook/main.c:1687 svnserve/main.c:207
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -7835,7 +7973,7 @@
"已取得檔案庫鎖定.\n"
"請稍待; 修復檔案庫也許得花費一些時間...\n"
-#: svnadmin/main.c:810
+#: svnadmin/main.c:811
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -7843,12 +7981,12 @@
"無法取得獨佔存取權; 也許其它像是 httpd, svnserve 或 svn 的行程讓它\n"
"保持開啟的狀態?"
-#: svnadmin/main.c:815
+#: svnadmin/main.c:816
#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr "等待檔案庫鎖定中; 也許其它的行讓它保持開啟的狀態?\n"
-#: svnadmin/main.c:822
+#: svnadmin/main.c:824
#, c-format
msgid ""
"\n"
@@ -7857,58 +7995,58 @@
"\n"
"修復完成.\n"
-#: svnadmin/main.c:829
+#: svnadmin/main.c:831
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "最新的檔案庫修訂版為 %ld.\n"
-#: svnadmin/main.c:939
+#: svnadmin/main.c:941
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "異動 '%s' 被移除.\n"
-#: svnadmin/main.c:1007 svnadmin/main.c:1034
+#: svnadmin/main.c:1009 svnadmin/main.c:1036
#, c-format
msgid "Missing revision"
msgstr "遺漏修訂版"
-#: svnadmin/main.c:1010 svnadmin/main.c:1037
+#: svnadmin/main.c:1012 svnadmin/main.c:1039
#, c-format
msgid "Only one revision allowed"
msgstr "僅允許一個修訂版"
-#: svnadmin/main.c:1016
+#: svnadmin/main.c:1018
#, fuzzy, c-format
msgid "Exactly one property name and one file argument required"
msgstr "必須提供恰好一個的檔案引數"
-#: svnadmin/main.c:1043
+#: svnadmin/main.c:1045
#, c-format
msgid "Exactly one file argument required"
msgstr "必須提供恰好一個的檔案引數"
-#: svnadmin/main.c:1117 svnlook/main.c:1739
+#: svnadmin/main.c:1119 svnlook/main.c:1752
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID 符記: %s\n"
# this points to filename according to sunny256
-#: svnadmin/main.c:1118 svnlook/main.c:1740
+#: svnadmin/main.c:1120 svnlook/main.c:1753
#, c-format
msgid "Owner: %s\n"
msgstr "擁有者: %s\n"
-#: svnadmin/main.c:1119 svnlook/main.c:1741
+#: svnadmin/main.c:1121 svnlook/main.c:1754
#, c-format
msgid "Created: %s\n"
msgstr "建立於: %s\n"
-#: svnadmin/main.c:1120 svnlook/main.c:1742
+#: svnadmin/main.c:1122 svnlook/main.c:1755
#, c-format
msgid "Expires: %s\n"
msgstr "過期: %s\n"
-#: svnadmin/main.c:1122
+#: svnadmin/main.c:1124
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -7919,7 +8057,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1123
+#: svnadmin/main.c:1125
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -7930,36 +8068,36 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1180
+#: svnadmin/main.c:1182
#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "路徑 '%s' 未被鎖定.\n"
-#: svnadmin/main.c:1192
+#: svnadmin/main.c:1194
#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "移除 '%s' 的鎖定.\n"
-#: svnadmin/main.c:1300
+#: svnadmin/main.c:1303
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
msgstr "遇到了多個修訂版引數; 請試著將 '-r M -r N' 改為 '-r M:N'"
-#: svnadmin/main.c:1425
+#: svnadmin/main.c:1428
#, c-format
msgid "subcommand argument required\n"
msgstr "必須提供子命令引數\n"
-#: svnadmin/main.c:1510
-#, c-format
+#: svnadmin/main.c:1502
+#, fuzzy, c-format
msgid ""
-"subcommand '%s' doesn't accept option '%s'\n"
+"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnadmin help %s' for usage.\n"
msgstr ""
"子命令 '%s' 不接受選項 '%s'\n"
"請使用 'svnadmin help %s' 以了解用法.\n"
-#: svnadmin/main.c:1543
+#: svnadmin/main.c:1535
#, fuzzy
msgid "Try 'svnadmin help' for more info"
msgstr "請使用 'svnversion --help' 以了解用法.\n"
@@ -8112,43 +8250,47 @@
msgid "Try 'svndumpfilter help' for more info"
msgstr ""
-#: svnlook/main.c:99
-msgid "specify revision number ARG"
-msgstr "指定修訂版編號 ARG"
-
-#: svnlook/main.c:102
-msgid "specify transaction name ARG"
-msgstr "指定異動名稱 ARG"
-
-#: svnlook/main.c:105
-msgid "be verbose"
-msgstr "詳細"
-
-#: svnlook/main.c:108
-msgid "show node revision ids for each path"
-msgstr "為每個路徑顯示節點修訂版編號"
-
-#: svnlook/main.c:114
-msgid "do not print differences for added files"
-msgstr "不顯示新增檔案的差異"
-
-#: svnlook/main.c:117
-msgid "print differences against the copy source"
-msgstr "顯示與複製來源的差異"
-
-#: svnlook/main.c:120
-msgid "operate on a revision property (use with -r or -t)"
-msgstr "操作修訂版性質 (與 -r 或 -t 一同使用)"
-
-#: svnlook/main.c:123
-msgid "show full paths instead of indenting them"
-msgstr "顯示完整路徑而非對其縮排"
-
-#: svnlook/main.c:126
+#: svnlook/main.c:93
msgid "show details for copies"
msgstr "顯示複本的細節"
-#: svnlook/main.c:138
+#: svnlook/main.c:96
+msgid "print differences against the copy source"
+msgstr "顯示與複製來源的差異"
+
+#: svnlook/main.c:99
+msgid "show full paths instead of indenting them"
+msgstr "顯示完整路徑而非對其縮排"
+
+#: svnlook/main.c:105
+msgid "do not print differences for added files"
+msgstr "不顯示新增檔案的差異"
+
+#: svnlook/main.c:111
+msgid "operate on single directory only"
+msgstr "只在單一目錄中進行作業"
+
+#: svnlook/main.c:114
+msgid "specify revision number ARG"
+msgstr "指定修訂版編號 ARG"
+
+#: svnlook/main.c:117
+msgid "operate on a revision property (use with -r or -t)"
+msgstr "操作修訂版性質 (與 -r 或 -t 一同使用)"
+
+#: svnlook/main.c:120
+msgid "show node revision ids for each path"
+msgstr "為每個路徑顯示節點修訂版編號"
+
+#: svnlook/main.c:123
+msgid "specify transaction name ARG"
+msgstr "指定異動名稱 ARG"
+
+#: svnlook/main.c:126
+msgid "be verbose"
+msgstr "詳細"
+
+#: svnlook/main.c:141
msgid ""
"usage: svnlook author REPOS_PATH\n"
"\n"
@@ -8158,7 +8300,7 @@
"\n"
"顯示作者.\n"
-#: svnlook/main.c:143
+#: svnlook/main.c:146
msgid ""
"usage: svnlook cat REPOS_PATH FILE_PATH\n"
"\n"
@@ -8168,7 +8310,7 @@
"\n"
"顯示檔案的內容. FILE_PATH 前的 '/' 可省略.\n"
-#: svnlook/main.c:148
+#: svnlook/main.c:151
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -8178,7 +8320,7 @@
"\n"
"顯示已更動的路徑.\n"
-#: svnlook/main.c:153
+#: svnlook/main.c:156
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -8188,7 +8330,7 @@
"\n"
"顯示日期戳記.\n"
-#: svnlook/main.c:158
+#: svnlook/main.c:161
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -8198,7 +8340,7 @@
"\n"
"以 GNU 樣式, 顯示檔案庫中更動的檔案與性質差異.\n"
-#: svnlook/main.c:164
+#: svnlook/main.c:167
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -8209,7 +8351,7 @@
"\n"
"顯示本身曾更動 (或性質編輯) 過的目錄, 或是其下的檔案更曾動過目錄.\n"
-#: svnlook/main.c:170
+#: svnlook/main.c:173
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -8219,7 +8361,7 @@
"\n"
"顯示本程式或其子命令的用法.\n"
-#: svnlook/main.c:175
+#: svnlook/main.c:178
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8230,7 +8372,7 @@
"\n"
"顯示檔案庫中, 某個路徑的歷史紀錄資訊 (如果沒有指定路徑, 則為根目錄).\n"
-#: svnlook/main.c:181
+#: svnlook/main.c:184
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -8240,7 +8382,7 @@
"\n"
"顯示作者, 日期戳記, 紀錄訊息大小, 以及紀錄訊息.\n"
-#: svnlook/main.c:186
+#: svnlook/main.c:189
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -8250,7 +8392,7 @@
"\n"
"如果檔案庫中的某個路徑有鎖定存在的話, 描述之.\n"
-#: svnlook/main.c:191
+#: svnlook/main.c:194
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -8260,7 +8402,7 @@
"\n"
"顯示紀錄訊息.\n"
-#: svnlook/main.c:196
+#: svnlook/main.c:199
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -8272,7 +8414,7 @@
"顯示檔案庫中, 某個路徑的性質的原始內容. 加上 --revprop 的話,\n"
"顯示修訂版性質的原始內容\n"
-#: svnlook/main.c:202
+#: svnlook/main.c:205
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8286,7 +8428,7 @@
"則為修訂版性質\n"
"加上 -v 的話, 一併顯示性質內容.\n"
-#: svnlook/main.c:209
+#: svnlook/main.c:212
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8298,7 +8440,7 @@
"顯示檔案樹, 自 PATH_IN_REPOS 開始 (如果有提供的話, 不然就從檔案樹的\n"
"根目錄開始), 可選擇性地顯示節點修訂版 id.\n"
-#: svnlook/main.c:215
+#: svnlook/main.c:218
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -8308,7 +8450,7 @@
"\n"
"顯示檔案庫的 UUID.\n"
-#: svnlook/main.c:220
+#: svnlook/main.c:223
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -8318,52 +8460,52 @@
"\n"
"顯示最年輕的修訂版號.\n"
-#: svnlook/main.c:815
+#: svnlook/main.c:819
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "已複製: %s (來自修訂版 %ld, %s)\n"
-#: svnlook/main.c:884
+#: svnlook/main.c:888
msgid "Added"
msgstr "已加入"
-#: svnlook/main.c:885
+#: svnlook/main.c:889
msgid "Deleted"
msgstr "已刪除"
-#: svnlook/main.c:886
+#: svnlook/main.c:890
msgid "Modified"
msgstr "已修改"
-#: svnlook/main.c:887
+#: svnlook/main.c:891
msgid "Index"
msgstr "索引"
-#: svnlook/main.c:899
+#: svnlook/main.c:903
#, c-format
msgid "(Binary files differ)\n"
msgstr "(二進制檔案差異)\n"
-#: svnlook/main.c:1028
+#: svnlook/main.c:1036
msgid "unknown"
msgstr "未知"
-#: svnlook/main.c:1171 svnlook/main.c:1264 svnlook/main.c:1293
+#: svnlook/main.c:1183 svnlook/main.c:1276 svnlook/main.c:1305
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "異動 '%s' 並非根基於某個修訂版; 多神祕啊"
-#: svnlook/main.c:1201
+#: svnlook/main.c:1213
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "'%s' 是 URL, 也許該是路徑."
-#: svnlook/main.c:1228
+#: svnlook/main.c:1240
#, c-format
msgid "Path '%s' is not a file"
msgstr "路徑 '%s' 不是檔案"
-#: svnlook/main.c:1367
+#: svnlook/main.c:1379
#, c-format
msgid ""
"REVISION PATH <ID>\n"
@@ -8372,7 +8514,7 @@
"修 訂 版 路徑 <ID>\n"
"-------- ---------\n"
-#: svnlook/main.c:1372
+#: svnlook/main.c:1384
#, c-format
msgid ""
"REVISION PATH\n"
@@ -8381,27 +8523,27 @@
"修 訂 版 路徑\n"
"-------- ----\n"
-#: svnlook/main.c:1419
+#: svnlook/main.c:1431
#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "性質 '%s' 於修訂版 %ld 中找不到"
-#: svnlook/main.c:1426
+#: svnlook/main.c:1438
#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "性質 '%s' 不存在於路徑 '%s', 修訂版 %ld 中"
-#: svnlook/main.c:1431
+#: svnlook/main.c:1443
#, fuzzy, c-format
msgid "Property '%s' not found on path '%s' in transaction %s"
msgstr "性質 '%s' 不存在於路徑 '%s', 修訂版 %ld 中"
-#: svnlook/main.c:1603 svnlook/main.c:1818
+#: svnlook/main.c:1616 svnlook/main.c:1831
#, c-format
msgid "Missing repository path argument"
msgstr "未提供檔案庫路徑引數"
-#: svnlook/main.c:1664
+#: svnlook/main.c:1677
#, fuzzy
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
@@ -8420,11 +8562,11 @@
"\n"
"可用的子命令:\n"
-#: svnlook/main.c:1720
+#: svnlook/main.c:1733
msgid "Missing path argument"
msgstr "未提供路徑引數"
-#: svnlook/main.c:1745
+#: svnlook/main.c:1758
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -8433,7 +8575,7 @@
"註解 (%i 列):\n"
"%s\n"
-#: svnlook/main.c:1746
+#: svnlook/main.c:1759
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -8442,40 +8584,40 @@
"註解 (%i 列):\n"
"%s\n"
-#: svnlook/main.c:1792
+#: svnlook/main.c:1805
#, c-format
msgid "Missing propname argument"
msgstr "未提供性質名稱引數"
-#: svnlook/main.c:1793
+#: svnlook/main.c:1806
#, c-format
msgid "Missing propname and repository path arguments"
msgstr "未提供性質名稱與檔案庫路徑引數"
-#: svnlook/main.c:1799
+#: svnlook/main.c:1812
msgid "Missing propname or repository path argument"
msgstr "未提供性質名稱或檔案庫路徑引數"
-#: svnlook/main.c:1957
+#: svnlook/main.c:1971
msgid "Invalid revision number supplied"
msgstr "提供了無效的版本號碼"
-#: svnlook/main.c:2018
+#: svnlook/main.c:2036
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr "'--transaction' (-t) 與 '--revision' (-r) 引數無法共存"
-#: svnlook/main.c:2100
+#: svnlook/main.c:2118
#, c-format
msgid "Repository argument required\n"
msgstr "需有檔案庫引數\n"
-#: svnlook/main.c:2109
+#: svnlook/main.c:2127
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "'%s' 是 URL, 但是應該是路徑\n"
-#: svnlook/main.c:2160
+#: svnlook/main.c:2178
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -8484,72 +8626,92 @@
"子命令 '%s' 並不接受選項 '%s'\n"
"請使用 'svnlook help %s' 以了解用法.\n"
-#: svnlook/main.c:2203
+#: svnlook/main.c:2221
msgid "Try 'svnlook help' for more info"
msgstr ""
-#: svnserve/main.c:141
+#: svnserve/cyrus_auth.c:243
+#, fuzzy, c-format
+msgid "Can't get hostname"
+msgstr "無法取得本機名稱"
+
+#: svnserve/cyrus_auth.c:311
+msgid "Could not obtain the list of SASL mechanisms"
+msgstr ""
+
+#: svnserve/cyrus_auth.c:351
+#, fuzzy
+msgid "Couldn't obtain the authenticated username"
+msgstr "無法解除路徑 '%s' 的鎖定, 沒有通過認證的使用者名稱"
+
+#: svnserve/main.c:142
msgid "daemon mode"
msgstr "伺服器模式"
-#: svnserve/main.c:143
+#: svnserve/main.c:144
msgid "listen port (for daemon mode)"
msgstr "聆聽通訊埠 (伺服器模式使用)"
-#: svnserve/main.c:145
+#: svnserve/main.c:146
msgid "listen hostname or IP address (for daemon mode)"
msgstr "聆聽主機名稱或 IP 位址 (伺服器模式使用)"
-#: svnserve/main.c:147
+#: svnserve/main.c:148
msgid "run in foreground (useful for debugging)"
msgstr "前景執行 (適合除錯)"
-#: svnserve/main.c:148 svnversion/main.c:123
+#: svnserve/main.c:149 svnversion/main.c:123
msgid "display this help"
msgstr "顯示本求助畫面"
-#: svnserve/main.c:151
+#: svnserve/main.c:152
msgid "inetd mode"
msgstr "inetd 模式"
-#: svnserve/main.c:152
+#: svnserve/main.c:153
msgid "root of directory to serve"
msgstr "服務的根目錄"
-#: svnserve/main.c:154
+#: svnserve/main.c:155
msgid "force read only, overriding repository config file"
msgstr "強制為唯讀, 略過檔案庫設定檔"
-#: svnserve/main.c:155
+#: svnserve/main.c:156
msgid "tunnel mode"
msgstr "tunnel 模式"
-#: svnserve/main.c:157
+#: svnserve/main.c:158
msgid "tunnel username (default is current uid's name)"
msgstr "tunnel 使用者名稱 (預設為目前 uid 的名稱)"
-#: svnserve/main.c:159
+#: svnserve/main.c:160
msgid "use threads instead of fork"
msgstr "使用執行緒而非 fork"
-#: svnserve/main.c:161
+#: svnserve/main.c:162
msgid "listen once (useful for debugging)"
msgstr "只聆聽一次 (適合除錯)"
-#: svnserve/main.c:163
-msgid "write server process ID to file arg"
-msgstr "將伺服器行程代號寫入檔案引數"
+#: svnserve/main.c:164
+#, fuzzy
+msgid "read configuration from file ARG"
+msgstr "自目錄 ARG 讀取使用者設定檔"
#: svnserve/main.c:166
+#, fuzzy
+msgid "write server process ID to file ARG"
+msgstr "將伺服器行程代號寫入檔案引數"
+
+#: svnserve/main.c:169
msgid "run as a windows service (SCM only)"
msgstr "以 Windows 服務的形式執行 (僅服務控制管理員)"
-#: svnserve/main.c:178
+#: svnserve/main.c:181
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "請使用 '%s --help' 以了解用法.\n"
-#: svnserve/main.c:187
+#: svnserve/main.c:190
msgid ""
"usage: svnserve [options]\n"
"\n"
@@ -8559,77 +8721,68 @@
"\n"
"有效選項:\n"
-#: svnserve/main.c:450
+#: svnserve/main.c:444
#, fuzzy, c-format
msgid "svnserve: Root path '%s' does not exist or is not a directory.\n"
msgstr "路徑 '%s' 不存在於檔案庫中"
-#: svnserve/main.c:492
+#: svnserve/main.c:493
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "你必須指定 -d, -i, -t 或 -X 其中之一.\n"
-#: svnserve/main.c:502
+#: svnserve/main.c:511
#, c-format
msgid "Option --tunnel-user is only valid in tunnel mode.\n"
msgstr "選項 --tunnel-user 只有在 tunnel 模式才可以使用\n"
-#: svnserve/main.c:571
+#: svnserve/main.c:576
#, c-format
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
"Service Control Manager.\n"
msgstr "svnserve: --service 只有在行程以服務控制管理員起動時才有效.\n"
-#: svnserve/main.c:607
+#: svnserve/main.c:612
#, c-format
msgid "Can't get address info"
msgstr "無法取得位址資訊"
-#: svnserve/main.c:623
+#: svnserve/main.c:626
#, c-format
msgid "Can't create server socket"
msgstr "無法建立伺服器 socket"
-#: svnserve/main.c:636
+#: svnserve/main.c:637
#, c-format
msgid "Can't bind server socket"
msgstr "無法繫結伺服器 socket"
-#: svnserve/main.c:704
+#: svnserve/main.c:703
#, c-format
msgid "Can't accept client connection"
msgstr "無法接受用戶連線"
# as-is
-#: svnserve/main.c:758
+#: svnserve/main.c:755
#, c-format
msgid "Can't create threadattr"
msgstr "Can't create threadattr"
# as-is
-#: svnserve/main.c:766
+#: svnserve/main.c:763
#, c-format
msgid "Can't set detached state"
msgstr "Can't set detached state"
-#: svnserve/main.c:779
+#: svnserve/main.c:776
#, c-format
msgid "Can't create thread"
msgstr "無法建立執行緒"
-#: svnserve/sasl_auth.c:243
-#, fuzzy, c-format
-msgid "Can't get hostname"
-msgstr "無法取得本機名稱"
-
-#: svnserve/sasl_auth.c:311
-msgid "Could not obtain the list of SASL mechanisms"
-msgstr ""
-
-#: svnserve/sasl_auth.c:351
+#: svnserve/serve.c:1437
#, fuzzy
-msgid "Couldn't obtain the authenticated username"
-msgstr "無法解除路徑 '%s' 的鎖定, 沒有通過認證的使用者名稱"
+msgid "Path is not a string"
+msgstr "路徑不是工作複本檔案"
#: svnserve/winservice.c:341
#, c-format
@@ -8653,7 +8806,7 @@
"service"
msgstr "服務無法啟動; 啟動時發生內部錯誤"
-#: svnsync/main.c:56
+#: svnsync/main.c:64
msgid ""
"usage: svnsync initialize DEST_URL SOURCE_URL\n"
"\n"
@@ -8670,28 +8823,36 @@
"mirror of the source repository.\n"
msgstr ""
-#: svnsync/main.c:71
+#: svnsync/main.c:79
#, fuzzy
msgid ""
"usage: svnsync synchronize DEST_URL\n"
"\n"
-"Transfer all pending revisions from source to destination.\n"
+"Transfer all pending revisions to the destination from the source\n"
+"with which it was initialized.\n"
msgstr ""
"用法: svnsync synchronize DEST_URL\n"
"將所有擱置的修訂版自來源傳送至目標.\n"
-#: svnsync/main.c:76
-#, fuzzy
+#: svnsync/main.c:85
msgid ""
-"usage: svnsync copy-revprops DEST_URL REV\n"
+"usage: svnsync copy-revprops DEST_URL [REV[:REV2]]\n"
"\n"
-"Copy all revision properties for revision REV from source to\n"
+"Copy the revision properties in a given range of revisions to the\n"
+"destination from the source with which it was initialized.\n"
+"\n"
+"If REV and REV2 are provided, copy properties for the revisions\n"
+"specified by that range, inclusively. If only REV is provided,\n"
+"copy properties for that revision alone. If REV is not provided,\n"
+"copy properties for all revisions previously transferred to the\n"
"destination.\n"
+"\n"
+"REV and REV2 must be revisions which were previously transferred\n"
+"to the destination. You may use \"HEAD\" for either revision to\n"
+"mean \"the last revision transferred\".\n"
msgstr ""
-"用法: svnsync copy-revprops DEST_URL --revision REV\n"
-"將所有修訂版 REV 的修訂版性質自來源複製至目標\n"
-#: svnsync/main.c:82
+#: svnsync/main.c:101
#, fuzzy
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
@@ -8701,63 +8862,91 @@
"用法: svnadmin help [子命令...]\n"
"顯示本程式或其子命令的用法.\n"
-#: svnsync/main.c:184
+#: svnsync/main.c:115
+msgid ""
+"specify a username ARG (deprecated;\n"
+" see --source-username and --sync-username)"
+msgstr ""
+
+#: svnsync/main.c:119
+msgid ""
+"specify a password ARG (deprecated;\n"
+" see --source-password and --sync-password)"
+msgstr ""
+
+#: svnsync/main.c:123
+msgid "connect to source repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:125
+msgid "connect to source repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:127
+msgid "connect to sync repository with username ARG"
+msgstr ""
+
+#: svnsync/main.c:129
+msgid "connect to sync repository with password ARG"
+msgstr ""
+
+#: svnsync/main.c:218
#, c-format
msgid "Can't get local hostname"
msgstr "無法取得本機名稱"
-#: svnsync/main.c:206
+#: svnsync/main.c:241
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
msgstr "無法取得目標檔案庫的鎖定, 目前被 '%s' 持有\n"
-#: svnsync/main.c:301
+#: svnsync/main.c:336
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
msgstr "Session 的根目錄為 '%s', 但是檔案庫的根目錄為 '%s'"
-#: svnsync/main.c:368
+#: svnsync/main.c:403
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
msgstr ""
-#: svnsync/main.c:373
+#: svnsync/main.c:408
#, fuzzy, c-format
msgid "Copied properties for revision %ld.\n"
msgstr "修訂版 %ld 上的未納入版本控制的性質:\n"
-#: svnsync/main.c:414
+#: svnsync/main.c:450
msgid "Cannot initialize a repository with content in it"
msgstr "無法初始一個有內容的檔案庫"
-#: svnsync/main.c:425
+#: svnsync/main.c:461
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
msgstr "目標檔案庫已經自 '%s' 同步了"
-#: svnsync/main.c:489 svnsync/main.c:492 svnsync/main.c:1159
-#: svnsync/main.c:1250
+#: svnsync/main.c:525 svnsync/main.c:528 svnsync/main.c:1203
+#: svnsync/main.c:1382
#, fuzzy, c-format
msgid "Path '%s' is not a URL"
msgstr "路徑 '%s' 不是檔案"
-#: svnsync/main.c:874
+#: svnsync/main.c:914
#, fuzzy, c-format
msgid "Committed revision %ld.\n"
msgstr ""
"\n"
"送交修訂版 %ld.\n"
-#: svnsync/main.c:913
+#: svnsync/main.c:954
msgid "Destination repository has not been initialized"
msgstr "目標檔案庫尚未被初始"
-#: svnsync/main.c:928
+#: svnsync/main.c:969
#, fuzzy, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
msgstr "目標檔案庫的 UUID (%s) 不符合預期的 UUID (%s)"
-#: svnsync/main.c:990
+#: svnsync/main.c:1032
#, c-format
msgid ""
"Revision being currently copied (%ld), last merged revision (%ld), and "
@@ -8765,28 +8954,35 @@
"destination without using svnsync?"
msgstr ""
-#: svnsync/main.c:1028
+#: svnsync/main.c:1070
#, c-format
msgid ""
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
"committed to the destination without using svnsync?"
msgstr ""
-#: svnsync/main.c:1105
+#: svnsync/main.c:1148
#, c-format
msgid "Commit created rev %ld but should have created %ld"
msgstr "送交產生修訂版 %ld, 但應該是 %ld"
-#: svnsync/main.c:1214
-msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+#: svnsync/main.c:1275 svnsync/main.c:1280
+#, fuzzy, c-format
+msgid ""
+"Cannot copy revprops for a revision (%ld) that has not been synchronized yet"
msgstr "無法複製尚未同步的修訂版性質"
-#: svnsync/main.c:1253
-#, fuzzy
-msgid "Invalid revision number"
+#: svnsync/main.c:1332
+#, fuzzy, c-format
+msgid "'%s' is not a valid revision range"
+msgstr "項目 '%s' 有無效的修訂版"
+
+#: svnsync/main.c:1346 svnsync/main.c:1366
+#, fuzzy, c-format
+msgid "Invalid revision number (%ld)"
msgstr "提供了無效的版本號碼"
-#: svnsync/main.c:1289
+#: svnsync/main.c:1423
#, fuzzy
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
@@ -8800,16 +8996,22 @@
"\n"
"可用的子命令:\n"
-#: svnsync/main.c:1479
-#, c-format
+#: svnsync/main.c:1581
msgid ""
-"subcommand '%s' doesn't accept option '%s'\n"
+"Cannot use --username or --password with any of --source-username, --source-"
+"password, --sync-username, or --sync-password.\n"
+msgstr ""
+
+#: svnsync/main.c:1661
+#, fuzzy, c-format
+msgid ""
+"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnsync help %s' for usage.\n"
msgstr ""
"子命令 '%s' 不接受選項 '%s'\n"
"請輸入 'svnsync help %s' 以取得用法.\n"
-#: svnsync/main.c:1541
+#: svnsync/main.c:1733
#, fuzzy
msgid "Try 'svnsync help' for more info"
msgstr "未提供足夠的引數; 請試用 'svn help' 以取得更多的資訊"
@@ -8883,16 +9085,67 @@
msgid "last changed rather than current revisions"
msgstr "最近一次更動的, 而不是目前的修訂版"
-#: svnversion/main.c:229
+#: svnversion/main.c:221
#, c-format
msgid "exported%s"
msgstr "已匯出%s"
-#: svnversion/main.c:238
+#: svnversion/main.c:230
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "'%s' 未納入版本控制, 並未匯出\n"
+#~ msgid "'%s' is not under version control or doesn't exist"
+#~ msgstr "'%s' 尚未納入版本控制或不存在"
+
+#~ msgid "No support for repos <--> working copy moves"
+#~ msgstr "不支援檔案庫 <--> 工作複本移動"
+
+#~ msgid "Cannot read entry for '%s'"
+#~ msgstr "無法讀取項目 '%s'"
+
+#~ msgid "Lock comment has illegal characters"
+#~ msgstr "鎖定註解含有不合法的字元"
+
+#~ msgid "Can't find entry for '%s'"
+#~ msgstr "無法找到 '%s' 的項目"
+
+#, fuzzy
+#~ msgid "Can't get user name"
+#~ msgstr "無法取得檔案名稱"
+
+# as-is
+#~ msgid " arg"
+#~ msgstr " arg"
+
+#~ msgid "'%s' has unsupported special file type '%s'"
+#~ msgstr "'%s' 為不支援的特殊檔案格式 '%s'"
+
+#~ msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
+#~ msgstr "'%s' 的總和檢查值不一致: 預期 '%s', 實際: '%s'"
+
+#~ msgid "No entry for '%s'"
+#~ msgstr "沒有 '%s' 的項目"
+
+#~ msgid "Cannot revert: '%s' is not under version control"
+#~ msgstr "無法復原: '%s' 未納入版本控制"
+
+#~ msgid "Cannot copy or move '%s': it's not under version control"
+#~ msgstr "無法複製或移動 '%s': 它尚未納入版本控制"
+
+#~ msgid "descend recursively"
+#~ msgstr "遞迴式深入"
+
+#, fuzzy
+#~ msgid ""
+#~ "usage: svnsync copy-revprops DEST_URL REV\n"
+#~ "\n"
+#~ "Copy all revision properties for revision REV from source to\n"
+#~ "destination.\n"
+#~ msgstr ""
+#~ "用法: svnsync copy-revprops DEST_URL --revision REV\n"
+#~ "將所有修訂版 REV 的修訂版性質自來源複製至目標\n"
+
#~ msgid "Not enough arguments provided; try 'svn help' for more info"
#~ msgstr "未提供足夠的引數; 請試用 'svn help' 以取得更多的資訊"
