You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ds...@apache.org on 2022/06/26 18:21:39 UTC
svn commit: r1902264 [2/2] - /subversion/trunk/subversion/po/sv.po
Modified: subversion/trunk/subversion/po/sv.po
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/po/sv.po?rev=1902264&r1=1902263&r2=1902264&view=diff
==============================================================================
--- subversion/trunk/subversion/po/sv.po [UTF-8] (original)
+++ subversion/trunk/subversion/po/sv.po [UTF-8] Sun Jun 26 18:21:39 2022
@@ -76,6 +76,7 @@
# reject (v) avslå
# reject file avslagsfil
# relocate omlokalisera
+# rep-sharing innehållsdelning
# repository arkiv
# repository access arkivåtkomst
# resolution lösning
@@ -89,6 +90,7 @@
# shard skärva, splittra
# sharded splittrad
# sharding splittring
+# shelf hylla
# stream (s) ström
# subcommand underkommando
# switch [to] (v) växla [till]
@@ -110,7 +112,7 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.9\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2018-10-06 16:54+0200\n"
+"POT-Creation-Date: 2022-06-26 11:47+0200\n"
"PO-Revision-Date: 2018-10-06 17:37+0200\n"
"Last-Translator: Subversion Developers <de...@subversion.apache.org>\n"
"Language-Team: Swedish <de...@subversion.apache.org>\n"
@@ -237,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:1041
+#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1056
msgid "Invalid configuration value"
msgstr "Ogiltigt konfigurationsvärde"
@@ -322,8 +324,8 @@ msgid "Read error in pipe"
msgstr "Läsfel i rör"
#. is errno on POSIX
-#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:435
-#: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:571
+#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:442
+#: ../libsvn_subr/cmdline.c:473 ../libsvn_subr/cmdline.c:496 ../svn/util.c:573
#: ../svnlook/svnlook.c:2034
#, c-format
msgid "Write error"
@@ -697,7 +699,7 @@ msgstr "Ingen användare kopplad till fi
msgid "Path is already locked"
msgstr "Sökvägen är redan låst"
-#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:978
+#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:993
msgid "Path is not locked"
msgstr "Sökvägen är inte låst"
@@ -721,7 +723,7 @@ msgstr "Låset saknas i filsystemet"
msgid "Lock has expired"
msgstr "Låset har gått ut"
-#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:965
+#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:980
msgid "Item is out of date"
msgstr "Objektet är inaktuellt"
@@ -821,741 +823,757 @@ msgstr "Förstörd egenskapslista."
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:895
+#: ../include/svn_error_codes.h:894
+msgid "Unrecognized filesystem I/O control code"
+msgstr "Okänd I/O-kontrollkod för filsystemet"
+
+#: ../include/svn_error_codes.h:899
+msgid "Rep-sharing is not allowed."
+msgstr "Innehållsdelning är inte tillåtet."
+
+#: ../include/svn_error_codes.h:904
+msgid "Rep-sharing is not supported."
+msgstr "Innehållsdelning stöds ej."
+
+#: ../include/svn_error_codes.h:910
msgid "The repository is locked, perhaps for db recovery"
msgstr "Arkivet är låst, kanske för reparation"
-#: ../include/svn_error_codes.h:899
+#: ../include/svn_error_codes.h:914
msgid "A repository hook failed"
msgstr "Ett krokskript i arkivet misslyckades"
-#: ../include/svn_error_codes.h:903
+#: ../include/svn_error_codes.h:918
msgid "Incorrect arguments supplied"
msgstr "Felaktiga argument"
-#: ../include/svn_error_codes.h:907
+#: ../include/svn_error_codes.h:922
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:911
+#: ../include/svn_error_codes.h:926
msgid "Bogus revision report"
msgstr "Felaktig revisionsrapport"
-#: ../include/svn_error_codes.h:920
+#: ../include/svn_error_codes.h:935
msgid "Unsupported repository version"
msgstr "Arkivversionen stöds ej"
-#: ../include/svn_error_codes.h:924
+#: ../include/svn_error_codes.h:939
msgid "Disabled repository feature"
msgstr "Funktionen är avslagen i arkivet"
-#: ../include/svn_error_codes.h:928
+#: ../include/svn_error_codes.h:943
msgid "Error running post-commit hook"
msgstr "Fel vid körning av krokskript efter arkivering (\"post-commit\")"
-#: ../include/svn_error_codes.h:933
+#: ../include/svn_error_codes.h:948
msgid "Error running post-lock hook"
msgstr "Fel vid körning av krokskript efter låsning (\"post-lock\")"
-#: ../include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:953
msgid "Error running post-unlock hook"
msgstr "Fel vid körning av krokskript efter upplåsning (\"post-unlock\")"
-#: ../include/svn_error_codes.h:943
+#: ../include/svn_error_codes.h:958
msgid "Repository upgrade is not supported"
msgstr "Uppgradering av arkiv stöds ej"
-#: ../include/svn_error_codes.h:949
+#: ../include/svn_error_codes.h:964
msgid "Bad URL passed to RA layer"
msgstr "Felaktig URL skickad till RA-skiktet"
-#: ../include/svn_error_codes.h:953
+#: ../include/svn_error_codes.h:968
msgid "Authorization failed"
msgstr "Behörighetskontroll misslyckades"
-#: ../include/svn_error_codes.h:957
+#: ../include/svn_error_codes.h:972
msgid "Unknown authorization method"
msgstr "Okänd metod för behörighetskontroll"
-#: ../include/svn_error_codes.h:961
+#: ../include/svn_error_codes.h:976
msgid "Repository access method not implemented"
msgstr "Metod för arkivåtkomst ej implementerad"
-#: ../include/svn_error_codes.h:969
+#: ../include/svn_error_codes.h:984
msgid "Repository has no UUID"
msgstr "Arkivet saknar UUID"
-#: ../include/svn_error_codes.h:973
+#: ../include/svn_error_codes.h:988
msgid "Unsupported RA plugin ABI version"
msgstr "ABI-versionen för insticksmodulen för arkivåtkomst stöds ej"
-#: ../include/svn_error_codes.h:983
+#: ../include/svn_error_codes.h:998
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:988
+#: ../include/svn_error_codes.h:1003
msgid "Repository UUID does not match expected UUID"
msgstr "Arkivets UUID matchar inte den förväntade UUID:n"
-#: ../include/svn_error_codes.h:993
+#: ../include/svn_error_codes.h:1008
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:998
+#: ../include/svn_error_codes.h:1013
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:1003 ../libsvn_ra_svn/client.c:506
+#: ../include/svn_error_codes.h:1018 ../libsvn_ra_svn/client.c:506
#, c-format
msgid "Can't create tunnel"
msgstr "Kan inte skapa tunnel"
-#: ../include/svn_error_codes.h:1008
+#: ../include/svn_error_codes.h:1023
msgid "Can't create session"
msgstr "Kan inte skapa session"
-#: ../include/svn_error_codes.h:1014
+#: ../include/svn_error_codes.h:1029
msgid "RA layer failed to init socket layer"
msgstr "RA-skiktet kunde inte initiera uttagsskiktet (socket layer)"
-#: ../include/svn_error_codes.h:1018
+#: ../include/svn_error_codes.h:1033
msgid "RA layer failed to create HTTP request"
msgstr "RA-skiktet kunde inte skapa en HTTP-förfrågan"
-#: ../include/svn_error_codes.h:1022
+#: ../include/svn_error_codes.h:1037
msgid "RA layer request failed"
msgstr "Förfrågan misslyckad i RA-skiktet"
-#: ../include/svn_error_codes.h:1026
+#: ../include/svn_error_codes.h:1041
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA-skiktet mottog ej begärd OPTIONS-information"
-#: ../include/svn_error_codes.h:1030
+#: ../include/svn_error_codes.h:1045
msgid "RA layer failed to fetch properties"
msgstr "RA-skiktet misslyckades med att erhålla egenskaper"
-#: ../include/svn_error_codes.h:1034
+#: ../include/svn_error_codes.h:1049
msgid "RA layer file already exists"
msgstr "RA-skiktsfil finns redan"
-#: ../include/svn_error_codes.h:1048
+#: ../include/svn_error_codes.h:1063
msgid "HTTP Path Not Found"
msgstr "HTTP-sökväg finns inte"
-#: ../include/svn_error_codes.h:1052
+#: ../include/svn_error_codes.h:1067
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:1057 ../include/svn_error_codes.h:1560
+#: ../include/svn_error_codes.h:1072 ../include/svn_error_codes.h:1580
#: ../libsvn_ra_svn/marshal.c:1459 ../libsvn_ra_svn/marshal.c:1716
-#: ../libsvn_ra_svn/marshal.c:1745 ../libsvn_ra_svn/marshal.c:3000
+#: ../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:1062
+#: ../include/svn_error_codes.h:1077
msgid "Unable to extract data from response header"
msgstr "Kunde inte läsa data från responshuvud"
-#: ../include/svn_error_codes.h:1067
+#: ../include/svn_error_codes.h:1082
msgid "Repository has been moved"
msgstr "Arkivet har flyttats"
-#: ../include/svn_error_codes.h:1072 ../libsvn_ra_serf/util.c:940
+#: ../include/svn_error_codes.h:1087 ../libsvn_ra_serf/util.c:940
msgid "Connection timed out"
msgstr "Nätverksanslutningen gick ut"
-#: ../include/svn_error_codes.h:1077
+#: ../include/svn_error_codes.h:1092
msgid "URL access forbidden for unknown reason"
msgstr "Åtkomst till URL tilläts ej av okänd anledning"
-#: ../include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1097
msgid "The server state conflicts with the requested preconditions"
msgstr "Servertillståndet strider mot begärda förhandsvillkor."
-#: ../include/svn_error_codes.h:1087
+#: ../include/svn_error_codes.h:1102
msgid "The URL doesn't allow the requested method"
msgstr "URL:en tillåter ej begärd metod"
-#: ../include/svn_error_codes.h:1093 ../include/svn_error_codes.h:1564
+#: ../include/svn_error_codes.h:1108 ../include/svn_error_codes.h:1584
msgid "Couldn't find a repository"
msgstr "Kunde inte hitta något arkiv"
-#: ../include/svn_error_codes.h:1097
+#: ../include/svn_error_codes.h:1112
msgid "Couldn't open a repository"
msgstr "Kunde inte öppna arkivet"
-#: ../include/svn_error_codes.h:1103
+#: ../include/svn_error_codes.h:1118
msgid "Svndiff data has invalid header"
msgstr "Svndiff-data har ogiltigt huvud"
-#: ../include/svn_error_codes.h:1107
+#: ../include/svn_error_codes.h:1122
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff-data innehåller trasigt fönster"
-#: ../include/svn_error_codes.h:1111
+#: ../include/svn_error_codes.h:1126
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:1115
+#: ../include/svn_error_codes.h:1130
msgid "Svndiff data contains invalid instruction"
msgstr "Ogiltig instruktion i svndiff-data"
-#: ../include/svn_error_codes.h:1119
+#: ../include/svn_error_codes.h:1134
msgid "Svndiff data ends unexpectedly"
msgstr "Svndiff-data tog oväntat slut"
-#: ../include/svn_error_codes.h:1123
+#: ../include/svn_error_codes.h:1138
msgid "Svndiff compressed data is invalid"
msgstr "Komprimerad svndiff-data är ogiltig"
-#: ../include/svn_error_codes.h:1129
+#: ../include/svn_error_codes.h:1144
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache saknar sökväg till SVN-filsystem"
-#: ../include/svn_error_codes.h:1133
+#: ../include/svn_error_codes.h:1148
msgid "Apache got a malformed URI"
msgstr "Apache fick en felaktig URI"
-#: ../include/svn_error_codes.h:1137
+#: ../include/svn_error_codes.h:1152
msgid "Activity not found"
msgstr "Aktiviteten hittades ej"
-#: ../include/svn_error_codes.h:1141
+#: ../include/svn_error_codes.h:1156
msgid "Baseline incorrect"
msgstr "Felaktig utgångspunkt"
-#: ../include/svn_error_codes.h:1145
+#: ../include/svn_error_codes.h:1160
msgid "Input/output error"
msgstr "In/ut-fel"
-#: ../include/svn_error_codes.h:1151
+#: ../include/svn_error_codes.h:1166
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:1155
+#: ../include/svn_error_codes.h:1170
msgid "Repository access is needed for this operation"
msgstr "Operationen kräver åtkomst till ett arkiv"
-#: ../include/svn_error_codes.h:1159
+#: ../include/svn_error_codes.h:1174
msgid "Bogus revision information given"
msgstr "Felaktig revisionsinformation angiven"
-#: ../include/svn_error_codes.h:1163
+#: ../include/svn_error_codes.h:1178
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:1167
+#: ../include/svn_error_codes.h:1182
msgid "Operation does not apply to binary file"
msgstr "Operationen kan ej utföras på binär fil"
-#: ../include/svn_error_codes.h:1173
+#: ../include/svn_error_codes.h:1188
msgid "Format of an svn:externals property was invalid"
msgstr "Felaktigt format på svn:externals-egenskap"
-#: ../include/svn_error_codes.h:1177
+#: ../include/svn_error_codes.h:1192
msgid "Attempting restricted operation for modified resource"
msgstr "Operationen tillåter ej att källan är modifierad"
-#: ../include/svn_error_codes.h:1181
+#: ../include/svn_error_codes.h:1196
msgid "Operation does not apply to directory"
msgstr "Operationen kan ej utföras på en katalog"
-#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1813
+#: ../include/svn_error_codes.h:1200 ../svnadmin/svnadmin.c:1842
#, c-format
msgid "Revision range is not allowed"
msgstr "Revisionsområde otillåtet"
-#: ../include/svn_error_codes.h:1189
+#: ../include/svn_error_codes.h:1204
msgid "Inter-repository relocation not allowed"
msgstr "Omlokalisering mellan arkiv otillåten"
-#: ../include/svn_error_codes.h:1193
+#: ../include/svn_error_codes.h:1208
msgid "Author name cannot contain a newline"
msgstr "Författarnamn kan ej innehålla radslut"
-#: ../include/svn_error_codes.h:1197
+#: ../include/svn_error_codes.h:1212
msgid "Bad property name"
msgstr "Felaktigt egenskapsnamn"
-#: ../include/svn_error_codes.h:1202
+#: ../include/svn_error_codes.h:1217
msgid "Two versioned resources are unrelated"
msgstr "Två orelaterade versionshanterade resurser"
-#: ../include/svn_error_codes.h:1207
+#: ../include/svn_error_codes.h:1222
msgid "Path has no lock token"
msgstr "Sökvägen saknar låsidentifierare"
-#: ../include/svn_error_codes.h:1212
+#: ../include/svn_error_codes.h:1227
msgid "Operation does not support multiple sources"
msgstr "Operationen klarar ej flera källor"
-#: ../include/svn_error_codes.h:1217
+#: ../include/svn_error_codes.h:1232
msgid "No versioned parent directories"
msgstr "Inga versionshanterade föräldrakataloger"
-#: ../include/svn_error_codes.h:1222 ../include/svn_error_codes.h:1242
+#: ../include/svn_error_codes.h:1237 ../include/svn_error_codes.h:1257
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:1227
+#: ../include/svn_error_codes.h:1242
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:1232
+#: ../include/svn_error_codes.h:1247
msgid "Invalid path component strip count specified"
msgstr "Ogiltig angivelse av antal sökvägsdelar att ta bort"
-#: ../include/svn_error_codes.h:1237
+#: ../include/svn_error_codes.h:1252
msgid "Detected a cycle while processing the operation"
msgstr "En rundgång upptäcktes när operationen behandlades"
-#: ../include/svn_error_codes.h:1247
+#: ../include/svn_error_codes.h:1262
msgid "Invalid mergeinfo detected in merge target"
msgstr "Ogiltig sammanslagningsinformation upptäcktes i målet"
-#: ../include/svn_error_codes.h:1252
+#: ../include/svn_error_codes.h:1267
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:1257
+#: ../include/svn_error_codes.h:1272
msgid "The operation is forbidden by the server"
msgstr "Operationen tillåts inte av servern"
-#: ../include/svn_error_codes.h:1262
+#: ../include/svn_error_codes.h:1277
msgid "The conflict resolution option is not applicable"
msgstr "Konfliktlösningsvalet är ej tillämpbart"
-#: ../include/svn_error_codes.h:1268
+#: ../include/svn_error_codes.h:1283
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:1272
+#: ../include/svn_error_codes.h:1287
msgid "Failure loading plugin"
msgstr "Fel vid inladdning av insticksmodul"
-#: ../include/svn_error_codes.h:1276
+#: ../include/svn_error_codes.h:1291
msgid "Malformed file"
msgstr "Felaktig fil"
-#: ../include/svn_error_codes.h:1280
+#: ../include/svn_error_codes.h:1295
msgid "Incomplete data"
msgstr "Ofullständig data"
-#: ../include/svn_error_codes.h:1284
+#: ../include/svn_error_codes.h:1299
msgid "Incorrect parameters given"
msgstr "Felaktiga parametrar angivna"
-#: ../include/svn_error_codes.h:1288
+#: ../include/svn_error_codes.h:1303
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:1292
+#: ../include/svn_error_codes.h:1307
msgid "Test failed"
msgstr "Test misslyckades"
-#: ../include/svn_error_codes.h:1296
+#: ../include/svn_error_codes.h:1311
msgid "Trying to use an unsupported feature"
msgstr "Försöker använda en funktion som ej stöds"
-#: ../include/svn_error_codes.h:1300
+#: ../include/svn_error_codes.h:1315
msgid "Unexpected or unknown property kind"
msgstr "Oväntad eller okänd egenskapstyp"
-#: ../include/svn_error_codes.h:1304
+#: ../include/svn_error_codes.h:1319
msgid "Illegal target for the requested operation"
msgstr "Otillåtet mål för begärd operation"
-#: ../include/svn_error_codes.h:1308
+#: ../include/svn_error_codes.h:1323
msgid "MD5 checksum is missing"
msgstr "MD5-kontrollsumma saknas"
-#: ../include/svn_error_codes.h:1312
+#: ../include/svn_error_codes.h:1327
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:1316
+#: ../include/svn_error_codes.h:1331
msgid "Error calling external program"
msgstr "Fel vid anrop av externt program"
-#: ../include/svn_error_codes.h:1320
+#: ../include/svn_error_codes.h:1335
msgid "Python exception has been set with the error"
msgstr "Python-undantag har satts för felet"
-#: ../include/svn_error_codes.h:1324
+#: ../include/svn_error_codes.h:1339
msgid "A checksum mismatch occurred"
msgstr "Felaktig kontrollsumma"
-#: ../include/svn_error_codes.h:1328
+#: ../include/svn_error_codes.h:1343
msgid "The operation was interrupted"
msgstr "Operationen avbröts"
-#: ../include/svn_error_codes.h:1332
+#: ../include/svn_error_codes.h:1347
msgid "The specified diff option is not supported"
msgstr "Den angivna diff-flaggan stöds ej"
-#: ../include/svn_error_codes.h:1336
+#: ../include/svn_error_codes.h:1351
msgid "Property not found"
msgstr "Egenskapen finns ej"
-#: ../include/svn_error_codes.h:1340
+#: ../include/svn_error_codes.h:1355
msgid "No auth file path available"
msgstr "Sökväg för auth-fil ej tillgänglig"
-#: ../include/svn_error_codes.h:1345
+#: ../include/svn_error_codes.h:1360
msgid "Incompatible library version"
msgstr "Biblioteksversioner inte kompatibla"
-#: ../include/svn_error_codes.h:1350
+#: ../include/svn_error_codes.h:1365
msgid "Mergeinfo parse error"
msgstr "Syntaxfel i sammanslagningsinformation"
-#: ../include/svn_error_codes.h:1355
+#: ../include/svn_error_codes.h:1370
msgid "Cease invocation of this API"
msgstr "Avsluta anropet av detta API"
-#: ../include/svn_error_codes.h:1360
+#: ../include/svn_error_codes.h:1375
msgid "Error parsing revision number"
msgstr "Syntaxfel i revisionsnummer"
-#: ../include/svn_error_codes.h:1365
+#: ../include/svn_error_codes.h:1380
msgid "Iteration terminated before completion"
msgstr "Upprepning avslutades före fullbordan"
-#: ../include/svn_error_codes.h:1370
+#: ../include/svn_error_codes.h:1385
msgid "Unknown changelist"
msgstr "Okänd ändringslista"
-#: ../include/svn_error_codes.h:1375
+#: ../include/svn_error_codes.h:1390
msgid "Reserved directory name in command line arguments"
msgstr "Reserverat katalognamn i kommandoradsargumenten"
-#: ../include/svn_error_codes.h:1380
+#: ../include/svn_error_codes.h:1395
msgid "Inquiry about unknown capability"
msgstr "Förfrågan om okänd förmåga"
-#: ../include/svn_error_codes.h:1385
+#: ../include/svn_error_codes.h:1400
msgid "Test skipped"
msgstr "Test hoppades över"
-#: ../include/svn_error_codes.h:1390
+#: ../include/svn_error_codes.h:1405
msgid "APR memcache library not available"
msgstr "APR memcache-bibliotek ej tillgängligt"
-#: ../include/svn_error_codes.h:1395
+#: ../include/svn_error_codes.h:1410
msgid "Couldn't perform atomic initialization"
msgstr "Kunde inte genomföra atomisk initiering"
-#: ../include/svn_error_codes.h:1400
+#: ../include/svn_error_codes.h:1415
msgid "SQLite error"
msgstr "SQLite-fel"
-#: ../include/svn_error_codes.h:1405
+#: ../include/svn_error_codes.h:1420
msgid "Attempted to write to readonly SQLite db"
msgstr "Försök att skriva till skrivskyddad SQLite-databas"
-#: ../include/svn_error_codes.h:1412
+#: ../include/svn_error_codes.h:1427
msgid "Unsupported schema found in SQLite db"
msgstr "Schemat i SQLite-databasen stöds ej"
-#: ../include/svn_error_codes.h:1417
+#: ../include/svn_error_codes.h:1432
msgid "The SQLite db is busy"
msgstr "SQLite-databasen är upptagen"
-#: ../include/svn_error_codes.h:1422
+#: ../include/svn_error_codes.h:1437
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:1428
+#: ../include/svn_error_codes.h:1443
msgid "Constraint error in SQLite db"
msgstr "Restriktionsfel i SQLite-databas"
-#: ../include/svn_error_codes.h:1433
+#: ../include/svn_error_codes.h:1448
msgid "Too many memcached servers configured"
msgstr "För många konfigurerade memcached-servrar"
-#: ../include/svn_error_codes.h:1438
+#: ../include/svn_error_codes.h:1453
msgid "Failed to parse version number string"
msgstr "Syntaxfel i sträng med versionsnummer"
-#: ../include/svn_error_codes.h:1443
+#: ../include/svn_error_codes.h:1458
msgid "Atomic data storage is corrupt"
msgstr "Förstörd atomisk datalagring"
-#: ../include/svn_error_codes.h:1448
+#: ../include/svn_error_codes.h:1463
msgid "utf8proc library error"
msgstr "biblioteksfel i utf8proc"
-#: ../include/svn_error_codes.h:1453
+#: ../include/svn_error_codes.h:1468
msgid "Bad arguments to SQL operators GLOB or LIKE"
msgstr "Felaktiga argument till SQL-operatorerna GLOB eller LIKE"
-#: ../include/svn_error_codes.h:1458
+#: ../include/svn_error_codes.h:1473
msgid "Packed data stream is corrupt"
msgstr "Förstörd packad dataström"
-#: ../include/svn_error_codes.h:1463
+#: ../include/svn_error_codes.h:1478
msgid "Additional errors:"
msgstr "Ytterligare fel:"
-#: ../include/svn_error_codes.h:1468
+#: ../include/svn_error_codes.h:1483
msgid "Parser error: invalid input"
msgstr "Syntaxfel: felaktig indata"
-#: ../include/svn_error_codes.h:1473
+#: ../include/svn_error_codes.h:1488
msgid "SQLite transaction rollback failed"
msgstr "SQLite-transaktionsåterladdning misslyckades"
-#: ../include/svn_error_codes.h:1478
+#: ../include/svn_error_codes.h:1493
msgid "LZ4 compression failed"
msgstr "LZ4-kompression misslyckades"
-#: ../include/svn_error_codes.h:1483
+#: ../include/svn_error_codes.h:1498
msgid "LZ4 decompression failed"
msgstr "LZ4-dekompression misslyckades"
-#: ../include/svn_error_codes.h:1489
+#: ../include/svn_error_codes.h:1503
+msgid "Could not canonicalize path or URI"
+msgstr "Kunde inte skapa kanonisk sökväg eller URI"
+
+#: ../include/svn_error_codes.h:1509
msgid "Error parsing arguments"
msgstr "Syntaxfel i argument"
-#: ../include/svn_error_codes.h:1493
+#: ../include/svn_error_codes.h:1513
msgid "Not enough arguments provided"
msgstr "För få argument givna"
-#: ../include/svn_error_codes.h:1497
+#: ../include/svn_error_codes.h:1517
msgid "Mutually exclusive arguments specified"
msgstr "De angivna argumenten kan inte användas samtidigt"
-#: ../include/svn_error_codes.h:1501
+#: ../include/svn_error_codes.h:1521
msgid "Attempted command in administrative dir"
msgstr "Försökte utföra kommando i förvaltningskatalog"
-#: ../include/svn_error_codes.h:1505
+#: ../include/svn_error_codes.h:1525
msgid "The log message file is under version control"
msgstr "Filen med loggmeddelandet är versionshanterad"
-#: ../include/svn_error_codes.h:1509
+#: ../include/svn_error_codes.h:1529
msgid "The log message is a pathname"
msgstr "Loggmeddelandet är en sökväg"
-#: ../include/svn_error_codes.h:1513
+#: ../include/svn_error_codes.h:1533
msgid "Committing in directory scheduled for addition"
msgstr "Arkiverar i katalog schemalagd att läggas till"
-#: ../include/svn_error_codes.h:1517
+#: ../include/svn_error_codes.h:1537
msgid "No external editor available"
msgstr "Ingen extern editor tillgänglig"
-#: ../include/svn_error_codes.h:1521
+#: ../include/svn_error_codes.h:1541
msgid "Something is wrong with the log message's contents"
msgstr "Fel i loggmeddelandets innehåll"
-#: ../include/svn_error_codes.h:1525
+#: ../include/svn_error_codes.h:1545
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:1529
+#: ../include/svn_error_codes.h:1549
msgid "No external merge tool available"
msgstr "Ingen externt sammanslagningsverktyg tillgängligt"
-#: ../include/svn_error_codes.h:1533
+#: ../include/svn_error_codes.h:1553
msgid "Failed processing one or more externals definitions"
msgstr "Misslyckad behandling av en eller fler external-definitioner"
-#: ../include/svn_error_codes.h:1538
+#: ../include/svn_error_codes.h:1558
msgid "Repository verification failed"
msgstr "Arkivkontroll misslyckades"
-#: ../include/svn_error_codes.h:1544
+#: ../include/svn_error_codes.h:1564
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:1548
+#: ../include/svn_error_codes.h:1568
msgid "Unknown svn protocol command"
msgstr "Okänt kommando i svn-protokollet"
-#: ../include/svn_error_codes.h:1552
+#: ../include/svn_error_codes.h:1572
msgid "Network connection closed unexpectedly"
msgstr "Nätverksanslutningen stängdes oväntat"
-#: ../include/svn_error_codes.h:1556
+#: ../include/svn_error_codes.h:1576
msgid "Network read/write error"
msgstr "Läs/skrivfel till nätverket"
-#: ../include/svn_error_codes.h:1568
+#: ../include/svn_error_codes.h:1588
msgid "Client/server version mismatch"
msgstr "Klient- och serverversion stämmer ej överens"
-#: ../include/svn_error_codes.h:1573
+#: ../include/svn_error_codes.h:1593
msgid "Cannot negotiate authentication mechanism"
msgstr "Kan inte förhandla om autentiseringsmekanism"
-#: ../include/svn_error_codes.h:1578
+#: ../include/svn_error_codes.h:1598
msgid "Editor drive was aborted"
msgstr "Editorkörning avbröts"
-#: ../include/svn_error_codes.h:1583
+#: ../include/svn_error_codes.h:1603
msgid "Client request too long"
msgstr "Klientbegäran för lång"
-#: ../include/svn_error_codes.h:1588
+#: ../include/svn_error_codes.h:1608
msgid "Server response too long"
msgstr "För långt svar från server"
-#: ../include/svn_error_codes.h:1596
+#: ../include/svn_error_codes.h:1616
msgid "Credential data unavailable"
msgstr "Klientreferenser otillgängliga"
-#: ../include/svn_error_codes.h:1600
+#: ../include/svn_error_codes.h:1620
msgid "No authentication provider available"
msgstr "Ingen tillhandahållare av autentisering tillgänglig"
-#: ../include/svn_error_codes.h:1604
+#: ../include/svn_error_codes.h:1624
msgid "All authentication providers exhausted"
msgstr "Alla tillhandahållare av autentisering förbrukade"
-#: ../include/svn_error_codes.h:1608
+#: ../include/svn_error_codes.h:1628
msgid "Credentials not saved"
msgstr "Klientreferenser sparades inte"
-#: ../include/svn_error_codes.h:1613 ../libsvn_subr/gpg_agent.c:512
+#: ../include/svn_error_codes.h:1633 ../libsvn_subr/gpg_agent.c:512
msgid "Authentication failed"
msgstr "Autentisering misslyckades"
-#: ../include/svn_error_codes.h:1619
+#: ../include/svn_error_codes.h:1639
msgid "Read access denied for root of edit"
msgstr "Läsning nekas till roten för editeringen"
-#: ../include/svn_error_codes.h:1624
+#: ../include/svn_error_codes.h:1644
msgid "Item is not readable"
msgstr "Objektet är inte läsbart"
-#: ../include/svn_error_codes.h:1629
+#: ../include/svn_error_codes.h:1649
msgid "Item is partially readable"
msgstr "Objektet är delvis läsbart"
-#: ../include/svn_error_codes.h:1633
+#: ../include/svn_error_codes.h:1653
msgid "Invalid authz configuration"
msgstr "Ogiltig behörighetskonfiguration"
-#: ../include/svn_error_codes.h:1638
+#: ../include/svn_error_codes.h:1658
msgid "Item is not writable"
msgstr "Objektet är inte skrivbart"
-#: ../include/svn_error_codes.h:1645
+#: ../include/svn_error_codes.h:1665
msgid "Diff data source modified unexpectedly"
msgstr "Datakälla för diff ändrades oväntat"
-#: ../include/svn_error_codes.h:1650
+#: ../include/svn_error_codes.h:1670
msgid "Diff data unexpected"
msgstr "Oväntad diff-data"
-#: ../include/svn_error_codes.h:1657
+#: ../include/svn_error_codes.h:1677
msgid "Initialization of SSPI library failed"
msgstr "Misslyckad initiering av SSPI-biblioteket"
-#: ../include/svn_error_codes.h:1663
+#: ../include/svn_error_codes.h:1683
msgid "Server SSL certificate untrusted"
msgstr "Ej betrott SSL-certifikat för server"
-#: ../include/svn_error_codes.h:1668
+#: ../include/svn_error_codes.h:1688
msgid "Initialization of the GSSAPI context failed"
msgstr "Misslyckad initiering av GSSAPI-kontext"
-#: ../include/svn_error_codes.h:1673
+#: ../include/svn_error_codes.h:1693
msgid "While handling serf response:"
msgstr "När svar från serf behandlades:"
-#: ../include/svn_error_codes.h:1678
+#: ../include/svn_error_codes.h:1698
msgid "Can't read from stream"
msgstr "Kan inte läsa från ström"
-#: ../include/svn_error_codes.h:1684
+#: ../include/svn_error_codes.h:1704
msgid "Assertion failure"
msgstr "Fel upptäckt vid invariantkontroll"
-#: ../include/svn_error_codes.h:1688
+#: ../include/svn_error_codes.h:1708
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:1696
+#: ../include/svn_error_codes.h:1716
msgid "Unexpected end of ASN1 data"
msgstr "Oväntat slut på ASN1-data"
-#: ../include/svn_error_codes.h:1700
+#: ../include/svn_error_codes.h:1720
msgid "Unexpected ASN1 tag"
msgstr "Oväntat slut på ASN1-märke"
-#: ../include/svn_error_codes.h:1704
+#: ../include/svn_error_codes.h:1724
msgid "Invalid ASN1 length"
msgstr "Ogiltig ASN1-längd"
-#: ../include/svn_error_codes.h:1708
+#: ../include/svn_error_codes.h:1728
msgid "ASN1 length mismatch"
msgstr "ANS1-längd stämmer ej"
-#: ../include/svn_error_codes.h:1712
+#: ../include/svn_error_codes.h:1732
msgid "Invalid ASN1 data"
msgstr "Ogiltig ASN1-data"
-#: ../include/svn_error_codes.h:1716
+#: ../include/svn_error_codes.h:1736
msgid "Unavailable X509 feature"
msgstr "Otillgänglig X509-funktion"
-#: ../include/svn_error_codes.h:1720
+#: ../include/svn_error_codes.h:1740
msgid "Invalid PEM certificate"
msgstr "Ogiltigt PEM-certifikat"
-#: ../include/svn_error_codes.h:1724
+#: ../include/svn_error_codes.h:1744
msgid "Invalid certificate format"
msgstr "Ogiltigt certifikatsformat"
-#: ../include/svn_error_codes.h:1728
+#: ../include/svn_error_codes.h:1748
msgid "Invalid certificate version"
msgstr "Ogiltig certifikatversion"
-#: ../include/svn_error_codes.h:1732
+#: ../include/svn_error_codes.h:1752
msgid "Invalid certificate serial number"
msgstr "Ogiltigt serienummer för certifikat"
-#: ../include/svn_error_codes.h:1736
+#: ../include/svn_error_codes.h:1756
msgid "Found invalid algorithm in certificate"
msgstr "Ogiltig algoritm hittad i certifikat"
-#: ../include/svn_error_codes.h:1740
+#: ../include/svn_error_codes.h:1760
msgid "Found invalid name in certificate"
msgstr "Ogiltigt namn hittat i certifikat"
-#: ../include/svn_error_codes.h:1744
+#: ../include/svn_error_codes.h:1764
msgid "Found invalid date in certificate"
msgstr "Ogiltigt datum hittat i certifikat"
-#: ../include/svn_error_codes.h:1748
+#: ../include/svn_error_codes.h:1768
msgid "Found invalid public key in certificate"
msgstr "Ogiltig öppen nyckel hittad i certifikat"
-#: ../include/svn_error_codes.h:1752
+#: ../include/svn_error_codes.h:1772
msgid "Found invalid signature in certificate"
msgstr "Ogiltig signatur hittad i certifikat"
-#: ../include/svn_error_codes.h:1756
+#: ../include/svn_error_codes.h:1776
msgid "Found invalid extensions in certificate"
msgstr "Ogiltig utvidgning hittad i certifikat"
-#: ../include/svn_error_codes.h:1760
+#: ../include/svn_error_codes.h:1780
msgid "Unknown certificate version"
msgstr "Okänd certifikatversion"
-#: ../include/svn_error_codes.h:1764
+#: ../include/svn_error_codes.h:1784
msgid "Certificate uses unknown public key algorithm"
msgstr "Certifikatet använder okänd öppen nyckelalgoritm"
-#: ../include/svn_error_codes.h:1768
+#: ../include/svn_error_codes.h:1788
msgid "Certificate signature mismatch"
msgstr "Certifikatssignaturen stämmer ej"
-#: ../include/svn_error_codes.h:1772
+#: ../include/svn_error_codes.h:1792
msgid "Certificate verification failed"
msgstr "Certifikatskontrollen misslyckades"
@@ -1564,7 +1582,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:908
+#: ../libsvn_subr/opt.c:970
#, c-format
msgid "'%s' ends in a reserved name"
msgstr "\"%s\" slutar med ett reserverat namn"
@@ -1580,7 +1598,7 @@ msgid "'%s' is an existing item in confl
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:874 ../libsvn_wc/workqueue.c:968
+#: ../libsvn_wc/workqueue.c:902 ../libsvn_wc/workqueue.c:996
#, c-format
msgid "'%s' not found"
msgstr "\"%s\" finns inte"
@@ -1592,30 +1610,30 @@ msgid "Unsupported node kind for path '%
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:3197
-#: ../libsvn_client/export.c:1389 ../libsvn_client/import.c:861
-#: ../libsvn_client/patch.c:3747 ../libsvn_client/relocate.c:155
-#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:152
-#: ../libsvn_client/shelf.c:1105 ../libsvn_client/status.c:444
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3270
+#: ../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:111 ../svn/shelf-cmd.c:1023 ../svn/util.c:990
-#: ../svnbench/util.c:76
+#: ../libsvn_client/upgrade.c:116 ../svn/shelf-cmd.c:1030
+#: ../svn/shelf2-cmd.c:1030 ../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_client/copy_foreign.c:491
-#: ../libsvn_wc/adm_ops.c:479 ../libsvn_wc/copy.c:786
+#: ../libsvn_client/add.c:949 ../libsvn_wc/adm_ops.c:479
+#: ../libsvn_wc/copy.c:786
#, c-format
msgid "'%s' is already under version control"
msgstr "\"%s\" är redan versionshanterad"
-#: ../libsvn_client/add.c:1082 ../libsvn_client/add.c:1109
+#: ../libsvn_client/add.c:1083 ../libsvn_client/add.c:1110
#, c-format
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:764
+#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:769
#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "Kan inte beräkna skuldinformation för den binära filen \"%s\""
@@ -1625,7 +1643,7 @@ msgstr "Kan inte beräkna skuldinformati
#: ../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:1157
+#: ../libsvn_wc/entries.c:2803 ../libsvn_wc/entries.c:2834 ../svn/notify.c:1167
#: ../svnbench/notify.c:968
#, c-format
msgid "'%s' is not under version control"
@@ -1641,7 +1659,7 @@ msgstr "\"%s\" pekar på en katalog"
msgid "'%s' has no pristine version until it is committed"
msgstr "\"%s\" har ingen orörd revision förrän den arkiveras"
-#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:390
+#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:383
msgid "(local)"
msgstr "(lokal)"
@@ -1654,23 +1672,28 @@ 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:133 ../libsvn_client/export.c:1446
+#: ../libsvn_client/checkout.c:146 ../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:137
+#: ../libsvn_client/checkout.c:150
#, 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:175
+#: ../libsvn_client/checkout.c:188
#, 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:183
+#: ../libsvn_client/checkout.c:195
+#, 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
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "\"%s\" finns redan och är ingen katalog"
@@ -1689,7 +1712,7 @@ msgstr "\"%s\" är bara en fixerad revis
msgid "Resolving '^/': no repository root found in the target arguments or in the current directory"
msgstr "Uppslagning av \"^/\": ingen arkivrot hittades i målargumenten eller i arbetskatalogen"
-#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2303
+#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2294
msgid "Commit failed (details follow):"
msgstr "Arkiveringen misslyckades (mer information följer):"
@@ -1705,12 +1728,7 @@ msgstr "Fel vid upplåsning av låsta ka
msgid "Error bumping revisions post-commit (details follow):"
msgstr "Fel vid höjning av revisionsnummer efter arkivering (mer information följer):"
-#: ../libsvn_client/commit.c:554
-#, c-format
-msgid "'%s' is a URL, but URLs cannot be commit targets"
-msgstr "\"%s\" är en URL, men URL:er kan inte vara mål vid arkivering"
-
-#: ../libsvn_client/commit.c:656
+#: ../libsvn_client/commit.c:544
msgid ""
"Commit can only commit to a single repository at a time.\n"
"Are all targets part of the same working copy?"
@@ -1718,12 +1736,17 @@ msgstr ""
"Arkivering kan bara ske till ett enda arkiv åt gången.\n"
"Ingår samtliga mål i samma arbetskopia?"
-#: ../libsvn_client/commit.c:722
+#: ../libsvn_client/commit.c:677
+#, c-format
+msgid "'%s' is a URL, but URLs cannot be commit targets"
+msgstr "\"%s\" är en URL, men URL:er kan inte vara mål vid arkivering"
+
+#: ../libsvn_client/commit.c:817
#, 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:777
+#: ../libsvn_client/commit.c:872
#, 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"
@@ -1783,29 +1806,29 @@ msgstr "\"%s\" är schemalagd att lägga
msgid "'%s' is not known to exist in the repository and is not part of the commit, yet its child '%s' is part of the commit"
msgstr "\"%s\" är inte versionshanterad och är ej heller delaktig i arkiveringen, men trots det är dess barn \"%s\" en del av arkiveringen"
-#: ../libsvn_client/commit_util.c:1421
+#: ../libsvn_client/commit_util.c:1444
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
msgstr "Kan inte arkivera både \"%s\" och \"%s\" eftersom de syftar på samma URL"
-#: ../libsvn_client/commit_util.c:1576
+#: ../libsvn_client/commit_util.c:1598
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "Arkiveringsobjektet \"%s\" har kopieringsflaggan satt, men saknar \"copyfrom\"-URL"
-#: ../libsvn_client/commit_util.c:1581
+#: ../libsvn_client/commit_util.c:1603
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "Arkiveringsobjektet \"%s\" har kopieringsflagga men ogiltig revision"
-#: ../libsvn_client/commit_util.c:2056
+#: ../libsvn_client/commit_util.c:2076
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:4985
-#: ../libsvn_client/conflicts.c:5359 ../libsvn_client/conflicts.c:5381
-#: ../libsvn_client/conflicts.c:5433 ../libsvn_client/conflicts.c:5906
+#: ../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
msgid "unknown author"
msgstr "okänd författare"
@@ -1979,24 +2002,24 @@ msgstr ""
"En katalog hade flyttats hit i arbetskopian från\n"
"\"%s\"."
-#: ../libsvn_client/conflicts.c:3119
+#: ../libsvn_client/conflicts.c:3130
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:3123
+#: ../libsvn_client/conflicts.c:3134
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:3127
+#: ../libsvn_client/conflicts.c:3138
msgid "A deleted item was found in the working copy."
msgstr "Ett raderat objekt hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:3132
+#: ../libsvn_client/conflicts.c:3143
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:3137
+#: ../libsvn_client/conflicts.c:3148
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."
@@ -2004,23 +2027,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:3144
+#: ../libsvn_client/conflicts.c:3155
msgid "An unversioned item was found in the working copy."
msgstr "Ett icke versionshanterat objekt hittades i arbetskopian."
-#: ../libsvn_client/conflicts.c:3149
+#: ../libsvn_client/conflicts.c:3160
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:3154
+#: ../libsvn_client/conflicts.c:3165
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:3158
+#: ../libsvn_client/conflicts.c:3169
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:3186
+#: ../libsvn_client/conflicts.c:3197
#, c-format
msgid ""
"%s\n"
@@ -2029,41 +2052,41 @@ msgstr ""
"%s\n"
"Och sedan flyttats bort till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:3251
+#: ../libsvn_client/conflicts.c:3262
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:3260
+#: ../libsvn_client/conflicts.c:3271
#, 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:3266
+#: ../libsvn_client/conflicts.c:3277
#, 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:3273
+#: ../libsvn_client/conflicts.c:3284
#, 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:3289
+#: ../libsvn_client/conflicts.c:3300
#, 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:3297
+#: ../libsvn_client/conflicts.c:3308
#, 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:3305
+#: ../libsvn_client/conflicts.c:3316
#, 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:3319
+#: ../libsvn_client/conflicts.c:3330
#, c-format
msgid ""
"No such file or directory was found in the merge target working copy.\n"
@@ -2072,229 +2095,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:3343
+#: ../libsvn_client/conflicts.c:3354
msgid "An update operation tried to edit a file."
msgstr "En uppdatering försökte ändra en fil."
-#: ../libsvn_client/conflicts.c:3345
+#: ../libsvn_client/conflicts.c:3356
msgid "An update operation tried to add a file."
msgstr "En uppdatering försökte lägga till en fil."
-#: ../libsvn_client/conflicts.c:3347
+#: ../libsvn_client/conflicts.c:3358
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:3350
+#: ../libsvn_client/conflicts.c:3361
msgid "An update operation tried to replace a file."
msgstr "En uppdatering försökte ersätta en fil."
-#: ../libsvn_client/conflicts.c:3358
+#: ../libsvn_client/conflicts.c:3369
msgid "A switch operation tried to edit a file."
msgstr "En växling försökte ändra en fil."
-#: ../libsvn_client/conflicts.c:3360
+#: ../libsvn_client/conflicts.c:3371
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:3362
+#: ../libsvn_client/conflicts.c:3373
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:3365
+#: ../libsvn_client/conflicts.c:3376
msgid "A switch operation tried to replace a file."
msgstr "En växling försökte ersätta en fil."
-#: ../libsvn_client/conflicts.c:3373
+#: ../libsvn_client/conflicts.c:3384
msgid "A merge operation tried to edit a file."
msgstr "En sammanslagning försökte ändra en fil."
-#: ../libsvn_client/conflicts.c:3375
+#: ../libsvn_client/conflicts.c:3386
msgid "A merge operation tried to add a file."
msgstr "En sammanslagning försökte lägga till en fil."
-#: ../libsvn_client/conflicts.c:3377
+#: ../libsvn_client/conflicts.c:3388
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:3380
+#: ../libsvn_client/conflicts.c:3391
msgid "A merge operation tried to replace a file."
msgstr "En sammanslagning försökte ersätta en fil."
-#: ../libsvn_client/conflicts.c:3390
+#: ../libsvn_client/conflicts.c:3401
msgid "An update operation tried to change a directory."
msgstr "En uppdatering försökte ändra en katalog."
-#: ../libsvn_client/conflicts.c:3392
+#: ../libsvn_client/conflicts.c:3403
msgid "An update operation tried to add a directory."
msgstr "En uppdatering försökte lägga till en katalog."
-#: ../libsvn_client/conflicts.c:3394
+#: ../libsvn_client/conflicts.c:3405
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:3397
+#: ../libsvn_client/conflicts.c:3408
msgid "An update operation tried to replace a directory."
msgstr "En uppdatering försökte ersätta en katalog."
-#: ../libsvn_client/conflicts.c:3405
+#: ../libsvn_client/conflicts.c:3416
msgid "A switch operation tried to edit a directory."
msgstr "En växling försökte ändra en katalog."
-#: ../libsvn_client/conflicts.c:3407
+#: ../libsvn_client/conflicts.c:3418
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:3409
+#: ../libsvn_client/conflicts.c:3420
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:3412
+#: ../libsvn_client/conflicts.c:3423
msgid "A switch operation tried to replace a directory."
msgstr "En växling försökte ersätta en katalog."
-#: ../libsvn_client/conflicts.c:3420
+#: ../libsvn_client/conflicts.c:3431
msgid "A merge operation tried to edit a directory."
msgstr "En sammanslagning försökte ändra en katalog."
-#: ../libsvn_client/conflicts.c:3422
+#: ../libsvn_client/conflicts.c:3433
msgid "A merge operation tried to add a directory."
msgstr "En sammanslagning försökte lägga till en katalog."
-#: ../libsvn_client/conflicts.c:3424
+#: ../libsvn_client/conflicts.c:3435
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:3427
+#: ../libsvn_client/conflicts.c:3438
msgid "A merge operation tried to replace a directory."
msgstr "En sammanslagning försökte ersätta en katalog."
-#: ../libsvn_client/conflicts.c:3438
+#: ../libsvn_client/conflicts.c:3449
msgid "An update operation tried to edit an item."
msgstr "En uppdatering försökte ändra ett objekt."
-#: ../libsvn_client/conflicts.c:3440
+#: ../libsvn_client/conflicts.c:3451
msgid "An update operation tried to add an item."
msgstr "En uppdatering försökte lägga till ett objekt."
-#: ../libsvn_client/conflicts.c:3442
+#: ../libsvn_client/conflicts.c:3453
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:3445
+#: ../libsvn_client/conflicts.c:3456
msgid "An update operation tried to replace an item."
msgstr "En uppdatering försökte ersätta ett objekt."
-#: ../libsvn_client/conflicts.c:3453
+#: ../libsvn_client/conflicts.c:3464
msgid "A switch operation tried to edit an item."
msgstr "En växling försökte ändra ett objekt."
-#: ../libsvn_client/conflicts.c:3455
+#: ../libsvn_client/conflicts.c:3466
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:3457
+#: ../libsvn_client/conflicts.c:3468
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:3460
+#: ../libsvn_client/conflicts.c:3471
msgid "A switch operation tried to replace an item."
msgstr "En växlig försökte ersätta ett objekt."
-#: ../libsvn_client/conflicts.c:3468
+#: ../libsvn_client/conflicts.c:3479
msgid "A merge operation tried to edit an item."
msgstr "En sammanslagning försökte ändra ett objekt."
-#: ../libsvn_client/conflicts.c:3470
+#: ../libsvn_client/conflicts.c:3481
msgid "A merge operation tried to add an item."
msgstr "En sammanslagning försökte lägga till ett objekt."
-#: ../libsvn_client/conflicts.c:3472
+#: ../libsvn_client/conflicts.c:3483
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:3475
+#: ../libsvn_client/conflicts.c:3486
msgid "A merge operation tried to replace an item."
msgstr "En sammanslagning försökte ersätta ett objekt."
-#: ../libsvn_client/conflicts.c:3491 ../svn/cl-conflicts.c:212
+#: ../libsvn_client/conflicts.c:3502 ../svn/cl-conflicts.c:212
msgid "upon update"
msgstr "vid uppdatering"
-#: ../libsvn_client/conflicts.c:3492 ../svn/cl-conflicts.c:213
+#: ../libsvn_client/conflicts.c:3503 ../svn/cl-conflicts.c:213
msgid "upon switch"
msgstr "vid växling"
-#: ../libsvn_client/conflicts.c:3493 ../svn/cl-conflicts.c:214
+#: ../libsvn_client/conflicts.c:3504 ../svn/cl-conflicts.c:214
msgid "upon merge"
msgstr "vid sammanslagning"
-#: ../libsvn_client/conflicts.c:3494 ../svn/cl-conflicts.c:215
+#: ../libsvn_client/conflicts.c:3505 ../svn/cl-conflicts.c:215
msgid "upon none"
msgstr "vid ingenting"
-#: ../libsvn_client/conflicts.c:3513 ../svn/cl-conflicts.c:127
+#: ../libsvn_client/conflicts.c:3524 ../svn/cl-conflicts.c:127
#: ../svn/cl-conflicts.c:234
msgid "local edit"
msgstr "lokal ändring"
-#: ../libsvn_client/conflicts.c:3516 ../svn/cl-conflicts.c:140
+#: ../libsvn_client/conflicts.c:3527 ../svn/cl-conflicts.c:140
#: ../svn/cl-conflicts.c:237
msgid "local add"
msgstr "lokalt tillägg"
-#: ../libsvn_client/conflicts.c:3519 ../svn/cl-conflicts.c:131
+#: ../libsvn_client/conflicts.c:3530 ../svn/cl-conflicts.c:131
#: ../svn/cl-conflicts.c:240
msgid "local delete"
msgstr "lokal radering"
-#: ../libsvn_client/conflicts.c:3522 ../svn/cl-conflicts.c:129
+#: ../libsvn_client/conflicts.c:3533 ../svn/cl-conflicts.c:129
#: ../svn/cl-conflicts.c:243
msgid "local obstruction"
msgstr "lokal blockering"
-#: ../libsvn_client/conflicts.c:3526 ../svn/cl-conflicts.c:247
+#: ../libsvn_client/conflicts.c:3537 ../svn/cl-conflicts.c:247
#, c-format
msgid "local %s"
msgstr "lokal %s"
-#: ../libsvn_client/conflicts.c:3535 ../svn/cl-conflicts.c:192
+#: ../libsvn_client/conflicts.c:3546 ../svn/cl-conflicts.c:192
#: ../svn/cl-conflicts.c:256
msgid "incoming edit"
msgstr "inkommande ändring"
-#: ../libsvn_client/conflicts.c:3538 ../svn/cl-conflicts.c:194
+#: ../libsvn_client/conflicts.c:3549 ../svn/cl-conflicts.c:194
#: ../svn/cl-conflicts.c:259
msgid "incoming add"
msgstr "inkommande tillägg"
-#: ../libsvn_client/conflicts.c:3541 ../svn/cl-conflicts.c:262
+#: ../libsvn_client/conflicts.c:3552 ../svn/cl-conflicts.c:262
msgid "incoming delete"
msgstr "inkommande radering"
-#: ../libsvn_client/conflicts.c:3545 ../svn/cl-conflicts.c:266
+#: ../libsvn_client/conflicts.c:3556 ../svn/cl-conflicts.c:266
#, c-format
msgid "incoming %s"
msgstr "inkommande %s"
-#: ../libsvn_client/conflicts.c:3553 ../svn/cl-conflicts.c:273
+#: ../libsvn_client/conflicts.c:3564 ../svn/cl-conflicts.c:273
#: ../svn/cl-conflicts.c:326
#, c-format
msgid "%s, %s %s"
msgstr "%s, %s %s"
-#: ../libsvn_client/conflicts.c:3612
+#: ../libsvn_client/conflicts.c:3623
#, c-format
msgid "incoming %s %s"
msgstr "inkommande %s %s"
-#: ../libsvn_client/conflicts.c:3715
+#: ../libsvn_client/conflicts.c:3726
#, 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:3726 ../libsvn_client/conflicts.c:3806
-#: ../libsvn_client/conflicts.c:4060 ../libsvn_client/conflicts.c:4147
-#: ../libsvn_client/conflicts.c:4447 ../libsvn_client/conflicts.c:4515
+#: ../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
#, c-format
msgid ""
"%s\n"
@@ -2303,14 +2326,14 @@ msgstr ""
"%s\n"
"Den ersatta katalogen flyttades till \"^/%s\"."
-#: ../libsvn_client/conflicts.c:3741
+#: ../libsvn_client/conflicts.c:3752
#, 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:3753 ../libsvn_client/conflicts.c:3832
-#: ../libsvn_client/conflicts.c:4089 ../libsvn_client/conflicts.c:4175
-#: ../libsvn_client/conflicts.c:4476 ../libsvn_client/conflicts.c:4543
+#: ../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
#, c-format
msgid ""
"%s\n"
@@ -2319,14 +2342,14 @@ msgstr ""
"%s\n"
"Den ersatta filen flyttades till \"^/%s\"."
-#: ../libsvn_client/conflicts.c:3767
+#: ../libsvn_client/conflicts.c:3778
#, 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:3777 ../libsvn_client/conflicts.c:3856
-#: ../libsvn_client/conflicts.c:4116 ../libsvn_client/conflicts.c:4202
-#: ../libsvn_client/conflicts.c:4570
+#: ../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
#, c-format
msgid ""
"%s\n"
@@ -2335,97 +2358,97 @@ msgstr ""
"%s\n"
"Det ersatta objektet flyttades till \"^/%s\"."
-#: ../libsvn_client/conflicts.c:3794
+#: ../libsvn_client/conflicts.c:3805
#, 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:3821
+#: ../libsvn_client/conflicts.c:3832
#, 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:3846
+#: ../libsvn_client/conflicts.c:3857
#, 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:3879
+#: ../libsvn_client/conflicts.c:3890
#, 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:3891
+#: ../libsvn_client/conflicts.c:3902
#, 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:3907
+#: ../libsvn_client/conflicts.c:3918
#, 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:3918
+#: ../libsvn_client/conflicts.c:3929
#, 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:3932
+#: ../libsvn_client/conflicts.c:3943
#, 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:3943
+#: ../libsvn_client/conflicts.c:3954
#, 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:3963
+#: ../libsvn_client/conflicts.c:3974
#, 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:3970
+#: ../libsvn_client/conflicts.c:3981
#, 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:3977
+#: ../libsvn_client/conflicts.c:3988
#, 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:3986
+#: ../libsvn_client/conflicts.c:3997
#, 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:3994
+#: ../libsvn_client/conflicts.c:4005
#, 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:4000
+#: ../libsvn_client/conflicts.c:4011
#, 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:4009
+#: ../libsvn_client/conflicts.c:4020
#, 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:4016
+#: ../libsvn_client/conflicts.c:4027
#, 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:4022
+#: ../libsvn_client/conflicts.c:4033
#, 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:4047
+#: ../libsvn_client/conflicts.c:4058
#, c-format
msgid ""
"Directory switched from\n"
@@ -2440,7 +2463,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4075
+#: ../libsvn_client/conflicts.c:4086
#, c-format
msgid ""
"File switched from\n"
@@ -2455,7 +2478,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4103 ../libsvn_client/conflicts.c:4346
+#: ../libsvn_client/conflicts.c:4114 ../libsvn_client/conflicts.c:4357
#, c-format
msgid ""
"Item switched from\n"
@@ -2470,7 +2493,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4133
+#: ../libsvn_client/conflicts.c:4144
#, c-format
msgid ""
"Directory switched from\n"
@@ -2485,7 +2508,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4162
+#: ../libsvn_client/conflicts.c:4173
#, c-format
msgid ""
"File switched from\n"
@@ -2500,7 +2523,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4189 ../libsvn_client/conflicts.c:4376
+#: ../libsvn_client/conflicts.c:4200 ../libsvn_client/conflicts.c:4387
#, c-format
msgid ""
"Item switched from\n"
@@ -2515,7 +2538,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4225
+#: ../libsvn_client/conflicts.c:4236
#, c-format
msgid ""
"Directory switched from\n"
@@ -2530,7 +2553,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4239
+#: ../libsvn_client/conflicts.c:4250
#, c-format
msgid ""
"Directory switched from\n"
@@ -2545,7 +2568,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4257
+#: ../libsvn_client/conflicts.c:4268
#, c-format
msgid ""
"File switched from\n"
@@ -2560,7 +2583,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4271
+#: ../libsvn_client/conflicts.c:4282
#, c-format
msgid ""
"File switched from\n"
@@ -2575,7 +2598,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4288
+#: ../libsvn_client/conflicts.c:4299
#, c-format
msgid ""
"Item switched from\n"
@@ -2590,7 +2613,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4302
+#: ../libsvn_client/conflicts.c:4313
#, c-format
msgid ""
"Item switched from\n"
@@ -2605,7 +2628,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4327 ../libsvn_client/conflicts.c:4367
+#: ../libsvn_client/conflicts.c:4338 ../libsvn_client/conflicts.c:4378
#, c-format
msgid ""
"Directory switched from\n"
@@ -2620,7 +2643,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"var en fil före ersättningen gjord av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4337
+#: ../libsvn_client/conflicts.c:4348
#, c-format
msgid ""
"File switched from\n"
@@ -2635,7 +2658,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:4357
+#: ../libsvn_client/conflicts.c:4368
#, c-format
msgid ""
"Directory switched from\n"
@@ -2650,7 +2673,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:4387
+#: ../libsvn_client/conflicts.c:4398
#, c-format
msgid ""
"Directory switched from\n"
@@ -2665,7 +2688,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4397
+#: ../libsvn_client/conflicts.c:4408
#, c-format
msgid ""
"File switched from\n"
@@ -2680,7 +2703,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4406
+#: ../libsvn_client/conflicts.c:4417
#, c-format
msgid ""
"Item switched from\n"
@@ -2695,7 +2718,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4434
+#: ../libsvn_client/conflicts.c:4445
#, c-format
msgid ""
"Directory merged from\n"
@@ -2710,7 +2733,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4462
+#: ../libsvn_client/conflicts.c:4473
#, c-format
msgid ""
"File merged from\n"
@@ -2725,7 +2748,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4488
+#: ../libsvn_client/conflicts.c:4499
#, c-format
msgid ""
"Item merged from\n"
@@ -2740,7 +2763,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4501
+#: ../libsvn_client/conflicts.c:4512
#, c-format
msgid ""
"Directory merged from\n"
@@ -2755,7 +2778,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog från en annan historielinje av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4530
+#: ../libsvn_client/conflicts.c:4541
#, c-format
msgid ""
"File merged from\n"
@@ -2770,7 +2793,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4557
+#: ../libsvn_client/conflicts.c:4568
#, c-format
msgid ""
"Item merged from\n"
@@ -2785,7 +2808,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4593
+#: ../libsvn_client/conflicts.c:4604
#, c-format
msgid ""
"Directory merged from\n"
@@ -2800,7 +2823,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4607
+#: ../libsvn_client/conflicts.c:4618
#, c-format
msgid ""
"Directory merged from\n"
@@ -2815,7 +2838,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4625
+#: ../libsvn_client/conflicts.c:4636
#, c-format
msgid ""
"File merged from\n"
@@ -2830,7 +2853,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4639
+#: ../libsvn_client/conflicts.c:4650
#, c-format
msgid ""
"File merged from\n"
@@ -2845,7 +2868,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4656
+#: ../libsvn_client/conflicts.c:4667
#, c-format
msgid ""
"Item merged from\n"
@@ -2860,7 +2883,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"flyttades till \"^/%s\" av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4670
+#: ../libsvn_client/conflicts.c:4681
#, c-format
msgid ""
"Item merged from\n"
@@ -2875,7 +2898,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4695 ../libsvn_client/conflicts.c:4734
+#: ../libsvn_client/conflicts.c:4706 ../libsvn_client/conflicts.c:4745
#, c-format
msgid ""
"Directory reverse-merged from\n"
@@ -2886,7 +2909,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:4704
+#: ../libsvn_client/conflicts.c:4715
#, c-format
msgid ""
"File reverse-merged from\n"
@@ -2901,7 +2924,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:4713
+#: ../libsvn_client/conflicts.c:4724
#, c-format
msgid ""
"Item reverse-merged from\n"
@@ -2916,7 +2939,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en fil av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4724
+#: ../libsvn_client/conflicts.c:4735
#, c-format
msgid ""
"Directory reverse-merged from\n"
@@ -2927,7 +2950,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:4742
+#: ../libsvn_client/conflicts.c:4753
#, c-format
msgid ""
"Item reverse-merged from\n"
@@ -2942,7 +2965,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"ersattes av en katalog av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4753
+#: ../libsvn_client/conflicts.c:4764
#, c-format
msgid ""
"Directory reverse-merged from\n"
@@ -2953,7 +2976,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"till ^/%s@%ld fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4762
+#: ../libsvn_client/conflicts.c:4773
#, c-format
msgid ""
"File reverse-merged from\n"
@@ -2968,7 +2991,7 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:4771
+#: ../libsvn_client/conflicts.c:4782
#, c-format
msgid ""
"Item reverse-merged from\n"
@@ -2983,52 +3006,52 @@ msgstr ""
"\"^/%s@%ld\"\n"
"fanns inte innan det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5495
+#: ../libsvn_client/conflicts.c:5506
#, 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:5502
+#: ../libsvn_client/conflicts.c:5513
#, 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:5507
+#: ../libsvn_client/conflicts.c:5518
#, 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:5517
+#: ../libsvn_client/conflicts.c:5528
#, 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:5524
+#: ../libsvn_client/conflicts.c:5535
#, 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:5529
+#: ../libsvn_client/conflicts.c:5540
#, 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:5538
+#: ../libsvn_client/conflicts.c:5549
#, 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:5545
+#: ../libsvn_client/conflicts.c:5556
#, 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:5550
+#: ../libsvn_client/conflicts.c:5561
#, 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:5569
+#: ../libsvn_client/conflicts.c:5580
#, c-format
msgid ""
"A new directory appeared during switch to\n"
@@ -3039,7 +3062,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:5577
+#: ../libsvn_client/conflicts.c:5588
#, c-format
msgid ""
"A new directory appeared during switch to\n"
@@ -3050,7 +3073,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5583
+#: ../libsvn_client/conflicts.c:5594
#, c-format
msgid ""
"A new directory appeared during switch to\n"
@@ -3061,7 +3084,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5594
+#: ../libsvn_client/conflicts.c:5605
#, c-format
msgid ""
"A new file appeared during switch to\n"
@@ -3072,7 +3095,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:5602
+#: ../libsvn_client/conflicts.c:5613
#, c-format
msgid ""
"A new file appeared during switch to\n"
@@ -3083,7 +3106,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5609
+#: ../libsvn_client/conflicts.c:5620
#, c-format
msgid ""
"A new file appeared during switch to\n"
@@ -3094,7 +3117,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5620
+#: ../libsvn_client/conflicts.c:5631
#, c-format
msgid ""
"A new item appeared during switch to\n"
@@ -3105,7 +3128,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:5628
+#: ../libsvn_client/conflicts.c:5639
#, c-format
msgid ""
"A new item appeared during switch to\n"
@@ -3116,7 +3139,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5635
+#: ../libsvn_client/conflicts.c:5646
#, c-format
msgid ""
"A new item appeared during switch to\n"
@@ -3127,7 +3150,7 @@ msgstr ""
"\"^/%s@%ld\".\n"
"Det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5656
+#: ../libsvn_client/conflicts.c:5667
#, c-format
msgid ""
"A new directory appeared during merge of\n"
@@ -3138,7 +3161,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5662
+#: ../libsvn_client/conflicts.c:5673
#, c-format
msgid ""
"A new directory appeared during merge of\n"
@@ -3149,7 +3172,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5672
+#: ../libsvn_client/conflicts.c:5683
#, c-format
msgid ""
"A new file appeared during merge of\n"
@@ -3160,7 +3183,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5678
+#: ../libsvn_client/conflicts.c:5689
#, c-format
msgid ""
"A new file appeared during merge of\n"
@@ -3171,7 +3194,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5687
+#: ../libsvn_client/conflicts.c:5698
#, c-format
msgid ""
"A new item appeared during merge of\n"
@@ -3182,7 +3205,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5693
+#: ../libsvn_client/conflicts.c:5704
#, c-format
msgid ""
"A new item appeared during merge of\n"
@@ -3193,7 +3216,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Det lades till av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5713
+#: ../libsvn_client/conflicts.c:5724
#, c-format
msgid ""
"A new directory appeared during reverse-merge of\n"
@@ -3204,7 +3227,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5720
+#: ../libsvn_client/conflicts.c:5731
#, c-format
msgid ""
"A new directory appeared during reverse-merge of\n"
@@ -3215,7 +3238,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5732
+#: ../libsvn_client/conflicts.c:5743
#, c-format
msgid ""
"A new file appeared during reverse-merge of\n"
@@ -3226,7 +3249,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5739
+#: ../libsvn_client/conflicts.c:5750
#, c-format
msgid ""
"A new file appeared during reverse-merge of\n"
@@ -3237,7 +3260,7 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Den raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5749
+#: ../libsvn_client/conflicts.c:5760
#, c-format
msgid ""
"A new item appeared during reverse-merge of\n"
@@ -3248,7 +3271,7 @@ msgstr ""
"\"^/%s:%ld\".\n"
"Det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:5756
+#: ../libsvn_client/conflicts.c:5767
#, c-format
msgid ""
"A new item appeared during reverse-merge of\n"
@@ -3259,37 +3282,37 @@ msgstr ""
"\"^/%s:%ld-%ld\".\n"
"Det raderades av %s i r%ld."
-#: ../libsvn_client/conflicts.c:6070
+#: ../libsvn_client/conflicts.c:6081
#, 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:6076
+#: ../libsvn_client/conflicts.c:6087
#, 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:6081
+#: ../libsvn_client/conflicts.c:6092
#, 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:6089
+#: ../libsvn_client/conflicts.c:6100
#, 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:6096
+#: ../libsvn_client/conflicts.c:6107
#, 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:6102
+#: ../libsvn_client/conflicts.c:6113
#, 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:6116 ../libsvn_client/conflicts.c:6123
+#: ../libsvn_client/conflicts.c:6127 ../libsvn_client/conflicts.c:6134
#, c-format
msgid ""
"Changes destined for a directory arrived via the following revisions during switch to\n"
@@ -3298,7 +3321,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:6129
+#: ../libsvn_client/conflicts.c:6140
#, c-format
msgid ""
"Changes from the following revisions arrived during switch to\n"
@@ -3307,13 +3330,17 @@ msgstr ""
"Ändringar från följande revisioner kom under växling till\n"
"\"^/%s@r%ld\""
-#: ../libsvn_client/conflicts.c:6172 ../libsvn_client/conflicts.c:6189
-#: ../libsvn_client/conflicts.c:6195
+#: ../libsvn_client/conflicts.c:6158
+msgid " (no revisions found)"
+msgstr " (inga revisioner hittade)"
+
+#: ../libsvn_client/conflicts.c:6186 ../libsvn_client/conflicts.c:6203
+#: ../libsvn_client/conflicts.c:6209
#, c-format
msgid "%s r%ld by %s%s"
msgstr "%s r%ld av %s%s"
-#: ../libsvn_client/conflicts.c:6182
+#: ../libsvn_client/conflicts.c:6196
#, c-format
msgid ""
"%s\n"
@@ -3328,7 +3355,7 @@ msgstr[1] ""
"%s\n"
" [%d revisioner utelämnade],\n"
-#: ../libsvn_client/conflicts.c:6254
+#: ../libsvn_client/conflicts.c:6268
#, c-format
msgid ""
"Changes destined for a directory arrived during merge of\n"
@@ -3337,7 +3364,7 @@ msgstr ""
"Ändringar avsedda för en katalog kom under sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6261
+#: ../libsvn_client/conflicts.c:6275
#, c-format
msgid ""
"Changes destined for a file arrived during merge of\n"
@@ -3346,7 +3373,7 @@ msgstr ""
"Ändringar avsedda för en fil kom under sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6267
+#: ../libsvn_client/conflicts.c:6281
#, c-format
msgid ""
"Changes arrived during merge of\n"
@@ -3355,7 +3382,7 @@ msgstr ""
"Ändringar kom under sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6279
+#: ../libsvn_client/conflicts.c:6293
#, c-format
msgid ""
"Changes destined for a directory arrived via the following revisions during merge of\n"
@@ -3364,7 +3391,7 @@ msgstr ""
"Ändringar avsedda för en katalog kom genom följande revisioner under sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6286
+#: ../libsvn_client/conflicts.c:6300
#, c-format
msgid ""
"Changes destined for a file arrived via the following revisions during merge of\n"
@@ -3373,7 +3400,7 @@ msgstr ""
"Ändringar avsedda för en fil kom genom följande revisioner under sammanslagninv av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6292
+#: ../libsvn_client/conflicts.c:6306
#, c-format
msgid ""
"Changes from the following revisions arrived during merge of\n"
@@ -3382,7 +3409,7 @@ msgstr ""
"Ändringar från följande revisioner kom under sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6304
+#: ../libsvn_client/conflicts.c:6318
#, c-format
msgid ""
"Changes destined for a directory arrived during reverse-merge of\n"
@@ -3391,7 +3418,7 @@ msgstr ""
"Ändringar avsedda för en katalog kom under omvänd sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6311
+#: ../libsvn_client/conflicts.c:6325
#, c-format
msgid ""
"Changes destined for a file arrived during reverse-merge of\n"
@@ -3400,7 +3427,7 @@ msgstr ""
"Ändringar kom under omvänd sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6317
+#: ../libsvn_client/conflicts.c:6331
#, c-format
msgid ""
"Changes arrived during reverse-merge of\n"
@@ -3409,7 +3436,7 @@ msgstr ""
"Ändringar kom under omvänd sammanslagning av\n"
"\"^/%s:%ld\"."
-#: ../libsvn_client/conflicts.c:6329
+#: ../libsvn_client/conflicts.c:6343
#, c-format
msgid ""
"Changes destined for a directory arrived via the following revisions during reverse-merge of\n"
@@ -3418,7 +3445,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:6337
+#: ../libsvn_client/conflicts.c:6351
#, c-format
msgid ""
"Changes destined for a file arrived via the following revisions during reverse-merge of\n"
@@ -3427,7 +3454,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:6345
+#: ../libsvn_client/conflicts.c:6359
#, c-format
msgid ""
"Changes from the following revisions arrived during reverse-merge of\n"
@@ -3436,414 +3463,436 @@ msgstr ""
"Ändringar från följande revisioner kom under omvänd sammanslagning av\n"
"\"^/%s:%ld-%ld\""
-#: ../libsvn_client/conflicts.c:6534
+#: ../libsvn_client/conflicts.c:6548
#, 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:6718 ../libsvn_client/conflicts.c:6724
+#: ../libsvn_client/conflicts.c:6732 ../libsvn_client/conflicts.c:6738
#, 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:6729 ../libsvn_client/conflicts.c:6755
-#: ../libsvn_client/conflicts.c:6782 ../libsvn_client/conflicts.c:6805
+#: ../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
#, c-format
msgid "Unexpected option id '%d'"
msgstr "Oväntad options-ID \"%d\""
[... 12602 lines stripped ...]