svn commit: r1936267 - in subversion/branches/1.15.x: . subversion/po
[email protected] Fri, 17 Jul 2026 14:18:21 -0000
| Newsgroups | gmane.comp.version-control.subversion.svn |
|---|---|
| Message-ID | <178429790161.3871241.4959714692937986805@svn03-he-fi> |
Author: svn-role
Date: Fri Jul 17 14:18:21 2026
New Revision: 1936267
Log:
Merge r1936218 from trunk:
* r1936218
Update and verify Swedish translation
Justification:
Swedish translation for 1.15
Votes:
+1: dsahlberg
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/STATUS
subversion/branches/1.15.x/subversion/po/sv.po
Modified: subversion/branches/1.15.x/STATUS
==============================================================================
--- subversion/branches/1.15.x/STATUS Fri Jul 17 13:58:04 2026 (r1936266)
+++ subversion/branches/1.15.x/STATUS Fri Jul 17 14:18:21 2026 (r1936267)
@@ -59,10 +59,3 @@ Veto-blocked changes:
Approved changes:
=================
-
-* r1936218
- Update and verify Swedish translation
- Justification:
- Swedish translation for 1.15
- Votes:
- +1: dsahlberg
Modified: subversion/branches/1.15.x/subversion/po/sv.po
==============================================================================
--- subversion/branches/1.15.x/subversion/po/sv.po Fri Jul 17 13:58:04 2026 (r1936266)
+++ subversion/branches/1.15.x/subversion/po/sv.po Fri Jul 17 14:18:21 2026 (r1936267)
@@ -112,7 +112,7 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.9\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-06-27 08:03+0200\n"
+"POT-Creation-Date: 2026-07-17 00:39+0200\n"
"PO-Revision-Date: 2018-10-06 17:37+0200\n"
"Last-Translator: Subversion Developers <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
@@ -239,7 +239,7 @@ msgstr "Sökvägen står inte omedelbart
msgid "Bogus UUID"
msgstr "Felaktig UUID"
-#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1056
+#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1072
msgid "Invalid configuration value"
msgstr "Ogiltigt konfigurationsvärde"
@@ -555,1025 +555,1037 @@ msgstr "Arbetskopia med blandad revision
msgid "Duplicate targets in svn:externals property"
msgstr "Dubblettmål i svn:externals-egenskap"
-#: ../include/svn_error_codes.h:583
+#: ../include/svn_error_codes.h:582
+msgid "Incompatible working copy settings"
+msgstr "Icke kompatibla inställningar i arbetskopia"
+
+#: ../include/svn_error_codes.h:587
+msgid "This client uses a deprecated API that does not support working copies without local pristines"
+msgstr "Den här klienten använder ett föråldrat API som inte stödjer arbetskopior utan lokala orörda filer"
+
+#: ../include/svn_error_codes.h:593
+msgid "No local pristine contents for a file"
+msgstr "Ingen lokal orörd fil för en fil"
+
+#: ../include/svn_error_codes.h:599
msgid "General filesystem error"
msgstr "Allmänt filsystemsfel"
-#: ../include/svn_error_codes.h:587
+#: ../include/svn_error_codes.h:603
msgid "Error closing filesystem"
msgstr "Fel vid stängning av filsystem"
-#: ../include/svn_error_codes.h:591
+#: ../include/svn_error_codes.h:607
msgid "Filesystem is already open"
msgstr "Filsystemet är redan öppet"
-#: ../include/svn_error_codes.h:595
+#: ../include/svn_error_codes.h:611
msgid "Filesystem is not open"
msgstr "Filsystemet är ej öppet"
-#: ../include/svn_error_codes.h:599
+#: ../include/svn_error_codes.h:615
msgid "Filesystem is corrupt"
msgstr "Förstört filsystem"
-#: ../include/svn_error_codes.h:603
+#: ../include/svn_error_codes.h:619
msgid "Invalid filesystem path syntax"
msgstr "Ogiltig syntax för sökväg i filsystem"
-#: ../include/svn_error_codes.h:607
+#: ../include/svn_error_codes.h:623
msgid "Invalid filesystem revision number"
msgstr "Ogiltigt revisionsnummer för filsystem"
-#: ../include/svn_error_codes.h:611
+#: ../include/svn_error_codes.h:627
msgid "Invalid filesystem transaction name"
msgstr "Ogiltigt transaktionsnamn för filsystem"
-#: ../include/svn_error_codes.h:615
+#: ../include/svn_error_codes.h:631
msgid "Filesystem directory has no such entry"
msgstr "Katalog i filsystem saknar post med det namnet"
-#: ../include/svn_error_codes.h:619
+#: ../include/svn_error_codes.h:635
msgid "Filesystem has no such representation"
msgstr "Representation saknas i filsystem"
-#: ../include/svn_error_codes.h:623
+#: ../include/svn_error_codes.h:639
msgid "Filesystem has no such string"
msgstr "Sträng saknas i filsystem"
-#: ../include/svn_error_codes.h:627
+#: ../include/svn_error_codes.h:643
msgid "Filesystem has no such copy"
msgstr "Kopia saknas i filsystem"
-#: ../include/svn_error_codes.h:631
+#: ../include/svn_error_codes.h:647
msgid "The specified transaction is not mutable"
msgstr "Angiven transaktion går ej att ändra"
-#: ../include/svn_error_codes.h:635
+#: ../include/svn_error_codes.h:651
msgid "Filesystem has no item"
msgstr "Filsystem saknar objekt"
-#: ../include/svn_error_codes.h:639
+#: ../include/svn_error_codes.h:655
msgid "Filesystem has no such node-rev-id"
msgstr "Node-rev-id saknas i filsystem"
-#: ../include/svn_error_codes.h:643
+#: ../include/svn_error_codes.h:659
msgid "String does not represent a node or node-rev-id"
msgstr "Strängen representerar ingen nod eller node-rev-id"
-#: ../include/svn_error_codes.h:647
+#: ../include/svn_error_codes.h:663
msgid "Name does not refer to a filesystem directory"
msgstr "Namnet syftar ej på en katalog i filsystemet"
-#: ../include/svn_error_codes.h:651
+#: ../include/svn_error_codes.h:667
msgid "Name does not refer to a filesystem file"
msgstr "Namnet syftar ej på en fil i filsystemet"
-#: ../include/svn_error_codes.h:655
+#: ../include/svn_error_codes.h:671
msgid "Name is not a single path component"
msgstr "Namnet är ej en ensam sökvägskomponent"
-#: ../include/svn_error_codes.h:659
+#: ../include/svn_error_codes.h:675
msgid "Attempt to change immutable filesystem node"
msgstr "Försök att ändra filsystemsnod som ej får ändras"
-#: ../include/svn_error_codes.h:663
+#: ../include/svn_error_codes.h:679
msgid "Item already exists in filesystem"
msgstr "Objektet finns redan i filsystemet"
-#: ../include/svn_error_codes.h:667
+#: ../include/svn_error_codes.h:683
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:671
+#: ../include/svn_error_codes.h:687
msgid "Object is not a transaction root"
msgstr "Objektet är ingen transaktionsrot"
-#: ../include/svn_error_codes.h:675
+#: ../include/svn_error_codes.h:691
msgid "Object is not a revision root"
msgstr "Objektet är ingen revisionsrot"
-#: ../include/svn_error_codes.h:679
+#: ../include/svn_error_codes.h:695
msgid "Merge conflict during commit"
msgstr "Sammanslagningskonflikt vid arkivering"
-#: ../include/svn_error_codes.h:683
+#: ../include/svn_error_codes.h:699
msgid "A representation vanished or changed between reads"
msgstr "Representation försvann eller ändrades mellan läsningar"
-#: ../include/svn_error_codes.h:687
+#: ../include/svn_error_codes.h:703
msgid "Tried to change an immutable representation"
msgstr "Försök att ändra representation som ej får ändras"
-#: ../include/svn_error_codes.h:691
+#: ../include/svn_error_codes.h:707
msgid "Malformed skeleton data"
msgstr "Felaktig skelettdata"
-#: ../include/svn_error_codes.h:695
+#: ../include/svn_error_codes.h:711
msgid "Transaction is out of date"
msgstr "Transaktionen är inaktuell"
-#: ../include/svn_error_codes.h:699
+#: ../include/svn_error_codes.h:715
msgid "Berkeley DB error"
msgstr "Fel i Berkeley DB"
-#: ../include/svn_error_codes.h:703
+#: ../include/svn_error_codes.h:719
msgid "Berkeley DB deadlock error"
msgstr "Berkeley DB i baklås"
-#: ../include/svn_error_codes.h:707
+#: ../include/svn_error_codes.h:723
msgid "Transaction is dead"
msgstr "Transaktionen är död"
-#: ../include/svn_error_codes.h:711
+#: ../include/svn_error_codes.h:727
msgid "Transaction is not dead"
msgstr "Transaktionen är inte död"
-#: ../include/svn_error_codes.h:716
+#: ../include/svn_error_codes.h:732
msgid "Unknown FS type"
msgstr "Okänd filsystemstyp"
-#: ../include/svn_error_codes.h:721
+#: ../include/svn_error_codes.h:737
msgid "No user associated with filesystem"
msgstr "Ingen användare kopplad till filsystemet"
-#: ../include/svn_error_codes.h:726
+#: ../include/svn_error_codes.h:742
msgid "Path is already locked"
msgstr "Sökvägen är redan låst"
-#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:993
+#: ../include/svn_error_codes.h:747 ../include/svn_error_codes.h:1009
msgid "Path is not locked"
msgstr "Sökvägen är inte låst"
-#: ../include/svn_error_codes.h:736
+#: ../include/svn_error_codes.h:752
msgid "Lock token is incorrect"
msgstr "Låsidentifieraren är felaktig"
-#: ../include/svn_error_codes.h:741
+#: ../include/svn_error_codes.h:757
msgid "No lock token provided"
msgstr "Ingen låsidentifierare tillhandahölls"
-#: ../include/svn_error_codes.h:746
+#: ../include/svn_error_codes.h:762
msgid "Username does not match lock owner"
msgstr "Användarnamnet matchar inte låsägaren"
-#: ../include/svn_error_codes.h:751
+#: ../include/svn_error_codes.h:767
msgid "Filesystem has no such lock"
msgstr "LÃ¥set saknas i filsystemet"
-#: ../include/svn_error_codes.h:756
+#: ../include/svn_error_codes.h:772
msgid "Lock has expired"
msgstr "Låset har gått ut"
-#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:980
+#: ../include/svn_error_codes.h:777 ../include/svn_error_codes.h:996
msgid "Item is out of date"
msgstr "Objektet är inaktuellt"
-#: ../include/svn_error_codes.h:773
+#: ../include/svn_error_codes.h:789
msgid "Unsupported FS format"
msgstr "Formatet på filsystemet stöds ej"
-#: ../include/svn_error_codes.h:778
+#: ../include/svn_error_codes.h:794
msgid "Representation is being written"
msgstr "Representationen håller på att skrivas"
-#: ../include/svn_error_codes.h:783
+#: ../include/svn_error_codes.h:799
msgid "The generated transaction name is too long"
msgstr "Det genererade transaktionsnamnet är för långt"
-#: ../include/svn_error_codes.h:788
+#: ../include/svn_error_codes.h:804
msgid "Filesystem has no such node origin record"
msgstr "Filsystemet saknar en sådan nodursprungspost"
-#: ../include/svn_error_codes.h:793
+#: ../include/svn_error_codes.h:809
msgid "Filesystem upgrade is not supported"
msgstr "Filsystemsuppgradering stöds ej"
-#: ../include/svn_error_codes.h:798
+#: ../include/svn_error_codes.h:814
msgid "Filesystem has no such checksum-representation index record"
msgstr "Indexpost för kontrollsummerepresentation saknas i filsystem"
-#: ../include/svn_error_codes.h:803
+#: ../include/svn_error_codes.h:819
msgid "Property value in filesystem differs from the provided base value"
msgstr "Egenskapsvärde i filsystem skiljer sig från givet basvärde"
-#: ../include/svn_error_codes.h:809
+#: ../include/svn_error_codes.h:825
msgid "The filesystem editor completion process was not followed"
msgstr "Filsystemseditorns avslutningsprocess följdes inte"
-#: ../include/svn_error_codes.h:814
+#: ../include/svn_error_codes.h:830
msgid "A packed revprop could not be read"
msgstr "En packad revisionsegenskap kunde inte läsas"
-#: ../include/svn_error_codes.h:819
+#: ../include/svn_error_codes.h:835
msgid "Could not initialize the revprop caching infrastructure."
msgstr "Kunde inte initiera infrastrukturen för cachning av revisionsegenskaper"
-#: ../include/svn_error_codes.h:824
+#: ../include/svn_error_codes.h:840
msgid "Malformed transaction ID string."
msgstr "Felaktig ID-sträng för transaktion."
-#: ../include/svn_error_codes.h:829
+#: ../include/svn_error_codes.h:845
msgid "Corrupt index file."
msgstr "Trasig indexfil."
-#: ../include/svn_error_codes.h:834
+#: ../include/svn_error_codes.h:850
msgid "Revision not covered by index."
msgstr "Revisionen täcks ej av indexet."
-#: ../include/svn_error_codes.h:839
+#: ../include/svn_error_codes.h:855
msgid "Item index too large for this revision."
msgstr "Objektindex för stort för denna revision."
-#: ../include/svn_error_codes.h:844
+#: ../include/svn_error_codes.h:860
msgid "Container index out of range."
msgstr "Behållarindex utanför giltigt område."
-#: ../include/svn_error_codes.h:849
+#: ../include/svn_error_codes.h:865
msgid "Index files are inconsistent."
msgstr "Indexfilerna stämmer inte överens."
-#: ../include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:870
msgid "Lock operation failed"
msgstr "LÃ¥sning misslyckades"
-#: ../include/svn_error_codes.h:859
+#: ../include/svn_error_codes.h:875
msgid "Unsupported FS type"
msgstr "Filsystemstypen stöds ej"
-#: ../include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:880
msgid "Container capacity exceeded."
msgstr "Slut på plats i behållare."
-#: ../include/svn_error_codes.h:869
+#: ../include/svn_error_codes.h:885
msgid "Malformed node revision ID string."
msgstr "Felaktig ID-sträng för nodrevision."
-#: ../include/svn_error_codes.h:874
+#: ../include/svn_error_codes.h:890
msgid "Invalid generation number data."
msgstr "Ogiltigt generationsnummersdata."
-#: ../include/svn_error_codes.h:879
+#: ../include/svn_error_codes.h:895
msgid "Revprop manifest corrupt."
msgstr "Förstörd innehållsförteckning för revisionsegenskap."
-#: ../include/svn_error_codes.h:884
+#: ../include/svn_error_codes.h:900
msgid "Property list is corrupt."
msgstr "Förstörd egenskapslista."
-#: ../include/svn_error_codes.h:889
+#: ../include/svn_error_codes.h:905
msgid "Content checksums supposedly match but content does not."
msgstr "Innehållens kontrollsummor stämmer men innehållen skiljer sig åt."
-#: ../include/svn_error_codes.h:894
+#: ../include/svn_error_codes.h:910
msgid "Unrecognized filesystem I/O control code"
msgstr "Okänd I/O-kontrollkod för filsystemet"
-#: ../include/svn_error_codes.h:899
+#: ../include/svn_error_codes.h:915
msgid "Rep-sharing is not allowed."
msgstr "Innehållsdelning är inte tillåtet."
-#: ../include/svn_error_codes.h:904
+#: ../include/svn_error_codes.h:920
msgid "Rep-sharing is not supported."
msgstr "Innehållsdelning stöds ej."
-#: ../include/svn_error_codes.h:910
+#: ../include/svn_error_codes.h:926
msgid "The repository is locked, perhaps for db recovery"
msgstr "Arkivet är låst, kanske för reparation"
-#: ../include/svn_error_codes.h:914
+#: ../include/svn_error_codes.h:930
msgid "A repository hook failed"
msgstr "Ett krokskript i arkivet misslyckades"
-#: ../include/svn_error_codes.h:918
+#: ../include/svn_error_codes.h:934
msgid "Incorrect arguments supplied"
msgstr "Felaktiga argument"
-#: ../include/svn_error_codes.h:922
+#: ../include/svn_error_codes.h:938
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:926
+#: ../include/svn_error_codes.h:942
msgid "Bogus revision report"
msgstr "Felaktig revisionsrapport"
-#: ../include/svn_error_codes.h:935
+#: ../include/svn_error_codes.h:951
msgid "Unsupported repository version"
msgstr "Arkivversionen stöds ej"
-#: ../include/svn_error_codes.h:939
+#: ../include/svn_error_codes.h:955
msgid "Disabled repository feature"
msgstr "Funktionen är avslagen i arkivet"
-#: ../include/svn_error_codes.h:943
+#: ../include/svn_error_codes.h:959
msgid "Error running post-commit hook"
msgstr "Fel vid körning av krokskript efter arkivering (\"post-commit\")"
-#: ../include/svn_error_codes.h:948
+#: ../include/svn_error_codes.h:964
msgid "Error running post-lock hook"
msgstr "Fel vid körning av krokskript efter låsning (\"post-lock\")"
-#: ../include/svn_error_codes.h:953
+#: ../include/svn_error_codes.h:969
msgid "Error running post-unlock hook"
msgstr "Fel vid körning av krokskript efter upplåsning (\"post-unlock\")"
-#: ../include/svn_error_codes.h:958
+#: ../include/svn_error_codes.h:974
msgid "Repository upgrade is not supported"
msgstr "Uppgradering av arkiv stöds ej"
-#: ../include/svn_error_codes.h:964
+#: ../include/svn_error_codes.h:980
msgid "Bad URL passed to RA layer"
msgstr "Felaktig URL skickad till RA-skiktet"
-#: ../include/svn_error_codes.h:968
+#: ../include/svn_error_codes.h:984
msgid "Authorization failed"
msgstr "Behörighetskontroll misslyckades"
-#: ../include/svn_error_codes.h:972
+#: ../include/svn_error_codes.h:988
msgid "Unknown authorization method"
msgstr "Okänd metod för behörighetskontroll"
-#: ../include/svn_error_codes.h:976
+#: ../include/svn_error_codes.h:992
msgid "Repository access method not implemented"
msgstr "Metod för arkivåtkomst ej implementerad"
-#: ../include/svn_error_codes.h:984
+#: ../include/svn_error_codes.h:1000
msgid "Repository has no UUID"
msgstr "Arkivet saknar UUID"
-#: ../include/svn_error_codes.h:988
+#: ../include/svn_error_codes.h:1004
msgid "Unsupported RA plugin ABI version"
msgstr "ABI-versionen för insticksmodulen för arkivåtkomst stöds ej"
-#: ../include/svn_error_codes.h:998
+#: ../include/svn_error_codes.h:1014
msgid "Server can only replay from the root of a repository"
msgstr "Servern kan bara spela upp från arkivroten"
-#: ../include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1019
msgid "Repository UUID does not match expected UUID"
msgstr "Arkivets UUID matchar inte den förväntade UUID:n"
-#: ../include/svn_error_codes.h:1008
+#: ../include/svn_error_codes.h:1024
msgid "Repository root URL does not match expected root URL"
msgstr "Arkivets rot-URL matchar inte den förväntade rot-URL:en"
-#: ../include/svn_error_codes.h:1013
+#: ../include/svn_error_codes.h:1029
msgid "Session URL does not match expected session URL"
msgstr "Sessionens URL matchar inte den förväntade sessions-URL:en"
-#: ../include/svn_error_codes.h:1018 ../libsvn_ra_svn/client.c:506
+#: ../include/svn_error_codes.h:1034 ../libsvn_ra_svn/client.c:507
#, c-format
msgid "Can't create tunnel"
msgstr "Kan inte skapa tunnel"
-#: ../include/svn_error_codes.h:1023
+#: ../include/svn_error_codes.h:1039
msgid "Can't create session"
msgstr "Kan inte skapa session"
-#: ../include/svn_error_codes.h:1029
+#: ../include/svn_error_codes.h:1045
msgid "RA layer failed to init socket layer"
msgstr "RA-skiktet kunde inte initiera uttagsskiktet (socket layer)"
-#: ../include/svn_error_codes.h:1033
+#: ../include/svn_error_codes.h:1049
msgid "RA layer failed to create HTTP request"
msgstr "RA-skiktet kunde inte skapa en HTTP-förfrågan"
-#: ../include/svn_error_codes.h:1037
+#: ../include/svn_error_codes.h:1053
msgid "RA layer request failed"
msgstr "Förfrågan misslyckad i RA-skiktet"
-#: ../include/svn_error_codes.h:1041
+#: ../include/svn_error_codes.h:1057
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA-skiktet mottog ej begärd OPTIONS-information"
-#: ../include/svn_error_codes.h:1045
+#: ../include/svn_error_codes.h:1061
msgid "RA layer failed to fetch properties"
msgstr "RA-skiktet misslyckades med att erhålla egenskaper"
-#: ../include/svn_error_codes.h:1049
+#: ../include/svn_error_codes.h:1065
msgid "RA layer file already exists"
msgstr "RA-skiktsfil finns redan"
-#: ../include/svn_error_codes.h:1063
+#: ../include/svn_error_codes.h:1079
msgid "HTTP Path Not Found"
msgstr "HTTP-sökväg finns inte"
-#: ../include/svn_error_codes.h:1067
+#: ../include/svn_error_codes.h:1083
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "Misslyckades med att utföra WebDAV PROPPATCH"
#. If condition COND is not met, return a "malformed network data" error.
#.
-#: ../include/svn_error_codes.h:1072 ../include/svn_error_codes.h:1580
+#: ../include/svn_error_codes.h:1088 ../include/svn_error_codes.h:1596
#: ../libsvn_ra_svn/marshal.c:1459 ../libsvn_ra_svn/marshal.c:1716
#: ../libsvn_ra_svn/marshal.c:1745 ../libsvn_ra_svn/marshal.c:2997
msgid "Malformed network data"
msgstr "Felaktig nätverksdata"
-#: ../include/svn_error_codes.h:1077
+#: ../include/svn_error_codes.h:1093
msgid "Unable to extract data from response header"
msgstr "Kunde inte läsa data från responshuvud"
-#: ../include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1098
msgid "Repository has been moved"
msgstr "Arkivet har flyttats"
-#: ../include/svn_error_codes.h:1087 ../libsvn_ra_serf/util.c:940
+#: ../include/svn_error_codes.h:1103 ../libsvn_ra_serf/util.c:945
msgid "Connection timed out"
msgstr "Nätverksanslutningen gick ut"
-#: ../include/svn_error_codes.h:1092
+#: ../include/svn_error_codes.h:1108
msgid "URL access forbidden for unknown reason"
msgstr "Ã
tkomst till URL tilläts ej av okänd anledning"
-#: ../include/svn_error_codes.h:1097
+#: ../include/svn_error_codes.h:1113
msgid "The server state conflicts with the requested preconditions"
msgstr "Servertillståndet strider mot begärda förhandsvillkor."
-#: ../include/svn_error_codes.h:1102
+#: ../include/svn_error_codes.h:1118
msgid "The URL doesn't allow the requested method"
msgstr "URL:en tillåter ej begärd metod"
-#: ../include/svn_error_codes.h:1108 ../include/svn_error_codes.h:1584
+#: ../include/svn_error_codes.h:1124 ../include/svn_error_codes.h:1600
msgid "Couldn't find a repository"
msgstr "Kunde inte hitta något arkiv"
-#: ../include/svn_error_codes.h:1112
+#: ../include/svn_error_codes.h:1128
msgid "Couldn't open a repository"
msgstr "Kunde inte öppna arkivet"
-#: ../include/svn_error_codes.h:1118
+#: ../include/svn_error_codes.h:1134
msgid "Svndiff data has invalid header"
msgstr "Svndiff-data har ogiltigt huvud"
-#: ../include/svn_error_codes.h:1122
+#: ../include/svn_error_codes.h:1138
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff-data innehåller trasigt fönster"
-#: ../include/svn_error_codes.h:1126
+#: ../include/svn_error_codes.h:1142
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:1130
+#: ../include/svn_error_codes.h:1146
msgid "Svndiff data contains invalid instruction"
msgstr "Ogiltig instruktion i svndiff-data"
-#: ../include/svn_error_codes.h:1134
+#: ../include/svn_error_codes.h:1150
msgid "Svndiff data ends unexpectedly"
msgstr "Svndiff-data tog oväntat slut"
-#: ../include/svn_error_codes.h:1138
+#: ../include/svn_error_codes.h:1154
msgid "Svndiff compressed data is invalid"
msgstr "Komprimerad svndiff-data är ogiltig"
-#: ../include/svn_error_codes.h:1144
+#: ../include/svn_error_codes.h:1160
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache saknar sökväg till SVN-filsystem"
-#: ../include/svn_error_codes.h:1148
+#: ../include/svn_error_codes.h:1164
msgid "Apache got a malformed URI"
msgstr "Apache fick en felaktig URI"
-#: ../include/svn_error_codes.h:1152
+#: ../include/svn_error_codes.h:1168
msgid "Activity not found"
msgstr "Aktiviteten hittades ej"
-#: ../include/svn_error_codes.h:1156
+#: ../include/svn_error_codes.h:1172
msgid "Baseline incorrect"
msgstr "Felaktig utgångspunkt"
-#: ../include/svn_error_codes.h:1160
+#: ../include/svn_error_codes.h:1176
msgid "Input/output error"
msgstr "In/ut-fel"
-#: ../include/svn_error_codes.h:1166
+#: ../include/svn_error_codes.h:1182
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:1170
+#: ../include/svn_error_codes.h:1186
msgid "Repository access is needed for this operation"
msgstr "Operationen kräver åtkomst till ett arkiv"
-#: ../include/svn_error_codes.h:1174
+#: ../include/svn_error_codes.h:1190
msgid "Bogus revision information given"
msgstr "Felaktig revisionsinformation angiven"
-#: ../include/svn_error_codes.h:1178
+#: ../include/svn_error_codes.h:1194
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:1182
+#: ../include/svn_error_codes.h:1198
msgid "Operation does not apply to binary file"
msgstr "Operationen kan ej utföras på binär fil"
-#: ../include/svn_error_codes.h:1188
+#: ../include/svn_error_codes.h:1204
msgid "Format of an svn:externals property was invalid"
msgstr "Felaktigt format på svn:externals-egenskap"
-#: ../include/svn_error_codes.h:1192
+#: ../include/svn_error_codes.h:1208
msgid "Attempting restricted operation for modified resource"
msgstr "Operationen tillåter ej att källan är modifierad"
-#: ../include/svn_error_codes.h:1196
+#: ../include/svn_error_codes.h:1212
msgid "Operation does not apply to directory"
msgstr "Operationen kan ej utföras på en katalog"
-#: ../include/svn_error_codes.h:1200 ../svnadmin/svnadmin.c:1842
+#: ../include/svn_error_codes.h:1216 ../svnadmin/svnadmin.c:1842
#, c-format
msgid "Revision range is not allowed"
msgstr "Revisionsområde otillåtet"
-#: ../include/svn_error_codes.h:1204
+#: ../include/svn_error_codes.h:1220
msgid "Inter-repository relocation not allowed"
msgstr "Omlokalisering mellan arkiv otillåten"
-#: ../include/svn_error_codes.h:1208
+#: ../include/svn_error_codes.h:1224
msgid "Author name cannot contain a newline"
msgstr "Författarnamn kan ej innehålla radslut"
-#: ../include/svn_error_codes.h:1212
+#: ../include/svn_error_codes.h:1228
msgid "Bad property name"
msgstr "Felaktigt egenskapsnamn"
-#: ../include/svn_error_codes.h:1217
+#: ../include/svn_error_codes.h:1233
msgid "Two versioned resources are unrelated"
msgstr "Två orelaterade versionshanterade resurser"
-#: ../include/svn_error_codes.h:1222
+#: ../include/svn_error_codes.h:1238
msgid "Path has no lock token"
msgstr "Sökvägen saknar låsidentifierare"
-#: ../include/svn_error_codes.h:1227
+#: ../include/svn_error_codes.h:1243
msgid "Operation does not support multiple sources"
msgstr "Operationen klarar ej flera källor"
-#: ../include/svn_error_codes.h:1232
+#: ../include/svn_error_codes.h:1248
msgid "No versioned parent directories"
msgstr "Inga versionshanterade föräldrakataloger"
-#: ../include/svn_error_codes.h:1237 ../include/svn_error_codes.h:1257
+#: ../include/svn_error_codes.h:1253 ../include/svn_error_codes.h:1273
msgid "Working copy and merge source not ready for reintegration"
msgstr "Arbetskopia och källa för sammanslagning inte klara för återförening"
-#: ../include/svn_error_codes.h:1242
+#: ../include/svn_error_codes.h:1258
msgid "A file external cannot overwrite an existing versioned item"
msgstr "En extern fil kan inte skriva över ett befintligt versionshanterat objekt"
-#: ../include/svn_error_codes.h:1247
+#: ../include/svn_error_codes.h:1263
msgid "Invalid path component strip count specified"
msgstr "Ogiltig angivelse av antal sökvägsdelar att ta bort"
-#: ../include/svn_error_codes.h:1252
+#: ../include/svn_error_codes.h:1268
msgid "Detected a cycle while processing the operation"
msgstr "En rundgång upptäcktes när operationen behandlades"
-#: ../include/svn_error_codes.h:1262
+#: ../include/svn_error_codes.h:1278
msgid "Invalid mergeinfo detected in merge target"
msgstr "Ogiltig sammanslagningsinformation upptäcktes i målet"
-#: ../include/svn_error_codes.h:1267
+#: ../include/svn_error_codes.h:1283
msgid "Can't perform this operation without a valid lock token"
msgstr "Kan inte utföra denna operation utan giltig låsidentifierare"
-#: ../include/svn_error_codes.h:1272
+#: ../include/svn_error_codes.h:1288
msgid "The operation is forbidden by the server"
msgstr "Operationen tillåts inte av servern"
-#: ../include/svn_error_codes.h:1277
+#: ../include/svn_error_codes.h:1293
msgid "The conflict resolution option is not applicable"
msgstr "Konfliktlösningsvalet är ej tillämpbart"
-#: ../include/svn_error_codes.h:1283
+#: ../include/svn_error_codes.h:1299
msgid "A problem occurred; see other errors for details"
msgstr "Ett problem har inträffat; se vidare fel för mer information"
-#: ../include/svn_error_codes.h:1287
+#: ../include/svn_error_codes.h:1303
msgid "Failure loading plugin"
msgstr "Fel vid inladdning av insticksmodul"
-#: ../include/svn_error_codes.h:1291
+#: ../include/svn_error_codes.h:1307
msgid "Malformed file"
msgstr "Felaktig fil"
-#: ../include/svn_error_codes.h:1295
+#: ../include/svn_error_codes.h:1311
msgid "Incomplete data"
msgstr "Ofullständig data"
-#: ../include/svn_error_codes.h:1299
+#: ../include/svn_error_codes.h:1315
msgid "Incorrect parameters given"
msgstr "Felaktiga parametrar angivna"
-#: ../include/svn_error_codes.h:1303
+#: ../include/svn_error_codes.h:1319
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:1307
+#: ../include/svn_error_codes.h:1323
msgid "Test failed"
msgstr "Test misslyckades"
-#: ../include/svn_error_codes.h:1311
+#: ../include/svn_error_codes.h:1327
msgid "Trying to use an unsupported feature"
msgstr "Försöker använda en funktion som ej stöds"
-#: ../include/svn_error_codes.h:1315
+#: ../include/svn_error_codes.h:1331
msgid "Unexpected or unknown property kind"
msgstr "Oväntad eller okänd egenskapstyp"
-#: ../include/svn_error_codes.h:1319
+#: ../include/svn_error_codes.h:1335
msgid "Illegal target for the requested operation"
msgstr "Otillåtet mål för begärd operation"
-#: ../include/svn_error_codes.h:1323
+#: ../include/svn_error_codes.h:1339
msgid "MD5 checksum is missing"
msgstr "MD5-kontrollsumma saknas"
-#: ../include/svn_error_codes.h:1327
+#: ../include/svn_error_codes.h:1343
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:1331
+#: ../include/svn_error_codes.h:1347
msgid "Error calling external program"
msgstr "Fel vid anrop av externt program"
-#: ../include/svn_error_codes.h:1335
+#: ../include/svn_error_codes.h:1351
msgid "Python exception has been set with the error"
msgstr "Python-undantag har satts för felet"
-#: ../include/svn_error_codes.h:1339
+#: ../include/svn_error_codes.h:1355
msgid "A checksum mismatch occurred"
msgstr "Felaktig kontrollsumma"
-#: ../include/svn_error_codes.h:1343
+#: ../include/svn_error_codes.h:1359
msgid "The operation was interrupted"
msgstr "Operationen avbröts"
-#: ../include/svn_error_codes.h:1347
+#: ../include/svn_error_codes.h:1363
msgid "The specified diff option is not supported"
msgstr "Den angivna diff-flaggan stöds ej"
-#: ../include/svn_error_codes.h:1351
+#: ../include/svn_error_codes.h:1367
msgid "Property not found"
msgstr "Egenskapen finns ej"
-#: ../include/svn_error_codes.h:1355
+#: ../include/svn_error_codes.h:1371
msgid "No auth file path available"
msgstr "Sökväg för auth-fil ej tillgänglig"
-#: ../include/svn_error_codes.h:1360
+#: ../include/svn_error_codes.h:1376
msgid "Incompatible library version"
msgstr "Biblioteksversioner inte kompatibla"
-#: ../include/svn_error_codes.h:1365
+#: ../include/svn_error_codes.h:1381
msgid "Mergeinfo parse error"
msgstr "Syntaxfel i sammanslagningsinformation"
-#: ../include/svn_error_codes.h:1370
+#: ../include/svn_error_codes.h:1386
msgid "Cease invocation of this API"
msgstr "Avsluta anropet av detta API"
-#: ../include/svn_error_codes.h:1375
+#: ../include/svn_error_codes.h:1391
msgid "Error parsing revision number"
msgstr "Syntaxfel i revisionsnummer"
-#: ../include/svn_error_codes.h:1380
+#: ../include/svn_error_codes.h:1396
msgid "Iteration terminated before completion"
msgstr "Upprepning avslutades före fullbordan"
-#: ../include/svn_error_codes.h:1385
+#: ../include/svn_error_codes.h:1401
msgid "Unknown changelist"
msgstr "Okänd ändringslista"
-#: ../include/svn_error_codes.h:1390
+#: ../include/svn_error_codes.h:1406
msgid "Reserved directory name in command line arguments"
msgstr "Reserverat katalognamn i kommandoradsargumenten"
-#: ../include/svn_error_codes.h:1395
+#: ../include/svn_error_codes.h:1411
msgid "Inquiry about unknown capability"
msgstr "Förfrågan om okänd förmåga"
-#: ../include/svn_error_codes.h:1400
+#: ../include/svn_error_codes.h:1416
msgid "Test skipped"
msgstr "Test hoppades över"
-#: ../include/svn_error_codes.h:1405
+#: ../include/svn_error_codes.h:1421
msgid "APR memcache library not available"
msgstr "APR memcache-bibliotek ej tillgängligt"
-#: ../include/svn_error_codes.h:1410
+#: ../include/svn_error_codes.h:1426
msgid "Couldn't perform atomic initialization"
msgstr "Kunde inte genomföra atomisk initiering"
-#: ../include/svn_error_codes.h:1415
+#: ../include/svn_error_codes.h:1431
msgid "SQLite error"
msgstr "SQLite-fel"
-#: ../include/svn_error_codes.h:1420
+#: ../include/svn_error_codes.h:1436
msgid "Attempted to write to readonly SQLite db"
msgstr "Försök att skriva till skrivskyddad SQLite-databas"
-#: ../include/svn_error_codes.h:1427
+#: ../include/svn_error_codes.h:1443
msgid "Unsupported schema found in SQLite db"
msgstr "Schemat i SQLite-databasen stöds ej"
-#: ../include/svn_error_codes.h:1432
+#: ../include/svn_error_codes.h:1448
msgid "The SQLite db is busy"
msgstr "SQLite-databasen är upptagen"
-#: ../include/svn_error_codes.h:1437
+#: ../include/svn_error_codes.h:1453
msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
msgstr "SQLite upptagen vid transaktionsåterladding; återställer alla upptagna SQLite-satser för att tillåta återladdning"
-#: ../include/svn_error_codes.h:1443
+#: ../include/svn_error_codes.h:1459
msgid "Constraint error in SQLite db"
msgstr "Restriktionsfel i SQLite-databas"
-#: ../include/svn_error_codes.h:1448
+#: ../include/svn_error_codes.h:1464
msgid "Too many memcached servers configured"
msgstr "För många konfigurerade memcached-servrar"
-#: ../include/svn_error_codes.h:1453
+#: ../include/svn_error_codes.h:1469
msgid "Failed to parse version number string"
msgstr "Syntaxfel i sträng med versionsnummer"
-#: ../include/svn_error_codes.h:1458
+#: ../include/svn_error_codes.h:1474
msgid "Atomic data storage is corrupt"
msgstr "Förstörd atomisk datalagring"
-#: ../include/svn_error_codes.h:1463
+#: ../include/svn_error_codes.h:1479
msgid "utf8proc library error"
msgstr "biblioteksfel i utf8proc"
-#: ../include/svn_error_codes.h:1468
+#: ../include/svn_error_codes.h:1484
msgid "Bad arguments to SQL operators GLOB or LIKE"
msgstr "Felaktiga argument till SQL-operatorerna GLOB eller LIKE"
-#: ../include/svn_error_codes.h:1473
+#: ../include/svn_error_codes.h:1489
msgid "Packed data stream is corrupt"
msgstr "Förstörd packad dataström"
-#: ../include/svn_error_codes.h:1478
+#: ../include/svn_error_codes.h:1494
msgid "Additional errors:"
msgstr "Ytterligare fel:"
-#: ../include/svn_error_codes.h:1483
+#: ../include/svn_error_codes.h:1499
msgid "Parser error: invalid input"
msgstr "Syntaxfel: felaktig indata"
-#: ../include/svn_error_codes.h:1488
+#: ../include/svn_error_codes.h:1504
msgid "SQLite transaction rollback failed"
msgstr "SQLite-transaktionsåterladdning misslyckades"
-#: ../include/svn_error_codes.h:1493
+#: ../include/svn_error_codes.h:1509
msgid "LZ4 compression failed"
msgstr "LZ4-kompression misslyckades"
-#: ../include/svn_error_codes.h:1498
+#: ../include/svn_error_codes.h:1514
msgid "LZ4 decompression failed"
msgstr "LZ4-dekompression misslyckades"
-#: ../include/svn_error_codes.h:1503
+#: ../include/svn_error_codes.h:1519
msgid "Could not canonicalize path or URI"
msgstr "Kunde inte skapa kanonisk sökväg eller URI"
-#: ../include/svn_error_codes.h:1509
+#: ../include/svn_error_codes.h:1525
msgid "Error parsing arguments"
msgstr "Syntaxfel i argument"
-#: ../include/svn_error_codes.h:1513
+#: ../include/svn_error_codes.h:1529
msgid "Not enough arguments provided"
msgstr "För få argument givna"
-#: ../include/svn_error_codes.h:1517
+#: ../include/svn_error_codes.h:1533
msgid "Mutually exclusive arguments specified"
msgstr "De angivna argumenten kan inte användas samtidigt"
-#: ../include/svn_error_codes.h:1521
+#: ../include/svn_error_codes.h:1537
msgid "Attempted command in administrative dir"
msgstr "Försökte utföra kommando i förvaltningskatalog"
-#: ../include/svn_error_codes.h:1525
+#: ../include/svn_error_codes.h:1541
msgid "The log message file is under version control"
msgstr "Filen med loggmeddelandet är versionshanterad"
-#: ../include/svn_error_codes.h:1529
+#: ../include/svn_error_codes.h:1545
msgid "The log message is a pathname"
msgstr "Loggmeddelandet är en sökväg"
-#: ../include/svn_error_codes.h:1533
+#: ../include/svn_error_codes.h:1549
msgid "Committing in directory scheduled for addition"
msgstr "Arkiverar i katalog schemalagd att läggas till"
-#: ../include/svn_error_codes.h:1537
+#: ../include/svn_error_codes.h:1553
msgid "No external editor available"
msgstr "Ingen extern editor tillgänglig"
-#: ../include/svn_error_codes.h:1541
+#: ../include/svn_error_codes.h:1557
msgid "Something is wrong with the log message's contents"
msgstr "Fel i loggmeddelandets innehåll"
-#: ../include/svn_error_codes.h:1545
+#: ../include/svn_error_codes.h:1561
msgid "A log message was given where none was necessary"
msgstr "Ett loggmeddelande angavs utan att det var nödvändigt"
-#: ../include/svn_error_codes.h:1549
+#: ../include/svn_error_codes.h:1565
msgid "No external merge tool available"
msgstr "Ingen externt sammanslagningsverktyg tillgängligt"
-#: ../include/svn_error_codes.h:1553
+#: ../include/svn_error_codes.h:1569
msgid "Failed processing one or more externals definitions"
msgstr "Misslyckad behandling av en eller fler external-definitioner"
-#: ../include/svn_error_codes.h:1558
+#: ../include/svn_error_codes.h:1574
msgid "Repository verification failed"
msgstr "Arkivkontroll misslyckades"
-#: ../include/svn_error_codes.h:1564
+#: ../include/svn_error_codes.h:1580
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:1568
+#: ../include/svn_error_codes.h:1584
msgid "Unknown svn protocol command"
msgstr "Okänt kommando i svn-protokollet"
-#: ../include/svn_error_codes.h:1572
+#: ../include/svn_error_codes.h:1588
msgid "Network connection closed unexpectedly"
msgstr "Nätverksanslutningen stängdes oväntat"
-#: ../include/svn_error_codes.h:1576
+#: ../include/svn_error_codes.h:1592
msgid "Network read/write error"
msgstr "Läs/skrivfel till nätverket"
-#: ../include/svn_error_codes.h:1588
+#: ../include/svn_error_codes.h:1604
msgid "Client/server version mismatch"
msgstr "Klient- och serverversion stämmer ej överens"
-#: ../include/svn_error_codes.h:1593
+#: ../include/svn_error_codes.h:1609
msgid "Cannot negotiate authentication mechanism"
msgstr "Kan inte förhandla om autentiseringsmekanism"
-#: ../include/svn_error_codes.h:1598
+#: ../include/svn_error_codes.h:1614
msgid "Editor drive was aborted"
msgstr "Editorkörning avbröts"
-#: ../include/svn_error_codes.h:1603
+#: ../include/svn_error_codes.h:1619
msgid "Client request too long"
msgstr "Klientbegäran för lång"
-#: ../include/svn_error_codes.h:1608
+#: ../include/svn_error_codes.h:1624
msgid "Server response too long"
msgstr "För långt svar från server"
-#: ../include/svn_error_codes.h:1616
+#: ../include/svn_error_codes.h:1632
msgid "Credential data unavailable"
msgstr "Klientreferenser otillgängliga"
-#: ../include/svn_error_codes.h:1620
+#: ../include/svn_error_codes.h:1636
msgid "No authentication provider available"
msgstr "Ingen tillhandahållare av autentisering tillgänglig"
-#: ../include/svn_error_codes.h:1624
+#: ../include/svn_error_codes.h:1640
msgid "All authentication providers exhausted"
msgstr "Alla tillhandahållare av autentisering förbrukade"
-#: ../include/svn_error_codes.h:1628
+#: ../include/svn_error_codes.h:1644
msgid "Credentials not saved"
msgstr "Klientreferenser sparades inte"
-#: ../include/svn_error_codes.h:1633 ../libsvn_subr/gpg_agent.c:512
+#: ../include/svn_error_codes.h:1649 ../libsvn_subr/gpg_agent.c:512
msgid "Authentication failed"
msgstr "Autentisering misslyckades"
-#: ../include/svn_error_codes.h:1639
+#: ../include/svn_error_codes.h:1655
msgid "Read access denied for root of edit"
msgstr "Läsning nekas till roten för editeringen"
-#: ../include/svn_error_codes.h:1644
+#: ../include/svn_error_codes.h:1660
msgid "Item is not readable"
msgstr "Objektet är inte läsbart"
-#: ../include/svn_error_codes.h:1649
+#: ../include/svn_error_codes.h:1665
msgid "Item is partially readable"
msgstr "Objektet är delvis läsbart"
-#: ../include/svn_error_codes.h:1653
+#: ../include/svn_error_codes.h:1669
msgid "Invalid authz configuration"
msgstr "Ogiltig behörighetskonfiguration"
-#: ../include/svn_error_codes.h:1658
+#: ../include/svn_error_codes.h:1674
msgid "Item is not writable"
msgstr "Objektet är inte skrivbart"
-#: ../include/svn_error_codes.h:1665
+#: ../include/svn_error_codes.h:1681
msgid "Diff data source modified unexpectedly"
msgstr "Datakälla för diff ändrades oväntat"
-#: ../include/svn_error_codes.h:1670
+#: ../include/svn_error_codes.h:1686
msgid "Diff data unexpected"
msgstr "Oväntad diff-data"
-#: ../include/svn_error_codes.h:1677
+#: ../include/svn_error_codes.h:1693
msgid "Initialization of SSPI library failed"
msgstr "Misslyckad initiering av SSPI-biblioteket"
-#: ../include/svn_error_codes.h:1683
+#: ../include/svn_error_codes.h:1699
msgid "Server SSL certificate untrusted"
msgstr "Ej betrott SSL-certifikat för server"
-#: ../include/svn_error_codes.h:1688
+#: ../include/svn_error_codes.h:1704
msgid "Initialization of the GSSAPI context failed"
msgstr "Misslyckad initiering av GSSAPI-kontext"
-#: ../include/svn_error_codes.h:1693
+#: ../include/svn_error_codes.h:1709
msgid "While handling serf response:"
msgstr "När svar från serf behandlades:"
-#: ../include/svn_error_codes.h:1698
+#: ../include/svn_error_codes.h:1714
msgid "Can't read from stream"
msgstr "Kan inte läsa från ström"
-#: ../include/svn_error_codes.h:1704
+#: ../include/svn_error_codes.h:1720
msgid "Assertion failure"
msgstr "Fel upptäckt vid invariantkontroll"
-#: ../include/svn_error_codes.h:1708
+#: ../include/svn_error_codes.h:1724
msgid "No non-tracing links found in the error chain"
msgstr "Inga icke-spårande länkar hittades i felkedjan"
-#: ../include/svn_error_codes.h:1716
+#: ../include/svn_error_codes.h:1732
msgid "Unexpected end of ASN1 data"
msgstr "Oväntat slut på ASN1-data"
-#: ../include/svn_error_codes.h:1720
+#: ../include/svn_error_codes.h:1736
msgid "Unexpected ASN1 tag"
msgstr "Oväntat slut på ASN1-märke"
-#: ../include/svn_error_codes.h:1724
+#: ../include/svn_error_codes.h:1740
msgid "Invalid ASN1 length"
msgstr "Ogiltig ASN1-längd"
-#: ../include/svn_error_codes.h:1728
+#: ../include/svn_error_codes.h:1744
msgid "ASN1 length mismatch"
msgstr "ANS1-längd stämmer ej"
-#: ../include/svn_error_codes.h:1732
+#: ../include/svn_error_codes.h:1748
msgid "Invalid ASN1 data"
msgstr "Ogiltig ASN1-data"
-#: ../include/svn_error_codes.h:1736
+#: ../include/svn_error_codes.h:1752
msgid "Unavailable X509 feature"
msgstr "Otillgänglig X509-funktion"
-#: ../include/svn_error_codes.h:1740
+#: ../include/svn_error_codes.h:1756
msgid "Invalid PEM certificate"
msgstr "Ogiltigt PEM-certifikat"
-#: ../include/svn_error_codes.h:1744
+#: ../include/svn_error_codes.h:1760
msgid "Invalid certificate format"
msgstr "Ogiltigt certifikatsformat"
-#: ../include/svn_error_codes.h:1748
+#: ../include/svn_error_codes.h:1764
msgid "Invalid certificate version"
msgstr "Ogiltig certifikatversion"
-#: ../include/svn_error_codes.h:1752
+#: ../include/svn_error_codes.h:1768
msgid "Invalid certificate serial number"
msgstr "Ogiltigt serienummer för certifikat"
-#: ../include/svn_error_codes.h:1756
+#: ../include/svn_error_codes.h:1772
msgid "Found invalid algorithm in certificate"
msgstr "Ogiltig algoritm hittad i certifikat"
-#: ../include/svn_error_codes.h:1760
+#: ../include/svn_error_codes.h:1776
msgid "Found invalid name in certificate"
msgstr "Ogiltigt namn hittat i certifikat"
-#: ../include/svn_error_codes.h:1764
+#: ../include/svn_error_codes.h:1780
msgid "Found invalid date in certificate"
msgstr "Ogiltigt datum hittat i certifikat"
-#: ../include/svn_error_codes.h:1768
+#: ../include/svn_error_codes.h:1784
msgid "Found invalid public key in certificate"
msgstr "Ogiltig öppen nyckel hittad i certifikat"
-#: ../include/svn_error_codes.h:1772
+#: ../include/svn_error_codes.h:1788
msgid "Found invalid signature in certificate"
msgstr "Ogiltig signatur hittad i certifikat"
-#: ../include/svn_error_codes.h:1776
+#: ../include/svn_error_codes.h:1792
msgid "Found invalid extensions in certificate"
msgstr "Ogiltig utvidgning hittad i certifikat"
-#: ../include/svn_error_codes.h:1780
+#: ../include/svn_error_codes.h:1796
msgid "Unknown certificate version"
msgstr "Okänd certifikatversion"
-#: ../include/svn_error_codes.h:1784
+#: ../include/svn_error_codes.h:1800
msgid "Certificate uses unknown public key algorithm"
msgstr "Certifikatet använder okänd öppen nyckelalgoritm"
-#: ../include/svn_error_codes.h:1788
+#: ../include/svn_error_codes.h:1804
msgid "Certificate signature mismatch"
msgstr "Certifikatssignaturen stämmer ej"
-#: ../include/svn_error_codes.h:1792
+#: ../include/svn_error_codes.h:1808
msgid "Certificate verification failed"
msgstr "Certifikatskontrollen misslyckades"
@@ -1582,7 +1594,7 @@ msgid "GNOME Keyring is locked and we ar
msgstr "GNOMEs nyckelkedja är låst och vi är inte interaktiva"
#: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365
-#: ../libsvn_subr/opt.c:970
+#: ../libsvn_subr/opt.c:302
#, c-format
msgid "'%s' ends in a reserved name"
msgstr "\"%s\" slutar med ett reserverat namn"
@@ -1592,38 +1604,39 @@ msgstr "\"%s\" slutar med ett reserverat
msgid "'%s' prevents creating parent of '%s'"
msgstr "\"%s\" hindrar att förälder till \"%s\" skapas"
-#: ../libsvn_client/add.c:862 ../libsvn_wc/adm_ops.c:445
+#: ../libsvn_client/add.c:862 ../libsvn_wc/adm_ops.c:446
#, c-format
msgid "'%s' is an existing item in conflict; please mark the conflict as resolved before adding a new item here"
msgstr "\"%s\" är ett befintligt objekt i konflikt; markera konflikten som löst innan ett nytt objekt läggs till här"
-#: ../libsvn_client/add.c:869 ../libsvn_wc/adm_ops.c:400
-#: ../libsvn_wc/workqueue.c:902 ../libsvn_wc/workqueue.c:996
+#: ../libsvn_client/add.c:869 ../libsvn_wc/adm_ops.c:401
+#: ../libsvn_wc/workqueue.c:908 ../libsvn_wc/workqueue.c:1002
#, c-format
msgid "'%s' not found"
msgstr "\"%s\" finns inte"
-#: ../libsvn_client/add.c:875 ../libsvn_wc/adm_ops.c:405
+#: ../libsvn_client/add.c:875 ../libsvn_wc/adm_ops.c:406
#: ../libsvn_wc/delete.c:98
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "Nodtypen för sökvägen \"%s\" stöds inte"
#: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65
-#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3270
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3271
#: ../libsvn_client/export.c:1388 ../libsvn_client/import.c:861
-#: ../libsvn_client/patch.c:3750 ../libsvn_client/relocate.c:155
-#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:140
-#: ../libsvn_client/shelf2.c:1128 ../libsvn_client/status.c:445
-#: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:749
-#: ../libsvn_client/upgrade.c:116 ../svn/shelf-cmd.c:1030
-#: ../svn/shelf2-cmd.c:1030 ../svn/util.c:992 ../svnbench/util.c:76
+#: ../libsvn_client/patch.c:3747 ../libsvn_client/patch.c:3812
+#: ../libsvn_client/relocate.c:155 ../libsvn_client/resolved.c:160
+#: ../libsvn_client/revert.c:149 ../libsvn_client/shelf2.c:1131
+#: ../libsvn_client/status.c:445 ../libsvn_client/switch.c:477
+#: ../libsvn_client/update.c:755 ../libsvn_client/upgrade.c:119
+#: ../svn/shelf-cmd.c:1032 ../svn/shelf2-cmd.c:1032 ../svn/util.c:992
+#: ../svnbench/util.c:76
#, c-format
msgid "'%s' is not a local path"
msgstr "\"%s\" är ingen lokal sökväg"
-#: ../libsvn_client/add.c:949 ../libsvn_wc/adm_ops.c:479
-#: ../libsvn_wc/copy.c:786
+#: ../libsvn_client/add.c:949 ../libsvn_wc/adm_ops.c:480
+#: ../libsvn_wc/copy.c:837
#, c-format
msgid "'%s' is already under version control"
msgstr "\"%s\" är redan versionshanterad"
@@ -1633,7 +1646,7 @@ msgstr "\"%s\" är redan versionshantera
msgid "There is no valid URI above '%s'"
msgstr "Det finns ingen giltig URI ovanför \"%s\""
-#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:769
+#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:770
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "Kan inte beräkna skuldinformation för den binära filen \"%s\""
@@ -1641,9 +1654,9 @@ msgstr "Kan inte beräkna skuldinformati
#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:612
#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:817
#: ../libsvn_client/prop_commands.c:1398 ../libsvn_client/revisions.c:107
-#: ../libsvn_wc/adm_ops.c:913 ../libsvn_wc/adm_ops.c:967
-#: ../libsvn_wc/copy.c:628 ../libsvn_wc/copy.c:689 ../libsvn_wc/entries.c:1407
-#: ../libsvn_wc/entries.c:2803 ../libsvn_wc/entries.c:2834 ../svn/notify.c:1167
+#: ../libsvn_wc/adm_ops.c:979 ../libsvn_wc/adm_ops.c:1033
+#: ../libsvn_wc/copy.c:679 ../libsvn_wc/copy.c:740 ../libsvn_wc/entries.c:1407
+#: ../libsvn_wc/entries.c:2803 ../libsvn_wc/entries.c:2834 ../svn/notify.c:1169
#: ../svnbench/notify.c:968
#, c-format
msgid "'%s' is not under version control"
@@ -1663,7 +1676,7 @@ msgstr "\"%s\" har ingen orörd revision
msgid "(local)"
msgstr "(lokal)"
-#: ../libsvn_client/cat.c:255
+#: ../libsvn_client/cat.c:265
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL:en \"%s\" pekar på en katalog"
@@ -1672,28 +1685,33 @@ msgstr "URL:en \"%s\" pekar på en katal
msgid "Target changelist name must not be empty"
msgstr "Ãndringslistan fÃ¥r inte ha tomt namn"
-#: ../libsvn_client/checkout.c:146 ../libsvn_client/export.c:1445
+#: ../libsvn_client/checkout.c:196 ../libsvn_client/export.c:1445
#: ../svnbench/null-export-cmd.c:293
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL:en \"%s\" finns inte"
-#: ../libsvn_client/checkout.c:150
+#: ../libsvn_client/checkout.c:200
#, 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:188
+#: ../libsvn_client/checkout.c:238 ../libsvn_wc/adm_files.c:325
+#, c-format
+msgid "'%s' is an existing working copy with different '%s' setting"
+msgstr "\"%s\" är befintlig arbetskopia med en annan inställning av \"%s\""
+
+#: ../libsvn_client/checkout.c:253
#, 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:195
+#: ../libsvn_client/checkout.c:259
#, c-format
msgid "'%s' is already a working copy for the same URL but its format is %d instead of the expected %d"
msgstr "\"%s\" är redan en arbetskopia för samma URL men dess format är %d istället för det förväntade %d"
-#: ../libsvn_client/checkout.c:204
+#: ../libsvn_client/checkout.c:268
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "\"%s\" finns redan och är ingen katalog"
@@ -1741,12 +1759,12 @@ msgstr ""
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:817
+#: ../libsvn_client/commit.c:821
#, c-format
msgid "Cannot commit '%s' because it was moved from '%s' which is not part of the commit; both sides of the move must be committed together"
msgstr "Kan inte arkivera \"%s\" eftersom den flyttades från \"%s\" som inte ingår i arkiveringen; bägge sidor av flytten måste arkiveras tillsammans"
-#: ../libsvn_client/commit.c:872
+#: ../libsvn_client/commit.c:876
#, c-format
msgid "Cannot commit '%s' because it was moved to '%s' which is not part of the commit; both sides of the move must be committed together"
msgstr "Kan inte arkivera \"%s\" eftersom den flyttades till \"%s\" som inte ingår i arkiveringen; bägge sidor av flytten måste arkiveras tillsammans"
@@ -1825,39 +1843,39 @@ msgstr "Arkiveringsobjektet \"%s\" har k
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "Standardegenskaper kan inte sättas direkt som revisionsegenskaper"
-#: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1100
-#: ../libsvn_client/conflicts.c:1693 ../libsvn_client/conflicts.c:4996
-#: ../libsvn_client/conflicts.c:5370 ../libsvn_client/conflicts.c:5392
-#: ../libsvn_client/conflicts.c:5444 ../libsvn_client/conflicts.c:5917
+#: ../libsvn_client/conflicts.c:735 ../libsvn_client/conflicts.c:1101
+#: ../libsvn_client/conflicts.c:1694 ../libsvn_client/conflicts.c:5004
+#: ../libsvn_client/conflicts.c:5378 ../libsvn_client/conflicts.c:5400
+#: ../libsvn_client/conflicts.c:5452 ../libsvn_client/conflicts.c:5932
msgid "unknown author"
msgstr "okänd författare"
-#: ../libsvn_client/conflicts.c:1131
+#: ../libsvn_client/conflicts.c:1132
msgid "A file containing uncommitted changes was found in the working copy."
msgstr "En fil med oarkiverade ändringar hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:1134
+#: ../libsvn_client/conflicts.c:1135
msgid "A file which differs from the corresponding file on the merge source branch was found in the working copy."
msgstr "En fil som skiljer sig från motsvarande fil i källgrenen för sammanslagningen hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:1139
+#: ../libsvn_client/conflicts.c:1140
msgid "A file which already occupies this path was found in the working copy."
msgstr "En fil som redan upptar denna sökväg hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:1143
+#: ../libsvn_client/conflicts.c:1144
msgid "An unversioned file was found in the working copy."
msgstr "En icke versionshanterad fil fanns i arbetskopian."
-#: ../libsvn_client/conflicts.c:1147
+#: ../libsvn_client/conflicts.c:1148
msgid "A deleted file was found in the working copy."
msgstr "En raderad fil hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:1152
+#: ../libsvn_client/conflicts.c:1153
msgid "No such file was found in the working copy."
msgstr "Ingen sådan fil hittades i arbetskopian."
#. ### display deleted revision
-#: ../libsvn_client/conflicts.c:1156
+#: ../libsvn_client/conflicts.c:1157
msgid ""
"No such file was found in the merge target working copy.\n"
"Perhaps the file has been deleted or moved away in the repository's history?"
@@ -1866,7 +1884,7 @@ msgstr ""
"Kanske filen har raderats eller flyttas bort i arkivets historia?"
#. ### show more details about copies or replacements?
-#: ../libsvn_client/conflicts.c:1166
+#: ../libsvn_client/conflicts.c:1167
msgid "A file scheduled to be added to the repository in the next commit was found in the working copy."
msgstr "En fil schemalagd för att läggas till i nästa arkivering hittades i arbetskopian."
@@ -1875,11 +1893,11 @@ msgstr "En fil schemalagd för att lägg
#. * This case cannot happen until we detect incoming
#. * moves, which we currently don't do.
#. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1197 ../libsvn_client/conflicts.c:1229
+#: ../libsvn_client/conflicts.c:1198 ../libsvn_client/conflicts.c:1230
msgid "The file in the working copy had been moved away at the time this conflict was recorded."
msgstr "Filen i arbetskopian var bortflyttad när denna konflikt registrerades."
-#: ../libsvn_client/conflicts.c:1212 ../libsvn_client/conflicts.c:1245
+#: ../libsvn_client/conflicts.c:1213 ../libsvn_client/conflicts.c:1246
#, c-format
msgid ""
"The file in the working copy was moved away to\n"
@@ -1893,11 +1911,11 @@ msgstr ""
#. * This case cannot happen until we detect incoming
#. * moves, which we currently don't do.
#. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1271 ../libsvn_client/conflicts.c:1303
+#: ../libsvn_client/conflicts.c:1272 ../libsvn_client/conflicts.c:1304
msgid "A file had been moved here in the working copy at the time this conflict was recorded."
msgstr "En fil hade flyttats hit i arbetskopian när denna konflikt registrerades."
-#: ../libsvn_client/conflicts.c:1286 ../libsvn_client/conflicts.c:1319
+#: ../libsvn_client/conflicts.c:1287 ../libsvn_client/conflicts.c:1320
#, c-format
msgid ""
"A file was moved here in the working copy from\n"
@@ -1906,32 +1924,32 @@ msgstr ""
"En fil hade flyttats hit i arbetskopian från\n"
"\"%s\"."
-#: ../libsvn_client/conflicts.c:1355
+#: ../libsvn_client/conflicts.c:1356
msgid "A directory containing uncommitted changes was found in the working copy."
msgstr "En katalog med oarkiverade ändringar hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:1358
+#: ../libsvn_client/conflicts.c:1359
msgid "A directory which differs from the corresponding directory on the merge source branch was found in the working copy."
msgstr "En katalog som skiljer sig från motsvarande katalog i källgrenen för sammanslagningen hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:1363
+#: ../libsvn_client/conflicts.c:1364
msgid "A directory which already occupies this path was found in the working copy."
msgstr "En katalog som redan upptar denna sökväg hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:1367
+#: ../libsvn_client/conflicts.c:1368
msgid "An unversioned directory was found in the working copy."
msgstr "En icke versionshanterad katalog hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:1371
+#: ../libsvn_client/conflicts.c:1372
msgid "A deleted directory was found in the working copy."
msgstr "En raderad katalog hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:1377
+#: ../libsvn_client/conflicts.c:1378
msgid "No such directory was found in the working copy."
msgstr "Ingen sådan katalog hittades i arbetskopian."
#. ### display deleted revision
-#: ../libsvn_client/conflicts.c:1381
+#: ../libsvn_client/conflicts.c:1382
msgid ""
"No such directory was found in the merge target working copy.\n"
"Perhaps the directory has been deleted or moved away in the repository's history?"
@@ -1940,16 +1958,16 @@ msgstr ""
"Kanske katalogen har raderats eller flyttats bort i arkivets historia?"
#. ### show more details about copies or replacements?
-#: ../libsvn_client/conflicts.c:1391
+#: ../libsvn_client/conflicts.c:1392
msgid "A directory scheduled to be added to the repository in the next commit was found in the working copy."
msgstr "En katalog schemalagd för att läggas till i nästa arkivering hittades i arbetskopian."
#. The move no longer exists.
-#: ../libsvn_client/conflicts.c:1423
+#: ../libsvn_client/conflicts.c:1424
msgid "The directory in the working copy had been moved away at the time this conflict was recorded."
msgstr "Katalogen i arbetskopian hade flyttas bort när denna konflikt registrerades."
-#: ../libsvn_client/conflicts.c:1438
+#: ../libsvn_client/conflicts.c:1439
#, c-format
msgid ""
"The directory in the working copy was moved away to\n"
@@ -1962,11 +1980,11 @@ msgstr ""
#. * This case cannot happen until we detect incoming
#. * moves, which we currently don't do.
#. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1455
+#: ../libsvn_client/conflicts.c:1456
msgid "The directory had been moved away at the time this conflict was recorded."
msgstr "Katalogen hade flyttats bort när denna konflikt registrerades."
-#: ../libsvn_client/conflicts.c:1471
+#: ../libsvn_client/conflicts.c:1472
#, c-format
msgid ""
"The directory was moved away to\n"
@@ -1980,11 +1998,11 @@ msgstr ""
#. * This case cannot happen until we detect incoming
#. * moves, which we currently don't do.
#. ### find deleted/moved revision?
-#: ../libsvn_client/conflicts.c:1497 ../libsvn_client/conflicts.c:1529
+#: ../libsvn_client/conflicts.c:1498 ../libsvn_client/conflicts.c:1530
msgid "A directory had been moved here at the time this conflict was recorded."
msgstr "En katalog hade flyttats hit när denna konflikt registrerades."
-#: ../libsvn_client/conflicts.c:1512
+#: ../libsvn_client/conflicts.c:1513
#, c-format
msgid ""
"A directory was moved here from\n"
@@ -1993,7 +2011,7 @@ msgstr ""
"En katalog hade flyttats hit från\n"
"\"%s\"."
-#: ../libsvn_client/conflicts.c:1545
+#: ../libsvn_client/conflicts.c:1546
#, c-format
msgid ""
"A directory was moved here in the working copy from\n"
@@ -2002,24 +2020,24 @@ msgstr ""
"En katalog hade flyttats hit i arbetskopian från\n"
"\"%s\"."
-#: ../libsvn_client/conflicts.c:3130
+#: ../libsvn_client/conflicts.c:3131
msgid "An item containing uncommitted changes was found in the working copy."
msgstr "Ett objekt med oarkiverade ändringar hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:3134
+#: ../libsvn_client/conflicts.c:3135
msgid "An item which already occupies this path was found in the working copy."
msgstr "Ett objekt som redan upptar denna sökväg hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:3138
+#: ../libsvn_client/conflicts.c:3139
msgid "A deleted item was found in the working copy."
msgstr "Ett raderat objekt hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:3143
+#: ../libsvn_client/conflicts.c:3144
msgid "No such file or directory was found in the working copy."
msgstr "Ingen sådan fil eller katalog hittades i arbetskopian."
#. ### display deleted revision
-#: ../libsvn_client/conflicts.c:3148
+#: ../libsvn_client/conflicts.c:3149
msgid ""
"No such file or directory was found in the merge target working copy.\n"
"The item may have been deleted or moved away in the repository's history."
@@ -2027,23 +2045,23 @@ msgstr ""
"Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n"
"Objektet kan ha raderats eller flyttats bort i arkivets historia."
-#: ../libsvn_client/conflicts.c:3155
+#: ../libsvn_client/conflicts.c:3156
msgid "An unversioned item was found in the working copy."
msgstr "Ett icke versionshanterat objekt hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:3160
+#: ../libsvn_client/conflicts.c:3161
msgid "An item scheduled to be added to the repository in the next commit was found in the working copy."
msgstr "Ett objekt schemalagt för att läggas till i nästa arkivering hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:3165
+#: ../libsvn_client/conflicts.c:3166
msgid "The item in the working copy had been moved away at the time this conflict was recorded."
msgstr "Objektet i arbetskopian hade flyttas bort när denna konflikt registrerades."
-#: ../libsvn_client/conflicts.c:3169
+#: ../libsvn_client/conflicts.c:3170
msgid "An item had been moved here in the working copy at the time this conflict was recorded."
msgstr "Ett objekt hade flyttats hit i arbetskopian när denna konflikt registrerades."
-#: ../libsvn_client/conflicts.c:3197
+#: ../libsvn_client/conflicts.c:3198
#, c-format
msgid ""
"%s\n"
@@ -2052,41 +2070,41 @@ msgstr ""
"%s\n"
"Och sedan flyttats bort till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3262
+#: ../libsvn_client/conflicts.c:3263
msgid "No such file or directory was found in the merge target working copy.\n"
msgstr "Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n"
-#: ../libsvn_client/conflicts.c:3271
+#: ../libsvn_client/conflicts.c:3272
#, c-format
msgid "%sThe file was moved to '^/%s' in r%ld by %s."
msgstr "%sFilen flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3277
+#: ../libsvn_client/conflicts.c:3278
#, c-format
msgid "%sThe directory was moved to '^/%s' in r%ld by %s."
msgstr "%sKatalogen flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3284
+#: ../libsvn_client/conflicts.c:3285
#, c-format
msgid "%sThe item was moved to '^/%s' in r%ld by %s."
msgstr "%sObjektet flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3300
+#: ../libsvn_client/conflicts.c:3301
#, c-format
msgid "%sThe file '^/%s' was moved to '^/%s' in r%ld by %s."
msgstr "%sFilen \"^/%s\" flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3308
+#: ../libsvn_client/conflicts.c:3309
#, c-format
msgid "%sThe directory '^/%s' was moved to '^/%s' in r%ld by %s."
msgstr "%sKatalogen \"^/%s\" flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3316
+#: ../libsvn_client/conflicts.c:3317
#, c-format
msgid "%sThe item '^/%s' was moved to '^/%s' in r%ld by %s."
msgstr "%sObjektet \"^/%s\" flyttades till \"^/%s\" i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3330
+#: ../libsvn_client/conflicts.c:3331
#, c-format
msgid ""
"No such file or directory was found in the merge target working copy.\n"
@@ -2095,229 +2113,229 @@ msgstr ""
"Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n"
"\"^/%s\" raderades i r%ld av %s."
-#: ../libsvn_client/conflicts.c:3354
+#: ../libsvn_client/conflicts.c:3355
msgid "An update operation tried to edit a file."
msgstr "En uppdatering försökte ändra en fil."
-#: ../libsvn_client/conflicts.c:3356
+#: ../libsvn_client/conflicts.c:3357
msgid "An update operation tried to add a file."
msgstr "En uppdatering försökte lägga till en fil."
-#: ../libsvn_client/conflicts.c:3358
+#: ../libsvn_client/conflicts.c:3359
msgid "An update operation tried to delete or move a file."
msgstr "En uppdatering försökte radera eller flytta en fil."
-#: ../libsvn_client/conflicts.c:3361
+#: ../libsvn_client/conflicts.c:3362
msgid "An update operation tried to replace a file."
msgstr "En uppdatering försökte ersätta en fil."
-#: ../libsvn_client/conflicts.c:3369
+#: ../libsvn_client/conflicts.c:3370
msgid "A switch operation tried to edit a file."
msgstr "En växling försökte ändra en fil."
-#: ../libsvn_client/conflicts.c:3371
+#: ../libsvn_client/conflicts.c:3372
msgid "A switch operation tried to add a file."
msgstr "En växling försökte lägga till en fil."
-#: ../libsvn_client/conflicts.c:3373
+#: ../libsvn_client/conflicts.c:3374
msgid "A switch operation tried to delete or move a file."
msgstr "En växling försökte radera eller flytta en fil."
-#: ../libsvn_client/conflicts.c:3376
+#: ../libsvn_client/conflicts.c:3377
msgid "A switch operation tried to replace a file."
msgstr "En växling försökte ersätta en fil."
-#: ../libsvn_client/conflicts.c:3384
+#: ../libsvn_client/conflicts.c:3385
msgid "A merge operation tried to edit a file."
msgstr "En sammanslagning försökte ändra en fil."
-#: ../libsvn_client/conflicts.c:3386
+#: ../libsvn_client/conflicts.c:3387
msgid "A merge operation tried to add a file."
msgstr "En sammanslagning försökte lägga till en fil."
-#: ../libsvn_client/conflicts.c:3388
+#: ../libsvn_client/conflicts.c:3389
msgid "A merge operation tried to delete or move a file."
msgstr "En sammanslagning försökte radera eller flytta en fil."
-#: ../libsvn_client/conflicts.c:3391
+#: ../libsvn_client/conflicts.c:3392
msgid "A merge operation tried to replace a file."
msgstr "En sammanslagning försökte ersätta en fil."
-#: ../libsvn_client/conflicts.c:3401
+#: ../libsvn_client/conflicts.c:3402
msgid "An update operation tried to change a directory."
msgstr "En uppdatering försökte ändra en katalog."
-#: ../libsvn_client/conflicts.c:3403
+#: ../libsvn_client/conflicts.c:3404
msgid "An update operation tried to add a directory."
msgstr "En uppdatering försökte lägga till en katalog."
-#: ../libsvn_client/conflicts.c:3405
+#: ../libsvn_client/conflicts.c:3406
msgid "An update operation tried to delete or move a directory."
msgstr "En uppdatering försökte radera eller flytta en katalog."
-#: ../libsvn_client/conflicts.c:3408
+#: ../libsvn_client/conflicts.c:3409
msgid "An update operation tried to replace a directory."
msgstr "En uppdatering försökte ersätta en katalog."
-#: ../libsvn_client/conflicts.c:3416
+#: ../libsvn_client/conflicts.c:3417
msgid "A switch operation tried to edit a directory."
msgstr "En växling försökte ändra en katalog."
-#: ../libsvn_client/conflicts.c:3418
+#: ../libsvn_client/conflicts.c:3419
msgid "A switch operation tried to add a directory."
msgstr "En växling försökte lägga till en katalog."
-#: ../libsvn_client/conflicts.c:3420
+#: ../libsvn_client/conflicts.c:3421
msgid "A switch operation tried to delete or move a directory."
msgstr "En växling försökte radera eller flytta en katalog."
-#: ../libsvn_client/conflicts.c:3423
+#: ../libsvn_client/conflicts.c:3424
msgid "A switch operation tried to replace a directory."
msgstr "En växling försökte ersätta en katalog."
-#: ../libsvn_client/conflicts.c:3431
+#: ../libsvn_client/conflicts.c:3432
msgid "A merge operation tried to edit a directory."
msgstr "En sammanslagning försökte ändra en katalog."
-#: ../libsvn_client/conflicts.c:3433
+#: ../libsvn_client/conflicts.c:3434
msgid "A merge operation tried to add a directory."
msgstr "En sammanslagning försökte lägga till en katalog."
-#: ../libsvn_client/conflicts.c:3435
+#: ../libsvn_client/conflicts.c:3436
msgid "A merge operation tried to delete or move a directory."
msgstr "En sammanslagning försökte radera eller flytta en katalog."
-#: ../libsvn_client/conflicts.c:3438
+#: ../libsvn_client/conflicts.c:3439
msgid "A merge operation tried to replace a directory."
msgstr "En sammanslagning försökte ersätta en katalog."
-#: ../libsvn_client/conflicts.c:3449
+#: ../libsvn_client/conflicts.c:3450
msgid "An update operation tried to edit an item."
msgstr "En uppdatering försökte ändra ett objekt."
-#: ../libsvn_client/conflicts.c:3451
+#: ../libsvn_client/conflicts.c:3452
msgid "An update operation tried to add an item."
msgstr "En uppdatering försökte lägga till ett objekt."
-#: ../libsvn_client/conflicts.c:3453
+#: ../libsvn_client/conflicts.c:3454
msgid "An update operation tried to delete or move an item."
msgstr "En uppdatering försökte radera eller flytta ett objekt."
-#: ../libsvn_client/conflicts.c:3456
+#: ../libsvn_client/conflicts.c:3457
msgid "An update operation tried to replace an item."
msgstr "En uppdatering försökte ersätta ett objekt."
-#: ../libsvn_client/conflicts.c:3464
+#: ../libsvn_client/conflicts.c:3465
msgid "A switch operation tried to edit an item."
msgstr "En växling försökte ändra ett objekt."
-#: ../libsvn_client/conflicts.c:3466
+#: ../libsvn_client/conflicts.c:3467
msgid "A switch operation tried to add an item."
msgstr "En växling försökte lägga till ett objekt."
-#: ../libsvn_client/conflicts.c:3468
+#: ../libsvn_client/conflicts.c:3469
msgid "A switch operation tried to delete or move an item."
msgstr "En växling försökte radera eller flytta ett objekt."
-#: ../libsvn_client/conflicts.c:3471
+#: ../libsvn_client/conflicts.c:3472
msgid "A switch operation tried to replace an item."
msgstr "En växlig försökte ersätta ett objekt."
-#: ../libsvn_client/conflicts.c:3479
+#: ../libsvn_client/conflicts.c:3480
msgid "A merge operation tried to edit an item."
msgstr "En sammanslagning försökte ändra ett objekt."
-#: ../libsvn_client/conflicts.c:3481
+#: ../libsvn_client/conflicts.c:3482
msgid "A merge operation tried to add an item."
msgstr "En sammanslagning försökte lägga till ett objekt."
-#: ../libsvn_client/conflicts.c:3483
+#: ../libsvn_client/conflicts.c:3484
msgid "A merge operation tried to delete or move an item."
msgstr "En sammanslagning försökte radera eller flytta ett objekt."
-#: ../libsvn_client/conflicts.c:3486
+#: ../libsvn_client/conflicts.c:3487
msgid "A merge operation tried to replace an item."
msgstr "En sammanslagning försökte ersätta ett objekt."
-#: ../libsvn_client/conflicts.c:3502 ../svn/cl-conflicts.c:212
+#: ../libsvn_client/conflicts.c:3503 ../svn/cl-conflicts.c:212
msgid "upon update"
msgstr "vid uppdatering"
-#: ../libsvn_client/conflicts.c:3503 ../svn/cl-conflicts.c:213
+#: ../libsvn_client/conflicts.c:3504 ../svn/cl-conflicts.c:213
msgid "upon switch"
msgstr "vid växling"
-#: ../libsvn_client/conflicts.c:3504 ../svn/cl-conflicts.c:214
+#: ../libsvn_client/conflicts.c:3505 ../svn/cl-conflicts.c:214
msgid "upon merge"
msgstr "vid sammanslagning"
-#: ../libsvn_client/conflicts.c:3505 ../svn/cl-conflicts.c:215
+#: ../libsvn_client/conflicts.c:3506 ../svn/cl-conflicts.c:215
msgid "upon none"
msgstr "vid ingenting"
-#: ../libsvn_client/conflicts.c:3524 ../svn/cl-conflicts.c:127
+#: ../libsvn_client/conflicts.c:3525 ../svn/cl-conflicts.c:127
#: ../svn/cl-conflicts.c:234
msgid "local edit"
msgstr "lokal ändring"
-#: ../libsvn_client/conflicts.c:3527 ../svn/cl-conflicts.c:140
+#: ../libsvn_client/conflicts.c:3528 ../svn/cl-conflicts.c:140
#: ../svn/cl-conflicts.c:237
msgid "local add"
msgstr "lokalt tillägg"
-#: ../libsvn_client/conflicts.c:3530 ../svn/cl-conflicts.c:131
+#: ../libsvn_client/conflicts.c:3531 ../svn/cl-conflicts.c:131
#: ../svn/cl-conflicts.c:240
msgid "local delete"
msgstr "lokal radering"
-#: ../libsvn_client/conflicts.c:3533 ../svn/cl-conflicts.c:129
+#: ../libsvn_client/conflicts.c:3534 ../svn/cl-conflicts.c:129
#: ../svn/cl-conflicts.c:243
msgid "local obstruction"
msgstr "lokal blockering"
-#: ../libsvn_client/conflicts.c:3537 ../svn/cl-conflicts.c:247
+#: ../libsvn_client/conflicts.c:3538 ../svn/cl-conflicts.c:247
#, c-format
msgid "local %s"
msgstr "lokal %s"
-#: ../libsvn_client/conflicts.c:3546 ../svn/cl-conflicts.c:192
+#: ../libsvn_client/conflicts.c:3547 ../svn/cl-conflicts.c:192
#: ../svn/cl-conflicts.c:256
msgid "incoming edit"
msgstr "inkommande ändring"
-#: ../libsvn_client/conflicts.c:3549 ../svn/cl-conflicts.c:194
+#: ../libsvn_client/conflicts.c:3550 ../svn/cl-conflicts.c:194
#: ../svn/cl-conflicts.c:259
msgid "incoming add"
msgstr "inkommande tillägg"
-#: ../libsvn_client/conflicts.c:3552 ../svn/cl-conflicts.c:262
+#: ../libsvn_client/conflicts.c:3553 ../svn/cl-conflicts.c:262
msgid "incoming delete"
msgstr "inkommande radering"
-#: ../libsvn_client/conflicts.c:3556 ../svn/cl-conflicts.c:266
+#: ../libsvn_client/conflicts.c:3557 ../svn/cl-conflicts.c:266
#, c-format
msgid "incoming %s"
msgstr "inkommande %s"
-#: ../libsvn_client/conflicts.c:3564 ../svn/cl-conflicts.c:273
+#: ../libsvn_client/conflicts.c:3565 ../svn/cl-conflicts.c:273
#: ../svn/cl-conflicts.c:326
#, c-format
msgid "%s, %s %s"
msgstr "%s, %s %s"
-#: ../libsvn_client/conflicts.c:3623
+#: ../libsvn_client/conflicts.c:3624
#, c-format
msgid "incoming %s %s"
msgstr "inkommande %s %s"
-#: ../libsvn_client/conflicts.c:3726
+#: ../libsvn_client/conflicts.c:3727
#, c-format
msgid "Directory updated from r%ld to r%ld was replaced with a file by %s in r%ld."
msgstr "Katalog uppdaterad från r%ld till r%ld ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3737 ../libsvn_client/conflicts.c:3817
-#: ../libsvn_client/conflicts.c:4071 ../libsvn_client/conflicts.c:4158
-#: ../libsvn_client/conflicts.c:4458 ../libsvn_client/conflicts.c:4526
+#: ../libsvn_client/conflicts.c:3738 ../libsvn_client/conflicts.c:3818
+#: ../libsvn_client/conflicts.c:4072 ../libsvn_client/conflicts.c:4159
+#: ../libsvn_client/conflicts.c:4459 ../libsvn_client/conflicts.c:4527
#, c-format
msgid ""
"%s\n"
@@ -2326,14 +2344,14 @@ msgstr ""
"%s\n"
"Den ersatta katalogen flyttades till \"^/%s\"."
-#: ../libsvn_client/conflicts.c:3752
+#: ../libsvn_client/conflicts.c:3753
#, c-format
msgid "File updated from r%ld to r%ld was replaced with a file from another line of history by %s in r%ld."
msgstr "Fil uppdaterad från r%ld till r%ld ersattes av en fil från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3764 ../libsvn_client/conflicts.c:3843
-#: ../libsvn_client/conflicts.c:4100 ../libsvn_client/conflicts.c:4186
-#: ../libsvn_client/conflicts.c:4487 ../libsvn_client/conflicts.c:4554
+#: ../libsvn_client/conflicts.c:3765 ../libsvn_client/conflicts.c:3844
+#: ../libsvn_client/conflicts.c:4101 ../libsvn_client/conflicts.c:4187
+#: ../libsvn_client/conflicts.c:4488 ../libsvn_client/conflicts.c:4555
#, c-format
msgid ""
"%s\n"
@@ -2342,14 +2360,14 @@ msgstr ""
"%s\n"
"Den ersatta filen flyttades till \"^/%s\"."
-#: ../libsvn_client/conflicts.c:3778
+#: ../libsvn_client/conflicts.c:3779
#, c-format
msgid "Item updated from r%ld to r%ld was replaced with a file by %s in r%ld."
msgstr "Objekt uppdaterat från r%ld till r%ld ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3788 ../libsvn_client/conflicts.c:3867
-#: ../libsvn_client/conflicts.c:4127 ../libsvn_client/conflicts.c:4213
-#: ../libsvn_client/conflicts.c:4581
+#: ../libsvn_client/conflicts.c:3789 ../libsvn_client/conflicts.c:3868
+#: ../libsvn_client/conflicts.c:4128 ../libsvn_client/conflicts.c:4214
+#: ../libsvn_client/conflicts.c:4582
#, c-format
msgid ""
"%s\n"
@@ -2358,97 +2376,97 @@ msgstr ""
"%s\n"
"Det ersatta objektet flyttades till \"^/%s\"."
-#: ../libsvn_client/conflicts.c:3805
+#: ../libsvn_client/conflicts.c:3806
#, c-format
msgid "Directory updated from r%ld to r%ld was replaced with a directory from another line of history by %s in r%ld."
msgstr "Katalog uppdaterad från r%ld till r%ld ersattes av en katalog från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3832
+#: ../libsvn_client/conflicts.c:3833
#, c-format
msgid "File updated from r%ld to r%ld was replaced with a directory by %s in r%ld."
msgstr "Fil uppdaterad från r%ld till r%ld ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3857
+#: ../libsvn_client/conflicts.c:3858
#, c-format
msgid "Item updated from r%ld to r%ld was replaced by %s in r%ld."
msgstr "Objekt uppdaterat från r%ld till r%ld ersattes av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3890
+#: ../libsvn_client/conflicts.c:3891
#, c-format
msgid "Directory updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
msgstr "Katalog uppdaterad från r%ld till r%ld flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3902
+#: ../libsvn_client/conflicts.c:3903
#, c-format
msgid "Directory updated from r%ld to r%ld was deleted by %s in r%ld."
msgstr "Katalog uppdaterad från r%ld till r%ld raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3918
+#: ../libsvn_client/conflicts.c:3919
#, c-format
msgid "File updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
msgstr "Fil uppdaterad från r%ld till r%ld flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3929
+#: ../libsvn_client/conflicts.c:3930
#, c-format
msgid "File updated from r%ld to r%ld was deleted by %s in r%ld."
msgstr "Fil uppdaterad från r%ld till r%ld raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3943
+#: ../libsvn_client/conflicts.c:3944
#, c-format
msgid "Item updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
msgstr "Objekt uppdaterat från r%ld till r%ld flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3954
+#: ../libsvn_client/conflicts.c:3955
#, c-format
msgid "Item updated from r%ld to r%ld was deleted by %s in r%ld."
msgstr "Objekt uppdaterat från r%ld till r%ld raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3974
+#: ../libsvn_client/conflicts.c:3975
#, c-format
msgid "Directory updated backwards from r%ld to r%ld was a file before the replacement made by %s in r%ld."
msgstr "Katalog uppdaterad bakåt från r%ld till r%ld var en fil före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3981
+#: ../libsvn_client/conflicts.c:3982
#, c-format
msgid "File updated backwards from r%ld to r%ld was a file from another line of history before the replacement made by %s in r%ld."
msgstr "Fil uppdaterad bakåt från r%ld till r%ld var en fil från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3988
+#: ../libsvn_client/conflicts.c:3989
#, c-format
msgid "Item updated backwards from r%ld to r%ld was replaced with a file by %s in r%ld."
msgstr "Objekt uppdaterat bakåt från r%ld till r%ld ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3997
+#: ../libsvn_client/conflicts.c:3998
#, c-format
msgid "Directory updated backwards from r%ld to r%ld was a directory from another line of history before the replacement made by %s in r%ld."
msgstr "Katalog uppdaterad bakåt från r%ld till r%ld var en katalog från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4005
+#: ../libsvn_client/conflicts.c:4006
#, c-format
msgid "File updated backwards from r%ld to r%ld was a directory before the replacement made by %s in r%ld."
msgstr "Fil uppdaterad bakåt från r%ld till r%ld var en katalog före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4011
+#: ../libsvn_client/conflicts.c:4012
#, c-format
msgid "Item updated backwards from r%ld to r%ld was replaced with a directory by %s in r%ld."
msgstr "Objekt uppdaterat bakåt från r%ld till r%ld ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4020
+#: ../libsvn_client/conflicts.c:4021
#, c-format
msgid "Directory updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld."
msgstr "Katalog uppdaterad bakåt från r%ld till r%ld fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4027
+#: ../libsvn_client/conflicts.c:4028
#, c-format
msgid "File updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld."
msgstr "Fil uppdaterad bakåt från r%ld till r%ld fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4033
+#: ../libsvn_client/conflicts.c:4034
#, c-format
msgid "Item updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld."
msgstr "Objekt uppdaterat bakåt från r%ld till r%ld fanns inte innan det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4058
+#: ../libsvn_client/conflicts.c:4059
#, c-format
msgid ""
"Directory switched from\n"
@@ -2463,7 +2481,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4086
+#: ../libsvn_client/conflicts.c:4087
#, c-format
msgid ""
"File switched from\n"
@@ -2478,7 +2496,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4114 ../libsvn_client/conflicts.c:4357
+#: ../libsvn_client/conflicts.c:4115 ../libsvn_client/conflicts.c:4358
#, c-format
msgid ""
"Item switched from\n"
@@ -2493,7 +2511,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4144
+#: ../libsvn_client/conflicts.c:4145
#, c-format
msgid ""
"Directory switched from\n"
@@ -2508,7 +2526,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4173
+#: ../libsvn_client/conflicts.c:4174
#, c-format
msgid ""
"File switched from\n"
@@ -2523,7 +2541,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4200 ../libsvn_client/conflicts.c:4387
+#: ../libsvn_client/conflicts.c:4201 ../libsvn_client/conflicts.c:4388
#, c-format
msgid ""
"Item switched from\n"
@@ -2538,7 +2556,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4236
+#: ../libsvn_client/conflicts.c:4237
#, c-format
msgid ""
"Directory switched from\n"
@@ -2553,7 +2571,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4250
+#: ../libsvn_client/conflicts.c:4251
#, c-format
msgid ""
"Directory switched from\n"
@@ -2568,7 +2586,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4268
+#: ../libsvn_client/conflicts.c:4269
#, c-format
msgid ""
"File switched from\n"
@@ -2583,7 +2601,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4282
+#: ../libsvn_client/conflicts.c:4283
#, c-format
msgid ""
"File switched from\n"
@@ -2598,7 +2616,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4299
+#: ../libsvn_client/conflicts.c:4300
#, c-format
msgid ""
"Item switched from\n"
@@ -2613,7 +2631,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4313
+#: ../libsvn_client/conflicts.c:4314
#, c-format
msgid ""
"Item switched from\n"
@@ -2628,7 +2646,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4338 ../libsvn_client/conflicts.c:4378
+#: ../libsvn_client/conflicts.c:4339 ../libsvn_client/conflicts.c:4379
#, c-format
msgid ""
"Directory switched from\n"
@@ -2643,7 +2661,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"var en fil före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4348
+#: ../libsvn_client/conflicts.c:4349
#, c-format
msgid ""
"File switched from\n"
@@ -2658,7 +2676,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"var en fil från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4368
+#: ../libsvn_client/conflicts.c:4369
#, c-format
msgid ""
"Directory switched from\n"
@@ -2673,7 +2691,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"var en katalog från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4398
+#: ../libsvn_client/conflicts.c:4399
#, c-format
msgid ""
"Directory switched from\n"
@@ -2688,7 +2706,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4408
+#: ../libsvn_client/conflicts.c:4409
#, c-format
msgid ""
"File switched from\n"
@@ -2703,7 +2721,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4417
+#: ../libsvn_client/conflicts.c:4418
#, c-format
msgid ""
"Item switched from\n"
@@ -2718,7 +2736,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4445
+#: ../libsvn_client/conflicts.c:4446
#, c-format
msgid ""
"Directory merged from\n"
@@ -2733,7 +2751,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4473
+#: ../libsvn_client/conflicts.c:4474
#, c-format
msgid ""
"File merged from\n"
@@ -2748,7 +2766,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4499
+#: ../libsvn_client/conflicts.c:4500
#, c-format
msgid ""
"Item merged from\n"
@@ -2763,7 +2781,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4512
+#: ../libsvn_client/conflicts.c:4513
#, c-format
msgid ""
"Directory merged from\n"
@@ -2778,7 +2796,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4541
+#: ../libsvn_client/conflicts.c:4542
#, c-format
msgid ""
"File merged from\n"
@@ -2793,7 +2811,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4568
+#: ../libsvn_client/conflicts.c:4569
#, c-format
msgid ""
"Item merged from\n"
@@ -2808,7 +2826,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4604
+#: ../libsvn_client/conflicts.c:4605
#, c-format
msgid ""
"Directory merged from\n"
@@ -2823,7 +2841,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4618
+#: ../libsvn_client/conflicts.c:4619
#, c-format
msgid ""
"Directory merged from\n"
@@ -2838,7 +2856,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4636
+#: ../libsvn_client/conflicts.c:4637
#, c-format
msgid ""
"File merged from\n"
@@ -2853,7 +2871,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4650
+#: ../libsvn_client/conflicts.c:4651
#, c-format
msgid ""
"File merged from\n"
@@ -2868,7 +2886,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4667
+#: ../libsvn_client/conflicts.c:4668
#, c-format
msgid ""
"Item merged from\n"
@@ -2883,7 +2901,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4681
+#: ../libsvn_client/conflicts.c:4682
#, c-format
msgid ""
"Item merged from\n"
@@ -2898,7 +2916,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4706 ../libsvn_client/conflicts.c:4745
+#: ../libsvn_client/conflicts.c:4707 ../libsvn_client/conflicts.c:4746
#, c-format
msgid ""
"Directory reverse-merged from\n"
@@ -2909,7 +2927,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"till ^/%s@%ld var en fil före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4715
+#: ../libsvn_client/conflicts.c:4716
#, c-format
msgid ""
"File reverse-merged from\n"
@@ -2924,7 +2942,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"var en fil från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4724
+#: ../libsvn_client/conflicts.c:4725
#, c-format
msgid ""
"Item reverse-merged from\n"
@@ -2939,7 +2957,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4735
+#: ../libsvn_client/conflicts.c:4736
#, c-format
msgid ""
"Directory reverse-merged from\n"
@@ -2950,7 +2968,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"till ^/%s@%ld var en katalog från en annan historielinje före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4753
+#: ../libsvn_client/conflicts.c:4754
#, c-format
msgid ""
"Item reverse-merged from\n"
@@ -2965,7 +2983,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4764
+#: ../libsvn_client/conflicts.c:4765
#, c-format
msgid ""
"Directory reverse-merged from\n"
@@ -2976,7 +2994,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"till ^/%s@%ld fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4773
+#: ../libsvn_client/conflicts.c:4774
#, c-format
msgid ""
"File reverse-merged from\n"
@@ -2991,7 +3009,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4782
+#: ../libsvn_client/conflicts.c:4783
#, c-format
msgid ""
"Item reverse-merged from\n"
@@ -3006,52 +3024,52 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5506
+#: ../libsvn_client/conflicts.c:5514
#, c-format
msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld."
msgstr "En ny katalog dök upp under uppdatering till r%ld; den lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5513
+#: ../libsvn_client/conflicts.c:5521
#, c-format
msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld."
msgstr "En ny katalog dök upp under uppdatering till r%ld; den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5518
+#: ../libsvn_client/conflicts.c:5526
#, c-format
msgid "A new directory appeared during update to r%ld; it was deleted by %s in r%ld."
msgstr "En ny katalog dök upp under uppdatering till r%ld; den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5528
+#: ../libsvn_client/conflicts.c:5536
#, c-format
msgid "A new file appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld."
msgstr "En ny fil dök upp under uppdatering till r%ld; den lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5535
+#: ../libsvn_client/conflicts.c:5543
#, c-format
msgid "A new file appeared during update to r%ld; it was added by %s in r%ld."
msgstr "En ny fil dök upp under uppdatering till r%ld; den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5540
+#: ../libsvn_client/conflicts.c:5548
#, c-format
msgid "A new file appeared during update to r%ld; it was deleted by %s in r%ld."
msgstr "En ny katalog dök upp under uppdatering till r%ld; den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5549
+#: ../libsvn_client/conflicts.c:5557
#, c-format
msgid "A new item appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld."
msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5556
+#: ../libsvn_client/conflicts.c:5564
#, c-format
msgid "A new item appeared during update to r%ld; it was added by %s in r%ld."
msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5561
+#: ../libsvn_client/conflicts.c:5569
#, c-format
msgid "A new item appeared during update to r%ld; it was deleted by %s in r%ld."
msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5580
+#: ../libsvn_client/conflicts.c:5588
#, c-format
msgid ""
"A new directory appeared during switch to\n"
@@ -3062,7 +3080,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5588
+#: ../libsvn_client/conflicts.c:5596
#, c-format
msgid ""
"A new directory appeared during switch to\n"
@@ -3073,7 +3091,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5594
+#: ../libsvn_client/conflicts.c:5602
#, c-format
msgid ""
"A new directory appeared during switch to\n"
@@ -3084,7 +3102,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5605
+#: ../libsvn_client/conflicts.c:5613
#, c-format
msgid ""
"A new file appeared during switch to\n"
@@ -3095,7 +3113,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5613
+#: ../libsvn_client/conflicts.c:5621
#, c-format
msgid ""
"A new file appeared during switch to\n"
@@ -3106,7 +3124,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5620
+#: ../libsvn_client/conflicts.c:5628
#, c-format
msgid ""
"A new file appeared during switch to\n"
@@ -3117,7 +3135,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5631
+#: ../libsvn_client/conflicts.c:5639
#, c-format
msgid ""
"A new item appeared during switch to\n"
@@ -3128,7 +3146,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Det lades till av %s i r%ld och raderades senare av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5639
+#: ../libsvn_client/conflicts.c:5647
#, c-format
msgid ""
"A new item appeared during switch to\n"
@@ -3139,7 +3157,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5646
+#: ../libsvn_client/conflicts.c:5654
#, c-format
msgid ""
"A new item appeared during switch to\n"
@@ -3150,7 +3168,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5667
+#: ../libsvn_client/conflicts.c:5675
#, c-format
msgid ""
"A new directory appeared during merge of\n"
@@ -3161,7 +3179,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5673
+#: ../libsvn_client/conflicts.c:5681
#, c-format
msgid ""
"A new directory appeared during merge of\n"
@@ -3172,7 +3190,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5683
+#: ../libsvn_client/conflicts.c:5691
#, c-format
msgid ""
"A new file appeared during merge of\n"
@@ -3183,7 +3201,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5689
+#: ../libsvn_client/conflicts.c:5697
#, c-format
msgid ""
"A new file appeared during merge of\n"
@@ -3194,7 +3212,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5698
+#: ../libsvn_client/conflicts.c:5706
#, c-format
msgid ""
"A new item appeared during merge of\n"
@@ -3205,7 +3223,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5704
+#: ../libsvn_client/conflicts.c:5712
#, c-format
msgid ""
"A new item appeared during merge of\n"
@@ -3216,7 +3234,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5724
+#: ../libsvn_client/conflicts.c:5732
#, c-format
msgid ""
"A new directory appeared during reverse-merge of\n"
@@ -3227,7 +3245,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5731
+#: ../libsvn_client/conflicts.c:5739
#, c-format
msgid ""
"A new directory appeared during reverse-merge of\n"
@@ -3238,7 +3256,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5743
+#: ../libsvn_client/conflicts.c:5751
#, c-format
msgid ""
"A new file appeared during reverse-merge of\n"
@@ -3249,7 +3267,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5750
+#: ../libsvn_client/conflicts.c:5758
#, c-format
msgid ""
"A new file appeared during reverse-merge of\n"
@@ -3260,7 +3278,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5760
+#: ../libsvn_client/conflicts.c:5768
#, c-format
msgid ""
"A new item appeared during reverse-merge of\n"
@@ -3271,7 +3289,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5767
+#: ../libsvn_client/conflicts.c:5775
#, c-format
msgid ""
"A new item appeared during reverse-merge of\n"
@@ -3282,37 +3300,37 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:6081
+#: ../libsvn_client/conflicts.c:6103
#, c-format
msgid "Changes destined for a directory arrived via the following revisions during update from r%ld to r%ld."
msgstr "Ãndringar avsedda för en katalog kom genom följande revisioner under uppdatering frÃ¥n r%ld till r%ld."
-#: ../libsvn_client/conflicts.c:6087
+#: ../libsvn_client/conflicts.c:6109
#, c-format
msgid "Changes destined for a file arrived via the following revisions during update from r%ld to r%ld"
msgstr "Ãndringar avsedda för en fil kom genom följande revisioner under uppdatering frÃ¥n r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:6092
+#: ../libsvn_client/conflicts.c:6114
#, c-format
msgid "Changes from the following revisions arrived during update from r%ld to r%ld"
msgstr "Ãndringar frÃ¥n följande revisioner kom under uppdatering frÃ¥n r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:6100
+#: ../libsvn_client/conflicts.c:6122
#, c-format
msgid "Changes destined for a directory arrived via the following revisions during backwards update from r%ld to r%ld"
msgstr "Ãndringar avsedda för en katalog kom genom följande revisioner under uppdatering bakÃ¥t frÃ¥n r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:6107
+#: ../libsvn_client/conflicts.c:6129
#, c-format
msgid "Changes destined for a file arrived via the following revisions during backwards update from r%ld to r%ld"
msgstr "Ãndringar avsedda för en fil kom genom följande revisioner under uppdatering bakÃ¥t frÃ¥n r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:6113
+#: ../libsvn_client/conflicts.c:6135
#, c-format
msgid "Changes from the following revisions arrived during backwards update from r%ld to r%ld"
msgstr "Ãndringar frÃ¥n följande revisioner kom under uppdatering bakÃ¥t frÃ¥n r%ld till r%ld"
-#: ../libsvn_client/conflicts.c:6127 ../libsvn_client/conflicts.c:6134
+#: ../libsvn_client/conflicts.c:6149 ../libsvn_client/conflicts.c:6156
#, c-format
msgid ""
"Changes destined for a directory arrived via the following revisions during switch to\n"
@@ -3321,7 +3339,7 @@ msgstr ""
"Ãndringar avsedda för en katalog kom genom följande revisioner under växling till\n"
"\"^/%s@r%ld\""
-#: ../libsvn_client/conflicts.c:6140
+#: ../libsvn_client/conflicts.c:6162
#, c-format
msgid ""
"Changes from the following revisions arrived during switch to\n"
@@ -3330,17 +3348,17 @@ msgstr ""
"Ãndringar frÃ¥n följande revisioner kom under växling till\n"
"\"^/%s@r%ld\""
-#: ../libsvn_client/conflicts.c:6158
+#: ../libsvn_client/conflicts.c:6180
msgid " (no revisions found)"
msgstr " (inga revisioner hittade)"
-#: ../libsvn_client/conflicts.c:6186 ../libsvn_client/conflicts.c:6203
-#: ../libsvn_client/conflicts.c:6209
+#: ../libsvn_client/conflicts.c:6208 ../libsvn_client/conflicts.c:6225
+#: ../libsvn_client/conflicts.c:6231
#, c-format
msgid "%s r%ld by %s%s"
msgstr "%s r%ld av %s%s"
-#: ../libsvn_client/conflicts.c:6196
+#: ../libsvn_client/conflicts.c:6218
#, c-format
msgid ""
"%s\n"
@@ -3355,7 +3373,7 @@ msgstr[1] ""
"%s\n"
" [%d revisioner utelämnade],\n"
-#: ../libsvn_client/conflicts.c:6268
+#: ../libsvn_client/conflicts.c:6290
#, c-format
msgid ""
"Changes destined for a directory arrived during merge of\n"
@@ -3364,7 +3382,7 @@ msgstr ""
"Ãndringar avsedda för en katalog kom under sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6275
+#: ../libsvn_client/conflicts.c:6297
#, c-format
msgid ""
"Changes destined for a file arrived during merge of\n"
@@ -3373,7 +3391,7 @@ msgstr ""
"Ãndringar avsedda för en fil kom under sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6281
+#: ../libsvn_client/conflicts.c:6303
#, c-format
msgid ""
"Changes arrived during merge of\n"
@@ -3382,7 +3400,7 @@ msgstr ""
"Ãndringar kom under sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6293
+#: ../libsvn_client/conflicts.c:6315
#, c-format
msgid ""
"Changes destined for a directory arrived via the following revisions during merge of\n"
@@ -3391,7 +3409,7 @@ msgstr ""
"Ãndringar avsedda för en katalog kom genom följande revisioner under sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6300
+#: ../libsvn_client/conflicts.c:6322
#, c-format
msgid ""
"Changes destined for a file arrived via the following revisions during merge of\n"
@@ -3400,7 +3418,7 @@ msgstr ""
"Ãndringar avsedda för en fil kom genom följande revisioner under sammanslagninv av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6306
+#: ../libsvn_client/conflicts.c:6328
#, c-format
msgid ""
"Changes from the following revisions arrived during merge of\n"
@@ -3409,7 +3427,7 @@ msgstr ""
"Ãndringar frÃ¥n följande revisioner kom under sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6318
+#: ../libsvn_client/conflicts.c:6340
#, c-format
msgid ""
"Changes destined for a directory arrived during reverse-merge of\n"
@@ -3418,7 +3436,7 @@ msgstr ""
"Ãndringar avsedda för en katalog kom under omvänd sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6325
+#: ../libsvn_client/conflicts.c:6347
#, c-format
msgid ""
"Changes destined for a file arrived during reverse-merge of\n"
@@ -3427,7 +3445,7 @@ msgstr ""
"Ãndringar kom under omvänd sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6331
+#: ../libsvn_client/conflicts.c:6353
#, c-format
msgid ""
"Changes arrived during reverse-merge of\n"
@@ -3436,7 +3454,7 @@ msgstr ""
"Ãndringar kom under omvänd sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6343
+#: ../libsvn_client/conflicts.c:6365
#, c-format
msgid ""
"Changes destined for a directory arrived via the following revisions during reverse-merge of\n"
@@ -3445,7 +3463,7 @@ msgstr ""
"Ãndringar avsedda för en katalog kom genom följande revisioner under omvänd sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6351
+#: ../libsvn_client/conflicts.c:6373
#, c-format
msgid ""
"Changes destined for a file arrived via the following revisions during reverse-merge of\n"
@@ -3454,7 +3472,7 @@ msgstr ""
"Ãndringar avsedda för en fil kom genom följande revisioner under omvänd sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6359
+#: ../libsvn_client/conflicts.c:6381
#, c-format
msgid ""
"Changes from the following revisions arrived during reverse-merge of\n"
@@ -3463,436 +3481,436 @@ msgstr ""
"Ãndringar frÃ¥n följande revisioner kom under omvänd sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6548
+#: ../libsvn_client/conflicts.c:6620
#, c-format
msgid "Tree conflict on '%s' can only be resolved to the current working copy state"
msgstr "Trädkonflikt på \"%s\" kan endast lösas till tillståndet i nuvarande arbetskopia"
-#: ../libsvn_client/conflicts.c:6732 ../libsvn_client/conflicts.c:6738
+#: ../libsvn_client/conflicts.c:6789 ../libsvn_client/conflicts.c:6795
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected a base node but found none)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (en basnod förväntades men hittades inte)"
-#: ../libsvn_client/conflicts.c:6743 ../libsvn_client/conflicts.c:6769
-#: ../libsvn_client/conflicts.c:6796 ../libsvn_client/conflicts.c:6819
-#: ../libsvn_client/conflicts.c:12541
+#: ../libsvn_client/conflicts.c:6800 ../libsvn_client/conflicts.c:6826
+#: ../libsvn_client/conflicts.c:6853 ../libsvn_client/conflicts.c:6876
+#: ../libsvn_client/conflicts.c:12519
#, c-format
msgid "Unexpected option id '%d'"
msgstr "Oväntad options-ID \"%d\""
-#: ../libsvn_client/conflicts.c:6752 ../libsvn_client/conflicts.c:6761
+#: ../libsvn_client/conflicts.c:6809 ../libsvn_client/conflicts.c:6818
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected base node kind '%s', but found '%s')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (basnodstyp \"%s\" förväntades, men \"%s\" hittades)"
-#: ../libsvn_client/conflicts.c:6777 ../libsvn_client/conflicts.c:6787
+#: ../libsvn_client/conflicts.c:6834 ../libsvn_client/conflicts.c:6844
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected base node from '^/%s@%ld', but found '^/%s@%ld')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (basnod från \"^/%s@%ld\" förväntades, men \"^/%s@%ld\" hittades)"
-#: ../libsvn_client/conflicts.c:6805 ../libsvn_client/conflicts.c:6813
+#: ../libsvn_client/conflicts.c:6862 ../libsvn_client/conflicts.c:6870
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an added item, but the item is not added)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (tillagt objekt förväntades, men objektet är inte tillagt)"
-#: ../libsvn_client/conflicts.c:6997 ../libsvn_client/conflicts.c:8817
+#: ../libsvn_client/conflicts.c:7049 ../libsvn_client/conflicts.c:8837
#, c-format
msgid "If needed, a backup copy of '%s' can be found at '%s'"
msgstr "Vid behov finns en säkerhetskopia av \"%s\" vid \"%s\""
-#: ../libsvn_client/conflicts.c:7859
+#: ../libsvn_client/conflicts.c:7899
#, c-format
msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository"
msgstr "Konfliktlösningsvalet \"%d\" kräver att detaljer om trädkonflikten vid \"%s\" hämtas från arkivet"
-#: ../libsvn_client/conflicts.c:7883
+#: ../libsvn_client/conflicts.c:7923
#, c-format
msgid "Could not determine when '%s' was added to the repository"
msgstr "Kunde inte avgöra när \"%s\" lades till arkivet"
-#: ../libsvn_client/conflicts.c:7898
+#: ../libsvn_client/conflicts.c:7938
#, c-format
msgid "Could not determine when '%s' was deleted from the repository"
msgstr "Kunde inte avgöra när \"%s\" raderades från arkivet"
-#: ../libsvn_client/conflicts.c:8119
+#: ../libsvn_client/conflicts.c:8150
#, c-format
msgid "Could not determine the revision in which '^/%s' was added to the repository.\n"
msgstr "Kunde inte avgöra i vilken revision \"^/%s\" lades till arkivet.\n"
-#: ../libsvn_client/conflicts.c:8215
+#: ../libsvn_client/conflicts.c:8244
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected a copied item, but the item is not a copy)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett kopierat objekt, men objektet är inte en kopia)"
-#: ../libsvn_client/conflicts.c:8226
+#: ../libsvn_client/conflicts.c:8255
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision smaller than r%ld, but the item was copied from r%ld)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från en revision mindre än r%ld, men objektet kopierades från r%ld)"
-#: ../libsvn_client/conflicts.c:8238
+#: ../libsvn_client/conflicts.c:8267
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision larger than r%ld, but the item was copied from r%ld)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från en revision större än r%ld, men objektet kopierades från r%ld)"
-#: ../libsvn_client/conflicts.c:8257
+#: ../libsvn_client/conflicts.c:8286
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s' or from '^/%s' but the item was copied from '^/%s@%ld')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från \"^/%s\" eller från \"^/%s\" men objektet kopierades från \"^/%s@%ld\")"
-#: ../libsvn_client/conflicts.c:8279
+#: ../libsvn_client/conflicts.c:8308
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s', but the item was copied from '^/%s@%ld')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett objekt kopierat från \"^/%s\", men objektet kopierades från \"^/%s@%ld\")"
-#: ../libsvn_client/conflicts.c:8328
+#: ../libsvn_client/conflicts.c:8357
#, c-format
msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository."
msgstr "Konfliktlösningsvalet \"%d\" kräver att detaljer om trädkonflikten vid \"%s\" hämtas från arkivet."
-#: ../libsvn_client/conflicts.c:8338
+#: ../libsvn_client/conflicts.c:8367
#, c-format
msgid "Could not find the revision in which '%s' was deleted from the repository"
msgstr "Kunde inte avgöra i vilken revision \"%s\" raderades från arkivet"
-#: ../libsvn_client/conflicts.c:8363
+#: ../libsvn_client/conflicts.c:8392
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected node kind '%s' but found '%s')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade nodtyp \"%s\" men hittade \"%s\")"
-#: ../libsvn_client/conflicts.c:8533 ../libsvn_client/conflicts.c:8872
-#: ../libsvn_client/conflicts.c:9070 ../libsvn_client/conflicts.c:9218
-#: ../libsvn_client/conflicts.c:9379 ../libsvn_client/conflicts.c:11171
-#: ../libsvn_client/conflicts.c:11381
+#: ../libsvn_client/conflicts.c:8554 ../libsvn_client/conflicts.c:8889
+#: ../libsvn_client/conflicts.c:9083 ../libsvn_client/conflicts.c:9227
+#: ../libsvn_client/conflicts.c:9384 ../libsvn_client/conflicts.c:11157
+#: ../libsvn_client/conflicts.c:11363
#, c-format
msgid "The specified conflict resolution option requires details for tree conflict at '%s' to be fetched from the repository first."
msgstr "Det angivna konfliktlösningsvalet kräver att detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet."
-#: ../libsvn_client/conflicts.c:8540 ../libsvn_client/conflicts.c:8879
-#: ../libsvn_client/conflicts.c:9078 ../libsvn_client/conflicts.c:9226
-#: ../libsvn_client/conflicts.c:11178 ../libsvn_client/conflicts.c:11388
+#: ../libsvn_client/conflicts.c:8561 ../libsvn_client/conflicts.c:8896
+#: ../libsvn_client/conflicts.c:9091 ../libsvn_client/conflicts.c:9235
+#: ../libsvn_client/conflicts.c:11164 ../libsvn_client/conflicts.c:11370
#, c-format
msgid "Invalid operation code '%d' recorded for conflict at '%s'"
msgstr "Ogiltig operationskod \"%d\" registrerad för konflikten vid \"%s\""
-#: ../libsvn_client/conflicts.c:9440
+#: ../libsvn_client/conflicts.c:9444
#, c-format
msgid "Cannot resolve tree conflict on '%s' (expected a copied item at '%s', but the item is not a copy)"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade ett kopierat objekt vid \"%s\", men objektet är inte en kopia)"
-#: ../libsvn_client/conflicts.c:9453
+#: ../libsvn_client/conflicts.c:9457
#, c-format
msgid "Cannot resolve tree conflict on '%s' (could not determine origin of '%s')"
msgstr "Kan inte lösa trädkonflikten på \"%s\" (kunde inte avgöra ursprunget för \"%s\")"
-#: ../libsvn_client/conflicts.c:9642
+#: ../libsvn_client/conflicts.c:9643
#, c-format
msgid "Corresponding working copy node not found for '%s'"
msgstr "Motsvarande nod i arbetskopian fanns ej för \"%s\""
-#: ../libsvn_client/conflicts.c:9964 ../libsvn_client/conflicts.c:10047
-#: ../libsvn_client/conflicts.c:12618
+#: ../libsvn_client/conflicts.c:9950 ../libsvn_client/conflicts.c:10033
+#: ../libsvn_client/conflicts.c:12596
msgid "Postpone"
msgstr "Lös senare"
-#: ../libsvn_client/conflicts.c:9965 ../libsvn_client/conflicts.c:10048
-#: ../libsvn_client/conflicts.c:12619
+#: ../libsvn_client/conflicts.c:9951 ../libsvn_client/conflicts.c:10034
+#: ../libsvn_client/conflicts.c:12597
msgid "skip this conflict and leave it unresolved"
msgstr "hoppa över denna konflikt och lämna den olöst"
-#: ../libsvn_client/conflicts.c:9974 ../libsvn_client/conflicts.c:9995
-#: ../libsvn_client/conflicts.c:10053
+#: ../libsvn_client/conflicts.c:9960 ../libsvn_client/conflicts.c:9981
+#: ../libsvn_client/conflicts.c:10039
msgid "Accept base"
msgstr "Godta basen"
-#: ../libsvn_client/conflicts.c:9975
+#: ../libsvn_client/conflicts.c:9961
msgid "discard local and incoming changes for this binary file"
msgstr "släng bort lokala och inkommande ändringar för denna binärfil"
-#: ../libsvn_client/conflicts.c:9980 ../libsvn_client/conflicts.c:10001
-#: ../libsvn_client/conflicts.c:10059
+#: ../libsvn_client/conflicts.c:9966 ../libsvn_client/conflicts.c:9987
+#: ../libsvn_client/conflicts.c:10045
msgid "Accept incoming"
msgstr "Godta inkommande"
-#: ../libsvn_client/conflicts.c:9981
+#: ../libsvn_client/conflicts.c:9967
msgid "accept incoming version of binary file"
msgstr "godta inkommande version av binärfil"
-#: ../libsvn_client/conflicts.c:9986 ../libsvn_client/conflicts.c:10025
-#: ../libsvn_client/conflicts.c:10065 ../libsvn_client/conflicts.c:10122
+#: ../libsvn_client/conflicts.c:9972 ../libsvn_client/conflicts.c:10011
+#: ../libsvn_client/conflicts.c:10051 ../libsvn_client/conflicts.c:10108
msgid "Mark as resolved"
msgstr "Markera som löst"
-#: ../libsvn_client/conflicts.c:9987
+#: ../libsvn_client/conflicts.c:9973
msgid "accept binary file as it appears in the working copy"
msgstr "godta binärfilen som den är i arbetskopian"
-#: ../libsvn_client/conflicts.c:9996
+#: ../libsvn_client/conflicts.c:9982
msgid "discard local and incoming changes for this file"
msgstr "släng bort lokala och inkommande ändringar för denna fil"
-#: ../libsvn_client/conflicts.c:10002
+#: ../libsvn_client/conflicts.c:9988
msgid "accept incoming version of entire file"
msgstr "godta inkommande version av hela filen"
-#: ../libsvn_client/conflicts.c:10007
+#: ../libsvn_client/conflicts.c:9993
msgid "Reject incoming"
msgstr "Avslå inkommande"
-#: ../libsvn_client/conflicts.c:10008
+#: ../libsvn_client/conflicts.c:9994
msgid "reject all incoming changes for this file"
msgstr "avslå alla inkommande ändringar för denna fil"
-#: ../libsvn_client/conflicts.c:10013 ../libsvn_client/conflicts.c:10071
+#: ../libsvn_client/conflicts.c:9999 ../libsvn_client/conflicts.c:10057
msgid "Accept incoming for conflicts"
msgstr "Godta inkommande för konflikter"
-#: ../libsvn_client/conflicts.c:10014 ../libsvn_client/conflicts.c:10072
+#: ../libsvn_client/conflicts.c:10000 ../libsvn_client/conflicts.c:10058
msgid "accept incoming changes only where they conflict"
msgstr "godta inkommande ändringar bara där konflikter uppstår"
-#: ../libsvn_client/conflicts.c:10019 ../libsvn_client/conflicts.c:10077
+#: ../libsvn_client/conflicts.c:10005 ../libsvn_client/conflicts.c:10063
msgid "Reject conflicts"
msgstr "Avslå konflikter"
-#: ../libsvn_client/conflicts.c:10020
+#: ../libsvn_client/conflicts.c:10006
msgid "reject incoming changes which conflict and accept the rest"
msgstr "avslå inkommande ändringar som orsakar konflikter och godta resten"
-#: ../libsvn_client/conflicts.c:10026
+#: ../libsvn_client/conflicts.c:10012
msgid "accept the file as it appears in the working copy"
msgstr "godta filen som den är i arbetskopian"
-#: ../libsvn_client/conflicts.c:10054
+#: ../libsvn_client/conflicts.c:10040
msgid "discard local and incoming changes for this property"
msgstr "släng bort lokala och inkommande ändringar för denna egenskap"
-#: ../libsvn_client/conflicts.c:10060
+#: ../libsvn_client/conflicts.c:10046
msgid "accept incoming version of entire property value"
msgstr "godta inkommande version av hela egenskapsvärdet"
-#: ../libsvn_client/conflicts.c:10066
+#: ../libsvn_client/conflicts.c:10052
msgid "accept working copy version of entire property value"
msgstr "godta arbetskopians version av hela egenskapsvärdet"
-#: ../libsvn_client/conflicts.c:10078
+#: ../libsvn_client/conflicts.c:10064
msgid "reject changes which conflict and accept the rest"
msgstr "avslå ändringar som orsakar konflikter och godta resten"
-#: ../libsvn_client/conflicts.c:10083
+#: ../libsvn_client/conflicts.c:10069
msgid "Accept merged"
msgstr "Godta sammanslaget"
-#: ../libsvn_client/conflicts.c:10084
+#: ../libsvn_client/conflicts.c:10070
msgid "accept merged version of property value"
msgstr "godta sammanslagen version av egenskapsvärde"
-#: ../libsvn_client/conflicts.c:10123
+#: ../libsvn_client/conflicts.c:10109
msgid "accept current working copy state"
msgstr "godta nuvarande tillstånd i arbetskopia"
-#: ../libsvn_client/conflicts.c:10150
+#: ../libsvn_client/conflicts.c:10136
msgid "Update move destination"
msgstr "Uppdatera flyttmålet"
-#: ../libsvn_client/conflicts.c:10151
+#: ../libsvn_client/conflicts.c:10137
msgid "apply incoming changes to move destination"
msgstr "utför inkommande ändringar på flyttmålet"
-#: ../libsvn_client/conflicts.c:10185
+#: ../libsvn_client/conflicts.c:10171
msgid "Update any moved-away children"
msgstr "Uppdatera bortflyttade barn om sådana finns"
-#: ../libsvn_client/conflicts.c:10186
+#: ../libsvn_client/conflicts.c:10172
msgid "prepare for updating moved-away children, if any"
msgstr "förbered för uppdatering av bortflyttade barn, om sådana finns"
-#: ../libsvn_client/conflicts.c:10231
+#: ../libsvn_client/conflicts.c:10217
#, c-format
msgid "ignore and do not add '^/%s@%ld' here"
msgstr "hoppa över och lägg inte till \"^/%s@%ld\" här"
-#: ../libsvn_client/conflicts.c:10239
+#: ../libsvn_client/conflicts.c:10225
#, c-format
msgid "replace '^/%s@%ld' with the locally added file"
msgstr "ersätt \"^/%s@%ld\" med den lokalt tillagda filen"
-#: ../libsvn_client/conflicts.c:10244
+#: ../libsvn_client/conflicts.c:10230
#, c-format
msgid "replace '^/%s@%ld' with the locally added directory"
msgstr "ersätt \"^/%s@%ld\" med den lokalt tillagda katalogen"
-#: ../libsvn_client/conflicts.c:10250
+#: ../libsvn_client/conflicts.c:10236
#, c-format
msgid "replace '^/%s@%ld' with the locally added item"
msgstr "ersätt \"^/%s@%ld\" med det lokalt tillagda objektet"
-#: ../libsvn_client/conflicts.c:10255
+#: ../libsvn_client/conflicts.c:10241
#, c-format
msgid "unexpected operation code '%d'"
msgstr "oväntad operationskod \"%d\""
-#: ../libsvn_client/conflicts.c:10259
+#: ../libsvn_client/conflicts.c:10245
msgid "Ignore incoming addition"
msgstr "Hoppa över inkommande tillägg"
-#: ../libsvn_client/conflicts.c:10306 ../libsvn_client/conflicts.c:10436
+#: ../libsvn_client/conflicts.c:10292 ../libsvn_client/conflicts.c:10422
#, c-format
msgid "merge '^/%s@%ld' into '%s'"
msgstr "slå samman \"^/%s@%ld\" in i \"%s\""
-#: ../libsvn_client/conflicts.c:10314 ../libsvn_client/conflicts.c:10445
+#: ../libsvn_client/conflicts.c:10300 ../libsvn_client/conflicts.c:10431
#, c-format
msgid "merge local '%s' and '^/%s@%ld'"
msgstr "slå samman lokala \"%s\" och \"^/%s@%ld\""
-#: ../libsvn_client/conflicts.c:10324
+#: ../libsvn_client/conflicts.c:10310
msgid "Merge the files"
msgstr "Slå samman filerna"
-#: ../libsvn_client/conflicts.c:10373
+#: ../libsvn_client/conflicts.c:10359
#, c-format
msgid "delete '%s', copy '^/%s@%ld' here, and merge the files"
msgstr "radera \"%s\", kopiera hit \"^/%s@%ld\", och slå samman filerna"
-#: ../libsvn_client/conflicts.c:10383 ../libsvn_client/conflicts.c:10567
+#: ../libsvn_client/conflicts.c:10369 ../libsvn_client/conflicts.c:10553
msgid "Replace and merge"
msgstr "Ersätt och slå samman"
-#: ../libsvn_client/conflicts.c:10454
+#: ../libsvn_client/conflicts.c:10440
msgid "Merge the directories"
msgstr "Slå samman katalogerna"
-#: ../libsvn_client/conflicts.c:10501
+#: ../libsvn_client/conflicts.c:10487
#, c-format
msgid "delete '%s' and copy '^/%s@%ld' here"
msgstr "radera \"%s\" och kopiera hit \"^/%s@%ld\""
-#: ../libsvn_client/conflicts.c:10510
+#: ../libsvn_client/conflicts.c:10496
msgid "Delete my directory and replace it with incoming directory"
msgstr "Radera min katalog och ersätt den med inkommande katalog"
-#: ../libsvn_client/conflicts.c:10557
+#: ../libsvn_client/conflicts.c:10543
#, c-format
msgid "delete '%s', copy '^/%s@%ld' here, and merge the directories"
msgstr "radera \"%s\", kopiera hit \"^/%s@%ld\", och slå samman katalogerna"
-#: ../libsvn_client/conflicts.c:10637
+#: ../libsvn_client/conflicts.c:10623
#, c-format
msgid "ignore the deletion of '^/%s@%ld'"
msgstr "hoppa över raderingen av \"^/%s@%ld\""
-#: ../libsvn_client/conflicts.c:10642
+#: ../libsvn_client/conflicts.c:10628
msgid "Ignore incoming deletion"
msgstr "Hoppa över inkommande radering"
-#: ../libsvn_client/conflicts.c:10696
+#: ../libsvn_client/conflicts.c:10682
#, c-format
msgid "accept the deletion of '%s'"
msgstr "godta borttagningen av \"%s\""
-#: ../libsvn_client/conflicts.c:10703
+#: ../libsvn_client/conflicts.c:10689
msgid "Accept incoming deletion"
msgstr "Godta inkommande radering"
-#: ../libsvn_client/conflicts.c:10764 ../libsvn_client/conflicts.c:10777
+#: ../libsvn_client/conflicts.c:10750 ../libsvn_client/conflicts.c:10763
#, c-format
msgid "move '%s' to '%s' and merge"
msgstr "flytta \"%s\" till \"%s\" och slå samman"
-#: ../libsvn_client/conflicts.c:10789
+#: ../libsvn_client/conflicts.c:10775
#, c-format
msgid "move and merge local changes from '%s' into '%s'"
msgstr "flytta och slå samman lokala ändringar från \"%s\" till \"%s\""
-#: ../libsvn_client/conflicts.c:10862 ../libsvn_client/conflicts.c:10930
-#: ../libsvn_client/conflicts.c:11820 ../libsvn_client/conflicts.c:11923
+#: ../libsvn_client/conflicts.c:10848 ../libsvn_client/conflicts.c:10916
+#: ../libsvn_client/conflicts.c:11798 ../libsvn_client/conflicts.c:11901
msgid "Move and merge"
msgstr "Flytta och slå samman"
-#: ../libsvn_client/conflicts.c:10994
+#: ../libsvn_client/conflicts.c:10980
#, c-format
msgid "apply changes to move destination '%s'"
msgstr "utför ändringar på flyttmålet \"%s\""
-#: ../libsvn_client/conflicts.c:11007 ../libsvn_client/conflicts.c:11015
+#: ../libsvn_client/conflicts.c:10993 ../libsvn_client/conflicts.c:11001
msgid "Apply to move destination"
msgstr "Utför ändringar på flyttmålet"
-#: ../libsvn_client/conflicts.c:11078 ../libsvn_client/conflicts.c:12465
+#: ../libsvn_client/conflicts.c:11064 ../libsvn_client/conflicts.c:12443
#, c-format
msgid "apply changes to '%s'"
msgstr "utför ändringar på \"%s\""
-#: ../libsvn_client/conflicts.c:11091 ../libsvn_client/conflicts.c:11099
+#: ../libsvn_client/conflicts.c:11077 ../libsvn_client/conflicts.c:11085
msgid "Apply to corresponding local location"
msgstr "Utför ändringar på motsvarande lokalt ställe"
-#: ../libsvn_client/conflicts.c:11672 ../libsvn_client/conflicts.c:11906
+#: ../libsvn_client/conflicts.c:11650 ../libsvn_client/conflicts.c:11884
#, c-format
msgid "apply changes to '%s' and revert addition of '%s'"
msgstr "utför ändringar på \"%s\" och ångra tillägget av \"%s\""
-#: ../libsvn_client/conflicts.c:11686
+#: ../libsvn_client/conflicts.c:11664
#, c-format
msgid "override incoming move and merge incoming changes from '%s' to '%s'"
msgstr "ignorera inkommande flytt och slå samman inkommande ändringar från \"%s\" till \"%s\""
-#: ../libsvn_client/conflicts.c:11737
+#: ../libsvn_client/conflicts.c:11715
#, c-format
msgid "accept incoming move and merge local changes from '%s' to '%s'"
msgstr "acceptera inkommande flytt och slå samman lokala ändringar från \"%s\" till \"%s\""
-#: ../libsvn_client/conflicts.c:11809 ../libsvn_client/conflicts.c:11915
+#: ../libsvn_client/conflicts.c:11787 ../libsvn_client/conflicts.c:11893
msgid "Merge to corresponding local location"
msgstr "Slå samman ändringar på motsvarande lokalt ställe"
-#: ../libsvn_client/conflicts.c:12008 ../libsvn_client/conflicts.c:12028
-#: ../libsvn_client/conflicts.c:12318 ../libsvn_client/conflicts.c:12346
+#: ../libsvn_client/conflicts.c:11986 ../libsvn_client/conflicts.c:12006
+#: ../libsvn_client/conflicts.c:12296 ../libsvn_client/conflicts.c:12324
#, c-format
msgid "Getting a list of possible move targets requires details for tree conflict at '%s' to be fetched from the repository first"
msgstr "För att räkna upp möjliga flyttmål måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet"
-#: ../libsvn_client/conflicts.c:12073 ../libsvn_client/conflicts.c:12480
-#: ../libsvn_client/conflicts.c:12514 ../libsvn_client/conflicts.c:12565
+#: ../libsvn_client/conflicts.c:12051 ../libsvn_client/conflicts.c:12458
+#: ../libsvn_client/conflicts.c:12492 ../libsvn_client/conflicts.c:12543
#, c-format
msgid "Index '%d' is out of bounds of the possible move target list for '%s'"
msgstr "Index \"%d\" är utanför listan av möjliga flyttmål för \"%s\""
-#: ../libsvn_client/conflicts.c:12101
+#: ../libsvn_client/conflicts.c:12079
#, c-format
msgid "Repository path '%s' not found in list of possible move targets for '%s'"
msgstr "Arkivsökvägen \"%s\" fanns inte i listan av möjliga flyttmål för \"%s\""
-#: ../libsvn_client/conflicts.c:12149 ../libsvn_client/conflicts.c:12175
-#: ../libsvn_client/conflicts.c:12440 ../libsvn_client/conflicts.c:12505
-#: ../libsvn_client/conflicts.c:12552
+#: ../libsvn_client/conflicts.c:12127 ../libsvn_client/conflicts.c:12153
+#: ../libsvn_client/conflicts.c:12418 ../libsvn_client/conflicts.c:12483
+#: ../libsvn_client/conflicts.c:12530
#, c-format
msgid "Setting a move target requires details for tree conflict at '%s' to be fetched from the repository first"
msgstr "För att ange ett flyttmål måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet"
-#: ../libsvn_client/conflicts.c:12268
+#: ../libsvn_client/conflicts.c:12246
#, c-format
msgid "Getting a list of possible move siblings requires details for tree conflict at '%s' to be fetched from the repository first"
msgstr "För att få en lista på möjliga syskon att flytta måste detaljer om trädkonflikten vid \"%s\" först hämtas från arkivet"
-#: ../libsvn_client/conflicts.c:12451
+#: ../libsvn_client/conflicts.c:12429
#, c-format
msgid "Index '%d' is out of bounds of the possible move sibling list for '%s'"
msgstr "Index \"%d\" är utanför listan av möjliga syskon att flytta för \"%s\""
-#: ../libsvn_client/conflicts.c:12809 ../libsvn_client/conflicts.c:12858
-#: ../libsvn_client/conflicts.c:12911
+#: ../libsvn_client/conflicts.c:12787 ../libsvn_client/conflicts.c:12836
+#: ../libsvn_client/conflicts.c:12889
#, c-format
msgid "Inapplicable conflict resolution option given for conflicted path '%s'"
msgstr "Ej tillämpbart konfliktlösningsval angivet för konfliktsökväg \"%s\""
-#: ../libsvn_client/conflicts.c:13131
+#: ../libsvn_client/conflicts.c:13109
#, c-format
msgid "Property '%s' is not in conflict."
msgstr "Egenskapen \"%s\" är inte i konflikt"
-#: ../libsvn_client/conflicts.c:13529 ../libsvn_wc/conflicts.c:3327
+#: ../libsvn_client/conflicts.c:13507 ../libsvn_wc/conflicts.c:3327
#, c-format
msgid "Unable to resolve pending conflict on '%s'"
msgstr "Kan inte lösa väntande konflikt på \"%s\""
@@ -3929,7 +3947,7 @@ msgstr "Sökvägen \"%s\" finns men är
#: ../libsvn_client/copy.c:991 ../libsvn_client/copy.c:1708
#: ../libsvn_client/copy.c:2081 ../libsvn_client/import.c:911
-#: ../libsvn_client/mtcc.c:474 ../libsvn_ra_serf/util.c:1918
+#: ../libsvn_client/mtcc.c:474 ../libsvn_ra_serf/util.c:1925
#, c-format
msgid "Path '%s' already exists"
msgstr "Sökvägen \"%s\" finns redan"
@@ -3950,7 +3968,7 @@ msgstr "Katalogen \"%s\" är inte versio
msgid "Path '%s' is not a directory"
msgstr "Sökvägen \"%s\" är ingen katalog"
-#: ../libsvn_client/copy.c:1130 ../libsvn_client/merge.c:10367
+#: ../libsvn_client/copy.c:1130 ../libsvn_client/merge.c:10351
#: ../svnlook/svnlook.c:1445
#, c-format
msgid "Path '%s' does not exist"
@@ -3970,45 +3988,50 @@ msgstr "Käll- och destinations-URL:erna
msgid "Path '%s' does not exist in revision %ld"
msgstr "Sökvägen \"%s\" finns inte i revision %ld"
-#: ../libsvn_client/copy.c:2928 ../libsvn_client/mtcc.c:551
+#: ../libsvn_client/copy.c:2929 ../libsvn_client/mtcc.c:551
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "Sökvägen \"%s\" finns inte i revision %ld"
-#: ../libsvn_client/copy.c:2933
+#: ../libsvn_client/copy.c:2934
#, 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:3041
+#: ../libsvn_client/copy.c:3042
msgid "Cannot mix repository and working copy sources"
msgstr "Kan inte blanda källor från arkiv och arbetskopia"
-#: ../libsvn_client/copy.c:3094
+#: ../libsvn_client/copy.c:3096
+#, c-format
+msgid "Cannot move path '%s' into its own child '%s'"
+msgstr "Kan inte flytta sökvägen \"%s\" till dess eget barn \"%s\""
+
+#: ../libsvn_client/copy.c:3097
#, 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:3130
+#: ../libsvn_client/copy.c:3137
#, c-format
msgid "Cannot move the external at '%s'; please edit the svn:externals property on '%s'."
msgstr "Kan inte flytta externa objektet \"%s\"; var god redigera egenskapen svn:externals på \"%s\"."
-#: ../libsvn_client/copy.c:3145
+#: ../libsvn_client/copy.c:3152
msgid "Moves between the working copy and the repository are not supported"
msgstr "Flytt mellan arbetskopian och arkivet stöds ej"
-#: ../libsvn_client/copy.c:3160
+#: ../libsvn_client/copy.c:3167
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "Kan inte flytta URL:en \"%s\" till sig själv"
-#: ../libsvn_client/copy.c:3161
+#: ../libsvn_client/copy.c:3168
#, 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:3228
+#: ../libsvn_client/copy.c:3235
#, c-format
msgid "'%s' does not have a URL associated with it"
msgstr "\"%s\" verkar inte ha någon URL kopplad till sig"
@@ -4046,74 +4069,48 @@ msgstr "Revisioner (förutom HEAD) kan e
msgid "No commits in repository"
msgstr "Ingenting har arkiverats i arkivet"
-#: ../libsvn_client/deprecated.c:3224 ../libsvn_wc/deprecated.c:4244
+#: ../libsvn_client/deprecated.c:3225 ../libsvn_wc/deprecated.c:4468
msgid "Non-recursive relocation not supported"
msgstr "Icke-rekursiv omlokalisering otillåten"
-#: ../libsvn_client/diff.c:70
-#, c-format
-msgid "Path '%s' must be an immediate child of the directory '%s'"
-msgstr "Sökvägen \"%s\" måste stå omedelbart under katalogen \"%s\""
-
-#: ../libsvn_client/diff.c:293
-#, c-format
-msgid "%s\t(revision %ld)"
-msgstr "%s\t(revision %ld)"
-
-#: ../libsvn_client/diff.c:295
-#, c-format
-msgid "%s\t(nonexistent)"
-msgstr "%s\t(finns ej)"
-
-#. SVN_INVALID_REVNUM
-#: ../libsvn_client/diff.c:297
-#, c-format
-msgid "%s\t(working copy)"
-msgstr "%s\t(arbetskopia)"
-
-#: ../libsvn_client/diff.c:979
-#, c-format
-msgid "Cannot display: file marked as a binary type.%s"
-msgstr "Kan inte visa: filen markerad som binär.%s"
-
-#: ../libsvn_client/diff.c:1475 ../libsvn_client/merge.c:7434
-#: ../libsvn_client/merge.c:10787
+#: ../libsvn_client/diff.c:104 ../libsvn_client/merge.c:7417
+#: ../libsvn_client/merge.c:10773
msgid "Not all required revisions are specified"
msgstr "Alla revisioner som krävs angavs inte"
-#: ../libsvn_client/diff.c:1489
+#: ../libsvn_client/diff.c:118
msgid "At least one revision must be something other than BASE or WORKING when diffing a URL"
msgstr "Ã
tminstone en revision måste vara något annat än BASE eller WORKING för diff av en URL"
-#: ../libsvn_client/diff.c:1526
+#: ../libsvn_client/diff.c:155
#, c-format
msgid "Diff target '%s' was not found in the repository at revision '%ld'"
msgstr "\"%s\" fanns inte i revision %ld i arkivet"
-#: ../libsvn_client/diff.c:1531
+#: ../libsvn_client/diff.c:160
#, c-format
msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
msgstr "\"%s\" fanns inte i revision %ld eller %ld i arkivet"
-#: ../libsvn_client/diff.c:1718
+#: ../libsvn_client/diff.c:347
#, c-format
msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
msgstr "\"%s\" fanns inte i revision %ld och %ld i arkivet"
-#: ../libsvn_client/diff.c:1723
+#: ../libsvn_client/diff.c:352
#, c-format
msgid "Diff targets '%s' and '%s' were not found in the repository at revisions '%ld' and '%ld'"
msgstr "\"%s\" och \"%s\" fanns inte i revision %ld och %ld i arkivet"
-#: ../libsvn_client/diff.c:1822
+#: ../libsvn_client/diff.c:451
msgid "Sorry, svn_client_diff7 was called in a way that is not yet supported"
msgstr "Tyvärr anropades svn_client_diff7 på ett sätt som inte stöds ännu"
-#: ../libsvn_client/diff.c:1864
+#: ../libsvn_client/diff.c:493
msgid "A non-URL diff at this time must be either from a path's base to the same path's working version or between the working versions of two paths"
msgstr "En diff som inte är en URL måste antingen komma från sökvägens bas till samma sökvägs arbetsversion eller mellan två arbetsversioner av två sökvägar"
-#: ../libsvn_client/diff.c:2795 ../libsvn_client/diff.c:2858
+#: ../libsvn_client/diff.c:1265 ../libsvn_client/diff.c:1331
msgid "Cannot ignore properties and show only properties at the same time"
msgstr "Kan inte samtidigt bortse från egenskaper och bara visa egenskaper"
@@ -4122,6 +4119,32 @@ msgstr "Kan inte samtidigt bortse från
msgid "'%s' is not a file or directory"
msgstr "\"%s\" är ingen fil eller katalog"
+#: ../libsvn_client/diff_patch.c:60
+#, c-format
+msgid "Path '%s' must be an immediate child of the directory '%s'"
+msgstr "Sökvägen \"%s\" måste stå omedelbart under katalogen \"%s\""
+
+#: ../libsvn_client/diff_patch.c:261
+#, c-format
+msgid "%s\t(revision %ld)"
+msgstr "%s\t(revision %ld)"
+
+#: ../libsvn_client/diff_patch.c:263
+#, c-format
+msgid "%s\t(nonexistent)"
+msgstr "%s\t(finns ej)"
+
+#. SVN_INVALID_REVNUM
+#: ../libsvn_client/diff_patch.c:265
+#, c-format
+msgid "%s\t(working copy)"
+msgstr "%s\t(arbetskopia)"
+
+#: ../libsvn_client/diff_patch.c:947
+#, c-format
+msgid "Cannot display: file marked as a binary type.%s"
+msgstr "Kan inte visa: filen markerad som binär.%s"
+
#: ../libsvn_client/export.c:102
#, c-format
msgid "'%s' is not a valid EOL value"
@@ -4132,22 +4155,22 @@ msgid "Destination directory exists, and
msgstr "Destinationskatalogen finns och kommer inte att skrivas över om det inte framtvingas"
#: ../libsvn_client/export.c:267 ../libsvn_client/export.c:1525
-#: ../libsvn_wc/adm_crawler.c:1269 ../libsvn_wc/copy.c:651
-#: ../libsvn_wc/crop.c:239 ../libsvn_wc/crop.c:342 ../libsvn_wc/info.c:380
+#: ../libsvn_wc/adm_crawler.c:1291 ../libsvn_wc/copy.c:702
+#: ../libsvn_wc/crop.c:239 ../libsvn_wc/crop.c:342 ../libsvn_wc/info.c:381
#: ../libsvn_wc/node.c:529 ../libsvn_wc/props.c:202 ../libsvn_wc/status.c:2728
-#: ../libsvn_wc/wc_db.c:2166 ../libsvn_wc/wc_db.c:2707
-#: ../libsvn_wc/wc_db.c:2946 ../libsvn_wc/wc_db.c:2979
-#: ../libsvn_wc/wc_db.c:3137 ../libsvn_wc/wc_db.c:4150
-#: ../libsvn_wc/wc_db.c:6451 ../libsvn_wc/wc_db.c:6771
-#: ../libsvn_wc/wc_db.c:7015 ../libsvn_wc/wc_db.c:7155
-#: ../libsvn_wc/wc_db.c:8194 ../libsvn_wc/wc_db.c:9194
-#: ../libsvn_wc/wc_db.c:9926 ../libsvn_wc/wc_db.c:10573
-#: ../libsvn_wc/wc_db.c:10798 ../libsvn_wc/wc_db.c:11174
-#: ../libsvn_wc/wc_db.c:11514 ../libsvn_wc/wc_db.c:12791
-#: ../libsvn_wc/wc_db.c:12860 ../libsvn_wc/wc_db.c:14190
-#: ../libsvn_wc/wc_db.c:14239 ../libsvn_wc/wc_db.c:14360
-#: ../libsvn_wc/wc_db.c:14519 ../libsvn_wc/wc_db.c:14960
-#: ../libsvn_wc/wc_db.c:15824
+#: ../libsvn_wc/wc_db.c:2183 ../libsvn_wc/wc_db.c:2724
+#: ../libsvn_wc/wc_db.c:2963 ../libsvn_wc/wc_db.c:2996
+#: ../libsvn_wc/wc_db.c:3154 ../libsvn_wc/wc_db.c:4167
+#: ../libsvn_wc/wc_db.c:6468 ../libsvn_wc/wc_db.c:6788
+#: ../libsvn_wc/wc_db.c:7032 ../libsvn_wc/wc_db.c:7172
+#: ../libsvn_wc/wc_db.c:8211 ../libsvn_wc/wc_db.c:9211
+#: ../libsvn_wc/wc_db.c:9943 ../libsvn_wc/wc_db.c:10590
+#: ../libsvn_wc/wc_db.c:10815 ../libsvn_wc/wc_db.c:11191
+#: ../libsvn_wc/wc_db.c:11531 ../libsvn_wc/wc_db.c:12808
+#: ../libsvn_wc/wc_db.c:12877 ../libsvn_wc/wc_db.c:14210
+#: ../libsvn_wc/wc_db.c:14259 ../libsvn_wc/wc_db.c:14380
+#: ../libsvn_wc/wc_db.c:14539 ../libsvn_wc/wc_db.c:14980
+#: ../libsvn_wc/wc_db.c:15844
#, c-format
msgid "The node '%s' was not found."
msgstr "Noden \"%s\" kunde inte hittas."
@@ -4176,12 +4199,12 @@ msgstr "\"%s\" finns och är ingen katal
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: ../libsvn_client/export.c:834 ../libsvn_client/repos_diff.c:998
-#: ../libsvn_client/wc_editor.c:538 ../libsvn_fs_fs/dag.c:1107
+#: ../libsvn_client/export.c:834 ../libsvn_client/repos_diff.c:999
+#: ../libsvn_client/wc_editor.c:539 ../libsvn_fs_fs/dag.c:1107
#: ../libsvn_fs_x/dag.c:904 ../libsvn_ra_serf/commit.c:2229
-#: ../libsvn_ra_svn/client.c:1509 ../libsvn_wc/diff_editor.c:2109
-#: ../libsvn_wc/diff_editor.c:2195 ../libsvn_wc/externals.c:711
-#: ../libsvn_wc/update_editor.c:4431
+#: ../libsvn_ra_svn/client.c:1512 ../libsvn_wc/diff_editor.c:2114
+#: ../libsvn_wc/diff_editor.c:2202 ../libsvn_wc/externals.c:714
+#: ../libsvn_wc/update_editor.c:4466
#, c-format
msgid "Checksum mismatch for '%s'"
msgstr "Felaktig kontrollsumma för \"%s\""
@@ -4191,43 +4214,43 @@ msgstr "Felaktig kontrollsumma för \"%s
msgid "The external '%s' defined in %s at '%s' cannot be checked out because '%s' is already a versioned path."
msgstr "Den externa \"%s\" definierad i %s i \"%s\" kan inte checkas ut eftersom \"%s\" redan är versionshanterad."
-#: ../libsvn_client/externals.c:501
+#: ../libsvn_client/externals.c:502
#, c-format
msgid "Cannot insert a file external defined on '%s' into the working copy '%s'."
msgstr "Kan inte skapa en extern fil definierad på \"%s\" i arbetskopian \"%s\""
-#: ../libsvn_client/externals.c:526
+#: ../libsvn_client/externals.c:527
#, c-format
msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'"
msgstr "Den externa filen från \"%s\" kan inte ersätta det befintliga versionshanterade objektet \"%s\""
-#: ../libsvn_client/externals.c:540
+#: ../libsvn_client/externals.c:541
#, c-format
msgid "The file external '%s' can not be created because the node exists."
msgstr "Den externa filen \"%s\" kan inte skapas för noden finns redan."
-#: ../libsvn_client/externals.c:820
+#: ../libsvn_client/externals.c:821
#, c-format
msgid "URL '%s' at revision %ld doesn't exist"
msgstr "URL:en \"%s\" finns inte vid revision %ld"
-#: ../libsvn_client/externals.c:825
+#: ../libsvn_client/externals.c:826
#, c-format
msgid "URL '%s' at revision %ld is not a file or a directory"
msgstr "URL:en \"%s\" vid revision %ld är ingen fil eller katalog"
-#: ../libsvn_client/externals.c:904
+#: ../libsvn_client/externals.c:905
#, c-format
msgid "Unsupported external: URL of file external '%s' is not in repository '%s'"
msgstr "URL:en för den externa filen \"%s\" är inte i arkivet \"%s\""
-#: ../libsvn_client/externals.c:1024 ../libsvn_client/externals.c:1235
-#: ../libsvn_client/wc_editor.c:121 ../libsvn_wc/update_editor.c:1131
+#: ../libsvn_client/externals.c:1025 ../libsvn_client/externals.c:1236
+#: ../libsvn_client/wc_editor.c:121 ../libsvn_wc/update_editor.c:1149
#, c-format
msgid "Path '%s' is not in the working copy"
msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
-#: ../libsvn_client/externals.c:1100
+#: ../libsvn_client/externals.c:1101
#, c-format
msgid "Traversal of '%s' found no ambient depth"
msgstr "Inget omgivande djup hittades i en genomgång av \"%s\""
@@ -4246,9 +4269,10 @@ msgstr "\"%s\" är av en typ som är okÃ
msgid "New entry name required when importing a file"
msgstr "Nytt postnamn krävs vid import av en fil"
-#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3757
-#: ../libsvn_client/patch.c:3769 ../libsvn_wc/delete.c:93
-#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:80
+#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3754
+#: ../libsvn_client/patch.c:3766 ../libsvn_client/patch.c:3819
+#: ../libsvn_wc/delete.c:93 ../libsvn_wc/lock.c:121
+#: ../libsvn_wc/wc_db_wcroot.c:78
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" finns inte"
@@ -4287,8 +4311,8 @@ msgstr "\"%s\" är inte låst i den här
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: ../libsvn_client/locking_commands.c:529 ../libsvn_fs/fs-loader.c:1835
-#: ../libsvn_ra/ra_loader.c:1091
+#: ../libsvn_client/locking_commands.c:529 ../libsvn_fs/fs-loader.c:1847
+#: ../libsvn_ra/ra_loader.c:1094
msgid "Lock comment contains illegal characters"
msgstr "Låskommentaren innehåller otillåtna tecken"
@@ -4320,21 +4344,21 @@ msgstr "De speciella revisionerna PREV,
msgid "Missing required revision specification"
msgstr "Revisionsspecifikation saknas"
-#: ../libsvn_client/merge.c:450
+#: ../libsvn_client/merge.c:434
msgid "In Subversion 1.16 this warning will become a fatal error"
msgstr "I Subversion 1.16 kommer denna varning bli ett stoppande fel"
-#: ../libsvn_client/merge.c:468
+#: ../libsvn_client/merge.c:452
#, c-format
msgid "URL '%s' of '%s' is not in repository '%s'"
msgstr "URL:en \"%s\" för \"%s\" är inte i arkivet \"%s\""
-#: ../libsvn_client/merge.c:503
+#: ../libsvn_client/merge.c:487
#, c-format
msgid "The locations '%s' and '%s' point to repositories with the same repository UUID using different repository root URLs ('%s' and '%s')"
msgstr "Platserna \"%s\" och \"%s\" pekar på arkiv med samma UUID men med olika URL till arkivroten (\"%s\" och \"%s\")"
-#: ../libsvn_client/merge.c:534
+#: ../libsvn_client/merge.c:518
#, c-format
msgid "The locations '%s' and '%s' point to different repositories (root URLs '%s' and '%s', and differing UUIDs)"
msgstr "Platserna \"%s\" och \"%s\" pekar på olika arkiv (URL till arkivrötterna \"%s\" och \"%s\" och olika UUID)"
@@ -4342,26 +4366,26 @@ msgstr "Platserna \"%s\" och \"%s\" peka
#. 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:2191
+#: ../libsvn_client/merge.c:2194
#, c-format
msgid ".working%s%s"
msgstr ".arbetskopia%s%s"
-#: ../libsvn_client/merge.c:2194
+#: ../libsvn_client/merge.c:2197
#, c-format
msgid ".merge-left.r%ld%s%s"
msgstr ".sammanslagning-vänster.r%ld%s%s"
-#: ../libsvn_client/merge.c:2198
+#: ../libsvn_client/merge.c:2201
#, c-format
msgid ".merge-right.r%ld%s%s"
msgstr ".sammanslagning-höger.r%ld%s%s"
-#: ../libsvn_client/merge.c:4942
+#: ../libsvn_client/merge.c:4918
msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
msgstr "Det går inte att göra en omvänd sammanslagning av revisioner från en sökvägs egen framtid; försök att uppdatera först"
-#: ../libsvn_client/merge.c:5663
+#: ../libsvn_client/merge.c:5642
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -4374,92 +4398,92 @@ msgstr ""
"lös alla konflikter och kör om sammanslagningen för att ta hand om\n"
"de återstående revisionerna"
-#: ../libsvn_client/merge.c:6486
+#: ../libsvn_client/merge.c:6465
#, c-format
msgid "Invalid mergeinfo detected on '%s', merge tracking not possible"
msgstr "Ogiltig sammanslagningsinformation (\"mergeinfo\") för \"%s\"; följning av sammanslagning ej möjlig"
-#: ../libsvn_client/merge.c:6637
+#: ../libsvn_client/merge.c:6616
msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
msgstr "Följning av sammanslagning kräver att inga delträd saknas; försök att återställa dessa först:\n"
-#: ../libsvn_client/merge.c:7638
+#: ../libsvn_client/merge.c:7621
#, c-format
msgid "Invalid mergeinfo detected on merge target '%s', merge tracking not possible"
msgstr "Ogiltig sammanslagningsinformation (\"mergeinfo\") för målet \"%s\"; följning av sammanslagning ej möjlig"
-#: ../libsvn_client/merge.c:9953
+#: ../libsvn_client/merge.c:9936
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr "Det går inte att använda två URL:er vid ändring av sammanslagningsinformationen"
-#: ../libsvn_client/merge.c:9960 ../libsvn_client/merge.c:10281
+#: ../libsvn_client/merge.c:9943 ../libsvn_client/merge.c:10265
msgid "Merge from foreign repository is not compatible with mergeinfo modification"
msgstr "Sammanslagning från annat arkiv går inte vid ändring av sammanslagningsinformationen"
-#: ../libsvn_client/merge.c:10374 ../libsvn_client/merge.c:10517
+#: ../libsvn_client/merge.c:10358 ../libsvn_client/merge.c:10501
#, c-format
msgid "Merge target '%s' does not exist in the working copy"
msgstr "Sammanslagningsmålet \"%s\" finns inte i arbetskopian"
-#: ../libsvn_client/merge.c:10397
+#: ../libsvn_client/merge.c:10381
msgid "Cannot determine revision of working copy"
msgstr "Arbetskopians revision kan inte bestämmas"
-#: ../libsvn_client/merge.c:10403
+#: ../libsvn_client/merge.c:10387
#, c-format
msgid "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first"
msgstr "Sammanslagning till en arbetskopia i blandad revision [%ld:%ld] går inte; försök med att uppdatera först"
-#: ../libsvn_client/merge.c:10418
+#: ../libsvn_client/merge.c:10402
msgid "Cannot merge into a working copy with a switched subtree"
msgstr "Kan inte slå samman till en arbetskopia med växlat delträd"
-#: ../libsvn_client/merge.c:10434
+#: ../libsvn_client/merge.c:10418
msgid "Cannot merge into a working copy that has local modifications"
msgstr "Kan inte slå samman till en arbetskopia som har lokala ändringar"
-#: ../libsvn_client/merge.c:10454 ../svn/merge-cmd.c:56
+#: ../libsvn_client/merge.c:10438 ../svn/merge-cmd.c:56
#, c-format
msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)"
msgstr "Ogiltig sammanslagningskälla \"%s\"; en sökväg i en arbetskopia kan bara användas med en arkivrevision (ett nummer, ett datum eller \"HEAD\")"
-#: ../libsvn_client/merge.c:10600
+#: ../libsvn_client/merge.c:10584
msgid "The repository root URLs of the two sources must be identical in a two-URL merge"
msgstr "Arkivrotens URL för de två källorna måste vara identisik i sammanslagning av två URL:er"
-#: ../libsvn_client/merge.c:10605 ../libsvn_ra/ra_loader.c:495
+#: ../libsvn_client/merge.c:10589 ../libsvn_ra/ra_loader.c:498
#, c-format
msgid "'%s' isn't in the same repository as '%s'"
msgstr "\"%s\" är inte i samma arkiv som \"%s\""
-#: ../libsvn_client/merge.c:10611 ../libsvn_client/merge.c:12001
+#: ../libsvn_client/merge.c:10595 ../libsvn_client/merge.c:11987
msgid "The given merge source must have the same repository root URL as the target WC, in the usual case; or, if a foreign repository merge is intended, the repositories must have different root URLs and different UUIDs"
msgstr "Den angivna källan för sammanslagningen måste ha samma URL till arkivroten som mål-arbetskopian (det normala fallet) eller om en sammanslagning med ett främmande arkiv önskas måste arkiven ha olika URL till arkivrötterna och olika UUID"
-#: ../libsvn_client/merge.c:10790 ../svn/merge-cmd.c:123
+#: ../libsvn_client/merge.c:10776 ../svn/merge-cmd.c:123
msgid "Merge sources must both be either paths or URLs"
msgstr "Båda sammanslagningskällorna måste vara antingen sökvägar eller URL:er"
-#: ../libsvn_client/merge.c:11560 ../libsvn_client/merge.c:11722
-#: ../libsvn_client/merge.c:12656
+#: ../libsvn_client/merge.c:11546 ../libsvn_client/merge.c:11708
+#: ../libsvn_client/merge.c:12627
#, c-format
msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr "\"%s@%ld\" måste ha samma ursprung som \"%s@%ld\""
-#: ../libsvn_client/merge.c:11672
+#: ../libsvn_client/merge.c:11658
#, c-format
msgid "Neither the reintegrate source nor target can be the root of the repository"
msgstr "Varken återföreningens källa eller mål kan vara arkivets rot"
-#: ../libsvn_client/merge.c:11682
+#: ../libsvn_client/merge.c:11668
msgid "Reintegrate merge not possible"
msgstr "Ã
terförenande sammanslagning ej möjlig"
-#: ../libsvn_client/merge.c:11752
+#: ../libsvn_client/merge.c:11738
msgid " Missing ranges: "
msgstr " Saknade revisioner: "
-#: ../libsvn_client/merge.c:11755
+#: ../libsvn_client/merge.c:11741
#, c-format
msgid ""
"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n"
@@ -4468,44 +4492,40 @@ msgstr ""
"Ã
terförening kan bara ske om revisionerna %ld till %ld tidigare slogs samman från %s till återföreningens källa, men så är inte fallet:\n"
"%s"
-#: ../libsvn_client/merge.c:11814
+#: ../libsvn_client/merge.c:11800
#, c-format
msgid "Can't reintegrate into '%s' because it is locally added and therefore not related to the merge source"
msgstr "Kan inte återförena in i \"%s\" eftersom den har lagts till lokalt och är därför orelaterad till sammanslagningskällan"
-#: ../libsvn_client/merge.c:11835
+#: ../libsvn_client/merge.c:11821
msgid "The repository root URLs of the source and the target WC must be identical in a reintegrate merge"
msgstr "URL till arkivroten för källan och sammanslagningsmålets arbetskopia måste vara vara identiska i en återförenande sammanslagning"
-#: ../libsvn_client/merge.c:12118
+#: ../libsvn_client/merge.c:12089
msgid "Cannot merge automatically while ignoring mergeinfo"
msgstr "Automatisk sammanslagning ej möjlig utan användning av sammanslagningsinformation"
-#: ../libsvn_client/merge.c:12786
+#: ../libsvn_client/merge.c:12757
#, c-format
msgid "Can't perform automatic merge into '%s' because it is locally added and therefore not related to the merge source"
msgstr "Kan inte göra automatisk sammanslagning in i \"%s\" eftersom den har lagts till lokalt och är därför orelaterad till sammanslagningskällan"
-#: ../libsvn_client/merge.c:12807
+#: ../libsvn_client/merge.c:12778
msgid "The repository root URLs of the source and the target WC must be identical in an automatic merge"
msgstr "URL:en till källans arbetskopierot och sammanslagningsmålets arbetskopia måste vara identiska i en automatisk sammanslagning"
-#: ../libsvn_client/merge.c:12888
+#: ../libsvn_client/merge.c:12859
msgid "The required merge is reintegrate-like, and the record-only option cannot be used with this kind of merge"
msgstr "Sammanslagningen som krävs är en återförening, och väljaren \"record-only\" kan inte användas för den här sortens sammanslagning"
-#: ../libsvn_client/merge.c:12894
+#: ../libsvn_client/merge.c:12865
msgid "The required merge is reintegrate-like, and the depth option cannot be used with this kind of merge"
msgstr "Sammanslagningen som krävs är en återförening, och väljaren för att ange djupet kan inte användas för den här sortens sammanslagning"
-#: ../libsvn_client/merge.c:12900
+#: ../libsvn_client/merge.c:12871
msgid "The required merge is reintegrate-like, and the force_delete option cannot be used with this kind of merge"
msgstr "Sammanslagningen som krävs är en återförening, och väljaren \"force_delete\" kan inte användas för den här sortens sammanslagning"
-#: ../libsvn_client/merge_elements.c:193
-msgid "Merge had conflicts; this is not yet supported"
-msgstr "Sammanslagningen orsakade konflikter; detta hanteras inte än"
-
#: ../libsvn_client/mergeinfo.c:1715
msgid "Only depths 'infinity' and 'empty' are currently supported"
msgstr "Bara djupen \"infinity\" (obegränsat) och \"empty\" (tomt) stöds för närvarande"
@@ -4520,7 +4540,7 @@ msgstr "Kan inte verka på \"%s\" efters
msgid "No origin found for node at '%s'"
msgstr "Inget ursprung hittat för noden i \"%s\""
-#: ../libsvn_client/mtcc.c:359 ../libsvn_repos/commit.c:431
+#: ../libsvn_client/mtcc.c:359 ../libsvn_repos/commit.c:430
#, c-format
msgid "No such revision %ld (HEAD is %ld)"
msgstr "Revisionen %ld finns inte (HEAD är %ld)"
@@ -4541,14 +4561,13 @@ msgid "Can't add file at '%s'"
msgstr "Kan inte lägga till fil i \"%s\""
#: ../libsvn_client/mtcc.c:539 ../libsvn_client/ra.c:718
-#: ../libsvn_delta/branch_repos.c:91 ../libsvn_fs_base/lock.c:274
-#: ../libsvn_fs_fs/fs_fs.c:1507 ../libsvn_fs_fs/lock.c:759
-#: ../libsvn_fs_fs/rev_file.c:177 ../libsvn_fs_fs/rev_file.c:189
-#: ../libsvn_fs_x/fs_x.c:724 ../libsvn_fs_x/lock.c:779
-#: ../libsvn_fs_x/rev_file.c:245 ../libsvn_repos/commit.c:193
-#: ../libsvn_repos/log.c:2362 ../libsvn_repos/log.c:2366
-#: ../libsvn_repos/rev_hunt.c:850 ../libsvn_repos/rev_hunt.c:857
-#: ../libsvn_repos/rev_hunt.c:864
+#: ../libsvn_fs_base/lock.c:274 ../libsvn_fs_fs/fs_fs.c:1507
+#: ../libsvn_fs_fs/lock.c:759 ../libsvn_fs_fs/rev_file.c:177
+#: ../libsvn_fs_fs/rev_file.c:189 ../libsvn_fs_x/fs_x.c:724
+#: ../libsvn_fs_x/lock.c:779 ../libsvn_fs_x/rev_file.c:245
+#: ../libsvn_repos/commit.c:193 ../libsvn_repos/log.c:2362
+#: ../libsvn_repos/log.c:2366 ../libsvn_repos/rev_hunt.c:850
+#: ../libsvn_repos/rev_hunt.c:857 ../libsvn_repos/rev_hunt.c:864
#, c-format
msgid "No such revision %ld"
msgstr "Revisionen %ld finns inte"
@@ -4640,20 +4659,21 @@ msgstr[1] "Kan inte ta bort %u sökvägs
msgid "Invalid patch: specifies contradicting mode changes and %s changes (for '%s')"
msgstr "Ogiltig patch: den anger motstridiga ändringar av filrättigheter och %s (för \"%s\")"
-#: ../libsvn_client/patch.c:3746
+#: ../libsvn_client/patch.c:3743 ../libsvn_client/patch.c:3808
msgid "strip count must be positive"
msgstr "antal sökvägsdelar att ta bort måste vara positivt"
-#: ../libsvn_client/patch.c:3762 ../libsvn_fs_base/tree.c:4112
-#: ../libsvn_fs_base/tree.c:4117 ../libsvn_fs_fs/tree.c:3270
-#: ../libsvn_fs_fs/tree.c:3276 ../libsvn_fs_x/tree.c:2188
-#: ../libsvn_fs_x/tree.c:2194 ../libsvn_ra/compat.c:677
-#: ../libsvn_ra_local/ra_plugin.c:1293
+#: ../libsvn_client/patch.c:3759 ../libsvn_fs_base/tree.c:4113
+#: ../libsvn_fs_base/tree.c:4118 ../libsvn_fs_fs/tree.c:3262
+#: ../libsvn_fs_fs/tree.c:3268 ../libsvn_fs_x/tree.c:2214
+#: ../libsvn_fs_x/tree.c:2220 ../libsvn_ra/compat.c:677
+#: ../libsvn_ra_local/ra_plugin.c:1294
#, c-format
msgid "'%s' is not a file"
msgstr "\"%s\" är ingen fil"
-#: ../libsvn_client/patch.c:3774 ../libsvn_wc/util.c:59
+#: ../libsvn_client/patch.c:3771 ../libsvn_client/patch.c:3824
+#: ../libsvn_wc/util.c:60
#, c-format
msgid "'%s' is not a directory"
msgstr "\"%s\" är ingen katalog"
@@ -4739,7 +4759,7 @@ msgstr "\"%s\" är inte arkivets rot"
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/repos_diff.c:931 ../libsvn_wc/externals.c:629
+#: ../libsvn_client/repos_diff.c:931 ../libsvn_wc/externals.c:630
#, c-format
msgid "Base checksum mismatch for '%s'"
msgstr "Felaktig baskontrollsumma för \"%s\""
@@ -4759,42 +4779,42 @@ msgstr "Sökvägen \"%s\" saknar tidigar
msgid "Unrecognized revision type requested for '%s'"
msgstr "Okänd revisionstyp begärd för \"%s\""
-#: ../libsvn_client/shelf.c:59 ../libsvn_client/shelf2.c:59
+#: ../libsvn_client/shelf.c:62 ../libsvn_client/shelf2.c:62
msgid "Shelf name cannot be the empty string"
msgstr "Hyllnamnet kan inte vara tomma strängen"
-#: ../libsvn_client/shelf.c:87 ../libsvn_client/shelf2.c:87
+#: ../libsvn_client/shelf.c:90 ../libsvn_client/shelf2.c:90
#, c-format
msgid "Shelve: Bad encoded name '%s'"
msgstr "Shelve: Felaktigt kodat namn \"%s\""
-#: ../libsvn_client/shelf.c:592 ../libsvn_client/shelf2.c:1230
+#: ../libsvn_client/shelf.c:595 ../libsvn_client/shelf2.c:1233
#, c-format
msgid "Shelf '%s' not found"
msgstr "Hylla \"%s\" finns inte"
-#: ../libsvn_client/shelf.c:1228 ../libsvn_client/shelf2.c:2077
+#: ../libsvn_client/shelf.c:1232 ../libsvn_client/shelf2.c:2080
#, c-format
msgid "Shelf '%s' version %d not found"
msgstr "Hylla \"%s\" med version %d finns inte"
#. xgettext: the '.working', '.merge-left' and '.merge-right' strings
#. are used to tag onto a file name in case of a merge conflict
-#: ../libsvn_client/shelf2.c:1408 ../libsvn_wc/wc_db_update_move.c:1627
+#: ../libsvn_client/shelf2.c:1411 ../libsvn_wc/wc_db_update_move.c:1671
msgid ".working"
msgstr ".arbetskopia"
-#: ../libsvn_client/shelf2.c:1409
+#: ../libsvn_client/shelf2.c:1412
msgid ".merge-left"
msgstr ".sammanslagning-vänster"
-#: ../libsvn_client/shelf2.c:1410
+#: ../libsvn_client/shelf2.c:1413
msgid ".merge-right"
msgstr ".sammanslagning-höger"
#: ../libsvn_client/status.c:499 ../libsvn_client/status.c:681
#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:858 ../libsvn_wc/lock.c:1544
-#: ../libsvn_wc/wc_db.c:13748 ../libsvn_wc/wc_db_wcroot.c:740
+#: ../libsvn_wc/wc_db.c:13768 ../libsvn_wc/wc_db_wcroot.c:769
#, c-format
msgid "'%s' is not a working copy"
msgstr "\"%s\" är ingen arbetskopia"
@@ -4819,8 +4839,8 @@ msgstr "Kan inte växla \"%s\" eftersom
msgid "Directory '%s' has no URL"
msgstr "Katalogen \"%s\" saknar URL"
-#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:236
-#: ../libsvn_ra_local/ra_plugin.c:326 ../libsvn_wc/update_editor.c:5130
+#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:237
+#: ../libsvn_ra_local/ra_plugin.c:327 ../libsvn_wc/update_editor.c:5165
#, c-format
msgid ""
"'%s'\n"
@@ -4836,39 +4856,19 @@ msgstr ""
msgid "'%s' shares no common ancestry with '%s'"
msgstr "\"%s\" och \"%s\" saknar gemensamt ursprung"
-#: ../libsvn_client/update.c:810
+#: ../libsvn_client/update.c:816
msgid "None of the targets are working copies"
msgstr "Inget av målen är arbetskopior"
-#: ../libsvn_client/util.c:343
+#: ../libsvn_client/upgrade.c:234
#, c-format
-msgid "Cannot mix repository and working copy targets"
-msgstr "Kan inte blanda mål i arkiv och arbetskopia"
-
-#: ../libsvn_delta/branch.c:230
-#, c-format
-msgid "Cannot branch from r%ld %s e%d: branch does not exist"
-msgstr "Kan inte skapa gren från r%ld %s e%d: grenen finns inte"
-
-#: ../libsvn_delta/branch.c:245
-#, c-format
-msgid "Cannot branch from r%ld %s e%d: element does not exist"
-msgstr "Kan inte skapa gren från r%ld %s e%d: elementet finns inte"
-
-#: ../libsvn_delta/branch.c:1003
-#, c-format
-msgid "Cannot set e%d to (parent=e%d, name='%s'): branch root is e%d"
-msgstr "Kan inte sätta e%d till (förälder=e%d, namn=\"%s\"): grenrot är e%d"
-
-#: ../libsvn_delta/branch_nested.c:439
-#, c-format
-msgid "Branch %s not found"
-msgstr "Gren \"%s\" finns inte"
+msgid "Working copy '%s' is already at version %s (format %d) and cannot be downgraded to version %s (format %d)"
+msgstr "Arbetskopian \"%s\" är redan på version %s (format %d) och kan inte nedgraderas till version %s (format %d)"
-#: ../libsvn_delta/branch_repos.c:98
+#: ../libsvn_client/util.c:371
#, c-format
-msgid "Branch %s not found in r%ld"
-msgstr "Gren %s finns inte i r%ld"
+msgid "Cannot mix repository and working copy targets"
+msgstr "Kan inte blanda mål i arkiv och arbetskopia"
#: ../libsvn_delta/svndiff.c:495
#, c-format
@@ -4946,31 +4946,31 @@ msgstr "Oväntad base85-radlängd"
msgid "File '%s' is too large to be read in to memory"
msgstr "Filen \"%s\" är för stor för att läsas in i minnet"
-#: ../libsvn_diff/diff_file.c:1103
+#: ../libsvn_diff/diff_file.c:976
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
msgstr "Filen \"%s\" ändrades oväntat vid diff-beräkning"
-#: ../libsvn_diff/diff_file.c:1280
+#: ../libsvn_diff/diff_file.c:1153
msgid "Error in options to internal diff"
msgstr "Fel i väljare till intern diff-beräkning"
-#: ../libsvn_diff/diff_file.c:1309
+#: ../libsvn_diff/diff_file.c:1182
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "Ogiltigt argument \"%s\" i diff-flaggor"
#. Order of date components can be different in different languages
-#: ../libsvn_diff/diff_file.c:1830
+#: ../libsvn_diff/diff_file.c:1703
msgid "%a %b %e %H:%M:%S %Y"
msgstr "%a %e %b %Y %H:%M:%S"
-#: ../libsvn_diff/diff_file.c:1913 ../libsvn_diff/diff_file.c:1929
+#: ../libsvn_diff/diff_file.c:1786 ../libsvn_diff/diff_file.c:1802
#, c-format
msgid "Path '%s' must be inside the directory '%s'"
msgstr "Sökvägen \"%s\" måste vara inuti katalogen \"%s\""
-#: ../libsvn_diff/diff_file.c:2475
+#: ../libsvn_diff/diff_file.c:2348
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "Kunde inte ta bort minnesmappning \"%s\""
@@ -5021,92 +5021,92 @@ msgstr "\"%s\" finns redan, så den kan
msgid "The filesystem does not support 'absent' nodes"
msgstr "Filsystemet stöder ej \"frånvarande\" noder"
-#: ../libsvn_fs/fs-loader.c:155
+#: ../libsvn_fs/fs-loader.c:167
#, c-format
msgid "Invalid name for FS type '%s'"
msgstr "Ogiltigt namn för filsystemstypen \"%s\""
-#: ../libsvn_fs/fs-loader.c:172 ../libsvn_ra/ra_loader.c:163
-#: ../libsvn_ra/ra_loader.c:176
+#: ../libsvn_fs/fs-loader.c:184 ../libsvn_ra/ra_loader.c:166
+#: ../libsvn_ra/ra_loader.c:179
#, c-format
msgid "'%s' does not define '%s()'"
msgstr "\"%s\" definierar inte \"%s()\""
-#: ../libsvn_fs/fs-loader.c:205
+#: ../libsvn_fs/fs-loader.c:217
#, c-format
msgid "Failed to load module for FS type '%s'"
msgstr "Kunde inte ladda modulen för filsystemstypen \"%s\""
-#: ../libsvn_fs/fs-loader.c:226
+#: ../libsvn_fs/fs-loader.c:238
#, c-format
msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr "Versioner stämmer ej i FS-modulen \"%s\": hittade %d.%d.%d%s, väntade %d.%d.%d%s"
-#: ../libsvn_fs/fs-loader.c:316
+#: ../libsvn_fs/fs-loader.c:328
#, c-format
msgid "Unknown FS type '%s'"
msgstr "Okänd filsystemstyp \"%s\""
-#: ../libsvn_fs/fs-loader.c:465
+#: ../libsvn_fs/fs-loader.c:477
#, c-format
msgid "Path '%s' is not in UTF-8"
msgstr "Sökvägen \"%s\" är inte i UTF-8"
-#: ../libsvn_fs/fs-loader.c:473
+#: ../libsvn_fs/fs-loader.c:485
#, c-format
msgid "Path '%s' contains '.' or '..' element"
msgstr "Sökvägen \"%s\" innehåller elementet \".\" eller \"..\""
-#: ../libsvn_fs/fs-loader.c:485 ../libsvn_fs_fs/tree.c:2501
+#: ../libsvn_fs/fs-loader.c:497 ../libsvn_fs_fs/tree.c:2492
#: ../libsvn_subr/path.c:1240
#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
msgstr "Ogiltigt kontrolltecken \"0x%02x\" i sökvägen \"%s\""
-#: ../libsvn_fs/fs-loader.c:665 ../libsvn_repos/repos.c:1990
+#: ../libsvn_fs/fs-loader.c:677 ../libsvn_repos/repos.c:1990
msgid "Hotcopy source and destination are equal"
msgstr "Samma källa och mål för kopiering under drift"
-#: ../libsvn_fs/fs-loader.c:675
+#: ../libsvn_fs/fs-loader.c:687
#, c-format
msgid "'%s' already exists and is a file"
msgstr "\"%s\" finns redan och är en fil"
-#: ../libsvn_fs/fs-loader.c:680
+#: ../libsvn_fs/fs-loader.c:692
#, c-format
msgid "'%s' already exists and has an unknown node kind"
msgstr "\"%s\" finns redan och har en okänd nodtyp"
-#: ../libsvn_fs/fs-loader.c:698
+#: ../libsvn_fs/fs-loader.c:710
#, c-format
msgid "The filesystem type of the hotcopy source ('%s') does not match the filesystem type of the hotcopy destination ('%s')"
msgstr "Filsystemstypen för källan för kopiering under drift (\"%s\") stämmer inte överens med filsystemstypen för destinationen (\"%s\")"
-#: ../libsvn_fs/fs-loader.c:969 ../libsvn_fs/fs-loader.c:987
+#: ../libsvn_fs/fs-loader.c:981 ../libsvn_fs/fs-loader.c:999
#, c-format
msgid "Attempt to modify internal transaction property '%s'"
msgstr "Försök att ändra intern transaktionsegenskap \"%s\""
-#: ../libsvn_fs/fs-loader.c:1810
+#: ../libsvn_fs/fs-loader.c:1822
#, c-format
msgid "Malformed UUID '%s'"
msgstr "Felaktig UUID \"%s\""
-#: ../libsvn_fs/fs-loader.c:1839
+#: ../libsvn_fs/fs-loader.c:1851
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "Negativt utgångsgdatum till svn_fs_lock"
-#: ../libsvn_fs/fs-loader.c:1854
+#: ../libsvn_fs/fs-loader.c:1866
#, c-format
msgid "Lock token URI '%s' has bad scheme; expected '%s'"
msgstr "Låsidentifieraren med URI \"%s\" har felaktigt schema; väntade \"%s\""
-#: ../libsvn_fs/fs-loader.c:1864
+#: ../libsvn_fs/fs-loader.c:1876
#, c-format
msgid "Lock token '%s' is not ASCII or is a control character at byte %u"
msgstr "Låsidentifieraren \"%s\" är inte ASCII eller är ett styrtecken vid byte %u"
-#: ../libsvn_fs/fs-loader.c:1874
+#: ../libsvn_fs/fs-loader.c:1886
#, c-format
msgid "Lock token URI '%s' is not XML-safe"
msgstr "Låsidentifieraren med URI \"%s\" är inte XML-säker"
@@ -5670,151 +5670,151 @@ msgstr "Ingen post i tabellen \"node-ori
msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'"
msgstr "Ingen post i tabellen \"checksum-reps\" för kontrollsumman \"%s\" i filsystemet \"%s\""
-#: ../libsvn_fs_base/fs.c:87
+#: ../libsvn_fs_base/fs.c:88
#, 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:98
+#: ../libsvn_fs_base/fs.c:99
#, 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:188
+#: ../libsvn_fs_base/fs.c:189
#, 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:615
+#: ../libsvn_fs_base/fs.c:616
#, 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:621
+#: ../libsvn_fs_base/fs.c:622
#, 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:636
+#: ../libsvn_fs_base/fs.c:637
msgid "creating 'nodes' table"
msgstr "skapande av \"nodes\"-tabellen"
-#: ../libsvn_fs_base/fs.c:637
+#: ../libsvn_fs_base/fs.c:638
msgid "opening 'nodes' table"
msgstr "öppning av \"nodes\"-tabellen"
-#: ../libsvn_fs_base/fs.c:642
+#: ../libsvn_fs_base/fs.c:643
msgid "creating 'revisions' table"
msgstr "skapande av \"revisions\"-tabellen"
-#: ../libsvn_fs_base/fs.c:643
+#: ../libsvn_fs_base/fs.c:644
msgid "opening 'revisions' table"
msgstr "öppnande av \"revisions\"-tabellen"
-#: ../libsvn_fs_base/fs.c:648
+#: ../libsvn_fs_base/fs.c:649
msgid "creating 'transactions' table"
msgstr "skapande av \"transactions\"-tabellen"
-#: ../libsvn_fs_base/fs.c:649
+#: ../libsvn_fs_base/fs.c:650
msgid "opening 'transactions' table"
msgstr "öppnande av \"transactions\"-tabellen"
-#: ../libsvn_fs_base/fs.c:654
+#: ../libsvn_fs_base/fs.c:655
msgid "creating 'copies' table"
msgstr "skapande av \"copies\"-tabellen"
-#: ../libsvn_fs_base/fs.c:655
+#: ../libsvn_fs_base/fs.c:656
msgid "opening 'copies' table"
msgstr "öppnande av \"copies\"-tabellen"
-#: ../libsvn_fs_base/fs.c:660
+#: ../libsvn_fs_base/fs.c:661
msgid "creating 'changes' table"
msgstr "skapande av \"changes\"-tabellen"
-#: ../libsvn_fs_base/fs.c:661
+#: ../libsvn_fs_base/fs.c:662
msgid "opening 'changes' table"
msgstr "öppnande av \"changes\"-tabellen"
-#: ../libsvn_fs_base/fs.c:666
+#: ../libsvn_fs_base/fs.c:667
msgid "creating 'representations' table"
msgstr "skapande av \"representations\"-tabellen"
-#: ../libsvn_fs_base/fs.c:667
+#: ../libsvn_fs_base/fs.c:668
msgid "opening 'representations' table"
msgstr "öppnande av \"representations\"-tabellen"
-#: ../libsvn_fs_base/fs.c:672
+#: ../libsvn_fs_base/fs.c:673
msgid "creating 'strings' table"
msgstr "skapande av \"strings\"-tabellen"
-#: ../libsvn_fs_base/fs.c:673
+#: ../libsvn_fs_base/fs.c:674
msgid "opening 'strings' table"
msgstr "öppnande av \"strings\"-tabellen"
-#: ../libsvn_fs_base/fs.c:678
+#: ../libsvn_fs_base/fs.c:679
msgid "creating 'uuids' table"
msgstr "skapande av \"uuids\"-tabellen"
-#: ../libsvn_fs_base/fs.c:679
+#: ../libsvn_fs_base/fs.c:680
msgid "opening 'uuids' table"
msgstr "öppnande av \"uuids\"-tabellen"
-#: ../libsvn_fs_base/fs.c:684
+#: ../libsvn_fs_base/fs.c:685
msgid "creating 'locks' table"
msgstr "skapande av \"locks\"-tabellen"
-#: ../libsvn_fs_base/fs.c:685
+#: ../libsvn_fs_base/fs.c:686
msgid "opening 'locks' table"
msgstr "öppnande av \"locks\"-tabellen"
-#: ../libsvn_fs_base/fs.c:690
+#: ../libsvn_fs_base/fs.c:691
msgid "creating 'lock-tokens' table"
msgstr "skapande av \"lock-tokens\"-tabellen"
-#: ../libsvn_fs_base/fs.c:691
+#: ../libsvn_fs_base/fs.c:692
msgid "opening 'lock-tokens' table"
msgstr "öppnande av \"lock-tokens\"-tabellen"
-#: ../libsvn_fs_base/fs.c:699
+#: ../libsvn_fs_base/fs.c:700
msgid "creating 'node-origins' table"
msgstr "skapande av \"node-origins\"-tabellen"
-#: ../libsvn_fs_base/fs.c:700
+#: ../libsvn_fs_base/fs.c:701
msgid "opening 'node-origins' table"
msgstr "öppnande av \"node-origins\"-tabellen"
-#: ../libsvn_fs_base/fs.c:709
+#: ../libsvn_fs_base/fs.c:710
msgid "creating 'miscellaneous' table"
msgstr "skapande av \"miscellaneous\"-tabellen"
-#: ../libsvn_fs_base/fs.c:710
+#: ../libsvn_fs_base/fs.c:711
msgid "opening 'miscellaneous' table"
msgstr "öppnande av \"miscellaneous\"-tabellen"
-#: ../libsvn_fs_base/fs.c:719
+#: ../libsvn_fs_base/fs.c:720
msgid "creating 'checksum-reps' table"
msgstr "skapande av \"checksum-reps\"-tabellen"
-#: ../libsvn_fs_base/fs.c:720
+#: ../libsvn_fs_base/fs.c:721
msgid "opening 'checksum-reps' table"
msgstr "öppnande av \"checksum-reps\"-tabellen"
-#: ../libsvn_fs_base/fs.c:811
+#: ../libsvn_fs_base/fs.c:812
#, c-format
msgid "The '%s' feature requires version %d of the filesystem schema; filesystem '%s' uses only version %d"
msgstr "Funktionen \"%s\" behöver version %d av filsystemsschemat; filsystemet \"%s\" använder bara version %d"
-#: ../libsvn_fs_base/fs.c:830
+#: ../libsvn_fs_base/fs.c:831
#, 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:1320
+#: ../libsvn_fs_base/fs.c:1321
#, c-format
msgid "BDB repositories do not support incremental hotcopy"
msgstr "BDB-arkiv stöder inte successiv kopiering under drift"
-#: ../libsvn_fs_base/fs.c:1424
+#: ../libsvn_fs_base/fs.c:1425
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -5825,7 +5825,7 @@ msgstr ""
"dåligt med algoritmen för kopiering under drift. Om problemet kvarstår,\n"
"försök med att slå av funktionen i DB_CONFIG"
-#: ../libsvn_fs_base/fs.c:1443
+#: ../libsvn_fs_base/fs.c:1444
msgid ""
"Error running catastrophic recovery on hotcopy; the\n"
"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -5837,11 +5837,11 @@ msgstr ""
"kopiering under drift. Prova med att avaktivera\n"
"denna funktion i DB_CONFIG om problemet kvarstår"
-#: ../libsvn_fs_base/fs.c:1488
+#: ../libsvn_fs_base/fs.c:1489
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:1539
+#: ../libsvn_fs_base/fs.c:1540
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "Versionen för FS-laddaren (%d) stöds ej för bdb"
@@ -5982,7 +5982,7 @@ msgstr "slutförande av Berkeley DB-tran
msgid "Failure opening '%s'"
msgstr "Kan inte öppna \"%s\""
-#: ../libsvn_fs_base/tree.c:1461 ../libsvn_fs_fs/tree.c:1718
+#: ../libsvn_fs_base/tree.c:1461 ../libsvn_fs_fs/tree.c:1686
#: ../libsvn_fs_x/tree.c:602
msgid "Cannot compare property value between two different filesystems"
msgstr "Kan inte jämföra egenskapsvärde mellan två olika filsystem"
@@ -5996,19 +5996,19 @@ msgstr "Trasig databas: felaktigt föreg
msgid "Unexpected immutable node at '%s'"
msgstr "Oväntad icke ändringsbar nod på \"%s\""
-#: ../libsvn_fs_base/tree.c:2075 ../libsvn_fs_fs/tree.c:1748
-#: ../libsvn_fs_x/tree.c:638 ../libsvn_repos/commit.c:1307
+#: ../libsvn_fs_base/tree.c:2075 ../libsvn_fs_fs/tree.c:1716
+#: ../libsvn_fs_x/tree.c:638 ../libsvn_repos/commit.c:1306
#, c-format
msgid "Conflict at '%s'"
msgstr "Konflikt på \"%s\""
#: ../libsvn_fs_base/tree.c:2128 ../libsvn_fs_base/tree.c:2892
-#: ../libsvn_fs_fs/tree.c:1846 ../libsvn_fs_fs/tree.c:2400
-#: ../libsvn_fs_x/tree.c:759 ../libsvn_fs_x/tree.c:1292
+#: ../libsvn_fs_fs/tree.c:1814 ../libsvn_fs_fs/tree.c:2391
+#: ../libsvn_fs_x/tree.c:759 ../libsvn_fs_x/tree.c:1317
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr "Felaktig sammanslagning; ursprung, källa och mål är inte samtliga i samma filsystem"
-#: ../libsvn_fs_base/tree.c:2144 ../libsvn_fs_fs/tree.c:1862
+#: ../libsvn_fs_base/tree.c:2144 ../libsvn_fs_fs/tree.c:1830
#: ../libsvn_fs_x/tree.c:775
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
@@ -6024,39 +6024,39 @@ msgstr "Transaktionen \"%s\" är inaktue
msgid "Cannot deltify revisions prior to r%ld"
msgstr "Kan inte deltifiera revisioner äldre än r%ld"
-#: ../libsvn_fs_base/tree.c:3094 ../libsvn_fs_fs/tree.c:2582
-#: ../libsvn_fs_x/tree.c:1478
+#: ../libsvn_fs_base/tree.c:3094 ../libsvn_fs_fs/tree.c:2573
+#: ../libsvn_fs_x/tree.c:1503
msgid "The root directory cannot be deleted"
msgstr "Rotkatalogen kan inte raderas"
-#: ../libsvn_fs_base/tree.c:3308 ../libsvn_fs_fs/tree.c:2652
-#: ../libsvn_fs_x/tree.c:1548
+#: ../libsvn_fs_base/tree.c:3308 ../libsvn_fs_fs/tree.c:2643
+#: ../libsvn_fs_x/tree.c:1573
#, 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:3317 ../libsvn_fs_fs/tree.c:2659
-#: ../libsvn_fs_x/tree.c:1555
+#: ../libsvn_fs_base/tree.c:3317 ../libsvn_fs_fs/tree.c:2650
+#: ../libsvn_fs_x/tree.c:1580
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:3827 ../libsvn_fs_fs/tree.c:3054
-#: ../libsvn_fs_x/tree.c:1964
+#: ../libsvn_fs_base/tree.c:3827 ../libsvn_fs_fs/tree.c:3045
+#: ../libsvn_fs_x/tree.c:1989
#, c-format
msgid "Base checksum mismatch on '%s'"
msgstr "Felaktig baskontrollsumma för \"%s\""
-#: ../libsvn_fs_base/tree.c:4103 ../libsvn_fs_fs/tree.c:3264
-#: ../libsvn_fs_x/tree.c:2182
+#: ../libsvn_fs_base/tree.c:4104 ../libsvn_fs_fs/tree.c:3256
+#: ../libsvn_fs_x/tree.c:2208
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:5152 ../libsvn_fs_base/tree.c:5331
+#: ../libsvn_fs_base/tree.c:5153 ../libsvn_fs_base/tree.c:5332
#, c-format
msgid "Node-revision '%s' claims to have mergeinfo but doesn't"
msgstr "Nodrevision \"%s\" påstår sig ha sammanslagningsinformation men det har den inte"
-#: ../libsvn_fs_base/tree.c:5190
+#: ../libsvn_fs_base/tree.c:5191
#, c-format
msgid "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not a directory"
msgstr "Nodrevision \"%s\" påstår sig sitta på ett träd med sammanslagningsinformation men är ingen katalog"
@@ -6143,21 +6143,21 @@ msgstr "Tom nodrevision i cache"
msgid "Attempted to update ancestry of non-mutable node"
msgstr "Försök att uppdatera ursprung till icke ändringsbar nod"
-#: ../libsvn_fs_fs/fs.c:101
+#: ../libsvn_fs_fs/fs.c:102
#, c-format
msgid "Can't fetch FSFS shared data"
msgstr "Kan inte hämta delad data i FSFS"
-#: ../libsvn_fs_fs/fs.c:130
+#: ../libsvn_fs_fs/fs.c:131
#, c-format
msgid "Can't store FSFS shared data"
msgstr "Kan inte lagra delad data i FSFS"
-#: ../libsvn_fs_fs/fs.c:641
+#: ../libsvn_fs_fs/fs.c:642
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:704
+#: ../libsvn_fs_fs/fs.c:705
#, c-format
msgid "Unsupported FS loader version (%d) for fsfs"
msgstr "Versionen för FS-laddaren (%d) stöds ej för fsfs"
@@ -6830,31 +6830,31 @@ msgstr "Transaktionen är inaktuell"
msgid "No such transaction '%s'"
msgstr "Transaktionen \"%s\" finns inte"
-#: ../libsvn_fs_fs/tree.c:934
+#: ../libsvn_fs_fs/tree.c:902
#, c-format
msgid "Failure opening '%s' in transaction '%s'"
msgstr "Fel vid öppning av \"%s\" i transaktionen \"%s\""
-#: ../libsvn_fs_fs/tree.c:937
+#: ../libsvn_fs_fs/tree.c:905
#, c-format
msgid "Failure opening '%s' in revision %ld"
msgstr "Kan inte öppna \"%s\" i revision %ld"
-#: ../libsvn_fs_fs/tree.c:2664 ../libsvn_fs_x/tree.c:1560
+#: ../libsvn_fs_fs/tree.c:2655 ../libsvn_fs_x/tree.c:1585
msgid "Copy immutable tree not supported"
msgstr "Kopiering från ej ändringsbart träd stöds ej"
-#: ../libsvn_fs_fs/tree.c:4220 ../libsvn_fs_x/tree.c:2958
+#: ../libsvn_fs_fs/tree.c:4212 ../libsvn_fs_x/tree.c:2984
#, c-format
msgid "Node-revision #'%s' claims to have mergeinfo but doesn't"
msgstr "Nodrevision nr \"%s\" påstår sig ha sammanslagningsinformation men det har den inte"
-#: ../libsvn_fs_fs/tree.c:4335 ../libsvn_fs_x/tree.c:3050
+#: ../libsvn_fs_fs/tree.c:4327 ../libsvn_fs_x/tree.c:3076
#, c-format
msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't"
msgstr "Nodrevision \"%s@%ld\" påstår sig ha sammanslagningsinformation men det har den inte"
-#: ../libsvn_fs_fs/tree.c:4534
+#: ../libsvn_fs_fs/tree.c:4526
#, c-format
msgid "Querying mergeinfo requires version %d of the FSFS filesystem schema; filesystem '%s' uses only version %d"
msgstr "För att begära sammanslagningsinformation krävs version %d av FSFS-filsystemsschemat; filsystemet \"%s\" har bara version %d"
@@ -6955,7 +6955,7 @@ msgstr "Filsystemet redan öppet"
msgid "Can't create fsync thread pool in FSX"
msgstr "Kan inte skapa trådsamling för fsync i FSX"
-#: ../libsvn_fs_x/batch_fsync.c:414 ../svnserve/svnserve.c:1380
+#: ../libsvn_fs_x/batch_fsync.c:414 ../svnserve/svnserve.c:1416
#, c-format
msgid "Can't push task"
msgstr "Kan inte överföra uppgift"
@@ -7004,21 +7004,21 @@ msgstr "Ãndringslistindex %%%s överskr
msgid "Changes list index %u exceeds container size %d"
msgstr "Ãndringslistindex %u överskrider behÃ¥llarstorlek %d"
-#: ../libsvn_fs_x/fs.c:103
+#: ../libsvn_fs_x/fs.c:104
#, c-format
msgid "Can't fetch FSX shared data"
msgstr "Kan inte hämta delad data i FSX"
-#: ../libsvn_fs_x/fs.c:132
+#: ../libsvn_fs_x/fs.c:133
#, c-format
msgid "Can't store FSX shared data"
msgstr "Kan inte lagra delad data i FSX"
-#: ../libsvn_fs_x/fs.c:602
+#: ../libsvn_fs_x/fs.c:603
msgid "Module for working with an experimental (FSX) repository."
msgstr "Modul för att arbeta med ett experimentellt arkiv (FSX)."
-#: ../libsvn_fs_x/fs.c:666
+#: ../libsvn_fs_x/fs.c:667
#, c-format
msgid "Unsupported FS loader version (%d) for fsx"
msgstr "Versionen för FS-laddaren (%d) stöds ej för fsx"
@@ -7121,72 +7121,72 @@ msgstr "Sökvägen \"%s\" finns inte i r
msgid "'%s' in revision %ld is an unrelated object"
msgstr "\"%s\" i revision %ld är ett orelaterat objekt"
-#: ../libsvn_ra/compat.c:845 ../libsvn_ra/ra_loader.c:1317
+#: ../libsvn_ra/compat.c:845 ../libsvn_ra/ra_loader.c:1320
#, c-format
msgid "Invalid peg revision %ld"
msgstr "Ogiltig fixerad revision %ld"
-#: ../libsvn_ra/compat.c:848 ../libsvn_ra/ra_loader.c:1320
+#: ../libsvn_ra/compat.c:848 ../libsvn_ra/ra_loader.c:1323
#: ../libsvn_repos/rev_hunt.c:214 ../libsvn_repos/rev_hunt.c:329
#, c-format
msgid "Invalid end revision %ld"
msgstr "Ogiltig slutrevision %ld"
-#: ../libsvn_ra/compat.c:851 ../libsvn_ra/ra_loader.c:1323
+#: ../libsvn_ra/compat.c:851 ../libsvn_ra/ra_loader.c:1326
msgid "Peg revision must precede end revision"
msgstr "Fixerad revision måste komma före slutrevisionen"
-#: ../libsvn_ra/ra_loader.c:217
+#: ../libsvn_ra/ra_loader.c:220
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
msgstr "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:292
+#: ../libsvn_ra/ra_loader.c:295
#, c-format
msgid "Illegal repository URL '%s'"
msgstr "Ogiltig arkiv-URL \"%s\""
-#: ../libsvn_ra/ra_loader.c:330
+#: ../libsvn_ra/ra_loader.c:333
#, c-format
msgid "Invalid config: unknown HTTP library '%s'"
msgstr "Felaktig konfiguration: okänt HTTP-bibliotek \"%s\""
-#: ../libsvn_ra/ra_loader.c:374
+#: ../libsvn_ra/ra_loader.c:377
#, c-format
msgid "Unrecognized URL scheme for '%s'"
msgstr "Okänt URL-schema för \"%s\""
-#: ../libsvn_ra/ra_loader.c:398
+#: ../libsvn_ra/ra_loader.c:401
#, c-format
msgid "Unable to connect to a repository at URL '%s'"
msgstr "Kunde inte ansluta till ett arkiv vid URL \"%s\""
-#: ../libsvn_ra/ra_loader.c:431
+#: ../libsvn_ra/ra_loader.c:434
#, c-format
msgid "Repository UUID '%s' doesn't match expected UUID '%s'"
msgstr "Arkivets UUID \"%s\" stämmer inte med den förväntade UUID:n \"%s\""
-#: ../libsvn_ra/ra_loader.c:519
+#: ../libsvn_ra/ra_loader.c:522
#, c-format
msgid "'%s' isn't a child of session URL '%s'"
msgstr "\"%s\" är inget barn i sessions-URL:en \"%s\""
-#: ../libsvn_ra/ra_loader.c:535 ../libsvn_ra_svn/client.c:2881
+#: ../libsvn_ra/ra_loader.c:538 ../libsvn_ra_svn/client.c:2884
#, c-format
msgid "'%s' isn't a child of repository root URL '%s'"
msgstr "\"%s\" är inget barn i arkivrots-URL:en \"%s\""
-#: ../libsvn_ra/ra_loader.c:579
+#: ../libsvn_ra/ra_loader.c:582
#, c-format
msgid "Specifying 'old_value_p' is not allowed when the '%s' capability is not advertised, and could indicate a bug in your client"
msgstr "Angivelse av \"old_value_p\" tillåts inte när inte förmågan \"%s\" har annonserats, och kan tyda på ett fel i klienten"
-#: ../libsvn_ra/ra_loader.c:1463
+#: ../libsvn_ra/ra_loader.c:1478
#, c-format
msgid " - handles '%s' scheme\n"
msgstr " - hanterar schemat \"%s\"\n"
-#: ../libsvn_ra/ra_loader.c:1556
+#: ../libsvn_ra/ra_loader.c:1571
#, c-format
msgid "Unrecognized URL scheme '%s'"
msgstr "Okänt URL-schema \"%s\""
@@ -7220,34 +7220,34 @@ msgstr "Det gick inte att ta reda på de
msgid "Couldn't get lock on destination repos after %d attempts"
msgstr "Kunde inte låsa destinationsarkivet efter %d försök"
-#: ../libsvn_ra_local/ra_plugin.c:162
+#: ../libsvn_ra_local/ra_plugin.c:163
msgid "memory-cache-size invalid"
msgstr "ogiltig \"memory-cache-size\""
#. ----------------------------------------------------------------
#. ** The RA vtable routines **
-#: ../libsvn_ra_local/ra_plugin.c:509
+#: ../libsvn_ra_local/ra_plugin.c:510
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:688 ../libsvn_ra_serf/serf.c:828
+#: ../libsvn_ra_local/ra_plugin.c:689 ../libsvn_ra_serf/serf.c:837
#, c-format
msgid "URL '%s' is not a child of the session's repository root URL '%s'"
msgstr "URL:en \"%s\" är inte ett barn av sessionens arkivrots-URL \"%s\""
-#: ../libsvn_ra_local/ra_plugin.c:1288 ../libsvn_ra_local/ra_plugin.c:1743
-#: ../libsvn_ra_serf/util.c:1862 ../svnserve/serve.c:3646
+#: ../libsvn_ra_local/ra_plugin.c:1289 ../libsvn_ra_local/ra_plugin.c:1741
+#: ../libsvn_ra_serf/util.c:1869 ../svnserve/serve.c:3648
#, c-format
msgid "'%s' path not found"
msgstr "Sökvägen \"%s\" finns inte"
-#: ../libsvn_ra_local/ra_plugin.c:1695 ../libsvn_ra_serf/options.c:787
-#: ../libsvn_ra_svn/client.c:3096
+#: ../libsvn_ra_local/ra_plugin.c:1693 ../libsvn_ra_serf/options.c:787
+#: ../libsvn_ra_svn/client.c:3099
#, c-format
msgid "Don't know anything about capability '%s'"
msgstr "Okänd förmåga \"%s\""
-#: ../libsvn_ra_local/ra_plugin.c:1949
+#: ../libsvn_ra_local/ra_plugin.c:1980
#, 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"
@@ -7265,7 +7265,7 @@ msgstr "Inget \"Location\"-huvud mottage
msgid "Error parsing Location header value"
msgstr "Syntaxfel i \"Location\"-huvudets värde"
-#: ../libsvn_ra_serf/commit.c:487 ../libsvn_repos/commit.c:554
+#: ../libsvn_ra_serf/commit.c:487 ../libsvn_repos/commit.c:553
#, c-format
msgid "Path '%s' not present"
msgstr "Sökvägen \"%s\" finns inte"
@@ -7311,7 +7311,7 @@ msgstr "Servern stöder ej funktionalite
msgid "The REPORT response did not include the requested properties"
msgstr "REPORT-svaret innehöll inte de efterfrågade egenskaperna"
-#: ../libsvn_ra_serf/inherited_props.c:169 ../libsvn_ra_serf/property.c:264
+#: ../libsvn_ra_serf/inherited_props.c:168 ../libsvn_ra_serf/property.c:264
#: ../libsvn_ra_serf/update.c:1749
#, c-format
msgid "Got unrecognized encoding '%s'"
@@ -7347,7 +7347,7 @@ msgstr "Sökvägen \"%s\" är redan lås
msgid "'%s' is not locked in the repository"
msgstr "\"%s\" är inte låst i arkivet"
-#: ../libsvn_ra_serf/log.c:574 ../libsvn_ra_svn/client.c:1949
+#: ../libsvn_ra_serf/log.c:574 ../libsvn_ra_svn/client.c:1952
msgid "Server does not support custom revprops via log"
msgstr "Servern stöder ej anpassade revisionsegenskaper via loggning"
@@ -7401,12 +7401,12 @@ msgstr "OPTIONS-svaret innehöll inte de
msgid "Location header not set on redirect response"
msgstr "Platshuvud inte satt i omriktningssvar"
-#: ../libsvn_ra_serf/options.c:613 ../libsvn_ra_serf/util.c:1853
+#: ../libsvn_ra_serf/options.c:613 ../libsvn_ra_serf/util.c:1860
#, c-format
msgid "Repository moved permanently to '%s'"
msgstr "Arkivet har permanent flyttats till \"%s\""
-#: ../libsvn_ra_serf/options.c:614 ../libsvn_ra_serf/util.c:1854
+#: ../libsvn_ra_serf/options.c:614 ../libsvn_ra_serf/util.c:1861
#, c-format
msgid "Repository moved temporarily to '%s'"
msgstr "Arkivet har tillfälligt flyttats till \"%s\""
@@ -7445,11 +7445,11 @@ msgstr "Fel vid skrivning till ström: o
msgid "Failed to read the request"
msgstr "Kunde inte läsa förfrågan"
-#: ../libsvn_ra_serf/serf.c:63
+#: ../libsvn_ra_serf/serf.c:64
msgid "Module for accessing a repository via WebDAV protocol using serf."
msgstr "Modul för åtkomst av arkiv via protokollet WebDAV med hjälp av serf."
-#: ../libsvn_ra_serf/serf.c:66
+#: ../libsvn_ra_serf/serf.c:67
#, c-format
msgid ""
"Module for accessing a repository via WebDAV protocol using serf.\n"
@@ -7458,48 +7458,48 @@ msgstr ""
"Modul för åtkomst av arkiv via protokollet WebDAV med hjälp av serf.\n"
" - använder serv %d.%d.%d (kompilerad med %d.%d.%d)"
-#: ../libsvn_ra_serf/serf.c:135
+#: ../libsvn_ra_serf/serf.c:136
#, c-format
msgid "Invalid config: unknown %s '%s'"
msgstr "Felaktig konfiguration: okänd %s \"%s\""
-#: ../libsvn_ra_serf/serf.c:370
+#: ../libsvn_ra_serf/serf.c:379
#, c-format
msgid "invalid config: bad value for '%s' option"
msgstr "ogiltig konfiguration: felaktigt värde för valet\"%s\""
-#: ../libsvn_ra_serf/serf.c:383
+#: ../libsvn_ra_serf/serf.c:392
msgid "Invalid URL: illegal character in proxy port number"
msgstr "Felaktig URL: ogiltigt tecken i proxy-portnummer"
-#: ../libsvn_ra_serf/serf.c:387
+#: ../libsvn_ra_serf/serf.c:396
msgid "Invalid URL: negative proxy port number"
msgstr "Felaktig URL: negativt proxy-portnummer"
-#: ../libsvn_ra_serf/serf.c:390
+#: ../libsvn_ra_serf/serf.c:399
msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535"
msgstr "Felaktig URL: portnummer för proxy större än det högsta TCP-portnumret 65535"
-#: ../libsvn_ra_serf/serf.c:410
+#: ../libsvn_ra_serf/serf.c:419
#, c-format
msgid "Could not resolve proxy server '%s'"
msgstr "Kunde inte slå upp proxy-servern \"%s\""
-#: ../libsvn_ra_serf/serf.c:611
+#: ../libsvn_ra_serf/serf.c:620
#, c-format
msgid "Connection to '%s' failed"
msgstr "Anslutning till \"%s\" misslyckades"
-#: ../libsvn_ra_serf/serf.c:1020
+#: ../libsvn_ra_serf/serf.c:1029
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_serf/serf.c:1099
+#: ../libsvn_ra_serf/serf.c:1109
#, 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/serf.c:1113
+#: ../libsvn_ra_serf/serf.c:1123
#, c-format
msgid "ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d library"
msgstr "ra_serf är kompilerad för serf %d.%d.%d men läste in ett inkompatibelt bibliotek med version %d.%d.%d"
@@ -7530,48 +7530,48 @@ msgstr "REPORT-svaret innehöll inte det
msgid "Missing update-report close tag"
msgstr "Slutmärke för \"update-report\" saknas"
-#: ../libsvn_ra_serf/util.c:197
+#: ../libsvn_ra_serf/util.c:198
msgid ": "
msgstr ": "
-#: ../libsvn_ra_serf/util.c:199
+#: ../libsvn_ra_serf/util.c:200
msgid ", "
msgstr ", "
-#: ../libsvn_ra_serf/util.c:409
+#: ../libsvn_ra_serf/util.c:410
msgid "Server SSL certificate verification failed"
msgstr "Kontroll av SSL-certifikat misslyckades"
-#: ../libsvn_ra_serf/util.c:414
+#: ../libsvn_ra_serf/util.c:415
msgid "certificate is not yet valid"
msgstr "certifikatet är inte giltigt än"
-#: ../libsvn_ra_serf/util.c:417
+#: ../libsvn_ra_serf/util.c:418
msgid "certificate has expired"
msgstr "certifikatet har gått ut"
-#: ../libsvn_ra_serf/util.c:421
+#: ../libsvn_ra_serf/util.c:422
msgid "certificate issued for a different hostname"
msgstr "certifikatet utfärdades för ett annat värddatornamn"
-#: ../libsvn_ra_serf/util.c:425
+#: ../libsvn_ra_serf/util.c:426
msgid "issuer is not trusted"
msgstr "utfärdaren är inte betrodd"
-#: ../libsvn_ra_serf/util.c:428
+#: ../libsvn_ra_serf/util.c:429
msgid "and other reason(s)"
msgstr "och andra orsaker"
-#: ../libsvn_ra_serf/util.c:475
+#: ../libsvn_ra_serf/util.c:476
#, c-format
msgid "Invalid config: unable to load certificate file '%s'"
msgstr "Felaktig konfiguration: kan inte ladda certifikatfilen \"%s\""
-#: ../libsvn_ra_serf/util.c:958 ../libsvn_ra_serf/util.c:961
+#: ../libsvn_ra_serf/util.c:963 ../libsvn_ra_serf/util.c:966
msgid "Error running context"
msgstr "Fel vid körning av kontext"
-#: ../libsvn_ra_serf/util.c:1231
+#: ../libsvn_ra_serf/util.c:1238
msgid ""
"No more credentials or we tried too many times.\n"
"Authentication failed"
@@ -7579,85 +7579,85 @@ msgstr ""
"Inga fler klientreferenser eller så försökte vi för många gånger.\n"
"Autentisering misslyckades"
-#: ../libsvn_ra_serf/util.c:1253
+#: ../libsvn_ra_serf/util.c:1260
msgid "Proxy authentication failed"
msgstr "Proxy-autentisering misslyckades"
-#: ../libsvn_ra_serf/util.c:1308
+#: ../libsvn_ra_serf/util.c:1315
#, c-format
msgid "%s request on '%s' failed"
msgstr "%s-förfrågan på \"%s\" misslyckades"
-#: ../libsvn_ra_serf/util.c:1384
+#: ../libsvn_ra_serf/util.c:1391
#, c-format
msgid "Premature EOF seen from server (http status=%d)"
msgstr "För tidigt filslut från server (HTTP-felkod %d)"
-#: ../libsvn_ra_serf/util.c:1752
+#: ../libsvn_ra_serf/util.c:1759
msgid "The PROPFIND response did not include the requested version-controlled-configuration value"
msgstr "PROPFIND-svaret innehöll inte det efterfrågade värdet på \"version-controlled-configuration\""
-#: ../libsvn_ra_serf/util.c:1858
+#: ../libsvn_ra_serf/util.c:1865
#, c-format
msgid "Access to '%s' forbidden"
msgstr "Ã
tkomst till \"%s\" ej tillåten"
-#: ../libsvn_ra_serf/util.c:1865
+#: ../libsvn_ra_serf/util.c:1872
#, c-format
msgid "HTTP method is not allowed on '%s'"
msgstr "HTTP-metod inte tillåten för \"%s\""
-#: ../libsvn_ra_serf/util.c:1869
+#: ../libsvn_ra_serf/util.c:1876
#, c-format
msgid "'%s' conflicts"
msgstr "\"%s\" orsakar konflikt"
-#: ../libsvn_ra_serf/util.c:1872
+#: ../libsvn_ra_serf/util.c:1879
#, c-format
msgid "Precondition on '%s' failed"
msgstr "Förhandsvillkor för \"%s\" misslyckades"
-#: ../libsvn_ra_serf/util.c:1875
+#: ../libsvn_ra_serf/util.c:1882
#, c-format
msgid "'%s': no lock token available"
msgstr "\"%s\": ingen låsidentifierare tillgänglig"
-#: ../libsvn_ra_serf/util.c:1879
+#: ../libsvn_ra_serf/util.c:1886
#, c-format
msgid "DAV request failed: 411 Content length required. The server or an intermediate proxy does not accept chunked encoding. Try setting 'http-chunked-requests' to 'auto' or 'no' in your client configuration."
msgstr "DAV-begäran misslyckades: 411, innehållslängd krävs. Servern eller en mellanliggande proxy godtar inte styckvis kodning. Försök med att sätta \"http-chunked-requests\" till \"auto\" eller \"no\" i klientinställningarna."
-#: ../libsvn_ra_serf/util.c:1885
+#: ../libsvn_ra_serf/util.c:1892
#, c-format
msgid "Unexpected server error %d '%s' on '%s'"
msgstr "Oväntat serverfel %d \"%s\" för \"%s\""
-#: ../libsvn_ra_serf/util.c:1889
+#: ../libsvn_ra_serf/util.c:1896
#, c-format
msgid "The requested feature is not supported by '%s'"
msgstr "Den begärda funktionen stöds inte av \"%s\""
-#: ../libsvn_ra_serf/util.c:1895
+#: ../libsvn_ra_serf/util.c:1902
#, c-format
msgid "Unexpected HTTP status %d '%s' on '%s'"
msgstr "Oväntat HTTP-fel %d \"%s\" för \"%s\""
-#: ../libsvn_ra_serf/util.c:1914
+#: ../libsvn_ra_serf/util.c:1921
#, c-format
msgid "Path '%s' unexpectedly created"
msgstr "Sökvägen \"%s\" skapades oväntat"
-#: ../libsvn_ra_serf/util.c:1923
+#: ../libsvn_ra_serf/util.c:1930
#, c-format
msgid "The HTTP method '%s' is not allowed on '%s'"
msgstr "HTTP-metoden \"%s\" tillåts inte för \"%s\""
-#: ../libsvn_ra_serf/util.c:1928
+#: ../libsvn_ra_serf/util.c:1935
#, c-format
msgid "Unexpected HTTP status %d '%s' on '%s' request to '%s'"
msgstr "Oväntat HTTP-fel %d \"%s\" för \"%s\" vid begäran till \"%s\""
-#: ../libsvn_ra_serf/util.c:2031
+#: ../libsvn_ra_serf/util.c:2038
#, c-format
msgid "Illegal URL '%s'"
msgstr "Otillåten URL \"%s\""
@@ -7690,68 +7690,68 @@ msgstr "XML-attributet \"%s\" på elemen
msgid "The XML response contains invalid XML"
msgstr "XML-svaret innehåller ogiltig XML"
-#: ../libsvn_ra_svn/client.c:144
+#: ../libsvn_ra_svn/client.c:145
#, c-format
msgid "Unknown hostname '%s'"
msgstr "Okänt värdnamn \"%s\""
-#: ../libsvn_ra_svn/client.c:169
+#: ../libsvn_ra_svn/client.c:170
#, c-format
msgid "Can't connect to host '%s'"
msgstr "Kan inte ansluta till värden \"%s\""
-#: ../libsvn_ra_svn/client.c:207
+#: ../libsvn_ra_svn/client.c:208
msgid "Prop diffs element not a list"
msgstr "Element med egenskapsskillnader är ingen lista"
-#: ../libsvn_ra_svn/client.c:407
+#: ../libsvn_ra_svn/client.c:408
#, c-format
msgid "Undefined tunnel scheme '%s'"
msgstr "Odefinierat tunnelschema \"%s\""
-#: ../libsvn_ra_svn/client.c:424
+#: ../libsvn_ra_svn/client.c:425
#, 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:435
+#: ../libsvn_ra_svn/client.c:436
#, c-format
msgid "Can't tokenize command '%s'"
msgstr "Kan inte dela upp kommandosträngen \"%s\""
-#: ../libsvn_ra_svn/client.c:478
+#: ../libsvn_ra_svn/client.c:479
#, c-format
msgid "Error in child process: %s"
msgstr "Fel i barnprocess: %s"
-#: ../libsvn_ra_svn/client.c:557
+#: ../libsvn_ra_svn/client.c:558
msgid "To better debug SSH connection problems, remove the -q option from 'ssh' in the [tunnels] section of your Subversion configuration file."
msgstr "För att kunna felsöka problem med SSH-anslutningar bättre, ta bort väljaren -q från \"ssh\" i sektionen \"[tunnels] \" i konfigurationsfilen för Subversion."
-#: ../libsvn_ra_svn/client.c:575
+#: ../libsvn_ra_svn/client.c:576
#, c-format
msgid "Illegal svn repository URL '%s'"
msgstr "Ogiltig svn-arkiv-URL \"%s\""
-#: ../libsvn_ra_svn/client.c:732
+#: ../libsvn_ra_svn/client.c:733
#, c-format
msgid "Server requires minimum version %d"
msgstr "Servern kräver minst version %d"
-#: ../libsvn_ra_svn/client.c:736
+#: ../libsvn_ra_svn/client.c:737
#, c-format
msgid "Server only supports versions up to %d"
msgstr "Servern stöder bara versioner till och med %d"
-#: ../libsvn_ra_svn/client.c:744
+#: ../libsvn_ra_svn/client.c:745
msgid "Server does not support edit pipelining"
msgstr "Servern stöder ej \"edit pipelining\""
-#: ../libsvn_ra_svn/client.c:782
+#: ../libsvn_ra_svn/client.c:783
msgid "Impossibly long repository root from server"
msgstr "För lång arkivrot från servern"
-#: ../libsvn_ra_svn/client.c:794
+#: ../libsvn_ra_svn/client.c:795
msgid ""
"Module for accessing a repository using the svn network protocol.\n"
" - with Cyrus SASL authentication"
@@ -7759,163 +7759,163 @@ msgstr ""
"Modul för åtkomst av ett arkiv över nätverk via protokollet svn.\n"
" - med Cyrus-SASL-autentisering"
-#: ../libsvn_ra_svn/client.c:798
+#: ../libsvn_ra_svn/client.c:799
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:883
+#: ../libsvn_ra_svn/client.c:884
#, c-format
msgid "Invalid host '%s'"
msgstr "Ogiltig värddator \"%s\""
-#: ../libsvn_ra_svn/client.c:1212
+#: ../libsvn_ra_svn/client.c:1213
msgid "Server did not send repository root"
msgstr "Servern skickade ingen arkivrot"
-#: ../libsvn_ra_svn/client.c:1288
+#: ../libsvn_ra_svn/client.c:1289
#, c-format
msgid "ra_svn does not support not specifying a log message with pre-1.5 servers; consider passing an empty one, or upgrading the server"
msgstr "ra_svn stöder inte att ett loggmeddelande anges med en server äldre än 1.5; använd ett tomt loggmeddelande eller uppgradera servern"
-#: ../libsvn_ra_svn/client.c:1311
+#: ../libsvn_ra_svn/client.c:1312
msgid "Server doesn't support setting arbitrary revision properties during commit"
msgstr "Servern stöder inte att godtyckliga revisionsegenskaper sätts under arkivering"
-#: ../libsvn_ra_svn/client.c:1413
+#: ../libsvn_ra_svn/client.c:1414
msgid "Inherited proplist element not a list"
msgstr "Element i ärvda egenskaper är ingen lista"
-#: ../libsvn_ra_svn/client.c:1487
+#: ../libsvn_ra_svn/client.c:1488
msgid "Non-string as part of file contents"
msgstr "Icke-sträng var del av filinnehåll"
-#: ../libsvn_ra_svn/client.c:1595
+#: ../libsvn_ra_svn/client.c:1598
msgid "Dirlist element not a list"
msgstr "Element med kataloglista är ingen lista"
-#: ../libsvn_ra_svn/client.c:1604
+#: ../libsvn_ra_svn/client.c:1607
#, c-format
msgid "Invalid directory entry name '%s'"
msgstr "Ogiltigt katalogpostnamn \"%s\""
-#: ../libsvn_ra_svn/client.c:1689
+#: ../libsvn_ra_svn/client.c:1692
msgid "Mergeinfo element is not a list"
msgstr "Element för sammanslagningsinformation är ej en lista"
-#: ../libsvn_ra_svn/client.c:1937
+#: ../libsvn_ra_svn/client.c:1940
msgid "Log entry not a list"
msgstr "Loggposten är ej en lista"
-#: ../libsvn_ra_svn/client.c:1984
+#: ../libsvn_ra_svn/client.c:1987
msgid "Changed-path entry not a list"
msgstr "Post med ändrade sökvägar är ingen lista"
-#: ../libsvn_ra_svn/client.c:2151
+#: ../libsvn_ra_svn/client.c:2154
msgid "'stat' not implemented"
msgstr "\"stat\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:2213
+#: ../libsvn_ra_svn/client.c:2216
msgid "'get-locations' not implemented"
msgstr "\"get-locations\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:2230
+#: ../libsvn_ra_svn/client.c:2233
msgid "Location entry not a list"
msgstr "Post med information om plats är ingen lista"
-#: ../libsvn_ra_svn/client.c:2274
+#: ../libsvn_ra_svn/client.c:2277
msgid "'get-location-segments' not implemented"
msgstr "\"get-location-segments\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:2291
+#: ../libsvn_ra_svn/client.c:2294
msgid "Location segment entry not a list"
msgstr "Post med information om segmentplats är ingen lista"
-#: ../libsvn_ra_svn/client.c:2301
+#: ../libsvn_ra_svn/client.c:2304
msgid "Expected valid revision range"
msgstr "Väntade ett giltigt revisionsnummerintervall"
-#: ../libsvn_ra_svn/client.c:2374
+#: ../libsvn_ra_svn/client.c:2377
msgid "'get-file-revs' not implemented"
msgstr "\"get-file-revs\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:2398
+#: ../libsvn_ra_svn/client.c:2401
msgid "Revision entry not a list"
msgstr "Revisionsposten är ej en lista"
-#: ../libsvn_ra_svn/client.c:2415 ../libsvn_ra_svn/client.c:2445
+#: ../libsvn_ra_svn/client.c:2418 ../libsvn_ra_svn/client.c:2448
msgid "Text delta chunk not a string"
msgstr "Textdeltadel är inte en sträng"
-#: ../libsvn_ra_svn/client.c:2457
+#: ../libsvn_ra_svn/client.c:2460
msgid "The get-file-revs command didn't return any revisions"
msgstr "Kommandot get-file-revs returnerade inga revisioner"
-#: ../libsvn_ra_svn/client.c:2504
+#: ../libsvn_ra_svn/client.c:2507
msgid "Server doesn't support the lock command"
msgstr "Servern stöder ej lock-kommandot"
-#: ../libsvn_ra_svn/client.c:2568
+#: ../libsvn_ra_svn/client.c:2571
msgid "Server doesn't support the unlock command"
msgstr "Servern stöder ej unlock-kommandot"
-#: ../libsvn_ra_svn/client.c:2667
+#: ../libsvn_ra_svn/client.c:2670
msgid "Lock response not a list"
msgstr "Svar på lock-kommandot är ingen lista"
-#: ../libsvn_ra_svn/client.c:2680
+#: ../libsvn_ra_svn/client.c:2683
msgid "Unknown status for lock command"
msgstr "Okänd statusindikering för lock-kommandot"
-#: ../libsvn_ra_svn/client.c:2704
+#: ../libsvn_ra_svn/client.c:2707
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:2795
+#: ../libsvn_ra_svn/client.c:2798
msgid "Unlock response not a list"
msgstr "Svar på unlock-kommandot är ingen lista"
-#: ../libsvn_ra_svn/client.c:2808
+#: ../libsvn_ra_svn/client.c:2811
msgid "Unknown status for unlock command"
msgstr "Okänd statusindikation för unlock-kommandot"
-#: ../libsvn_ra_svn/client.c:2831
+#: ../libsvn_ra_svn/client.c:2834
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:2856 ../libsvn_ra_svn/client.c:2909
+#: ../libsvn_ra_svn/client.c:2859 ../libsvn_ra_svn/client.c:2912
msgid "Server doesn't support the get-lock command"
msgstr "Servern stöder ej get-lock-kommandot"
-#: ../libsvn_ra_svn/client.c:2923
+#: ../libsvn_ra_svn/client.c:2926
msgid "Lock element not a list"
msgstr "Element med lås är ingen lista"
-#: ../libsvn_ra_svn/client.c:2969
+#: ../libsvn_ra_svn/client.c:2972
msgid "Server doesn't support the replay command"
msgstr "Servern stöder ej replay-kommandot"
-#: ../libsvn_ra_svn/client.c:3003
+#: ../libsvn_ra_svn/client.c:3006
msgid "Server doesn't support the replay-range command"
msgstr "Servern stöder ej replay-range-kommandot"
-#: ../libsvn_ra_svn/client.c:3026
+#: ../libsvn_ra_svn/client.c:3029
#, c-format
msgid "Expected 'revprops', found '%s'"
msgstr "Väntade \"revprops\", hittade \"%s\""
-#: ../libsvn_ra_svn/client.c:3044
+#: ../libsvn_ra_svn/client.c:3047
msgid "Error while replaying commit"
msgstr "Fel vid uppspelning av arkivering"
-#: ../libsvn_ra_svn/client.c:3121
+#: ../libsvn_ra_svn/client.c:3124
msgid "'get-deleted-rev' not implemented"
msgstr "\"get-deleted-rev\" ej implementerat"
-#: ../libsvn_ra_svn/client.c:3239
+#: ../libsvn_ra_svn/client.c:3242
msgid "List entry not a list"
msgstr "Listposten är ej en lista"
-#: ../libsvn_ra_svn/client.c:3326
+#: ../libsvn_ra_svn/client.c:3358
#, 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"
@@ -8179,17 +8179,17 @@ msgstr "Ignorerar åtkomstpost för tom
msgid "'%s' is out of date"
msgstr "\"%s\" är inaktuell"
-#: ../libsvn_repos/commit.c:322
+#: ../libsvn_repos/commit.c:321
#, 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:354
+#: ../libsvn_repos/commit.c:353
#, c-format
msgid "Source url '%s' is from different repository"
msgstr "Käll-URL:en \"%s\" är från ett annat arkiv"
-#: ../libsvn_repos/commit.c:693
+#: ../libsvn_repos/commit.c:692
#, c-format
msgid ""
"Checksum mismatch for resulting fulltext\n"
@@ -8198,15 +8198,15 @@ msgstr ""
"Kontrollsumma fel för resulterande fulltext\n"
"(\"%s\")"
-#: ../libsvn_repos/commit.c:743
+#: ../libsvn_repos/commit.c:742
msgid "(no error)"
msgstr "(inget fel)"
-#: ../libsvn_repos/commit.c:774 ../libsvn_repos/commit.c:780
+#: ../libsvn_repos/commit.c:773 ../libsvn_repos/commit.c:779
msgid "post-commit hook failed with no error message."
msgstr "Krokskriptet efter arkivering (\"post-commit\") misslyckades utan något felmeddelande."
-#: ../libsvn_repos/commit.c:783
+#: ../libsvn_repos/commit.c:782
#, c-format
msgid ""
"post commit FS processing had error:\n"
@@ -8217,11 +8217,11 @@ msgstr ""
"%s\n"
"%s"
-#: ../libsvn_repos/commit.c:784 ../libsvn_repos/commit.c:793
+#: ../libsvn_repos/commit.c:783 ../libsvn_repos/commit.c:792
msgid "(no error message)"
msgstr "(inget felmeddelande)"
-#: ../libsvn_repos/commit.c:791
+#: ../libsvn_repos/commit.c:790
#, c-format
msgid ""
"post commit FS processing had error:\n"
@@ -8230,8 +8230,8 @@ msgstr ""
"filsystemsbearbetning efter arkiveringen (post-commit) slog fel:\n"
"%s"
-#: ../libsvn_repos/commit.c:1318 ../libsvn_repos/fs-wrap.c:120
-#: ../libsvn_repos/load-fs-vtable.c:1145
+#: ../libsvn_repos/commit.c:1317 ../libsvn_repos/fs-wrap.c:120
+#: ../libsvn_repos/load-fs-vtable.c:1148
msgid "Commit succeeded, but post-commit hook failed"
msgstr "Arkiveringen lyckades, men krokskriptet efter arkivering (\"post-commit\") misslyckades"
@@ -8546,12 +8546,12 @@ msgstr ""
msgid "Path '%s' not found"
msgstr "Sökvägen \"%s\" finns inte"
-#: ../libsvn_repos/load-fs-vtable.c:607 ../svnrdump/load_editor.c:492
+#: ../libsvn_repos/load-fs-vtable.c:610 ../svnrdump/load_editor.c:492
#, c-format
msgid "Relative source revision %ld is not available in current repository"
msgstr "Den relativa källrevisionen %ld är inte tillgänglig i nuvarande arkiv"
-#: ../libsvn_repos/load-fs-vtable.c:621
+#: ../libsvn_repos/load-fs-vtable.c:624
#, c-format
msgid ""
"Copy source checksum mismatch on copy from '%s'@%ld\n"
@@ -8560,20 +8560,20 @@ msgstr ""
"Felaktig kontrollsumma för källan i kopiering från \"%s\"@%ld\n"
"till \"%s\" i revision baserad på r%ld"
-#: ../libsvn_repos/load-fs-vtable.c:677
+#: ../libsvn_repos/load-fs-vtable.c:680
msgid "Malformed dumpstream: Revision 0 must not contain node records"
msgstr "Felaktig dumpström: revision 0 får ej innehålla nodposter"
-#: ../libsvn_repos/load-fs-vtable.c:693
+#: ../libsvn_repos/load-fs-vtable.c:696
#, c-format
msgid "Unrecognized node-action on node '%s'"
msgstr "Okänd nodåtgärd på noden \"%s\""
-#: ../libsvn_repos/load-fs-vtable.c:862 ../svnrdump/load_editor.c:628
+#: ../libsvn_repos/load-fs-vtable.c:865 ../svnrdump/load_editor.c:628
msgid "Invalid svn:mergeinfo value"
msgstr "Ogiltigt värde för svn:mergeinfo"
-#: ../libsvn_repos/load-fs-vtable.c:871
+#: ../libsvn_repos/load-fs-vtable.c:874
msgid "Invalid svn:mergeinfo value; leaving unchanged"
msgstr "Ogiltigt värde för svn:mergeinfo; ej ändrat"
@@ -8635,52 +8635,52 @@ msgstr "Sökvägen \"%s\" i filsystemet
msgid "Root directory already exists."
msgstr "Rotkatalogen finns redan."
-#: ../libsvn_repos/reporter.c:205
+#: ../libsvn_repos/reporter.c:206
#, c-format
msgid "Invalid length (%%%s) when about to read a string"
msgstr "Ogiltig längd (%%%s) när en sträng skulle läsas"
-#: ../libsvn_repos/reporter.c:270
+#: ../libsvn_repos/reporter.c:271
#, c-format
msgid "Invalid depth (%c) for path '%s'"
msgstr "Ogiltigt djup (%c) för sökväg \"%s\""
-#: ../libsvn_repos/reporter.c:952
+#: ../libsvn_repos/reporter.c:953
#, 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:1378
+#: ../libsvn_repos/reporter.c:1379
msgid "Not authorized to open root of edit operation"
msgstr "Ej behörig att öppna editeringens rot"
-#: ../libsvn_repos/reporter.c:1395
+#: ../libsvn_repos/reporter.c:1396
#, c-format
msgid "Target path '%s' does not exist"
msgstr "Målsökvägen \"%s\" finns inte"
-#: ../libsvn_repos/reporter.c:1403
+#: ../libsvn_repos/reporter.c:1404
msgid "Cannot replace a directory from within"
msgstr "Kan inte ersätta en katalog från inuti sig själv"
-#: ../libsvn_repos/reporter.c:1443
+#: ../libsvn_repos/reporter.c:1444
msgid "Invalid report for top level of working copy"
msgstr "Ogiltig rapport arbetskopians toppnivå"
-#: ../libsvn_repos/reporter.c:1458
+#: ../libsvn_repos/reporter.c:1459
msgid "Two top-level reports with no target"
msgstr "Två toppnivårapporter utan mål"
-#: ../libsvn_repos/reporter.c:1520
+#: ../libsvn_repos/reporter.c:1521
#, c-format
msgid "Unsupported report depth '%s'"
msgstr "Rapportdjupet \"%s\" stöds inte"
-#: ../libsvn_repos/reporter.c:1550
+#: ../libsvn_repos/reporter.c:1551
msgid "Depth 'exclude' not supported for link"
msgstr "Djupet \"exclude\" stöds ej för länkar"
-#: ../libsvn_repos/reporter.c:1608
+#: ../libsvn_repos/reporter.c:1609
msgid "Request depth 'exclude' not supported"
msgstr "Efterfrågedjup \"exclude\" stöds ej"
@@ -8937,52 +8937,63 @@ msgstr "Felaktig syntax för argumentet
msgid "Unrecognized file in argument of %s"
msgstr "Okänd fil i argumentet till %s"
-#: ../libsvn_subr/cmdline.c:1341
+#: ../libsvn_subr/cmdline.c:1234 ../svnrdump/svnrdump.c:950
+msgid "--non-interactive and --force-interactive are mutually exclusive"
+msgstr "--non-interactive och --force-interactive kan inte användas samtidigt"
+
+#: ../libsvn_subr/cmdline.c:1287 ../svn/svn.c:2771
+#, c-format
+msgid ""
+"Unknown value '%s' for %s.\n"
+"Supported values: %s"
+msgstr ""
+"Okänt värde \"%s\" för %s.\n"
+"Tillåtna värden: %s"
+
+#: ../libsvn_subr/cmdline.c:1340
+msgid "Caught signal"
+msgstr "FÃ¥ngade signal"
+
+#: ../libsvn_subr/cmdline.c:1421 ../libsvn_subr/cmdline.c:1426
+#: ../libsvn_subr/cmdline.c:1435 ../libsvn_subr/cmdline.c:1440
+#: ../libsvn_subr/utf.c:1259 ../libsvn_subr/utf.c:1269
+#, c-format
+msgid "Conversion from UTF-16 failed"
+msgstr "Konvertering från UTF-16 misslyckades"
+
+#: ../libsvn_subr/cmdline_editor.c:147
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 "Någon av omgivningsvariablerna EDITOR, SVN_EDITOR eller VISUAL eller inställningen \"editor-cmd\" saknar innehåll eller består enbart av tomrum. Ett skalkommando förväntades."
-#: ../libsvn_subr/cmdline.c:1348
+#: ../libsvn_subr/cmdline_editor.c:154
msgid "None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no 'editor-cmd' run-time configuration option was found"
msgstr "Ingen av omgivningsvariablerna SVN_EDITOR, VISUAL eller EDITOR är satt och ingen \"editor-cmd\"-inställning hittades"
-#: ../libsvn_subr/cmdline.c:1469 ../libsvn_subr/cmdline.c:1572
+#: ../libsvn_subr/cmdline_editor.c:275 ../libsvn_subr/cmdline_editor.c:378
#, c-format
msgid "Can't get working directory"
msgstr "Kan inte erhålla aktuell katalog"
-#: ../libsvn_subr/cmdline.c:1480 ../libsvn_subr/cmdline.c:1583
-#: ../libsvn_subr/cmdline.c:1608
+#: ../libsvn_subr/cmdline_editor.c:286 ../libsvn_subr/cmdline_editor.c:389
+#: ../libsvn_subr/cmdline_editor.c:414
#, c-format
msgid "Can't change working directory to '%s'"
msgstr "Kan inte byta aktuell katalog till \"%s\""
-#: ../libsvn_subr/cmdline.c:1498 ../libsvn_subr/cmdline.c:1752
+#: ../libsvn_subr/cmdline_editor.c:304 ../libsvn_subr/cmdline_editor.c:558
#, c-format
msgid "Can't restore working directory"
msgstr "Kan inte återställa aktuell katalog"
-#: ../libsvn_subr/cmdline.c:1509 ../libsvn_subr/cmdline.c:1693
+#: ../libsvn_subr/cmdline_editor.c:315 ../libsvn_subr/cmdline_editor.c:499
#, c-format
msgid "system('%s') returned %d"
msgstr "system(\"%s\") returnerade %d"
-#: ../libsvn_subr/cmdline.c:1725
+#: ../libsvn_subr/cmdline_editor.c:531
msgid "Error normalizing edited contents to internal format"
msgstr "Fel vid normalisering av det redigerade innehållet till det interna formatet"
-#: ../libsvn_subr/cmdline.c:1795
-#, c-format
-msgid ""
-"Unknown value '%s' for %s.\n"
-"Supported values: %s"
-msgstr ""
-"Okänt värde \"%s\" för %s.\n"
-"Tillåtna värden: %s"
-
-#: ../libsvn_subr/cmdline.c:1848
-msgid "Caught signal"
-msgstr "FÃ¥ngade signal"
-
#: ../libsvn_subr/compress_lz4.c:92
msgid "Decompression of compressed data failed: no size"
msgstr "Misslyckades med att packa upp komprimerad data: ingen storlek"
@@ -9073,17 +9084,17 @@ msgstr "Syntaxfel i konfigurationsfil: %
msgid "line %d: Section header must start in the first column"
msgstr "rad %d: Sektionshuvud måste börja i första kolumnen"
-#: ../libsvn_subr/config_file.c:820
+#: ../libsvn_subr/config_file.c:821
#, c-format
msgid "line %d: Comment must start in the first column"
msgstr "rad %d: Kommentar måste börja i första kolumnen"
-#: ../libsvn_subr/config_file.c:835
+#: ../libsvn_subr/config_file.c:836
#, c-format
msgid "line %d: Section header expected"
msgstr "rad %d: Sektionshuvud förväntas"
-#: ../libsvn_subr/config_file.c:839
+#: ../libsvn_subr/config_file.c:840
#, c-format
msgid "line %d: Option expected"
msgstr "rad %d: Val förväntas"
@@ -9215,7 +9226,7 @@ msgid "Can't expand time"
msgstr "Kan inte dela upp tid"
#: ../libsvn_subr/deprecated.c:365 ../libsvn_subr/deprecated.c:605
-#: ../libsvn_subr/opt.c:274
+#: ../libsvn_subr/opt_subcommand.c:265
msgid ""
"\n"
"Valid options:\n"
@@ -9223,11 +9234,11 @@ msgstr ""
"\n"
"Giltiga flaggor:\n"
-#: ../libsvn_subr/deprecated.c:545 ../libsvn_subr/opt.c:174
+#: ../libsvn_subr/deprecated.c:545 ../libsvn_subr/opt_subcommand.c:165
msgid " ARG"
msgstr " ARG"
-#: ../libsvn_subr/deprecated.c:627 ../libsvn_subr/opt.c:307
+#: ../libsvn_subr/deprecated.c:627 ../libsvn_subr/opt_subcommand.c:298
msgid ""
"\n"
"Global options:\n"
@@ -9236,7 +9247,7 @@ msgstr ""
"Globala flaggor:\n"
#: ../libsvn_subr/deprecated.c:769 ../libsvn_subr/deprecated.c:803
-#: ../libsvn_subr/opt.c:444
+#: ../libsvn_subr/opt_subcommand.c:435
#, c-format
msgid ""
"\"%s\": unknown command.\n"
@@ -9245,13 +9256,13 @@ msgstr ""
"\"%s\": okänt kommando.\n"
"\n"
-#: ../libsvn_subr/deprecated.c:931 ../libsvn_subr/deprecated.c:1031
-#: ../libsvn_subr/opt.c:1267 ../svnrdump/svnrdump.c:607
+#: ../libsvn_subr/deprecated.c:945 ../libsvn_subr/deprecated.c:1045
+#: ../libsvn_subr/opt_subcommand.c:588 ../svnrdump/svnrdump.c:607
#, c-format
msgid "Type '%s help' for usage.\n"
msgstr "Skriv \"%s help\" för användning.\n"
-#: ../libsvn_subr/deprecated.c:1459
+#: ../libsvn_subr/deprecated.c:1473
#, c-format
msgid "'%s' is neither a file nor a directory name"
msgstr "\"%s\" är varken ett fil- eller katalognamn"
@@ -9828,11 +9839,19 @@ msgstr "Kan inte skapa temporärfil frå
msgid "Can't set aside '%s'"
msgstr "Kan inte flytta \"%s\" åt sidan"
-#: ../libsvn_subr/io.c:5586 ../libsvn_subr/stream.c:2234
+#: ../libsvn_subr/io.c:5586 ../libsvn_subr/stream.c:2246
#, c-format
msgid "Unable to make name in '%s'"
msgstr "Kunde inte skapa namn i \"%s\""
+#: ../libsvn_subr/macos_keychain.c:456
+msgid "repository password"
+msgstr "arkivlösenord"
+
+#: ../libsvn_subr/macos_keychain.c:457
+msgid "certificate passphrase"
+msgstr "certifikatets lösenordsfras"
+
#: ../libsvn_subr/mergeinfo.c:110 ../libsvn_subr/mergeinfo.c:738
msgid "Pathname not terminated by ':'"
msgstr "Sökväg avslutades inte med \":\""
@@ -9891,16 +9910,16 @@ msgstr "Kunde inte hitta radslutet i rad
msgid "Could not parse mergeinfo string '%s'"
msgstr "Kunde inte tolka sammanslagningsinformation i strängen \"%s\""
-#: ../libsvn_subr/mergeinfo.c:829
+#: ../libsvn_subr/mergeinfo.c:830
#, c-format
msgid "<bad rangelist [%d ranges]: %s>"
msgstr "<felaktig revisionslista [%d delar]: %s>"
-#: ../libsvn_subr/mergeinfo.c:2313
+#: ../libsvn_subr/mergeinfo.c:2315
msgid "NULL mergeinfo catalog\n"
msgstr "katalog för sammanslagningsinformation är NULL\n"
-#: ../libsvn_subr/mergeinfo.c:2318
+#: ../libsvn_subr/mergeinfo.c:2320
msgid "empty mergeinfo catalog\n"
msgstr "tom katalog för sammanslagningsinformation\n"
@@ -9924,7 +9943,37 @@ msgstr "Kan inte låsa upp mutex"
msgid "Can't get module file name"
msgstr "Kan inte erhålla modulens filnamn"
-#: ../libsvn_subr/opt.c:291
+#: ../libsvn_subr/opt.c:200
+#, c-format
+msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?"
+msgstr "Syntaxfel i den fixerade revisionen \"%s\"; menade du \"%s@\"?"
+
+#: ../libsvn_subr/opt.c:206
+#, c-format
+msgid "Syntax error parsing peg revision '%s'"
+msgstr "Syntaxfel i den fixerade revisionen \"%s\""
+
+#: ../libsvn_subr/opt.c:331
+msgid "Revision property pair is empty"
+msgstr "Revisionsegenskapsparet är tomt"
+
+#: ../libsvn_subr/opt.c:351 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:341
+#: ../svn/propset-cmd.c:68
+#, c-format
+msgid "'%s' is not a valid Subversion property name"
+msgstr "\"%s\" är inget giltigt namn på en Subversion-egenskap"
+
+#: ../libsvn_subr/opt.c:427
+#, c-format
+msgid "URL '%s' contains a '..' element"
+msgstr "URL:en \"%s\" innehåller ett \"..\"-element"
+
+#: ../libsvn_subr/opt.c:460
+#, c-format
+msgid "Error resolving case of '%s'"
+msgstr "Kunde inte ta reda på skiftläge för \"%s\""
+
+#: ../libsvn_subr/opt_subcommand.c:282
msgid ""
"\n"
"Experimental options:\n"
@@ -9932,7 +9981,7 @@ msgstr ""
"\n"
"Experimentella flaggor:\n"
-#: ../libsvn_subr/opt.c:330
+#: ../libsvn_subr/opt_subcommand.c:321
msgid ""
"\n"
"(Use '-v' to show global and experimental options.)\n"
@@ -9940,7 +9989,7 @@ msgstr ""
"\n"
"(Använd \"-v\" för att visa globala och experimentella flaggor.)\n"
-#: ../libsvn_subr/opt.c:360
+#: ../libsvn_subr/opt_subcommand.c:351
msgid ""
"\n"
"Experimental subcommands:\n"
@@ -9948,7 +9997,7 @@ msgstr ""
"\n"
"Experimentella underkommandon:\n"
-#: ../libsvn_subr/opt.c:374
+#: ../libsvn_subr/opt_subcommand.c:365
msgid ""
"\n"
"(Use '-v' to show experimental subcommands.)\n"
@@ -9956,37 +10005,7 @@ msgstr ""
"\n"
"(Använd \"-v\" för att visa experimentella underkommandon.)\n"
-#: ../libsvn_subr/opt.c:856
-#, c-format
-msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?"
-msgstr "Syntaxfel i den fixerade revisionen \"%s\"; menade du \"%s@\"?"
-
-#: ../libsvn_subr/opt.c:862
-#, c-format
-msgid "Syntax error parsing peg revision '%s'"
-msgstr "Syntaxfel i den fixerade revisionen \"%s\""
-
-#: ../libsvn_subr/opt.c:999
-msgid "Revision property pair is empty"
-msgstr "Revisionsegenskapsparet är tomt"
-
-#: ../libsvn_subr/opt.c:1019 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:337
-#: ../svn/propset-cmd.c:68
-#, c-format
-msgid "'%s' is not a valid Subversion property name"
-msgstr "\"%s\" är inget giltigt namn på en Subversion-egenskap"
-
-#: ../libsvn_subr/opt.c:1095
-#, c-format
-msgid "URL '%s' contains a '..' element"
-msgstr "URL:en \"%s\" innehåller ett \"..\"-element"
-
-#: ../libsvn_subr/opt.c:1128
-#, c-format
-msgid "Error resolving case of '%s'"
-msgstr "Kunde inte ta reda på skiftläge för \"%s\""
-
-#: ../libsvn_subr/opt.c:1150
+#: ../libsvn_subr/opt_subcommand.c:468
#, c-format
msgid ""
"%s, version %s\n"
@@ -9997,7 +10016,7 @@ msgstr ""
" kompilerad %s %s på %s\n"
"\n"
-#: ../libsvn_subr/opt.c:1167
+#: ../libsvn_subr/opt_subcommand.c:485
msgid ""
"System information:\n"
"\n"
@@ -10005,21 +10024,26 @@ msgstr ""
"Systeminformation:\n"
"\n"
-#: ../libsvn_subr/opt.c:1168
+#: ../libsvn_subr/opt_subcommand.c:486
#, c-format
msgid "* running on %s\n"
msgstr "* kör på %s\n"
-#: ../libsvn_subr/opt.c:1172
+#: ../libsvn_subr/opt_subcommand.c:490
#, c-format
msgid " - %s\n"
msgstr " - %s\n"
-#: ../libsvn_subr/opt.c:1182
+#: ../libsvn_subr/opt_subcommand.c:494
+#, c-format
+msgid " - character encoding: %s\n"
+msgstr " - teckenkodning: %s\n"
+
+#: ../libsvn_subr/opt_subcommand.c:503
msgid "* linked dependencies:\n"
msgstr "* länkade beroenden:\n"
-#: ../libsvn_subr/opt.c:1207
+#: ../libsvn_subr/opt_subcommand.c:528
msgid "* loaded shared libraries:\n"
msgstr "* inlästa delat bibliotek:\n"
@@ -10059,7 +10083,7 @@ msgstr "Kan inte läsa från terminal"
msgid "End of file while reading from terminal"
msgstr "Filslut vid läsning från terminal"
-#: ../libsvn_subr/prompt.c:598 ../svn/auth-cmd.c:312
+#: ../libsvn_subr/prompt.c:598 ../svn/auth-cmd.c:311
#, c-format
msgid "Authentication realm: %s\n"
msgstr "Autentiseringsregion (realm): %s\n"
@@ -10280,21 +10304,21 @@ msgstr "Kunde inte initiera SQLite"
msgid "SQLite hotcopy failed for %s"
msgstr "SQLite-kopiering under drift misslyckades för %s"
-#: ../libsvn_subr/stream.c:846
+#: ../libsvn_subr/stream.c:856
#, c-format
msgid "Polling for available data on filestream failed"
msgstr "Misslyckad pollning för tillgänglig data på filström"
-#: ../libsvn_subr/stream.c:866
+#: ../libsvn_subr/stream.c:876
msgid "Windows doesn't support polling on files"
msgstr "Windows stöder ej pollning på filer"
-#: ../libsvn_subr/stream.c:908
+#: ../libsvn_subr/stream.c:918
#, c-format
msgid "Can't read a line from file '%s'"
msgstr "Kan inte läsa en rade från filen \"%s\""
-#: ../libsvn_subr/stream.c:912
+#: ../libsvn_subr/stream.c:922
#, c-format
msgid "Can't read a line from stream"
msgstr "Kan inte läsa en rad från ström"
@@ -10304,29 +10328,29 @@ msgstr "Kan inte läsa en rad frÃ¥n strÃ
msgid "Could not convert '%s' into a number"
msgstr "Kunde inte omvandla \"%s\" till ett tal"
-#: ../libsvn_subr/subst.c:1822 ../libsvn_wc/props.c:1767
+#: ../libsvn_subr/subst.c:1821 ../libsvn_wc/props.c:1767
#, c-format
msgid "File '%s' has inconsistent newlines"
msgstr "Filen \"%s\" har inkonsekventa radslut"
-#: ../libsvn_subr/subst.c:1860
+#: ../libsvn_subr/subst.c:1859
#, c-format
msgid "Can't read special file: File '%s' not found"
msgstr "Kan inte läsa specialfil: Filen \"%s\" hittades ej"
-#: ../libsvn_subr/sysinfo.c:1498
+#: ../libsvn_subr/sysinfo.c:1507
msgid "Intel"
msgstr "Intel"
-#: ../libsvn_subr/sysinfo.c:1499
+#: ../libsvn_subr/sysinfo.c:1508
msgid "Intel 64-bit"
msgstr "64-bitars Intel"
-#: ../libsvn_subr/sysinfo.c:1500
+#: ../libsvn_subr/sysinfo.c:1509
msgid "PowerPC"
msgstr "PowerPC"
-#: ../libsvn_subr/sysinfo.c:1501
+#: ../libsvn_subr/sysinfo.c:1510
msgid "PowerPC 64-bit"
msgstr "64-bitars PowerPC"
@@ -10360,47 +10384,47 @@ msgstr "Revisionsnummer längre än 10 s
msgid "Revision number too large '%s'"
msgstr "Revisionsnummer för stort: \"%s\""
-#: ../libsvn_subr/utf.c:243
+#: ../libsvn_subr/utf.c:257
#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr "Kan inte skapa teckenkonverterare från systemets kodning till \"%s\""
-#: ../libsvn_subr/utf.c:247
+#: ../libsvn_subr/utf.c:261
#, c-format
msgid "Can't create a character converter from '%s' to native encoding"
msgstr "Kan inte skapa teckenkonverterare från \"%s\" till systemets kodning"
-#: ../libsvn_subr/utf.c:251
+#: ../libsvn_subr/utf.c:265
#, c-format
msgid "Can't create a character converter from '%s' to '%s'"
msgstr "Kan inte skapa teckenkonverterare från \"%s\" till \"%s\""
-#: ../libsvn_subr/utf.c:546
+#: ../libsvn_subr/utf.c:560
#, 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:550
+#: ../libsvn_subr/utf.c:564
#, 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:554
+#: ../libsvn_subr/utf.c:568
#, 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:599
+#: ../libsvn_subr/utf.c:613
#, c-format
msgid "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from UTF-8"
msgstr "Giltig data \"%s\" följdes av icke-ASCII-byte %d: kan inte konvertera till/från UTF-8"
-#: ../libsvn_subr/utf.c:607
+#: ../libsvn_subr/utf.c:621
#, c-format
msgid "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
msgstr "Tecken som ej tillhör ASCII (kod %d) hittades; kan inte konvertera till/från UTF-8"
-#: ../libsvn_subr/utf.c:652
+#: ../libsvn_subr/utf.c:666
#, c-format
msgid ""
"Valid UTF-8 data\n"
@@ -10413,16 +10437,11 @@ msgstr ""
"följd av ogiltig UTF-8-sekvens\n"
"(hex:%s)"
-#: ../libsvn_subr/utf.c:1207 ../libsvn_subr/utf.c:1216
+#: ../libsvn_subr/utf.c:1221 ../libsvn_subr/utf.c:1230
#, c-format
msgid "Conversion to UTF-16 failed"
msgstr "Konvertering till UTF-16 misslyckades"
-#: ../libsvn_subr/utf.c:1245 ../libsvn_subr/utf.c:1255
-#, c-format
-msgid "Conversion from UTF-16 failed"
-msgstr "Konvertering från UTF-16 misslyckades"
-
# ### inpresice
#: ../libsvn_subr/utf8proc.c:298
#, c-format
@@ -10476,55 +10495,55 @@ msgstr " (likhet förväntas)"
msgid " (expecting compatibility)"
msgstr " (kompatibilitet förväntas)"
-#: ../libsvn_subr/version.c:146
+#: ../libsvn_subr/version.c:147
msgid ""
-"Copyright (C) 2022 The Apache Software Foundation.\n"
+"Copyright (C) 2026 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see https://subversion.apache.org/\n"
msgstr ""
-"© 2022 The Apache Software Foundation.\n"
+"Copyright (C) 2026 The Apache Software Foundation.\n"
"Denna programvara består av bidrag från många personer;\n"
"se filen NOTICE för vidare information.\n"
"Subversion är öppen källkod; se https://subversion.apache.org/\n"
-#: ../libsvn_subr/version.c:224 ../libsvn_subr/version.c:235
-#: ../libsvn_subr/version.c:241 ../libsvn_subr/version.c:258
-#: ../libsvn_subr/version.c:265
+#: ../libsvn_subr/version.c:232 ../libsvn_subr/version.c:243
+#: ../libsvn_subr/version.c:249 ../libsvn_subr/version.c:266
+#: ../libsvn_subr/version.c:273
#, c-format
msgid "Failed to parse version number string '%s'"
msgstr "Syntaxfel i sträng med versionsnummer \"%s\""
-#: ../libsvn_subr/xml.c:518
+#: ../libsvn_subr/xml.c:271
#, c-format
msgid "Malformed XML: %s at line %ld"
msgstr "Felaktig XML: %s på rad %ld"
-#: ../libsvn_wc/adm_crawler.c:229
+#: ../libsvn_wc/adm_crawler.c:239
#, c-format
msgid "The existing node '%s' can not be restored."
msgstr "Den befintliga noden \"%s\" kan inte återställas."
-#: ../libsvn_wc/adm_crawler.c:248
+#: ../libsvn_wc/adm_crawler.c:258
#, c-format
msgid "The node '%s' can not be restored."
msgstr "Noden \"%s\" kan inte återställas."
-#: ../libsvn_wc/adm_crawler.c:864
+#: ../libsvn_wc/adm_crawler.c:874
msgid "Error aborting report"
msgstr "Fel när rapportering avbröts"
-#: ../libsvn_wc/adm_crawler.c:1003
+#: ../libsvn_wc/adm_crawler.c:1013
#, c-format
msgid "Pristine checksum for file '%s' is missing"
msgstr "Orörd kontrollsumma för filen \"%s\" saknas"
-#: ../libsvn_wc/adm_crawler.c:1193
+#: ../libsvn_wc/adm_crawler.c:1215
#, c-format
msgid "Checksum mismatch for text base of '%s'"
msgstr "Felaktig kontrollsumma för textbas för \"%s\""
-#: ../libsvn_wc/adm_crawler.c:1204
+#: ../libsvn_wc/adm_crawler.c:1226
#, c-format
msgid "While preparing '%s' for commit"
msgstr "Under förberedelse för arkivering av \"%s\""
@@ -10534,86 +10553,91 @@ msgstr "Under förberedelse för arkiver
msgid "'%s' is not a valid administrative directory name"
msgstr "\"%s\" är inget giltigt namn på förvaltningskatalogen"
-#: ../libsvn_wc/adm_files.c:186 ../libsvn_wc/adm_files.c:242
-#, c-format
-msgid "Can only get the pristine contents of files; '%s' is not a file"
-msgstr "Kan bara hämta det orörda innehållet av filer; \"%s\" är ingen fil"
-
-#: ../libsvn_wc/adm_files.c:195 ../libsvn_wc/adm_files.c:257
-#, c-format
-msgid "Cannot get the pristine contents of '%s' because its delete is already committed"
-msgstr "Kan inte hämta orört innehåll av \"%s\" eftersom dess radering redan är arkiverad"
-
-#: ../libsvn_wc/adm_files.c:203 ../libsvn_wc/adm_files.c:265
-#, c-format
-msgid "Cannot get the pristine contents of '%s' because it has an unexpected status"
-msgstr "Kan inte hämta det orörda innehållet av \"%s\" eftersom det befinner sig i oväntat tillstånd"
-
-#: ../libsvn_wc/adm_files.c:210
-#, c-format
-msgid "Node '%s' has no pristine text"
-msgstr "Nod \"%s\" har ingen orörd text"
-
-#: ../libsvn_wc/adm_files.c:402
+#: ../libsvn_wc/adm_files.c:281
#, c-format
msgid "Working copy format %d is not supported by client version %s."
msgstr "Arbetskopians format \"%d\" stöds inte av Subversion %s."
-#: ../libsvn_wc/adm_files.c:408
+#: ../libsvn_wc/adm_files.c:287
#, c-format
msgid "Working copy format %d can't be created by client version %s."
msgstr "Arbetskopia med format %d kan inte skapas av Subversion %s."
-#: ../libsvn_wc/adm_files.c:437
+#: ../libsvn_wc/adm_files.c:293
+#, c-format
+msgid "Working copy format %d does not support the requested capabilities"
+msgstr "Arbetskopians format \"%d\" stödjer inte den önskade förmågan"
+
+#: ../libsvn_wc/adm_files.c:312
#, c-format
msgid "Format %d doesn't match existing format %d in '%s'"
msgstr "Format %d stämmer inte med existerande format %d i \"%s\""
-#: ../libsvn_wc/adm_files.c:444
+#: ../libsvn_wc/adm_files.c:351
#, c-format
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "Revisionen %ld stämmer inte med den existerande revisionen %ld i \"%s\""
-#: ../libsvn_wc/adm_files.c:484
+#: ../libsvn_wc/adm_files.c:393
#, c-format
msgid "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'"
msgstr "URL:en \"%s\" (UUID: \"%s\") stämmer inte med den existerande URL:en \"%s\" (UUID: \"%s\") i \"%s\""
-#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5543
+#: ../libsvn_wc/adm_ops.c:314 ../libsvn_wc/update_editor.c:5578
#, c-format
msgid "Can't find parent directory's node while trying to add '%s'"
msgstr "Kunde inte hitta föräldrakatalogens nod när \"%s\" skulle läggas till"
-#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5537
+#: ../libsvn_wc/adm_ops.c:323 ../libsvn_wc/update_editor.c:5572
#, 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:329 ../libsvn_wc/update_editor.c:5550
+#: ../libsvn_wc/adm_ops.c:330 ../libsvn_wc/update_editor.c:5585
#, c-format
msgid "Can't schedule an addition of '%s' below a not-directory node"
msgstr "Kan inte schemalägga ett tillägg av \"%s\" under en nod som inte är en katalog"
-#: ../libsvn_wc/adm_ops.c:390
+#: ../libsvn_wc/adm_ops.c:391
#, c-format
msgid "Can't create an entry with a reserved name while trying to add '%s'"
msgstr "Kunde inte skapa en post med ett reserverat namn när \"%s\" skulle läggas till"
-#: ../libsvn_wc/adm_ops.c:594
+#: ../libsvn_wc/adm_ops.c:595
#, 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:614
+#: ../libsvn_wc/adm_ops.c:615
#, c-format
msgid "Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' for addition under a working copy from repository '%s' with uuid '%s'."
msgstr "Kan inte schemalägga arbetskopian vid \"%s\" från arkivet \"%s\" med UUID \"%s\" för att läggas till under en arbetskopia från arkiv \"%s\" med UUID \"%s\"."
-#: ../libsvn_wc/adm_ops.c:628
+#: ../libsvn_wc/adm_ops.c:629
#, c-format
msgid "Can't add '%s' with URL '%s', but with the data from '%s'"
msgstr "Kan inte lägga till \"%s\" med URL \"%s\", men med data från \"%s\""
+#: ../libsvn_wc/adm_ops.c:785 ../libsvn_wc/textbase.c:227
+#, c-format
+msgid "Can only get the pristine contents of files; '%s' is not a file"
+msgstr "Kan bara hämta det orörda innehållet av filer; \"%s\" är ingen fil"
+
+#: ../libsvn_wc/adm_ops.c:794 ../libsvn_wc/textbase.c:237
+#, c-format
+msgid "Cannot get the pristine contents of '%s' because its delete is already committed"
+msgstr "Kan inte hämta orört innehåll av \"%s\" eftersom dess radering redan är arkiverad"
+
+#: ../libsvn_wc/adm_ops.c:802 ../libsvn_wc/textbase.c:247
+#, c-format
+msgid "Cannot get the pristine contents of '%s' because it has an unexpected status"
+msgstr "Kan inte hämta det orörda innehållet av \"%s\" eftersom det befinner sig i oväntat tillstånd"
+
+#: ../libsvn_wc/adm_ops.c:826 ../libsvn_wc/wc_db_pristine.c:544
+#, c-format
+msgid "The pristine text with checksum '%s' was not found"
+msgstr "Den orörda texten med kontrollsumma \"%s\" hittades inte"
+
#: ../libsvn_wc/cleanup.c:58
#, c-format
msgid "'%s' is not a working copy directory"
@@ -10683,88 +10707,88 @@ msgstr "Ingen konfliktprocedur och inget
msgid "Unable to resolve conflicts on '%s'"
msgstr "Kan inte lösa konflikten på \"%s\""
-#: ../libsvn_wc/conflicts.c:3530 ../libsvn_wc/conflicts.c:3616
-#: ../libsvn_wc/conflicts.c:3695 ../libsvn_wc/conflicts.c:3781
-#: ../libsvn_wc/conflicts.c:3848
+#: ../libsvn_wc/conflicts.c:3537 ../libsvn_wc/conflicts.c:3623
+#: ../libsvn_wc/conflicts.c:3702 ../libsvn_wc/conflicts.c:3788
+#: ../libsvn_wc/conflicts.c:3855
#, c-format
msgid "Unexpected conflict operation '%s' on '%s'"
msgstr "Oväntad konfliktsoperation \"%s\" på \"%s\""
-#: ../libsvn_wc/conflicts.c:3538 ../libsvn_wc/conflicts.c:3623
-#: ../libsvn_wc/conflicts.c:3701 ../libsvn_wc/conflicts.c:3787
-#: ../libsvn_wc/conflicts.c:3854
+#: ../libsvn_wc/conflicts.c:3545 ../libsvn_wc/conflicts.c:3630
+#: ../libsvn_wc/conflicts.c:3708 ../libsvn_wc/conflicts.c:3794
+#: ../libsvn_wc/conflicts.c:3861
#, c-format
msgid "Unexpected conflict reason '%s' on '%s'"
msgstr "Oväntad konfliktorsak \"%s\" på \"%s\""
-#: ../libsvn_wc/conflicts.c:3629 ../libsvn_wc/conflicts.c:3707
-#: ../libsvn_wc/conflicts.c:3793 ../libsvn_wc/conflicts.c:3860
+#: ../libsvn_wc/conflicts.c:3636 ../libsvn_wc/conflicts.c:3714
+#: ../libsvn_wc/conflicts.c:3800 ../libsvn_wc/conflicts.c:3867
#, c-format
msgid "Unexpected conflict action '%s' on '%s'"
msgstr "Oväntad konflikthandling \"%s\" på \"%s\""
-#: ../libsvn_wc/copy.c:103
+#: ../libsvn_wc/copy.c:104
#, c-format
msgid "Source '%s' is unexpected kind"
msgstr "Källan \"%s\" är av oväntat slag"
-#: ../libsvn_wc/copy.c:471
+#: ../libsvn_wc/copy.c:522
#, c-format
msgid "cannot handle node kind for '%s'"
msgstr "kan inte hantera nodtyp för \"%s\""
-#: ../libsvn_wc/copy.c:493 ../libsvn_wc/wc_db.c:4726 ../libsvn_wc/wc_db.c:5529
+#: ../libsvn_wc/copy.c:544 ../libsvn_wc/wc_db.c:4743 ../libsvn_wc/wc_db.c:5546
#, c-format
msgid "Cannot handle status of '%s'"
msgstr "Kan inte hantera tillståndet för \"%s\""
-#: ../libsvn_wc/copy.c:502 ../libsvn_wc/wc_db.c:4717 ../libsvn_wc/wc_db.c:5523
-#: ../libsvn_wc/wc_db.c:5767
+#: ../libsvn_wc/copy.c:553 ../libsvn_wc/wc_db.c:4734 ../libsvn_wc/wc_db.c:5540
+#: ../libsvn_wc/wc_db.c:5784
#, c-format
msgid "Cannot copy '%s' excluded by server"
msgstr "Kan inte kopiera \"%s\" som är utesluten av servern"
-#: ../libsvn_wc/copy.c:643
+#: ../libsvn_wc/copy.c:694
#, c-format
msgid "Deleted node '%s' can't be copied."
msgstr "Den raderade noden \"%s\" kan inte kopieras."
-#: ../libsvn_wc/copy.c:661
+#: ../libsvn_wc/copy.c:712
#, c-format
msgid "'%s' is the root of a working copy and cannot be moved"
msgstr "\"%s\" är rot till en arbetskopia och kan inte flyttas"
-#: ../libsvn_wc/copy.c:669
+#: ../libsvn_wc/copy.c:720
#, c-format
msgid "'%s' represents the repository root and cannot be moved"
msgstr "\"%s\" representerar arkivroten och kan inte flyttas"
-#: ../libsvn_wc/copy.c:744
+#: ../libsvn_wc/copy.c:795
#, 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:752
+#: ../libsvn_wc/copy.c:803
#, 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/copy.c:780
+#: ../libsvn_wc/copy.c:831
#, c-format
msgid "'%s' is already under version control but is excluded."
msgstr "\"%s\" är redan versionshanterad men är utesluten."
-#: ../libsvn_wc/copy.c:796
+#: ../libsvn_wc/copy.c:847
#, c-format
msgid "There is already a versioned item '%s'"
msgstr "Det finns redan ett versionshanterat objekt \"%s\""
-#: ../libsvn_wc/copy.c:812
+#: ../libsvn_wc/copy.c:863
#, c-format
msgid "'%s' already exists and is in the way"
msgstr "\"%s\" finns redan och är i vägen"
-#: ../libsvn_wc/copy.c:864
+#: ../libsvn_wc/copy.c:910
#, c-format
msgid "Cannot move mixed-revision subtree '%s' [%ld:%ld]; try updating it first"
msgstr "Kan inte flytta delträd \"%s\" i blandad revision [%ld:%ld]; försök med att uppdatera först"
@@ -10827,7 +10851,7 @@ msgstr "\"%s\" representerar arkivroten
msgid "File '%s' has local modifications"
msgstr "Filen \"%s\" har lokala ändringar"
-#: ../libsvn_wc/deprecated.c:2435
+#: ../libsvn_wc/deprecated.c:2637
#, c-format
msgid "Unexpectedly found '%s': path is marked 'missing'"
msgstr "Hittade \"%s\", vilket var oväntat: sökvägen är markerad som \"saknad\""
@@ -10882,62 +10906,62 @@ msgstr "Katalogen \"%s\" saknar THIS_DIR
msgid "'%s' has an unrecognized node kind"
msgstr "\"%s\" har okänd nodtyp"
-#: ../libsvn_wc/externals.c:158 ../libsvn_wc/externals.c:247
+#: ../libsvn_wc/externals.c:159 ../libsvn_wc/externals.c:248
#, c-format
msgid "Error parsing %s property on '%s': '%s'"
msgstr "Fel vid tolkning av egenskapen %s på \"%s\": \"%s\""
-#: ../libsvn_wc/externals.c:214
+#: ../libsvn_wc/externals.c:215
#, c-format
msgid "Can't split line into components: '%s'"
msgstr "Kan inte dela upp rad i beståndsdelar: \"%s\""
-#: ../libsvn_wc/externals.c:273
+#: ../libsvn_wc/externals.c:274
#, c-format
msgid "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in an external; one must be a path where an absolute or relative URL is checked out to"
msgstr "Felaktig egenskap %s på \"%s\": kan inte använda två absoluta URL:er (\"%s\" och \"%s\") i ett externt objekt; den ena måste vara en sökväg som en absolut eller relativ URL hämtas ut till"
-#: ../libsvn_wc/externals.c:282 ../libsvn_wc/externals.c:290
+#: ../libsvn_wc/externals.c:283 ../libsvn_wc/externals.c:291
#, c-format
msgid "Invalid %s property on '%s': cannot use a URL '%s' as the target directory for an external definition"
msgstr "Felaktig egenskap %s på \"%s\": kan inte använda URL:en \"%s\" som målkatalog för en extern definition"
-#: ../libsvn_wc/externals.c:354
+#: ../libsvn_wc/externals.c:355
#, c-format
msgid "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'"
msgstr "Felaktig egenskap %s på %s: målet \"%s\" är en absolut sökväg eller innehåller \"..\""
-#: ../libsvn_wc/externals.c:549 ../libsvn_wc/externals.c:572
+#: ../libsvn_wc/externals.c:550 ../libsvn_wc/externals.c:573
#, c-format
msgid "This editor can only update '%s'"
msgstr "Denna editor kan bara uppdatera \"%s\""
-#: ../libsvn_wc/externals.c:588
+#: ../libsvn_wc/externals.c:589
#, c-format
msgid "Node '%s' is no existing file external"
msgstr "Noden \"%s\" är inte en befintlig extern fil"
-#: ../libsvn_wc/externals.c:1595
+#: ../libsvn_wc/externals.c:1628
#, c-format
msgid "URL '%s' does not begin with a scheme"
msgstr "URL:en \"%s\" börjar inte med ett schema"
-#: ../libsvn_wc/externals.c:1650
+#: ../libsvn_wc/externals.c:1683
#, c-format
msgid "Illegal parent directory URL '%s'"
msgstr "Otillåten föräldrakatalogs-URL \"%s\""
-#: ../libsvn_wc/externals.c:1689
+#: ../libsvn_wc/externals.c:1722
#, c-format
msgid "Illegal repository root URL '%s'"
msgstr "Otillåten arkivrots-URL \"%s\""
-#: ../libsvn_wc/externals.c:1734
+#: ../libsvn_wc/externals.c:1767
#, c-format
msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
msgstr "Den externa relativa URL:en \"%s\" får inte innehålla \"..\""
-#: ../libsvn_wc/externals.c:1762
+#: ../libsvn_wc/externals.c:1795
#, c-format
msgid "Unrecognized format for the relative external URL '%s'"
msgstr "Okänt format för den relativa externa URL:en \"%s\""
@@ -10977,8 +11001,8 @@ msgstr "Katalogen \"%s\" saknas"
msgid "Working copy '%s' is not locked"
msgstr "Arbetskopian \"%s\" är inte låst"
-#: ../libsvn_wc/lock.c:1384 ../libsvn_wc/wc_db.c:5050
-#: ../libsvn_wc/wc_db.c:16338 ../libsvn_wc/wc_db_update_move.c:185
+#: ../libsvn_wc/lock.c:1384 ../libsvn_wc/wc_db.c:5067
+#: ../libsvn_wc/wc_db.c:16358 ../libsvn_wc/wc_db_update_move.c:186
#, c-format
msgid "No write-lock in '%s'"
msgstr "Inget skrivlås i \"%s\""
@@ -11322,6 +11346,17 @@ msgstr "Ogiltigt omlokaliseringsmål: \"
msgid "Invalid relocation destination: '%s' (does not point to target)"
msgstr "Ogiltigt omlokaliseringsmål: \"%s\" (pekar inte på målet)"
+#: ../libsvn_wc/textbase.c:310
+#, c-format
+msgid "No local pristine contents for file '%s'"
+msgstr "Inget lokalt orört innehåll för fil \"%s\""
+
+#: ../libsvn_wc/textbase.c:339 ../libsvn_wc/textbase.c:369
+#: ../libsvn_wc/textbase.c:416
+#, c-format
+msgid "Node '%s' has no pristine text"
+msgstr "Nod \"%s\" har ingen orörd text"
+
#: ../libsvn_wc/tree_conflicts.c:137
msgid "Unknown enumeration value in tree conflict description"
msgstr "Okänt uppräkningsvärde i beskrivning av trädkonflikt"
@@ -11348,7 +11383,7 @@ msgstr "Ogiltigt \"node_kind\"-fält i b
msgid "Attempt to add tree conflict that already exists at '%s'"
msgstr "Försök att lägga till en trädkonflikt som redan finns vid \"%s\""
-#: ../libsvn_wc/update_editor.c:1000
+#: ../libsvn_wc/update_editor.c:1018
#, c-format
msgid ""
"Checksum mismatch while updating '%s':\n"
@@ -11359,36 +11394,36 @@ msgstr ""
" väntad: %s\n"
" erhållen: %s\n"
-#: ../libsvn_wc/update_editor.c:1141
+#: ../libsvn_wc/update_editor.c:1159
#, c-format
msgid "'%s' is not valid as filename in directory '%s'"
msgstr "\"%s\" är inte giltig som filnamn i katalogen \"%s\""
-#: ../libsvn_wc/update_editor.c:1523
+#: ../libsvn_wc/update_editor.c:1541
#, c-format
msgid "Unexpected attempt to add a node at path '%s'"
msgstr "Oväntat försök att lägga till en nod vid sökvägen \"%s\""
-#: ../libsvn_wc/update_editor.c:1534
+#: ../libsvn_wc/update_editor.c:1552
#, c-format
msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'"
msgstr "Oväntat försök att ändra, radera eller ersätta en nod vid sökvägen \"%s\""
-#: ../libsvn_wc/update_editor.c:1916
+#: ../libsvn_wc/update_editor.c:1934
#, c-format
msgid "Failed to add directory '%s': object of the same name as the administrative directory"
msgstr "Kunde inte lägga till katalogen \"%s\": objektet har samma namn som förvaltningskatalogen"
-#: ../libsvn_wc/update_editor.c:2592
+#: ../libsvn_wc/update_editor.c:2610
msgid "Couldn't do property merge"
msgstr "Kunde inte slå ihop egenskaper"
-#: ../libsvn_wc/update_editor.c:3131
+#: ../libsvn_wc/update_editor.c:3149
#, c-format
msgid "Failed to add file '%s': object of the same name as the administrative directory"
msgstr "Misslyckades att lägga till filen \"%s\": objektet har samma namn som förvaltningskatalogen"
-#: ../libsvn_wc/update_editor.c:3850
+#: ../libsvn_wc/update_editor.c:3884
#, c-format
msgid ""
"Checksum mismatch for '%s':\n"
@@ -11399,22 +11434,22 @@ msgstr ""
" väntad: %s\n"
" lagrad: %s\n"
-#: ../libsvn_wc/update_editor.c:5518
+#: ../libsvn_wc/update_editor.c:5553
#, c-format
msgid "Node '%s' exists."
msgstr "Noden \"%s\" finns redan."
-#: ../libsvn_wc/update_editor.c:5578
+#: ../libsvn_wc/update_editor.c:5613
#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "URL:en för kopieringskällan till \"%s\" har annan arkivrot än \"%s\""
-#: ../libsvn_wc/update_editor.c:5790
+#: ../libsvn_wc/update_editor.c:5813
#, c-format
msgid "'%s' is not an unmodified copied directory"
msgstr "\"%s\" är inte en oförändrad kopierad katalog"
-#: ../libsvn_wc/update_editor.c:5801
+#: ../libsvn_wc/update_editor.c:5824
#, c-format
msgid "Copyfrom '%s' doesn't match original location of '%s'"
msgstr "Kopieringskällan \"%s\" motsvarar inte den ursprungliga platsen \"%s\""
@@ -11483,25 +11518,20 @@ msgstr "Arbetskopian \"%s\" är en gamma
#: ../libsvn_wc/upgrade.c:1770
#, c-format
-msgid "Working copy '%s' is already at version %s (format %d) and cannot be downgraded to version %s (format %d)"
-msgstr "Arbetskopian \"%s\" är redan på version %s (format %d) och kan inte nedgraderas till version %s (format %d)"
-
-#: ../libsvn_wc/upgrade.c:1782
-#, c-format
msgid "Working copy version %s (format %d) is not supported by client version %s."
msgstr "Arbetskopians version \"%s\" (format %d) stöds inte av Subversion %s."
-#: ../libsvn_wc/upgrade.c:1789
+#: ../libsvn_wc/upgrade.c:1777
#, c-format
msgid "Working copy with format %d can't be created by client version %s."
msgstr "Arbetskopia med format %d kan inte skapas av Subversion %s."
-#: ../libsvn_wc/upgrade.c:1970
+#: ../libsvn_wc/upgrade.c:1946
#, c-format
msgid "Can't upgrade '%s' as it is not a working copy"
msgstr "Kan inte uppgradera \"%s\" eftersom det inte är en arbetskopia"
-#: ../libsvn_wc/upgrade.c:2019
+#: ../libsvn_wc/upgrade.c:1995
#, c-format
msgid "Can't upgrade '%s' as it is not a working copy root, the root is '%s'"
msgstr "Kan inte uppgradera \"%s\" eftersom det inte är roten till en arbetskopia - roten är \"%s\""
@@ -11516,248 +11546,248 @@ msgstr "Ingen \"REPOSITORY\"-tabellpost
msgid "The file '%s' has no checksum."
msgstr "Filen \"%s\" saknar kontrollsumma."
-#: ../libsvn_wc/wc_db.c:2192
+#: ../libsvn_wc/wc_db.c:2209
#, c-format
msgid "Path '%s' is not moved"
msgstr "Sökvägen \"%s\" har inte flyttats"
-#: ../libsvn_wc/wc_db.c:2666 ../libsvn_wc/wc_db.c:3101
-#: ../libsvn_wc/wc_db.c:10004
+#: ../libsvn_wc/wc_db.c:2683 ../libsvn_wc/wc_db.c:3118
+#: ../libsvn_wc/wc_db.c:10021
#, c-format
msgid "The node '%s' has a corrupt checksum value."
msgstr "Noden \"%s\" har en trasig kontrollsumma."
-#: ../libsvn_wc/wc_db.c:2886
+#: ../libsvn_wc/wc_db.c:2903
#, c-format
msgid "The node '%s' has a BASE status that has no properties."
msgstr "Noden \"%s\" har ett \"BASE\"-tillstånd utan egenskaper."
-#: ../libsvn_wc/wc_db.c:3628 ../libsvn_wc/wc_db.c:3748
+#: ../libsvn_wc/wc_db.c:3645 ../libsvn_wc/wc_db.c:3765
#, c-format
msgid "The node '%s' is not an external."
msgstr "Noden \"%s\" är inte extern."
-#: ../libsvn_wc/wc_db.c:4160
+#: ../libsvn_wc/wc_db.c:4177
#, c-format
msgid "Expected node '%s' to be deleted."
msgstr "Noden \"%s\" väntades vara raderad."
-#: ../libsvn_wc/wc_db.c:7006 ../libsvn_wc/wc_db.c:7053
+#: ../libsvn_wc/wc_db.c:7023 ../libsvn_wc/wc_db.c:7070
#, c-format
msgid "Can't revert '%s' without reverting children"
msgstr "Kan inte återställa \"%s\" utan att återställa dess barn"
-#: ../libsvn_wc/wc_db.c:7167
+#: ../libsvn_wc/wc_db.c:7184
#, c-format
msgid "Can't revert '%s' without reverting parent"
msgstr "Kan inte återställa \"%s\" utan att återställa dess förälder"
-#: ../libsvn_wc/wc_db.c:7302
+#: ../libsvn_wc/wc_db.c:7319
#, c-format
msgid "Unsupported depth for revert of '%s'"
msgstr "Djupet för återställningen av \"%s\" stöds inte"
-#: ../libsvn_wc/wc_db.c:7872
+#: ../libsvn_wc/wc_db.c:7889
#, c-format
msgid "The node '%s' is not a committed directory"
msgstr "Noden \"%s\" är inte en arkiverad katalog"
-#: ../libsvn_wc/wc_db.c:8262
+#: ../libsvn_wc/wc_db.c:8279
#, c-format
msgid "Cannot delete '%s' as '%s' is excluded by server"
msgstr "Kan inte ta bort \"%s\" eftersom servern har uteslutit \"%s\""
-#: ../libsvn_wc/wc_db.c:8273
+#: ../libsvn_wc/wc_db.c:8290
#, c-format
msgid "Cannot delete '%s' as it is excluded by server"
msgstr "Kan inte ta bort \"%s\" eftersom servern har uteslutit den"
-#: ../libsvn_wc/wc_db.c:8280
+#: ../libsvn_wc/wc_db.c:8297
#, c-format
msgid "Cannot delete '%s' as it is excluded"
msgstr "Kan inte ta bort \"%s\" eftersom den är utesluten"
-#: ../libsvn_wc/wc_db.c:8737
+#: ../libsvn_wc/wc_db.c:8754
#, c-format
msgid "Cannot move '%s' to '%s' because they are not in the same working copy"
msgstr "Kan inte flytta \"%s\" till \"%s\" eftersom de inte är i samma arbetskopia"
-#: ../libsvn_wc/wc_db.c:8876
+#: ../libsvn_wc/wc_db.c:8893
#, c-format
msgid "Encountered invalid node state in column %d of info query to working copy database"
msgstr "Ogiltigt nodtillstånd påträffat i kolumn %d av informationsförfråga till databasen i arbetskopian"
-#: ../libsvn_wc/wc_db.c:9131
+#: ../libsvn_wc/wc_db.c:9148
#, c-format
msgid "Corrupt data for '%s'"
msgstr "Trasig data för \"%s\""
-#: ../libsvn_wc/wc_db.c:9203
+#: ../libsvn_wc/wc_db.c:9220
#, c-format
msgid "Error reading node '%s'"
msgstr "Fel vid läsning av nod \"%s\""
-#: ../libsvn_wc/wc_db.c:9461
+#: ../libsvn_wc/wc_db.c:9478
#, c-format
msgid "The node '%s' comes from unexpected repository '%s', expected '%s'; if this node is a file external using the correct URL in the external definition can fix the problem, see issue #4087"
msgstr "Noden \"%s\" tillhör arkiv \"%s\" istället för \"%s\"; om denna nod är en extern fil så kan problemet lösas genom att använda rätt URL i den externa definitionen, se felrapport nr 4087"
-#: ../libsvn_wc/wc_db.c:10135
+#: ../libsvn_wc/wc_db.c:10152
#, c-format
msgid "The node '%s' is not in working copy '%s'"
msgstr "Noden \"%s\" är inte i arbetskopian \"%s\""
-#: ../libsvn_wc/wc_db.c:10172
+#: ../libsvn_wc/wc_db.c:10189
#, c-format
msgid "The node '%s' is not installable"
msgstr "Noden \"%s\" kan inte installeras"
-#: ../libsvn_wc/wc_db.c:10613 ../libsvn_wc/wc_db.c:10810
+#: ../libsvn_wc/wc_db.c:10630 ../libsvn_wc/wc_db.c:10827
#, c-format
msgid "The node '%s' has a status that has no properties."
msgstr "Noden \"%s\" har ett tillstånd utan egenskaper."
-#: ../libsvn_wc/wc_db.c:12806
+#: ../libsvn_wc/wc_db.c:12823
#, c-format
msgid "Expected node '%s' to be added."
msgstr "Noden \"%s\" förväntades ha lagts till."
-#: ../libsvn_wc/wc_db.c:13135
+#: ../libsvn_wc/wc_db.c:13152
#, c-format
msgid "Path '%s' was not moved here"
msgstr "Sökvägen \"%s\" har inte flyttats hit"
-#: ../libsvn_wc/wc_db.c:13323
+#: ../libsvn_wc/wc_db.c:13340
#, c-format
msgid "Node '%s' is not shadowed"
msgstr "Nod \"%s\" är inte skuggad"
-#: ../libsvn_wc/wc_db.c:14565 ../libsvn_wc/wc_db.c:14613
+#: ../libsvn_wc/wc_db.c:14585 ../libsvn_wc/wc_db.c:14633
#, c-format
msgid "'%s' is already locked."
msgstr "\"%s\" är redan låst."
-#: ../libsvn_wc/wc_db.c:14570 ../libsvn_wc/wc_db.c:14621
+#: ../libsvn_wc/wc_db.c:14590 ../libsvn_wc/wc_db.c:14641
#, c-format
msgid "Working copy '%s' locked."
msgstr "Arbetskopian \"%s\" är låst."
-#: ../libsvn_wc/wc_db.c:14644
+#: ../libsvn_wc/wc_db.c:14664
#, c-format
msgid "Failed to lock working copy '%s'."
msgstr "Kunde inte låsa arbetskopia \"%s\"."
-#: ../libsvn_wc/wc_db.c:14693
+#: ../libsvn_wc/wc_db.c:14713
#, c-format
msgid "'%s' is already locked via '%s'."
msgstr "\"%s\" är redan låst genom \"%s\"."
-#: ../libsvn_wc/wc_db.c:14867
+#: ../libsvn_wc/wc_db.c:14887
#, c-format
msgid "Working copy not locked at '%s'."
msgstr "Arbetskopian inte låst vid \"%s\"."
-#: ../libsvn_wc/wc_db.c:15366
+#: ../libsvn_wc/wc_db.c:15386
#, c-format
msgid "Modification of '%s' already exists"
msgstr "Ãndringen av \"%s\" finns redan"
#. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT
#. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message.
-#: ../libsvn_wc/wc_db.c:15963
+#: ../libsvn_wc/wc_db.c:15983
#, c-format
msgid "database inconsistency at local_relpath='%s' verifying expression '%s'"
msgstr "inkonsistens i databasen vid \"local_relpath\" \"%s\" när uttrycket \"%s\" kontrollerades"
-#: ../libsvn_wc/wc_db.c:16152
+#: ../libsvn_wc/wc_db.c:16172
#, c-format
msgid "Can't upgrade '%s' as it is not a working copy root"
msgstr "Kan inte uppgradera \"%s\" eftersom den inte är rot till en arbetskopia"
-#: ../libsvn_wc/wc_db.c:16158
+#: ../libsvn_wc/wc_db.c:16178
#, c-format
msgid "Working copy '%s' is too old and must be upgraded to at least format %d, as created by Subversion %s"
msgstr "Arbetskopian \"%s\" är för gammal och måste uppgraderas till åtminstone format %d, vilket är vad Subversion %s använder"
-#: ../libsvn_wc/wc_db.c:16176
+#: ../libsvn_wc/wc_db.c:16196
msgid "Working copy upgrade failed"
msgstr "Uppgradering av arbetskopian misslyckades"
-#: ../libsvn_wc/wc_db.c:16277
+#: ../libsvn_wc/wc_db.c:16297
#, c-format
msgid "The path '%s' is not in the working copy '%s'"
msgstr "Sökvägen \"%s\" finns inte i arbetskopian \"%s\""
-#: ../libsvn_wc/wc_db_pristine.c:128 ../libsvn_wc/wc_db_pristine.c:468
-#, c-format
-msgid "The pristine text with checksum '%s' was not found"
-msgstr "Den orörda texten med kontrollsumma \"%s\" hittades inte"
-
-#: ../libsvn_wc/wc_db_pristine.c:194
+#: ../libsvn_wc/wc_db_pristine.c:191
#, c-format
msgid "Pristine text '%s' not present"
msgstr "Orörd text \"%s\" finns inte"
-#: ../libsvn_wc/wc_db_pristine.c:236
+#: ../libsvn_wc/wc_db_pristine.c:241
#, c-format
msgid "Can't read '%s' from pristine store because no checksum supplied"
msgstr "Kan inte läsa \"%s\" från lagringen av orörd data eftersom ingen kontrollsumma gavs"
-#: ../libsvn_wc/wc_db_pristine.c:320
-#, c-format
-msgid "New pristine text '%s' has different size: %s versus %s"
-msgstr "Ny orörd text \"%s\" har en annan storlek: %s gentemot %s"
-
-#: ../libsvn_wc/wc_db_pristine.c:389
+#: ../libsvn_wc/wc_db_pristine.c:449
msgid "Unable to create pristine install stream"
msgstr "Det gick inte att skapa en orörd installationsström"
-#: ../libsvn_wc/wc_db_pristine.c:507
+#: ../libsvn_wc/wc_db_pristine.c:582
#, c-format
msgid "The pristine text with MD5 checksum '%s' was not found"
msgstr "Den orörda texten med MD5-kontrollsumma \"%s\" hittades inte"
-#: ../libsvn_wc/wc_db_update_move.c:225
+#: ../libsvn_wc/wc_db_textbase.c:198
+msgid "Checksum mismatch while fetching text base"
+msgstr "Felaktig kontrollsumma vid nedladdning av textbas"
+
+#: ../libsvn_wc/wc_db_textbase.c:284 ../libsvn_wc/wc_db_textbase.c:296
+#: ../libsvn_wc/wc_db_textbase.c:310 ../libsvn_wc/wc_db_textbase.c:319
+#, c-format
+msgid "Unexpected entry for '%s'"
+msgstr "Oväntad post för \"%s\""
+
+#: ../libsvn_wc/wc_db_update_move.c:226
#, c-format
msgid "'%s' is not deleted"
msgstr "\"%s\" är inte raderad"
-#: ../libsvn_wc/wc_db_update_move.c:464 ../libsvn_wc/wc_db_update_move.c:488
+#: ../libsvn_wc/wc_db_update_move.c:465 ../libsvn_wc/wc_db_update_move.c:489
#, c-format
msgid "'%s' already in conflict"
msgstr "\"%s\" är redan i konflikt"
-#: ../libsvn_wc/wc_db_update_move.c:2190
+#: ../libsvn_wc/wc_db_update_move.c:2235
#, c-format
msgid "Cannot apply update because '%s' is a switched path (please switch it back to its original URL and try again)"
msgstr "Kan inte utföra uppdatering eftersom \"%s\" är en växlad sökväg (växla den tillbaka till dess ursprungliga URL och försök igen)"
-#: ../libsvn_wc/wc_db_update_move.c:2199
+#: ../libsvn_wc/wc_db_update_move.c:2244
#, c-format
msgid "Cannot apply update because '%s' is a mixed-revision working copy (please update and try again)"
msgstr "Kan inte utföra uppdatering eftersom \"%s\" är en arbetskopia med blandad revision (uppdatera och försök igen)"
-#: ../libsvn_wc/wc_db_update_move.c:2252
+#: ../libsvn_wc/wc_db_update_move.c:2297
#, c-format
msgid "The node '%s' has not been moved away"
msgstr "Noden \"%s\" har inte flyttats bort"
-#: ../libsvn_wc/wc_db_update_move.c:2716
+#: ../libsvn_wc/wc_db_update_move.c:2761
#, c-format
msgid "Cannot merge local changes from '%s' because '%s' already contains other local changes (please commit or revert these other changes and try again)"
msgstr "Kan inte slå samman lokala ändringar från \"%s\" eftersom \"%s\" redan innehåller andra lokala ändringar (arkivera eller återställ dessa andra ändringar och försök igen)"
-#: ../libsvn_wc/wc_db_update_move.c:4090
+#: ../libsvn_wc/wc_db_update_move.c:4160
#, c-format
msgid "'%s' is not in conflict"
msgstr "\"%s\" är inte i konflikt"
-#: ../libsvn_wc/wc_db_update_move.c:4103
+#: ../libsvn_wc/wc_db_update_move.c:4173
#, c-format
msgid "'%s' is not a valid tree-conflict victim"
msgstr "\"%s\" är inte ett giltigt offer för trädkonflikt"
-#: ../libsvn_wc/wc_db_update_move.c:4116
+#: ../libsvn_wc/wc_db_update_move.c:4186
#, c-format
msgid "'%s' is already a moved away tree-conflict"
msgstr "\"%s\" är redan en bortflyttad trädkonflikt"
@@ -11772,12 +11802,12 @@ msgstr "En rad i \"WCROOT\" saknas."
msgid "Working copy database '%s' not found"
msgstr "Arbetskopians databas \"%s\" hittades inte"
-#: ../libsvn_wc/wc_db_wcroot.c:320
+#: ../libsvn_wc/wc_db_wcroot.c:319
#, c-format
msgid "Working copy format of '%s' is too old (%d); please check out your working copy again"
msgstr "Arbetskopian \"%s\" har för gammalt format (%d); checka ut din arbetskopia igen"
-#: ../libsvn_wc/wc_db_wcroot.c:330
+#: ../libsvn_wc/wc_db_wcroot.c:329
#, c-format
msgid ""
"This client is too old to work with the working copy at\n"
@@ -11790,11 +11820,11 @@ msgstr ""
"En nyare Subversionklient behövs. För mer detaljer, se\n"
" https://subversion.apache.org/faq.html#working-copy-format-change\n"
-#: ../libsvn_wc/wc_db_wcroot.c:351
+#: ../libsvn_wc/wc_db_wcroot.c:350
msgid "Cleanup with an older 1.7 client before upgrading with this client"
msgstr "Kör (\"svn cleanup\") med en äldre version av Subversion 1.7 före uppgradering med denna klient"
-#: ../libsvn_wc/wc_db_wcroot.c:363
+#: ../libsvn_wc/wc_db_wcroot.c:362
#, c-format
msgid ""
"The working copy at '%s'\n"
@@ -11803,7 +11833,7 @@ msgstr ""
"Arbetskopian vid \"%s\"\n"
"är för gammal (format %d) för att kunna användas med en klient som har version \"%s\" (format %d förväntas). Arbetskopian måste uppgraderas först.\n"
-#: ../libsvn_wc/wc_db_wcroot.c:372
+#: ../libsvn_wc/wc_db_wcroot.c:371
#, c-format
msgid ""
"The working copy at '%s'\n"
@@ -11817,42 +11847,46 @@ msgstr ""
msgid "The symlink at '%s' points nowhere"
msgstr "Den symboliska länken vid \"%s\" pekar ingenstans"
-#: ../libsvn_wc/wc_db_wcroot.c:775
+#: ../libsvn_wc/wc_db_wcroot.c:805
#, c-format
msgid "Missing a row in WCROOT for '%s'."
msgstr "En rad i \"WCROOT\" saknas för \"%s\"."
-#: ../libsvn_wc/wc_db_wcroot.c:829
+#: ../libsvn_wc/wc_db_wcroot.c:860
#, c-format
msgid "The working copy at '%s' is corrupt."
msgstr "Förstörd arbetskopia \"%s\"."
-#: ../libsvn_wc/wc_db_wcroot.c:845
+#: ../libsvn_wc/wc_db_wcroot.c:876
#, c-format
msgid "The working copy database at '%s' is missing."
msgstr "Arbetskopians databas \"%s\" saknas."
-#: ../libsvn_wc/wc_db_wcroot.c:854
+#: ../libsvn_wc/wc_db_wcroot.c:885
#, c-format
msgid "The working copy database at '%s' is corrupt."
msgstr "Arbetskopians databas \"%s\" är trasig."
-#: ../libsvn_wc/wc_db_wcroot.c:1013
+#: ../libsvn_wc/wc_db_wcroot.c:1045
#, c-format
msgid "'%s' is not a working copy root"
msgstr "\"%s\" är inte rot till en arbetskopia"
+#: ../libsvn_wc/working_file_writer.c:77
+msgid "Unable to create file install stream"
+msgstr "Det gick inte att skapa filinstallationsström"
+
#: ../libsvn_wc/workqueue.c:550
#, c-format
msgid "Can't install '%s' from pristine store, because no checksum is recorded for this file"
msgstr "Kan inte installera \"%s\" från lagringen av orörd data eftersom ingen kontrollsumma har registrerats för denna fil"
-#: ../libsvn_wc/workqueue.c:1496
+#: ../libsvn_wc/workqueue.c:1502
#, c-format
msgid "Unrecognized work item in the queue"
msgstr "Okänt element i arbetskön"
-#: ../libsvn_wc/workqueue.c:1579
+#: ../libsvn_wc/workqueue.c:1585
#, c-format
msgid "Failed to run the WC DB work queue associated with '%s', work item %d %s"
msgstr "Misslyckades med att behandla arbetskopians databaskö kopplad till \"%s\", element %d %s"
@@ -11865,131 +11899,131 @@ msgstr "Kunde inte lägga till alla mål
msgid "Could not add all targets because some targets are already versioned"
msgstr "Kunde inte lägga till alla mål eftersom några mål redan är versionshanterade"
-#: ../svn/auth-cmd.c:72
+#: ../svn/auth-cmd.c:71
#, c-format
msgid "Automatic certificate validity check failed because:\n"
msgstr "Automatisk giltighetskontroll av certifikat misslyckades eftersom:\n"
-#: ../svn/auth-cmd.c:77
+#: ../svn/auth-cmd.c:76
#, c-format
msgid " The certificate is not yet valid.\n"
msgstr " Certifikatet är inte giltigt än.\n"
-#: ../svn/auth-cmd.c:81
+#: ../svn/auth-cmd.c:80
#, c-format
msgid " The certificate has expired.\n"
msgstr " Certifikatet har gått ut.\n"
-#: ../svn/auth-cmd.c:85
+#: ../svn/auth-cmd.c:84
#, c-format
msgid " The certificate's Common Name (hostname) does not match the remote hostname.\n"
msgstr " Certifikatets vanliga namn (värdnamn) stämmer inte med fjärrdatorns värdnamn.\n"
-#: ../svn/auth-cmd.c:90
+#: ../svn/auth-cmd.c:89
#, c-format
msgid " The certificate issuer is unknown.\n"
msgstr " Utfärdaren av certifikatet är okänd.\n"
-#: ../svn/auth-cmd.c:94
+#: ../svn/auth-cmd.c:93
#, c-format
msgid " Unknown verification failure.\n"
msgstr " Okänt kontrollfel.\n"
-#: ../svn/auth-cmd.c:261
+#: ../svn/auth-cmd.c:260
#, c-format
msgid "Subject: %s\n"
msgstr "Ãmne: %s\n"
-#: ../svn/auth-cmd.c:263
+#: ../svn/auth-cmd.c:262
#, c-format
msgid "Valid from: %s\n"
msgstr "Giltigt från: %s\n"
-#: ../svn/auth-cmd.c:267
+#: ../svn/auth-cmd.c:266
#, c-format
msgid "Valid until: %s\n"
msgstr "Giltigt till och med %s:\n"
-#: ../svn/auth-cmd.c:271
+#: ../svn/auth-cmd.c:270
#, c-format
msgid "Issuer: %s\n"
msgstr "Utfärdare: %s\n"
-#: ../svn/auth-cmd.c:273
+#: ../svn/auth-cmd.c:272
#, c-format
msgid "Fingerprint: %s\n"
msgstr "Fingeravtryck: %s\n"
-#: ../svn/auth-cmd.c:290
+#: ../svn/auth-cmd.c:289
#, c-format
msgid "Hostnames: %s\n"
msgstr "Datornamn: %s\n"
-#: ../svn/auth-cmd.c:310
+#: ../svn/auth-cmd.c:309
#, c-format
msgid "Credential kind: %s\n"
msgstr "Klientreferenstyp: %s\n"
-#: ../svn/auth-cmd.c:330
+#: ../svn/auth-cmd.c:329
#, c-format
msgid "Password: %s\n"
msgstr "Lösenord: %s\n"
-#: ../svn/auth-cmd.c:332
+#: ../svn/auth-cmd.c:331
#, c-format
msgid "Password: [not shown]\n"
msgstr "Lösenord: [visas ej]\n"
-#: ../svn/auth-cmd.c:338
+#: ../svn/auth-cmd.c:337
#, c-format
msgid "Passphrase: %s\n"
msgstr "Lösenordsfras: %s\n"
-#: ../svn/auth-cmd.c:341
+#: ../svn/auth-cmd.c:340
#, c-format
msgid "Passphrase: [not shown]\n"
msgstr "Lösenordsfras: [visas ej]\n"
-#: ../svn/auth-cmd.c:344
+#: ../svn/auth-cmd.c:343
#, c-format
msgid "Password cache: %s\n"
msgstr "Lösenordscache: %s\n"
-#: ../svn/auth-cmd.c:347
+#: ../svn/auth-cmd.c:346
#, c-format
msgid "Username: %s\n"
msgstr "Användarnamn: %s\n"
-#: ../svn/auth-cmd.c:399
+#: ../svn/auth-cmd.c:398
#, c-format
msgid "Deleting %s credential for realm '%s'\n"
msgstr "Raderar klientreferens av typ %s för autentiseringsregion \"%s\"\n"
-#: ../svn/auth-cmd.c:446
+#: ../svn/auth-cmd.c:445
#, c-format
msgid "Credentials cache in '%s' is empty\n"
msgstr "Klientreferenscache i \"%s\" är tom\n"
-#: ../svn/auth-cmd.c:450 ../svn/auth-cmd.c:476
+#: ../svn/auth-cmd.c:449 ../svn/auth-cmd.c:475
#, c-format
msgid "Credentials cache in '%s' contains no matching credentials"
msgstr "Klientreferenscache i \"%s\" innehåller inga passande klientreferenser"
-#: ../svn/auth-cmd.c:458
+#: ../svn/auth-cmd.c:457
#, c-format
msgid "Credentials cache in '%s' contains %d credential\n"
msgid_plural "Credentials cache in '%s' contains %d credentials\n"
msgstr[0] "Klientreferenscache i \"%s\" innehåller %d klientreferens\n"
msgstr[1] "Klientreferenscache i \"%s\" innehåller %d klientreferenser\n"
-#: ../svn/auth-cmd.c:464
+#: ../svn/auth-cmd.c:463
#, c-format
msgid "Credentials cache in '%s' contains %d matching credential\n"
msgid_plural "Credentials cache in '%s' contains %d matching credentials\n"
msgstr[0] "Klientreferenscache i \"%s\" innehåller %d passande klientreferens\n"
msgstr[1] "Klientreferenscache i \"%s\" innehåller %d passande klientreferenser\n"
-#: ../svn/auth-cmd.c:481
+#: ../svn/auth-cmd.c:480
#, c-format
msgid "Deleted %d matching credential from '%s'\n"
msgid_plural "Deleted %d matching credentials from '%s'\n"
@@ -12038,7 +12072,7 @@ msgstr "Kunde inte sätta ändringslista
msgid "'%s' does not appear to be a URL"
msgstr "\"%s\" verkar inte vara en URL"
-#: ../svn/checkout-cmd.c:182 ../svn/export-cmd.c:130 ../svn/list-cmd.c:508
+#: ../svn/checkout-cmd.c:183 ../svn/export-cmd.c:130 ../svn/list-cmd.c:508
#: ../svn/switch-cmd.c:191 ../svn/update-cmd.c:181
msgid "Failure occurred processing one or more externals definitions"
msgstr "Fel vid behandlingen av en eller flera externals-definitioner"
@@ -12763,252 +12797,260 @@ msgstr "svn-viewspec.py format 1 stöder
msgid "svn-viewspec.py format 1 does not support the 'switched' state found at '%s'"
msgstr "svn-viewspect.py format 1 stöder inte \"switched\"-tillståndet som fanns vid \"%s\""
-#: ../svn/info-cmd.c:479
+#: ../svn/info-cmd.c:481
#, c-format
msgid "'%s' is not a valid value for --show-item"
msgstr "\"%s\" är inte ett giltigt värde för --show-item"
-#: ../svn/info-cmd.c:487
+#: ../svn/info-cmd.c:489
#, c-format
msgid "'%s' is not a valid value for --show-item; did you mean '%s'?"
msgstr "\"%s\" är inget giltigt värde för --show-item; menade du \"%s\"?"
-#: ../svn/info-cmd.c:497
+#: ../svn/info-cmd.c:499
#, c-format
msgid "'%s' is not a valid value for --show-item; did you mean '%s' or '%s'?"
msgstr "\"%s\" är inget giltigt värde för --show-item; menade du \"%s\" eller \"%s\"?"
-#: ../svn/info-cmd.c:508
+#: ../svn/info-cmd.c:510
#, c-format
msgid "'%s' is not a valid value for --show-item; did you mean '%s', '%s' or '%s'?"
msgstr "\"%s\" är inget giltigt värde för --show-item; menade du \"%s\", \"%s\" eller \"%s\"?"
-#: ../svn/info-cmd.c:532
+#: ../svn/info-cmd.c:534
msgid "Resource is not under version control."
msgstr "Resursen är inte versionshanterad."
-#: ../svn/info-cmd.c:739 ../svnadmin/svnadmin.c:2400
+#: ../svn/info-cmd.c:745 ../svnadmin/svnadmin.c:2400
#: ../svnadmin/svnadmin.c:2636
#, c-format
msgid "Path: %s\n"
msgstr "Sökväg: %s\n"
-#: ../svn/info-cmd.c:746
+#: ../svn/info-cmd.c:752
#, c-format
msgid "Name: %s\n"
msgstr "Namn: %s\n"
-#: ../svn/info-cmd.c:750
+#: ../svn/info-cmd.c:756
#, c-format
msgid "Working Copy Root Path: %s\n"
msgstr "Sökväg till arbetskopians rot: %s\n"
-#: ../svn/info-cmd.c:760
+#: ../svn/info-cmd.c:766
#, c-format
msgid "Working Copy Compatible With Version: %d.%d\n"
msgstr "Arbetskopia kompatibel med version: %d.%d\n"
-#: ../svn/info-cmd.c:762
+#: ../svn/info-cmd.c:768
#, c-format
msgid "Working Copy Format: %d\n"
msgstr "Arbetskopieformat: %d\n"
-#: ../svn/info-cmd.c:768
+#: ../svn/info-cmd.c:775
+msgid "Working Copy Store Pristine: yes\n"
+msgstr "Arbetskopian lagrar orörda filer: ja\n"
+
+#: ../svn/info-cmd.c:778
+msgid "Working Copy Store Pristine: no\n"
+msgstr "Arbetskopian lagrar orörda filer: nej\n"
+
+#: ../svn/info-cmd.c:783
#, c-format
msgid "URL: %s\n"
msgstr "URL: %s\n"
-#: ../svn/info-cmd.c:771
+#: ../svn/info-cmd.c:786
#, c-format
msgid "Relative URL: %s\n"
msgstr "Relativ URL: %s\n"
-#: ../svn/info-cmd.c:775
+#: ../svn/info-cmd.c:790
#, c-format
msgid "Repository Root: %s\n"
msgstr "Arkivrot: %s\n"
-#: ../svn/info-cmd.c:779
+#: ../svn/info-cmd.c:794
#, c-format
msgid "Repository UUID: %s\n"
msgstr "Arkivets UUID: %s\n"
-#: ../svn/info-cmd.c:783
+#: ../svn/info-cmd.c:798
#, c-format
msgid "Revision: %ld\n"
msgstr "Revision: %ld\n"
-#: ../svn/info-cmd.c:788
+#: ../svn/info-cmd.c:803
#, c-format
msgid "Node Kind: file\n"
msgstr "Nodtyp: fil\n"
-#: ../svn/info-cmd.c:792
+#: ../svn/info-cmd.c:807
#, c-format
msgid "Node Kind: directory\n"
msgstr "Nodtyp: katalog\n"
-#: ../svn/info-cmd.c:796
+#: ../svn/info-cmd.c:811
#, c-format
msgid "Node Kind: none\n"
msgstr "Nodtyp: ingen\n"
-#: ../svn/info-cmd.c:801
+#: ../svn/info-cmd.c:816
#, c-format
msgid "Node Kind: unknown\n"
msgstr "Nodtyp: okänd\n"
-#: ../svn/info-cmd.c:811
+#: ../svn/info-cmd.c:826
#, c-format
msgid "Size in Repository: %s\n"
msgstr "Storlek i arkivet: %s\n"
-#: ../svn/info-cmd.c:820
+#: ../svn/info-cmd.c:835
#, c-format
msgid "Schedule: normal\n"
msgstr "Schemalagd: normal\n"
-#: ../svn/info-cmd.c:824
+#: ../svn/info-cmd.c:839
#, c-format
msgid "Schedule: add\n"
msgstr "Schemalagd: att läggas till\n"
-#: ../svn/info-cmd.c:828
+#: ../svn/info-cmd.c:843
#, c-format
msgid "Schedule: delete\n"
msgstr "Schemalagd: att raderas\n"
-#: ../svn/info-cmd.c:832
+#: ../svn/info-cmd.c:847
#, c-format
msgid "Schedule: replace\n"
msgstr "Schemalagd: att ersättas\n"
-#: ../svn/info-cmd.c:848
+#: ../svn/info-cmd.c:863
#, c-format
msgid "Depth: empty\n"
msgstr "Djup: \"empty\"\n"
-#: ../svn/info-cmd.c:852
+#: ../svn/info-cmd.c:867
#, c-format
msgid "Depth: files\n"
msgstr "Djup: \"files\"\n"
-#: ../svn/info-cmd.c:856
+#: ../svn/info-cmd.c:871
#, c-format
msgid "Depth: immediates\n"
msgstr "Djup: \"immediates\"\n"
-#: ../svn/info-cmd.c:860
+#: ../svn/info-cmd.c:875
#, c-format
msgid "Depth: exclude\n"
msgstr "Djup: \"exclude\"\n"
#. Other depths should never happen here.
-#: ../svn/info-cmd.c:871
+#: ../svn/info-cmd.c:886
#, c-format
msgid "Depth: INVALID\n"
msgstr "Djup: OGILTIGT\n"
-#: ../svn/info-cmd.c:875
+#: ../svn/info-cmd.c:890
#, c-format
msgid "Copied From URL: %s\n"
msgstr "Kopierad från URL: %s\n"
-#: ../svn/info-cmd.c:879
+#: ../svn/info-cmd.c:894
#, c-format
msgid "Copied From Rev: %ld\n"
msgstr "Kopierad från revision: %ld\n"
-#: ../svn/info-cmd.c:882
+#: ../svn/info-cmd.c:897
#, c-format
msgid "Moved From: %s\n"
msgstr "Flyttad från: %s\n"
# ###
-#: ../svn/info-cmd.c:889
+#: ../svn/info-cmd.c:904
#, c-format
msgid "Moved To: %s\n"
msgstr "Flyttad till: %s\n"
-#: ../svn/info-cmd.c:897
+#: ../svn/info-cmd.c:912
#, c-format
msgid "Last Changed Author: %s\n"
msgstr "Författare till senaste ändringen: %s\n"
-#: ../svn/info-cmd.c:901
+#: ../svn/info-cmd.c:916
#, c-format
msgid "Last Changed Rev: %ld\n"
msgstr "Senast ändrad i revision: %ld\n"
-#: ../svn/info-cmd.c:906
+#: ../svn/info-cmd.c:921
msgid "Last Changed Date"
msgstr "Datum för senaste ändringen"
-#: ../svn/info-cmd.c:912
+#: ../svn/info-cmd.c:927
msgid "Text Last Updated"
msgstr "Innehållet senast uppdaterat"
-#: ../svn/info-cmd.c:915
+#: ../svn/info-cmd.c:930
#, c-format
msgid "Checksum: %s\n"
msgstr "Kontrollsumma: %s\n"
-#: ../svn/info-cmd.c:949
+#: ../svn/info-cmd.c:964
#, c-format
msgid "Conflict Previous Base File: %s\n"
msgstr "Konflikt: föregående basfil: %s\n"
-#: ../svn/info-cmd.c:957
+#: ../svn/info-cmd.c:972
#, c-format
msgid "Conflict Previous Working File: %s\n"
msgstr "Konflikt: föregående arbetsfil: %s\n"
-#: ../svn/info-cmd.c:965
+#: ../svn/info-cmd.c:980
#, c-format
msgid "Conflict Current Base File: %s\n"
msgstr "Konflikt: nuvarande basfil: %s\n"
-#: ../svn/info-cmd.c:1001
+#: ../svn/info-cmd.c:1016
msgid "Tree conflict"
msgstr "Trädkonflikt"
-#: ../svn/info-cmd.c:1005
+#: ../svn/info-cmd.c:1020
#, c-format
msgid "Conflicted Properties: %s\n"
msgstr "Konfliktegenskaper: %s\n"
-#: ../svn/info-cmd.c:1031
+#: ../svn/info-cmd.c:1046
msgid "Conflict Details"
msgstr "Konfliktdetaljer"
-#: ../svn/info-cmd.c:1052
+#: ../svn/info-cmd.c:1067
msgid "Source left"
msgstr "Källa vänster"
-#: ../svn/info-cmd.c:1061
+#: ../svn/info-cmd.c:1076
msgid "Source right"
msgstr "Källa höger"
# ###
-#: ../svn/info-cmd.c:1070
+#: ../svn/info-cmd.c:1085
#, c-format
msgid "Lock Token: %s\n"
msgstr "LÃ¥sidentifierare: %s\n"
-#: ../svn/info-cmd.c:1074
+#: ../svn/info-cmd.c:1089
#, c-format
msgid "Lock Owner: %s\n"
msgstr "Låsägare: %s\n"
-#: ../svn/info-cmd.c:1079
+#: ../svn/info-cmd.c:1094
msgid "Lock Created"
msgstr "LÃ¥s skapat"
-#: ../svn/info-cmd.c:1083
+#: ../svn/info-cmd.c:1098
msgid "Lock Expires"
msgstr "Låset går ut"
-#: ../svn/info-cmd.c:1091
+#: ../svn/info-cmd.c:1106
#, c-format
msgid ""
"Lock Comment (%i line):\n"
@@ -13023,41 +13065,41 @@ msgstr[1] ""
"LÃ¥skommentar (%i rader):\n"
"%s\n"
-#: ../svn/info-cmd.c:1100
+#: ../svn/info-cmd.c:1115
#, c-format
msgid "Changelist: %s\n"
msgstr "Ãndringslista: %s\n"
-#: ../svn/info-cmd.c:1220
+#: ../svn/info-cmd.c:1235
#, c-format
msgid "can't show in-repository size of working copy file '%s'"
msgstr "kan inte visa storlek i arkivet för arbetskopians fil \"%s\""
-#: ../svn/info-cmd.c:1348
+#: ../svn/info-cmd.c:1382
msgid "--show-item is not valid in --xml mode"
msgstr "--show-item är inte giltig i läget --xml"
-#: ../svn/info-cmd.c:1352
+#: ../svn/info-cmd.c:1386
msgid "--no-newline is not valid in --xml mode"
msgstr "--new-newline är inte giltig i läget --xml"
-#: ../svn/info-cmd.c:1356 ../svn/list-cmd.c:356
+#: ../svn/info-cmd.c:1390 ../svn/list-cmd.c:356
msgid "--human-readable is not valid in --xml mode"
msgstr "--human-readable är inte giltig i läget --xml"
-#: ../svn/info-cmd.c:1371 ../svn/info-cmd.c:1391 ../svn/list-cmd.c:369
+#: ../svn/info-cmd.c:1405 ../svn/info-cmd.c:1425 ../svn/list-cmd.c:369
msgid "--incremental is only valid in --xml mode"
msgstr "--incremental är endast tillåten i läget --xml"
-#: ../svn/info-cmd.c:1378
+#: ../svn/info-cmd.c:1412
msgid "--no-newline is only available for single-target, non-recursive info operations"
msgstr "--no-newline är endast tillgänglig för icke-rekursiva informationsoperationer på ett enda mål"
-#: ../svn/info-cmd.c:1395
+#: ../svn/info-cmd.c:1429
msgid "--no-newline' is only valid with --show-item"
msgstr "--no-newline är endast tillåten tillsammans med --show-item"
-#: ../svn/info-cmd.c:1468 ../svnbench/null-info-cmd.c:283
+#: ../svn/info-cmd.c:1502 ../svnbench/null-info-cmd.c:283
msgid "Could not display info for all targets because some targets don't exist"
msgstr "Kunde inte visa information för alla mål eftersom några mål inte finns"
@@ -13094,87 +13136,87 @@ msgstr "Låskommentaren innehåller en n
msgid "One or more locks could not be obtained"
msgstr "Ett eller flera lås kunde inte tas"
-#: ../svn/log-cmd.c:117 ../svn/svn.c:1108 ../svn/svn.c:1180 ../svn/svn.c:1246
+#: ../svn/log-cmd.c:111 ../svn/svn.c:1141 ../svn/svn.c:1213 ../svn/svn.c:1279
msgid "\n"
msgstr "\n"
-#: ../svn/log-cmd.c:347
+#: ../svn/log-cmd.c:341
msgid "(no author)"
msgstr "(författare saknas)"
-#: ../svn/log-cmd.c:353
+#: ../svn/log-cmd.c:347
msgid "(no date)"
msgstr "(datum saknas)"
-#: ../svn/log-cmd.c:389
+#: ../svn/log-cmd.c:377
#, c-format
msgid " | %d line"
msgid_plural " | %d lines"
msgstr[0] " | %d rad"
msgstr[1] " | %d rader"
-#: ../svn/log-cmd.c:406
+#: ../svn/log-cmd.c:394
#, c-format
msgid "Changed paths:\n"
msgstr "Ãndrade sökvägar:\n"
-#: ../svn/log-cmd.c:426
+#: ../svn/log-cmd.c:414
#, c-format
msgid " (from %s:%ld)"
msgstr " (från %s:%ld)"
-#: ../svn/log-cmd.c:444
+#: ../svn/log-cmd.c:432
#, c-format
msgid "Reverse merged via:"
msgstr "Omvänt sammanslaget från:"
-#: ../svn/log-cmd.c:446
+#: ../svn/log-cmd.c:434
#, c-format
msgid "Merged via:"
msgstr "Sammanslaget från:"
-#: ../svn/log-cmd.c:778
+#: ../svn/log-cmd.c:717
msgid "'with-all-revprops' option only valid in XML mode"
msgstr "Flaggan \"with-all-revprops\" är endast tillåten i XML-läge"
-#: ../svn/log-cmd.c:782
+#: ../svn/log-cmd.c:721
msgid "'with-no-revprops' option only valid in XML mode"
msgstr "Flaggan \"with-no-revprops\" är endast tillåten i XML-läge"
-#: ../svn/log-cmd.c:786
+#: ../svn/log-cmd.c:725
msgid "'with-revprop' option only valid in XML mode"
msgstr "Flaggan \"with-revprop\" är endast tillåten i XML-läge"
-#: ../svn/log-cmd.c:793
+#: ../svn/log-cmd.c:732
msgid "'diff' option is not supported in XML mode"
msgstr "Flaggan \"diff\" stöds ej i XML-läge"
-#: ../svn/log-cmd.c:799
+#: ../svn/log-cmd.c:738
msgid "'diff-cmd' option requires 'diff' option"
msgstr "Flaggan \"diff-cmd\" måste användas med flaggan \"diff\""
-#: ../svn/log-cmd.c:803
+#: ../svn/log-cmd.c:742
msgid "'internal-diff' option requires 'diff' option"
msgstr "Flaggan \"internal-diff\" måste användas med flaggan \"diff\""
-#: ../svn/log-cmd.c:807
+#: ../svn/log-cmd.c:746
msgid "'extensions' option requires 'diff' option"
msgstr "Flaggan \"extensions\" måste användas med flaggan \"diff\""
-#: ../svn/log-cmd.c:812
+#: ../svn/log-cmd.c:751
msgid "'depth' option requires 'diff' option"
msgstr "Flaggan \"depth\" måste användas med flaggan \"diff\""
-#: ../svn/log-cmd.c:828 ../svnbench/null-log-cmd.c:158
+#: ../svn/log-cmd.c:767 ../svnbench/null-log-cmd.c:158
msgid "-c and -r are mutually exclusive"
msgstr "-c och -r kan inte användas samtidigt"
-#: ../svn/log-cmd.c:860
+#: ../svn/log-cmd.c:799
#, c-format
msgid "Only relative paths can be specified after a URL for 'svn log', but '%s' is not a relative path"
msgstr "Endast relativa sökvägar kan anges efter en URL för \"svn log\", men \"%s\" är inte en relativ sökväg"
-#: ../svn/log-cmd.c:907
+#: ../svn/log-cmd.c:846
#, c-format
msgid "cannot assign with 'with-revprop' option (drop the '=')"
msgstr "kan inte tilldela med flaggan \"with-revprop\" (ta bort \"=\")"
@@ -13296,203 +13338,203 @@ msgstr "Försök med \"svn add\" eller \
msgid "Try 'svn mkdir --parents' instead?"
msgstr "Försök med \"svn mkdir --parents\" istället?"
-#: ../svn/notify.c:135
+#: ../svn/notify.c:137
#, c-format
msgid "%d remaining"
msgid_plural "%d remaining"
msgstr[0] "%d återstår"
msgstr[1] "%d återstår"
-#: ../svn/notify.c:144
+#: ../svn/notify.c:146
#, c-format
msgid "and %d already resolved"
msgid_plural "and %d already resolved"
msgstr[0] "och %d redan löst"
msgstr[1] "och %d redan lösta"
-#: ../svn/notify.c:236 ../svn/status-cmd.c:93
+#: ../svn/notify.c:238 ../svn/status-cmd.c:93
#, c-format
msgid "Summary of conflicts:\n"
msgstr "Konfliktsammanfattning:\n"
-#: ../svn/notify.c:242
+#: ../svn/notify.c:244
#, c-format
msgid " Text conflicts: %d\n"
msgstr " Textkonflikter: %d\n"
-#: ../svn/notify.c:246
+#: ../svn/notify.c:248
#, c-format
msgid " Property conflicts: %d\n"
msgstr " Egenskapskonflikter: %d\n"
-#: ../svn/notify.c:250
+#: ../svn/notify.c:252
#, c-format
msgid " Tree conflicts: %d\n"
msgstr " Trädkonflikter: %d\n"
-#: ../svn/notify.c:257
+#: ../svn/notify.c:259
#, c-format
msgid " Text conflicts: %s (%s)\n"
msgstr " Textkonflikter: %s (%s)\n"
-#: ../svn/notify.c:262
+#: ../svn/notify.c:264
#, c-format
msgid " Property conflicts: %s (%s)\n"
msgstr " Egenskapskonflikter: %s (%s)\n"
-#: ../svn/notify.c:267
+#: ../svn/notify.c:269
#, c-format
msgid " Tree conflicts: %s (%s)\n"
msgstr " Trädkonflikter: %s (%s)\n"
-#: ../svn/notify.c:273
+#: ../svn/notify.c:275
#, c-format
msgid " Skipped paths: %d\n"
msgstr " Ãverhoppade sökvägar: %d\n"
-#: ../svn/notify.c:327 ../svnbench/notify.c:107
+#: ../svn/notify.c:329 ../svnbench/notify.c:107
#, c-format
msgid "Skipped missing target: '%s'\n"
msgstr "Hoppade över saknat mål: \"%s\"\n"
-#: ../svn/notify.c:334 ../svnbench/notify.c:114
+#: ../svn/notify.c:336 ../svnbench/notify.c:114
#, c-format
msgid "Skipped target: '%s' -- copy-source is missing\n"
msgstr "Hoppade över mål: \"%s\" -- kopieringskällan saknas\n"
-#: ../svn/notify.c:341
+#: ../svn/notify.c:343
#, c-format
msgid "Skipped '%s' -- obstructed by unversioned node\n"
msgstr "Hoppade över \"%s\" -- blockerad av icke versionshanterad nod\n"
-#: ../svn/notify.c:346 ../svnbench/notify.c:121
+#: ../svn/notify.c:348 ../svnbench/notify.c:121
#, c-format
msgid "Skipped '%s'\n"
msgstr "Hoppade över \"%s\"\n"
-#: ../svn/notify.c:353 ../svnbench/notify.c:128
+#: ../svn/notify.c:355 ../svnbench/notify.c:128
#, c-format
msgid "Skipped '%s' -- An obstructing working copy was found\n"
msgstr "Hoppade över \"%s\" -- En arbetskopia hittades som var i vägen\n"
-#: ../svn/notify.c:359 ../svnbench/notify.c:135
+#: ../svn/notify.c:361 ../svnbench/notify.c:135
#, c-format
msgid "Skipped '%s' -- Has no versioned parent\n"
msgstr "Hoppade över \"%s\" -- Saknar versionshanterad förälder\n"
-#: ../svn/notify.c:365 ../svnbench/notify.c:142
+#: ../svn/notify.c:367 ../svnbench/notify.c:142
#, c-format
msgid "Skipped '%s' -- Access denied\n"
msgstr "Hoppade över \"%s\" -- Ã
tkomst nekas\n"
-#: ../svn/notify.c:371 ../svnbench/notify.c:149
+#: ../svn/notify.c:373 ../svnbench/notify.c:149
#, c-format
msgid "Skipped '%s' -- Node remains in conflict\n"
msgstr "Hoppade över \"%s\" -- Noden är fortfarande i konflikt\n"
-#: ../svn/notify.c:387
+#: ../svn/notify.c:389
#, c-format
msgid "Removed external '%s': %s\n"
msgstr "Tog bort extern referens \"%s\": %s\n"
-#: ../svn/notify.c:392
+#: ../svn/notify.c:394
#, c-format
msgid "Removed external '%s'\n"
msgstr "Tog bort extern referens \"%s\"\n"
-#: ../svn/notify.c:398
+#: ../svn/notify.c:400
#, c-format
msgid "Left local modifications as '%s'\n"
msgstr "Lokala ändringar kvarlämnade som \"%s\"\n"
-#: ../svn/notify.c:442 ../svnbench/notify.c:233
+#: ../svn/notify.c:444 ../svnbench/notify.c:233
#, c-format
msgid "Restored '%s'\n"
msgstr "Ã
terskapade \"%s\"\n"
-#: ../svn/notify.c:447 ../svnbench/notify.c:239
+#: ../svn/notify.c:449 ../svnbench/notify.c:239
#, c-format
msgid "Reverted '%s'\n"
msgstr "Ã
terställde \"%s\"\n"
-#: ../svn/notify.c:452 ../svnbench/notify.c:245
+#: ../svn/notify.c:454 ../svnbench/notify.c:245
#, c-format
msgid "Failed to revert '%s' -- try updating instead.\n"
msgstr "Misslyckades med att återställa \"%s\" -- försök uppdatera istället.\n"
-#: ../svn/notify.c:459 ../svnbench/notify.c:253
+#: ../svn/notify.c:461 ../svnbench/notify.c:253
#, c-format
msgid "Resolved conflicted state of '%s'\n"
msgstr "Löste konflikttillståndet för \"%s\"\n"
-#: ../svn/notify.c:465
+#: ../svn/notify.c:467
#, c-format
msgid "Merge conflicts in '%s' marked as resolved.\n"
msgstr "Sammansmältningskonflikter i \"%s\" markerade som löst.\n"
-#: ../svn/notify.c:473
+#: ../svn/notify.c:475
#, c-format
msgid "Conflict in property '%s' at '%s' marked as resolved.\n"
msgstr "Konflikt för egenskapen \"%s\" i \"%s\" markerad som löst.\n"
-#: ../svn/notify.c:480
+#: ../svn/notify.c:482
#, c-format
msgid "Tree conflict at '%s' marked as resolved.\n"
msgstr "Trädkonflikt på \"%s\" markerad som löst.\n"
-#: ../svn/notify.c:487
+#: ../svn/notify.c:489
#, c-format
msgid "Searching tree conflict details for '%s' in repository:\n"
msgstr "Letar efter trädkonfliktsdetaljer för \"%s\" i arkivet:\n"
-#: ../svn/notify.c:509
+#: ../svn/notify.c:511
#, c-format
msgid " done\n"
msgstr " klart\n"
-#: ../svn/notify.c:601 ../svn/notify.c:638 ../svnbench/notify.c:344
+#: ../svn/notify.c:603 ../svn/notify.c:640 ../svnbench/notify.c:344
#: ../svnbench/notify.c:384
#, c-format
msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s"
msgstr "> anbragte stycke ## -%lu,%lu +%lu,%lu ## med förskjutning %s"
-#: ../svn/notify.c:618 ../svn/notify.c:652 ../svnbench/notify.c:361
+#: ../svn/notify.c:620 ../svn/notify.c:654 ../svnbench/notify.c:361
#: ../svnbench/notify.c:398
#, c-format
msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s"
msgstr "> anbragte stycke @@ -%lu,%lu +%lu,%lu @@ med förskjutning %s"
-#: ../svn/notify.c:670 ../svnbench/notify.c:419
+#: ../svn/notify.c:672 ../svnbench/notify.c:419
#, c-format
msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n"
msgstr "> anbragte stycke ## -%lu,%lu +%lu,%lu ## med oskärpa %lu (%s)\n"
-#: ../svn/notify.c:680 ../svnbench/notify.c:429
+#: ../svn/notify.c:682 ../svnbench/notify.c:429
#, c-format
msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n"
msgstr "> anbragte stycke @@ -%lu,%lu +%lu,%lu @@ med oskärpa %lu\n"
-#: ../svn/notify.c:696 ../svnbench/notify.c:447
+#: ../svn/notify.c:698 ../svnbench/notify.c:447
#, c-format
msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n"
msgstr "> avslog stycke ## -%lu,%lu +%lu,%lu ## (%s)\n"
-#: ../svn/notify.c:705 ../svnbench/notify.c:456
+#: ../svn/notify.c:707 ../svnbench/notify.c:456
#, c-format
msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n"
msgstr "> avslog stycke @@ -%lu,%lu +%lu,%lu @@\n"
-#: ../svn/notify.c:717 ../svnbench/notify.c:470
+#: ../svn/notify.c:719 ../svnbench/notify.c:470
#, c-format
msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n"
msgstr "> stycke ## -%lu,%lu +%lu,%lu ## redan anbragt (%s)\n"
-#: ../svn/notify.c:727 ../svnbench/notify.c:480
+#: ../svn/notify.c:729 ../svnbench/notify.c:480
#, c-format
msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n"
msgstr "> stycke @@ -%lu,%lu +%lu,%lu @@ redan anbragt\n"
-#: ../svn/notify.c:784 ../svnbench/notify.c:542
+#: ../svn/notify.c:786 ../svnbench/notify.c:542
#, c-format
msgid ""
"\n"
@@ -13501,87 +13543,87 @@ msgstr ""
"\n"
"Hämtar externt objekt till \"%s\":\n"
-#: ../svn/notify.c:808 ../svnbench/notify.c:568
+#: ../svn/notify.c:810 ../svnbench/notify.c:568
#, c-format
msgid "Error handling externals definition for '%s':"
msgstr "Fel vid hantering av externa definitionen för \"%s\":"
-#: ../svn/notify.c:821 ../svnbench/notify.c:581
+#: ../svn/notify.c:823 ../svnbench/notify.c:581
#, c-format
msgid "Updating '%s':\n"
msgstr "Uppdaterar \"%s\":\n"
-#: ../svn/notify.c:834 ../svnbench/notify.c:595
+#: ../svn/notify.c:836 ../svnbench/notify.c:595
#, c-format
msgid "Exported external at revision %ld.\n"
msgstr "Exporterade extern katalog vid revision %ld.\n"
-#: ../svn/notify.c:835 ../svnbench/notify.c:596
+#: ../svn/notify.c:837 ../svnbench/notify.c:596
#, c-format
msgid "Exported revision %ld.\n"
msgstr "Exporterade revision %ld.\n"
-#: ../svn/notify.c:842 ../svnbench/notify.c:604
+#: ../svn/notify.c:844 ../svnbench/notify.c:604
#, c-format
msgid "Checked out external at revision %ld.\n"
msgstr "Checkade ut extern katalog vid revision %ld.\n"
-#: ../svn/notify.c:843 ../svnbench/notify.c:605
+#: ../svn/notify.c:845 ../svnbench/notify.c:605
#, c-format
msgid "Checked out revision %ld.\n"
msgstr "Checkade ut revision %ld.\n"
-#: ../svn/notify.c:853 ../svnbench/notify.c:616
+#: ../svn/notify.c:855 ../svnbench/notify.c:616
#, c-format
msgid "Updated external to revision %ld.\n"
msgstr "Uppdaterade extern katalog till revision %ld.\n"
-#: ../svn/notify.c:854 ../svnbench/notify.c:617
+#: ../svn/notify.c:856 ../svnbench/notify.c:617
#, c-format
msgid "Updated to revision %ld.\n"
msgstr "Uppdaterade till revision %ld.\n"
-#: ../svn/notify.c:861 ../svnbench/notify.c:625
+#: ../svn/notify.c:863 ../svnbench/notify.c:625
#, c-format
msgid "External at revision %ld.\n"
msgstr "Extern katalog är på revision %ld.\n"
-#: ../svn/notify.c:862 ../svnbench/notify.c:626
+#: ../svn/notify.c:864 ../svnbench/notify.c:626
#, c-format
msgid "At revision %ld.\n"
msgstr "Ãr pÃ¥ revision %ld.\n"
-#: ../svn/notify.c:873 ../svnbench/notify.c:638
+#: ../svn/notify.c:875 ../svnbench/notify.c:638
#, c-format
msgid "External export complete.\n"
msgstr "Extern export klar.\n"
-#: ../svn/notify.c:874 ../svnbench/notify.c:639
+#: ../svn/notify.c:876 ../svnbench/notify.c:639
#, c-format
msgid "Export complete.\n"
msgstr "Export klar.\n"
-#: ../svn/notify.c:880 ../svnbench/notify.c:646
+#: ../svn/notify.c:882 ../svnbench/notify.c:646
#, c-format
msgid "External checkout complete.\n"
msgstr "Extern utcheckning klar.\n"
-#: ../svn/notify.c:881 ../svnbench/notify.c:647
+#: ../svn/notify.c:883 ../svnbench/notify.c:647
#, c-format
msgid "Checkout complete.\n"
msgstr "Utcheckning klar.\n"
-#: ../svn/notify.c:887 ../svnbench/notify.c:654
+#: ../svn/notify.c:889 ../svnbench/notify.c:654
#, c-format
msgid "External update complete.\n"
msgstr "Extern uppdatering klar.\n"
-#: ../svn/notify.c:888 ../svnbench/notify.c:655
+#: ../svn/notify.c:890 ../svnbench/notify.c:655
#, c-format
msgid "Update complete.\n"
msgstr "Uppdatering klar.\n"
-#: ../svn/notify.c:902 ../svnbench/notify.c:671
+#: ../svn/notify.c:904 ../svnbench/notify.c:671
#, c-format
msgid ""
"\n"
@@ -13590,7 +13632,7 @@ msgstr ""
"\n"
"Utför statuskontroll av externt objekt vid \"%s\":\n"
-#: ../svn/notify.c:908
+#: ../svn/notify.c:910
#, c-format
msgid ""
"\n"
@@ -13599,216 +13641,221 @@ msgstr ""
"\n"
"Hämtar information om externt objekt vid \"%s\":\n"
-#: ../svn/notify.c:915 ../svnbench/notify.c:679
+#: ../svn/notify.c:917 ../svnbench/notify.c:679
#, c-format
msgid "Status against revision: %6ld\n"
msgstr "Status gentemot revision: %6ld\n"
-#: ../svn/notify.c:923 ../svnbench/notify.c:688
+#: ../svn/notify.c:925 ../svnbench/notify.c:688
#, c-format
msgid "Sending copy of %s\n"
msgstr "Skickar kopia av %s\n"
-#: ../svn/notify.c:924 ../svnbench/notify.c:689
+#: ../svn/notify.c:926 ../svnbench/notify.c:689
#, c-format
msgid "Sending %s\n"
msgstr "Skickar %s\n"
-#: ../svn/notify.c:934 ../svnbench/notify.c:700
+#: ../svn/notify.c:936 ../svnbench/notify.c:700
#, c-format
msgid "Adding copy of (bin) %s\n"
msgstr "Lägger till kopia av (binär) %s\n"
-#: ../svn/notify.c:935 ../svnbench/notify.c:701
+#: ../svn/notify.c:937 ../svnbench/notify.c:701
#, c-format
msgid "Adding (bin) %s\n"
msgstr "Lägger till (binär) %s\n"
-#: ../svn/notify.c:942 ../svnbench/notify.c:709
+#: ../svn/notify.c:944 ../svnbench/notify.c:709
#, c-format
msgid "Adding copy of %s\n"
msgstr "Lägger till kopia av %s\n"
-#: ../svn/notify.c:943 ../svnbench/notify.c:710
+#: ../svn/notify.c:945 ../svnbench/notify.c:710
#, c-format
msgid "Adding %s\n"
msgstr "Lägger till %s\n"
-#: ../svn/notify.c:951 ../svnbench/notify.c:719
+#: ../svn/notify.c:953 ../svnbench/notify.c:719
#, c-format
msgid "Deleting copy of %s\n"
msgstr "Raderar kopia av %s\n"
-#: ../svn/notify.c:952 ../svnbench/notify.c:720
+#: ../svn/notify.c:954 ../svnbench/notify.c:720
#, c-format
msgid "Deleting %s\n"
msgstr "Raderar %s\n"
-#: ../svn/notify.c:960 ../svnbench/notify.c:729
+#: ../svn/notify.c:962 ../svnbench/notify.c:729
#, c-format
msgid "Replacing copy of %s\n"
msgstr "Ersätter kopia av %s\n"
-#: ../svn/notify.c:961 ../svnbench/notify.c:730
+#: ../svn/notify.c:963 ../svnbench/notify.c:730
#, c-format
msgid "Replacing %s\n"
msgstr "Ersätter %s\n"
-#: ../svn/notify.c:970 ../svnbench/notify.c:740 ../svnsync/sync.c:416
+#: ../svn/notify.c:972 ../svnbench/notify.c:740 ../svnsync/sync.c:416
#, c-format
msgid "Transmitting file data "
msgstr "Skickar filinnehåll "
-#: ../svn/notify.c:977 ../svnadmin/svnadmin.c:2581 ../svnbench/notify.c:749
+#: ../svn/notify.c:979 ../svnadmin/svnadmin.c:2581 ../svnbench/notify.c:749
#, c-format
msgid "'%s' locked by user '%s'.\n"
msgstr "\"%s\" låstes av användaren \"%s\".\n"
-#: ../svn/notify.c:982 ../svnbench/notify.c:755
+#: ../svn/notify.c:984 ../svnbench/notify.c:755
#, c-format
msgid "'%s' unlocked.\n"
msgstr "\"%s\" låstes upp.\n"
-#: ../svn/notify.c:1006 ../svnbench/notify.c:782
+#: ../svn/notify.c:1008 ../svnbench/notify.c:782
#, c-format
msgid "--- Merging differences between repository URLs into '%s':\n"
msgstr "--- Slår samman skillnader mellan arkiv-URL:er i \"%s\":\n"
-#: ../svn/notify.c:1011 ../svnbench/notify.c:787
+#: ../svn/notify.c:1013 ../svnbench/notify.c:787
#, c-format
msgid "--- Merging r%ld into '%s':\n"
msgstr "--- Sammanslagning av r%ld i \"%s\":\n"
-#: ../svn/notify.c:1015 ../svnbench/notify.c:791
+#: ../svn/notify.c:1017 ../svnbench/notify.c:791
#, c-format
msgid "--- Reverse-merging r%ld into '%s':\n"
msgstr "--- Omvänd sammanslagning av r%ld i \"%s\":\n"
-#: ../svn/notify.c:1019 ../svnbench/notify.c:795
+#: ../svn/notify.c:1021 ../svnbench/notify.c:795
#, c-format
msgid "--- Merging r%ld through r%ld into '%s':\n"
msgstr "--- Sammanslagning av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:1025 ../svnbench/notify.c:801
+#: ../svn/notify.c:1027 ../svnbench/notify.c:801
#, c-format
msgid "--- Reverse-merging r%ld through r%ld into '%s':\n"
msgstr "--- Omvänd sammanslagning av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:1035 ../svnbench/notify.c:813
+#: ../svn/notify.c:1037 ../svnbench/notify.c:813
#, c-format
msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n"
msgstr "--- Noterar information om sammanslagning mellan arkiv-URL:er i \"%s\":\n"
-#: ../svn/notify.c:1045 ../svnbench/notify.c:823
+#: ../svn/notify.c:1047 ../svnbench/notify.c:823
#, c-format
msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n"
msgstr "--- Noterar information om sammanslagning av r%ld i \"%s\":\n"
-#: ../svn/notify.c:1050 ../svnbench/notify.c:828
+#: ../svn/notify.c:1052 ../svnbench/notify.c:828
#, c-format
msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n"
msgstr "--- Noterar information om omvänd sammanslagning av r%ld i \"%s\":\n"
-#: ../svn/notify.c:1055 ../svnbench/notify.c:833
+#: ../svn/notify.c:1057 ../svnbench/notify.c:833
#, c-format
msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n"
msgstr "--- Noterar information om sammanslagning av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:1060 ../svnbench/notify.c:838
+#: ../svn/notify.c:1062 ../svnbench/notify.c:838
#, c-format
msgid "--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n"
msgstr "--- Noterar information om omvänd sammanslagning av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:1067 ../svnbench/notify.c:848
+#: ../svn/notify.c:1069 ../svnbench/notify.c:848
#, c-format
msgid "--- Eliding mergeinfo from '%s':\n"
msgstr "--- Utelämnar information om sammanslagning från \"%s\":\n"
-#: ../svn/notify.c:1074 ../svnbench/notify.c:856
+#: ../svn/notify.c:1076 ../svnbench/notify.c:856
#, c-format
msgid "--- Merging differences between foreign repository URLs into '%s':\n"
msgstr "--- Sammanslagning av skillnader mellan andra arkiv-URL:er i \"%s\":\n"
-#: ../svn/notify.c:1080 ../svnbench/notify.c:862
+#: ../svn/notify.c:1082 ../svnbench/notify.c:862
#, c-format
msgid "--- Merging (from foreign repository) r%ld into '%s':\n"
msgstr "--- Sammanslagning (från annat arkiv) av r%ld i \"%s\":\n"
-#: ../svn/notify.c:1085 ../svnbench/notify.c:867
+#: ../svn/notify.c:1087 ../svnbench/notify.c:867
#, c-format
msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n"
msgstr "--- Omvänd sammanslagning (från annat arkiv) av r%ld i \"%s\":\n"
-#: ../svn/notify.c:1090 ../svnbench/notify.c:872
+#: ../svn/notify.c:1092 ../svnbench/notify.c:872
#, c-format
msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n"
msgstr "--- Sammanslagning (från annat arkiv) av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:1096 ../svnbench/notify.c:878
+#: ../svn/notify.c:1098 ../svnbench/notify.c:878
#, c-format
msgid "--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n"
msgstr "--- Omvänd sammanslagning (från annat arkiv) av r%ld till r%ld i \"%s\":\n"
-#: ../svn/notify.c:1126 ../svnbench/notify.c:915
+#: ../svn/notify.c:1128 ../svnbench/notify.c:915
#, c-format
msgid "property '%s' set on '%s'\n"
msgstr "satte egenskapen \"%s\" på \"%s\"\n"
-#: ../svn/notify.c:1132 ../svnbench/notify.c:923
+#: ../svn/notify.c:1134 ../svnbench/notify.c:923
#, c-format
msgid "property '%s' deleted from '%s'.\n"
msgstr "egenskapen \"%s\" raderades från \"%s\".\n"
-#: ../svn/notify.c:1138 ../svnbench/notify.c:931
+#: ../svn/notify.c:1140 ../svnbench/notify.c:931
#, c-format
msgid "Attempting to delete nonexistent property '%s' on '%s'\n"
msgstr "Försök att ta bort den icke existerande egenskapen \"%s\" på \"%s\"\n"
-#: ../svn/notify.c:1145 ../svnbench/notify.c:940
+#: ../svn/notify.c:1147 ../svnbench/notify.c:940
#, c-format
msgid "property '%s' set on repository revision %ld\n"
msgstr "satte egenskapen \"%s\" på revision %ld i arkivet\n"
-#: ../svn/notify.c:1151 ../svnbench/notify.c:948
+#: ../svn/notify.c:1153 ../svnbench/notify.c:948
#, c-format
msgid "property '%s' deleted from repository revision %ld\n"
msgstr "egenskapen \"%s\" raderades från revision %ld i arkivet\n"
-#: ../svn/notify.c:1156 ../svnbench/notify.c:955
+#: ../svn/notify.c:1158 ../svnbench/notify.c:955
#, c-format
msgid "Upgraded '%s'\n"
msgstr "Uppgraderade \"%s\"\n"
-#: ../svn/notify.c:1161 ../svnbench/notify.c:961
+#: ../svn/notify.c:1163 ../svnbench/notify.c:961
#, c-format
msgid "Redirecting to URL '%s':\n"
msgstr "Omleder till URL \"%s\":\n"
-#: ../svn/notify.c:1185
+#: ../svn/notify.c:1187
#, c-format
msgid "--- Copying from foreign repository URL '%s':\n"
msgstr "--- Kopierar från annat arkiv med URL \"%s\":\n"
-#: ../svn/notify.c:1192
+#: ../svn/notify.c:1194
#, c-format
msgid "Breaking move with source path '%s'\n"
msgstr "Bruten flyttning med källsökväg \"%s\"\n"
-#: ../svn/notify.c:1198
+#: ../svn/notify.c:1200
#, c-format
msgid "Performing cleanup on external item at '%s'.\n"
msgstr "Utför städning av externt objekt vid \"%s\".\n"
-#: ../svn/notify.c:1205
+#: ../svn/notify.c:1207 ../svn/notify.c:1231
#, c-format
msgid "done\n"
msgstr "klart\n"
-#: ../svn/notify.c:1207
+#: ../svn/notify.c:1209
#, c-format
msgid "Committing transaction...\n"
msgstr "Arkiverar transaktion...\n"
+#: ../svn/notify.c:1220
+#, c-format
+msgid "Fetching text bases "
+msgstr "Hämtar textbaser "
+
#: ../svn/propdel-cmd.c:88
#, c-format
msgid "Cannot specify revision for deleting versioned property '%s'"
@@ -13856,7 +13903,7 @@ msgstr "Egenskapen \"%s\" för \"%s\" ä
msgid "Error writing to stream"
msgstr "Fel vid skrivning till ström"
-#: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:156 ../svn/proplist-cmd.c:160
+#: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:158 ../svn/proplist-cmd.c:162
#: ../svnlook/svnlook.c:1777 ../svnlook/svnlook.c:1932
#, c-format
msgid ""
@@ -13867,44 +13914,44 @@ msgstr ""
"från \"%s\":\n"
#. Not a --revprop
-#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 ../svnlook/svnlook.c:1812
+#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:177 ../svnlook/svnlook.c:1812
#: ../svnlook/svnlook.c:1967
#, c-format
msgid "Properties on '%s':\n"
msgstr "Egenskaper på \"%s\":\n"
-#: ../svn/propget-cmd.c:328
+#: ../svn/propget-cmd.c:332
msgid "--verbose cannot be used with --revprop or --no-newline or --xml"
msgstr "--verbose kan inte användas tillsammans med --revprop, --no-newline eller --xml"
-#: ../svn/propget-cmd.c:359 ../svn/proplist-cmd.c:214
+#: ../svn/propget-cmd.c:363 ../svn/proplist-cmd.c:216
msgid "--show-inherited-props can't be used with --revprop"
msgstr "--show-inherited-props kan inte användas tillsammans med --revprop"
-#: ../svn/propget-cmd.c:372
+#: ../svn/propget-cmd.c:376
#, c-format
msgid "Property '%s' not found on revision %s"
msgstr "Egenskapen \"%s\" finns inte för revision %s"
-#: ../svn/propget-cmd.c:437
+#: ../svn/propget-cmd.c:441
msgid "--no-newline is only available for single-target, non-recursive propget operations"
msgstr "--no-newline finns bara för icke-rekursiva propget-operationer med ett enda mål"
-#: ../svn/propget-cmd.c:492
+#: ../svn/propget-cmd.c:496
#, c-format
msgid "Property '%s' not found on '%s'"
msgstr "Egenskapen \"%s\" finns inte för \"%s\""
-#: ../svn/proplist-cmd.c:246
+#: ../svn/proplist-cmd.c:248
#, c-format
msgid "Unversioned properties on revision %ld:\n"
msgstr "Ej versionshanterade egenskaper på revision %ld:\n"
-#: ../svn/proplist-cmd.c:321
+#: ../svn/proplist-cmd.c:323
msgid "Could not display properties of all targets because some targets don't exist"
msgstr "Kunde inte visa egenskaper hos alla mål eftersom några mål inte finns"
-#: ../svn/proplist-cmd.c:326
+#: ../svn/proplist-cmd.c:328
msgid "Could not display properties of all targets because some targets are not versioned"
msgstr "Kunde inte visa egenskaper hos alla mål eftersom några mål inte är versionshanterade"
@@ -14121,32 +14168,32 @@ msgstr[1] "återställde \"%s\" version
msgid "restored '%s' version %d (the newest version)\n"
msgstr "återställde \"%s\" version %d (senaste versionen)\n"
-#: ../svn/shelf-cmd.c:799 ../svn/shelf2-cmd.c:799
+#: ../svn/shelf-cmd.c:801 ../svn/shelf2-cmd.c:801
#, c-format
msgid "deleted '%s'\n"
msgstr "raderade \"%s\"\n"
-#: ../svn/shelf-cmd.c:904 ../svn/shelf2-cmd.c:904
+#: ../svn/shelf-cmd.c:906 ../svn/shelf2-cmd.c:906
#, c-format
msgid "saved '%s' version %d\n"
msgstr "sparade \"%s\" version %d\n"
-#: ../svn/shelf-cmd.c:908 ../svn/shelf2-cmd.c:908
+#: ../svn/shelf-cmd.c:910 ../svn/shelf2-cmd.c:910
#, c-format
msgid "shelved '%s' version %d\n"
msgstr "lade \"%s\" version %d på hyllan\n"
-#: ../svn/shelf-cmd.c:939 ../svn/shelf2-cmd.c:939
+#: ../svn/shelf-cmd.c:941 ../svn/shelf2-cmd.c:941
#, c-format
msgid "unshelving the youngest shelf, '%s'\n"
msgstr "tar bort den yngsta hyllan, \"%s\"\n"
-#: ../svn/shelf-cmd.c:949 ../svn/shelf-cmd.c:1134 ../svn/shelf2-cmd.c:949
-#: ../svn/shelf2-cmd.c:1134 ../svnadmin/svnadmin.c:798
+#: ../svn/shelf-cmd.c:951 ../svn/shelf-cmd.c:1136 ../svn/shelf2-cmd.c:951
+#: ../svn/shelf2-cmd.c:1136 ../svnadmin/svnadmin.c:798
msgid "Too many arguments"
msgstr "För många argument"
-#: ../svn/shelf-cmd.c:1246 ../svn/shelf2-cmd.c:1222
+#: ../svn/shelf-cmd.c:1248 ../svn/shelf2-cmd.c:1224
msgid ""
"Show shelved changes as a diff.\n"
"usage: x-shelf-diff SHELF [VERSION]\n"
@@ -14156,7 +14203,7 @@ msgstr ""
"användning: x-shelf-diff HYLLA [VERSION]\n"
"\n"
-#: ../svn/shelf-cmd.c:1249 ../svn/shelf2-cmd.c:1225
+#: ../svn/shelf-cmd.c:1251 ../svn/shelf2-cmd.c:1227
msgid ""
" Show the changes in SHELF:VERSION (default: latest) as a diff.\n"
"\n"
@@ -14165,7 +14212,7 @@ msgstr ""
" ändringsfil.\n"
"\n"
-#: ../svn/shelf-cmd.c:1251 ../svn/shelf2-cmd.c:1227
+#: ../svn/shelf-cmd.c:1253 ../svn/shelf2-cmd.c:1229
msgid ""
" See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n"
" 'svn diff'.\n"
@@ -14175,12 +14222,12 @@ msgstr ""
" väljarna för \"svn diff\".\n"
"\n"
-#: ../svn/shelf-cmd.c:1254 ../svn/shelf-cmd.c:1267 ../svn/shelf-cmd.c:1280
-#: ../svn/shelf-cmd.c:1292 ../svn/shelf-cmd.c:1304 ../svn/shelf-cmd.c:1319
-#: ../svn/shelf-cmd.c:1353 ../svn/shelf-cmd.c:1386 ../svn/shelf2-cmd.c:1230
-#: ../svn/shelf2-cmd.c:1243 ../svn/shelf2-cmd.c:1256 ../svn/shelf2-cmd.c:1268
-#: ../svn/shelf2-cmd.c:1280 ../svn/shelf2-cmd.c:1295 ../svn/shelf2-cmd.c:1329
-#: ../svn/shelf2-cmd.c:1362
+#: ../svn/shelf-cmd.c:1256 ../svn/shelf-cmd.c:1269 ../svn/shelf-cmd.c:1282
+#: ../svn/shelf-cmd.c:1294 ../svn/shelf-cmd.c:1306 ../svn/shelf-cmd.c:1321
+#: ../svn/shelf-cmd.c:1355 ../svn/shelf-cmd.c:1388 ../svn/shelf2-cmd.c:1232
+#: ../svn/shelf2-cmd.c:1245 ../svn/shelf2-cmd.c:1258 ../svn/shelf2-cmd.c:1270
+#: ../svn/shelf2-cmd.c:1282 ../svn/shelf2-cmd.c:1297 ../svn/shelf2-cmd.c:1331
+#: ../svn/shelf2-cmd.c:1364
msgid ""
" The shelving feature is EXPERIMENTAL. This command is likely to change\n"
" in the next release, and there is no promise of backward compatibility.\n"
@@ -14188,7 +14235,7 @@ msgstr ""
" Hyllfunktionen är EXPERIMENTELL. Detta kommando kommer troligen\n"
" ändras i nästa utgåva, och ingen bakåtkompatibilitet utlovas.\n"
-#: ../svn/shelf-cmd.c:1261 ../svn/shelf2-cmd.c:1237
+#: ../svn/shelf-cmd.c:1263 ../svn/shelf2-cmd.c:1239
msgid ""
"Delete a shelf.\n"
"usage: x-shelf-drop SHELF [PATH ...]\n"
@@ -14198,7 +14245,7 @@ msgstr ""
"användning: x-shelf-drop HYLLA [SÃKVÃG ...]\n"
"\n"
-#: ../svn/shelf-cmd.c:1264 ../svn/shelf2-cmd.c:1240
+#: ../svn/shelf-cmd.c:1266 ../svn/shelf2-cmd.c:1242
msgid ""
" Delete the shelves named SHELF from the working copies containing PATH\n"
" (default PATH is '.')\n"
@@ -14208,7 +14255,7 @@ msgstr ""
" (\".\" om ingen anges)\n"
"\n"
-#: ../svn/shelf-cmd.c:1273 ../svn/shelf2-cmd.c:1249
+#: ../svn/shelf-cmd.c:1275 ../svn/shelf2-cmd.c:1251
msgid ""
"List shelves.\n"
"usage: x-shelf-list [PATH ...]\n"
@@ -14218,7 +14265,7 @@ msgstr ""
"användning: x-shelf-list [SÃKVÃG ...]\n"
"\n"
-#: ../svn/shelf-cmd.c:1276 ../svn/shelf2-cmd.c:1252
+#: ../svn/shelf-cmd.c:1278 ../svn/shelf2-cmd.c:1254
msgid ""
" List shelves for each working copy containing PATH (default is '.')\n"
" Include the first line of any log message and some details about the\n"
@@ -14230,7 +14277,7 @@ msgstr ""
" innehåll, om inte väljaren \"-q\" anges.\n"
"\n"
-#: ../svn/shelf-cmd.c:1287 ../svn/shelf2-cmd.c:1263
+#: ../svn/shelf-cmd.c:1289 ../svn/shelf2-cmd.c:1265
msgid ""
"List which shelf affects each path.\n"
"usage: x-shelf-list-by-paths [PATH...]\n"
@@ -14240,7 +14287,7 @@ msgstr ""
"användning: x-shelf-list-by-paths [SÃKVÃG...]\n"
"\n"
-#: ../svn/shelf-cmd.c:1290 ../svn/shelf2-cmd.c:1266
+#: ../svn/shelf-cmd.c:1292 ../svn/shelf2-cmd.c:1268
msgid ""
" List which shelf most recently affects each path below the given PATHs.\n"
"\n"
@@ -14248,7 +14295,7 @@ msgstr ""
" Lista hyllorna som senast pÃ¥verkar varje sökväg under givna SÃKVÃGar.\n"
"\n"
-#: ../svn/shelf-cmd.c:1298 ../svn/shelf2-cmd.c:1274
+#: ../svn/shelf-cmd.c:1300 ../svn/shelf2-cmd.c:1276
msgid ""
"Show the versions of a shelf.\n"
"usage: x-shelf-log SHELF [PATH...]\n"
@@ -14258,7 +14305,7 @@ msgstr ""
"användning: x-shelf-log HYLLA [SÃKVÃG...]\n"
"\n"
-#: ../svn/shelf-cmd.c:1301 ../svn/shelf2-cmd.c:1277
+#: ../svn/shelf-cmd.c:1303 ../svn/shelf2-cmd.c:1279
msgid ""
" Show all versions of SHELF for each working copy containing PATH (the\n"
" default PATH is '.').\n"
@@ -14268,7 +14315,7 @@ msgstr ""
" (\".\" om ingen anges).\n"
"\n"
-#: ../svn/shelf-cmd.c:1311 ../svn/shelf2-cmd.c:1287
+#: ../svn/shelf-cmd.c:1313 ../svn/shelf2-cmd.c:1289
msgid ""
"Copy local changes onto a new version of a shelf.\n"
"usage: x-shelf-save SHELF [PATH...]\n"
@@ -14278,7 +14325,7 @@ msgstr ""
"användning: x-shelf-save HYLLA [SÃKVÃG...]\n"
"\n"
-#: ../svn/shelf-cmd.c:1314 ../svn/shelf2-cmd.c:1290
+#: ../svn/shelf-cmd.c:1316 ../svn/shelf2-cmd.c:1292
msgid ""
" Save local changes in the given PATHs as a new version of SHELF.\n"
" The shelf's log message can be set with -m, -F, etc.\n"
@@ -14288,7 +14335,7 @@ msgstr ""
" Hyllans loggmeddelande kan anges med -m, -F, osv.\n"
"\n"
-#: ../svn/shelf-cmd.c:1317 ../svn/shelf2-cmd.c:1293
+#: ../svn/shelf-cmd.c:1319 ../svn/shelf2-cmd.c:1295
msgid ""
" The same as 'svn shelve --keep-local'.\n"
"\n"
@@ -14296,7 +14343,7 @@ msgstr ""
" Samma som \"svn shelve --keep-local\".\n"
"\n"
-#: ../svn/shelf-cmd.c:1329 ../svn/shelf2-cmd.c:1305
+#: ../svn/shelf-cmd.c:1331 ../svn/shelf2-cmd.c:1307
msgid ""
"Move local changes onto a shelf.\n"
"usage: x-shelve [--keep-local] SHELF [PATH...]\n"
@@ -14306,7 +14353,7 @@ msgstr ""
"användning: x-shelve [--keep-local] HYLLA [SÃKVÃG...]\n"
"\n"
-#: ../svn/shelf-cmd.c:1332 ../svn/shelf2-cmd.c:1308
+#: ../svn/shelf-cmd.c:1334 ../svn/shelf2-cmd.c:1310
msgid ""
" Save the local changes in the given PATHs to a new or existing SHELF.\n"
" Revert those changes from the WC unless '--keep-local' is given.\n"
@@ -14318,7 +14365,7 @@ msgstr ""
" Hyllans loggmeddelande kan anges med -m, -F, osv.\n"
"\n"
-#: ../svn/shelf-cmd.c:1336 ../svn/shelf2-cmd.c:1312
+#: ../svn/shelf-cmd.c:1338 ../svn/shelf2-cmd.c:1314
msgid ""
" 'svn shelve --keep-local' is the same as 'svn shelf-save'.\n"
"\n"
@@ -14326,7 +14373,7 @@ msgstr ""
" \"svn shelve --keep-local\" är samma som \"svn shelf-save\".\n"
"\n"
-#: ../svn/shelf-cmd.c:1338 ../svn/shelf2-cmd.c:1314
+#: ../svn/shelf-cmd.c:1340 ../svn/shelf2-cmd.c:1316
msgid ""
" The kinds of change you can shelve are committable changes to files and\n"
" properties, except the following kinds which are not yet supported:\n"
@@ -14344,7 +14391,7 @@ msgstr ""
" saknade filer kan inte läggas på hyllan.\n"
"\n"
-#: ../svn/shelf-cmd.c:1345 ../svn/shelf2-cmd.c:1321
+#: ../svn/shelf-cmd.c:1347 ../svn/shelf2-cmd.c:1323
msgid ""
" To bring back shelved changes, use 'svn unshelve SHELF'.\n"
"\n"
@@ -14352,7 +14399,7 @@ msgstr ""
" För att återfå ändringar från hyllan, använd \"svn unshelve HYLLA\".\n"
"\n"
-#: ../svn/shelf-cmd.c:1347 ../svn/shelf2-cmd.c:1323
+#: ../svn/shelf-cmd.c:1349 ../svn/shelf2-cmd.c:1325
msgid ""
" Shelves are currently stored under <WC>/.svn/experimental/shelves/ .\n"
" (In Subversion 1.10, shelves were stored under <WC>/.svn/shelves/ as\n"
@@ -14368,7 +14415,7 @@ msgstr ""
" anbringa den med \"svn patch\" med klient 1.10 eller senare.)\n"
"\n"
-#: ../svn/shelf-cmd.c:1362 ../svn/shelf2-cmd.c:1338
+#: ../svn/shelf-cmd.c:1364 ../svn/shelf2-cmd.c:1340
msgid ""
"Copy shelved changes back into the WC.\n"
"usage: x-unshelve [--drop] [SHELF [VERSION]]\n"
@@ -14378,7 +14425,7 @@ msgstr ""
"användning: x-unshelve [--drop] [HYLLA [VERSION]]\n"
"\n"
-#: ../svn/shelf-cmd.c:1365 ../svn/shelf2-cmd.c:1341
+#: ../svn/shelf-cmd.c:1367 ../svn/shelf2-cmd.c:1343
msgid ""
" Apply the changes stored in SHELF to the working copy.\n"
" SHELF defaults to the newest shelf.\n"
@@ -14388,7 +14435,7 @@ msgstr ""
" Den nyaste hyllan används om HYLLA inte anges.\n"
"\n"
-#: ../svn/shelf-cmd.c:1368 ../svn/shelf2-cmd.c:1344
+#: ../svn/shelf-cmd.c:1370 ../svn/shelf2-cmd.c:1346
msgid ""
" Apply the newest version of the shelf, by default. If VERSION is\n"
" specified, apply that version and discard all versions newer than that.\n"
@@ -14402,7 +14449,7 @@ msgstr ""
" versioner (såvida inte --drop anges).\n"
"\n"
-#: ../svn/shelf-cmd.c:1373 ../svn/shelf2-cmd.c:1349
+#: ../svn/shelf-cmd.c:1375 ../svn/shelf2-cmd.c:1351
msgid ""
" With --drop, delete the entire shelf (like 'svn shelf-drop') after\n"
" successfully unshelving with no conflicts.\n"
@@ -14412,7 +14459,7 @@ msgstr ""
" lyckats anbringa ändringen utan konflikter.\n"
"\n"
-#: ../svn/shelf-cmd.c:1376 ../svn/shelf2-cmd.c:1352
+#: ../svn/shelf-cmd.c:1378 ../svn/shelf2-cmd.c:1354
msgid ""
" The working files involved should be in a clean, unmodified state\n"
" before using this command. To roll back to an older version of the\n"
@@ -14427,7 +14474,7 @@ msgstr ""
" önskade versionen från hyllan.\n"
"\n"
-#: ../svn/shelf-cmd.c:1381 ../svn/shelf2-cmd.c:1357
+#: ../svn/shelf-cmd.c:1383 ../svn/shelf2-cmd.c:1359
msgid ""
" Unshelve normally refuses to apply any changes if any path involved is\n"
" already modified (or has any other abnormal status) in the WC. With\n"
@@ -14441,7 +14488,7 @@ msgstr ""
" halvfärdiga eller oväntade resultat.\n"
"\n"
-#: ../svn/shelf-cmd.c:1392
+#: ../svn/shelf-cmd.c:1394
msgid ""
"Copy local modifications from one WC to another.\n"
"usage: x-wc-copy-mods SRC_WC_PATH DST_WC_PATH\n"
@@ -14451,7 +14498,7 @@ msgstr ""
"användning: x-wc-copy-mods KÃLL_AK_SÃKVÃG MÃ
L_AK_SÃKVÃG\n"
"\n"
-#: ../svn/shelf-cmd.c:1395
+#: ../svn/shelf-cmd.c:1397
msgid ""
" The source and destination WC paths may be in the same WC or in different WCs.\n"
"\n"
@@ -14459,7 +14506,7 @@ msgstr ""
" Källans och målets AK-sökväg kan vara i samma AK eller i olika AK.\n"
"\n"
-#: ../svn/shelf-cmd.c:1398
+#: ../svn/shelf-cmd.c:1400
msgid ""
" This feature is EXPERIMENTAL. This command is likely to change\n"
" in the next release, and there is no promise of backward compatibility.\n"
@@ -14510,15 +14557,15 @@ msgstr "flyttad från %s"
msgid "moved to %s"
msgstr "flyttad till %s"
-#: ../svn/svn.c:74
+#: ../svn/svn.c:73
msgid "force operation to run"
msgstr "tvinga operationen att utföras"
-#: ../svn/svn.c:76
+#: ../svn/svn.c:75
msgid "force validity of log message source"
msgstr "acceptera alltid det angivna loggmeddelandet"
-#: ../svn/svn.c:77 ../svn/svn.c:78 ../svnadmin/svnadmin.c:172
+#: ../svn/svn.c:76 ../svn/svn.c:77 ../svnadmin/svnadmin.c:172
#: ../svnadmin/svnadmin.c:175 ../svnbench/svnbench.c:83
#: ../svnbench/svnbench.c:84 ../svndumpfilter/svndumpfilter.c:945
#: ../svndumpfilter/svndumpfilter.c:948 ../svnfsfs/svnfsfs.c:89
@@ -14527,27 +14574,27 @@ msgstr "acceptera alltid det angivna log
msgid "show help on a subcommand"
msgstr "visa hjälp för ett underkommando"
-#: ../svn/svn.c:79
+#: ../svn/svn.c:78
msgid "specify log message ARG"
msgstr "ange loggmeddelande ARG"
-#: ../svn/svn.c:80 ../svnbench/svnbench.c:85
+#: ../svn/svn.c:79 ../svnbench/svnbench.c:85
msgid "print nothing, or only summary information"
msgstr "ingen utmatning, eller bara sammanfattning"
-#: ../svn/svn.c:81 ../svnbench/svnbench.c:86
+#: ../svn/svn.c:80 ../svnbench/svnbench.c:86
msgid "descend recursively, same as --depth=infinity"
msgstr "gå ner rekursivt, som --depth=infinity"
-#: ../svn/svn.c:82
+#: ../svn/svn.c:81
msgid "obsolete"
msgstr "föråldrat"
-#: ../svn/svn.c:83
+#: ../svn/svn.c:82
msgid "show human-readable output"
msgstr "visa läsbar utskrift"
-#: ../svn/svn.c:85 ../svnbench/svnbench.c:89
+#: ../svn/svn.c:84 ../svnbench/svnbench.c:89
msgid ""
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1\n"
@@ -14560,7 +14607,7 @@ msgstr ""
" Om ARG är på formen ARG1-ARG2 så är detta samma\n"
" som ARG1:ARG2, där ARG1 ingår"
-#: ../svn/svn.c:93 ../svnbench/svnbench.c:97
+#: ../svn/svn.c:92 ../svnbench/svnbench.c:97
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -14584,41 +14631,41 @@ msgstr ""
" arkiveringen vid eller före BASE\n"
" \"PREV\" revisionen före COMMITTED"
-#: ../svn/svn.c:108
+#: ../svn/svn.c:107
msgid "read log message from file ARG"
msgstr "läs loggmeddelande från filen ARG"
-#: ../svn/svn.c:110
+#: ../svn/svn.c:109
msgid "give output suitable for concatenation"
msgstr "skapa utdata som kan slås ihop"
-#: ../svn/svn.c:112
+#: ../svn/svn.c:111
msgid "treat value as being in charset encoding ARG"
msgstr ""
"betrakta värdet som om det använder\n"
" teckenkodningen ARG"
-#: ../svn/svn.c:113 ../svnadmin/svnadmin.c:178 ../svnbench/svnbench.c:112
+#: ../svn/svn.c:112 ../svnadmin/svnadmin.c:178 ../svnbench/svnbench.c:112
#: ../svndumpfilter/svndumpfilter.c:951 ../svnfsfs/svnfsfs.c:95
#: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:142
-#: ../svnserve/svnserve.c:419 ../svnsync/svnsync.c:287
-#: ../svnversion/svnversion.c:144
+#: ../svnserve/svnserve.c:421 ../svnsync/svnsync.c:287
+#: ../svnversion/svnversion.c:147
msgid "show program version information"
msgstr "visa programversionsinformation"
-#: ../svn/svn.c:114 ../svnbench/svnbench.c:113
+#: ../svn/svn.c:113 ../svnbench/svnbench.c:113
msgid "print extra information"
msgstr "visa extrainformation"
-#: ../svn/svn.c:115
+#: ../svn/svn.c:114
msgid "display update information"
msgstr "visa uppdateringsinformation"
-#: ../svn/svn.c:116 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:124
+#: ../svn/svn.c:115 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:124
msgid "specify a username ARG"
msgstr "ange ett användarnamn ARG"
-#: ../svn/svn.c:118
+#: ../svn/svn.c:117
msgid ""
"specify a password ARG (caution: on many operating\n"
" systems, other users will be able to see this)"
@@ -14626,11 +14673,11 @@ msgstr ""
"ange lösenordet ARG (varning: på många system\n"
" kan andra användare se detta)"
-#: ../svn/svn.c:123 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:128
+#: ../svn/svn.c:122 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:128
msgid "read password from stdin"
msgstr "läs lösenord från standard in"
-#: ../svn/svn.c:125
+#: ../svn/svn.c:124
msgid ""
"Specify differencing options for external diff or\n"
" internal diff or blame. Default: '-u'. Options are\n"
@@ -14658,13 +14705,13 @@ msgstr ""
" -U N, --context N: Visa N rader sammanhang\n"
" -p, --show-c-function: Visa funktionsnamn i C"
-#: ../svn/svn.c:145 ../svnbench/svnbench.c:119
+#: ../svn/svn.c:144 ../svnbench/svnbench.c:119
msgid "pass contents of file ARG as additional args"
msgstr ""
"använd innehållet i filen ARG som ytterligare\n"
" argument"
-#: ../svn/svn.c:147 ../svnbench/svnbench.c:121
+#: ../svn/svn.c:146 ../svnbench/svnbench.c:121
msgid ""
"limit operation by depth ARG ('empty', 'files',\n"
" 'immediates', or 'infinity')"
@@ -14672,7 +14719,7 @@ msgstr ""
"begränsa kommandot till djupet ARG (\"empty\",\n"
" \"files\", \"immediates\" eller \"infinity\")"
-#: ../svn/svn.c:151
+#: ../svn/svn.c:150
msgid ""
"set new working copy depth to ARG ('exclude',\n"
" 'empty', 'files', 'immediates', or 'infinity')"
@@ -14680,19 +14727,19 @@ msgstr ""
"sätt arbetskopians djup till ARG (\"exclude\",\n"
" \"empty\", \"files\", \"immediates\" eller \"infinity\")"
-#: ../svn/svn.c:154 ../svnlook/svnlook.c:182
+#: ../svn/svn.c:153 ../svnlook/svnlook.c:182
msgid "output in XML"
msgstr "visa information som XML"
-#: ../svn/svn.c:155
+#: ../svn/svn.c:154
msgid "DEPRECATED"
msgstr "FÃRÃ
LDRAT"
-#: ../svn/svn.c:157 ../svnbench/svnbench.c:126
+#: ../svn/svn.c:156 ../svnbench/svnbench.c:126
msgid "do not cross copies while traversing history"
msgstr "följ inte kopieringar när historiken gås igenom"
-#: ../svn/svn.c:159
+#: ../svn/svn.c:158
msgid ""
"disregard default and svn:ignore and\n"
" svn:global-ignores property ignores"
@@ -14700,12 +14747,12 @@ msgstr ""
"bortse ifrån svn:ignore, svn:global-ignores och\n"
" standarduteslutningar"
-#: ../svn/svn.c:163 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:138
+#: ../svn/svn.c:162 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:138
#: ../svnsync/svnsync.c:203
msgid "do not cache authentication tokens"
msgstr "spara inte autentiseringsinformation"
-#: ../svn/svn.c:165 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:152
+#: ../svn/svn.c:164 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:152
msgid ""
"deprecated; same as\n"
" --trust-server-cert-failures=unknown-ca"
@@ -14713,7 +14760,7 @@ msgstr ""
"föråldrat; samma som\n"
" --trust-server-cert-failures=unknown-ca"
-#: ../svn/svn.c:169 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:156
+#: ../svn/svn.c:168 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:156
msgid ""
"with --non-interactive, accept SSL server\n"
" certificates with failures; ARG is comma-separated\n"
@@ -14730,7 +14777,7 @@ msgstr ""
" certifikat), \"not-yet-valid\" (certifikatet ännu\n"
" ej giltigt) och \"other\" (alla andra fel)."
-#: ../svn/svn.c:183 ../svnrdump/svnrdump.c:130 ../svnsync/svnsync.c:195
+#: ../svn/svn.c:182 ../svnrdump/svnrdump.c:130 ../svnsync/svnsync.c:195
msgid ""
"do no interactive prompting (default is to prompt\n"
" only if standard input is a terminal device)"
@@ -14738,7 +14785,7 @@ msgstr ""
"ingen interaktiv fråga (vanligtvis ställs frågor\n"
" bara om standardinmatningen är en terminal)"
-#: ../svn/svn.c:187 ../svnrdump/svnrdump.c:134 ../svnsync/svnsync.c:199
+#: ../svn/svn.c:186 ../svnrdump/svnrdump.c:134 ../svnsync/svnsync.c:199
msgid ""
"do interactive prompting even if standard input\n"
" is not a terminal device"
@@ -14746,58 +14793,58 @@ msgstr ""
"ställ interaktiva frågor även om\n"
" standardinmatningen inte är en terminal"
-#: ../svn/svn.c:191
+#: ../svn/svn.c:190
msgid "try operation but make no changes"
msgstr "testa operationen, men gör inga ändringar"
-#: ../svn/svn.c:193
+#: ../svn/svn.c:192
msgid "disable merge tracking; diff nodes as if related"
msgstr ""
"stäng av sammanslagningsföljning; jämför som om\n"
" noderna var besläktade"
-#: ../svn/svn.c:195
+#: ../svn/svn.c:194
msgid "ignore externals definitions"
msgstr "bortse ifrån externals-definitioner"
-#: ../svn/svn.c:196
+#: ../svn/svn.c:195
msgid "use ARG as merge command"
msgstr "använd ARG som merge-kommando"
-#: ../svn/svn.c:197
+#: ../svn/svn.c:196
msgid "use ARG as external editor"
msgstr "använd ARG som extern editor"
-#: ../svn/svn.c:199
+#: ../svn/svn.c:198
msgid "merge only mergeinfo differences"
msgstr ""
"slå bara ihop skillnader i\n"
" sammanslagningsinformationen"
-#: ../svn/svn.c:200
+#: ../svn/svn.c:199
msgid "use ARG as the older target"
msgstr "använd ARG som det äldre målet"
-#: ../svn/svn.c:201
+#: ../svn/svn.c:200
msgid "use ARG as the newer target"
msgstr "använd ARG som det nyare målet"
-#: ../svn/svn.c:203
+#: ../svn/svn.c:202
msgid "operate on a revision property (use with -r)"
msgstr "arbeta med en revisionsegenskap (används med -r)"
-#: ../svn/svn.c:204
+#: ../svn/svn.c:203
msgid "relocate via URL-rewriting"
msgstr "omlokalisera genom att skriva om URL:er"
-#: ../svn/svn.c:206 ../svnadmin/svnadmin.c:225 ../svnbench/svnbench.c:150
+#: ../svn/svn.c:205 ../svnadmin/svnadmin.c:225 ../svnbench/svnbench.c:150
#: ../svnrdump/svnrdump.c:122 ../svnsync/svnsync.c:253
msgid "read user configuration files from directory ARG"
msgstr ""
"läs användarens konfigurationsfiler från katalogen\n"
" ARG"
-#: ../svn/svn.c:208 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:144
+#: ../svn/svn.c:207 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:144
#: ../svnsync/svnsync.c:255
msgid ""
"set user configuration option in the format:\n"
@@ -14810,15 +14857,15 @@ msgstr ""
" Till exempel:\n"
" servers:global:http-library=serf"
-#: ../svn/svn.c:215
+#: ../svn/svn.c:214
msgid "enable automatic properties"
msgstr "aktivera automatiska egenskaper"
-#: ../svn/svn.c:216
+#: ../svn/svn.c:215
msgid "disable automatic properties"
msgstr "deaktivera automatiska egenskaper"
-#: ../svn/svn.c:218
+#: ../svn/svn.c:217
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
@@ -14830,39 +14877,39 @@ msgstr ""
" \"eol-style\" satt till \"native\". ARG kan vara\n"
" något av \"LF\", \"CR\" och \"CRLF\""
-#: ../svn/svn.c:225 ../svnbench/svnbench.c:159
+#: ../svn/svn.c:224 ../svnbench/svnbench.c:159
msgid "maximum number of log entries"
msgstr "maximalt antal loggposter"
-#: ../svn/svn.c:226
+#: ../svn/svn.c:225
msgid "don't unlock the targets"
msgstr "lås inte upp målen"
-#: ../svn/svn.c:227
+#: ../svn/svn.c:226
msgid "remove changelist association"
msgstr "ta bort koppling till ändringslista"
-#: ../svn/svn.c:229
+#: ../svn/svn.c:228
msgid "operate only on members of changelist ARG"
msgstr "arbeta endast med medlemmar av ändringslistan ARG"
-#: ../svn/svn.c:231
+#: ../svn/svn.c:230
msgid "don't delete changelists after commit"
msgstr "ta inte bort ändringslistor efter arkivering"
-#: ../svn/svn.c:232
+#: ../svn/svn.c:231
msgid "keep path in working copy"
msgstr "behåll sökväg i arbetskopia"
-#: ../svn/svn.c:234 ../svnbench/svnbench.c:161
+#: ../svn/svn.c:233 ../svnbench/svnbench.c:161
msgid "retrieve all revision properties"
msgstr "hämta alla revisionsegenskaper"
-#: ../svn/svn.c:236 ../svnbench/svnbench.c:163
+#: ../svn/svn.c:235 ../svnbench/svnbench.c:163
msgid "retrieve no revision properties"
msgstr "hämta inga revisionsegenskaper"
-#: ../svn/svn.c:238 ../svnbench/svnbench.c:165
+#: ../svn/svn.c:237 ../svnbench/svnbench.c:165
msgid ""
"set revision property ARG in new revision\n"
" using the name[=value] format"
@@ -14870,11 +14917,11 @@ msgstr ""
"sätt revisionsegenskapen ARG i ny revision\n"
" på formatet namn[=värde]"
-#: ../svn/svn.c:241
+#: ../svn/svn.c:240
msgid "make intermediate directories"
msgstr "skapa mellanliggande kataloger"
-#: ../svn/svn.c:243 ../svnbench/svnbench.c:169
+#: ../svn/svn.c:242 ../svnbench/svnbench.c:169
msgid ""
"use/display additional information from merge\n"
" history"
@@ -14882,7 +14929,7 @@ msgstr ""
"använd/visa ytterligare information från\n"
" sammanslagningshistoriken"
-#: ../svn/svn.c:247
+#: ../svn/svn.c:246
msgid ""
"specify automatic conflict resolution action\n"
" ('postpone', 'working', 'base', 'mine-conflict',\n"
@@ -14897,7 +14944,7 @@ msgstr ""
" (förkortningar: \"p\", \"mc\", \"tc\", \"mf\", \"tf\",\n"
" \"e\", \"l\", \"r\")"
-#: ../svn/svn.c:258
+#: ../svn/svn.c:257
msgid ""
"specify which collection of revisions to display\n"
" ('merged', 'eligible')"
@@ -14905,11 +14952,11 @@ msgstr ""
"ange slag av revisioner att visa\n"
" (\"merged\", \"eligible\")"
-#: ../svn/svn.c:262
+#: ../svn/svn.c:261
msgid "deprecated"
msgstr "avrådes"
-#: ../svn/svn.c:264
+#: ../svn/svn.c:263
msgid ""
"number of leading path components to strip from\n"
" paths parsed from the patch file. --strip 0\n"
@@ -14929,67 +14976,67 @@ msgstr ""
" Katalogseparatorn är \"/\" på alla plattformar.\n"
" Ett \"/\" i början räknas som en katalog."
-#: ../svn/svn.c:280
+#: ../svn/svn.c:279
msgid "don't expand keywords"
msgstr "expandera inte nyckelord"
-#: ../svn/svn.c:282
+#: ../svn/svn.c:281
msgid "apply the unidiff in reverse"
msgstr "anbringa unidiffen baklänges"
-#: ../svn/svn.c:284
+#: ../svn/svn.c:283
msgid "ignore whitespace during pattern matching"
msgstr "strunta i tomrum vid mönstermatchning"
-#: ../svn/svn.c:285
+#: ../svn/svn.c:284
msgid "produce diff output"
msgstr "utdata i form av skillnader"
#. maps to show_diff
#. diff options
-#: ../svn/svn.c:287 ../svnlook/svnlook.c:139
+#: ../svn/svn.c:286 ../svnlook/svnlook.c:139
msgid "use ARG as diff command"
msgstr "använd ARG som diff-kommando"
-#: ../svn/svn.c:289
+#: ../svn/svn.c:288
msgid "override diff-cmd specified in config file"
msgstr "kringgå \"diff-cmd\" angiven i inställningsfilen"
-#: ../svn/svn.c:291 ../svnlook/svnlook.c:133
+#: ../svn/svn.c:290 ../svnlook/svnlook.c:133
msgid "do not print differences for added files"
msgstr "visa inte skillnader för tillagda filer"
-#: ../svn/svn.c:293 ../svnlook/svnlook.c:136
+#: ../svn/svn.c:292 ../svnlook/svnlook.c:136
msgid "do not print differences for deleted files"
msgstr "visa inte skillnader för raderade filer"
-#: ../svn/svn.c:295
+#: ../svn/svn.c:294
msgid "don't diff copied or moved files with their source"
msgstr ""
"jämför inte kopierade eller flyttade filer\n"
" med deras källa"
-#: ../svn/svn.c:297
+#: ../svn/svn.c:296
msgid "diff unrelated nodes as delete and add"
msgstr "jämför obesläktade noder som radering och tillägg"
-#: ../svn/svn.c:298
+#: ../svn/svn.c:297
msgid "show a summary of the results"
msgstr "visa en sammanfattning av resultatet"
-#: ../svn/svn.c:300
+#: ../svn/svn.c:299
msgid "use git's extended diff format"
msgstr "använd git:s utökade format"
-#: ../svn/svn.c:302 ../svnlook/svnlook.c:142
+#: ../svn/svn.c:301 ../svnlook/svnlook.c:142
msgid "ignore properties during the operation"
msgstr "strunta i egenskaper"
-#: ../svn/svn.c:304 ../svnlook/svnlook.c:145
+#: ../svn/svn.c:303 ../svnlook/svnlook.c:145
msgid "show only properties during the operation"
msgstr "visa endast egenskaper"
-#: ../svn/svn.c:306
+#: ../svn/svn.c:305
msgid ""
"generate diff suitable for generic third-party\n"
" patch tools; currently the same as\n"
@@ -14999,7 +15046,7 @@ msgstr ""
" patch-verktyg; för närvarande samma som\n"
" \"--show-copies-as-adds --ignore-properties\""
-#: ../svn/svn.c:314
+#: ../svn/svn.c:313
msgid ""
"Allow operation on mixed-revision working copy.\n"
" Use of this option is not recommended!\n"
@@ -15009,7 +15056,7 @@ msgstr ""
" Användning av denna flagga rekommenderas inte!\n"
" Kör \"svn update\" istället."
-#: ../svn/svn.c:320
+#: ../svn/svn.c:319
msgid ""
"also operate on externals defined by\n"
" svn:externals properties"
@@ -15017,11 +15064,11 @@ msgstr ""
"verka även på externa objekt\n"
" definierade av egenskaperna svn:externals"
-#: ../svn/svn.c:324
+#: ../svn/svn.c:323
msgid "retrieve properties set on parents of the target"
msgstr "hämta egenskaper satta på målets föräldrar"
-#: ../svn/svn.c:326
+#: ../svn/svn.c:325
msgid ""
"use ARG as search pattern (glob syntax, case-\n"
" and accent-insensitive, may require quotation marks\n"
@@ -15032,35 +15079,35 @@ msgstr ""
" behöva citattecken för att hindra expansion i\n"
" skalet)"
-#: ../svn/svn.c:332
+#: ../svn/svn.c:331
msgid "combine ARG with the previous search pattern"
msgstr "kombinera ARG med föregående sökmönster"
-#: ../svn/svn.c:334
+#: ../svn/svn.c:333
msgid "show revision log message, author and date"
msgstr "visa loggmeddelande, författare och datum"
-#: ../svn/svn.c:336
+#: ../svn/svn.c:335
msgid "remove unversioned items"
msgstr "visa icke versionshanterade objekt"
-#: ../svn/svn.c:337
+#: ../svn/svn.c:336
msgid "remove ignored items"
msgstr "ta bort ej beaktade objekt"
-#: ../svn/svn.c:339
+#: ../svn/svn.c:338
msgid "reverting an added item will remove it from disk"
msgstr "återställa ett tillagt objekt kommer radera det från disken"
-#: ../svn/svn.c:340 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:140
+#: ../svn/svn.c:339 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:143
msgid "do not output the trailing newline"
msgstr "skriv inte ut det avslutande radslutet"
-#: ../svn/svn.c:341
+#: ../svn/svn.c:340
msgid "show cached passwords"
msgstr "visa cachade lösenord"
-#: ../svn/svn.c:343
+#: ../svn/svn.c:342
msgid ""
"pin externals with no explicit revision to their\n"
" current revision (recommended when tagging)"
@@ -15069,11 +15116,11 @@ msgstr ""
" vid deras nuvarande revision (rekommenderas\n"
" vid märkning)"
-#: ../svn/svn.c:347
+#: ../svn/svn.c:346
msgid "print only the item identified by ARG"
msgstr "visa bara det objekt som identifierades av ARG"
-#: ../svn/svn.c:350
+#: ../svn/svn.c:349
msgid ""
"Local additions are merged with incoming additions\n"
" instead of causing a tree conflict. Use of this\n"
@@ -15085,17 +15132,17 @@ msgstr ""
" väljare rekommenderas inte! Använd \"svn resolve\"\n"
" för att lösa trädkonflikter istället."
-#: ../svn/svn.c:359
+#: ../svn/svn.c:358
msgid "remove unreferenced pristines from .svn directory"
msgstr ""
"ta bort orörda filer som inte används\n"
" från .svn-katalogen"
-#: ../svn/svn.c:362
+#: ../svn/svn.c:361
msgid "drop shelf after successful unshelve"
msgstr "ta bort hyllan efter lyckad återställning"
-#: ../svn/svn.c:365
+#: ../svn/svn.c:364
msgid ""
"print the working copy layout, formatted according\n"
" to ARG: 'classic' or 'svn11'"
@@ -15103,7 +15150,7 @@ msgstr ""
"visa arbetskopians omfattning, formaterad enligt\n"
" ARG: \"classic\" eller \"svn11\""
-#: ../svn/svn.c:370
+#: ../svn/svn.c:369
msgid ""
"use working copy format compatible with Subversion\n"
" version ARG (\"1.8\", \"1.9.5\", etc.)"
@@ -15111,17 +15158,32 @@ msgstr ""
"använd ett arkivformat kompatibelt med\n"
" Subversion-version ARG (\"1.8\", \"1.9.5\", osv)"
-#: ../svn/svn.c:415
+#: ../svn/svn.c:374
+msgid ""
+"Configure the working copy to either store local\n"
+" copies of pristine contents ('yes') or to fetch\n"
+" them on demand ('no'). Fetching on demand saves\n"
+" disk space, but may require network access for\n"
+" commands such as diff or revert. Default: 'yes'."
+msgstr ""
+"Konfigurera arbetskopian att antingen lagra\n"
+" lokala kopior av det orörda innehållet (\"ja\")\n"
+" eller att hämta dem vid behov (\"nej\"). Hämta\n"
+" vid behov sparar diskutrymme men kan kräva\n"
+" nätverksåtkomst för vissa kommandon som diff\n"
+" eller revert. Standard: \"ja\"."
+
+#: ../svn/svn.c:425
msgid ""
"Put new files and directories under version control.\n"
-"usage: add PATH...\n"
+"usage: add PATH[@]...\n"
"\n"
msgstr ""
"Lägg till nya filer och kataloger i versionshanteringen.\n"
-"användning: add SÃKVÃG...\n"
+"användning: add SÃKVÃG[@]...\n"
"\n"
-#: ../svn/svn.c:418
+#: ../svn/svn.c:428
msgid ""
" Schedule unversioned PATHs for addition, so they will become versioned and\n"
" be added to the repository in the next commit. Recurse into directories by\n"
@@ -15133,7 +15195,7 @@ msgstr ""
" kataloger som standard (se flaggan --depth).\n"
"\n"
-#: ../svn/svn.c:422
+#: ../svn/svn.c:432
msgid ""
" The 'svn add' command is only necessary for files and directories that are\n"
" not yet under version control. Unversioned files and directories can be\n"
@@ -15145,7 +15207,7 @@ msgstr ""
" hittas med komandot \"svn status\" (se \"svn help status\").\n"
"\n"
-#: ../svn/svn.c:426
+#: ../svn/svn.c:436
msgid ""
" The effects of 'svn add' can be undone with 'svn revert' before the addition\n"
" has been committed. Once committed, a path can be removed from version\n"
@@ -15159,7 +15221,7 @@ msgstr ""
" se (\"svn help merge\" för detaljer).\n"
"\n"
-#: ../svn/svn.c:431
+#: ../svn/svn.c:441
msgid ""
" With --force, add all the unversioned paths found in PATHs and ignore the\n"
" rest; otherwise, error out if any specified paths are already versioned.\n"
@@ -15170,7 +15232,7 @@ msgstr ""
" versionshanterad.\n"
"\n"
-#: ../svn/svn.c:434
+#: ../svn/svn.c:444
msgid ""
" The selection of items to add may be influenced by the 'ignores' feature.\n"
" Properties may be attached to the items as configured by the 'auto-props'\n"
@@ -15180,19 +15242,28 @@ msgstr ""
" Egenskaper kan kopplas till ett objekt om de är konfigurerade med funktionen\n"
" \"auto-props\"\n"
-#: ../svn/svn.c:440
+#: ../svn/svn.c:447 ../svn/svn.c:523 ../svn/svn.c:546 ../svn/svn.c:613
+msgid ""
+" If PATH contains an @ character, an additional @ must be specified at the\n"
+" end of PATH to avoid interpreting the first @ as a peg revision indicator.\n"
+msgstr ""
+" Om SÃKVÃG innehÃ¥ller ett @-tecken mÃ¥ste ytterligare ett @-tecken anges vid\n"
+" slutet av SÃKVÃG för att undvika att det första @-tecknet tolkas som ett\n"
+" ankare för en fixerad revision.\n"
+
+#: ../svn/svn.c:452
msgid "add intermediate parents"
msgstr "skapa mellanliggande föräldrakataloger"
-#: ../svn/svn.c:441 ../svn/svn.c:597
+#: ../svn/svn.c:453 ../svn/svn.c:618
msgid "obsolete; same as --depth=empty"
msgstr "föråldrat; samma som --depth=empty"
-#: ../svn/svn.c:442
+#: ../svn/svn.c:454
msgid "ignore already versioned paths"
msgstr "ignorera redan versionshanterade sökvägar"
-#: ../svn/svn.c:445
+#: ../svn/svn.c:457
msgid ""
"Manage cached authentication credentials.\n"
"usage: 1. svn auth [PATTERN ...]\n"
@@ -15204,7 +15275,7 @@ msgstr ""
" 2. svn auth --remove MÃNSTER [MÃNSTER ...]\n"
"\n"
-#: ../svn/svn.c:449
+#: ../svn/svn.c:461
msgid ""
" With no arguments, list all cached authentication credentials.\n"
" Authentication credentials include usernames, passwords,\n"
@@ -15222,7 +15293,7 @@ msgstr ""
" autentiseringsreferenser som motsvarar ett eller flera mönster.\n"
"\n"
-#: ../svn/svn.c:456
+#: ../svn/svn.c:468
msgid ""
" If more than one pattern is specified credentials are considered only if they\n"
" match all specified patterns. Patterns are matched case-sensitively and may\n"
@@ -15243,11 +15314,11 @@ msgstr ""
" Observera att jokertecken vanligtvis behöver citeras på kommandoraden\n"
" eftersom många kommandoskal annars försöker expandera dem.\n"
-#: ../svn/svn.c:467
+#: ../svn/svn.c:479
msgid "remove matching authentication credentials"
msgstr "ta bort motsvarande autentiseringsreferenser"
-#: ../svn/svn.c:472
+#: ../svn/svn.c:484
msgid ""
"Show when each line of a file was last (or\n"
"next) changed.\n"
@@ -15259,7 +15330,7 @@ msgstr ""
"användning: blame [-rM:N] MÃ
L[@REV]...\n"
"\n"
-#: ../svn/svn.c:476
+#: ../svn/svn.c:488
msgid ""
" Annotate each line of a file with the revision number and author of the\n"
" last change (or optionally the next change) to that line.\n"
@@ -15269,7 +15340,7 @@ msgstr ""
" den senaste ändringen (eller nästa ändring) av raden.\n"
"\n"
-#: ../svn/svn.c:479 ../svnbench/svnbench.c:222
+#: ../svn/svn.c:491 ../svnbench/svnbench.c:222
msgid ""
" With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n"
" annotate each line that is present in revision N of the file, with\n"
@@ -15283,7 +15354,7 @@ msgstr ""
" gå längre bakåt i tiden än rM.\n"
"\n"
-#: ../svn/svn.c:484 ../svnbench/svnbench.c:227
+#: ../svn/svn.c:496 ../svnbench/svnbench.c:227
msgid ""
" With a reverse revision range '-r M:N' where M > N,\n"
" annotate each line that is present in revision N of the file, with\n"
@@ -15296,7 +15367,7 @@ msgstr ""
" eller raderade raden, utan att gå längre framåt i tiden än rM.\n"
"\n"
-#: ../svn/svn.c:489 ../svnbench/svnbench.c:232
+#: ../svn/svn.c:501 ../svnbench/svnbench.c:232
msgid ""
" If specified, REV determines in which revision the target is first\n"
" looked up.\n"
@@ -15305,11 +15376,11 @@ msgstr ""
" Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
"\n"
-#: ../svn/svn.c:492 ../svnbench/svnbench.c:235
+#: ../svn/svn.c:504 ../svnbench/svnbench.c:235
msgid " Write the annotated result to standard output.\n"
msgstr " Det kommenterade resultatet skrivs till standardutmatningen.\n"
-#: ../svn/svn.c:497
+#: ../svn/svn.c:509
msgid ""
"Output the content of specified files or URLs.\n"
"usage: cat TARGET[@REV]...\n"
@@ -15319,25 +15390,25 @@ msgstr ""
"användning: cat MÃ
L[@REV]...\n"
"\n"
-#: ../svn/svn.c:500
+#: ../svn/svn.c:512
msgid ""
" If specified, REV determines in which revision the target is first\n"
" looked up.\n"
msgstr " Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
-#: ../svn/svn.c:506
+#: ../svn/svn.c:518
msgid ""
"Associate (or dissociate) changelist CLNAME with the named\n"
"files.\n"
-"usage: 1. changelist CLNAME PATH...\n"
-" 2. changelist --remove PATH...\n"
+"usage: 1. changelist CLNAME PATH[@]...\n"
+" 2. changelist --remove PATH[@]...\n"
msgstr ""
"Förknippa ändringslistan ÃLNAMN med de uppräknade filerna,\n"
"eller frigör dem från detta samband.\n"
"användning: 1. changelist ÃLNAMN SÃKVÃG...\n"
" 2. changelist --remove SÃKVÃG...\n"
-#: ../svn/svn.c:514
+#: ../svn/svn.c:529
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -15347,7 +15418,7 @@ msgstr ""
"användning: checkout URL[@REV]... [SÃKVÃG]\n"
"\n"
-#: ../svn/svn.c:517
+#: ../svn/svn.c:532
msgid ""
" The new working copy (WC) will be compatible with Subversion 1.8 and\n"
" newer (this default may change in the future). To create a different\n"
@@ -15363,7 +15434,7 @@ msgstr ""
" Använd \"svn --version\" för att se de versioner som stöds.\n"
"\n"
-#: ../svn/svn.c:523
+#: ../svn/svn.c:538
msgid ""
" If specified, REV determines in which revision the URL is first\n"
" looked up.\n"
@@ -15372,7 +15443,7 @@ msgstr ""
" Om REV anges, bestämmer den i vilken revision målet först letas upp.\n"
"\n"
-#: ../svn/svn.c:526
+#: ../svn/svn.c:541
msgid ""
" If PATH is omitted, the basename of the URL will be used as\n"
" the destination. If multiple URLs are given each will be checked\n"
@@ -15385,7 +15456,7 @@ msgstr ""
" SÃKVÃG som fÃ¥r URL:ens basnamn som katalognamn.\n"
"\n"
-#: ../svn/svn.c:531
+#: ../svn/svn.c:548
msgid ""
" If --force is used, unversioned obstructing paths in the working\n"
" copy destination do not automatically cause the check out to fail.\n"
@@ -15411,7 +15482,7 @@ msgstr ""
" sökvägar som är i vägen.\n"
"\n"
-#: ../svn/svn.c:542
+#: ../svn/svn.c:559
msgid ""
" See also 'svn help update' for a list of possible characters\n"
" reporting the action taken.\n"
@@ -15419,30 +15490,30 @@ msgstr ""
" Se även \"svn help update\" för en lista av möjliga tecken i rapporten\n"
" om vilken åtgärd som utfördes.\n"
-#: ../svn/svn.c:547 ../svn/svn.c:680 ../svn/svn.c:704 ../svn/svn.c:728
-#: ../svn/svn.c:1306 ../svn/svn.c:1848 ../svn/svn.c:1912
+#: ../svn/svn.c:564 ../svn/svn.c:706 ../svn/svn.c:733 ../svn/svn.c:757
+#: ../svn/svn.c:1339 ../svn/svn.c:1929 ../svn/svn.c:2001
msgid "obsolete; same as --depth=files"
msgstr "föråldrat; samma som --depth=files"
-#: ../svn/svn.c:550
+#: ../svn/svn.c:567
msgid ""
"Either recover from an interrupted operation that left the working\n"
"copy locked, or remove unwanted files.\n"
-"usage: 1. cleanup [WCPATH...]\n"
-" 2. cleanup --remove-unversioned [WCPATH...]\n"
-" cleanup --remove-ignored [WCPATH...]\n"
-" 3. cleanup --vacuum-pristines [WCPATH...]\n"
+"usage: 1. cleanup [WCPATH[@]...]\n"
+" 2. cleanup --remove-unversioned [WCPATH[@]...]\n"
+" cleanup --remove-ignored [WCPATH[@]...]\n"
+" 3. cleanup --vacuum-pristines [WCPATH[@]...]\n"
"\n"
msgstr ""
"Ã
terställ efter en avbruten operation som spärrade arbetskopian,\n"
"eller ta bort oönskade filer.\n"
-"användning: 1. cleanup [AKSÃKVÃG...]\n"
-" 2. cleanup --remove-unversioned [AKSÃKVÃG...]\n"
-" cleanup --remove-ignored [AKSÃKVÃG...]\n"
-" 3. cleanup --vacuum-pristines [AKSÃKVÃG...]\n"
+"användning: 1. cleanup [AKSÃKVÃG[@]...]\n"
+" 2. cleanup --remove-unversioned [AKSÃKVÃG[@]...]\n"
+" cleanup --remove-ignored [AKSÃKVÃG[@]...]\n"
+" 3. cleanup --vacuum-pristines [AKSÃKVÃG[@]...]\n"
"\n"
-#: ../svn/svn.c:557
+#: ../svn/svn.c:574
msgid ""
" 1. When none of the options --remove-unversioned, --remove-ignored, and\n"
" --vacuum-pristines is specified, remove all write locks (shown as 'L' by\n"
@@ -15458,7 +15529,7 @@ msgstr ""
" i ett oanvändbart tillstånd.\n"
"\n"
-#: ../svn/svn.c:563
+#: ../svn/svn.c:580
msgid ""
" WARNING: There is no mechanism that will protect write locks still\n"
" being used by other Subversion clients. Running this command\n"
@@ -15472,7 +15543,7 @@ msgstr ""
" utan möjlighet till reparation!\n"
"\n"
-#: ../svn/svn.c:568
+#: ../svn/svn.c:585
msgid ""
" 2. If the --remove-unversioned option or the --remove-ignored option\n"
" is given, remove any unversioned or ignored items within WCPATH.\n"
@@ -15486,7 +15557,7 @@ msgstr ""
" som \"?\" och ej beaktade objekt som \"I\" om väljaren --no-ignore används.\n"
"\n"
-#: ../svn/svn.c:573
+#: ../svn/svn.c:590
msgid ""
" 3. If the --vacuum-pristines option is given, remove pristine copies of\n"
" files which are stored inside the .svn directory and which are no longer\n"
@@ -15495,21 +15566,30 @@ msgstr ""
" 3. Om väljaren --vacuum-pristines anges, ta bort orörda kopior av filer\n"
" i katalogen \".svn\" som inte längre används av någon fil i arbetskopian.\n"
-#: ../svn/svn.c:579
+#: ../svn/svn.c:593
+msgid ""
+" If WCPATH contains an @ character, an additional @ must be specified at the\n"
+" end of WCPATH to avoid interpreting the first @ as a peg revision indicator.\n"
+msgstr ""
+" Om WCSÃKVÃG innehÃ¥ller ett @-tecken mÃ¥ste ytterligare ett @-tecken anges vid\n"
+" slutet av WCSÃKVÃG för att undvika att det första @-tecknet tolkas som ett\n"
+" ankare för en fixerad revision.\n"
+
+#: ../svn/svn.c:598
msgid "deprecated and ignored"
msgstr "föråldrad och har ingen verkan"
-#: ../svn/svn.c:582
+#: ../svn/svn.c:601
msgid ""
"Send changes from your working copy to the repository.\n"
-"usage: commit [PATH...]\n"
+"usage: commit [PATH[@]...]\n"
"\n"
msgstr ""
"Skicka ändringar från arbetskopian till arkivet.\n"
-"användning: commit [SÃKVÃG...]\n"
+"användning: commit [SÃKVÃG[@]...]\n"
"\n"
-#: ../svn/svn.c:585
+#: ../svn/svn.c:604
msgid ""
" A log message must be provided, but it can be empty. If it is not\n"
" given by a --message or --file option, an editor will be started.\n"
@@ -15519,7 +15599,7 @@ msgstr ""
" med en --message- eller --file-flagga, startas en editor.\n"
"\n"
-#: ../svn/svn.c:588
+#: ../svn/svn.c:607
msgid ""
" If any targets are (or contain) locked items, those will be\n"
" unlocked after a successful commit, unless --no-unlock is given.\n"
@@ -15529,7 +15609,7 @@ msgstr ""
" låsas upp efter en lyckad arkivering, såvida inte --no-unlock anges.\n"
"\n"
-#: ../svn/svn.c:591
+#: ../svn/svn.c:610
msgid ""
" If --include-externals is given, also commit file and directory\n"
" externals reached by recursion. Do not commit externals with a\n"
@@ -15538,17 +15618,17 @@ msgstr ""
" Om --include-externals anges, arkivera också externa filer och kataloger\n"
" som nås rekursivt. Arkivera inte externa objekt med en fixerad revision.\n"
-#: ../svn/svn.c:600
+#: ../svn/svn.c:621
msgid ""
"Copy files and directories in a working copy or repository.\n"
-"usage: copy SRC[@REV]... DST\n"
+"usage: copy SRC[@REV]... DST[@]\n"
"\n"
msgstr ""
"Kopiera filer och kataloger i en arbetskopia eller ett arkiv.\n"
-"användning: copy KÃLLA[@REV]... MÃ
L\n"
+"användning: copy KÃLLA[@REV]... MÃ
L[@]\n"
"\n"
-#: ../svn/svn.c:603
+#: ../svn/svn.c:624
msgid ""
" SRC and DST can each be either a working copy (WC) path or URL:\n"
" WC -> WC: copy and schedule for addition (with history)\n"
@@ -15572,7 +15652,16 @@ msgstr ""
" mÃ¥ste MÃ
L vara en befintlig katalog.\n"
"\n"
-#: ../svn/svn.c:612
+#: ../svn/svn.c:633
+msgid ""
+" If DST contains an @ character, an additional @ must be specified at the\n"
+" end of DST to avoid interpreting the first @ as a peg revision indicator.\n"
+msgstr ""
+" Om MÃ
L innehåller ett @-tecken måste ytterligare ett @-tecken anges vid\n"
+" slutet av MÃ
L för att undvika att det första @-tecknet tolkas som ett\n"
+" ankare för en fixerad revision.\n"
+
+#: ../svn/svn.c:635
msgid ""
" WARNING: For compatibility with previous versions of Subversion,\n"
" copies performed using two working copy paths (WC -> WC) will not\n"
@@ -15585,19 +15674,19 @@ msgstr ""
" (AK -> AK). Därför kommer normalt inte information för sammanslagnings-\n"
" följning överföras från kopieringens källa till dess mål.\n"
-#: ../svn/svn.c:622
+#: ../svn/svn.c:645
msgid ""
"Remove files and directories from version control.\n"
-"usage: 1. delete PATH...\n"
-" 2. delete URL...\n"
+"usage: 1. delete PATH[@]...\n"
+" 2. delete URL[@]...\n"
"\n"
msgstr ""
"Radera filer och kataloger från versionshantering.\n"
-"användning: 1. delete SÃKVÃG...\n"
-" 2. delete URL...\n"
+"användning: 1. delete SÃKVÃG[@]...\n"
+" 2. delete URL[@]...\n"
"\n"
-#: ../svn/svn.c:626
+#: ../svn/svn.c:649
msgid ""
" 1. Each item specified by a PATH is scheduled for deletion upon\n"
" the next commit. Files, and directories that have not been\n"
@@ -15615,7 +15704,7 @@ msgstr ""
" --keep-local används.\n"
"\n"
-#: ../svn/svn.c:633
+#: ../svn/svn.c:656
msgid ""
" 2. Each item specified by a URL is deleted from the repository\n"
" via an immediate commit.\n"
@@ -15623,7 +15712,17 @@ msgstr ""
" 2. Varje objekt som anges med en URL raderas från arkivet genom en\n"
" omedelbar arkivering.\n"
-#: ../svn/svn.c:639
+#: ../svn/svn.c:658
+msgid ""
+" If PATH or URL contains an @ character, an additional @ must be specified\n"
+" at the end of PATH to avoid interpreting the first @ as a peg revision\n"
+" indicator.\n"
+msgstr ""
+" Om SÃKVÃG eller URL innehÃ¥ller ett @-tecken mÃ¥ste ytterligare ett @-tecken\n"
+" anges vid slutet av SÃKVÃG/URL för att undvika att det första @-tecknet\n"
+" tolkas som ett ankare för en fixerad revision.\n"
+
+#: ../svn/svn.c:665
msgid ""
"Display local changes or differences between two revisions or paths.\n"
"usage: 1. diff\n"
@@ -15646,7 +15745,7 @@ msgstr ""
" 6. diff GAMMAL-SÃKVÃG[@GAMMALREV] NY-URL[@NYREV]\n"
"\n"
-#: ../svn/svn.c:648
+#: ../svn/svn.c:674
msgid ""
" 1. Use just 'svn diff' to display local modifications in a working copy.\n"
"\n"
@@ -15654,7 +15753,7 @@ msgstr ""
" 1. Använd bara \"svn diff\" för att visa lokala ändringar i en arbetskopia.\n"
"\n"
-#: ../svn/svn.c:650
+#: ../svn/svn.c:676
msgid ""
" 2. Display the changes made to TARGETs as they are seen in REV between\n"
" two revisions. TARGETs may be all working copy paths or all URLs.\n"
@@ -15674,7 +15773,7 @@ msgstr ""
" Det omvända fås med \"-c -M\", dvs \"-r M:N\" där N = M-1.\n"
"\n"
-#: ../svn/svn.c:657
+#: ../svn/svn.c:683
msgid ""
" 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
@@ -15698,7 +15797,7 @@ msgstr ""
" WORKING för arbetskopior och HEAD för URL:er.\n"
"\n"
-#: ../svn/svn.c:666
+#: ../svn/svn.c:692
msgid ""
" Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n"
" targets. Revisions cannot be specified for unversioned targets.\n"
@@ -15713,7 +15812,7 @@ msgstr ""
" stöds ej.\n"
"\n"
-#: ../svn/svn.c:671
+#: ../svn/svn.c:697
msgid ""
" 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
" 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]'\n"
@@ -15726,24 +15825,24 @@ msgstr ""
" 6. Kortare sätt att skriva\n"
" \"svn diff --old=GAMMAL-SÃKVÃG[@GAMMALREV] --new=NY-URL[@NYREV]\".\n"
-#: ../svn/svn.c:683
+#: ../svn/svn.c:709
msgid ""
"Create an unversioned copy of a tree.\n"
-"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"usage: 1. export [-r REV] URL[@PEGREV] [UNVERSIONED_PATH[@]]\n"
+" 2. export [-r REV] WCPATH[@PEGREV] [UNVERSIONED_PATH[@]]\n"
"\n"
msgstr ""
"Skapa en icke versionshanterad kopia av ett träd.\n"
-"användning: 1. export [-r REV] URL[@FIXREV] [SÃKVÃG]\n"
-" 2. export [-r REV] SÃKVÃG1[@FIXREV] [SÃKVÃG2]\n"
+"användning: 1. export [-r REV] URL[@FIXREV] [SÃKVÃG[@]]\n"
+" 2. export [-r REV] AKSÃKVÃG[@FIXREV] [SÃKVÃG[@]]\n"
"\n"
-#: ../svn/svn.c:687
+#: ../svn/svn.c:713
msgid ""
" 1. Exports a clean directory tree from the repository specified by\n"
" URL, at revision REV if it is given, otherwise at HEAD, into\n"
-" PATH. If PATH is omitted, the last component of the URL is used\n"
-" for the local directory name.\n"
+" UNVERSIONED_PATH. If UNVERSIONED_PATH is omitted, the last\n"
+" component of the URL is used for the local directory name.\n"
"\n"
msgstr ""
" 1. Exporterar ett rent katalogträd från arkivet som anges av URL, vid\n"
@@ -15751,30 +15850,41 @@ msgstr ""
" utelämnas används den sista delen av URL som lokalt katalognamn.\n"
"\n"
-#: ../svn/svn.c:692
+#: ../svn/svn.c:718
msgid ""
" 2. Exports a clean directory tree from the working copy specified by\n"
-" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
-" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
-" for the local directory name. If REV is not specified, all local\n"
-" changes will be preserved. Files not under version control will\n"
-" not be copied.\n"
+" WCPATH, at revision REV if it is given, otherwise at WORKING, into\n"
+" UNVERSIONED_PATH. If UNVERSIONED_PATH is omitted, the last\n"
+" component of the WCPATH is used for the local directory name. If\n"
+" REV is not specified, all local changes will be preserved. Files\n"
+" not under version control will not be copied.\n"
"\n"
msgstr ""
-" 2. Exporterar ett rent katalogträd frÃ¥n arbetskopian SÃKVÃG1, vid revision\n"
-" REV, eller WORKING om REV inte anges, till SÃKVÃG2. Om PATH2 utelämnas\n"
-" används den sista delen av PATH1 som lokalt katalognamn. Om REV inte\n"
+" 2. Exporterar ett rent katalogträd frÃ¥n arbetskopian AKSÃKVÃG, vid revision\n"
+" REV, eller WORKING om REV inte anges, till SÃKVÃG. Om SÃKVÃG utelämnas\n"
+" används den sista delen av AKSÃKVÃG som lokalt katalognamn. Om REV inte\n"
" är angiven kommer lokala ändringar att bevaras, men filer som inte är\n"
" versionshanterade kopieras inte.\n"
"\n"
-#: ../svn/svn.c:699 ../svnbench/svnbench.c:246
+#: ../svn/svn.c:725 ../svnbench/svnbench.c:246
msgid ""
" If specified, PEGREV determines in which revision the target is first\n"
" looked up.\n"
msgstr " Om FIXREV är angiven, anger den i vilken revision målet först letas upp.\n"
-#: ../svn/svn.c:707 ../svnbench/svnbench.c:212
+#: ../svn/svn.c:727
+msgid ""
+" If UNVERSIONED_PATH contains an @ character, an additional @ must be\n"
+" specified at the end of UNVERSIONED_PATH to avoid interpreting the\n"
+" first @ as a peg revision indicator.\n"
+msgstr ""
+" Om EJVERSIONSHANTERAD_SÃKVÃG innehÃ¥ller ett @-tecken mÃ¥ste ytterligare\n"
+" ett @-tecken anges vid slutet av EJVERSIONSHANTERAD_SÃKVÃG för att\n"
+" undvika att det första @-tecknet tolkas som ett ankare för en fixerad\n"
+" revision.\n"
+
+#: ../svn/svn.c:736 ../svnbench/svnbench.c:212
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: help [SUBCOMMAND...]\n"
@@ -15782,11 +15892,11 @@ msgstr ""
"Visa hur detta program eller dess underkommandon används.\n"
"användning: help [UNDERKOMMANDO...]\n"
-#: ../svn/svn.c:711
+#: ../svn/svn.c:740
msgid "also show experimental subcommands and options"
msgstr "visa även experimentella underkommandon och flaggor"
-#: ../svn/svn.c:715
+#: ../svn/svn.c:744
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -15796,7 +15906,7 @@ msgstr ""
"användning: import [SÃKVÃG] URL\n"
"\n"
-#: ../svn/svn.c:718
+#: ../svn/svn.c:747
msgid ""
" Recursively commit a copy of PATH to URL.\n"
" If PATH is omitted '.' is assumed.\n"
@@ -15813,7 +15923,7 @@ msgstr ""
" Objekt som ej kan versionshanteras, såsom enhetsfiler och rörledningar,\n"
" hoppas över om --force anges.\n"
-#: ../svn/svn.c:731
+#: ../svn/svn.c:760
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -15823,7 +15933,7 @@ msgstr ""
"användning: info [MÃ
L[@REV]...]\n"
"\n"
-#: ../svn/svn.c:734
+#: ../svn/svn.c:763
msgid ""
" Print information about each TARGET (default: '.').\n"
" TARGET may be either a working-copy path or a URL. If specified, REV\n"
@@ -15837,7 +15947,7 @@ msgstr ""
" för en sökväg i en arbetskopia.\n"
"\n"
-#: ../svn/svn.c:739
+#: ../svn/svn.c:768
msgid ""
" With --show-item, print only the value of one item of information\n"
" about TARGET.\n"
@@ -15847,7 +15957,7 @@ msgstr ""
" om MÃ
L.\n"
"\n"
-#: ../svn/svn.c:742
+#: ../svn/svn.c:771
msgid ""
" EXPERIMENTAL:\n"
" With --x-viewspec, print the working copy layout.\n"
@@ -15855,7 +15965,7 @@ msgstr ""
" EXPERIMENTELLT:\n"
" Med --x-viewspec, visa arbetskopians omfattning.\n"
-#: ../svn/svn.c:748
+#: ../svn/svn.c:777
msgid ""
"show file sizes with base-2 unit suffixes\n"
" (Byte, Kilobyte, Megabyte, Gigabyte, Terabyte\n"
@@ -15867,7 +15977,7 @@ msgstr ""
" och Petabyte), begränsa antalet siffror till\n"
" tre eller färre"
-#: ../svn/svn.c:755
+#: ../svn/svn.c:784
msgid ""
"print only the item identified by ARG:\n"
" 'kind' node kind of TARGET\n"
@@ -15893,7 +16003,9 @@ msgid ""
" 'wc-format' TARGET's working copy format\n"
" 'wc-compatible-version'\n"
" first version supporting TARGET WC\n"
-" 'changelist' changelist of TARGET in WC"
+" 'changelist' changelist of TARGET in WC\n"
+" 'store-pristine'\n"
+" TARGET's working copy pristine mode"
msgstr ""
"visa bara elementet namngivet av ARG:\n"
" \"kind\" MÃ
Lets nodtyp\n"
@@ -15917,8 +16029,16 @@ msgstr ""
" \"replace\"\n"
" \"depth\" hämtningsdjup av MÃ
L i\n"
" arbetskopia"
+" \"wc-format\" arbetskopieformatversion\n"
+" \"wc-compatible-version\"\n"
+" första version som stödjer\n"
+" arbetskopians formatversion\n"
+" \"changelist\" ändringslista av MÃ
L i\n"
+" arbetskopian\n"
+" \"store-pristine\" om arbetskopian lagrar\n"
+" lokala orörda filer"
-#: ../svn/svn.c:808
+#: ../svn/svn.c:841
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -15928,7 +16048,7 @@ msgstr ""
"användning: list [MÃ
L[@REV]...]\n"
"\n"
-#: ../svn/svn.c:811 ../svnbench/svnbench.c:255
+#: ../svn/svn.c:844 ../svnbench/svnbench.c:255
msgid ""
" List each TARGET file and the contents of each TARGET directory as\n"
" they exist in the repository. If TARGET is a working copy path, the\n"
@@ -15941,7 +16061,7 @@ msgstr ""
" till arkivet. OM REV anges, avgör den var MÃ
L först letas upp.\n"
"\n"
-#: ../svn/svn.c:816 ../svnbench/svnbench.c:260
+#: ../svn/svn.c:849 ../svnbench/svnbench.c:260
msgid ""
" The default TARGET is '.', meaning the repository URL of the current\n"
" working directory.\n"
@@ -15951,7 +16071,7 @@ msgstr ""
" arbetskopian i aktuell katalog.\n"
"\n"
-#: ../svn/svn.c:821
+#: ../svn/svn.c:854
msgid ""
" Multiple --search patterns may be specified and the output will be\n"
" reduced to those paths whose last segment - i.e. the file or directory\n"
@@ -15964,7 +16084,7 @@ msgstr ""
" en delsträng som matchar minst ett av dessa mönster (endast Windows).\n"
"\n"
-#: ../svn/svn.c:828
+#: ../svn/svn.c:861
msgid ""
" Multiple --search patterns may be specified and the output will be\n"
" reduced to those paths whose last segment - i.e. the file or directory\n"
@@ -15976,7 +16096,7 @@ msgstr ""
" minst ett av dessa mönster.\n"
"\n"
-#: ../svn/svn.c:834
+#: ../svn/svn.c:867
msgid ""
" With --verbose, the following fields will be shown for each item:\n"
"\n"
@@ -15984,7 +16104,7 @@ msgstr ""
" Om --verbose används, visas status med följande fält:\n"
"\n"
-#: ../svn/svn.c:836 ../svnbench/svnbench.c:265
+#: ../svn/svn.c:869 ../svnbench/svnbench.c:265
msgid ""
" Revision number of the last commit\n"
" Author of the last commit\n"
@@ -15998,7 +16118,7 @@ msgstr ""
" Storlek (i byte)\n"
" Datum och tid för senaste arkiveringen\n"
-#: ../svn/svn.c:844
+#: ../svn/svn.c:877
msgid ""
"with --verbose, show file sizes with base-2\n"
" unit suffixes (Byte, Kilobyte, Megabyte,\n"
@@ -16010,7 +16130,7 @@ msgstr ""
" Gigabyte, Terabyte och Petabyte), begränsa\n"
" antalet siffror till tre eller färre"
-#: ../svn/svn.c:853
+#: ../svn/svn.c:886
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -16022,29 +16142,29 @@ msgstr ""
"användning: lock MÃ
L...\n"
"\n"
-#: ../svn/svn.c:857
+#: ../svn/svn.c:890
msgid " Use --force to steal a lock from another user or working copy.\n"
msgstr ""
" Använd flaggan --force för att stjäla ett lås från en annan användare eller\n"
" arbetskopia.\n"
-#: ../svn/svn.c:860
+#: ../svn/svn.c:893
msgid "read lock comment from file ARG"
msgstr "läs låskommentar från filen ARG"
-#: ../svn/svn.c:861
+#: ../svn/svn.c:894
msgid "specify lock comment ARG"
msgstr "ange låskommentar ARG"
-#: ../svn/svn.c:862
+#: ../svn/svn.c:895
msgid "force validity of lock comment source"
msgstr "acceptera alltid den angivna låskommentaren"
-#: ../svn/svn.c:863
+#: ../svn/svn.c:896
msgid "steal locks"
msgstr "stjäl lås"
-#: ../svn/svn.c:866
+#: ../svn/svn.c:899
msgid ""
"Show the log messages for a set of revision(s) and/or path(s).\n"
"usage: 1. log [PATH][@REV]\n"
@@ -16056,7 +16176,7 @@ msgstr ""
" 2. log URL[@REV] [SÃKVÃG...]\n"
"\n"
-#: ../svn/svn.c:870
+#: ../svn/svn.c:903
msgid ""
" 1. Print the log messages for the URL corresponding to PATH\n"
" (default: '.'). If specified, REV is the revision in which the\n"
@@ -16072,7 +16192,7 @@ msgstr ""
" HEAD-revisionen.\n"
"\n"
-#: ../svn/svn.c:876
+#: ../svn/svn.c:909
msgid ""
" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
" If specified, REV is the revision in which the URL is first\n"
@@ -16087,7 +16207,7 @@ msgstr ""
" standardvärdet för revisionsområdet är HEAD:1.\n"
"\n"
-#: ../svn/svn.c:882 ../svnbench/svnbench.c:290
+#: ../svn/svn.c:915 ../svnbench/svnbench.c:290
msgid ""
" Multiple '-c' or '-r' options may be specified (but not a\n"
" combination of '-c' and '-r' options), and mixing of forward and\n"
@@ -16098,7 +16218,7 @@ msgstr ""
" och det går att blanda områden angivna framlänges och baklänges.\n"
"\n"
-#: ../svn/svn.c:886
+#: ../svn/svn.c:919
msgid ""
" With -v, also print all affected paths with each log message.\n"
" Each changed path is preceded with a symbol describing the change:\n"
@@ -16126,7 +16246,7 @@ msgstr ""
" kopierad från den gamla sökvägen vid en tidigare revision.\n"
"\n"
-#: ../svn/svn.c:898
+#: ../svn/svn.c:931
msgid ""
" With -q, don't print the log message body itself (note that this is\n"
" compatible with -v).\n"
@@ -16136,7 +16256,7 @@ msgstr ""
" -v).\n"
"\n"
-#: ../svn/svn.c:901
+#: ../svn/svn.c:934
msgid ""
" Each log message is printed just once, even if more than one of the\n"
" affected paths for that revision were explicitly requested. Logs\n"
@@ -16150,7 +16270,7 @@ msgstr ""
" användbart för att avgöra förgreningspunkter.\n"
"\n"
-#: ../svn/svn.c:906
+#: ../svn/svn.c:939
msgid ""
" The --depth option is only valid in combination with the --diff option\n"
" and limits the scope of the displayed diff to the specified depth.\n"
@@ -16160,7 +16280,7 @@ msgstr ""
" omfattningen av den visade skillnaden till det angivna djupet.\n"
"\n"
-#: ../svn/svn.c:909
+#: ../svn/svn.c:942
msgid ""
" If the --search option is used, log messages are displayed only if the\n"
" provided search pattern matches any of the author, date, log message\n"
@@ -16196,7 +16316,7 @@ msgstr ""
" antal genomsökta loggmeddelanden och inte antal matchande.\n"
"\n"
-#: ../svn/svn.c:926
+#: ../svn/svn.c:959
msgid ""
" Examples:\n"
"\n"
@@ -16204,7 +16324,7 @@ msgstr ""
" Exempel:\n"
"\n"
-#: ../svn/svn.c:928
+#: ../svn/svn.c:961
msgid ""
" Show the latest 5 log messages for the current working copy\n"
" directory and display paths changed in each commit:\n"
@@ -16216,7 +16336,7 @@ msgstr ""
" svn log -l 5 -v\n"
"\n"
-#: ../svn/svn.c:932
+#: ../svn/svn.c:965
msgid ""
" Show the log for bar.c as of revision 42:\n"
" svn log bar.c@42\n"
@@ -16226,7 +16346,7 @@ msgstr ""
" svn log fil.c@42\n"
"\n"
-#: ../svn/svn.c:935
+#: ../svn/svn.c:968
msgid ""
" Show log messages and diffs for each commit to foo.c:\n"
" svn log --diff http://www.example.com/repo/project/foo.c\n"
@@ -16239,7 +16359,7 @@ msgstr ""
" (Eftersom detta kommando anger en full URL behövs ingen arbetskopia.)\n"
"\n"
-#: ../svn/svn.c:940
+#: ../svn/svn.c:973
msgid ""
" Show log messages for the children foo.c and bar.c of the directory\n"
" '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n"
@@ -16252,7 +16372,7 @@ msgstr ""
" svn log ^/trunk@50 adam.c bertil.c\n"
"\n"
-#: ../svn/svn.c:944
+#: ../svn/svn.c:977
msgid ""
" Show the log messages for any incoming changes to foo.c during the\n"
" next 'svn update':\n"
@@ -16264,7 +16384,7 @@ msgstr ""
" svn log -r BASE:HEAD fil.c\n"
"\n"
-#: ../svn/svn.c:948
+#: ../svn/svn.c:981
msgid ""
" Show the log message for the revision in which /branches/foo\n"
" was created:\n"
@@ -16275,7 +16395,7 @@ msgstr ""
" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/gren\n"
"\n"
-#: ../svn/svn.c:952
+#: ../svn/svn.c:985
msgid ""
" Show all log messages for commits between the tags ^/tags/2.0 and\n"
" ^/tags/3.0; assuming that tag 2.0 was created in revision 100:\n"
@@ -16287,7 +16407,7 @@ msgstr ""
" svn log -rHEAD:100 ^/tags/3.0\n"
"\n"
-#: ../svn/svn.c:956
+#: ../svn/svn.c:989
msgid ""
" If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -v'\n"
" shows a deletion and a copy in its changed paths list, such as:\n"
@@ -16299,26 +16419,26 @@ msgstr ""
" D /trunk/adam.c\n"
" A /trunk/bertil.c (från /trunk/adam.c:21)\n"
-#: ../svn/svn.c:965 ../svnbench/svnbench.c:305
+#: ../svn/svn.c:998 ../svnbench/svnbench.c:305
msgid "retrieve revision property ARG"
msgstr "hämta revisionsegenskapen ARG"
-#: ../svn/svn.c:966 ../svnbench/svnbench.c:306
+#: ../svn/svn.c:999 ../svnbench/svnbench.c:306
msgid "the change made in revision ARG"
msgstr "ändringen gjord i revision ARG"
-#: ../svn/svn.c:967
+#: ../svn/svn.c:1000
msgid "also print all affected paths"
msgstr "skriv även ut alla berörda sökvägar"
-#: ../svn/svn.c:968
+#: ../svn/svn.c:1001
msgid "do not print the log message"
msgstr "skriv inte up loggmeddelandet"
#. For this large section, let's keep it unindented for easier
#. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw'
#. * (with quotes and newlines removed).
-#: ../svn/svn.c:974
+#: ../svn/svn.c:1007
msgid ""
"Merge changes into a working copy.\n"
"usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n"
@@ -16338,7 +16458,7 @@ msgstr ""
" (sammanslagning av skillnaden mellan 2 URL:er)\n"
"\n"
-#: ../svn/svn.c:982
+#: ../svn/svn.c:1015
msgid ""
" 1. This form, with one source path and no revision range, is called\n"
" a 'complete' merge:\n"
@@ -16348,7 +16468,7 @@ msgstr ""
" \"fullständig\" sammanslagning:\n"
"\n"
-#: ../svn/svn.c:985
+#: ../svn/svn.c:1018
msgid ""
" svn merge SOURCE[@REV] [TARGET_WCPATH]\n"
"\n"
@@ -16356,7 +16476,7 @@ msgstr ""
" svn merge KÃLLA[@REV] [AKSÃKVÃGSMÃ
L]\n"
"\n"
-#: ../svn/svn.c:987
+#: ../svn/svn.c:1020
msgid ""
" The complete merge is used for the 'sync' and 'reintegrate' merges\n"
" in the 'feature branch' pattern described below. It finds all the\n"
@@ -16372,7 +16492,7 @@ msgstr ""
" för att hålla reda på vilka ändringar som redan införts.\n"
"\n"
-#: ../svn/svn.c:993
+#: ../svn/svn.c:1026
msgid ""
" SOURCE specifies the branch from where the changes will be pulled, and\n"
" TARGET_WCPATH specifies a working copy of the target branch to which\n"
@@ -16390,7 +16510,7 @@ msgstr ""
" inte för att undvika sammanslagningsinformation i delträd.)\n"
"\n"
-#: ../svn/svn.c:1000
+#: ../svn/svn.c:1033
msgid ""
" SOURCE is usually a URL. The optional '@REV' specifies both the peg\n"
" revision of the URL and the latest revision that will be considered\n"
@@ -16408,7 +16528,7 @@ msgstr ""
" arbetskopian senast uppdaterades till).\n"
"\n"
-#: ../svn/svn.c:1007
+#: ../svn/svn.c:1040
msgid ""
" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
" assumed. There are some special cases:\n"
@@ -16418,7 +16538,7 @@ msgstr ""
" används i allmänhet \".\". Det finns vissa särskilda fall:\n"
"\n"
-#: ../svn/svn.c:1010
+#: ../svn/svn.c:1043
msgid ""
" - If SOURCE is a URL:\n"
"\n"
@@ -16426,7 +16546,7 @@ msgstr ""
" - Om KÃLLA är en URL:\n"
"\n"
-#: ../svn/svn.c:1012
+#: ../svn/svn.c:1045
msgid ""
" - If the basename of the URL and the basename of '.' are the\n"
" same, then the differences are applied to '.'. Otherwise,\n"
@@ -16442,7 +16562,7 @@ msgstr ""
" är målet \".\" om inget annat anges.\n"
"\n"
-#: ../svn/svn.c:1018
+#: ../svn/svn.c:1051
msgid ""
" - If SOURCE is a working copy path:\n"
"\n"
@@ -16450,7 +16570,7 @@ msgstr ""
" - Om KÃLLA är en sökväg till en arbetskopia:\n"
"\n"
-#: ../svn/svn.c:1020
+#: ../svn/svn.c:1053
msgid ""
" - If the source is a file, then differences are applied to that\n"
" file (useful for reverse-merging earlier changes). Otherwise,\n"
@@ -16463,7 +16583,7 @@ msgstr ""
" om inget annat anges.\n"
"\n"
-#: ../svn/svn.c:1024
+#: ../svn/svn.c:1057
msgid ""
" In normal usage the working copy should be up to date, at a single\n"
" revision, with no local modifications and no switched subtrees.\n"
@@ -16473,7 +16593,7 @@ msgstr ""
" revision, utan lokala ändringar eller växlade delträd.\n"
"\n"
-#: ../svn/svn.c:1027
+#: ../svn/svn.c:1060
msgid ""
" - The 'Feature Branch' Merging Pattern -\n"
"\n"
@@ -16481,7 +16601,7 @@ msgstr ""
" - Sammanslagningsmönstret för \"funktionsgrenar\" -\n"
"\n"
-#: ../svn/svn.c:1029
+#: ../svn/svn.c:1062
msgid ""
" In this commonly used work flow, known also as the 'development\n"
" branch' pattern, a developer creates a branch and commits a series of\n"
@@ -16500,7 +16620,7 @@ msgstr ""
" grenen till föräldragrenen för att återinföra ändringarna.\n"
"\n"
-#: ../svn/svn.c:1037
+#: ../svn/svn.c:1070
msgid ""
" parent --+----------o------o-o-------------o--\n"
" \\ \\ \\ /\n"
@@ -16516,7 +16636,7 @@ msgstr ""
" funktion +--o-o-------o----o-o----o-----------\n"
"\n"
-#: ../svn/svn.c:1043
+#: ../svn/svn.c:1076
msgid ""
" A merge from the parent branch to the feature branch is called a\n"
" 'sync' or 'catch-up' merge, and a merge from the feature branch to the\n"
@@ -16528,7 +16648,7 @@ msgstr ""
" från funktionsgrenen till föräldragrenen kallas en \"återförening\".\n"
"\n"
-#: ../svn/svn.c:1047
+#: ../svn/svn.c:1080
msgid ""
" - Sync Merge Example -\n"
" ............\n"
@@ -16552,7 +16672,7 @@ msgstr ""
" r100 r200\n"
"\n"
-#: ../svn/svn.c:1057
+#: ../svn/svn.c:1090
msgid ""
" Subversion will locate all the changes on 'trunk' that have not yet\n"
" been merged into the 'feature' branch. In this case that is a single\n"
@@ -16571,7 +16691,7 @@ msgstr ""
" utcheckning av hela grenen \"funktion\".\n"
"\n"
-#: ../svn/svn.c:1065
+#: ../svn/svn.c:1098
msgid ""
" To perform this sync merge, have a clean working copy of the feature\n"
" branch and run the following command in its top-level directory:\n"
@@ -16582,7 +16702,7 @@ msgstr ""
" rotkatalog:\n"
"\n"
-#: ../svn/svn.c:1068
+#: ../svn/svn.c:1101
msgid ""
" svn merge ^/trunk\n"
"\n"
@@ -16590,7 +16710,7 @@ msgstr ""
" svn merge ^/trunk\n"
"\n"
-#: ../svn/svn.c:1070
+#: ../svn/svn.c:1103
msgid ""
" Note that the merge is now only in your local working copy and still\n"
" needs to be committed to the repository so that it can be seen by\n"
@@ -16604,7 +16724,7 @@ msgstr ""
" arkiveras.\n"
"\n"
-#: ../svn/svn.c:1075
+#: ../svn/svn.c:1108
msgid ""
" - Reintegrate Merge Example -\n"
"\n"
@@ -16612,7 +16732,7 @@ msgstr ""
" - Exempel på återförening -\n"
"\n"
-#: ../svn/svn.c:1077
+#: ../svn/svn.c:1110
msgid ""
" The feature branch was last synced with trunk up to revision X. So the\n"
" difference between trunk@X and feature@HEAD contains the complete set\n"
@@ -16626,7 +16746,7 @@ msgstr ""
" \"trunk\".\n"
"\n"
-#: ../svn/svn.c:1082
+#: ../svn/svn.c:1115
msgid ""
" rW rX\n"
" trunk ------+--------------------L------------------o\n"
@@ -16644,7 +16764,7 @@ msgstr ""
" funktion +--------------------------------H\n"
"\n"
-#: ../svn/svn.c:1089
+#: ../svn/svn.c:1122
msgid ""
" In the diagram above, L marks the left side (trunk@X) and R marks the\n"
" right side (feature@HEAD) of the merge. The difference between the\n"
@@ -16656,7 +16776,7 @@ msgstr ""
" högra sidan införs i målet \"trunk\".\n"
"\n"
-#: ../svn/svn.c:1093
+#: ../svn/svn.c:1126
msgid ""
" To perform the merge, have a clean working copy of trunk and run the\n"
" following command in its top-level directory:\n"
@@ -16666,7 +16786,7 @@ msgstr ""
" Kör följande kommando i dess rotkatalog:\n"
"\n"
-#: ../svn/svn.c:1096
+#: ../svn/svn.c:1129
msgid ""
" svn merge ^/feature\n"
"\n"
@@ -16674,7 +16794,7 @@ msgstr ""
" svn merge ^/funktion\n"
"\n"
-#: ../svn/svn.c:1098
+#: ../svn/svn.c:1131
msgid ""
" To prevent unnecessary merge conflicts, a reintegrate merge requires\n"
" that TARGET_WCPATH is not a mixed-revision working copy, has no local\n"
@@ -16686,7 +16806,7 @@ msgstr ""
" lokala ändringar och växlade delträd.\n"
"\n"
-#: ../svn/svn.c:1102
+#: ../svn/svn.c:1135
msgid ""
" A reintegrate merge also requires that the source branch is coherently\n"
" synced with the target -- in the above example, this means that all\n"
@@ -16702,7 +16822,7 @@ msgstr ""
" revisioner därimellan.\n"
"\n"
-#: ../svn/svn.c:1109
+#: ../svn/svn.c:1142
msgid ""
" 2. This form is called a 'cherry-pick' merge:\n"
"\n"
@@ -16710,7 +16830,7 @@ msgstr ""
" 2. Denna form är en sammanslagning av utvalda ändringar:\n"
"\n"
-#: ../svn/svn.c:1111
+#: ../svn/svn.c:1144
msgid ""
" svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n"
"\n"
@@ -16718,7 +16838,7 @@ msgstr ""
" svn merge [-c M[,N...] | -r N:M ...] KÃLLA[@REV] [AKSÃKVÃGSMÃ
L]\n"
"\n"
-#: ../svn/svn.c:1113
+#: ../svn/svn.c:1146
msgid ""
" A cherry-pick merge is used to merge specific revisions (or revision\n"
" ranges) from one branch to another. By default, this uses merge\n"
@@ -16734,7 +16854,7 @@ msgstr ""
" av denna automatik.\n"
"\n"
-#: ../svn/svn.c:1119
+#: ../svn/svn.c:1152
msgid ""
" SOURCE is usually a URL. The optional '@REV' specifies only the peg\n"
" revision of the URL and does not affect the merge range; if REV is not\n"
@@ -16751,7 +16871,7 @@ msgstr ""
" uppdateringen).\n"
"\n"
-#: ../svn/svn.c:1125 ../svn/svn.c:1196
+#: ../svn/svn.c:1158 ../svn/svn.c:1229
msgid ""
" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n"
" assumed. The special cases noted above in the 'complete' merge form\n"
@@ -16763,7 +16883,7 @@ msgstr ""
" gäller även här.\n"
"\n"
-#: ../svn/svn.c:1129
+#: ../svn/svn.c:1162
msgid ""
" The revision ranges to be merged are specified by the '-r' and/or '-c'\n"
" options. '-r N:M' refers to the difference in the history of the\n"
@@ -16779,7 +16899,7 @@ msgstr ""
" eller ändring anbringas i AKSÃKVÃGSMÃ
L.\n"
"\n"
-#: ../svn/svn.c:1135
+#: ../svn/svn.c:1168
msgid ""
" If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n"
" range were already merged, changes made in those revisions are not\n"
@@ -16793,7 +16913,7 @@ msgstr ""
" behandlas separat.\n"
"\n"
-#: ../svn/svn.c:1140
+#: ../svn/svn.c:1173
msgid ""
" A 'reverse range' can be used to undo changes. For example, when\n"
" source and target refer to the same branch, a previously committed\n"
@@ -16811,7 +16931,7 @@ msgstr ""
" sätt kallas även \"omvänd sammanslagning\".\n"
"\n"
-#: ../svn/svn.c:1147
+#: ../svn/svn.c:1180
msgid ""
" Multiple '-c' and/or '-r' options may be specified and mixing of\n"
" forward and reverse ranges is allowed.\n"
@@ -16821,7 +16941,7 @@ msgstr ""
" att på samma gång ange raka och omvända revisionsområden.\n"
"\n"
-#: ../svn/svn.c:1150
+#: ../svn/svn.c:1183
msgid ""
" - Cherry-pick Merge Example -\n"
"\n"
@@ -16829,7 +16949,7 @@ msgstr ""
" - Exempel på sammanslagning av utvalda ändringar -\n"
"\n"
-#: ../svn/svn.c:1152
+#: ../svn/svn.c:1185
msgid ""
" A bug has been fixed on trunk in revision 50. This fix needs to\n"
" be merged from trunk onto the release branch.\n"
@@ -16839,7 +16959,7 @@ msgstr ""
" införas i grenen för utgåvor.\n"
"\n"
-#: ../svn/svn.c:1155
+#: ../svn/svn.c:1188
msgid ""
" 1.x-release +-----------------------o-----\n"
" / ^\n"
@@ -16857,7 +16977,7 @@ msgstr ""
" r50\n"
"\n"
-#: ../svn/svn.c:1162
+#: ../svn/svn.c:1195
msgid ""
" In the above diagram, L marks the left side (trunk@49) and R marks the\n"
" right side (trunk@50) of the merge. The difference between the left\n"
@@ -16869,7 +16989,7 @@ msgstr ""
" högra sidan anbringas i målets arbetskopia.\n"
"\n"
-#: ../svn/svn.c:1166
+#: ../svn/svn.c:1199
msgid ""
" Note that the difference between revision 49 and 50 is exactly those\n"
" changes that were committed in revision 50, not including changes\n"
@@ -16881,7 +17001,7 @@ msgstr ""
" revision 49.\n"
"\n"
-#: ../svn/svn.c:1170
+#: ../svn/svn.c:1203
msgid ""
" To perform the merge, have a clean working copy of the release branch\n"
" and run the following command in its top-level directory; remember\n"
@@ -16893,7 +17013,7 @@ msgstr ""
" Standardvärdet för målet är \".\":\n"
"\n"
-#: ../svn/svn.c:1174
+#: ../svn/svn.c:1207
msgid ""
" svn merge -c50 ^/trunk\n"
"\n"
@@ -16901,7 +17021,7 @@ msgstr ""
" svn merge -c50 ^/trunk\n"
"\n"
-#: ../svn/svn.c:1176
+#: ../svn/svn.c:1209
msgid ""
" You can also cherry-pick several revisions and/or revision ranges:\n"
"\n"
@@ -16909,7 +17029,7 @@ msgstr ""
" Det går också att plocka flera revisioner och/eller intervall:\n"
"\n"
-#: ../svn/svn.c:1178
+#: ../svn/svn.c:1211
msgid ""
" svn merge -c50,54,60 -r65:68 ^/trunk\n"
"\n"
@@ -16917,7 +17037,7 @@ msgstr ""
" svn merge -c50,54,60 -r65:68 ^/trunk\n"
"\n"
-#: ../svn/svn.c:1181
+#: ../svn/svn.c:1214
msgid ""
" 3. This form is called a '2-URL merge':\n"
"\n"
@@ -16925,7 +17045,7 @@ msgstr ""
" 3. Denna form är en sammanslagning av skillnaden mellan 2 URL:er:\n"
"\n"
-#: ../svn/svn.c:1183
+#: ../svn/svn.c:1216
msgid ""
" svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n"
"\n"
@@ -16933,7 +17053,7 @@ msgstr ""
" svn merge KÃLLA1[@REV1] KÃLLA2[@REV2] [AKSÃKVÃGSMÃ
L]\n"
"\n"
-#: ../svn/svn.c:1185
+#: ../svn/svn.c:1218
msgid ""
" You should use this merge variant only if the other variants do not\n"
" apply to your situation, as this variant can be quite complex to\n"
@@ -16944,7 +17064,7 @@ msgstr ""
" aktuella situationen, eftersom den är förhållandevis komplicerad.\n"
"\n"
-#: ../svn/svn.c:1189
+#: ../svn/svn.c:1222
msgid ""
" Two source URLs are specified, identifying two trees on the same\n"
" branch or on different branches. The trees are compared and the\n"
@@ -16961,7 +17081,7 @@ msgstr ""
" De tre inblandade grenarna kan vara helt obesläktade.\n"
"\n"
-#: ../svn/svn.c:1200
+#: ../svn/svn.c:1233
msgid ""
" SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n"
" in which case the merge source URL is derived from the working copy.\n"
@@ -16971,7 +17091,7 @@ msgstr ""
" och då tas käll-URL:en för sammanslagningen från arbetskopian.\n"
"\n"
-#: ../svn/svn.c:1203
+#: ../svn/svn.c:1236
msgid ""
" - 2-URL Merge Example -\n"
"\n"
@@ -16979,7 +17099,7 @@ msgstr ""
" - Exempel på sammanslagning med 2 URL:er -\n"
"\n"
-#: ../svn/svn.c:1205
+#: ../svn/svn.c:1238
msgid ""
" Two features have been developed on separate branches called 'foo' and\n"
" 'bar'. It has since become clear that 'bar' should be combined with\n"
@@ -16991,7 +17111,7 @@ msgstr ""
" \"apelsin\" för vidare utveckling före återförening.\n"
"\n"
-#: ../svn/svn.c:1209
+#: ../svn/svn.c:1242
msgid ""
" Although both feature branches originate from trunk, they are not\n"
" directly related -- one is not a direct copy of the other. A 2-URL\n"
@@ -17003,7 +17123,7 @@ msgstr ""
" En sammanslagning med 2 URL:er krävs.\n"
"\n"
-#: ../svn/svn.c:1213
+#: ../svn/svn.c:1246
msgid ""
" The 'bar' branch has been synced with trunk up to revision 500.\n"
" (If this revision number is not known, it can be located using the\n"
@@ -17021,7 +17141,7 @@ msgstr ""
" ändringar anbringas i grenen \"apelsin\".\n"
"\n"
-#: ../svn/svn.c:1220
+#: ../svn/svn.c:1253
msgid ""
" foo +-----------------------------------o\n"
" / ^\n"
@@ -17045,7 +17165,7 @@ msgstr ""
" banan +-----------------------------------H\n"
"\n"
-#: ../svn/svn.c:1230
+#: ../svn/svn.c:1263
msgid ""
" In the diagram above, L marks the left side (trunk@500) and R marks\n"
" the right side (bar@HEAD) of the merge. The difference between the\n"
@@ -17059,7 +17179,7 @@ msgstr ""
" grenen \"apelsin\".\n"
"\n"
-#: ../svn/svn.c:1235
+#: ../svn/svn.c:1268
msgid ""
" To perform the merge, have a clean working copy of the 'foo' branch\n"
" and run the following command in its top-level directory:\n"
@@ -17069,7 +17189,7 @@ msgstr ""
" till en ren arbetskopia av grenen \"apelsin\":\n"
"\n"
-#: ../svn/svn.c:1238
+#: ../svn/svn.c:1271
msgid ""
" svn merge ^/trunk@500 ^/bar\n"
"\n"
@@ -17077,7 +17197,7 @@ msgstr ""
" svn merge ^/trunk@500 ^/banan\n"
"\n"
-#: ../svn/svn.c:1240
+#: ../svn/svn.c:1273
msgid ""
" The exact changes applied by a 2-URL merge can be previewed with svn's\n"
" diff command, which is a good idea to verify if you do not have the\n"
@@ -17089,7 +17209,7 @@ msgstr ""
" I detta fall:\n"
"\n"
-#: ../svn/svn.c:1244
+#: ../svn/svn.c:1277
msgid ""
" svn diff ^/trunk@500 ^/bar@HEAD\n"
"\n"
@@ -17097,7 +17217,7 @@ msgstr ""
" svn diff ^/trunk@500 ^/banan@HEAD\n"
"\n"
-#: ../svn/svn.c:1247
+#: ../svn/svn.c:1280
msgid ""
" The following applies to all types of merges:\n"
"\n"
@@ -17105,7 +17225,7 @@ msgstr ""
" Följande gäller alla sorters sammanslagningar:\n"
"\n"
-#: ../svn/svn.c:1249
+#: ../svn/svn.c:1282
msgid ""
" To prevent unnecessary merge conflicts, svn merge requires that\n"
" TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n"
@@ -17119,7 +17239,7 @@ msgstr ""
" arbetskopian utgår från samma revision.\n"
"\n"
-#: ../svn/svn.c:1254
+#: ../svn/svn.c:1287
msgid ""
" If possible, you should have no local modifications in the merge's target\n"
" working copy prior to the merge, to keep things simpler. It will be\n"
@@ -17131,7 +17251,7 @@ msgstr ""
" åtgärden och att förstå grenens historik.\n"
"\n"
-#: ../svn/svn.c:1258
+#: ../svn/svn.c:1291
msgid ""
" Switched sub-paths should also be avoided during merging, as they may\n"
" cause incomplete merges and create subtree mergeinfo.\n"
@@ -17142,7 +17262,7 @@ msgstr ""
" slagningsinformation i delträd.\n"
"\n"
-#: ../svn/svn.c:1261
+#: ../svn/svn.c:1294
msgid ""
" For each merged item a line will be printed with characters reporting the\n"
" action taken. These characters have the following meaning:\n"
@@ -17152,7 +17272,7 @@ msgstr ""
" vad som gjordes. Dessa bokstäver betyder:\n"
"\n"
-#: ../svn/svn.c:1264 ../svn/svn.c:1870
+#: ../svn/svn.c:1297 ../svn/svn.c:1955
msgid ""
" A Added\n"
" D Deleted\n"
@@ -17172,7 +17292,7 @@ msgstr ""
" R Ersatt\n"
"\n"
-#: ../svn/svn.c:1272
+#: ../svn/svn.c:1305
msgid ""
" Characters in the first column report about the item itself.\n"
" Characters in the second column report about properties of the item.\n"
@@ -17188,7 +17308,7 @@ msgstr ""
" egenskapsvärden.\n"
"\n"
-#: ../svn/svn.c:1278
+#: ../svn/svn.c:1311
msgid ""
" - Merge Tracking -\n"
"\n"
@@ -17196,7 +17316,7 @@ msgstr ""
" - Sammanslagningsföljning -\n"
"\n"
-#: ../svn/svn.c:1280
+#: ../svn/svn.c:1313
msgid ""
" Subversion uses the svn:mergeinfo property to track merge history. This\n"
" property is considered at the start of a merge to determine what to merge\n"
@@ -17218,7 +17338,7 @@ msgstr ""
" återföreningar.\n"
"\n"
-#: ../svn/svn.c:1289
+#: ../svn/svn.c:1322
msgid ""
" The --ignore-ancestry option prevents merge tracking and thus ignores\n"
" mergeinfo, neither considering it nor recording it.\n"
@@ -17229,7 +17349,7 @@ msgstr ""
" uppdateras.\n"
"\n"
-#: ../svn/svn.c:1292
+#: ../svn/svn.c:1325
msgid ""
" - Merging from foreign repositories -\n"
"\n"
@@ -17237,7 +17357,7 @@ msgstr ""
" - Sammanslagning från andra arkiv -\n"
"\n"
-#: ../svn/svn.c:1294
+#: ../svn/svn.c:1327
msgid ""
" Subversion does support merging from foreign repositories.\n"
" While all merge source URLs must point to the same repository, the merge\n"
@@ -17254,13 +17374,13 @@ msgstr ""
" Vidare stöds inte sammanslagningsföljning för sammanslagningar från\n"
" andra arkiv.\n"
-#: ../svn/svn.c:1305
+#: ../svn/svn.c:1338
msgid "force deletions even if deleted contents don't match"
msgstr ""
"radera alltid även om raderat innehåll inte\n"
" stämmer överens"
-#: ../svn/svn.c:1310
+#: ../svn/svn.c:1343
msgid ""
"Display merge-related information.\n"
"usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n"
@@ -17272,7 +17392,7 @@ msgstr ""
" 2. mergeinfo --show-revs=VILKA KÃLLA[@REV] [MÃ
L[@REV]]\n"
"\n"
-#: ../svn/svn.c:1314
+#: ../svn/svn.c:1347
msgid ""
" 1. Summarize the history of merging between SOURCE and TARGET. The graph\n"
" shows, from left to right:\n"
@@ -17291,7 +17411,7 @@ msgstr ""
" arkivsökväg och revisionsnummer för varje grenspets.\n"
"\n"
-#: ../svn/svn.c:1321
+#: ../svn/svn.c:1354
msgid ""
" 2. Print the revision numbers on SOURCE that have been merged to TARGET\n"
" (with --show-revs=merged), or that have not been merged to TARGET\n"
@@ -17305,7 +17425,7 @@ msgstr ""
" skedde i KÃLLA visas.\n"
"\n"
-#: ../svn/svn.c:1326
+#: ../svn/svn.c:1359
msgid ""
" If --revision (-r) is provided, filter the displayed information to\n"
" show only that which is associated with the revisions within the\n"
@@ -17318,7 +17438,7 @@ msgstr ""
" giltiga områdesvärden.\n"
"\n"
-#: ../svn/svn.c:1331
+#: ../svn/svn.c:1364
msgid ""
" SOURCE and TARGET are the source and target branch URLs, respectively.\n"
" (If a WC path is given, the corresponding base URL is used.) The default\n"
@@ -17335,23 +17455,23 @@ msgstr ""
" arbetskopia.\n"
"\n"
-#: ../svn/svn.c:1337
+#: ../svn/svn.c:1370
msgid " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n"
msgstr " Djupet kan vara \"empty\" eller \"infinity\"; standardvärdet är \"empty\".\n"
-#: ../svn/svn.c:1343
+#: ../svn/svn.c:1376
msgid ""
"Create a new directory under version control.\n"
-"usage: 1. mkdir PATH...\n"
-" 2. mkdir URL...\n"
+"usage: 1. mkdir PATH[@]...\n"
+" 2. mkdir URL[@]...\n"
"\n"
msgstr ""
"Skapa en ny versionshanterad katalog.\n"
-"användning: 1. mkdir SÃKVÃG...\n"
-" 2. mkdir URL...\n"
+"användning: 1. mkdir SÃKVÃG[@]...\n"
+" 2. mkdir URL[@]...\n"
"\n"
-#: ../svn/svn.c:1347
+#: ../svn/svn.c:1380
msgid ""
" Create version controlled directories.\n"
"\n"
@@ -17359,7 +17479,7 @@ msgstr ""
" Skapa versionshanterade kataloger.\n"
"\n"
-#: ../svn/svn.c:1349
+#: ../svn/svn.c:1382
msgid ""
" 1. Each directory specified by a working copy PATH is created locally\n"
" and scheduled for addition upon the next commit.\n"
@@ -17369,7 +17489,7 @@ msgstr ""
" och schemaläggs att läggas till vid nästa arkivering.\n"
"\n"
-#: ../svn/svn.c:1352
+#: ../svn/svn.c:1385
msgid ""
" 2. Each directory specified by a URL is created in the repository via\n"
" an immediate commit.\n"
@@ -17379,7 +17499,7 @@ msgstr ""
" genast.\n"
"\n"
-#: ../svn/svn.c:1355
+#: ../svn/svn.c:1388
msgid ""
" In both cases, all the intermediate directories must already exist,\n"
" unless the --parents option is given.\n"
@@ -17387,18 +17507,28 @@ msgstr ""
" I båda fallen måste katalogerna ovanför de angivna redan finnas,\n"
" såvida inte flaggan --parents anges.\n"
-#: ../svn/svn.c:1361
+#: ../svn/svn.c:1391
+msgid ""
+" If PATH or URL contains an @ character, an additional @ must be\n"
+" specified at the end of PATH/URL to avoid interpreting the\n"
+" first @ as a peg revision indicator.\n"
+msgstr ""
+" Om SÃKVÃG eller URL innehÃ¥ller ett @-tecken mÃ¥ste ytterligare ett @-tecken\n"
+" anges vid slutet av SÃKVÃG/URL för att undvika att det första @-tecknet\n"
+" tolkas som ett ankare för en fixerad revision.\n"
+
+#: ../svn/svn.c:1398
msgid ""
"Move (rename) an item in a working copy or repository.\n"
-"usage: move SRC... DST\n"
+"usage: move SRC[@]... DST\n"
"\n"
msgstr ""
"Flytta (döp om) en fil eller katalog i en arbetskopia\n"
"eller ett arkiv.\n"
-"användning: move KÃLLOR... MÃ
L\n"
+"användning: move KÃLLOR[@]... MÃ
L\n"
"\n"
-#: ../svn/svn.c:1364
+#: ../svn/svn.c:1401
msgid ""
" SRC and DST can both be working copy (WC) paths or URLs:\n"
" WC -> WC: move an item in a working copy, as a local change to\n"
@@ -17421,7 +17551,7 @@ msgstr ""
" mÃ¥ste MÃ
L vara en befintlig katalog.\n"
"\n"
-#: ../svn/svn.c:1373
+#: ../svn/svn.c:1410
msgid ""
" SRC and DST of WC -> WC moves must be committed in the same revision.\n"
" Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n"
@@ -17436,17 +17566,28 @@ msgstr ""
" flyttas.\n"
" Flaggan --allow-mixed-revision finns till för bakåtkompatibilitet.\n"
-#: ../svn/svn.c:1384
+#: ../svn/svn.c:1416
+msgid ""
+" If any SRC contains an @ character, an additional @ must be\n"
+" specified at the end of that SRC to avoid interpreting the\n"
+" first @ as a peg revision indicator. This does not apply to DST.\n"
+msgstr ""
+" Om en KÃLLA innehÃ¥ller ett @-tecken mÃ¥ste ytterligare ett @-tecken\n"
+" anges vid slutet av KÃLLA för att undvika att det första @-tecknet\n"
+" tolkas som ett ankare för en fixerad revision. Detta gäller inte\n"
+" MÃ
L.\n"
+
+#: ../svn/svn.c:1425
msgid ""
"Apply a patch to a working copy.\n"
-"usage: patch PATCHFILE [WCPATH]\n"
+"usage: patch PATCHFILE [WCPATH[@]]\n"
"\n"
msgstr ""
"Anbringa en ändringsfil (patch) i en arbetskopia.\n"
-"användning: patch PATCHFIL [AKSÃKVÃG]\n"
+"användning: patch PATCHFIL [AKSÃKVÃG[@]]\n"
"\n"
-#: ../svn/svn.c:1387
+#: ../svn/svn.c:1428
msgid ""
" Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n"
" If WCPATH is omitted, '.' is assumed.\n"
@@ -17456,7 +17597,7 @@ msgstr ""
" arbetskopian AKSÃKVÃG. Om AKSÃKVÃG utelämnas sÃ¥ antas \".\".\n"
"\n"
-#: ../svn/svn.c:1390
+#: ../svn/svn.c:1431
msgid ""
" A unidiff patch suitable for application to a working copy can be\n"
" produced with the 'svn diff' command or third-party diffing tools.\n"
@@ -17470,7 +17611,7 @@ msgstr ""
" utom egenskapsändringar som genererades av \"svn diff\".\n"
"\n"
-#: ../svn/svn.c:1395
+#: ../svn/svn.c:1436
msgid ""
" Changes listed in the patch will either be applied or rejected.\n"
" If a change does not match at its exact line offset, it may be applied\n"
@@ -17492,7 +17633,7 @@ msgstr ""
" en konflikt och skrivs till en avslagsfil med suffixet \".svnpatch.rej\".\n"
"\n"
-#: ../svn/svn.c:1404
+#: ../svn/svn.c:1445
msgid ""
" For each patched file a line will be printed with characters reporting\n"
" the action taken. These characters have the following meaning:\n"
@@ -17502,7 +17643,7 @@ msgstr ""
" Dessa bokstäver betyder:\n"
"\n"
-#: ../svn/svn.c:1407
+#: ../svn/svn.c:1448
msgid ""
" A Added\n"
" D Deleted\n"
@@ -17518,7 +17659,7 @@ msgstr ""
" G Sammanslagen (med lokala ändringar som inte har arkiverats)\n"
"\n"
-#: ../svn/svn.c:1413
+#: ../svn/svn.c:1454
msgid ""
" Changes applied with an offset or fuzz are reported on lines starting\n"
" with the '>' symbol. You should review such changes carefully.\n"
@@ -17528,7 +17669,7 @@ msgstr ""
" börjar med tecknet \">\". Sådana ändringar bör granskas noga.\n"
"\n"
-#: ../svn/svn.c:1416
+#: ../svn/svn.c:1457
msgid ""
" If the patch removes all content from a file, that file is scheduled\n"
" for deletion. If the patch creates a new file, that file is scheduled\n"
@@ -17542,7 +17683,7 @@ msgstr ""
" tillägg.\n"
"\n"
-#: ../svn/svn.c:1421
+#: ../svn/svn.c:1462
msgid ""
" Hint: If the patch file was created with Subversion, it will contain\n"
" the number of a revision N the patch will cleanly apply to\n"
@@ -17558,19 +17699,29 @@ msgstr ""
" anbringa ändringsfilen, och uppdatera sedan tillbaka till revisionen\n"
" HEAD. På så sätt kan konflikter lösas interaktivt.\n"
-#: ../svn/svn.c:1432
+#: ../svn/svn.c:1469 ../svn/svn.c:2017
+msgid ""
+" If WCPATH contains an @ character, an additional @ must be\n"
+" specified at the end of WCPATH to avoid interpreting the\n"
+" first @ as a peg revision indicator.\n"
+msgstr ""
+" Om AKSÃKVÃG innehÃ¥ller ett @-tecken mÃ¥ste ytterligare ett @-tecken\n"
+" anges vid slutet av AKSÃKVÃG för att undvika att det första @-tecknet\n"
+" tolkas som ett ankare för en fixerad revision.\n"
+
+#: ../svn/svn.c:1477
msgid ""
"Remove a property from files, dirs, or revisions.\n"
-"usage: 1. propdel PROPNAME [PATH...]\n"
-" 2. propdel PROPNAME --revprop -r REV [TARGET]\n"
+"usage: 1. propdel PROPNAME [PATH[@]...]\n"
+" 2. propdel PROPNAME --revprop -r REV [TARGET[@]]\n"
"\n"
msgstr ""
"Radera en egenskap från filer, kataloger eller revisioner.\n"
-"användning: 1. propdel PROPNAMN [SÃKVÃG...]\n"
-" 2. propdel PROPNAMN --revprop -r REV [MÃ
L]\n"
+"användning: 1. propdel PROPNAMN [SÃKVÃG[@]...]\n"
+" 2. propdel PROPNAMN --revprop -r REV [MÃ
L[@]]\n"
"\n"
-#: ../svn/svn.c:1436
+#: ../svn/svn.c:1481
msgid ""
" 1. Removes versioned props in working copy.\n"
" 2. Removes unversioned remote prop on repos revision.\n"
@@ -17583,25 +17734,35 @@ msgstr ""
" MÃ
L används endast för att avgöra vilket arkiv som ska användas.\n"
"\n"
-#: ../svn/svn.c:1440 ../svn/svn.c:1453 ../svn/svn.c:1477 ../svn/svn.c:1497
+#: ../svn/svn.c:1485 ../svn/svn.c:1502 ../svn/svn.c:1530 ../svn/svn.c:1554
msgid " See 'svn help propset' for descriptions of the svn:* special properties.\n"
msgstr ""
" Se \"svn help propset\" för beskrivning av de speciella egenskaperna som\n"
" börjar med \"svn:\".\n"
-#: ../svn/svn.c:1445
+#: ../svn/svn.c:1487 ../svn/svn.c:1652
+msgid ""
+" If PATH or TARGET contains an @ character, an additional @ must be\n"
+" specified at the end of PATH or TARGET to avoid interpreting the\n"
+" first @ as a peg revision indicator.\n"
+msgstr ""
+" Om SÃKVÃG eller MÃ
L innehåller ett @-tecken måste ytterligare ett @-tecken\n"
+" anges vid slutet av SÃKVÃG/MÃ
L för att undvika att det första @-tecknet\n"
+" tolkas som ett ankare för en fixerad revision.\n"
+
+#: ../svn/svn.c:1494
msgid ""
"Edit a property with an external editor.\n"
-"usage: 1. propedit PROPNAME TARGET...\n"
-" 2. propedit PROPNAME --revprop -r REV [TARGET]\n"
+"usage: 1. propedit PROPNAME TARGET[@]...\n"
+" 2. propedit PROPNAME --revprop -r REV [TARGET[@]]\n"
"\n"
msgstr ""
"Redigera en egenskap med en extern editor.\n"
-"användning: 1. propedit EGENSKAPSNAMN MÃ
L...\n"
-" 2. propedit EGENSKAPSNAMN --revprop -r REV [MÃ
L]\n"
+"användning: 1. propedit EGENSKAPSNAMN MÃ
L[@]...\n"
+" 2. propedit EGENSKAPSNAMN --revprop -r REV [MÃ
L[@]]\n"
"\n"
-#: ../svn/svn.c:1449
+#: ../svn/svn.c:1498
msgid ""
" 1. Edits versioned prop in working copy or repository.\n"
" 2. Edits unversioned remote prop on repos revision.\n"
@@ -17614,20 +17775,30 @@ msgstr ""
" MÃ
L används endast för att avgöra vilket arkiv som ska användas.\n"
"\n"
-#: ../svn/svn.c:1458
+#: ../svn/svn.c:1504 ../svn/svn.c:1532 ../svn/svn.c:1556 ../svn/svn.c:1938
+msgid ""
+" If TARGET contains an @ character, an additional @ must be\n"
+" specified at the end of TARGET to avoid interpreting the\n"
+" first @ as a peg revision indicator.\n"
+msgstr ""
+" Om MÃ
L innehåller ett @-tecken måste ytterligare ett @-tecken anges vid\n"
+" slutet av MÃ
L för att undvika att det första @-tecknet tolkas som ett\n"
+" ankare för en fixerad revision.\n"
+
+#: ../svn/svn.c:1511
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
-" 2. propget PROPNAME --revprop -r REV [TARGET]\n"
+" 2. propget PROPNAME --revprop -r REV [TARGET[@]]\n"
"\n"
msgstr ""
"Skriv ut värdet på en egenskap för filer, kataloger\n"
"eller revisioner.\n"
"användning: 1. propget PROPNAMN [MÃ
L[@REV]...]\n"
-" 2. propget PROPNAMN --revprop -r REV [MÃ
L]\n"
+" 2. propget PROPNAMN --revprop -r REV [MÃ
L[@]]\n"
"\n"
-#: ../svn/svn.c:1462
+#: ../svn/svn.c:1515
msgid ""
" 1. Prints versioned props. If specified, REV determines in which\n"
" revision the target is first looked up.\n"
@@ -17642,7 +17813,7 @@ msgstr ""
" MÃ
L används endast för att avgöra vilket arkiv som ska användas.\n"
"\n"
-#: ../svn/svn.c:1467
+#: ../svn/svn.c:1520
msgid ""
" With --verbose, the target path and the property name are printed on\n"
" separate lines before each value, like 'svn proplist --verbose'.\n"
@@ -17656,7 +17827,7 @@ msgstr ""
" på samma rad framför varje värde.\n"
"\n"
-#: ../svn/svn.c:1472
+#: ../svn/svn.c:1525
msgid ""
" By default, an extra newline is printed after the property value so that\n"
" the output looks pretty. With a single TARGET, depth 'empty' and without\n"
@@ -17670,28 +17841,28 @@ msgstr ""
" (bland annat användbart när binära egenskaper skickas till en fil).\n"
"\n"
-#: ../svn/svn.c:1481 ../svn/svn.c:1501
+#: ../svn/svn.c:1538 ../svn/svn.c:1562
msgid "print path, name and value on separate lines"
msgstr "skriv sökväg, namn och värde på skilda rader"
-#: ../svn/svn.c:1482
+#: ../svn/svn.c:1539
msgid "(deprecated; use --no-newline)"
msgstr "(föråldrat; se --no-newline)"
-#: ../svn/svn.c:1485
+#: ../svn/svn.c:1542
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
-" 2. proplist --revprop -r REV [TARGET]\n"
+" 2. proplist --revprop -r REV [TARGET[@]]\n"
"\n"
msgstr ""
"Lista alla egenskaper på filer, kataloger eller\n"
"revisioner.\n"
"användning: 1. proplist [MÃ
L[@REV]...]\n"
-" 2. proplist --revprop -r REV [MÃ
L]\n"
+" 2. proplist --revprop -r REV [MÃ
L[@]]\n"
"\n"
-#: ../svn/svn.c:1489
+#: ../svn/svn.c:1546
msgid ""
" 1. Lists versioned props. If specified, REV determines in which\n"
" revision the target is first looked up.\n"
@@ -17706,7 +17877,7 @@ msgstr ""
" MÃ
L används endast för att avgöra vilket arkiv som ska användas.\n"
"\n"
-#: ../svn/svn.c:1494
+#: ../svn/svn.c:1551
msgid ""
" With --verbose, the property values are printed as well, like 'svn propget\n"
" --verbose'. With --quiet, the paths are not printed.\n"
@@ -17716,24 +17887,24 @@ msgstr ""
" --verbose\". Med --quiet skrivs inte sökvägarna ut.\n"
"\n"
-#: ../svn/svn.c:1502
+#: ../svn/svn.c:1563
msgid "don't print the path"
msgstr "skriv inte sökvägen"
-#: ../svn/svn.c:1505
+#: ../svn/svn.c:1566
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
-"usage: 1. propset PROPNAME PROPVAL PATH...\n"
-" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"usage: 1. propset PROPNAME PROPVAL PATH[@]...\n"
+" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET[@]]\n"
"\n"
msgstr ""
"Sätt värdet på en egenskap på filer, kataloger\n"
"eller revisioner.\n"
-"användning: 1. propset PROPNAMN VÃRDE SÃKVÃG...\n"
-" 2. propset PROPNAMN --revprop -r REV VÃRDE [MÃ
L]\n"
+"användning: 1. propset PROPNAMN VÃRDE SÃKVÃG[@]...\n"
+" 2. propset PROPNAMN --revprop -r REV VÃRDE [MÃ
L[@]]\n"
"\n"
-#: ../svn/svn.c:1509
+#: ../svn/svn.c:1570
msgid ""
" 1. Changes a versioned file or directory property in a working copy.\n"
" 2. Changes an unversioned property on a repository revision.\n"
@@ -17747,7 +17918,7 @@ msgstr ""
" MÃ
L används endast för att avgöra vilket arkiv som ska användas.\n"
"\n"
-#: ../svn/svn.c:1513
+#: ../svn/svn.c:1574
msgid ""
" The value may be provided with the --file option instead of PROPVAL.\n"
"\n"
@@ -17755,7 +17926,7 @@ msgstr ""
" Värdet kan tillhandahÃ¥llas med flaggan --file istället för som VÃRDE.\n"
"\n"
-#: ../svn/svn.c:1515
+#: ../svn/svn.c:1576
msgid ""
" Property names starting with 'svn:' are reserved. Subversion recognizes\n"
" the following special versioned properties on a file:\n"
@@ -17781,7 +17952,7 @@ msgstr ""
" Header - Som \"Id\" men med full URL.\n"
"\n"
-#: ../svn/svn.c:1526
+#: ../svn/svn.c:1587
msgid ""
" Custom keywords can be defined with a format string separated from\n"
" the keyword name with '='. Valid format substitutions are:\n"
@@ -17822,7 +17993,7 @@ msgstr ""
" inom den filen som vilket annat nyckelord som helst: $Mittnyckelord$\n"
"\n"
-#: ../svn/svn.c:1544
+#: ../svn/svn.c:1605
msgid ""
" svn:executable - If present, make the file executable. Use\n"
" 'svn propdel svn:executable PATH...' to clear.\n"
@@ -17850,7 +18021,7 @@ msgstr ""
" nollställa.\n"
"\n"
-#: ../svn/svn.c:1556
+#: ../svn/svn.c:1617
msgid ""
" Subversion recognizes the following special versioned properties on a\n"
" directory:\n"
@@ -17924,11 +18095,11 @@ msgstr ""
" \"relativ_URL relativ_sökväg\" med stöd för fixerad revision.\n"
" Rader som börjar med tecknet \"#\" hoppas över.\n"
-#: ../svn/svn.c:1593
+#: ../svn/svn.c:1658
msgid "read property value from file ARG"
msgstr "läs egenskapsvärde från filen ARG"
-#: ../svn/svn.c:1596
+#: ../svn/svn.c:1661
msgid ""
"Relocate the working copy to point to a different repository root URL.\n"
"usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n"
@@ -17940,7 +18111,7 @@ msgstr ""
" 2. relocate TILL-URL [SÃKVÃG]\n"
"\n"
-#: ../svn/svn.c:1600
+#: ../svn/svn.c:1665
msgid ""
" Rewrite working copy URL metadata to reflect a syntactic change only.\n"
" This is used when a repository's root URL changes (such as a scheme\n"
@@ -17954,7 +18125,7 @@ msgstr ""
" samma arkiv.\n"
"\n"
-#: ../svn/svn.c:1605
+#: ../svn/svn.c:1670
msgid ""
" 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n"
" copy's current and new URLs, respectively. (You may specify the\n"
@@ -17968,7 +18139,7 @@ msgstr ""
" arbetskopian.\n"
"\n"
-#: ../svn/svn.c:1610
+#: ../svn/svn.c:1675
msgid ""
" 2. TO-URL is the (complete) new repository URL to use for PATH.\n"
"\n"
@@ -17976,7 +18147,7 @@ msgstr ""
" 2. TILL-URL är den (fullständiga) nya arkiv-URL:en att använda för SÃKVÃG.\n"
"\n"
-#: ../svn/svn.c:1612
+#: ../svn/svn.c:1677
msgid ""
" Examples:\n"
" svn relocate http:// svn:// project1 project2\n"
@@ -17988,17 +18159,17 @@ msgstr ""
" svn relocate http://www.exempel.se/arkiv/projekt \\\n"
" svn://svn.exempel.se/arkiv/projekt\n"
-#: ../svn/svn.c:1620
+#: ../svn/svn.c:1685
msgid ""
"Resolve conflicts on working copy files or directories.\n"
-"usage: resolve [PATH...]\n"
+"usage: resolve [PATH[@]...]\n"
"\n"
msgstr ""
"Lös konflikter i filer och kataloger i arbetskopian.\n"
-"användning: resolve [SÃKVÃG...]\n"
+"användning: resolve [SÃKVÃG[@]...]\n"
"\n"
-#: ../svn/svn.c:1623
+#: ../svn/svn.c:1688
msgid ""
" By default, perform interactive conflict resolution on PATH.\n"
" In this mode, the command is recursive by default (depth 'infinity').\n"
@@ -18008,7 +18179,7 @@ msgstr ""
" I detta läge är kommandot normalt rekursivt (djup \"infinity\").\n"
"\n"
-#: ../svn/svn.c:1626
+#: ../svn/svn.c:1691
msgid ""
" The --accept=ARG option prevents interactive prompting and forces\n"
" conflicts on PATH to be resolved in the manner specified by ARG.\n"
@@ -18020,7 +18191,7 @@ msgstr ""
" rekursivt (djup \"empty\").\n"
"\n"
-#: ../svn/svn.c:1630
+#: ../svn/svn.c:1695
msgid ""
" A conflicted path cannot be committed with 'svn commit' until it\n"
" has been marked as resolved with 'svn resolve'.\n"
@@ -18030,7 +18201,7 @@ msgstr ""
" lösts med \"svn resolve\".\n"
"\n"
-#: ../svn/svn.c:1633
+#: ../svn/svn.c:1698
msgid ""
" Subversion knows three types of conflicts:\n"
" Text conflicts, Property conflicts, and Tree conflicts.\n"
@@ -18040,7 +18211,7 @@ msgstr ""
" Textkonflikter, egenskapskonflikter och trädkonflikter.\n"
"\n"
-#: ../svn/svn.c:1636
+#: ../svn/svn.c:1701
msgid ""
" Text conflicts occur when overlapping changes to file contents were\n"
" made. Text conflicts are usually resolved by editing the conflicted\n"
@@ -18061,7 +18232,7 @@ msgstr ""
" eller inkommande ändringar helt och hållet.\n"
"\n"
-#: ../svn/svn.c:1644
+#: ../svn/svn.c:1709
msgid ""
" Property conflicts are usually resolved by editing the value of the\n"
" conflicted property (either from the interactive prompt, or with\n"
@@ -18076,7 +18247,7 @@ msgstr ""
" till förmån för andra.\n"
"\n"
-#: ../svn/svn.c:1649
+#: ../svn/svn.c:1714
msgid ""
" Tree conflicts occur when a change to the directory structure was\n"
" made, and when this change cannot be applied to the working copy\n"
@@ -18100,7 +18271,7 @@ msgstr ""
" när det går, istället för att lösa trädkonflikten manuellt.\n"
"\n"
-#: ../svn/svn.c:1659
+#: ../svn/svn.c:1724
msgid ""
" If a tree conflict cannot be resolved automatically, it is recommended\n"
" to figure out why the conflict occurred before attempting to resolve it.\n"
@@ -18126,7 +18297,18 @@ msgstr ""
" nödvändigt att slänga bort vissa lokala ändringar med \"svn revert\".\n"
" Filer eller kataloger kan behöva kopieras, raderas eller flyttas.\n"
-#: ../svn/svn.c:1672
+#: ../svn/svn.c:1736 ../svn/svn.c:1756 ../svn/svn.c:1773 ../svn/svn.c:1873
+#: ../svn/svn.c:1992
+msgid ""
+" If PATH contains an @ character, an additional @ must be\n"
+" specified at the end of PATH to avoid interpreting the\n"
+" first @ as a peg revision indicator.\n"
+msgstr ""
+" Om SÃKVÃG innehÃ¥ller ett @-tecken mÃ¥ste ytterligare ett @-tecken anges vid\n"
+" slutet av SÃKVÃG för att undvika att det första @-tecknet tolkas som ett\n"
+" ankare för en fixerad revision.\n"
+
+#: ../svn/svn.c:1741
msgid ""
"specify automatic conflict resolution source\n"
" ('base', 'working', 'mine-conflict',\n"
@@ -18136,17 +18318,17 @@ msgstr ""
" (\"base\", \"working\", \"mine-conflict\",\n"
" \"theirs-conflict\", \"mine-full\", \"theirs-full\")"
-#: ../svn/svn.c:1679
+#: ../svn/svn.c:1748
msgid ""
"Remove 'conflicted' state on working copy files or directories.\n"
-"usage: resolved PATH...\n"
+"usage: resolved PATH[@]...\n"
"\n"
msgstr ""
"Ta bort konflikttillstånd på filer eller kataloger i arbetskopian.\n"
-"användning: resolved SÃKVÃG...\n"
+"användning: resolved SÃKVÃG[@]...\n"
"\n"
-#: ../svn/svn.c:1682
+#: ../svn/svn.c:1751
msgid ""
" Note: this subcommand does not semantically resolve conflicts or\n"
" remove conflict markers; it merely removes the conflict-related\n"
@@ -18158,17 +18340,17 @@ msgstr ""
" uppstod och gör sÃ¥ att det gÃ¥r att arkivera SÃKVÃG igen. Det rekommenderas\n"
" att använda \"svn resolve --accept working\" istället.\n"
-#: ../svn/svn.c:1690
+#: ../svn/svn.c:1763
msgid ""
"Restore pristine working copy state (undo local changes).\n"
-"usage: revert PATH...\n"
+"usage: revert PATH[@]...\n"
"\n"
msgstr ""
"Ã
terställ arbetskopia till orört tillstånd (upphäv lokala ändringar).\n"
-"användning: revert SÃKVÃG...\n"
+"användning: revert SÃKVÃG[@]...\n"
"\n"
-#: ../svn/svn.c:1693
+#: ../svn/svn.c:1766
msgid ""
" Revert changes in the working copy at or within PATH, and remove\n"
" conflict markers as well, if any.\n"
@@ -18178,7 +18360,7 @@ msgstr ""
" konfliktmarkeringar om sådana finns.\n"
"\n"
-#: ../svn/svn.c:1696
+#: ../svn/svn.c:1769
msgid ""
" This subcommand does not revert already committed changes.\n"
" For information about undoing already committed changes, search\n"
@@ -18188,17 +18370,17 @@ msgstr ""
" För information om att göra det, kör \"svn help merge\" och sök efter\n"
" \"upphäva\".\n"
-#: ../svn/svn.c:1704
+#: ../svn/svn.c:1781
msgid ""
"Print the status of working copy files and directories.\n"
-"usage: status [PATH...]\n"
+"usage: status [PATH[@]...]\n"
"\n"
msgstr ""
"Visa status för filer och kataloger i en arbetskopia.\n"
-"användning: status [SÃKVÃG...]\n"
+"användning: status [SÃKVÃG[@]...]\n"
"\n"
-#: ../svn/svn.c:1707
+#: ../svn/svn.c:1784
msgid ""
" With no args, print only locally modified items (no network access).\n"
" With -q, print only summary information about locally modified items.\n"
@@ -18213,7 +18395,7 @@ msgstr ""
" Med -v visas fullständig revisionsinformation för varje objekt.\n"
"\n"
-#: ../svn/svn.c:1712
+#: ../svn/svn.c:1789
msgid ""
" The first seven columns in the output are each one character wide:\n"
" First column: Says if item was added, deleted, or otherwise changed\n"
@@ -18308,7 +18490,7 @@ msgstr ""
" konflikten skrivas efter objektets statusrad.\n"
"\n"
-#: ../svn/svn.c:1756
+#: ../svn/svn.c:1833
msgid ""
" The out-of-date information appears in the ninth column (with -u):\n"
" '*' a newer revision exists on the server\n"
@@ -18321,7 +18503,7 @@ msgstr ""
" \" \" arbetskopian är aktuell\n"
"\n"
-#: ../svn/svn.c:1760
+#: ../svn/svn.c:1837
msgid ""
" Remaining fields are variable width and delimited by spaces:\n"
" The working revision (with -u or -v; '-' if the item is copied)\n"
@@ -18336,7 +18518,7 @@ msgstr ""
" Arbetskopians sökväg står alltid sist, så att den kan innehålla mellanslag.\n"
"\n"
-#: ../svn/svn.c:1766
+#: ../svn/svn.c:1843
msgid ""
" The presence of a question mark ('?') where a working revision, last\n"
" committed revision, or last committed author was expected indicates\n"
@@ -18352,7 +18534,7 @@ msgstr ""
" Frågetecknet fungerar som platshållare för att förenkla tolkning.\n"
"\n"
-#: ../svn/svn.c:1772
+#: ../svn/svn.c:1849
msgid ""
" Example output:\n"
" svn status wc\n"
@@ -18366,7 +18548,7 @@ msgstr ""
" A + ak/gamma.c\n"
"\n"
-#: ../svn/svn.c:1777
+#: ../svn/svn.c:1854
msgid ""
" svn status -u wc\n"
" M 965 wc/bar.c\n"
@@ -18382,7 +18564,7 @@ msgstr ""
" Status gentemot revision: 981\n"
"\n"
-#: ../svn/svn.c:1783
+#: ../svn/svn.c:1860
msgid ""
" svn status --show-updates --verbose wc\n"
" M 965 938 kfogel wc/bar.c\n"
@@ -18400,7 +18582,7 @@ msgstr ""
" Status gentemot revision: 981\n"
"\n"
-#: ../svn/svn.c:1790
+#: ../svn/svn.c:1867
msgid ""
" svn status\n"
" M wc/bar.c\n"
@@ -18414,15 +18596,15 @@ msgstr ""
" > lokal fil saknas, inkommande fil ändrad vid uppdatering\n"
" D ak/delta.c\n"
-#: ../svn/svn.c:1798
+#: ../svn/svn.c:1879
msgid "don't print unversioned items"
msgstr "visa inte icke versionshanterade objekt"
-#: ../svn/svn.c:1799
+#: ../svn/svn.c:1880
msgid "obsolete; same as --depth=immediates"
msgstr "föråldrat; samma som --depth=immediates"
-#: ../svn/svn.c:1802
+#: ../svn/svn.c:1883
msgid ""
"Update the working copy to a different URL within the same\n"
"repository.\n"
@@ -18435,7 +18617,7 @@ msgstr ""
" 2. switch --relocate FRÃ
N-PREFIX TILL-PREFIX [SÃKVÃG...]\n"
"\n"
-#: ../svn/svn.c:1807
+#: ../svn/svn.c:1888
msgid ""
" 1. Update the working copy to mirror a new URL within the repository.\n"
" This behavior is similar to 'svn update', and is the way to\n"
@@ -18451,7 +18633,7 @@ msgstr ""
" målet ursprunglingen slås upp.\n"
"\n"
-#: ../svn/svn.c:1813
+#: ../svn/svn.c:1894
msgid ""
" If --force is used, unversioned obstructing paths in the working\n"
" copy do not automatically cause a failure if the switch attempts to\n"
@@ -18477,7 +18659,7 @@ msgstr ""
" egenskaper i arkivet läggs till för sökvägar som är i vägen.\n"
"\n"
-#: ../svn/svn.c:1824
+#: ../svn/svn.c:1905
msgid ""
" Use the --set-depth option to set a new working copy depth on the\n"
" targets of this operation.\n"
@@ -18487,7 +18669,7 @@ msgstr ""
" målet för denna handling.\n"
"\n"
-#: ../svn/svn.c:1827
+#: ../svn/svn.c:1908
msgid ""
" By default, Subversion will refuse to switch a working copy path to\n"
" a new URL with which it shares no common version control ancestry.\n"
@@ -18499,7 +18681,7 @@ msgstr ""
" flaggan \"--ignore-ancestry\" för att kringgå denna kontroll.\n"
"\n"
-#: ../svn/svn.c:1831
+#: ../svn/svn.c:1912
msgid ""
" 2. The '--relocate' option is deprecated. This syntax is equivalent to\n"
" 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n"
@@ -18509,7 +18691,7 @@ msgstr ""
" \"svn relocate FRÃ
N-PREFIX TILL-PREFIX [SÃKVÃG]\".\n"
"\n"
-#: ../svn/svn.c:1834
+#: ../svn/svn.c:1915
msgid ""
" See also 'svn help update' for a list of possible characters\n"
" reporting the action taken.\n"
@@ -18519,7 +18701,7 @@ msgstr ""
" vad som gjorts.\n"
"\n"
-#: ../svn/svn.c:1837
+#: ../svn/svn.c:1918
msgid ""
" Examples:\n"
" svn switch ^/branches/1.x-release\n"
@@ -18527,51 +18709,51 @@ msgstr ""
" Exempel:\n"
" svn switch ^/branches/1.x-release\n"
-#: ../svn/svn.c:1844
+#: ../svn/svn.c:1925
msgid "allow switching to a node with no common ancestor"
msgstr "tillåt växling till en nod utan gemensamt ursprung"
-#: ../svn/svn.c:1846 ../svn/svn.c:1911
+#: ../svn/svn.c:1927 ../svn/svn.c:2000
msgid "handle unversioned obstructions as changes"
msgstr ""
"behandla ej versionshanterade blockeringar\n"
" som ändringar"
-#: ../svn/svn.c:1847
+#: ../svn/svn.c:1928
msgid "deprecated; use 'svn relocate'"
msgstr "föråldrat; använd \"svn relocate\""
-#: ../svn/svn.c:1852
+#: ../svn/svn.c:1933
msgid ""
"Unlock working copy paths or URLs.\n"
-"usage: unlock TARGET...\n"
+"usage: unlock TARGET[@]...\n"
"\n"
msgstr ""
"Lås upp sökvägar i en arbetskopia eller URL:er.\n"
-"användning: unlock MÃ
L...\n"
+"användning: unlock MÃ
L[@]...\n"
"\n"
-#: ../svn/svn.c:1855
+#: ../svn/svn.c:1936
msgid " Use --force to break a lock held by another user or working copy.\n"
msgstr ""
" Använd --force för att \"bryta upp\" ett lås som hålls av en annan användare\n"
" eller arbetskopia.\n"
-#: ../svn/svn.c:1858
+#: ../svn/svn.c:1943
msgid "break locks"
msgstr "bryt upp lås"
-#: ../svn/svn.c:1861
+#: ../svn/svn.c:1946
msgid ""
"Bring changes from the repository into the working copy.\n"
-"usage: update [PATH...]\n"
+"usage: update [PATH[@]...]\n"
"\n"
msgstr ""
"Inför ändringar från arkivet i arbetskopian.\n"
-"användning: update [SÃKVÃG...]\n"
+"användning: update [SÃKVÃG[@]...]\n"
"\n"
-#: ../svn/svn.c:1864
+#: ../svn/svn.c:1949
msgid ""
" If no revision is given, bring working copy up-to-date with HEAD rev.\n"
" Else synchronize working copy to revision given by -r.\n"
@@ -18581,7 +18763,7 @@ msgstr ""
" Annars synkroniseras arbetskopian med den revision som anges med -r.\n"
"\n"
-#: ../svn/svn.c:1867
+#: ../svn/svn.c:1952
msgid ""
" For each updated item a line will be printed with characters reporting\n"
" the action taken. These characters have the following meaning:\n"
@@ -18591,7 +18773,7 @@ msgstr ""
" vad som gjorts. Dessa tecken har följande innebörd:\n"
"\n"
-#: ../svn/svn.c:1878
+#: ../svn/svn.c:1963
msgid ""
" Characters in the first column report about the item itself.\n"
" Characters in the second column report about properties of the item.\n"
@@ -18610,7 +18792,7 @@ msgstr ""
" egenskaper.\n"
"\n"
-#: ../svn/svn.c:1886
+#: ../svn/svn.c:1971
msgid ""
" If --force is used, unversioned obstructing paths in the working\n"
" copy do not automatically cause a failure if the update attempts to\n"
@@ -18638,7 +18820,7 @@ msgstr ""
" kolumnen med ett \"E\".\n"
"\n"
-#: ../svn/svn.c:1898
+#: ../svn/svn.c:1983
msgid ""
" If the specified update target is missing from the working copy but its\n"
" immediate parent directory is present, checkout the target into its\n"
@@ -18654,7 +18836,7 @@ msgstr ""
" djupet \"empty\".\n"
"\n"
-#: ../svn/svn.c:1904
+#: ../svn/svn.c:1989
msgid ""
" Use the --set-depth option to set a new working copy depth on the\n"
" targets of this operation.\n"
@@ -18662,17 +18844,17 @@ msgstr ""
" Använd väljaren --set-depth för att ange ett nytt arbetskopiedjup för\n"
" målet för denna handling.\n"
-#: ../svn/svn.c:1915
+#: ../svn/svn.c:2004
msgid ""
"Upgrade the metadata storage format for a working copy.\n"
-"usage: upgrade [WCPATH...]\n"
+"usage: upgrade [WCPATH[@]...]\n"
"\n"
msgstr ""
"Uppgradera lagringsformatet för en arbetskopia.\n"
-"användning: upgrade [AKSÃKVÃG...]\n"
+"användning: upgrade [AKSÃKVÃG[@]...]\n"
"\n"
-#: ../svn/svn.c:1918
+#: ../svn/svn.c:2007
msgid ""
" The upgraded working copy will be compatible with Subversion 1.8 and\n"
" newer (this default may change in the future). To upgrade to a different\n"
@@ -18688,7 +18870,7 @@ msgstr ""
" Använd \"svn --version\" för att se de versioner som stöds.\n"
"\n"
-#: ../svn/svn.c:1924
+#: ../svn/svn.c:2013
msgid ""
" Only upgrades are supported, not downgrades.\n"
"\n"
@@ -18696,127 +18878,108 @@ msgstr ""
" Endast uppgraderingar stödjs, inte nedgraderingar.\n"
"\n"
-#: ../svn/svn.c:1926
+#: ../svn/svn.c:2015
msgid " Local modifications are preserved.\n"
msgstr " Lokala ändringar behålls som de är.\n"
-#: ../svn/svn.c:2008
+#: ../svn/svn.c:2101
#, c-format
msgid "'%s' is not a valid --x-viewspec value"
msgstr "\"%s\" är inte ett giltigt värde för --x-viewspec"
-#: ../svn/svn.c:2078
+#: ../svn/svn.c:2171
#, c-format
msgid "Cannot make working copies compatible with the requested version %d.%d; the oldest supported version is %d.%d"
msgstr "Kan inte göra arbetskopior kompatibla med den önskade versionen %d.%d; den äldsta stödda versionen är %d.%d"
-#: ../svn/svn.c:2090
+#: ../svn/svn.c:2183
#, c-format
msgid "Cannot guarantee working copy compatibility with the requested version %d.%d; the latest supported version is %d.%d"
msgstr "Kan inte garantera arbetskopians kompatibilitet med den angivna versionen %d.%d; den senaste stödda versionen är %d.%d"
-#: ../svn/svn.c:2222 ../svnbench/svnbench.c:474 ../svnlook/svnlook.c:2590
+#: ../svn/svn.c:2322 ../svnbench/svnbench.c:480 ../svnlook/svnlook.c:2589
msgid "Non-numeric limit argument given"
msgstr "Argumentet till limit-flaggan är inget tal"
-#: ../svn/svn.c:2227 ../svnbench/svnbench.c:479 ../svnlook/svnlook.c:2595
+#: ../svn/svn.c:2327 ../svnbench/svnbench.c:485 ../svnlook/svnlook.c:2594
msgid "Argument to --limit must be positive"
msgstr "Argumentet till --limit måste vara positivt"
-#: ../svn/svn.c:2247 ../svn/svn.c:2525
+#: ../svn/svn.c:2347 ../svn/svn.c:2554
msgid "Can't specify -c with --old"
msgstr "Kan inte ange -c med --old"
-#: ../svn/svn.c:2277 ../svnbench/svnbench.c:515
+#: ../svn/svn.c:2359 ../svnbench/svnbench.c:506
#, c-format
-msgid "Negative number in range (%s) not supported with -c"
-msgstr "Negativt tal i område (%s) stöds ej med -c"
+msgid "Syntax error in change argument '%s'"
+msgstr "Syntaxfel i change-argumentet \"%s\""
-#: ../svn/svn.c:2289 ../svnbench/svnbench.c:527
-#, c-format
-msgid "Non-numeric change argument (%s) given to -c"
-msgstr "Argumentet till flaggan -c (%s) är inget tal"
-
-#: ../svn/svn.c:2296 ../svnbench/svnbench.c:534
-msgid "There is no change 0"
-msgstr "Ãndring 0 finns inte"
-
-#: ../svn/svn.c:2337 ../svnadmin/svnadmin.c:3129 ../svnbench/svnbench.c:576
-#: ../svnfsfs/svnfsfs.c:303 ../svnrdump/svnrdump.c:865
-#: ../svnsync/svnsync.c:2146
+#: ../svn/svn.c:2374 ../svnadmin/svnadmin.c:3135 ../svnbench/svnbench.c:522
+#: ../svnfsfs/svnfsfs.c:309 ../svnrdump/svnrdump.c:871
+#: ../svnsync/svnsync.c:2152
#, c-format
msgid "Syntax error in revision argument '%s'"
msgstr "Syntaxfel i revisionsargumentet \"%s\""
-#: ../svn/svn.c:2403 ../svn/svn.c:2420 ../svnbench/svnbench.c:615
-#, c-format
-msgid "Error converting depth from locale to UTF-8"
-msgstr "Fel vid konvertering av djupet från lokal kodning till UTF-8"
-
-#: ../svn/svn.c:2410 ../svnbench/svnbench.c:622
+#: ../svn/svn.c:2443 ../svnbench/svnbench.c:564
#, c-format
msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'"
msgstr "\"%s\" är inget giltigt djup; försök med \"empty\", \"files\", \"immediates\" eller \"infinity\""
-#: ../svn/svn.c:2427
+#: ../svn/svn.c:2456
#, c-format
msgid "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or 'infinity'"
msgstr "\"%s\" är inget giltigt djup; försök med \"exclude\", \"empty\", \"files\", \"immediates\" eller \"infinity\""
-#: ../svn/svn.c:2563
+#: ../svn/svn.c:2592
#, c-format
msgid "Syntax error in native-eol argument '%s'"
msgstr "Syntaxfel i native-eol-argumentet \"%s\""
-#: ../svn/svn.c:2584
+#: ../svn/svn.c:2613
msgid "Changelist names must not be empty"
msgstr "Ãndringslistor fÃ¥r inte ha tomma namn"
-#: ../svn/svn.c:2617
+#: ../svn/svn.c:2646
#, c-format
msgid "'%s' is not a valid --accept value"
msgstr "\"%s\" är inte ett giltigt värde för --accept"
-#: ../svn/svn.c:2625
+#: ../svn/svn.c:2654
#, c-format
msgid "'%s' is not a valid --show-revs value"
msgstr "\"%s\" är inte ett giltigt värde för --show-revs"
-#: ../svn/svn.c:2641
+#: ../svn/svn.c:2670
#, c-format
msgid "Invalid strip count '%s'"
msgstr "Ogiltigt antal att ta bort: \"%s\""
-#: ../svn/svn.c:2647
+#: ../svn/svn.c:2676
msgid "Argument to --strip must be positive"
msgstr "Argumentet till --strip måste vara positivt"
-#: ../svn/svn.c:2749 ../svnmucc/svnmucc.c:666 ../svnrdump/svnrdump.c:944
-#: ../svnsync/svnsync.c:2204
-msgid "--non-interactive and --force-interactive are mutually exclusive"
-msgstr "--non-interactive och --force-interactive kan inte användas samtidigt"
-
-#: ../svn/svn.c:2802 ../svnbench/svnbench.c:756
-#: ../svndumpfilter/svndumpfilter.c:1429 ../svnlook/svnlook.c:2694
+#: ../svn/svn.c:2830 ../svnbench/svnbench.c:698
+#: ../svndumpfilter/svndumpfilter.c:1435 ../svnlook/svnlook.c:2693
#, c-format
msgid "Subcommand argument required\n"
msgstr "Argument för underkommando krävs\n"
-#: ../svn/svn.c:2820 ../svnadmin/svnadmin.c:3355 ../svnbench/svnbench.c:774
-#: ../svndumpfilter/svndumpfilter.c:1446 ../svnfsfs/svnfsfs.c:379
-#: ../svnlook/svnlook.c:2711 ../svnrdump/svnrdump.c:988
+#: ../svn/svn.c:2848 ../svnadmin/svnadmin.c:3361 ../svnbench/svnbench.c:716
+#: ../svndumpfilter/svndumpfilter.c:1452 ../svnfsfs/svnfsfs.c:385
+#: ../svnlook/svnlook.c:2710 ../svnrdump/svnrdump.c:994
#, c-format
msgid "Unknown subcommand: '%s'\n"
msgstr "Okänt underkommando: \"%s\"\n"
-#: ../svn/svn.c:2829
+#: ../svn/svn.c:2857
#, c-format
msgid "Undo is done using either the 'svn revert' or the 'svn merge' command.\n"
msgstr ""
"Ã
tergång till tidigare tillstånd görs med antingen \"svn revert\"\n"
"eller \"svn merge\".\n"
-#: ../svn/svn.c:2865
+#: ../svn/svn.c:2893
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -18825,99 +18988,99 @@ msgstr ""
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svn help %s\" för användning.\n"
-#: ../svn/svn.c:2880 ../svnbench/svnbench.c:822
+#: ../svn/svn.c:2908 ../svnbench/svnbench.c:764
msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r"
msgstr "Flera revisionsargument påträffades; -c kan inte anges flera gånger; -c och -r kan inte användas samtidigt"
-#: ../svn/svn.c:2891
+#: ../svn/svn.c:2919
msgid "--depth and --set-depth are mutually exclusive"
msgstr "--depth och --set-depth kan inte användas samtidigt"
-#: ../svn/svn.c:2900 ../svnbench/svnbench.c:833
+#: ../svn/svn.c:2928 ../svnbench/svnbench.c:775
msgid "--with-all-revprops and --with-no-revprops are mutually exclusive"
msgstr "--with-all-revprops och --with-no-revprops kan inte användas samtidigt"
-#: ../svn/svn.c:2909 ../svnbench/svnbench.c:842
+#: ../svn/svn.c:2937 ../svnbench/svnbench.c:784
msgid "--with-revprop and --with-no-revprops are mutually exclusive"
msgstr "--with-revprop och --with-no-revprops kan inte användas samtidigt"
-#: ../svn/svn.c:2939
+#: ../svn/svn.c:2967
msgid "--message (-m) and --file (-F) are mutually exclusive"
msgstr "--message (-m) och --file (-F) kan inte användas samtidigt"
-#: ../svn/svn.c:2952 ../svnbench/svnbench.c:855 ../svnmucc/svnmucc.c:678
-#: ../svnrdump/svnrdump.c:1047
+#: ../svn/svn.c:2980 ../svnbench/svnbench.c:797 ../svnmucc/svnmucc.c:701
+#: ../svnrdump/svnrdump.c:1053
msgid "--trust-server-cert-failures requires --non-interactive"
msgstr "--trust-server-cert-failures kräver --non-interactive"
-#: ../svn/svn.c:2960 ../svnbench/svnbench.c:863 ../svnmucc/svnmucc.c:686
-#: ../svnrdump/svnrdump.c:1054
+#: ../svn/svn.c:2988 ../svnbench/svnbench.c:805 ../svnmucc/svnmucc.c:709
+#: ../svnrdump/svnrdump.c:1060
msgid "--password-from-stdin requires --non-interactive"
msgstr "--password-from-stdin kräver --non-interactive"
-#: ../svn/svn.c:2969
+#: ../svn/svn.c:2997
msgid "--diff-cmd and --internal-diff are mutually exclusive"
msgstr "--diff-cmd och --internal-diff kan inte användas samtidigt"
-#: ../svn/svn.c:3011
+#: ../svn/svn.c:3039
msgid "--relocate and --depth are mutually exclusive"
msgstr "--relocate och --depth kan inte användas samtidigt"
-#: ../svn/svn.c:3018
+#: ../svn/svn.c:3046
msgid "--relocate and --non-recursive (-N) are mutually exclusive"
msgstr "--relocate och --non-recursive (-N) kan inte användas samtidigt"
-#: ../svn/svn.c:3134
+#: ../svn/svn.c:3162
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/svn.c:3141
+#: ../svn/svn.c:3169
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/svn.c:3161
+#: ../svn/svn.c:3189
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/svn.c:3168
+#: ../svn/svn.c:3196
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/svn.c:3191
+#: ../svn/svn.c:3219
msgid "--auto-props and --no-auto-props are mutually exclusive"
msgstr "--auto-props och --no-auto-props kan inte användas samtidigt"
-#: ../svn/svn.c:3284 ../svn/svn.c:3291
+#: ../svn/svn.c:3318 ../svn/svn.c:3325
#, c-format
msgid "--accept=%s incompatible with --non-interactive"
msgstr "--accept=%s kan inte användas med --non-interactive"
-#: ../svn/svn.c:3340
+#: ../svn/svn.c:3374
#, c-format
msgid "Try 'svn help %s' for more information"
msgstr "Skriv \"svn help %s\" för vidare information"
-#: ../svn/svn.c:3346 ../svnbench/svnbench.c:1006
+#: ../svn/svn.c:3380 ../svnbench/svnbench.c:948
msgid "Please see the 'svn upgrade' command"
msgstr "Se kommandot \"svn upgrade\""
-#: ../svn/svn.c:3352 ../svnmucc/svnmucc.c:971 ../svnrdump/svnrdump.c:1147
+#: ../svn/svn.c:3386 ../svnmucc/svnmucc.c:964 ../svnrdump/svnrdump.c:1152
msgid "Authentication failed and interactive prompting is disabled; see the --force-interactive option"
msgstr "Autentisering misslyckades och interaktiva frågor är avstängda; se flaggan --force-interactive"
-#: ../svn/svn.c:3357
+#: ../svn/svn.c:3391
msgid "Reading file from standard input because of -F option; this can interfere with interactive prompting"
msgstr "Läser filen från standardinmatningen eftersom flaggan -F angavs; detta kan påverka interaktiva frågor"
-#: ../svn/svn.c:3368 ../svnbench/svnbench.c:1014
+#: ../svn/svn.c:3402 ../svnbench/svnbench.c:956
msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)"
msgstr "Kör \"svn cleanup\" för att ta bort lås (skriv \"svn help cleanup\" för mer information)"
-#: ../svn/svn.c:3375
+#: ../svn/svn.c:3409
msgid "Another process is blocking the working copy database, or the underlying filesystem does not support file locking; if the working copy is on a network filesystem, make sure file locking has been enabled on the file server"
msgstr "En annan process blockerar arbetskopians databas, eller så stöder det underliggande filsystemet inte fillåsning; om arbetskopian ligger på ett nätverksfilsystem, se till att filservern har fillåsning påslagen"
-#: ../svn/svn.c:3388
+#: ../svn/svn.c:3422
msgid "When using svn+ssh:// URLs, keep in mind that the --username and --password options are ignored because authentication is performed by SSH, not Subversion"
msgstr "När URL:er på formen svn+ssh:// används, kom ihåg att flaggorna --username och --password ej beaktas eftersom autentisering görs av SSH, inte av Subversion"
@@ -18951,8 +19114,8 @@ msgstr " Uppdaterade \"%s\" till r%ld.\
#: ../svn/upgrade-cmd.c:94
#, c-format
-msgid "svn: The target working copies are already at version %d.%d; the highest version supported by this client can be specified with '--compatible-version=%d.%d'.\n"
-msgstr "svn: Mål-arbetskopiorna är redan på version %d.%d; den högsta version som stödjs av denna klient kan anges med \"--compatible-version=%d.%d\".\n"
+msgid "svn: The target working copy '%s' is at version %d.%d; the highest version supported by this client can be specified with '--compatible-version=%d.%d'.\n"
+msgstr "svn: Mål-arbetskopian \"%s\" är redan på version %d.%d; den högsta version som stödjs av denna klient kan anges med \"--compatible-version=%d.%d\".\n"
#: ../svn/util.c:86
#, c-format
@@ -19002,11 +19165,11 @@ msgstr "Ditt loggmeddelande lämnades i
msgid "--This line, and those below, will be ignored--"
msgstr "--Denna och nedanstående rader kommer inte med i loggmeddelandet--"
-#: ../svn/util.c:362 ../svnmucc/svnmucc.c:432
+#: ../svn/util.c:362 ../svnmucc/svnmucc.c:468
msgid "Error normalizing log message to internal format"
msgstr "Fel vid normalisering av loggmeddelande till det interna formatet"
-#: ../svn/util.c:451 ../svnmucc/svnmucc.c:442
+#: ../svn/util.c:451 ../svnmucc/svnmucc.c:478
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"
@@ -20060,7 +20223,7 @@ msgstr ""
"Tillgängliga underkommandon:\n"
#: ../svnadmin/svnadmin.c:1631 ../svnlook/svnlook.c:2252
-#: ../svnserve/svnserve.c:470
+#: ../svnserve/svnserve.c:472
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
@@ -20333,36 +20496,36 @@ msgstr "Bygga innehållsdelningscache ä
msgid "svnadmin: Warning - this repository has rep-sharing disabled. Building rep-cache has no effect.\n"
msgstr "svnadmin: Varning: detta arkiv har innehållsdelning avstängt. Skapande av innehållsdelningscache har ingen verkan.\n"
-#: ../svnadmin/svnadmin.c:3119 ../svnfsfs/svnfsfs.c:293
-#: ../svnrdump/svnrdump.c:853
+#: ../svnadmin/svnadmin.c:3125 ../svnfsfs/svnfsfs.c:299
+#: ../svnrdump/svnrdump.c:859
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/svnadmin.c:3202
+#: ../svnadmin/svnadmin.c:3208
#, c-format
msgid "Cannot create pre-1.0-compatible repositories"
msgstr "Kan inte skapa arkiv kompatibelt med versioner äldre än 1.0"
-#: ../svnadmin/svnadmin.c:3214
+#: ../svnadmin/svnadmin.c:3220
#, c-format
msgid "Cannot guarantee compatibility beyond the current running version (%s)"
msgstr "Kan inte garantera kompatibilitet bortom versionen som nu körs (%s)"
-#: ../svnadmin/svnadmin.c:3338 ../svnfsfs/svnfsfs.c:362
+#: ../svnadmin/svnadmin.c:3344 ../svnfsfs/svnfsfs.c:368
#, c-format
msgid "subcommand argument required\n"
msgstr "argument för underkommando krävs\n"
-#: ../svnadmin/svnadmin.c:3375 ../svnfsfs/svnfsfs.c:397
+#: ../svnadmin/svnadmin.c:3381 ../svnfsfs/svnfsfs.c:403
msgid "Repository argument required"
msgstr "Argument för arkiv krävs"
-#: ../svnadmin/svnadmin.c:3383 ../svnfsfs/svnfsfs.c:405
+#: ../svnadmin/svnadmin.c:3389 ../svnfsfs/svnfsfs.c:411
#, c-format
msgid "'%s' is a URL when it should be a local path"
msgstr "\"%s\" är en URL när den skulle vara en lokal sökväg"
-#: ../svnadmin/svnadmin.c:3413
+#: ../svnadmin/svnadmin.c:3419
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -20371,7 +20534,7 @@ msgstr ""
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnadmin help %s\" för användning.\n"
-#: ../svnadmin/svnadmin.c:3444
+#: ../svnadmin/svnadmin.c:3450
msgid "Try 'svnadmin help' for more info"
msgstr "Skriv \"svnadmin help\" för mer information"
@@ -20626,7 +20789,7 @@ msgstr ""
" MÃ
L kan antingen vara en arbetskopia eller en URL. Om REV anges, avgör\n"
" den i vilken revision målet letas upp.\n"
-#: ../svnbench/svnbench.c:808
+#: ../svnbench/svnbench.c:750
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -20635,17 +20798,17 @@ msgstr ""
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnbench help %s\" för användning.\n"
-#: ../svnbench/svnbench.c:1000
+#: ../svnbench/svnbench.c:942
#, c-format
msgid "Try 'svnbench help %s' for more information"
msgstr "Skriv \"svnbench help %s\" för vidare information"
-#: ../svnbench/svnbench.c:1025
+#: ../svnbench/svnbench.c:967
#, c-format
msgid "%15.6f seconds taken\n"
msgstr "tog %15.6f s\n"
-#: ../svnbench/svnbench.c:1032
+#: ../svnbench/svnbench.c:974
#, c-format
msgid "%15s bytes transferred over network\n"
msgstr "%15s byte överförda över nätverket\n"
@@ -20863,11 +21026,11 @@ msgid_plural "Dropped %d nodes:\n"
msgstr[0] "Tog bort %d noder:\n"
msgstr[1] "Tog bort %d noder:\n"
-#: ../svndumpfilter/svndumpfilter.c:1397
+#: ../svndumpfilter/svndumpfilter.c:1403
msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs"
msgstr "--drop-empty-revs kan inte användas tillsammans med --drop-all-empty-revs"
-#: ../svndumpfilter/svndumpfilter.c:1508
+#: ../svndumpfilter/svndumpfilter.c:1514
#, c-format
msgid ""
"\n"
@@ -20876,7 +21039,7 @@ msgstr ""
"\n"
"Fel: inga prefix angivna.\n"
-#: ../svndumpfilter/svndumpfilter.c:1539
+#: ../svndumpfilter/svndumpfilter.c:1545
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -20885,7 +21048,7 @@ msgstr ""
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svndumpfilter help %s\" för användning.\n"
-#: ../svndumpfilter/svndumpfilter.c:1557
+#: ../svndumpfilter/svndumpfilter.c:1563
msgid "Try 'svndumpfilter help' for more info"
msgstr "Skriv \"svndumpfilter help\" för med information"
@@ -21143,7 +21306,7 @@ msgstr ""
"\n"
"Tillgängliga underkommandon:\n"
-#: ../svnfsfs/svnfsfs.c:435
+#: ../svnfsfs/svnfsfs.c:441
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -21152,7 +21315,7 @@ msgstr ""
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnfsfs help %s\" för användning.\n"
-#: ../svnfsfs/svnfsfs.c:467
+#: ../svnfsfs/svnfsfs.c:473
msgid "Try 'svnfsfs help' for more info"
msgstr "Skriv \"svnfsfs help\" för mer information"
@@ -21225,7 +21388,7 @@ msgstr ""
" -p, --show-c-function: Visa funktionsnamn i C"
#: ../svnlook/svnlook.c:206 ../svnrdump/svnrdump.c:116
-#: ../svnserve/svnserve.c:421 ../svnversion/svnversion.c:146
+#: ../svnserve/svnserve.c:423 ../svnversion/svnversion.c:149
msgid "no progress (only errors) to stderr"
msgstr ""
"ingen förloppsinformation (endast fel) till\n"
@@ -21623,34 +21786,30 @@ msgstr "Egenskapsnamns- och arkivsökvä
msgid "Missing propname or repository path argument"
msgstr "Egenskapsnamns- eller arkivsökvägsargument saknas"
-#: ../svnlook/svnlook.c:2533
-msgid "Invalid revision number supplied"
-msgstr "Ogiltigt revisionsnummer angivet"
-
-#: ../svnlook/svnlook.c:2656
+#: ../svnlook/svnlook.c:2655
msgid "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist"
msgstr "Flaggorna \"--transaction\" (-t) och \"--revision\" (-r) kan inte anges samtidigt"
-#: ../svnlook/svnlook.c:2663
+#: ../svnlook/svnlook.c:2662
msgid "Cannot use the '--show-inherited-props' option with the '--revprop' option"
msgstr "Kan inte använda flaggan \"--show-inherited-props\" tillsammans med \"--revprop\""
-#: ../svnlook/svnlook.c:2720
+#: ../svnlook/svnlook.c:2719
#, c-format
msgid "Try 'svnadmin verify' instead.\n"
msgstr "Försök med \"svnadmin verify\" istället.\n"
-#: ../svnlook/svnlook.c:2753
+#: ../svnlook/svnlook.c:2752
#, c-format
msgid "Repository argument required\n"
msgstr "Arkivargument krävs\n"
-#: ../svnlook/svnlook.c:2762
+#: ../svnlook/svnlook.c:2761
#, 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/svnlook.c:2812
+#: ../svnlook/svnlook.c:2811
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -21659,16 +21818,16 @@ msgstr ""
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnlook help %s\" för användning.\n"
-#: ../svnlook/svnlook.c:2843
+#: ../svnlook/svnlook.c:2842
msgid "Try 'svnlook help' for more info"
msgstr "Skriv \"svnlook help\" för mer information"
-#: ../svnmucc/svnmucc.c:268
+#: ../svnmucc/svnmucc.c:302
#, c-format
msgid "Type 'svnmucc --help' for usage.\n"
msgstr "Skriv \"svnmucc --help\" för användning.\n"
-#: ../svnmucc/svnmucc.c:276
+#: ../svnmucc/svnmucc.c:310
msgid ""
"usage: svnmucc ACTION...\n"
"Subversion multiple URL command client.\n"
@@ -21683,7 +21842,9 @@ msgid ""
" mv SRC-URL DST-URL : move SRC-URL to DST-URL\n"
" rm URL : delete URL\n"
" put SRC-FILE URL : add or modify file URL with contents copied from\n"
-" SRC-FILE (use \"-\" to read from standard input)\n"
+" SRC-FILE (to read from standard input, use \"--\"\n"
+" to stop option processing followed by \"-\" to\n"
+" indicate standard input)\n"
" propset NAME VALUE URL : set property NAME on URL to VALUE\n"
" propsetf NAME FILE URL : set property NAME on URL to value read from FILE\n"
" propdel NAME URL : delete property NAME from URL\n"
@@ -21734,8 +21895,9 @@ msgstr ""
" mv KÃLL-URL MÃ
L-URL : flytta KÃLL-URL till MÃ
L-URL\n"
" rm URL : radera URL\n"
" put KÃLLFIL URL : lägg till eller ändra filen URL med innehÃ¥llet\n"
-" kopierat frÃ¥n KÃLLFIL (använd \"-\" för att läsa\n"
-" från standard in)\n"
+" kopierat frÃ¥n KÃLLFIL (för att läsa frÃ¥n standard\n"
+" in, använd \"--\" för att avsluta argumentläsning\n"
+" och \"-\" för att indikera standard in)\n"
" propset NAMN VÃRDE URL : sätt egenskapen NAMN pÃ¥ URL till VÃRDE\n"
" propsetf NAMN FIL URL : sätt egenskapen NAMN på URL till värdet läst\n"
" från FIL\n"
@@ -21772,15 +21934,10 @@ msgstr ""
" --no-auth-cache : spara inte autentiseringsinformation\n"
" --version : visa versionsinformation\n"
-#: ../svnmucc/svnmucc.c:358
+#: ../svnmucc/svnmucc.c:394
msgid "--message (-m), --file (-F), and --with-revprop=svn:log are mutually exclusive"
msgstr "--message (-m), --file (-F) och --with-revprop=svn:log kan inte användas samtidigt"
-#: ../svnmucc/svnmucc.c:600
-#, c-format
-msgid "Invalid revision number '%s'"
-msgstr "Ogiltigt revisionsnummer \"%s\""
-
#: ../svnrdump/load_editor.c:717
msgid "This dumpstream reader requires a delta format dumpstream"
msgstr "Denna dumpströms-läsare kräver en dumpström i deltaformat"
@@ -21840,8 +21997,8 @@ msgstr "dumpa inkrementellt"
msgid "skip revision property ARG (e.g., \"svn:author\")"
msgstr "hoppa över revisionsegenskapen ARG (t.ex. \"svn:author\")"
-#: ../svnrdump/svnrdump.c:140 ../svnserve/svnserve.c:413
-#: ../svnversion/svnversion.c:142
+#: ../svnrdump/svnrdump.c:140 ../svnserve/svnserve.c:415
+#: ../svnversion/svnversion.c:145
msgid "display this help"
msgstr "visa denna hjälp"
@@ -21879,7 +22036,7 @@ msgstr "Revisionen \"%ld\" finns inte"
msgid "LOWER revision cannot be greater than UPPER revision; consider reversing your revision range"
msgstr "Revisionen BÃRJAN kan inte vara större än SLUT; byt plats pÃ¥ dem"
-#: ../svnrdump/svnrdump.c:1021
+#: ../svnrdump/svnrdump.c:1027
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -21888,7 +22045,7 @@ msgstr ""
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnrdump help %s\" för användning.\n"
-#: ../svnrdump/svnrdump.c:1064
+#: ../svnrdump/svnrdump.c:1070
msgid "load subcommand with --password-from-stdin requires -F"
msgstr "Underkommandot \"load\" med --password-from-stdin måste användas med -F"
@@ -21919,70 +22076,70 @@ msgstr "Kunde inte erhålla listan med S
msgid "Couldn't obtain the authenticated username"
msgstr "Kan inte erhålla autentiserat användarnamn"
-#: ../svnserve/serve.c:2270
+#: ../svnserve/serve.c:2272
msgid "Path is not a string"
msgstr "Sökvägen är inte en sträng"
-#: ../svnserve/serve.c:2477
+#: ../svnserve/serve.c:2479
msgid "Log revprop entry not a string"
msgstr "Revisionsegenskapsposten för loggning är ej en sträng"
-#: ../svnserve/serve.c:2483
+#: ../svnserve/serve.c:2485
#, c-format
msgid "Unknown revprop word '%s' in log command"
msgstr "Okänt revisionsegenskapsord \"%s\" i log-kommandot"
-#: ../svnserve/serve.c:2499
+#: ../svnserve/serve.c:2501
msgid "Log path entry not a string"
msgstr "Sökvägsposten för loggning är ej en sträng"
-#: ../svnserve/serve.c:3154 ../svnserve/serve.c:3337
+#: ../svnserve/serve.c:3156 ../svnserve/serve.c:3339
#, c-format
msgid "No result for '%s'."
msgstr "Inget resultat för \"%s\"."
-#: ../svnserve/serve.c:3995
+#: ../svnserve/serve.c:3997
#, c-format
msgid "SASL requested but not compiled in; set '%s' to 'false' or recompile svnserve with SASL support"
msgstr ""
"SASL begärt men inte inkompilerat; sätt \"%s\" till \"false\" eller kompilera om\n"
"svnserve med stöd för SASL"
-#: ../svnserve/svnserve.c:239
+#: ../svnserve/svnserve.c:241
msgid "daemon mode"
msgstr "demonläge"
-#: ../svnserve/svnserve.c:240
+#: ../svnserve/svnserve.c:242
msgid "inetd mode"
msgstr "inetd-läge"
-#: ../svnserve/svnserve.c:241
+#: ../svnserve/svnserve.c:243
msgid "tunnel mode"
msgstr "tunnel-läge"
-#: ../svnserve/svnserve.c:242
+#: ../svnserve/svnserve.c:244
msgid "listen-once mode (useful for debugging)"
msgstr "engångslyssningsläge (användbart för felsökning)"
-#: ../svnserve/svnserve.c:245
+#: ../svnserve/svnserve.c:247
msgid "Windows service mode (Service Control Manager)"
msgstr "Windows-tjänst-läge (Tjänstehanteraren)"
-#: ../svnserve/svnserve.c:247
+#: ../svnserve/svnserve.c:249
msgid "root of directory to serve"
msgstr "serverns rotkatalog"
-#: ../svnserve/svnserve.c:249
+#: ../svnserve/svnserve.c:251
msgid "force read only, overriding repository config file"
msgstr ""
"tillåt endast läsning; överskuggar värdet i\n"
" arkivets konfigurationsfil"
-#: ../svnserve/svnserve.c:251
+#: ../svnserve/svnserve.c:253
msgid "read configuration from file ARG"
msgstr "läs konfiguration från filen ARG"
-#: ../svnserve/svnserve.c:254
+#: ../svnserve/svnserve.c:256
msgid ""
"listen port. The default port is 3690.\n"
" [mode: daemon, service, listen-once]"
@@ -21990,7 +22147,7 @@ msgstr ""
"port att lyssna på. Förvald är 3690.\n"
" [läge: demon, tjänst, engångslyssning]"
-#: ../svnserve/svnserve.c:258
+#: ../svnserve/svnserve.c:260
msgid ""
"listen port. The default port is 3690.\n"
" [mode: daemon, listen-once]"
@@ -21998,7 +22155,7 @@ msgstr ""
"port att lyssna på. Förvald är 3690.\n"
" [läge: demon, engångslyssning]"
-#: ../svnserve/svnserve.c:264
+#: ../svnserve/svnserve.c:266
msgid ""
"listen hostname or IP address\n"
" By default svnserve listens on all addresses.\n"
@@ -22008,7 +22165,7 @@ msgstr ""
" Normalt lyssnar svnserve på alla adresser.\n"
" [läge: demon, tjänst, engångslyssning]"
-#: ../svnserve/svnserve.c:270
+#: ../svnserve/svnserve.c:272
msgid ""
"listen hostname or IP address\n"
" By default svnserve listens on all addresses.\n"
@@ -22018,7 +22175,7 @@ msgstr ""
" Normalt lyssnar svnserve på alla adresser.\n"
" [läge: demon, engångslyssning]"
-#: ../svnserve/svnserve.c:277
+#: ../svnserve/svnserve.c:279
msgid ""
"prefer IPv6 when resolving the listen hostname\n"
" [IPv4 is preferred by default. Using IPv4 and IPv6\n"
@@ -22031,7 +22188,7 @@ msgstr ""
" Använd inetd-läge eller tunnelläge om detta\n"
" behövs.]"
-#: ../svnserve/svnserve.c:285
+#: ../svnserve/svnserve.c:287
msgid ""
"compression level to use for network transmissions\n"
" [0 .. no compression, 5 .. default, \n"
@@ -22041,7 +22198,7 @@ msgstr ""
" [0: ingen kompression, 5: normalnivå,\n"
" 9: maximal kompression]"
-#: ../svnserve/svnserve.c:291
+#: ../svnserve/svnserve.c:293
msgid ""
"size of the extra in-memory cache in MB used to\n"
" minimize redundant operations.\n"
@@ -22054,7 +22211,7 @@ msgstr ""
" Standardvärdet är 16.\n"
" [endast använt för FSFS- och FSX-arkiv]"
-#: ../svnserve/svnserve.c:301
+#: ../svnserve/svnserve.c:303
msgid ""
"enable or disable caching of deltas between older\n"
" revisions.\n"
@@ -22066,7 +22223,7 @@ msgstr ""
" Normalvärdet är \"no\" (avstängt).\n"
" [endast använt för FSFS- och FSX-arkiv]"
-#: ../svnserve/svnserve.c:309
+#: ../svnserve/svnserve.c:311
msgid ""
"enable or disable caching of file contents\n"
" Default is yes.\n"
@@ -22077,7 +22234,7 @@ msgstr ""
" Normalvärdet är \"yes\" (påslaget).\n"
" [endast använt för FSFS- och FSX-arkiv]"
-#: ../svnserve/svnserve.c:315
+#: ../svnserve/svnserve.c:317
msgid ""
"enable or disable caching of revision properties.\n"
" Consult the documentation before activating this.\n"
@@ -22089,7 +22246,7 @@ msgstr ""
" Normalvärdet är \"no\" (avstängt).\n"
" [endast använt för FSFS- och FSX-arkiv]"
-#: ../svnserve/svnserve.c:323
+#: ../svnserve/svnserve.c:325
msgid ""
"enable or disable caching of node properties\n"
" Default is yes.\n"
@@ -22100,7 +22257,7 @@ msgstr ""
" Normalvärdet är \"yes\" (påslaget).\n"
" [endast använt för FSFS- och FSX-arkiv]"
-#: ../svnserve/svnserve.c:329
+#: ../svnserve/svnserve.c:331
msgid ""
"Optimize network handling based on the assumption\n"
" that most clients are connected with a bitrate of\n"
@@ -22112,7 +22269,7 @@ msgstr ""
" överföringshastighet på ARG Mbit/s.\n"
" Normalvärdet är 0 (optimeringar avstängda)."
-#: ../svnserve/svnserve.c:337
+#: ../svnserve/svnserve.c:339
msgid ""
"Parse and cache all data found in block instead\n"
" of just the requested item.\n"
@@ -22125,13 +22282,13 @@ msgstr ""
#. ### Making the assumption here that WIN32 never has fork and so
#. * ### this option never exists when --service exists.
-#: ../svnserve/svnserve.c:347
+#: ../svnserve/svnserve.c:349
msgid "use threads instead of fork [mode: daemon]"
msgstr ""
"använd trådar istället för att skapa nya processer\n"
" [läge: demon]"
-#: ../svnserve/svnserve.c:352
+#: ../svnserve/svnserve.c:354
msgid ""
"Minimum number of server threads, even if idle.\n"
" Capped to max-threads; minimum value is 0.\n"
@@ -22141,7 +22298,7 @@ msgstr ""
" Begränsat till max-threads; minsta värdet är 0.\n"
" Standardvärde är 1."
-#: ../svnserve/svnserve.c:359
+#: ../svnserve/svnserve.c:361
msgid ""
"Maximum number of server threads, even if there\n"
" are more connections. Minimum value is 1.\n"
@@ -22151,7 +22308,7 @@ msgstr ""
" fler anslutningar. Minsta värdet är 1.\n"
" Standardvärde är "
-#: ../svnserve/svnserve.c:367
+#: ../svnserve/svnserve.c:369
msgid ""
"Maximum acceptable size of a client request in MB.\n"
" This implicitly limits the length of paths and\n"
@@ -22169,7 +22326,7 @@ msgstr ""
" 0 stänger av storlekskontrollen;\n"
" skönsvärdet är "
-#: ../svnserve/svnserve.c:380
+#: ../svnserve/svnserve.c:382
msgid ""
"Maximum acceptable server response size in MB.\n"
" Longer responses get truncated and return an\n"
@@ -22183,7 +22340,7 @@ msgstr ""
" utcheckning på fel katalognivå.\n"
" Standardvärdet är 0 (avstängt)."
-#: ../svnserve/svnserve.c:390
+#: ../svnserve/svnserve.c:392
msgid ""
"run in foreground (useful for debugging)\n"
" [mode: daemon]"
@@ -22191,7 +22348,7 @@ msgstr ""
"kör i förgrunden (användbart för felsökning)\n"
" [läge: demon]"
-#: ../svnserve/svnserve.c:394
+#: ../svnserve/svnserve.c:396
msgid ""
"handle one connection at a time in the parent\n"
" process (useful for debugging)"
@@ -22199,11 +22356,11 @@ msgstr ""
"hantera en anslutning i taget i föräldraprocessen\n"
" (användbart för felsökning)"
-#: ../svnserve/svnserve.c:398
+#: ../svnserve/svnserve.c:400
msgid "svnserve log file"
msgstr "loggfil för svnserve"
-#: ../svnserve/svnserve.c:401
+#: ../svnserve/svnserve.c:403
msgid ""
"write server process ID to file ARG\n"
" [mode: daemon, listen-once, service]"
@@ -22211,7 +22368,7 @@ msgstr ""
"skriv serverprocessens process-ID till filen ARG\n"
" [läge: demon, engångslyssning, tjänst]"
-#: ../svnserve/svnserve.c:405
+#: ../svnserve/svnserve.c:407
msgid ""
"write server process ID to file ARG\n"
" [mode: daemon, listen-once]"
@@ -22219,7 +22376,7 @@ msgstr ""
"skriv serverprocessens process-ID till filen ARG\n"
" [läge: demon, engångslyssning]"
-#: ../svnserve/svnserve.c:410
+#: ../svnserve/svnserve.c:412
msgid ""
"tunnel username (default is current uid's name)\n"
" [mode: tunnel]"
@@ -22227,7 +22384,7 @@ msgstr ""
"användarnamn för tunnel (standard är aktuell\n"
" användares namn) [läge: tunnel]"
-#: ../svnserve/svnserve.c:415
+#: ../svnserve/svnserve.c:417
msgid ""
"virtual host mode (look for repo in directory\n"
" of provided hostname)"
@@ -22235,12 +22392,12 @@ msgstr ""
"virtuell värddator-läge (leta efter arkiv i\n"
" katalog med samma namn som använt värddatornamn)"
-#: ../svnserve/svnserve.c:431
+#: ../svnserve/svnserve.c:433
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "Skriv \"%s --help\" för användning.\n"
-#: ../svnserve/svnserve.c:440
+#: ../svnserve/svnserve.c:442
msgid ""
"usage: svnserve [-d | -i | -t | -X | --service] [options]\n"
"Subversion repository server.\n"
@@ -22254,7 +22411,7 @@ msgstr ""
"\n"
"Giltiga flaggor:\n"
-#: ../svnserve/svnserve.c:449
+#: ../svnserve/svnserve.c:451
msgid ""
"usage: svnserve [-d | -i | -t | -X] [options]\n"
"Subversion repository server.\n"
@@ -22268,7 +22425,7 @@ msgstr ""
"\n"
"Giltiga flaggor:\n"
-#: ../svnserve/svnserve.c:479
+#: ../svnserve/svnserve.c:481
msgid ""
"\n"
"Cyrus SASL authentication is available.\n"
@@ -22276,68 +22433,68 @@ msgstr ""
"\n"
"Cyrus-SASL-autentisering finns tillgänglig.\n"
-#: ../svnserve/svnserve.c:565
+#: ../svnserve/svnserve.c:586
#, c-format
msgid "Can't accept client connection"
msgstr "Kan inte acceptera anslutning från klient"
-#: ../svnserve/svnserve.c:842
+#: ../svnserve/svnserve.c:869
#, c-format
msgid "Invalid port '%s'"
msgstr "Ogiltig port \"%s\""
-#: ../svnserve/svnserve.c:878
+#: ../svnserve/svnserve.c:905
#, c-format
msgid "Root path '%s' does not exist or is not a directory"
msgstr "Rotsökvägen \"%s\" finns inte eller är ingen katalog"
-#: ../svnserve/svnserve.c:1018
+#: ../svnserve/svnserve.c:1045
msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n"
msgstr "Du måste ange precis en av -d, -i, -t, --service eller -X.\n"
-#: ../svnserve/svnserve.c:1021
+#: ../svnserve/svnserve.c:1048
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/svnserve.c:1032
+#: ../svnserve/svnserve.c:1059
msgid "You may only specify one of -T or --single-thread\n"
msgstr "Du kan bara ange en av -T eller --single-thread\n"
-#: ../svnserve/svnserve.c:1079
+#: ../svnserve/svnserve.c:1106
msgid "Option --tunnel-user is only valid in tunnel mode"
msgstr "Flaggan --tunnel-user är endast giltig i tunnel-läge"
-#: ../svnserve/svnserve.c:1152
+#: ../svnserve/svnserve.c:1179
#, c-format
msgid "svnserve: The --service flag is only valid if the process is started by the Service Control Manager.\n"
msgstr "svnserve: Flaggan --service är endast tillåten om processen startas av tjänstehanteraren (SCM).\n"
-#: ../svnserve/svnserve.c:1203
+#: ../svnserve/svnserve.c:1230
#, c-format
msgid "Can't get address info"
msgstr "Kan inte erhålla adressinfo"
-#: ../svnserve/svnserve.c:1216
+#: ../svnserve/svnserve.c:1243
#, c-format
msgid "Can't create server socket"
msgstr "Kan inte skapa uttag (socket) för servern"
-#: ../svnserve/svnserve.c:1224
+#: ../svnserve/svnserve.c:1251
#, c-format
msgid "Can't set options on server socket"
msgstr "Kan inte sätta extra val för serveruttaget (socket)"
-#: ../svnserve/svnserve.c:1230
+#: ../svnserve/svnserve.c:1257
#, c-format
msgid "Can't bind server socket"
msgstr "Kan inte knyta adress till serveruttaget (socket)"
-#: ../svnserve/svnserve.c:1236
+#: ../svnserve/svnserve.c:1263
#, c-format
msgid "Can't listen on server socket"
msgstr "Kan inte lyssna på serveruttaget (socket)"
-#: ../svnserve/svnserve.c:1317
+#: ../svnserve/svnserve.c:1344
#, c-format
msgid "Can't create thread pool"
msgstr "Kan inte skapa trådsamling"
@@ -22770,7 +22927,7 @@ msgstr "Ogiltigt revisionsnummer (%ld)"
msgid "Cannot specify revisions via both command-line arguments and the --revision (-r) option"
msgstr "Kan inte ange revisioner både som kommandoradsargument och med flaggan --revision (-r)"
-#: ../svnsync/svnsync.c:1803 ../svnsync/svnsync.c:2159
+#: ../svnsync/svnsync.c:1803 ../svnsync/svnsync.c:2165
#, c-format
msgid "Invalid revision range '%s' provided"
msgstr "Ogiltigt revisionsområde \"%s\" angivet"
@@ -22812,19 +22969,19 @@ msgstr ""
"\n"
"Tillgängliga underkommandon:\n"
-#: ../svnsync/svnsync.c:2221
+#: ../svnsync/svnsync.c:2222
msgid "Cannot use --username or --password with any of --source-username, --source-password, --sync-username, or --sync-password.\n"
msgstr "Kan inte använda --username eller --password tillsammans med någon av flaggorna --source-username, --source-password, --sync-username eller --sync-password.\n"
-#: ../svnsync/svnsync.c:2244
+#: ../svnsync/svnsync.c:2245
msgid "--disable-locking and --steal-lock are mutually exclusive"
msgstr "--disable-locking och --steal-lock kan inte användas samtidigt"
-#: ../svnsync/svnsync.c:2262
+#: ../svnsync/svnsync.c:2263
msgid "--source-trust-server-cert-failures and --sync-trust-server-cert-failures require --non-interactive"
msgstr "--source-trust-server-cert-failures och --sync-trust-server-cert-failures kräver --non-interactive"
-#: ../svnsync/svnsync.c:2331
+#: ../svnsync/svnsync.c:2332
#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -22833,7 +22990,7 @@ msgstr ""
"Underkommandot \"%s\" tillåter inte flaggan \"%s\"\n"
"Skriv \"svnsync help %s\" för användning.\n"
-#: ../svnsync/svnsync.c:2395
+#: ../svnsync/svnsync.c:2396
msgid "Try 'svnsync help' for more info"
msgstr "Skriv \"svnsync help\" för mer information"
@@ -22915,37 +23072,37 @@ msgstr ""
"\n"
"Giltiga flaggor:\n"
-#: ../svnversion/svnversion.c:141
+#: ../svnversion/svnversion.c:144
msgid "last changed rather than current revisions"
msgstr "senast ändrade istället för aktuella revisioner"
-#: ../svnversion/svnversion.c:241
+#: ../svnversion/svnversion.c:247
#, c-format
msgid "Unversioned symlink%s"
msgstr "Ej versionshanterad symbolisk länk%s"
-#: ../svnversion/svnversion.c:244
+#: ../svnversion/svnversion.c:250
#, c-format
msgid "Unversioned directory%s"
msgstr "Ej versionshanterad katalog%s"
-#: ../svnversion/svnversion.c:247
+#: ../svnversion/svnversion.c:253
#, c-format
msgid "Unversioned file%s"
msgstr "Ej versionshanterad fil%s"
-#: ../svnversion/svnversion.c:253
+#: ../svnversion/svnversion.c:259
#, c-format
msgid "'%s' doesn't exist\n"
msgstr "\"%s\" finns inte\n"
-#: ../svnversion/svnversion.c:254
+#: ../svnversion/svnversion.c:260
#, c-format
msgid "'%s' is of unknown type\n"
msgstr "\"%s\" är av okänd typ\n"
#. Local uncommitted modifications, no revision info was found.
-#: ../svnversion/svnversion.c:268
+#: ../svnversion/svnversion.c:274
#, c-format
msgid "Uncommitted local addition, copy or move%s"
msgstr "Oarkiverad lokalt tillagd, kopierad eller flyttad fil eller katalog%s"
@@ -22975,6 +23132,14 @@ msgstr "Oarkiverad lokalt tillagd, kopie
#~ msgstr "Flaggorna \"quiet\" och \"quit\" kan inte användas samtidigt"
#, c-format
+#~ msgid "Branch %s not found"
+#~ msgstr "Gren \"%s\" finns inte"
+
+#, c-format
+#~ msgid "Branch %s not found in r%ld"
+#~ msgstr "Gren %s finns inte i r%ld"
+
+#, c-format
#~ msgid "Can't add '%s', because no parent directory is found"
#~ msgstr "Kan inte lägga till \"%s\" eftersom ingen föräldrakatalog kan hittas"
@@ -22985,9 +23150,47 @@ msgstr "Oarkiverad lokalt tillagd, kopie
#~ msgstr "Kan inte skapa villkorsvariabel"
#, c-format
+#~ msgid "Cannot branch from r%ld %s e%d: branch does not exist"
+#~ msgstr "Kan inte skapa gren från r%ld %s e%d: grenen finns inte"
+
+#, c-format
+#~ msgid "Cannot branch from r%ld %s e%d: element does not exist"
+#~ msgstr "Kan inte skapa gren från r%ld %s e%d: elementet finns inte"
+
+#, c-format
#~ msgid "Cannot resolve tree conflict on '%s' (could not find common ancestor of '^/%s@%ld' and '^/%s@%ld')"
#~ msgstr "Kan inte lösa trädkonflikten på \"%s\" (kunde inte hitta gemensamt ursprung för \"^/%s@%ld\" och \"^/%s@%ld\")"
+#, c-format
+#~ msgid "Cannot set e%d to (parent=e%d, name='%s'): branch root is e%d"
+#~ msgstr "Kan inte sätta e%d till (förälder=e%d, namn=\"%s\"): grenrot är e%d"
+
+#, c-format
+#~ msgid "Error converting depth from locale to UTF-8"
+#~ msgstr "Fel vid konvertering av djupet från lokal kodning till UTF-8"
+
+#, c-format
+#~ msgid "Invalid revision number '%s'"
+#~ msgstr "Ogiltigt revisionsnummer \"%s\""
+
+#~ msgid "Invalid revision number supplied"
+#~ msgstr "Ogiltigt revisionsnummer angivet"
+
+#~ msgid "Merge had conflicts; this is not yet supported"
+#~ msgstr "Sammanslagningen orsakade konflikter; detta hanteras inte än"
+
+#, c-format
+#~ msgid "Negative number in range (%s) not supported with -c"
+#~ msgstr "Negativt tal i område (%s) stöds ej med -c"
+
+#, c-format
+#~ msgid "New pristine text '%s' has different size: %s versus %s"
+#~ msgstr "Ny orörd text \"%s\" har en annan storlek: %s gentemot %s"
+
+#, c-format
+#~ msgid "Non-numeric change argument (%s) given to -c"
+#~ msgstr "Argumentet till flaggan -c (%s) är inget tal"
+
#~ msgid ""
#~ "Put files and directories under version control, scheduling\n"
#~ "them for addition to repository. They will be added in next commit.\n"
@@ -22999,3 +23202,6 @@ msgstr "Oarkiverad lokalt tillagd, kopie
#~ msgid "Read or write to a dumpfile instead of stdin/stdout"
#~ msgstr "Läs eller skriv till en dumpfil istället för standard in/ut"
+
+#~ msgid "There is no change 0"
+#~ msgstr "Ãndring 0 finns inte"