Modified: subversion/trunk/subversion/po/sv.po
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/po/sv.po?rev=1825972&r1=1825971&r2=1825972&view=diff
==============================================================================
--- subversion/trunk/subversion/po/sv.po [UTF-8] (original)
+++ subversion/trunk/subversion/po/sv.po [UTF-8] Tue Mar  6 10:39:24 2018
@@ -110,8 +110,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.9\n"
 "Report-Msgid-Bugs-To: d...@subversion.apache.org\n"
-"POT-Creation-Date: 2018-03-06 11:33+0100\n"
-"PO-Revision-Date: 2013-05-04 12:03+0200\n"
+"POT-Creation-Date: 2018-03-06 10:56+0100\n"
+"PO-Revision-Date: 2018-03-06 11:13+0100\n"
 "Last-Translator: Subversion Developers <d...@subversion.apache.org>\n"
 "Language-Team: Swedish <d...@subversion.apache.org>\n"
 "Language: sv\n"
@@ -266,14 +266,12 @@ msgid "Invalid atomic"
 msgstr "Ogiltig odelbar operation"
 
 #: ../include/svn_error_codes.h:241
-#, fuzzy
 msgid "Invalid compression method"
-msgstr "Ogiltig fixerad revision %ld"
+msgstr "Ogiltig kompressionsmetod"
 
 #: ../include/svn_error_codes.h:246
-#, fuzzy
 msgid "Unexpected line ending in the property value"
-msgstr "Oväntad eller okänd egenskapstyp"
+msgstr "Oväntat radslut i egenskapsvärdet"
 
 #: ../include/svn_error_codes.h:252
 msgid "No such XML tag attribute"
@@ -296,9 +294,8 @@ msgid "Data cannot be safely XML-escaped
 msgstr "Data kan inte skyddas för lagring som XML"
 
 #: ../include/svn_error_codes.h:273
-#, fuzzy
 msgid "Unexpected XML element found"
-msgstr "Oväntad nodtyp funnen"
+msgstr "Oväntat XML-element funnet"
 
 #: ../include/svn_error_codes.h:279
 msgid "Inconsistent line ending style"
@@ -353,9 +350,8 @@ msgid "Stream doesn't support seeking"
 msgstr "Strömmen stöder ej positionering"
 
 #: ../include/svn_error_codes.h:335
-#, fuzzy
 msgid "Stream doesn't support this capability"
-msgstr "Strömmen stöder ej positionering"
+msgstr "Strömmen stöder ej denna förmåga"
 
 #: ../include/svn_error_codes.h:341
 msgid "Unknown svn_node_kind"
@@ -615,7 +611,7 @@ msgstr "Filsystem saknar objekt"
 
 #: ../include/svn_error_codes.h:639
 msgid "Filesystem has no such node-rev-id"
-msgstr "node-rev-id saknas i filsystem"
+msgstr "Node-rev-id saknas i filsystem"
 
 #: ../include/svn_error_codes.h:643
 msgid "String does not represent a node or node-rev-id"
@@ -623,11 +619,11 @@ msgstr "Strängen representerar ingen no
 
 #: ../include/svn_error_codes.h:647
 msgid "Name does not refer to a filesystem directory"
-msgstr "Namnet refererar ej till en katalog i filsystemet"
+msgstr "Namnet syftar ej på en katalog i filsystemet"
 
 #: ../include/svn_error_codes.h:651
 msgid "Name does not refer to a filesystem file"
-msgstr "Namnet refererar ej till en fil i filsystemet"
+msgstr "Namnet syftar ej på en fil i filsystemet"
 
 #: ../include/svn_error_codes.h:655
 msgid "Name is not a single path component"
@@ -770,68 +766,60 @@ msgid "Could not initialize the revprop
 msgstr "Kunde inte initiera infrastrukturen för cachning av 
revisionsegenskaper"
 
 #: ../include/svn_error_codes.h:824
-#, fuzzy
 msgid "Malformed transaction ID string."
-msgstr "läsning av transaktionslista (listar nycklar)"
+msgstr "Felaktig ID-sträng för transaktion."
 
 #: ../include/svn_error_codes.h:829
-#, fuzzy
 msgid "Corrupt index file."
-msgstr "Trasig \"current\"-fil"
+msgstr "Trasig indexfil."
 
 #: ../include/svn_error_codes.h:834
 msgid "Revision not covered by index."
-msgstr ""
+msgstr "Revisionen täcks ej av indexet."
 
 #: ../include/svn_error_codes.h:839
 msgid "Item index too large for this revision."
-msgstr ""
+msgstr "Objektindex för stort för denna revision."
 
 #: ../include/svn_error_codes.h:844
 msgid "Container index out of range."
-msgstr ""
+msgstr "Behållarindex utanför giltigt område."
 
 #: ../include/svn_error_codes.h:849
 msgid "Index files are inconsistent."
-msgstr ""
+msgstr "Indexfilerna stämmer inte överens."
 
 #: ../include/svn_error_codes.h:854
-#, fuzzy
 msgid "Lock operation failed"
-msgstr "Behörighetskontroll misslyckades"
+msgstr "Låsning misslyckades"
 
 #: ../include/svn_error_codes.h:859
-#, fuzzy
 msgid "Unsupported FS type"
-msgstr "Formatet på filsystemet stöds ej"
+msgstr "Filsystemstypen stöds ej"
 
 #: ../include/svn_error_codes.h:864
 msgid "Container capacity exceeded."
-msgstr ""
+msgstr "Slut på plats i behållare."
 
 #: ../include/svn_error_codes.h:869
-#, fuzzy
 msgid "Malformed node revision ID string."
-msgstr "Nodrevisions-id saknas"
+msgstr "Felaktig ID-sträng för nodrevision."
 
 #: ../include/svn_error_codes.h:874
-#, fuzzy
 msgid "Invalid generation number data."
-msgstr "Ogiltigt revisionsnummer \"%ld\""
+msgstr "Ogiltigt generationsnummersdata."
 
 #: ../include/svn_error_codes.h:879
-#, fuzzy
 msgid "Revprop manifest corrupt."
-msgstr "Förstörd arbetskopia"
+msgstr "Förstörd innehållsförteckning för revisionsegenskap."
 
 #: ../include/svn_error_codes.h:884
-#, fuzzy
 msgid "Property list is corrupt."
-msgstr "Förstört filsystem"
+msgstr "Förstörd egenskapslista."
 
 #: ../include/svn_error_codes.h:889
 msgid "Content checksums supposedly match but content does not."
-msgstr ""
+msgstr "Innehållens kontrollsummor stämmer men innehållen skiljer sig åt."
 
 #: ../include/svn_error_codes.h:895
 msgid "The repository is locked, perhaps for db recovery"
@@ -923,9 +911,8 @@ msgid "Can't create tunnel"
 msgstr "Kan inte skapa tunnel"
 
 #: ../include/svn_error_codes.h:1008
-#, fuzzy
 msgid "Can't create session"
-msgstr "Kan inte skapa uttag (socket) för servern"
+msgstr "Kan inte skapa session"
 
 #: ../include/svn_error_codes.h:1014
 msgid "RA layer failed to init socket layer"
@@ -985,11 +972,11 @@ msgstr "Åtkomst till URL tilläts ej av
 
 #: ../include/svn_error_codes.h:1082
 msgid "The server state conflicts with the requested preconditions"
-msgstr ""
+msgstr "Servertillståndet strider mot begärda förhandsvillkor."
 
 #: ../include/svn_error_codes.h:1087
 msgid "The URL doesn't allow the requested method"
-msgstr ""
+msgstr "URL:en tillåter ej begärd metod"
 
 #: ../include/svn_error_codes.h:1093 ../include/svn_error_codes.h:1564
 msgid "Couldn't find a repository"
@@ -1118,7 +1105,7 @@ msgstr "En extern fil kan inte skriva ö
 
 #: ../include/svn_error_codes.h:1232
 msgid "Invalid path component strip count specified"
-msgstr "Ogiltigt angivelse av antal sökvägsdelar att ta bort "
+msgstr "Ogiltig angivelse av antal sökvägsdelar att ta bort"
 
 #: ../include/svn_error_codes.h:1237
 msgid "Detected a cycle while processing the operation"
@@ -1137,9 +1124,8 @@ msgid "The operation is forbidden by the
 msgstr "Operationen tillåts inte av servern"
 
 #: ../include/svn_error_codes.h:1262
-#, fuzzy
 msgid "The conflict resolution option is not applicable"
-msgstr "Konfliktlösningen misslyckades"
+msgstr "Konfliktlösningsvalet är ej tillämpbart"
 
 #: ../include/svn_error_codes.h:1268
 msgid "A problem occurred; see other errors for details"
@@ -1299,40 +1285,35 @@ msgstr "Förstörd atomisk datalagring"
 
 #: ../include/svn_error_codes.h:1448
 msgid "utf8proc library error"
-msgstr ""
+msgstr "biblioteksfel i utf8proc"
 
 #: ../include/svn_error_codes.h:1453
 msgid "Bad arguments to SQL operators GLOB or LIKE"
-msgstr ""
+msgstr "Felaktiga argument till SQL-operatorerna GLOB eller LIKE"
 
 #: ../include/svn_error_codes.h:1458
-#, fuzzy
 msgid "Packed data stream is corrupt"
-msgstr "Förstörd atomisk datalagring"
+msgstr "Förstörd packad dataström"
 
 #: ../include/svn_error_codes.h:1463
 msgid "Additional errors:"
 msgstr "Ytterligare fel:"
 
 #: ../include/svn_error_codes.h:1468
-#, fuzzy
 msgid "Parser error: invalid input"
-msgstr "Skrivfel i rör"
+msgstr "Syntaxfel: felaktig indata"
 
 #: ../include/svn_error_codes.h:1473
-#, fuzzy
 msgid "SQLite transaction rollback failed"
-msgstr "Städning efter transaktion \"%s\" misslyckades"
+msgstr "SQLite-transaktionsåterladdning misslyckades"
 
 #: ../include/svn_error_codes.h:1478
-#, fuzzy
 msgid "LZ4 compression failed"
-msgstr "XML-tolkning misslyckades"
+msgstr "LZ4-kompression misslyckades"
 
 #: ../include/svn_error_codes.h:1483
-#, fuzzy
 msgid "LZ4 decompression failed"
-msgstr "XML-tolkning misslyckades"
+msgstr "LZ4-dekompression misslyckades"
 
 #: ../include/svn_error_codes.h:1489
 msgid "Error parsing arguments"
@@ -1356,7 +1337,7 @@ msgstr "Filen med loggmeddelandet är ve
 
 #: ../include/svn_error_codes.h:1509
 msgid "The log message is a pathname"
-msgstr "Logmeddelandet är en sökväg"
+msgstr "Loggmeddelandet är en sökväg"
 
 #: ../include/svn_error_codes.h:1513
 msgid "Committing in directory scheduled for addition"
@@ -1383,9 +1364,8 @@ msgid "Failed processing one or more ext
 msgstr "Misslyckad behandling av en eller fler external-definitioner"
 
 #: ../include/svn_error_codes.h:1538
-#, fuzzy
 msgid "Repository verification failed"
-msgstr "Kunde inte skapa arkiv"
+msgstr "Arkivkontroll misslyckades"
 
 #: ../include/svn_error_codes.h:1544
 msgid "Special code for wrapping server errors to report to client"
@@ -1417,12 +1397,11 @@ msgstr "Editorkörning avbröts"
 
 #: ../include/svn_error_codes.h:1583
 msgid "Client request too long"
-msgstr ""
+msgstr "Klientbegäran för lång"
 
 #: ../include/svn_error_codes.h:1588
-#, fuzzy
 msgid "Server response too long"
-msgstr "För långt ord"
+msgstr "För långt svar från server"
 
 #: ../include/svn_error_codes.h:1596
 msgid "Credential data unavailable"
@@ -1469,9 +1448,8 @@ msgid "Diff data source modified unexpec
 msgstr "Datakälla för diff ändrades oväntat"
 
 #: ../include/svn_error_codes.h:1650
-#, fuzzy
 msgid "Diff data unexpected"
-msgstr "Svndiff-data tog oväntat slut"
+msgstr "Oväntad diff-data"
 
 #: ../include/svn_error_codes.h:1657
 msgid "Initialization of SSPI library failed"
@@ -1490,7 +1468,6 @@ msgid "While handling serf response:"
 msgstr "När svar från serf behandlades:"
 
 #: ../include/svn_error_codes.h:1678
-#, fuzzy
 msgid "Can't read from stream"
 msgstr "Kan inte läsa från ström"
 
@@ -1503,93 +1480,84 @@ msgid "No non-tracing links found in the
 msgstr "Inga icke-spårande länkar hittades i felkedjan"
 
 #: ../include/svn_error_codes.h:1696
-#, fuzzy
 msgid "Unexpected end of ASN1 data"
-msgstr "Oväntat slut på post"
+msgstr "Oväntat slut på ASN1-data"
 
 #: ../include/svn_error_codes.h:1700
-#, fuzzy
 msgid "Unexpected ASN1 tag"
-msgstr "Oväntat filslut"
+msgstr "Oväntat slut på ASN1-märke"
 
 #: ../include/svn_error_codes.h:1704
-#, fuzzy
 msgid "Invalid ASN1 length"
-msgstr "Ogiltig flagga"
+msgstr "Ogiltig ASN1-längd"
 
 #: ../include/svn_error_codes.h:1708
 msgid "ASN1 length mismatch"
-msgstr ""
+msgstr "ANS1-längd stämmer ej"
 
 #: ../include/svn_error_codes.h:1712
-#, fuzzy
 msgid "Invalid ASN1 data"
-msgstr "Ogiltig odelbar operation"
+msgstr "Ogiltig ASN1-data"
 
 #: ../include/svn_error_codes.h:1716
 msgid "Unavailable X509 feature"
-msgstr ""
+msgstr "Otillgänglig X509-funktion"
 
 #: ../include/svn_error_codes.h:1720
 msgid "Invalid PEM certificate"
-msgstr ""
+msgstr "Ogiltigt PEM-certifikat"
 
 #: ../include/svn_error_codes.h:1724
-#, fuzzy
 msgid "Invalid certificate format"
-msgstr "Ogiltigt avslutningstecken för post"
+msgstr "Ogiltigt certifikatsformat"
 
 #: ../include/svn_error_codes.h:1728
-#, fuzzy
 msgid "Invalid certificate version"
-msgstr "Ogiltig omlokalisering"
+msgstr "Ogiltig certifikatversion"
 
 #: ../include/svn_error_codes.h:1732
-#, fuzzy
 msgid "Invalid certificate serial number"
-msgstr "Ogiltigt revisionsnummer för filsystem"
+msgstr "Ogiltigt serienummer för certifikat"
 
 #: ../include/svn_error_codes.h:1736
 msgid "Found invalid algorithm in certificate"
-msgstr ""
+msgstr "Ogiltig algoritm hittad i certifikat"
 
 #: ../include/svn_error_codes.h:1740
 msgid "Found invalid name in certificate"
-msgstr ""
+msgstr "Ogiltigt namn hittat i certifikat"
 
 #: ../include/svn_error_codes.h:1744
 msgid "Found invalid date in certificate"
-msgstr ""
+msgstr "Ogiltigt datum hittat i certifikat"
 
 #: ../include/svn_error_codes.h:1748
 msgid "Found invalid public key in certificate"
-msgstr ""
+msgstr "Ogiltig öppen nyckel hittad i certifikat"
 
 #: ../include/svn_error_codes.h:1752
 msgid "Found invalid signature in certificate"
-msgstr ""
+msgstr "Ogiltig signatur hittad i certifikat"
 
 #: ../include/svn_error_codes.h:1756
 msgid "Found invalid extensions in certificate"
-msgstr ""
+msgstr "Ogiltig utvidgning hittad i certifikat"
 
 #: ../include/svn_error_codes.h:1760
 msgid "Unknown certificate version"
-msgstr ""
+msgstr "Okänd certifikatversion"
 
 #: ../include/svn_error_codes.h:1764
 msgid "Certificate uses unknown public key algorithm"
-msgstr ""
+msgstr "Certifikatet använder okänd öppen nyckelalgoritm"
 
 #: ../include/svn_error_codes.h:1768
-#, fuzzy
 msgid "Certificate signature mismatch"
-msgstr "Filnamn för klientcertifikat: "
+msgstr "Certifikatssignaturen stämmer ej"
 
 #: ../include/svn_error_codes.h:1772
-#, fuzzy
 msgid "Certficate verification failed"
-msgstr "Konfliktlösningen misslyckades"
+msgstr "Certifikatskontrollen misslyckades"
 
 #: ../libsvn_auth_gnome_keyring/gnome_keyring.c:290
 msgid "GNOME Keyring is locked and we are non-interactive"
@@ -1624,14 +1592,13 @@ 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/changelist.c:104 ../libsvn_client/deprecated.c:3098
+#: ../libsvn_client/export.c:1392 ../libsvn_client/import.c:861
 #: ../libsvn_client/patch.c:3745 ../libsvn_client/relocate.c:155
-#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:152
-#: ../libsvn_client/shelf.c:378 ../libsvn_client/status.c:368
+#: ../libsvn_client/resolved.c:120 ../libsvn_client/revert.c:149
+#: ../libsvn_client/shelve.c:194 ../libsvn_client/status.c:368
 #: ../libsvn_client/switch.c:471 ../libsvn_client/update.c:701
-#: ../libsvn_client/upgrade.c:111 ../svn/shelf-cmd.c:1053 ../svn/util.c:990
-#: ../svnbench/util.c:76
+#: ../libsvn_client/upgrade.c:111 ../svn/util.c:990 ../svnbench/util.c:76
 #, c-format
 msgid "'%s' is not a local path"
 msgstr "\"%s\" är ingen lokal sökväg"
@@ -1643,7 +1610,7 @@ msgid "'%s' is already under version con
 msgstr "\"%s\" är redan versionshanterad"
 
 #: ../libsvn_client/add.c:1082 ../libsvn_client/add.c:1109
-#, fuzzy, c-format
+#, c-format
 msgid "There is no valid URI above '%s'"
 msgstr "Det finns ingen giltig URI ovanför \"%s\""
 
@@ -1686,7 +1653,7 @@ 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:133 ../libsvn_client/export.c:1449
 #: ../svnbench/null-export-cmd.c:293
 #, c-format
 msgid "URL '%s' doesn't exist"
@@ -1838,36 +1805,32 @@ msgstr "Standardegenskaper kan inte sät
 #: ../libsvn_client/conflicts.c:1688 ../libsvn_client/conflicts.c:4625
 #: ../libsvn_client/conflicts.c:5124 ../libsvn_client/conflicts.c:5146
 #: ../libsvn_client/conflicts.c:5197 ../libsvn_client/conflicts.c:5674
-#, fuzzy
 msgid "unknown author"
-msgstr "okänt fel"
+msgstr "okänd författare"
 
 #: ../libsvn_client/conflicts.c:1126
 msgid "A file containing uncommitted changes was found in the working copy."
-msgstr ""
+msgstr "En fil med oarkiverade ändringar hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1129
 msgid "A file which differs from the corresponding file on the merge source 
branch was found in the working copy."
-msgstr ""
+msgstr "En fil som skiljer sig från motsvarande fil i källgrenen för 
sammanslagningen hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1134
 msgid "A file which already occupies this path was found in the working copy."
-msgstr ""
+msgstr "En fil som redan upptar denna sökväg hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1138
-#, fuzzy
 msgid "An unversioned file was found in the working copy."
-msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
+msgstr "En icke versionshanterad fil fanns i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1142
-#, fuzzy
 msgid "A deleted file was found in the working copy."
-msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
+msgstr "En raderad fil hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1147
-#, fuzzy
 msgid "No such file was found in the working copy."
-msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
+msgstr "Ingen sådan fil hittades i arbetskopian."
 
 #. ### display deleted revision
 #: ../libsvn_client/conflicts.c:1151
@@ -1875,11 +1838,13 @@ msgid ""
 "No such file was found in the merge target working copy.\n"
 "Perhaps the file has been deleted or moved away in the repository's history?"
 msgstr ""
+"Ingen sådan fil hittades i sammanslagningsmålets arbetskopia.\n"
+"Kanske filen har raderats eller flyttas bort i arkivets historia?"
 
 #. ### show more details about copies or replacements?
 #: ../libsvn_client/conflicts.c:1161
 msgid "A file scheduled to be added to the repository in the next commit was 
found in the working copy."
-msgstr ""
+msgstr "En fil schemalagd för att läggas till i nästa arkivering hittades i 
arbetskopian."
 
 #. The move no longer exists.
 #. The move probably happened in branch history.
@@ -1888,7 +1853,7 @@ msgstr ""
 #. ### find deleted/moved revision?
 #: ../libsvn_client/conflicts.c:1192 ../libsvn_client/conflicts.c:1224
 msgid "The file in the working copy had been moved away at the time this 
conflict was recorded."
-msgstr ""
+msgstr "Filen i arbetskopian var bortflyttad när denna konflikt registrerades."
 
 #: ../libsvn_client/conflicts.c:1207 ../libsvn_client/conflicts.c:1240
 #, c-format
@@ -1896,6 +1861,8 @@ msgid ""
 "The file in the working copy was moved away to\n"
 "'%s'."
 msgstr ""
+"Filen i arbetskopian var bortflyttad till\n"
+"\"%s\"."
 
 #. The move no longer exists.
 #. The move probably happened in branch history.
@@ -1904,41 +1871,40 @@ msgstr ""
 #. ### find deleted/moved revision?
 #: ../libsvn_client/conflicts.c:1266 ../libsvn_client/conflicts.c:1298
 msgid "A file had been moved here in the working copy at the time this 
conflict was recorded."
-msgstr ""
+msgstr "En fil hade flyttats hit i arbetskopian när denna konflikt 
registrerades."
 
 #: ../libsvn_client/conflicts.c:1281 ../libsvn_client/conflicts.c:1314
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A file was moved here in the working copy from\n"
 "'%s'."
-msgstr "\"%s\" är inte rot till arbetskopian \"%s\""
+msgstr ""
+"En fil hade flyttats hit i arbetskopian från\n"
+"\"%s\"."
 
 #: ../libsvn_client/conflicts.c:1350
 msgid "A directory containing uncommitted changes was found in the working 
copy."
-msgstr ""
+msgstr "En katalog med oarkiverade ändringar hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1353
 msgid "A directory which differs from the corresponding directory on the merge 
source branch was found in the working copy."
-msgstr ""
+msgstr "En katalog som skiljer sig från motsvarande katalog i källgrenen för 
sammanslagningen hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1358
 msgid "A directory which already occupies this path was found in the working 
copy."
-msgstr ""
+msgstr "En katalog som redan upptar denna sökväg hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1362
-#, fuzzy
 msgid "An unversioned directory was found in the working copy."
-msgstr "Katalogen \"%s\" är låst i en annan arbetskopia"
+msgstr "En icke versionshanterad katalog hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1366
-#, fuzzy
 msgid "A deleted directory was found in the working copy."
-msgstr "Katalogen \"%s\" är låst i en annan arbetskopia"
+msgstr "En raderad katalog hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:1372
-#, fuzzy
 msgid "No such directory was found in the working copy."
-msgstr "Katalogen \"%s\" är låst i en annan arbetskopia"
+msgstr "Ingen sådan katalog hittades i arbetskopian."
 
 #. ### display deleted revision
 #: ../libsvn_client/conflicts.c:1376
@@ -1946,16 +1912,18 @@ msgid ""
 "No such directory was found in the merge target working copy.\n"
 "Perhaps the directory has been deleted or moved away in the repository's 
history?"
 msgstr ""
+"Ingen sådan katalog hittades i sammanslagningsmålets arbetskopia.\n"
+"Kanske katalogen har raderats eller flyttats bort i arkivets historia?"
 
 #. ### show more details about copies or replacements?
 #: ../libsvn_client/conflicts.c:1386
 msgid "A directory scheduled to be added to the repository in the next commit 
was found in the working copy."
-msgstr ""
+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:1418
 msgid "The directory in the working copy had been moved away at the time this 
conflict was recorded."
-msgstr ""
+msgstr "Katalogen i arbetskopian hade flyttas bort när denna konflikt 
registrerades."
 
 #: ../libsvn_client/conflicts.c:1433
 #, c-format
@@ -1963,6 +1931,8 @@ msgid ""
 "The directory in the working copy was moved away to\n"
 "'%s'."
 msgstr ""
+"Katalogen i arbetskopian var bortflyttad till\n"
+"\"%s\"."
 
 #. The move probably happened in branch history.
 #. * This case cannot happen until we detect incoming
@@ -1970,7 +1940,7 @@ msgstr ""
 #. ### find deleted/moved revision?
 #: ../libsvn_client/conflicts.c:1450
 msgid "The directory had been moved away at the time this conflict was 
recorded."
-msgstr ""
+msgstr "Katalogen hade flyttats bort när denna konflikt registrerades."
 
 #: ../libsvn_client/conflicts.c:1466
 #, c-format
@@ -1978,6 +1948,8 @@ msgid ""
 "The directory was moved away to\n"
 "'%s'."
 msgstr ""
+"Katalogen var bortflyttad till\n"
+"\"%s\"."
 
 #. The move no longer exists.
 #. The move probably happened in branch history.
@@ -1986,7 +1958,7 @@ msgstr ""
 #. ### find deleted/moved revision?
 #: ../libsvn_client/conflicts.c:1492 ../libsvn_client/conflicts.c:1524
 msgid "A directory had been moved here at the time this conflict was recorded."
-msgstr ""
+msgstr "En katalog hade flyttats hit när denna konflikt registrerades."
 
 #: ../libsvn_client/conflicts.c:1507
 #, c-format
@@ -1994,31 +1966,33 @@ msgid ""
 "A directory was moved here from\n"
 "'%s'."
 msgstr ""
+"En katalog hade flyttats hit från\n"
+"\"%s\"."
 
 #: ../libsvn_client/conflicts.c:1540
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A directory was moved here in the working copy from\n"
 "'%s'."
-msgstr "Katalogen \"%s\" är låst i en annan arbetskopia"
+msgstr ""
+"En katalog hade flyttats hit i arbetskopian från\n"
+"\"%s\"."
 
 #: ../libsvn_client/conflicts.c:2759
 msgid "An item containing uncommitted changes was found in the working copy."
-msgstr ""
+msgstr "Ett objekt med oarkiverade ändringar hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:2763
 msgid "An item which already occupies this path was found in the working copy."
-msgstr ""
+msgstr "Ett objekt som redan upptar denna sökväg hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:2767
-#, fuzzy
 msgid "A deleted item was found in the working copy."
-msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
+msgstr "Ett raderat objekt hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:2772
-#, fuzzy
 msgid "No such file or directory was found in the working copy."
-msgstr "Katalogen \"%s\" är låst i en annan arbetskopia"
+msgstr "Ingen sådan fil eller katalog hittades i arbetskopian."
 
 #. ### display deleted revision
 #: ../libsvn_client/conflicts.c:2777
@@ -2026,23 +2000,24 @@ msgid ""
 "No such file or directory was found in the merge target working copy.\n"
 "The item may have been deleted or moved away in the repository's history."
 msgstr ""
+"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:2784
-#, fuzzy
 msgid "An unversioned item was found in the working copy."
-msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
+msgstr "Ett icke versionshanterat objekt hittades i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:2789
 msgid "An item scheduled to be added to the repository in the next commit was 
found in the working copy."
-msgstr ""
+msgstr "Ett objekt schemalagt för att läggas till i nästa arkivering hittades 
i arbetskopian."
 
 #: ../libsvn_client/conflicts.c:2794
 msgid "The item in the working copy had been moved away at the time this 
conflict was recorded."
-msgstr ""
+msgstr "Objektet i arbetskopian hade flyttas bort när denna konflikt 
registrerades."
 
 #: ../libsvn_client/conflicts.c:2798
 msgid "An item had been moved here in the working copy at the time this 
conflict was recorded."
-msgstr ""
+msgstr "Ett objekt hade flyttats hit i arbetskopian när denna konflikt 
registrerades."
 
 #: ../libsvn_client/conflicts.c:2826
 #, c-format
@@ -2050,40 +2025,42 @@ msgid ""
 "%s\n"
 "And then moved away to '^/%s' by %s in r%ld."
 msgstr ""
+"%s\n"
+"Och sedan flyttats bort till \"^/%s\" av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:2891
 msgid "No such file or directory was found in the merge target working copy.\n"
-msgstr ""
+msgstr "Ingen sådan fil eller katalog hittades i sammanslagningsmålets 
arbetskopia.\n"
 
 #: ../libsvn_client/conflicts.c:2900
 #, c-format
 msgid "%sThe file was moved to '^/%s' in r%ld by %s."
-msgstr ""
+msgstr "%sFilen flyttades till \"^/%s\" i r%ld av %s."
 
 #: ../libsvn_client/conflicts.c:2906
 #, c-format
 msgid "%sThe directory was moved to '^/%s' in r%ld by %s."
-msgstr ""
+msgstr "%sKatalogen flyttades till \"^/%s\" i r%ld av %s."
 
 #: ../libsvn_client/conflicts.c:2913
 #, c-format
 msgid "%sThe item was moved to '^/%s' in r%ld by %s."
-msgstr ""
+msgstr "%sObjektet flyttades till \"^/%s\" i r%ld av %s."
 
 #: ../libsvn_client/conflicts.c:2929
 #, c-format
 msgid "%sThe file '^/%s' was moved to '^/%s' in r%ld by %s."
-msgstr ""
+msgstr "%sFilen \"^/%s\" flyttades till \"^/%s\" i r%ld av %s."
 
 #: ../libsvn_client/conflicts.c:2937
 #, c-format
 msgid "%sThe directory '^/%s' was moved to '^/%s' in r%ld by %s."
-msgstr ""
+msgstr "%sKatalogen \"^/%s\" flyttades till \"^/%s\" i r%ld av %s."
 
 #: ../libsvn_client/conflicts.c:2945
 #, c-format
 msgid "%sThe item '^/%s' was moved to '^/%s' in r%ld by %s."
-msgstr ""
+msgstr "%sObjektet \"^/%s\" flyttades till \"^/%s\" i r%ld av %s."
 
 #: ../libsvn_client/conflicts.c:2959
 #, c-format
@@ -2091,159 +2068,152 @@ msgid ""
 "No such file or directory was found in the merge target working copy.\n"
 "'^/%s' was deleted in r%ld by %s."
 msgstr ""
+"Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n"
+"\"^/%s\" raderades i r%ld av %s."
 
 #: ../libsvn_client/conflicts.c:2983
 msgid "An update operation tried to edit a file."
-msgstr ""
+msgstr "En uppdatering försökte ändra en fil."
 
 #: ../libsvn_client/conflicts.c:2985
 msgid "An update operation tried to add a file."
-msgstr ""
+msgstr "En uppdatering försökte lägga till en fil."
 
 #: ../libsvn_client/conflicts.c:2987
 msgid "An update operation tried to delete or move a file."
-msgstr ""
+msgstr "En uppdatering försökte radera eller flytta en fil."
 
 #: ../libsvn_client/conflicts.c:2990
 msgid "An update operation tried to replace a file."
-msgstr ""
+msgstr "En uppdatering försökte ersätta en fil."
 
 #: ../libsvn_client/conflicts.c:2998
 msgid "A switch operation tried to edit a file."
-msgstr ""
+msgstr "En växling försökte ändra en fil."
 
 #: ../libsvn_client/conflicts.c:3000
 msgid "A switch operation tried to add a file."
-msgstr ""
+msgstr "En växling försökte lägga till en fil."
 
 #: ../libsvn_client/conflicts.c:3002
 msgid "A switch operation tried to delete or move a file."
-msgstr ""
+msgstr "En växling försökte radera eller flytta en fil."
 
 #: ../libsvn_client/conflicts.c:3005
 msgid "A switch operation tried to replace a file."
-msgstr ""
+msgstr "En växling försökte ersätta en fil."
 
 #: ../libsvn_client/conflicts.c:3013
 msgid "A merge operation tried to edit a file."
-msgstr ""
+msgstr "En sammanslagning försökte ändra en fil."
 
 #: ../libsvn_client/conflicts.c:3015
 msgid "A merge operation tried to add a file."
-msgstr ""
+msgstr "En sammanslagning försökte lägga till en fil."
 
 #: ../libsvn_client/conflicts.c:3017
 msgid "A merge operation tried to delete or move a file."
-msgstr ""
+msgstr "En sammanslagning försökte radera eller flytta en fil."
 
 #: ../libsvn_client/conflicts.c:3020
 msgid "A merge operation tried to replace a file."
-msgstr ""
+msgstr "En sammanslagning försökte ersätta en fil."
 
 #: ../libsvn_client/conflicts.c:3030
-#, fuzzy
 msgid "An update operation tried to change a directory."
-msgstr "Ogiltig operation på aktuell katalog"
+msgstr "En uppdatering försökte ändra en katalog."
 
 #: ../libsvn_client/conflicts.c:3032
-#, fuzzy
 msgid "An update operation tried to add a directory."
-msgstr "Operationen kan ej utföras på en katalog"
+msgstr "En uppdatering försökte lägga till en katalog."
 
 #: ../libsvn_client/conflicts.c:3034
 msgid "An update operation tried to delete or move a directory."
-msgstr ""
+msgstr "En uppdatering försökte radera eller flytta en katalog."
 
 #: ../libsvn_client/conflicts.c:3037
-#, fuzzy
 msgid "An update operation tried to replace a directory."
-msgstr "Operationen kan ej utföras på en katalog"
+msgstr "En uppdatering försökte ersätta en katalog."
 
 #: ../libsvn_client/conflicts.c:3045
-#, fuzzy
 msgid "A switch operation tried to edit a directory."
-msgstr "Operationen kan ej utföras på en katalog"
+msgstr "En växling försökte ändra en katalog."
 
 #: ../libsvn_client/conflicts.c:3047
-#, fuzzy
 msgid "A switch operation tried to add a directory."
-msgstr "Operationen kan ej utföras på en katalog"
+msgstr "En växling försökte lägga till en katalog."
 
 #: ../libsvn_client/conflicts.c:3049
 msgid "A switch operation tried to delete or move a directory."
-msgstr ""
+msgstr "En växling försökte radera eller flytta en katalog."
 
 #: ../libsvn_client/conflicts.c:3052
-#, fuzzy
 msgid "A switch operation tried to replace a directory."
-msgstr "Operationen kan ej utföras på en katalog"
+msgstr "En växling försökte ersätta en katalog."
 
 #: ../libsvn_client/conflicts.c:3060
-#, fuzzy
 msgid "A merge operation tried to edit a directory."
-msgstr "Operationen kan ej utföras på en katalog"
+msgstr "En sammanslagning försökte ändra en katalog."
 
 #: ../libsvn_client/conflicts.c:3062
-#, fuzzy
 msgid "A merge operation tried to add a directory."
-msgstr "Operationen kan ej utföras på en katalog"
+msgstr "En sammanslagning försökte lägga till en katalog."
 
 #: ../libsvn_client/conflicts.c:3064
 msgid "A merge operation tried to delete or move a directory."
-msgstr ""
+msgstr "En sammanslagning försökte radera eller flytta en katalog."
 
 #: ../libsvn_client/conflicts.c:3067
-#, fuzzy
 msgid "A merge operation tried to replace a directory."
-msgstr "Operationen kan ej utföras på en katalog"
+msgstr "En sammanslagning försökte ersätta en katalog."
 
 #: ../libsvn_client/conflicts.c:3078
 msgid "An update operation tried to edit an item."
-msgstr ""
+msgstr "En uppdatering försökte ändra ett objekt."
 
 #: ../libsvn_client/conflicts.c:3080
 msgid "An update operation tried to add an item."
-msgstr ""
+msgstr "En uppdatering försökte lägga till ett objekt."
 
 #: ../libsvn_client/conflicts.c:3082
 msgid "An update operation tried to delete or move an item."
-msgstr ""
+msgstr "En uppdatering försökte radera eller flytta ett objekt."
 
 #: ../libsvn_client/conflicts.c:3085
 msgid "An update operation tried to replace an item."
-msgstr ""
+msgstr "En uppdatering försökte ersätta ett objekt."
 
 #: ../libsvn_client/conflicts.c:3093
 msgid "A switch operation tried to edit an item."
-msgstr ""
+msgstr "En växling försökte ändra ett objekt."
 
 #: ../libsvn_client/conflicts.c:3095
 msgid "A switch operation tried to add an item."
-msgstr ""
+msgstr "En växling försökte lägga till ett objekt."
 
 #: ../libsvn_client/conflicts.c:3097
 msgid "A switch operation tried to delete or move an item."
-msgstr ""
+msgstr "En växling försökte radera eller flytta ett objekt."
 
 #: ../libsvn_client/conflicts.c:3100
 msgid "A switch operation tried to replace an item."
-msgstr ""
+msgstr "En växlig försökte ersätta ett objekt."
 
 #: ../libsvn_client/conflicts.c:3108
 msgid "A merge operation tried to edit an item."
-msgstr ""
+msgstr "En sammanslagning försökte ändra ett objekt."
 
 #: ../libsvn_client/conflicts.c:3110
 msgid "A merge operation tried to add an item."
-msgstr ""
+msgstr "En sammanslagning försökte lägga till ett objekt."
 
 #: ../libsvn_client/conflicts.c:3112
 msgid "A merge operation tried to delete or move an item."
-msgstr ""
+msgstr "En sammanslagning försökte radera eller flytta ett objekt."
 
 #: ../libsvn_client/conflicts.c:3115
 msgid "A merge operation tried to replace an item."
-msgstr ""
+msgstr "En sammanslagning försökte ersätta ett objekt."
 
 #: ../libsvn_client/conflicts.c:3131 ../svn/cl-conflicts.c:212
 msgid "upon update"
@@ -2312,28 +2282,30 @@ msgid "%s, %s %s"
 msgstr "%s, %s %s"
 
 #: ../libsvn_client/conflicts.c:3252
-#, fuzzy, c-format
+#, c-format
 msgid "incoming %s %s"
-msgstr "inkommande %s"
+msgstr "inkommande %s %s"
 
 #: ../libsvn_client/conflicts.c:3355
 #, c-format
 msgid "Directory updated from r%ld to r%ld was replaced with a file by %s in 
r%ld."
-msgstr ""
+msgstr "Katalog uppdaterad från r%ld till r%ld ersattes av en fil av %s i 
r%ld."
 
 #: ../libsvn_client/conflicts.c:3366 ../libsvn_client/conflicts.c:3446
 #: ../libsvn_client/conflicts.c:3700 ../libsvn_client/conflicts.c:3787
 #: ../libsvn_client/conflicts.c:4087 ../libsvn_client/conflicts.c:4155
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "The replaced directory was moved to '^/%s'."
-msgstr "Radering misslyckades: katalogen har ingen post \"%s\""
+msgstr ""
+"%s\n"
+"Den ersatta katalogen flyttades till \"^/%s\"."
 
 #: ../libsvn_client/conflicts.c:3381
 #, c-format
 msgid "File updated from r%ld to r%ld was replaced with a file from another 
line of history by %s in r%ld."
-msgstr ""
+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:3393 ../libsvn_client/conflicts.c:3472
 #: ../libsvn_client/conflicts.c:3729 ../libsvn_client/conflicts.c:3815
@@ -2343,11 +2315,13 @@ msgid ""
 "%s\n"
 "The replaced file was moved to '^/%s'."
 msgstr ""
+"%s\n"
+"Den ersatta filen flyttades till \"^/%s\"."
 
 #: ../libsvn_client/conflicts.c:3407
 #, c-format
 msgid "Item updated from r%ld to r%ld was replaced with a file by %s in r%ld."
-msgstr ""
+msgstr "Objekt uppdaterat från r%ld till r%ld ersattes av en fil av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3417 ../libsvn_client/conflicts.c:3496
 #: ../libsvn_client/conflicts.c:3756 ../libsvn_client/conflicts.c:3842
@@ -2357,96 +2331,98 @@ msgid ""
 "%s\n"
 "The replaced item was moved to '^/%s'."
 msgstr ""
+"%s\n"
+"Det ersatta objektet flyttades till \"^/%s\"."
 
 #: ../libsvn_client/conflicts.c:3434
 #, c-format
 msgid "Directory updated from r%ld to r%ld was replaced with a directory from 
another line of history by %s in r%ld."
-msgstr ""
+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:3461
 #, c-format
 msgid "File updated from r%ld to r%ld was replaced with a directory by %s in 
r%ld."
-msgstr ""
+msgstr "Fil uppdaterad från r%ld till r%ld ersattes av en katalog av %s i 
r%ld."
 
 #: ../libsvn_client/conflicts.c:3486
 #, c-format
 msgid "Item updated from r%ld to r%ld was replaced by %s in r%ld."
-msgstr ""
+msgstr "Objekt uppdaterat från r%ld till r%ld ersattes av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3519
 #, c-format
 msgid "Directory updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
-msgstr ""
+msgstr "Katalog uppdaterad från r%ld till r%ld flyttades till \"^/%s\" av %s i 
r%ld."
 
 #: ../libsvn_client/conflicts.c:3531
 #, c-format
 msgid "Directory updated from r%ld to r%ld was deleted by %s in r%ld."
-msgstr ""
+msgstr "Katalog uppdaterad från r%ld till r%ld raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3547
 #, c-format
 msgid "File updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
-msgstr ""
+msgstr "Fil uppdaterad från r%ld till r%ld flyttades till \"^/%s\" av %s i 
r%ld."
 
 #: ../libsvn_client/conflicts.c:3558
 #, c-format
 msgid "File updated from r%ld to r%ld was deleted by %s in r%ld."
-msgstr ""
+msgstr "Fil uppdaterad från r%ld till r%ld raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3572
 #, c-format
 msgid "Item updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld."
-msgstr ""
+msgstr "Objekt uppdaterat från r%ld till r%ld flyttades till \"^/%s\" av %s i 
r%ld."
 
 #: ../libsvn_client/conflicts.c:3583
 #, c-format
 msgid "Item updated from r%ld to r%ld was deleted by %s in r%ld."
-msgstr ""
+msgstr "Objekt uppdaterat från r%ld till r%ld raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3603
 #, c-format
 msgid "Directory updated backwards from r%ld to r%ld was a file before the 
replacement made by %s in r%ld."
-msgstr ""
+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:3610
 #, c-format
 msgid "File updated backwards from r%ld to r%ld was a file from another line 
of history before the replacement made by %s in r%ld."
-msgstr ""
+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:3617
 #, c-format
 msgid "Item updated backwards from r%ld to r%ld was replaced with a file by %s 
in r%ld."
-msgstr ""
+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:3626
 #, c-format
 msgid "Directory updated backwards from r%ld to r%ld was a directory from 
another line of history before the replacement made by %s in r%ld."
-msgstr ""
+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:3634
 #, c-format
 msgid "File updated backwards from r%ld to r%ld was a directory before the 
replacement made by %s in r%ld."
-msgstr ""
+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:3640
 #, c-format
 msgid "Item updated backwards from r%ld to r%ld was replaced with a directory 
by %s in r%ld."
-msgstr ""
+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:3649
 #, c-format
 msgid "Directory updated backwards from r%ld to r%ld did not exist before it 
was added by %s in r%ld."
-msgstr ""
+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:3656
 #, c-format
 msgid "File updated backwards from r%ld to r%ld did not exist before it was 
added by %s in r%ld."
-msgstr ""
+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:3662
 #, c-format
 msgid "Item updated backwards from r%ld to r%ld did not exist before it was 
added by %s in r%ld."
-msgstr ""
+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:3687
 #, c-format
@@ -2457,6 +2433,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a file by %s in r%ld."
 msgstr ""
+"Katalog växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en fil av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3715
 #, c-format
@@ -2467,6 +2448,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a file from another line of history by %s in r%ld."
 msgstr ""
+"Fil växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en fil från en annan historielinje av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3743 ../libsvn_client/conflicts.c:3986
 #, c-format
@@ -2477,6 +2463,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a file by %s in r%ld."
 msgstr ""
+"Objekt växlat från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en fil av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3773
 #, c-format
@@ -2487,6 +2478,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a directory from another line of history by %s in r%ld."
 msgstr ""
+"Katalog växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en katalog från en annan historielinje av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3802
 #, c-format
@@ -2497,6 +2493,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a directory by %s in r%ld."
 msgstr ""
+"Fil växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en katalog av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3829 ../libsvn_client/conflicts.c:4016
 #, c-format
@@ -2507,6 +2508,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a directory by %s in r%ld."
 msgstr ""
+"Objekt växlat från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en katalog av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3865
 #, c-format
@@ -2517,6 +2523,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was moved to '^/%s' by %s in r%ld."
 msgstr ""
+"Katalog växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"flyttades till \"^/%s\" av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3879
 #, c-format
@@ -2527,6 +2538,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was deleted by %s in r%ld."
 msgstr ""
+"Katalog växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3897
 #, c-format
@@ -2537,6 +2553,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was moved to '^/%s' by %s in r%ld."
 msgstr ""
+"Fil växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"flyttades till \"^/%s\" av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3911
 #, c-format
@@ -2547,6 +2568,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was deleted by %s in r%ld."
 msgstr ""
+"Fil växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3928
 #, c-format
@@ -2557,6 +2583,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was moved to '^/%s' by %s in r%ld."
 msgstr ""
+"Objekt växlat från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"flyttades till \"^/%s\" av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3942
 #, c-format
@@ -2567,6 +2598,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was deleted by %s in r%ld."
 msgstr ""
+"Objekt växlat från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3967 ../libsvn_client/conflicts.c:4007
 #, c-format
@@ -2577,6 +2613,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was a file before the replacement made by %s in r%ld."
 msgstr ""
+"Katalog växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"var en fil före ersättningen gjord av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:3977
 #, c-format
@@ -2587,6 +2628,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was a file from another line of history before the replacement made by %s in 
r%ld."
 msgstr ""
+"Fil växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%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:3997
 #, c-format
@@ -2597,6 +2643,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was a directory from another line of history before the replacement made by 
%s in r%ld."
 msgstr ""
+"Katalog växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%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:4027
 #, c-format
@@ -2607,6 +2658,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "did not exist before it was added by %s in r%ld."
 msgstr ""
+"Katalog växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"fanns inte innan den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4037
 #, c-format
@@ -2617,6 +2673,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "did not exist before it was added by %s in r%ld."
 msgstr ""
+"Fil växlad från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"fanns inte innan den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4046
 #, c-format
@@ -2627,6 +2688,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "did not exist before it was added by %s in r%ld."
 msgstr ""
+"Objekt växlat från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"fanns inte innan det lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4074
 #, c-format
@@ -2637,6 +2703,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a file by %s in r%ld."
 msgstr ""
+"Katalog sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en fil av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4102
 #, c-format
@@ -2647,6 +2718,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a file from another line of history by %s in r%ld."
 msgstr ""
+"Fil sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en fil från en annan historielinje av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4128
 #, c-format
@@ -2657,6 +2733,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a file by %s in r%ld."
 msgstr ""
+"Objekt sammanslaget från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en fil av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4141
 #, c-format
@@ -2667,6 +2748,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a directory from another line of history by %s in r%ld."
 msgstr ""
+"Katalog sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en katalog från en annan historielinje av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4170
 #, c-format
@@ -2677,6 +2763,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a directory by %s in r%ld."
 msgstr ""
+"Fil sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en katalog av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4197
 #, c-format
@@ -2687,6 +2778,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a directory by %s in r%ld."
 msgstr ""
+"Objekt sammanslaget från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en katalog av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4233
 #, c-format
@@ -2697,6 +2793,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was moved to '^/%s' by %s in r%ld."
 msgstr ""
+"Katalog sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"flyttades till \"^/%s\" av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4247
 #, c-format
@@ -2707,6 +2808,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was deleted by %s in r%ld."
 msgstr ""
+"Katalog sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4265
 #, c-format
@@ -2717,6 +2823,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was moved to '^/%s' by %s in r%ld."
 msgstr ""
+"Fil sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"flyttades till \"^/%s\" av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4279
 #, c-format
@@ -2727,6 +2838,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was deleted by %s in r%ld."
 msgstr ""
+"Fil sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4296
 #, c-format
@@ -2737,6 +2853,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was moved to '^/%s' by %s in r%ld."
 msgstr ""
+"Objekt sammanslaget från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"flyttades till \"^/%s\" av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4310
 #, c-format
@@ -2747,6 +2868,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was deleted by %s in r%ld."
 msgstr ""
+"Objekt sammanslaget från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4335 ../libsvn_client/conflicts.c:4374
 #, c-format
@@ -2755,6 +2881,9 @@ msgid ""
 "'^/%s@%ld'\n"
 "to ^/%s@%ld was a file before the replacement made by %s in r%ld."
 msgstr ""
+"Katalog omvänt sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till ^/%s@%ld var en fil före ersättningen gjord av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4344
 #, c-format
@@ -2765,6 +2894,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was a file from another line of history before the replacement made by %s in 
r%ld."
 msgstr ""
+"Fil omvänt sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%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:4353
 #, c-format
@@ -2775,6 +2909,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a file by %s in r%ld."
 msgstr ""
+"Objekt omvänt sammanslaget från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en fil av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4364
 #, c-format
@@ -2783,6 +2922,9 @@ msgid ""
 "'^/%s@%ld'\n"
 "to ^/%s@%ld was a directory from another line of history before the 
replacement made by %s in r%ld."
 msgstr ""
+"Katalog omvänt sammanslagen från\n"
+"\"^/%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:4382
 #, c-format
@@ -2793,6 +2935,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "was replaced with a directory by %s in r%ld."
 msgstr ""
+"Objekt omvänt sammanslaget från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"ersattes av en katalog av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4393
 #, c-format
@@ -2801,6 +2948,9 @@ msgid ""
 "'^/%s@%ld'\n"
 "to ^/%s@%ld did not exist before it was added by %s in r%ld."
 msgstr ""
+"Katalog omvänt sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till ^/%s@%ld fanns inte innan den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4402
 #, c-format
@@ -2811,6 +2961,11 @@ msgid ""
 "'^/%s@%ld'\n"
 "did not exist before it was added by %s in r%ld."
 msgstr ""
+"Fil omvänt sammanslagen från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"fanns inte innan den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:4411
 #, c-format
@@ -2821,51 +2976,56 @@ msgid ""
 "'^/%s@%ld'\n"
 "did not exist before it was added by %s in r%ld."
 msgstr ""
+"Objekt omvänt sammanslaget från\n"
+"\"^/%s@%ld\"\n"
+"till\n"
+"\"^/%s@%ld\"\n"
+"fanns inte innan det lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5263
 #, c-format
 msgid "A new directory appeared during update to r%ld; it was added by %s in 
r%ld and later deleted by %s in r%ld."
-msgstr ""
+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:5270
 #, c-format
 msgid "A new directory appeared during update to r%ld; it was added by %s in 
r%ld."
-msgstr ""
+msgstr "En ny katalog dök upp under uppdatering till r%ld; den lades till av 
%s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5275
 #, c-format
 msgid "A new directory appeared during update to r%ld; it was deleted by %s in 
r%ld."
-msgstr ""
+msgstr "En ny katalog dök upp under uppdatering till r%ld; den raderades av %s 
i r%ld."
 
 #: ../libsvn_client/conflicts.c:5285
 #, c-format
 msgid "A new file appeared during update to r%ld; it was added by %s in r%ld 
and later deleted by %s in r%ld."
-msgstr ""
+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:5292
 #, c-format
 msgid "A new file appeared during update to r%ld; it was added by %s in r%ld."
-msgstr ""
+msgstr "En ny fil dök upp under uppdatering till r%ld; den lades till av %s i 
r%ld."
 
 #: ../libsvn_client/conflicts.c:5297
 #, c-format
 msgid "A new file appeared during update to r%ld; it was deleted by %s in 
r%ld."
-msgstr ""
+msgstr "En ny katalog dök upp under uppdatering till r%ld; den raderades av %s 
i r%ld."
 
 #: ../libsvn_client/conflicts.c:5306
 #, 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 ""
+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:5313
 #, c-format
 msgid "A new item appeared during update to r%ld; it was added by %s in r%ld."
-msgstr ""
+msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det lades till av 
%s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5318
 #, c-format
 msgid "A new item appeared during update to r%ld; it was deleted by %s in 
r%ld."
-msgstr ""
+msgstr "Ett nytt objekt dök upp under uppdatering till r%ld; det raderades av 
%s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5337
 #, c-format
@@ -2874,6 +3034,9 @@ msgid ""
 "'^/%s@%ld'.\n"
 "It was added by %s in r%ld and later deleted by %s in r%ld."
 msgstr ""
+"En ny katalog dök upp under växling till\n"
+"\"^/%s@%ld\".\n"
+"Den lades till av %s i r%ld och raderades senare av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5345
 #, c-format
@@ -2882,6 +3045,9 @@ msgid ""
 "'^/%s@%ld'.\n"
 "It was added by %s in r%ld."
 msgstr ""
+"En ny katalog dök upp under växling till\n"
+"\"^/%s@%ld\".\n"
+"Den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5351
 #, c-format
@@ -2890,6 +3056,9 @@ msgid ""
 "'^/%s@%ld'.\n"
 "It was deleted by %s in r%ld."
 msgstr ""
+"En ny katalog dök upp under växling till\n"
+"\"^/%s@%ld\".\n"
+"Den raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5362
 #, c-format
@@ -2898,6 +3067,9 @@ msgid ""
 "'^/%s@%ld'.\n"
 "It was added by %s in r%ld and later deleted by %s in r%ld."
 msgstr ""
+"En ny fil dök upp under växling till\n"
+"\"^/%s@%ld\".\n"
+"Den lades till av %s i r%ld och raderades senare av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5370
 #, c-format
@@ -2906,6 +3078,9 @@ msgid ""
 "'^/%s@%ld'.\n"
 "It was added by %s in r%ld."
 msgstr ""
+"En ny fil dök upp under växling till\n"
+"\"^/%s@%ld\".\n"
+"Den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5377
 #, c-format
@@ -2914,6 +3089,9 @@ msgid ""
 "'^/%s@%ld'.\n"
 "It was deleted by %s in r%ld."
 msgstr ""
+"En ny fil dök upp under växling till\n"
+"\"^/%s@%ld\".\n"
+"Den raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5388
 #, c-format
@@ -2922,6 +3100,9 @@ msgid ""
 "'^/%s@%ld'.\n"
 "It was added by %s in r%ld and later deleted by %s in r%ld."
 msgstr ""
+"Ett nytt objekt dök upp under växling till\n"
+"\"^/%s@%ld\".\n"
+"Det lades till av %s i r%ld och raderades senare av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5396
 #, c-format
@@ -2930,6 +3111,9 @@ msgid ""
 "'^/%s@%ld'.\n"
 "It was added by %s in r%ld."
 msgstr ""
+"Ett nytt objekt dök upp under växling till\n"
+"\"^/%s@%ld\".\n"
+"Det lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5403
 #, c-format
@@ -2938,6 +3122,9 @@ msgid ""
 "'^/%s@%ld'.\n"
 "It was deleted by %s in r%ld."
 msgstr ""
+"Ett nytt objekt dök upp under växling till\n"
+"\"^/%s@%ld\".\n"
+"Det raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5424
 #, c-format
@@ -2946,6 +3133,9 @@ msgid ""
 "'^/%s:%ld'.\n"
 "It was added by %s in r%ld."
 msgstr ""
+"En ny katalog dök upp under sammanslagning av\n"
+"\"^/%s:%ld\".\n"
+"Den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5430
 #, c-format
@@ -2954,6 +3144,9 @@ msgid ""
 "'^/%s:%ld-%ld'.\n"
 "It was added by %s in r%ld."
 msgstr ""
+"En ny katalog dök upp under sammanslagning av\n"
+"\"^/%s:%ld-%ld\".\n"
+"Den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5440
 #, c-format
@@ -2962,6 +3155,9 @@ msgid ""
 "'^/%s:%ld'.\n"
 "It was added by %s in r%ld."
 msgstr ""
+"En ny fil dök upp under sammanslagning av\n"
+"\"^/%s:%ld\".\n"
+"Den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5446
 #, c-format
@@ -2970,6 +3166,9 @@ msgid ""
 "'^/%s:%ld-%ld'.\n"
 "It was added by %s in r%ld."
 msgstr ""
+"En ny fil dök upp under sammanslagning av\n"
+"\"^/%s:%ld-%ld\".\n"
+"Den lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5455
 #, c-format
@@ -2978,6 +3177,9 @@ msgid ""
 "'^/%s:%ld'.\n"
 "It was added by %s in r%ld."
 msgstr ""
+"Ett nytt objekt dök upp under sammanslagning av\n"
+"\"^/%s:%ld\".\n"
+"Det lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5461
 #, c-format
@@ -2986,6 +3188,9 @@ msgid ""
 "'^/%s:%ld-%ld'.\n"
 "It was added by %s in r%ld."
 msgstr ""
+"Ett nytt objekt dök upp under sammanslagning av\n"
+"\"^/%s:%ld-%ld\".\n"
+"Det lades till av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5481
 #, c-format
@@ -2994,6 +3199,9 @@ msgid ""
 "'^/%s:%ld'.\n"
 "It was deleted by %s in r%ld."
 msgstr ""
+"En ny katalog dök upp under omvänd sammanslagning av\n"
+"\"^/%s:%ld\".\n"
+"Den raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5488
 #, c-format
@@ -3002,6 +3210,9 @@ msgid ""
 "'^/%s:%ld-%ld'.\n"
 "It was deleted by %s in r%ld."
 msgstr ""
+"En ny katalog dök upp under omvänd sammanslagning av\n"
+"\"^/%s:%ld-%ld\".\n"
+"Den raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5500
 #, c-format
@@ -3010,6 +3221,9 @@ msgid ""
 "'^/%s:%ld'.\n"
 "It was deleted by %s in r%ld."
 msgstr ""
+"En ny fil dök upp under omvänd sammanslagning av\n"
+"\"^/%s:%ld\".\n"
+"Den raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5507
 #, c-format
@@ -3018,6 +3232,9 @@ msgid ""
 "'^/%s:%ld-%ld'.\n"
 "It was deleted by %s in r%ld."
 msgstr ""
+"En ny fil dök upp under omvänd sammanslagning av\n"
+"\"^/%s:%ld-%ld\".\n"
+"Den raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5517
 #, c-format
@@ -3026,6 +3243,9 @@ msgid ""
 "'^/%s:%ld'.\n"
 "It was deleted by %s in r%ld."
 msgstr ""
+"Ett nytt objekt dök upp under omvänd sammanslagning av\n"
+"\"^/%s:%ld\".\n"
+"Det raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5524
 #, c-format
@@ -3034,36 +3254,39 @@ msgid ""
 "'^/%s:%ld-%ld'.\n"
 "It was deleted by %s in r%ld."
 msgstr ""
+"Ett nytt objekt dök upp under omvänd sammanslagning av\n"
+"\"^/%s:%ld-%ld\".\n"
+"Det raderades av %s i r%ld."
 
 #: ../libsvn_client/conflicts.c:5835
 #, c-format
 msgid "Changes destined for a directory arrived via the following revisions 
during update from r%ld to r%ld."
-msgstr ""
+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:5841
 #, c-format
 msgid "Changes destined for a file arrived via the following revisions during 
update from r%ld to r%ld"
-msgstr ""
+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:5846
 #, c-format
 msgid "Changes from the following revisions arrived during update from r%ld to 
r%ld"
-msgstr ""
+msgstr "Ändringar från följande revisioner kom under uppdatering från r%ld 
till r%ld"
 
 #: ../libsvn_client/conflicts.c:5854
 #, c-format
 msgid "Changes destined for a directory arrived via the following revisions 
during backwards update from r%ld to r%ld"
-msgstr ""
+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:5861
 #, c-format
 msgid "Changes destined for a file arrived via the following revisions during 
backwards update from r%ld to r%ld"
-msgstr ""
+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:5867
 #, c-format
 msgid "Changes from the following revisions arrived during backwards update 
from r%ld to r%ld"
-msgstr ""
+msgstr "Ändringar från följande revisioner kom under uppdatering bakåt från 
r%ld till r%ld"
 
 #: ../libsvn_client/conflicts.c:5881 ../libsvn_client/conflicts.c:5888
 #, c-format
@@ -3071,6 +3294,8 @@ msgid ""
 "Changes destined for a directory arrived via the following revisions during 
switch to\n"
 "'^/%s@r%ld'"
 msgstr ""
+"Ändringar avsedda för en katalog kom genom följande revisioner under växling 
till\n"
+"\"^/%s@r%ld\""
 
 #: ../libsvn_client/conflicts.c:5894
 #, c-format
@@ -3078,12 +3303,14 @@ msgid ""
 "Changes from the following revisions arrived during switch to\n"
 "'^/%s@r%ld'"
 msgstr ""
+"Ändringar från följande revisioner kom under växling till\n"
+"\"^/%s@r%ld\""
 
 #: ../libsvn_client/conflicts.c:5937 ../libsvn_client/conflicts.c:5951
 #: ../libsvn_client/conflicts.c:5957
 #, c-format
 msgid "%s r%ld by %s%s"
-msgstr ""
+msgstr "%s r%ld av %s%s"
 
 #: ../libsvn_client/conflicts.c:5947
 #, c-format
@@ -3091,6 +3318,8 @@ msgid ""
 "%s\n"
 " [%d revisions omitted for brevity],\n"
 msgstr ""
+"%s\n"
+" [%d revisioner utelämnade],\n"
 
 #: ../libsvn_client/conflicts.c:6016
 #, c-format
@@ -3098,6 +3327,8 @@ msgid ""
 "Changes destined for a directory arrived during merge of\n"
 "'^/%s:%ld'."
 msgstr ""
+"Ändringar avsedda för en katalog kom under sammanslagning av\n"
+"\"^/%s:%ld\"."
 
 #: ../libsvn_client/conflicts.c:6023
 #, c-format
@@ -3105,6 +3336,8 @@ msgid ""
 "Changes destined for a file arrived during merge of\n"
 "'^/%s:%ld'."
 msgstr ""
+"Ändringar avsedda för en fil kom under sammanslagning av\n"
+"\"^/%s:%ld\"."
 
 #: ../libsvn_client/conflicts.c:6029
 #, c-format
@@ -3112,6 +3345,8 @@ msgid ""
 "Changes arrived during merge of\n"
 "'^/%s:%ld'."
 msgstr ""
+"Ändringar kom under sammanslagning av\n"
+"\"^/%s:%ld\"."
 
 #: ../libsvn_client/conflicts.c:6041
 #, c-format
@@ -3119,6 +3354,8 @@ msgid ""
 "Changes destined for a directory arrived via the following revisions during 
merge of\n"
 "'^/%s:%ld-%ld'"
 msgstr ""
+"Ändringar avsedda för en katalog kom genom följande revisioner under 
sammanslagning av\n"
+"\"^/%s:%ld-%ld\""
 
 #: ../libsvn_client/conflicts.c:6048
 #, c-format
@@ -3126,6 +3363,8 @@ msgid ""
 "Changes destined for a file arrived via the following revisions during merge 
of\n"
 "'^/%s:%ld-%ld'"
 msgstr ""
+"Ändringar avsedda för en fil kom genom följande revisioner under 
sammanslagninv av\n"
+"\"^/%s:%ld-%ld\""
 
 #: ../libsvn_client/conflicts.c:6054
 #, c-format
@@ -3133,6 +3372,8 @@ msgid ""
 "Changes from the following revisions arrived during merge of\n"
 "'^/%s:%ld-%ld'"
 msgstr ""
+"Ändringar från följande revisioner kom under sammanslagning av\n"
+"\"^/%s:%ld-%ld\""
 
 #: ../libsvn_client/conflicts.c:6066
 #, c-format
@@ -3140,6 +3381,8 @@ msgid ""
 "Changes destined for a directory arrived during reverse-merge of\n"
 "'^/%s:%ld'."
 msgstr ""
+"Ändringar avsedda för en katalog kom under omvänd sammanslagning av\n"
+"\"^/%s:%ld\"."
 
 #: ../libsvn_client/conflicts.c:6073
 #, c-format
@@ -3147,6 +3390,8 @@ msgid ""
 "Changes destined for a file arrived during reverse-merge of\n"
 "'^/%s:%ld'."
 msgstr ""
+"Ändringar kom under omvänd sammanslagning av\n"
+"\"^/%s:%ld\"."
 
 #: ../libsvn_client/conflicts.c:6079
 #, c-format
@@ -3154,6 +3399,8 @@ msgid ""
 "Changes arrived during reverse-merge of\n"
 "'^/%s:%ld'."
 msgstr ""
+"Ändringar kom under omvänd sammanslagning av\n"
+"\"^/%s:%ld\"."
 
 #: ../libsvn_client/conflicts.c:6091
 #, c-format
@@ -3161,6 +3408,8 @@ msgid ""
 "Changes destined for a directory arrived via the following revisions during 
reverse-merge of\n"
 "'^/%s:%ld-%ld'"
 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:6099
 #, c-format
@@ -3168,6 +3417,8 @@ msgid ""
 "Changes destined for a file arrived via the following revisions during 
reverse-merge of\n"
 "'^/%s:%ld-%ld'"
 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:6107
 #, c-format
@@ -3175,438 +3426,418 @@ msgid ""
 "Changes from the following revisions arrived during reverse-merge of\n"
 "'^/%s:%ld-%ld'"
 msgstr ""
+"Ändringar från följande revisioner kom under omvänd sammanslagning av\n"
+"\"^/%s:%ld-%ld\""
 
 #: ../libsvn_client/conflicts.c:6296
-#, fuzzy, c-format
+#, c-format
 msgid "Tree conflict on '%s' can only be resolved to the current working copy 
state"
-msgstr "Trädkonflikt kan endast lösas till tillståndet \"working\"; \"%s\" ej 
löst"
+msgstr "Trädkonflikt på \"%s\" kan endast lösas till tillståndet i nuvarande 
arbetskopia"
 
 #: ../libsvn_client/conflicts.c:6480 ../libsvn_client/conflicts.c:6486
-#, fuzzy, c-format
+#, 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\" automatiskt"
+msgstr "Kan inte lösa trädkonflikten på \"%s\" (en basnod förväntades men 
hittades inte)"
 
 #: ../libsvn_client/conflicts.c:6491 ../libsvn_client/conflicts.c:6517
 #: ../libsvn_client/conflicts.c:6544 ../libsvn_client/conflicts.c:6567
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected option id '%d'"
-msgstr "Oväntad nodtyp %d för \"%s\""
+msgstr "Oväntad options-ID \"%d\""
 
 #: ../libsvn_client/conflicts.c:6500 ../libsvn_client/conflicts.c:6509
 #, c-format
 msgid "Cannot resolve tree conflict on '%s' (expected base node kind '%s', but 
found '%s')"
-msgstr ""
+msgstr "Kan inte lösa trädkonflikten på \"%s\" (basnodstyp \"%s\" förväntades, 
men \"%s\" hittades)"
 
 #: ../libsvn_client/conflicts.c:6525 ../libsvn_client/conflicts.c:6535
 #, c-format
 msgid "Cannot resolve tree conflict on '%s' (expected base node from 
'^/%s@%ld', but found '^/%s@%ld')"
-msgstr ""
+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:6553 ../libsvn_client/conflicts.c:6561
 #, c-format
 msgid "Cannot resolve tree conflict on '%s' (expected an added item, but the 
item is not added)"
-msgstr ""
+msgstr "Kan inte lösa trädkonflikten på \"%s\" (tillagt objekt förväntades, 
men objektet är inte tillagt)"
 
-#: ../libsvn_client/conflicts.c:6732 ../libsvn_client/conflicts.c:8547
+#: ../libsvn_client/conflicts.c:6731 ../libsvn_client/conflicts.c:8546
 #, c-format
 msgid "If needed, a backup copy of '%s' can be found at '%s'"
-msgstr ""
+msgstr "Vid behov finns en säkerhetskopia av \"%s\" vid \"%s\""
 
-#: ../libsvn_client/conflicts.c:7595
+#: ../libsvn_client/conflicts.c:7594
 #, c-format
 msgid "Conflict resolution option '%d' requires details for tree conflict at 
'%s' to be fetched from the repository"
-msgstr ""
+msgstr "Konfliktlösningsvalet \"%d\" kräver att detaljer om trädkonflikten vid 
\"%s\" hämtas från arkivet"
 
-#: ../libsvn_client/conflicts.c:7619
+#: ../libsvn_client/conflicts.c:7618
 #, c-format
 msgid "Could not determine when '%s' was added the repository"
-msgstr ""
+msgstr "Kunde inte avgöra när \"%s\" lades till arkivet"
 
-#: ../libsvn_client/conflicts.c:7634
+#: ../libsvn_client/conflicts.c:7633
 #, c-format
 msgid "Could not determine when '%s' was deleted from the repository"
-msgstr ""
+msgstr "Kunde inte avgöra när \"%s\" raderades från arkivet"
 
-#: ../libsvn_client/conflicts.c:7923
+#: ../libsvn_client/conflicts.c:7922
 #, c-format
 msgid "Could not determine the revision in which '^/%s' was added to the 
repository.\n"
-msgstr ""
+msgstr "Kunde inte avgöra i vilken revision \"^/%s\" lades till arkivet.\n"
 
-#: ../libsvn_client/conflicts.c:8027
+#: ../libsvn_client/conflicts.c:8026
 #, c-format
 msgid "Conflict resolution option '%d' requires details for tree conflict at 
'%s' to be fetched from the repository."
-msgstr ""
+msgstr "Konfliktlösningsvalet \"%d\" kräver att detaljer om trädkonflikten vid 
\"%s\" hämtas från arkivet."
 
-#: ../libsvn_client/conflicts.c:8044
+#: ../libsvn_client/conflicts.c:8043
 #, c-format
 msgid "Cannot resolve tree conflict on '%s' (expected a copied item, but the 
item is not a copy)"
-msgstr ""
+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:8055
+#: ../libsvn_client/conflicts.c:8054
 #, c-format
 msgid "Could not find the revision in which '%s' was deleted from the 
repository"
-msgstr ""
+msgstr "Kunde inte avgöra i vilken revision \"%s\" raderades från arkivet"
 
-#: ../libsvn_client/conflicts.c:8065
+#: ../libsvn_client/conflicts.c:8064
 #, 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 ""
+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:8078
+#: ../libsvn_client/conflicts.c:8077
 #, 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 ""
+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:8097
+#: ../libsvn_client/conflicts.c:8096
 #, 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 ""
+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:8119
+#: ../libsvn_client/conflicts.c:8118
 #, c-format
 msgid "Cannot resolve tree conflict on '%s' (expected an item copied from 
'^/%s', but the item was copied from '^/%s@%ld')"
-msgstr ""
+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:8144
+#: ../libsvn_client/conflicts.c:8143
 #, c-format
 msgid "Cannot resolve tree conflict on '%s' (expected node kind '%s' but found 
'%s')"
-msgstr ""
+msgstr "Kan inte lösa trädkonflikten på \"%s\" (förväntade nodtyp \"%s\" men 
hittade \"%s\")"
 
-#: ../libsvn_client/conflicts.c:8311 ../libsvn_client/conflicts.c:8594
+#: ../libsvn_client/conflicts.c:8310 ../libsvn_client/conflicts.c:8593
 #, c-format
 msgid "The specified conflict resolution option requires details for tree 
conflict at '%s' to be fetched from the repository first."
-msgstr ""
+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:8318
+#: ../libsvn_client/conflicts.c:8317
 #, c-format
 msgid "Invalid operation code '%d' recorded for conflict at '%s'"
-msgstr ""
+msgstr "Ogiltig operationskod \"%d\" registrerad för konflikten vid \"%s\""
 
-#: ../libsvn_client/conflicts.c:8655
+#: ../libsvn_client/conflicts.c:8654
 #, c-format
 msgid "Cannot resolve tree conflict on '%s' (expected a copied item at '%s', 
but the item is not a copy)"
-msgstr ""
+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:8668
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:8667
+#, c-format
 msgid "Cannot resolve tree conflict on '%s' (could not determine origin of 
'%s')"
-msgstr "Kan inte lösa trädkonflikten på \"%s\" automatiskt"
+msgstr "Kan inte lösa trädkonflikten på \"%s\" (kunde inte avgöra ursprunget 
för \"%s\")"
 
-#: ../libsvn_client/conflicts.c:8688
+#: ../libsvn_client/conflicts.c:8687
 #, c-format
 msgid "Cannot resolve tree conflict on '%s' (could not find common ancestor of 
'^/%s@%ld'  and '^/%s@%ld')"
-msgstr ""
+msgstr "Kan inte lösa trädkonflikten på \"%s\" (kunde inte hitta gemensamt 
ursprung för \"^/%s@%ld\" och \"^/%s@%ld\")"
 
-#: ../libsvn_client/conflicts.c:9044 ../libsvn_client/conflicts.c:9127
-#: ../libsvn_client/conflicts.c:10293
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9042 ../libsvn_client/conflicts.c:9125
+#: ../libsvn_client/conflicts.c:10283
 msgid "Postpone"
-msgstr "lös senare"
+msgstr "Lös senare"
 
-#: ../libsvn_client/conflicts.c:9045 ../libsvn_client/conflicts.c:9128
-#: ../libsvn_client/conflicts.c:10294
+#: ../libsvn_client/conflicts.c:9043 ../libsvn_client/conflicts.c:9126
+#: ../libsvn_client/conflicts.c:10284
 msgid "skip this conflict and leave it unresolved"
-msgstr ""
+msgstr "hoppa över denna konflikt och lämna den olöst"
 
-#: ../libsvn_client/conflicts.c:9054 ../libsvn_client/conflicts.c:9075
-#: ../libsvn_client/conflicts.c:9133
+#: ../libsvn_client/conflicts.c:9052 ../libsvn_client/conflicts.c:9073
+#: ../libsvn_client/conflicts.c:9131
 msgid "Accept base"
-msgstr ""
+msgstr "Godta basen"
 
-#: ../libsvn_client/conflicts.c:9055
+#: ../libsvn_client/conflicts.c:9053
 msgid "discard local and incoming changes for this binary file"
-msgstr ""
+msgstr "släng bort lokala och inkommande ändringar för denna binärfil"
 
-#: ../libsvn_client/conflicts.c:9060 ../libsvn_client/conflicts.c:9081
-#: ../libsvn_client/conflicts.c:9139
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9058 ../libsvn_client/conflicts.c:9079
+#: ../libsvn_client/conflicts.c:9137
 msgid "Accept incoming"
-msgstr "inkommande %s"
+msgstr "Godta inkommande"
 
-#: ../libsvn_client/conflicts.c:9061
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9059
 msgid "accept incoming version of binary file"
-msgstr "godta sammanslagen version av fil"
+msgstr "godta inkommande version av binärfil"
 
-#: ../libsvn_client/conflicts.c:9066 ../libsvn_client/conflicts.c:9105
-#: ../libsvn_client/conflicts.c:9145 ../libsvn_client/conflicts.c:9202
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9064 ../libsvn_client/conflicts.c:9103
+#: ../libsvn_client/conflicts.c:9143 ../libsvn_client/conflicts.c:9200
 msgid "Mark as resolved"
-msgstr "markera som löst"
+msgstr "Markera som löst"
 
-#: ../libsvn_client/conflicts.c:9067
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9065
 msgid "accept binary file as it appears in the working copy"
-msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
+msgstr "godta binärfilen som den är i arbetskopian"
 
-#: ../libsvn_client/conflicts.c:9076
+#: ../libsvn_client/conflicts.c:9074
 msgid "discard local and incoming changes for this file"
-msgstr ""
+msgstr "släng bort lokala och inkommande ändringar för denna fil"
 
-#: ../libsvn_client/conflicts.c:9082
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9080
 msgid "accept incoming version of entire file"
-msgstr "godta sammanslagen version av fil"
+msgstr "godta inkommande version av hela filen"
 
-#: ../libsvn_client/conflicts.c:9087
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9085
 msgid "Reject incoming"
-msgstr "inkommande %s"
+msgstr "Avslå inkommande"
 
-#: ../libsvn_client/conflicts.c:9088
+#: ../libsvn_client/conflicts.c:9086
 msgid "reject all incoming changes for this file"
-msgstr ""
+msgstr "avslå alla inkommande ändringar för denna fil"
 
-#: ../libsvn_client/conflicts.c:9093 ../libsvn_client/conflicts.c:9151
+#: ../libsvn_client/conflicts.c:9091 ../libsvn_client/conflicts.c:9149
 msgid "Accept incoming for conflicts"
-msgstr ""
+msgstr "Godta inkommande för konflikter"
 
-#: ../libsvn_client/conflicts.c:9094
+#: ../libsvn_client/conflicts.c:9092
 msgid "accept changes only where they conflict"
-msgstr ""
+msgstr "godta ändringar bara där konflikter uppstår"
 
-#: ../libsvn_client/conflicts.c:9099 ../libsvn_client/conflicts.c:9157
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9097 ../libsvn_client/conflicts.c:9155
 msgid "Reject conflicts"
-msgstr "Trädkonflikt"
+msgstr "Avslå konflikter"
 
-#: ../libsvn_client/conflicts.c:9100 ../libsvn_client/conflicts.c:9158
+#: ../libsvn_client/conflicts.c:9098 ../libsvn_client/conflicts.c:9156
 msgid "reject changes which conflict and accept the rest"
-msgstr ""
+msgstr "avslå ändringar som orsakar konflikter och godta resten"
 
-#: ../libsvn_client/conflicts.c:9106
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9104
 msgid "accept the file as it appears in the working copy"
-msgstr "Sökvägen \"%s\" finns inte i arbetskopian"
+msgstr "godta filen som den är i arbetskopian"
 
-#: ../libsvn_client/conflicts.c:9134
+#: ../libsvn_client/conflicts.c:9132
 msgid "discard local and incoming changes for this property"
-msgstr ""
+msgstr "släng bort lokala och inkommande ändringar för denna egenskap"
 
-#: ../libsvn_client/conflicts.c:9140
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9138
 msgid "accept incoming version of entire property value"
-msgstr "godta andras version av hela filen (likaså)  [theirs-full]"
+msgstr "godta inkommande version av hela egenskapsvärdet"
 
-#: ../libsvn_client/conflicts.c:9146
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9144
 msgid "accept working copy version of entire property value"
-msgstr "godta andras version av hela filen (likaså)  [theirs-full]"
+msgstr "godta arbetskopians version av hela egenskapsvärdet"
 
-#: ../libsvn_client/conflicts.c:9152
+#: ../libsvn_client/conflicts.c:9150
 msgid "accept incoming changes only where they conflict"
-msgstr ""
+msgstr "godta inkommande ändringar bara där konflikter uppstår"
 
-#: ../libsvn_client/conflicts.c:9163
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9161
 msgid "Accept merged"
-msgstr "vid sammanslagning"
+msgstr "Godta sammanslaget"
 
-#: ../libsvn_client/conflicts.c:9164
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9162
 msgid "accept merged version of property value"
-msgstr "godta redigerad version av egenskap"
+msgstr "godta sammanslagen version av egenskapsvärde"
 
-#: ../libsvn_client/conflicts.c:9203
+#: ../libsvn_client/conflicts.c:9201
 msgid "accept current working copy state"
 msgstr "godta nuvarande tillstånd i arbetskopia"
 
-#: ../libsvn_client/conflicts.c:9230
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9228
 msgid "Update move destination"
-msgstr "utför uppdateringen på målet för flyttningen (rekommenderas)"
+msgstr "Uppdatera flyttmålet"
 
-#: ../libsvn_client/conflicts.c:9231
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9229
 msgid "apply incoming changes to move destination"
-msgstr "utför inkommande uppdatering på målet för flyttningen  [mine-conflict]"
+msgstr "utför inkommande ändringar på flyttmålet"
 
-#: ../libsvn_client/conflicts.c:9265
+#: ../libsvn_client/conflicts.c:9263
 msgid "Update any moved-away children"
-msgstr ""
+msgstr "Uppdatera bortflyttade barn om sådana finns"
 
-#: ../libsvn_client/conflicts.c:9266
+#: ../libsvn_client/conflicts.c:9264
 msgid "prepare for updating moved-away children, if any"
-msgstr ""
+msgstr "förbered för uppdatering av bortflyttade barn, om sådana finns"
 
-#: ../libsvn_client/conflicts.c:9311
+#: ../libsvn_client/conflicts.c:9309
 #, c-format
 msgid "ignore and do not add '^/%s@%ld' here"
-msgstr ""
+msgstr "hoppa över och lägg inte till \"^/%s@%ld\" här"
 
-#: ../libsvn_client/conflicts.c:9319
+#: ../libsvn_client/conflicts.c:9317
 #, c-format
 msgid "replace '^/%s@%ld' with the locally added file"
-msgstr ""
+msgstr "ersätt \"^/%s@%ld\" med den lokalt tillagda filen"
 
-#: ../libsvn_client/conflicts.c:9324
+#: ../libsvn_client/conflicts.c:9322
 #, c-format
 msgid "replace '^/%s@%ld' with the locally added directory"
-msgstr ""
+msgstr "ersätt \"^/%s@%ld\" med den lokalt tillagda katalogen"
 
-#: ../libsvn_client/conflicts.c:9330
+#: ../libsvn_client/conflicts.c:9328
 #, c-format
 msgid "replace '^/%s@%ld' with the locally added item"
-msgstr ""
+msgstr "ersätt \"^/%s@%ld\" med det lokalt tillagda objektet"
 
-#: ../libsvn_client/conflicts.c:9335
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:9333
+#, c-format
 msgid "unexpected operation code '%d'"
-msgstr "Oväntad nodtyp %d för \"%s\""
+msgstr "oväntad operationskod \"%d\""
 
-#: ../libsvn_client/conflicts.c:9339
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9337
 msgid "Ignore incoming addition"
-msgstr "inkommande tillägg"
+msgstr "Hoppa över inkommande tillägg"
 
-#: ../libsvn_client/conflicts.c:9385 ../libsvn_client/conflicts.c:9510
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:9383 ../libsvn_client/conflicts.c:9508
+#, c-format
 msgid "merge '^/%s@%ld' into '%s'"
-msgstr "--- Sammanslagning av r%ld i \"%s\":\n"
+msgstr "slå samman \"^/%s@%ld\" in i \"%s\""
 
-#: ../libsvn_client/conflicts.c:9393 ../libsvn_client/conflicts.c:9518
+#: ../libsvn_client/conflicts.c:9391 ../libsvn_client/conflicts.c:9516
 #, c-format
 msgid "merge local '%s' and '^/%s@%ld'"
-msgstr ""
+msgstr "slå samman lokala \"%s\" och \"^/%s@%ld\""
 
-#: ../libsvn_client/conflicts.c:9403
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9401
 msgid "Merge the files"
-msgstr "Djup: \"files\"\n"
+msgstr "Slå samman filerna"
 
-#: ../libsvn_client/conflicts.c:9452
+#: ../libsvn_client/conflicts.c:9450
 #, c-format
 msgid "delete '%s', copy '^/%s@%ld' here, and merge the files"
-msgstr ""
+msgstr "radera \"%s\", kopiera hit \"^/%s@%ld\", och slå samman filerna"
 
-#: ../libsvn_client/conflicts.c:9462 ../libsvn_client/conflicts.c:9640
+#: ../libsvn_client/conflicts.c:9460 ../libsvn_client/conflicts.c:9638
 msgid "Replace and merge"
-msgstr ""
+msgstr "Ersätt och slå samman"
 
-#: ../libsvn_client/conflicts.c:9527
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9525
 msgid "Merge the directories"
-msgstr "skapa mellanliggande kataloger"
+msgstr "Slå samman katalogerna"
 
-#: ../libsvn_client/conflicts.c:9574
+#: ../libsvn_client/conflicts.c:9572
 #, c-format
 msgid "delete '%s' and copy '^/%s@%ld' here"
-msgstr ""
+msgstr "radera \"%s\" och kopiera hit \"^/%s@%ld\""
 
-#: ../libsvn_client/conflicts.c:9583
+#: ../libsvn_client/conflicts.c:9581
 msgid "Delete my directory and replace it with incoming directory"
-msgstr ""
+msgstr "Radera min katalog och ersätt den med inkommande katalog"
 
-#: ../libsvn_client/conflicts.c:9630
+#: ../libsvn_client/conflicts.c:9628
 #, c-format
 msgid "delete '%s', copy '^/%s@%ld' here, and merge the directories"
-msgstr ""
+msgstr "radera \"%s\", kopiera hit \"^/%s@%ld\", och slå samman katalogerna"
 
-#: ../libsvn_client/conflicts.c:9710
+#: ../libsvn_client/conflicts.c:9706
 #, c-format
 msgid "ignore the deletion of '^/%s@%ld'"
-msgstr ""
+msgstr "hoppa över raderingen av \"^/%s@%ld\""
 
-#: ../libsvn_client/conflicts.c:9715
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9711
 msgid "Ignore incoming deletion"
-msgstr "inkommande radering"
+msgstr "Hoppa över inkommande radering"
 
-#: ../libsvn_client/conflicts.c:9768
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:9761
+#, c-format
 msgid "accept the deletion of '%s'"
-msgstr "godta sammanslagen version av fil"
+msgstr "godta borttagningen av \"%s\""
 
-#: ../libsvn_client/conflicts.c:9775
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9768
 msgid "Accept incoming deletion"
-msgstr "inkommande radering"
+msgstr "Godta inkommande radering"
 
-#: ../libsvn_client/conflicts.c:9814
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:9807
+#, c-format
 msgid "move '%s' to '%s' and merge"
-msgstr "Kan inte flytta \"%s\" till \"%s\""
+msgstr "flytta \"%s\" till \"%s\" och slå samman"
 
-#: ../libsvn_client/conflicts.c:9824
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:9817
+#, c-format
 msgid "move and merge local changes from '%s' into '%s'"
-msgstr "Kan inte skapa teckenkonverterare från \"%s\" till \"%s\""
+msgstr "flytta och slå samman lokala ändringar från \"%s\" till \"%s\""
 
-#: ../libsvn_client/conflicts.c:9885 ../libsvn_client/conflicts.c:9945
-#, fuzzy
+#: ../libsvn_client/conflicts.c:9878 ../libsvn_client/conflicts.c:9935
 msgid "Move and merge"
-msgstr "vid sammanslagning"
+msgstr "Flytta och slå samman"
 
-#: ../libsvn_client/conflicts.c:10029
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:10019
+#, c-format
 msgid "apply changes to move destination '%s'"
-msgstr "utför uppdateringen på målet för flyttningen (rekommenderas)"
+msgstr "utför ändringar på flyttmålet \"%s\""
 
-#: ../libsvn_client/conflicts.c:10038
-#, fuzzy
+#: ../libsvn_client/conflicts.c:10028
 msgid "Apply to move destination"
-msgstr "utför uppdateringen på målet för flyttningen (rekommenderas)"
+msgstr "Utför ändringar på flyttmålet"
 
-#: ../libsvn_client/conflicts.c:10071 ../libsvn_client/conflicts.c:10199
+#: ../libsvn_client/conflicts.c:10061 ../libsvn_client/conflicts.c:10189
 #, 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 ""
+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:10124 ../libsvn_client/conflicts.c:10247
+#: ../libsvn_client/conflicts.c:10114 ../libsvn_client/conflicts.c:10237
 #, c-format
 msgid "Setting a move target requires details for tree conflict at '%s' to be 
fetched from the repository first"
-msgstr ""
+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:10133 ../libsvn_client/conflicts.c:10260
+#: ../libsvn_client/conflicts.c:10123 ../libsvn_client/conflicts.c:10250
 #, c-format
 msgid "Index '%d' is out of bounds of the possible move target list for '%s'"
-msgstr ""
+msgstr "Index \"%d\" är utanför listan av möjliga flyttmål för \"%s\""
 
-#: ../libsvn_client/conflicts.c:10170
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:10160
+#, c-format
 msgid "Repository path '%s' not found in list of possible move targets for 
'%s'"
-msgstr "Arkivet \"%s\" finns inte i databasen"
+msgstr "Arkivsökvägen \"%s\" fanns inte i listan av möjliga flyttmål för 
\"%s\""
 
-#: ../libsvn_client/conflicts.c:10477 ../libsvn_client/conflicts.c:10526
-#: ../libsvn_client/conflicts.c:10579
+#: ../libsvn_client/conflicts.c:10467 ../libsvn_client/conflicts.c:10516
+#: ../libsvn_client/conflicts.c:10569
 #, c-format
 msgid "Inapplicable conflict resolution option given for conflicted path '%s'"
-msgstr ""
+msgstr "Ej tillämpbart konfliktlösningsval angivet för konfliktsökväg \"%s\""
 
-#: ../libsvn_client/conflicts.c:10799
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:10789
+#, c-format
 msgid "Property '%s' is not in conflict."
-msgstr "\"%s\" är inte i konflikt"
+msgstr "Egenskapen \"%s\" är inte i konflikt"
 
-#: ../libsvn_client/conflicts.c:11189 ../libsvn_wc/conflicts.c:3327
-#, fuzzy, c-format
+#: ../libsvn_client/conflicts.c:11179 ../libsvn_wc/conflicts.c:3292
+#, c-format
 msgid "Unable to resolve pending conflict on '%s'"
-msgstr "Kan inte lösa trädkonflikten på \"%s\" automatiskt"
+msgstr "Kan inte lösa väntande konflikt på \"%s\""
 
 #: ../libsvn_client/copy.c:295
 #, c-format
 msgid "%s property defined at '%s' is using an unsupported syntax"
-msgstr ""
+msgstr "Egenskapen %s definierad i \"%s\" använder felaktig syntax"
 
 #: ../libsvn_client/copy.c:460
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot pin external '%s' defined in %s at '%s' because it is not 
checked out in the working copy at '%s'"
-msgstr "Kan inte skapa en extern fil definierad på \"%s\" i arbetskopian 
\"%s\""
+msgstr "Kan inte fixera externa \"%s\" definierad i %s i \"%s\" eftersom den 
inte är utcheckad i arbetskopian i \"%s\""
 
 #: ../libsvn_client/copy.c:485
 #, c-format
 msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' has 
switched subtrees (switches cannot be represented in %s)"
-msgstr ""
+msgstr "Kan inte fixera externa \"%s\" definierad i %s i \"%s\" eftersom 
\"%s\" har växlade delträd (växlingar kan inte representeras i %s)"
 
 #: ../libsvn_client/copy.c:504
 #, c-format
 msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' has local 
modifications (local modifications cannot be represented in %s)"
-msgstr ""
+msgstr "Kan inte fixera externa \"%s\" definierad i %s i \"%s\" eftersom 
\"%s\" har lokala ändringar (lokala ändringar kan inte representeras i %s)"
 
 #: ../libsvn_client/copy.c:522
 #, c-format
 msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' is a 
mixed-revision working copy (mixed-revisions cannot be represented in %s)"
-msgstr ""
+msgstr "Kan inte fixera externa \"%s\" definierad i %s i \"%s\" eftersom 
\"%s\" är en arbetskopia med blandade versioner (blandade versioner kan inte 
representeras i %s)"
 
 #: ../libsvn_client/copy.c:985
 #, c-format
@@ -3627,9 +3858,9 @@ msgid "Path '%s' already exists as unver
 msgstr "Sökvägen \"%s\" finns redan men är ej versionshanterad"
 
 #: ../libsvn_client/copy.c:1071
-#, fuzzy, c-format
+#, c-format
 msgid "Directory '%s' is not under version control"
-msgstr "\"%s\" är inte versionshanterad"
+msgstr "Katalogen \"%s\" är inte versionshanterad"
 
 #: ../libsvn_client/copy.c:1073 ../libsvn_client/copy.c:1082
 #: ../libsvn_client/copy.c:1092 ../libsvn_client/copy.c:2748
@@ -3712,7 +3943,7 @@ msgstr "Sökvägen \"%s\" finns inte i a
 #: ../libsvn_fs_x/dag.c:904 ../libsvn_ra_serf/commit.c:2229
 #: ../libsvn_ra_svn/client.c:1506 ../libsvn_wc/diff_editor.c:2109
 #: ../libsvn_wc/diff_editor.c:2195 ../libsvn_wc/externals.c:711
-#: ../libsvn_wc/update_editor.c:4239
+#: ../libsvn_wc/update_editor.c:4228
 #, c-format

[... 8600 lines stripped ...]

Reply via email to