subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1035869 [15/19] - in /subversion/branches/performance: ./ build/ build/generator/ build/generator/templates/ build/win32/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/j...
Date Wed, 17 Nov 2010 00:09:55 GMT
Modified: subversion/branches/performance/subversion/po/sv.po
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/po/sv.po?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/po/sv.po [UTF-8] (original)
+++ subversion/branches/performance/subversion/po/sv.po [UTF-8] Wed Nov 17 00:09:50 2010
@@ -56,1317 +56,1817 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.7\n"
-"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-"POT-Creation-Date: 2007-05-25 20:39+0800\n"
+"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
+"POT-Creation-Date: 2010-11-12 08:49-0600\n"
 "PO-Revision-Date: 2006-10-25 09:19+0200\n"
 "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: include/svn_error_codes.h:154
+#. Constructing nice error messages for roots.
+#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
+#. for PATH in ROOT. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:68
+#, c-format
+msgid "File not found: transaction '%s', path '%s'"
+msgstr "Filen finns inte: transaktion \"%s\", sökväg \"%s\""
+
+#: ../include/private/svn_fs_util.h:73
+#, c-format
+msgid "File not found: revision %ld, path '%s'"
+msgstr "Filen finns inte: revision %ld, sökväg \"%s\""
+
+#. Build a detailed `file already exists' message for PATH in ROOT.
+#. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:84
+#, c-format
+msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
+msgstr "Filen finns redan: filsystem \"%s\", transaktion \"%s\", sökväg \"%s\""
+
+#: ../include/private/svn_fs_util.h:89
+#, c-format
+msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
+msgstr "Filen finns redan: filsystem \"%s\", revision %ld, sökväg \"%s\""
+
+#. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:97
+msgid "Root object must be a transaction root"
+msgstr "Rotobjektet måste vara en transaktionsrot"
+
+#. SVN_FS__ERR_NOT_MUTABLE: the caller attempted to change a node
+#. outside of a transaction. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:104
+#, c-format
+msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
+msgstr "Filen får ej ändras: filsystem \"%s\", revision %ld, sökväg \"%s\""
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:111
+#, c-format
+msgid "'%s' is not a directory in filesystem '%s'"
+msgstr "\"%s\" är ingen katalog i filsystemet \"%s\""
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:118
+#, c-format
+msgid "'%s' is not a file in filesystem '%s'"
+msgstr "\"%s\" är ingen fil i filsystemet \"%s\""
+
+#. FS is of type "svn fs_t *", LOCK is of type "svn_lock_t *".
+#: ../include/private/svn_fs_util.h:126
+#, c-format
+msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
+msgstr "Sökvägen \"%s\" är redan låst av användaren \"%s\" i filsystemet \"%s\""
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:133
+#, c-format
+msgid "No lock on path '%s' in filesystem '%s'"
+msgstr "Inget lås på sökvägen \"%s\" i filsystemet \"%s\""
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:140
+#, fuzzy, c-format
+msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
+msgstr "Låset har gått ut: låsidentifierare \"%s\" i filsystemet \"%s\""
+
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:147
+#, c-format
+msgid "No username is currently associated with filesystem '%s'"
+msgstr "Inget användarnamn är kopplat till filsystemet \"%s\""
+
+#. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose
+#. LOCK_OWNER doesn't match the USERNAME associated with FS.
+#. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:156
+#, c-format
+msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
+msgstr "Användaren \"%s\" försöker använda ett lås som ägs av \"%s\" i filsystemet \"%s\""
+
+#: ../include/svn_error_codes.h:160
 msgid "Bad parent pool passed to svn_make_pool()"
 msgstr "Felaktig föräldrapool skickad till svn_make_pool()"
 
-#: include/svn_error_codes.h:158
+#: ../include/svn_error_codes.h:164
 msgid "Bogus filename"
 msgstr "Felaktigt filnamn"
 
-#: include/svn_error_codes.h:162
+#: ../include/svn_error_codes.h:168
 msgid "Bogus URL"
 msgstr "Felaktig URL"
 
-#: include/svn_error_codes.h:166
+#: ../include/svn_error_codes.h:172
 msgid "Bogus date"
 msgstr "Felaktigt datum"
 
-#: include/svn_error_codes.h:170
+#: ../include/svn_error_codes.h:176
 msgid "Bogus mime-type"
 msgstr "Felaktig mime-typ"
 
-#: include/svn_error_codes.h:176
+#: ../include/svn_error_codes.h:186
+msgid "Wrong or unexpected property value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:190
 msgid "Version file format not correct"
 msgstr "Felaktigt format på versionsfil"
 
-#: include/svn_error_codes.h:182
+#: ../include/svn_error_codes.h:194
+#, fuzzy
+msgid "Path is not an immediate child of the specified directory"
+msgstr "Sökvägen är ingen katalog i en arbetskopia"
+
+#: ../include/svn_error_codes.h:198
+#, fuzzy
+msgid "Bogus UUID"
+msgstr "Felaktig URL"
+
+#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:887
+msgid "Invalid configuration value"
+msgstr "Ogiltigt konfigurationsvärde"
+
+#: ../include/svn_error_codes.h:207
+#, fuzzy
+msgid "Bogus server specification"
+msgstr "Revisionsspecifikation saknas"
+
+#: ../include/svn_error_codes.h:211
+#, fuzzy
+msgid "Unsupported checksum type"
+msgstr "Arkivversionen stöds ej"
+
+#: ../include/svn_error_codes.h:215
+#, fuzzy
+msgid "Invalid character in hex checksum"
+msgstr "Ogiltig slutrevision %ld"
+
+#: ../include/svn_error_codes.h:220
+#, fuzzy
+msgid "Unknown string value of token"
+msgstr "Okänd statusindikering för lock-kommandot"
+
+#: ../include/svn_error_codes.h:226
 msgid "No such XML tag attribute"
 msgstr "XML-attribut saknas"
 
-#: include/svn_error_codes.h:186
+#: ../include/svn_error_codes.h:230
 msgid "<delta-pkg> is missing ancestry"
 msgstr "<delta-pkg> saknar ursprung"
 
-#: include/svn_error_codes.h:190
+#: ../include/svn_error_codes.h:234
 msgid "Unrecognized binary data encoding; can't decode"
 msgstr "Okänd kodning av binärdata; kan inte avkoda"
 
-#: include/svn_error_codes.h:194
+#: ../include/svn_error_codes.h:238
 msgid "XML data was not well-formed"
 msgstr "XML var inte välformad"
 
-#: include/svn_error_codes.h:198
+#: ../include/svn_error_codes.h:242
 msgid "Data cannot be safely XML-escaped"
 msgstr "Data kan inte skyddas för lagring som XML"
 
-#: include/svn_error_codes.h:204
+#: ../include/svn_error_codes.h:248
 msgid "Inconsistent line ending style"
 msgstr "Inkonsekventa radslutstecken"
 
-#: include/svn_error_codes.h:208
+#: ../include/svn_error_codes.h:252
 msgid "Unrecognized line ending style"
 msgstr "Okänt sätt att markera radslut"
 
-#: include/svn_error_codes.h:213
+#: ../include/svn_error_codes.h:257
 msgid "Line endings other than expected"
 msgstr "Andra radslutstecken än väntat"
 
-#: include/svn_error_codes.h:217
+#: ../include/svn_error_codes.h:261
 msgid "Ran out of unique names"
 msgstr "Kunde inte generera fler unika namn"
 
-#: include/svn_error_codes.h:222
+#: ../include/svn_error_codes.h:266
 msgid "Framing error in pipe protocol"
 msgstr "Ramfel i rörprotokoll"
 
-#: include/svn_error_codes.h:227
+#: ../include/svn_error_codes.h:271
 msgid "Read error in pipe"
 msgstr "Läsfel i rör"
 
-#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:299
-#: libsvn_subr/cmdline.c:316 svn/util.c:758
+#: ../include/svn_error_codes.h:275 ../libsvn_subr/cmdline.c:341
+#: ../libsvn_subr/cmdline.c:358 ../svn/util.c:923 ../svnlook/main.c:1802
 #, c-format
 msgid "Write error"
 msgstr "Fel vid skrivning"
 
-#: include/svn_error_codes.h:237
+#: ../include/svn_error_codes.h:281
 msgid "Unexpected EOF on stream"
 msgstr "Oväntat filslut i ström"
 
-#: include/svn_error_codes.h:241
+#: ../include/svn_error_codes.h:285
 msgid "Malformed stream data"
 msgstr "Felaktig data i ström"
 
-#: include/svn_error_codes.h:245
+#: ../include/svn_error_codes.h:289
 msgid "Unrecognized stream data"
 msgstr "Okänd data i ström"
 
-#: include/svn_error_codes.h:251
+#: ../include/svn_error_codes.h:294
+#, fuzzy
+msgid "Stream doesn't support seeking"
+msgstr "Servern stöder ej lock-kommandot"
+
+#: ../include/svn_error_codes.h:300
 msgid "Unknown svn_node_kind"
 msgstr "Okänd svn_node_kind"
 
-#: include/svn_error_codes.h:255
+#: ../include/svn_error_codes.h:304
 msgid "Unexpected node kind found"
 msgstr "Oväntad nodtyp funnen"
 
-#: include/svn_error_codes.h:261
+#: ../include/svn_error_codes.h:310
 msgid "Can't find an entry"
 msgstr "Kan inte hitta post"
 
-#: include/svn_error_codes.h:267
+#: ../include/svn_error_codes.h:316
 msgid "Entry already exists"
 msgstr "Posten finns redan"
 
-#: include/svn_error_codes.h:271
+#: ../include/svn_error_codes.h:320
 msgid "Entry has no revision"
 msgstr "Posten saknar revision"
 
-#: include/svn_error_codes.h:275
+#: ../include/svn_error_codes.h:324
 msgid "Entry has no URL"
 msgstr "Posten saknar URL"
 
-#: include/svn_error_codes.h:279
+#: ../include/svn_error_codes.h:328
 msgid "Entry has an invalid attribute"
 msgstr "Ogiltigt attribut i post"
 
-#: include/svn_error_codes.h:285
+#: ../include/svn_error_codes.h:332
+msgid "Can't create an entry for a forbidden name"
+msgstr ""
+
+#: ../include/svn_error_codes.h:338
 msgid "Obstructed update"
 msgstr "Blockerad uppdatering"
 
-#: include/svn_error_codes.h:290
+#: ../include/svn_error_codes.h:343
 msgid "Mismatch popping the WC unwind stack"
 msgstr "Fel vid upprullning av arbetskopiestacken"
 
-#: include/svn_error_codes.h:295
+#: ../include/svn_error_codes.h:348
 msgid "Attempt to pop empty WC unwind stack"
 msgstr "Försök att rulla upp tom arbetskopiestack"
 
-#: include/svn_error_codes.h:300
+#: ../include/svn_error_codes.h:353
 msgid "Attempt to unlock with non-empty unwind stack"
 msgstr "Försök att låsa upp icke-tom upprullningsstack"
 
-#: include/svn_error_codes.h:304
+#: ../include/svn_error_codes.h:357
 msgid "Attempted to lock an already-locked dir"
 msgstr "Försök att låsa en katalog som redan var låst"
 
-#: include/svn_error_codes.h:308
+#: ../include/svn_error_codes.h:361
 msgid "Working copy not locked; this is probably a bug, please report"
-msgstr ""
-"Arbetskopian är inte låst; detta är troligen en bugg, vänligen rapportera den"
+msgstr "Arbetskopian är inte låst; detta är troligen en bugg, vänligen rapportera den"
 
-#: include/svn_error_codes.h:313
+#: ../include/svn_error_codes.h:366
 msgid "Invalid lock"
 msgstr "Ogiltigt lås"
 
-#: include/svn_error_codes.h:317
+#: ../include/svn_error_codes.h:373
 msgid "Path is not a working copy directory"
 msgstr "Sökvägen är ingen katalog i en arbetskopia"
 
-#: include/svn_error_codes.h:321
+#: ../include/svn_error_codes.h:381
 msgid "Path is not a working copy file"
 msgstr "Sökväg är inte en fil i en arbetskopia"
 
-#: include/svn_error_codes.h:325
+#: ../include/svn_error_codes.h:385
 msgid "Problem running log"
 msgstr "Problem vid körning av logg"
 
-#: include/svn_error_codes.h:329
+#: ../include/svn_error_codes.h:389
 msgid "Can't find a working copy path"
 msgstr "Kan inte hitta sökväg till arbetskopia"
 
-#: include/svn_error_codes.h:333
+#: ../include/svn_error_codes.h:393
 msgid "Working copy is not up-to-date"
 msgstr "Arbetskopian är inaktuell"
 
-#: include/svn_error_codes.h:337
+#: ../include/svn_error_codes.h:397
 msgid "Left locally modified or unversioned files"
 msgstr "Lämnade kvar lokalt ändrade eller icke versionshanterade filer"
 
-#: include/svn_error_codes.h:341
+#: ../include/svn_error_codes.h:401
 msgid "Unmergeable scheduling requested on an entry"
 msgstr "Schemaläggning som ej kan slås samman begärd på post"
 
-#: include/svn_error_codes.h:345
+#: ../include/svn_error_codes.h:405
 msgid "Found a working copy path"
 msgstr "Hittade sökväg till arbetskopia"
 
-#: include/svn_error_codes.h:349
+#: ../include/svn_error_codes.h:409
 msgid "A conflict in the working copy obstructs the current operation"
 msgstr "En konflikt i arbetskopian blockerar operationen"
 
-#: include/svn_error_codes.h:353
+#: ../include/svn_error_codes.h:413
 msgid "Working copy is corrupt"
 msgstr "Förstörd arbetskopia"
 
-#: include/svn_error_codes.h:357
+#: ../include/svn_error_codes.h:417
 msgid "Working copy text base is corrupt"
 msgstr "Förstörd textbas i arbetskopia"
 
-#: include/svn_error_codes.h:361
+#: ../include/svn_error_codes.h:421
 msgid "Cannot change node kind"
 msgstr "Kan inte ändra nodtyp"
 
-#: include/svn_error_codes.h:365
+#: ../include/svn_error_codes.h:425
 msgid "Invalid operation on the current working directory"
 msgstr "Ogiltig operation på aktuell katalog"
 
-#: include/svn_error_codes.h:369
+#: ../include/svn_error_codes.h:429
 msgid "Problem on first log entry in a working copy"
 msgstr "Problem med första loggposten i arbetskopia"
 
-#: include/svn_error_codes.h:373
+#: ../include/svn_error_codes.h:433
 msgid "Unsupported working copy format"
 msgstr "Formatet på arbetskopian stöds ej"
 
-#: include/svn_error_codes.h:377
+#: ../include/svn_error_codes.h:437
 msgid "Path syntax not supported in this context"
 msgstr "Sökvägssyntax stöds ej i detta sammanhang"
 
-#: include/svn_error_codes.h:382
+#: ../include/svn_error_codes.h:442
 msgid "Invalid schedule"
 msgstr "Ogiltig schemaläggning"
 
-#: include/svn_error_codes.h:387
+#: ../include/svn_error_codes.h:447
 msgid "Invalid relocation"
 msgstr "Ogiltig omlokalisering"
 
-#: include/svn_error_codes.h:392
+#: ../include/svn_error_codes.h:452
 msgid "Invalid switch"
 msgstr "Ogiltig flagga"
 
-#: include/svn_error_codes.h:397
+#: ../include/svn_error_codes.h:457
 #, fuzzy
 msgid "Changelist doesn't match"
 msgstr "Ändringslista: %s\n"
 
-#: include/svn_error_codes.h:403
+#: ../include/svn_error_codes.h:462
+#, fuzzy
+msgid "Conflict resolution failed"
+msgstr "Kunde inte skapa arkiv"
+
+#: ../include/svn_error_codes.h:466
+#, fuzzy
+msgid "Failed to locate 'copyfrom' path in working copy"
+msgstr "Sökväg är inte en fil i en arbetskopia"
+
+#: ../include/svn_error_codes.h:473
+msgid "Moving a path from one changelist to another"
+msgstr ""
+
+#: ../include/svn_error_codes.h:478
+#, fuzzy
+msgid "Cannot delete a file external"
+msgstr "Kan inte erhålla filnamn"
+
+#: ../include/svn_error_codes.h:483
+#, fuzzy
+msgid "Cannot move a file external"
+msgstr "Kan inte flytta sökvägen \"%s\" till sig själv"
+
+#: ../include/svn_error_codes.h:488
+msgid "Something's amiss with the wc sqlite database"
+msgstr ""
+
+#: ../include/svn_error_codes.h:493
+#, fuzzy
+msgid "The working copy is missing"
+msgstr "Förstörd arbetskopia"
+
+#: ../include/svn_error_codes.h:498
+#, fuzzy
+msgid "The specified node is not a symlink"
+msgstr "Angiven transaktion går ej att ändra"
+
+#: ../include/svn_error_codes.h:503
+#, fuzzy
+msgid "The specified path has an unexpected status"
+msgstr "Den angivna diff-flaggan stöds ej"
+
+#: ../include/svn_error_codes.h:508
+msgid "The working copy needs to be upgraded"
+msgstr ""
+
+#: ../include/svn_error_codes.h:513
+#, fuzzy
+msgid "Previous operation was interrupted; run 'svn cleanup'"
+msgstr "Operationen avbröts"
+
+#: ../include/svn_error_codes.h:518
+msgid "This operation can not be performed with just this depth."
+msgstr ""
+
+#: ../include/svn_error_codes.h:524
 msgid "General filesystem error"
 msgstr "Allmänt filsystemsfel"
 
-#: include/svn_error_codes.h:407
+#: ../include/svn_error_codes.h:528
 msgid "Error closing filesystem"
 msgstr "Fel vid stängning av filsystem"
 
-#: include/svn_error_codes.h:411
+#: ../include/svn_error_codes.h:532
 msgid "Filesystem is already open"
 msgstr "Filsystemet är redan öppet"
 
-#: include/svn_error_codes.h:415
+#: ../include/svn_error_codes.h:536
 msgid "Filesystem is not open"
 msgstr "Filsystemet är ej öppet"
 
-#: include/svn_error_codes.h:419
+#: ../include/svn_error_codes.h:540
 msgid "Filesystem is corrupt"
 msgstr "Förstört filsystem"
 
-#: include/svn_error_codes.h:423
+#: ../include/svn_error_codes.h:544
 msgid "Invalid filesystem path syntax"
 msgstr "Ogiltig syntax för sökväg i filsystem"
 
-#: include/svn_error_codes.h:427
+#: ../include/svn_error_codes.h:548
 msgid "Invalid filesystem revision number"
 msgstr "Ogiltigt revisionsnummer för filsystem"
 
-#: include/svn_error_codes.h:431
+#: ../include/svn_error_codes.h:552
 msgid "Invalid filesystem transaction name"
 msgstr "Ogiltigt transaktionsnamn för filsystem"
 
-#: include/svn_error_codes.h:435
+#: ../include/svn_error_codes.h:556
 msgid "Filesystem directory has no such entry"
 msgstr "Katalog i filsystem saknar post med det namnet"
 
-#: include/svn_error_codes.h:439
+#: ../include/svn_error_codes.h:560
 msgid "Filesystem has no such representation"
 msgstr "Representation saknas i filsystem"
 
-#: include/svn_error_codes.h:443
+#: ../include/svn_error_codes.h:564
 msgid "Filesystem has no such string"
 msgstr "Sträng saknas i filsystem"
 
-#: include/svn_error_codes.h:447
+#: ../include/svn_error_codes.h:568
 msgid "Filesystem has no such copy"
 msgstr "Kopia saknas i filsystem"
 
-#: include/svn_error_codes.h:451
+#: ../include/svn_error_codes.h:572
 msgid "The specified transaction is not mutable"
 msgstr "Angiven transaktion går ej att ändra"
 
-#: include/svn_error_codes.h:455
+#: ../include/svn_error_codes.h:576
 msgid "Filesystem has no item"
 msgstr "Filsystem saknar objekt"
 
-#: include/svn_error_codes.h:459
+#: ../include/svn_error_codes.h:580
 msgid "Filesystem has no such node-rev-id"
 msgstr "node-rev-id saknas i filsystem"
 
-#: include/svn_error_codes.h:463
+#: ../include/svn_error_codes.h:584
 msgid "String does not represent a node or node-rev-id"
 msgstr "Strängen representerar ingen nod eller node-erv-id"
 
-#: include/svn_error_codes.h:467
+#: ../include/svn_error_codes.h:588
 msgid "Name does not refer to a filesystem directory"
 msgstr "Namnet refererar ej till en katalog i filsystemet"
 
-#: include/svn_error_codes.h:471
+#: ../include/svn_error_codes.h:592
 msgid "Name does not refer to a filesystem file"
 msgstr "Namnet refererar ej till en fil i filsystemet"
 
-#: include/svn_error_codes.h:475
+#: ../include/svn_error_codes.h:596
 msgid "Name is not a single path component"
 msgstr "Namnet är ej en ensam sökvägskomponent"
 
-#: include/svn_error_codes.h:479
+#: ../include/svn_error_codes.h:600
 msgid "Attempt to change immutable filesystem node"
 msgstr "Försök att ändra filsystemsnod som ej får ändras"
 
-#: include/svn_error_codes.h:483
+#: ../include/svn_error_codes.h:604
 msgid "Item already exists in filesystem"
 msgstr "Objektet finns redan i filsystemet"
 
-#: include/svn_error_codes.h:487
+#: ../include/svn_error_codes.h:608
 msgid "Attempt to remove or recreate fs root dir"
 msgstr "Försök att ta bort eller omskapa filsystemets rotkatalog"
 
-#: include/svn_error_codes.h:491
+#: ../include/svn_error_codes.h:612
 msgid "Object is not a transaction root"
 msgstr "Objektet är ingen transaktionsrot"
 
-#: include/svn_error_codes.h:495
+#: ../include/svn_error_codes.h:616
 msgid "Object is not a revision root"
 msgstr "Objektet är ingen revisionsrot"
 
-#: include/svn_error_codes.h:499
+#: ../include/svn_error_codes.h:620
 msgid "Merge conflict during commit"
 msgstr "Sammanslagningskonflikt vid arkivering"
 
-#: include/svn_error_codes.h:503
+#: ../include/svn_error_codes.h:624
 msgid "A representation vanished or changed between reads"
 msgstr "Representation försvann eller ändrades mellan läsningar"
 
-#: include/svn_error_codes.h:507
+#: ../include/svn_error_codes.h:628
 msgid "Tried to change an immutable representation"
 msgstr "Försök att ändra representation som ej får ädnras"
 
-#: include/svn_error_codes.h:511
+#: ../include/svn_error_codes.h:632
 msgid "Malformed skeleton data"
 msgstr "Felaktig skelettdata"
 
-#: include/svn_error_codes.h:515
+#: ../include/svn_error_codes.h:636
 msgid "Transaction is out of date"
 msgstr "Transaktionen är inaktuell"
 
-#: include/svn_error_codes.h:519
+#: ../include/svn_error_codes.h:640
 msgid "Berkeley DB error"
 msgstr "Fel i Berkeley DB"
 
-#: include/svn_error_codes.h:523
+#: ../include/svn_error_codes.h:644
 msgid "Berkeley DB deadlock error"
 msgstr "\"Deadlock\" i Berkeley DB"
 
-#: include/svn_error_codes.h:527
+#: ../include/svn_error_codes.h:648
 msgid "Transaction is dead"
 msgstr "Transaktionen är död"
 
-#: include/svn_error_codes.h:531
+#: ../include/svn_error_codes.h:652
 msgid "Transaction is not dead"
 msgstr "Transaktionen är inte död"
 
-#: include/svn_error_codes.h:536
+#: ../include/svn_error_codes.h:657
 msgid "Unknown FS type"
 msgstr "Okänd filsystemstyp"
 
-#: include/svn_error_codes.h:541
+#: ../include/svn_error_codes.h:662
 msgid "No user associated with filesystem"
 msgstr "Ingen användare kopplad till filsystemet"
 
-#: include/svn_error_codes.h:546
+#: ../include/svn_error_codes.h:667
 msgid "Path is already locked"
 msgstr "Sökvägen är redan låst"
 
-#: include/svn_error_codes.h:551 include/svn_error_codes.h:688
+#: ../include/svn_error_codes.h:672 ../include/svn_error_codes.h:834
 msgid "Path is not locked"
 msgstr "Sökvägen är inte låst"
 
-#: include/svn_error_codes.h:556
+#: ../include/svn_error_codes.h:677
 msgid "Lock token is incorrect"
 msgstr "Låsidentifieraren är felaktig"
 
-#: include/svn_error_codes.h:561
+#: ../include/svn_error_codes.h:682
 msgid "No lock token provided"
 msgstr "Ingen låsidentifierare tillhandahölls"
 
-#: include/svn_error_codes.h:566
+#: ../include/svn_error_codes.h:687
 msgid "Username does not match lock owner"
 msgstr "Användarnamnet matchar inte låsägaren"
 
-#: include/svn_error_codes.h:571
+#: ../include/svn_error_codes.h:692
 msgid "Filesystem has no such lock"
 msgstr "Låset saknas i filsystemet"
 
-#: include/svn_error_codes.h:576
+#: ../include/svn_error_codes.h:697
 msgid "Lock has expired"
 msgstr "Låset har gått ut"
 
-#: include/svn_error_codes.h:581
+#: ../include/svn_error_codes.h:702 ../include/svn_error_codes.h:821
 msgid "Item is out of date"
 msgstr "Objektet är inaktuellt"
 
-#: include/svn_error_codes.h:586
-#, fuzzy
-msgid "SQLite error"
-msgstr "Fel vid skrivning"
-
-#: include/svn_error_codes.h:598
+#: ../include/svn_error_codes.h:714
 msgid "Unsupported FS format"
 msgstr "Formatet på filsystemet stöds ej"
 
-#: include/svn_error_codes.h:603
+#: ../include/svn_error_codes.h:719
 msgid "Representation is being written"
 msgstr "Representationen håller på att skrivas"
 
-#: include/svn_error_codes.h:609
+#: ../include/svn_error_codes.h:724
+#, fuzzy
+msgid "The generated transaction name is too long"
+msgstr "Angiven transaktion går ej att ändra"
+
+#: ../include/svn_error_codes.h:729
+#, fuzzy
+msgid "Filesystem has no such node origin record"
+msgstr "node-rev-id saknas i filsystem"
+
+#: ../include/svn_error_codes.h:734
+#, fuzzy
+msgid "Filesystem upgrade is not supported"
+msgstr "Filsystemet är ej öppet"
+
+#: ../include/svn_error_codes.h:739
+#, fuzzy
+msgid "Filesystem has no such checksum-representation index record"
+msgstr "Representation saknas i filsystem"
+
+#: ../include/svn_error_codes.h:744
+msgid "Property value in filesystem differs from the provided base value"
+msgstr ""
+
+#: ../include/svn_error_codes.h:751
 msgid "The repository is locked, perhaps for db recovery"
 msgstr "Arkivet är låst, kanske för reparation"
 
-#: include/svn_error_codes.h:613
+#: ../include/svn_error_codes.h:755
 msgid "A repository hook failed"
 msgstr "Arkivhookskript misslyckades"
 
-#: include/svn_error_codes.h:617
+#: ../include/svn_error_codes.h:759
 msgid "Incorrect arguments supplied"
 msgstr "Felaktiga argument"
 
-#: include/svn_error_codes.h:621
+#: ../include/svn_error_codes.h:763
 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:625
+#: ../include/svn_error_codes.h:767
 msgid "Bogus revision report"
 msgstr "Felaktig revisionsrapport"
 
-#: include/svn_error_codes.h:634
+#: ../include/svn_error_codes.h:776
 msgid "Unsupported repository version"
 msgstr "Arkivversionen stöds ej"
 
-#: include/svn_error_codes.h:638
+#: ../include/svn_error_codes.h:780
 msgid "Disabled repository feature"
 msgstr "Funktionen är avslagen i arkivet"
 
-#: include/svn_error_codes.h:642
+#: ../include/svn_error_codes.h:784
 msgid "Error running post-commit hook"
 msgstr "Fel vid körning av post-commit-hookskript"
 
-#: include/svn_error_codes.h:647
+#: ../include/svn_error_codes.h:789
 msgid "Error running post-lock hook"
 msgstr "Fel vid körning av post-lock-hookskript"
 
-#: include/svn_error_codes.h:652
+#: ../include/svn_error_codes.h:794
 msgid "Error running post-unlock hook"
 msgstr "Fel vid körning av post-unlock-hookskript"
 
-#: include/svn_error_codes.h:659
+#: ../include/svn_error_codes.h:799
+#, fuzzy
+msgid "Repository upgrade is not supported"
+msgstr "Argument för arkiv krävs"
+
+#: ../include/svn_error_codes.h:805
 msgid "Bad URL passed to RA layer"
 msgstr "Felaktig URL skickad till RA-skiktet"
 
-#: include/svn_error_codes.h:663
+#: ../include/svn_error_codes.h:809
 msgid "Authorization failed"
 msgstr "Behörighetskontroll misslyckades"
 
-#: include/svn_error_codes.h:667
+#: ../include/svn_error_codes.h:813
 msgid "Unknown authorization method"
 msgstr "Okänd metod för behörighetskontroll"
 
-#: include/svn_error_codes.h:671
+#: ../include/svn_error_codes.h:817
 msgid "Repository access method not implemented"
 msgstr "Metod för arkivåtkomst ej implementerad"
 
-#: include/svn_error_codes.h:675
-msgid "Item is out-of-date"
-msgstr "Objektet är inaktuellt"
-
-#: include/svn_error_codes.h:679
+#: ../include/svn_error_codes.h:825
 msgid "Repository has no UUID"
 msgstr "Arkivet saknar unik identifierare (UUID)"
 
-#: include/svn_error_codes.h:683
+#: ../include/svn_error_codes.h:829
 msgid "Unsupported RA plugin ABI version"
 msgstr "ABI-versionen för insticksmodulen för arkivåtkomst stöds ej"
 
-#: include/svn_error_codes.h:695
+#: ../include/svn_error_codes.h:839
+#, fuzzy
+msgid "Server can only replay from the root of a repository"
+msgstr "\"%s\" är inte arkivets rot"
+
+#: ../include/svn_error_codes.h:844
+#, fuzzy
+msgid "Repository UUID does not match expected UUID"
+msgstr "UUID:n på källarkivet (%s) matchar inte den förväntade UUID:n (%s)"
+
+#: ../include/svn_error_codes.h:849
+#, fuzzy
+msgid "Repository root URL does not match expected root URL"
+msgstr "UUID:n på källarkivet (%s) matchar inte den förväntade UUID:n (%s)"
+
+#: ../include/svn_error_codes.h:854
+msgid "Session URL does not match expected session URL"
+msgstr ""
+
+#: ../include/svn_error_codes.h:860
 msgid "RA layer failed to init socket layer"
 msgstr "RA-skiktet kunde inte initiera uttagsskiktet (socket layer)"
 
-#: include/svn_error_codes.h:699
+#: ../include/svn_error_codes.h:864
 msgid "RA layer failed to create HTTP request"
 msgstr "RA-skiktet kunde inte skapa en HTTP-förfrågan"
 
-#: include/svn_error_codes.h:703
+#: ../include/svn_error_codes.h:868
 msgid "RA layer request failed"
 msgstr "Förfrågan misslyckad i RA-skiktet"
 
-#: include/svn_error_codes.h:707
+#: ../include/svn_error_codes.h:872
 msgid "RA layer didn't receive requested OPTIONS info"
 msgstr "RA-skiktet mottog ej begärd OPTIONS-information"
 
-#: include/svn_error_codes.h:711
+#: ../include/svn_error_codes.h:876
 msgid "RA layer failed to fetch properties"
 msgstr "RA-skiktet misslyckades med att erhålla egenskaper"
 
-#: include/svn_error_codes.h:715
+#: ../include/svn_error_codes.h:880
 msgid "RA layer file already exists"
 msgstr "RA-skiktsfil finns redan"
 
-#: include/svn_error_codes.h:719
-msgid "Invalid configuration value"
-msgstr "Ogiltigt konfigurationsvärde"
-
-#: include/svn_error_codes.h:723
+#: ../include/svn_error_codes.h:894
 msgid "HTTP Path Not Found"
 msgstr "HTTP-sökväg finns inte"
 
-#: include/svn_error_codes.h:727
+#: ../include/svn_error_codes.h:898
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "Misslyckades med att utföra WebDAV PROPPATCH"
 
-#: include/svn_error_codes.h:732 include/svn_error_codes.h:773
-#: libsvn_ra_svn/marshal.c:639 libsvn_ra_svn/marshal.c:747
-#: libsvn_ra_svn/marshal.c:774
+#: ../include/svn_error_codes.h:903 ../include/svn_error_codes.h:954
+#: ../libsvn_ra_svn/marshal.c:714 ../libsvn_ra_svn/marshal.c:832
+#: ../libsvn_ra_svn/marshal.c:859
 msgid "Malformed network data"
 msgstr "Felaktig nätverksdata"
 
-#: include/svn_error_codes.h:737
+#: ../include/svn_error_codes.h:908
 msgid "Unable to extract data from response header"
 msgstr "Kunde inte läsa data från responshuvud"
 
-#: include/svn_error_codes.h:742
+#: ../include/svn_error_codes.h:913
 msgid "Repository has been moved"
 msgstr "Arkivet har flyttats"
 
-#: include/svn_error_codes.h:748 include/svn_error_codes.h:777
+#: ../include/svn_error_codes.h:918 ../libsvn_ra_serf/replay.c:844
+#: ../libsvn_ra_serf/update.c:2326 ../libsvn_ra_serf/util.c:689
+#, fuzzy
+msgid "Connection timed out"
+msgstr "Nätverksanslutningen stängdes oväntat"
+
+#: ../include/svn_error_codes.h:923
+msgid "URL access forbidden for unknown reason"
+msgstr ""
+
+#: ../include/svn_error_codes.h:929 ../include/svn_error_codes.h:958
 msgid "Couldn't find a repository"
 msgstr "Kunde inte hitta något arkiv"
 
-#: include/svn_error_codes.h:752
+#: ../include/svn_error_codes.h:933
 msgid "Couldn't open a repository"
 msgstr "Kunde inte öppna arkivet"
 
-#: include/svn_error_codes.h:757
+#: ../include/svn_error_codes.h:938
 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:761
+#: ../include/svn_error_codes.h:942
 msgid "Unknown svn protocol command"
 msgstr "Okänt kommando i svn-protokollet"
 
-#: include/svn_error_codes.h:765
+#: ../include/svn_error_codes.h:946
 msgid "Network connection closed unexpectedly"
 msgstr "Nätverksanslutningen stängdes oväntat"
 
-#: include/svn_error_codes.h:769
+#: ../include/svn_error_codes.h:950
 msgid "Network read/write error"
 msgstr "Läs/skrivfel till nätverket"
 
-#: include/svn_error_codes.h:781
+#: ../include/svn_error_codes.h:962
 msgid "Client/server version mismatch"
 msgstr "Klient- och serverversion stämmer ej överens"
 
-#: include/svn_error_codes.h:786
+#: ../include/svn_error_codes.h:967
 msgid "Cannot negotiate authentication mechanism"
 msgstr "Kan inte förhandla om autentiseringsmekanism"
 
-#: include/svn_error_codes.h:795
+#: ../include/svn_error_codes.h:972
+msgid "Editor drive was aborted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:978
+msgid "Initialization of SSPI library failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:982
+msgid "Server SSL certificate untrusted"
+msgstr ""
+
+#: ../include/svn_error_codes.h:986
+msgid "Initialization of the GSSAPI context failed"
+msgstr ""
+
+#: ../include/svn_error_codes.h:991
+msgid "While handling serf response:"
+msgstr ""
+
+#: ../include/svn_error_codes.h:999
 msgid "Credential data unavailable"
 msgstr "Klientreferenser otillgängliga"
 
-#: include/svn_error_codes.h:799
+#: ../include/svn_error_codes.h:1003
 msgid "No authentication provider available"
 msgstr "Ingen tillhandahållare av autentisering tillgänglig"
 
-#: include/svn_error_codes.h:803 include/svn_error_codes.h:807
+#: ../include/svn_error_codes.h:1007
 msgid "All authentication providers exhausted"
 msgstr "Alla tillhandahållare av autentisering förbrukade"
 
-#: include/svn_error_codes.h:813
+#: ../include/svn_error_codes.h:1011
+#, fuzzy
+msgid "Credentials not saved"
+msgstr "Klientreferenser otillgängliga"
+
+#: ../include/svn_error_codes.h:1016
+#, fuzzy
+msgid "Authentication failed"
+msgstr "Behörighetskontroll misslyckades"
+
+#: ../include/svn_error_codes.h:1022
 msgid "Read access denied for root of edit"
 msgstr "Läsning nekas till roten för editeringen"
 
-#: include/svn_error_codes.h:818
+#: ../include/svn_error_codes.h:1027
 msgid "Item is not readable"
 msgstr "Objektet är inte läsbart"
 
-#: include/svn_error_codes.h:823
+#: ../include/svn_error_codes.h:1032
 msgid "Item is partially readable"
 msgstr "Objektet är delvis läsbart"
 
-#: include/svn_error_codes.h:827
+#: ../include/svn_error_codes.h:1036
 msgid "Invalid authz configuration"
 msgstr "Ogiltig auktorisationskonfiguration"
 
-#: include/svn_error_codes.h:832
+#: ../include/svn_error_codes.h:1041
 msgid "Item is not writable"
 msgstr "Objektet är inte skrivbart"
 
-#: include/svn_error_codes.h:838
+#: ../include/svn_error_codes.h:1047
 msgid "Svndiff data has invalid header"
 msgstr "Svndiff-data har ogiltigt huvud"
 
-#: include/svn_error_codes.h:842
+#: ../include/svn_error_codes.h:1051
 msgid "Svndiff data contains corrupt window"
 msgstr "Svndiff-data innehåller trasigt fönster"
 
-#: include/svn_error_codes.h:846
+#: ../include/svn_error_codes.h:1055
 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:850
+#: ../include/svn_error_codes.h:1059
 msgid "Svndiff data contains invalid instruction"
 msgstr "Ogiltig instruktion i svndiff-data"
 
-#: include/svn_error_codes.h:854
+#: ../include/svn_error_codes.h:1063
 msgid "Svndiff data ends unexpectedly"
 msgstr "Svndiff-data tog oväntat slut"
 
-#: include/svn_error_codes.h:858
+#: ../include/svn_error_codes.h:1067
 msgid "Svndiff compressed data is invalid"
 msgstr "Komprimerad svndiff-data är ogiltig"
 
-#: include/svn_error_codes.h:864
+#: ../include/svn_error_codes.h:1073
 msgid "Diff data source modified unexpectedly"
 msgstr "Datakälla för diff ändrades oväntat"
 
-#: include/svn_error_codes.h:870
+#: ../include/svn_error_codes.h:1079
 msgid "Apache has no path to an SVN filesystem"
 msgstr "Apache saknar sökväg till SVN-filsystem"
 
-#: include/svn_error_codes.h:874
+#: ../include/svn_error_codes.h:1083
 msgid "Apache got a malformed URI"
 msgstr "Apache fick en felaktig URI"
 
-#: include/svn_error_codes.h:878
+#: ../include/svn_error_codes.h:1087
 msgid "Activity not found"
 msgstr "Aktiviteten hittades ej"
 
-#: include/svn_error_codes.h:882
+#: ../include/svn_error_codes.h:1091
 msgid "Baseline incorrect"
 msgstr "Felaktig baseline"
 
-#: include/svn_error_codes.h:886
+#: ../include/svn_error_codes.h:1095
 msgid "Input/output error"
 msgstr "In/ut-fel"
 
-#: include/svn_error_codes.h:892
+#: ../include/svn_error_codes.h:1101
 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:896
+#: ../include/svn_error_codes.h:1105
 msgid "Repository access is needed for this operation"
 msgstr "Operationen kräver åtkomst till ett arkiv"
 
-#: include/svn_error_codes.h:900
+#: ../include/svn_error_codes.h:1109
 msgid "Bogus revision information given"
 msgstr "Felaktig revisionsinformation angiven"
 
-#: include/svn_error_codes.h:904
+#: ../include/svn_error_codes.h:1113
 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:908
+#: ../include/svn_error_codes.h:1117
 msgid "Operation does not apply to binary file"
 msgstr "Operationen kan ej utföras på binär fil"
 
-#: include/svn_error_codes.h:914
+#: ../include/svn_error_codes.h:1123
 msgid "Format of an svn:externals property was invalid"
 msgstr "Felaktigt format på svn:externals-egenskap"
 
-#: include/svn_error_codes.h:918
+#: ../include/svn_error_codes.h:1127
 msgid "Attempting restricted operation for modified resource"
 msgstr "Operationen tillåter ej att källan är modifierad"
 
-#: include/svn_error_codes.h:922
+#: ../include/svn_error_codes.h:1131
 msgid "Operation does not apply to directory"
 msgstr "Operationen kan ej utföras på en katalog"
 
-#: include/svn_error_codes.h:926
+#: ../include/svn_error_codes.h:1135
 msgid "Revision range is not allowed"
 msgstr "Revisionsområde otillåtet"
 
-#: include/svn_error_codes.h:930
+#: ../include/svn_error_codes.h:1139
 msgid "Inter-repository relocation not allowed"
 msgstr "Omlokalisering mellan arkiv otillåten"
 
-#: include/svn_error_codes.h:934
+#: ../include/svn_error_codes.h:1143
 msgid "Author name cannot contain a newline"
 msgstr "Författarnamn kan ej innehålla radslut"
 
-#: include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:1147
 msgid "Bad property name"
 msgstr "Felaktigt egenskapsnamn"
 
-#: include/svn_error_codes.h:943
+#: ../include/svn_error_codes.h:1152
 msgid "Two versioned resources are unrelated"
 msgstr "Två orelaterade versionshanterade resurser"
 
-#: include/svn_error_codes.h:948
+#: ../include/svn_error_codes.h:1157
 msgid "Path has no lock token"
 msgstr "Sökvägen saknar låsidentifierare"
 
-#: include/svn_error_codes.h:953
+#: ../include/svn_error_codes.h:1162
 #, fuzzy
 msgid "Operation does not support multiple sources"
 msgstr "Operationen kan ej utföras på en katalog"
 
-#: include/svn_error_codes.h:957
+#: ../include/svn_error_codes.h:1167
 msgid "No versioned parent directories"
 msgstr ""
 
-#: include/svn_error_codes.h:963
-msgid "A problem occurred; see later errors for details"
+#: ../include/svn_error_codes.h:1172
+#, fuzzy
+msgid "Working copy and merge source not ready for reintegration"
+msgstr "En källa för sammanslagning (merge) som är en arbetskopia kräver att en revision anges"
+
+#: ../include/svn_error_codes.h:1177
+msgid "A file external cannot overwrite an existing versioned item"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1182
+#, fuzzy
+msgid "Invalid path component strip count specified"
+msgstr "Ogiltig revisionsangivelse"
+
+#: ../include/svn_error_codes.h:1187
+msgid "Detected a cycle while processing the operation"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1193
+#, fuzzy
+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:967
+#: ../include/svn_error_codes.h:1197
 msgid "Failure loading plugin"
 msgstr "Fel vid inladdning av insticksmodul"
 
-#: include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:1201
 msgid "Malformed file"
 msgstr "Felaktig fil"
 
-#: include/svn_error_codes.h:975
+#: ../include/svn_error_codes.h:1205
 msgid "Incomplete data"
 msgstr "Ofullständig data"
 
-#: include/svn_error_codes.h:979
+#: ../include/svn_error_codes.h:1209
 msgid "Incorrect parameters given"
 msgstr "Felaktiga parametrar angivna"
 
-#: include/svn_error_codes.h:983
+#: ../include/svn_error_codes.h:1213
 msgid "Tried a versioning operation on an unversioned resource"
-msgstr ""
-"Försökte utföra en versionshanteringsoperation på en resurs som ej är "
-"versionshanterad"
+msgstr "Försökte utföra en versionshanteringsoperation på en resurs som ej är versionshanterad"
 
-#: include/svn_error_codes.h:987
+#: ../include/svn_error_codes.h:1217
 msgid "Test failed"
 msgstr "Test misslyckades"
 
-#: include/svn_error_codes.h:991
+#: ../include/svn_error_codes.h:1221
 msgid "Trying to use an unsupported feature"
 msgstr "Försöker använda en funktion som ej stöds"
 
-#: include/svn_error_codes.h:995
+#: ../include/svn_error_codes.h:1225
 msgid "Unexpected or unknown property kind"
 msgstr "Oväntad eller okänd egenskapstyp"
 
-#: include/svn_error_codes.h:999
+#: ../include/svn_error_codes.h:1229
 msgid "Illegal target for the requested operation"
 msgstr "Felaktigt mål för begärd operation"
 
-#: include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1233
 msgid "MD5 checksum is missing"
 msgstr "MD5-kontrollsumma saknas"
 
-#: include/svn_error_codes.h:1007
+#: ../include/svn_error_codes.h:1237
 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:1011
+#: ../include/svn_error_codes.h:1241
 msgid "Error calling external program"
 msgstr "Fel vid anrop av externt program"
 
-#: include/svn_error_codes.h:1015
+#: ../include/svn_error_codes.h:1245
 msgid "Python exception has been set with the error"
 msgstr "Python-undantag har satts för felet"
 
-#: include/svn_error_codes.h:1019
+#: ../include/svn_error_codes.h:1249
 msgid "A checksum mismatch occurred"
 msgstr "Felaktig kontrollsumma"
 
-#: include/svn_error_codes.h:1023
+#: ../include/svn_error_codes.h:1253
 msgid "The operation was interrupted"
 msgstr "Operationen avbröts"
 
-#: include/svn_error_codes.h:1027
+#: ../include/svn_error_codes.h:1257
 msgid "The specified diff option is not supported"
 msgstr "Den angivna diff-flaggan stöds ej"
 
-#: include/svn_error_codes.h:1031
+#: ../include/svn_error_codes.h:1261
 msgid "Property not found"
 msgstr "Egenskapen finns ej"
 
-#: include/svn_error_codes.h:1035
+#: ../include/svn_error_codes.h:1265
 msgid "No auth file path available"
 msgstr "Sökväg för auth-fil ej tillgänglig"
 
-#: include/svn_error_codes.h:1039
-msgid "Merge info parse error"
-msgstr ""
-
-#: include/svn_error_codes.h:1044
+#: ../include/svn_error_codes.h:1270
 msgid "Incompatible library version"
 msgstr "Biblioteksversioner inte kompatibla"
 
-#: include/svn_error_codes.h:1050
+#: ../include/svn_error_codes.h:1275
+msgid "Mergeinfo parse error"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1280
+msgid "Cease invocation of this API"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1285
+#, fuzzy
+msgid "Error parsing revision number"
+msgstr "Syntaxfel i revisionsargumentet \"%s\""
+
+#: ../include/svn_error_codes.h:1290
+msgid "Iteration terminated before completion"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1295
+#, fuzzy
+msgid "Unknown changelist"
+msgstr "ingen ändringslista med namnet: \"%s\""
+
+#: ../include/svn_error_codes.h:1300
+#, fuzzy
+msgid "Reserved directory name in command line arguments"
+msgstr "Fel vid initiering av kommandoradsargument"
+
+#: ../include/svn_error_codes.h:1305
+msgid "Inquiry about unknown capability"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1310
+#, fuzzy
+msgid "Test skipped"
+msgstr "Test misslyckades"
+
+#: ../include/svn_error_codes.h:1315
+msgid "apr memcache library not available"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1320
+msgid "Couldn't perform atomic initialization"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1325
+#, fuzzy
+msgid "SQLite error"
+msgstr "Fel vid skrivning"
+
+#: ../include/svn_error_codes.h:1330
+#, fuzzy
+msgid "Attempted to write to readonly SQLite db"
+msgstr "Försök att skriva i något som inte är en transaktion"
+
+#: ../include/svn_error_codes.h:1335
+msgid "Unsupported schema found in SQLite db"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1340
+msgid "The SQLite db is busy"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1345
+msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
+msgstr ""
+
+#: ../include/svn_error_codes.h:1352
 #, fuzzy
 msgid "Error parsing arguments"
 msgstr "Klientfel vid tolkning av argument"
 
-#: include/svn_error_codes.h:1054
+#: ../include/svn_error_codes.h:1356
 #, fuzzy
 msgid "Not enough arguments provided"
 msgstr "För få argument; använd \"svn --help\" för mer information"
 
-#: include/svn_error_codes.h:1058
+#: ../include/svn_error_codes.h:1360
 msgid "Mutually exclusive arguments specified"
 msgstr "De angivna argumenten kan inte användas samtidigt"
 
-#: include/svn_error_codes.h:1062
+#: ../include/svn_error_codes.h:1364
 msgid "Attempted command in administrative dir"
 msgstr "Försökte utföra kommando i administrativ katalog"
 
-#: include/svn_error_codes.h:1066
+#: ../include/svn_error_codes.h:1368
 msgid "The log message file is under version control"
 msgstr "Filen med loggmeddelandet är versionshanterad"
 
-#: include/svn_error_codes.h:1070
+#: ../include/svn_error_codes.h:1372
 msgid "The log message is a pathname"
 msgstr "Logmeddelandet är en sökväg"
 
-#: include/svn_error_codes.h:1074
+#: ../include/svn_error_codes.h:1376
 msgid "Committing in directory scheduled for addition"
 msgstr "Arkiverar i katalog schemalagd att läggas till"
 
-#: include/svn_error_codes.h:1078
+#: ../include/svn_error_codes.h:1380
 msgid "No external editor available"
 msgstr "Ingen extern editor tillgänglig"
 
-#: include/svn_error_codes.h:1082
+#: ../include/svn_error_codes.h:1384
 msgid "Something is wrong with the log message's contents"
 msgstr "Fel i loggmeddelandets innehåll"
 
-#: include/svn_error_codes.h:1086
+#: ../include/svn_error_codes.h:1388
 msgid "A log message was given where none was necessary"
 msgstr "Ett loggmeddelande angavs utan att det var nödvändigt"
 
-#: libsvn_client/add.c:346 libsvn_wc/copy.c:188
+#: ../include/svn_error_codes.h:1392
+#, fuzzy
+msgid "No external merge tool available"
+msgstr "Ingen extern editor tillgänglig"
+
+#: ../include/svn_error_codes.h:1396
+#, fuzzy
+msgid "Failed processing one or more externals definitions"
+msgstr "bortse ifrån externals-definitioner"
+
+#: ../include/svn_error_codes.h:1402
+#, fuzzy
+msgid "Assertion failure"
+msgstr "Behörighetskontroll misslyckades"
+
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:392
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:447
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:554
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:610
+msgid "GNOME Keyring is locked and we are non-interactive"
+msgstr ""
+
+#: ../libsvn_client/add.c:488 ../libsvn_wc/adm_ops.c:881
+#: ../libsvn_wc/workqueue.c:1658 ../libsvn_wc/workqueue.c:1740
+#, c-format
+msgid "'%s' not found"
+msgstr "\"%s\" finns inte"
+
+#: ../libsvn_client/add.c:493 ../libsvn_wc/adm_ops.c:572
+#: ../libsvn_wc/adm_ops.c:886
 #, c-format
-msgid "Can't close directory '%s'"
-msgstr "Kan inte stänga katalogen \"%s\""
+msgid "Unsupported node kind for path '%s'"
+msgstr "Nodtypen för sökvägen \"%s\" stöds inte"
 
-#: libsvn_client/add.c:354
+#: ../libsvn_client/add.c:534 ../libsvn_client/cmdline.c:268
+#: ../libsvn_subr/opt.c:878
 #, c-format
-msgid "Error during recursive add of '%s'"
-msgstr "Fel vid rekursivt tillägg av \"%s\""
+msgid "'%s' ends in a reserved name"
+msgstr ""
+
+#: ../libsvn_client/add.c:580 ../libsvn_client/changelist.c:116
+#: ../libsvn_client/changelist.c:168 ../libsvn_client/cleanup.c:56
+#: ../libsvn_client/cleanup.c:134 ../libsvn_client/commit.c:701
+#: ../libsvn_client/export.c:952 ../libsvn_client/resolved.c:54
+#: ../libsvn_client/revert.c:135 ../libsvn_client/status.c:274
+#: ../svn/add-cmd.c:76 ../svn/changelist-cmd.c:84 ../svn/cleanup-cmd.c:69
+#: ../svn/export-cmd.c:91 ../svn/import-cmd.c:106 ../svn/resolve-cmd.c:106
+#: ../svn/resolved-cmd.c:76 ../svn/revert-cmd.c:77 ../svn/status-cmd.c:260
+#: ../svn/upgrade-cmd.c:72
+#, fuzzy, c-format
+msgid "'%s' is not a local path"
+msgstr "\"%s\" är ingen fil"
+
+#: ../libsvn_client/add.c:683 ../libsvn_ra/ra_loader.c:373
+#: ../libsvn_ra_serf/serf.c:366 ../libsvn_ra_serf/serf.c:482
+#, fuzzy, c-format
+msgid "Illegal repository URL '%s'"
+msgstr "Ogiltig svn-arkiv-URL \"%s\""
 
-#: libsvn_client/blame.c:368 libsvn_client/blame.c:838
+#: ../libsvn_client/blame.c:397
 #, c-format
 msgid "Cannot calculate blame information for binary file '%s'"
 msgstr "Kan inte beräkna blame-information för den binära fil \"%s\""
 
-#: libsvn_client/blame.c:522
-msgid "blame of the WORKING revision is not supported"
-msgstr "blame kan inte köras på arbetsrevisionen"
-
-#: libsvn_client/blame.c:535
+#: ../libsvn_client/blame.c:627
 msgid "Start revision must precede end revision"
 msgstr "Startrevisionen måste komma före slutrevisionen"
 
-#: libsvn_client/blame.c:725 libsvn_client/cat.c:205
-#, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "URL:en \"%s\" pekar på en katalog"
-
-#: libsvn_client/blame.c:798
+#: ../libsvn_client/cat.c:74 ../libsvn_client/commit_util.c:1038
+#: ../libsvn_client/delete.c:64 ../libsvn_client/prop_commands.c:429
+#: ../libsvn_client/prop_commands.c:947 ../libsvn_client/prop_commands.c:1264
+#: ../libsvn_client/revisions.c:104 ../libsvn_wc/adm_ops.c:2008
+#: ../libsvn_wc/adm_ops.c:2042 ../libsvn_wc/copy.c:596
+#: ../libsvn_wc/entries.c:1405 ../libsvn_wc/entries.c:2450
+#: ../libsvn_wc/entries.c:2481 ../libsvn_wc/node.c:1247
+#: ../libsvn_wc/update_editor.c:4171
 #, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr "Saknar tidigare revision för åtgärden \"%c\" i revision %ld av \"%s\""
+msgid "'%s' is not under version control"
+msgstr "\"%s\" är inte versionshanterad"
 
-#: libsvn_client/cat.c:74
+#: ../libsvn_client/cat.c:79
 #, c-format
 msgid "'%s' refers to a directory"
 msgstr "\"%s\" pekar på en katalog"
 
-#: libsvn_client/cat.c:126 libsvn_client/export.c:183
+#: ../libsvn_client/cat.c:89
+#, c-format
+msgid "'%s' has no base revision until it is committed"
+msgstr ""
+
+#: ../libsvn_client/cat.c:153 ../libsvn_client/export.c:234
 msgid "(local)"
 msgstr "(lokal)"
 
-#: libsvn_client/checkout.c:91 libsvn_client/export.c:886
+#: ../libsvn_client/cat.c:236
 #, c-format
-msgid "URL '%s' doesn't exist"
+msgid "URL '%s' refers to a directory"
+msgstr "URL:en \"%s\" pekar på en katalog"
+
+#: ../libsvn_client/checkout.c:164 ../libsvn_client/export.c:1116
+#, c-format
+msgid "URL '%s' doesn't exist"
 msgstr "URL:en \"%s\" finns inte"
 
-#: libsvn_client/checkout.c:95
+#: ../libsvn_client/checkout.c:168
 #, 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:168
-#, c-format
-msgid "'%s' is already a working copy for a different URL"
+#: ../libsvn_client/checkout.c:204
+#, fuzzy, c-format
+msgid "'%s' is already a working copy for a different URL; use 'svn update' to update it"
 msgstr "\"%s\" är redan en arbetskopia för en annan URL"
 
-#: libsvn_client/checkout.c:172
-msgid "; run 'svn update' to complete it"
-msgstr "; kör \"svn update\" för att slutföra"
-
-#: libsvn_client/checkout.c:182
+#: ../libsvn_client/checkout.c:212
 #, c-format
 msgid "'%s' already exists and is not a directory"
 msgstr "\"%s\" finns redan och är ingen katalog"
 
-#: libsvn_client/commit.c:198
+#: ../libsvn_client/cmdline.c:78
+#, fuzzy, c-format
+msgid "Improper relative URL '%s'"
+msgstr "Egenskaper på \"%s\":\n"
+
+#: ../libsvn_client/cmdline.c:149
+#, c-format
+msgid "All non-relative targets must have the same root URL"
+msgstr ""
+
+#: ../libsvn_client/commit.c:433
 #, c-format
 msgid "Unknown or unversionable type for '%s'"
 msgstr "\"%s\" är av en typ som är okänd eller ej kan versionshanteras"
 
-#: libsvn_client/commit.c:512
+#: ../libsvn_client/commit.c:538
 msgid "New entry name required when importing a file"
 msgstr "Nytt postnamn krävs vid import av en fil"
 
-#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:1008
-#: libsvn_wc/questions.c:92
+#: ../libsvn_client/commit.c:573 ../libsvn_wc/adm_ops.c:567
+#: ../libsvn_wc/lock.c:140 ../libsvn_wc/wc_db_pdh.c:64
 #, c-format
 msgid "'%s' does not exist"
 msgstr "\"%s\" finns inte"
 
-#: libsvn_client/commit.c:607 libsvn_client/copy.c:289 svnlook/main.c:1216
+#: ../libsvn_client/commit.c:655 ../libsvn_client/copy.c:471
+#: ../libsvn_client/merge.c:8975 ../libsvn_client/merge.c:10231
+#: ../libsvn_client/merge.c:10506 ../svnlook/main.c:1407
 #, c-format
 msgid "Path '%s' does not exist"
 msgstr "Sökvägen \"%s\" finns inte"
 
-#: libsvn_client/commit.c:741 libsvn_client/copy.c:298
-#: libsvn_client/copy.c:789 libsvn_client/copy.c:1118
-#: libsvn_client/copy.c:1550
+#: ../libsvn_client/commit.c:795 ../libsvn_client/copy.c:482
+#: ../libsvn_client/copy.c:1021 ../libsvn_client/copy.c:1245
+#: ../libsvn_client/copy.c:1860
 #, c-format
 msgid "Path '%s' already exists"
 msgstr "Sökvägen \"%s\" finns redan"
 
-#: libsvn_client/commit.c:756
+#: ../libsvn_client/commit.c:810
 #, c-format
 msgid "'%s' is a reserved name and cannot be imported"
 msgstr "\"%s\" är ett reserverat namn och kan inte importeras"
 
-#: libsvn_client/commit.c:872 libsvn_client/copy.c:972
+#: ../libsvn_client/commit.c:848 ../libsvn_client/copy.c:1402
 msgid "Commit failed (details follow):"
 msgstr "Arkiveringen misslyckades (mer information följer):"
 
-#: libsvn_client/commit.c:880 libsvn_client/copy.c:980
+#: ../libsvn_client/commit.c:856
 msgid "Commit succeeded, but other errors follow:"
 msgstr "Arkiveringen lyckades, men andra fel följer:"
 
-#: libsvn_client/commit.c:887 libsvn_client/copy.c:987
+#: ../libsvn_client/commit.c:863
 msgid "Error unlocking locked dirs (details follow):"
 msgstr "Fel vid upplåsning av låsta kataloger (mer information följer):"
 
-#: libsvn_client/commit.c:898
+#: ../libsvn_client/commit.c:874
 msgid "Error bumping revisions post-commit (details follow):"
-msgstr ""
-"Fel vid höjning av revisionsnummer efter arkivering (mer information följer):"
+msgstr "Fel vid höjning av revisionsnummer efter arkivering (mer information följer):"
+
+#: ../libsvn_client/commit.c:968
+#, fuzzy
+msgid "Are all targets part of the same working copy?"
+msgstr "Ingår samtliga mål i samma arbetskopia?"
 
-#: libsvn_client/commit.c:909 libsvn_client/copy.c:998
-msgid "Error in post-commit clean-up (details follow):"
-msgstr "Fel vid städning efter arkivering (mer information följer):"
+#: ../libsvn_client/commit.c:1007
+#, fuzzy
+msgid "Cannot non-recursively commit a directory deletion of a directory with child nodes"
+msgstr "Kan inte arkivera en radering av en katalog utan att det görs rekursivt"
 
-#: libsvn_client/commit.c:1193
+#: ../libsvn_client/commit.c:1057 ../svn/commit-cmd.c:71
 #, 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:1392
-msgid "Are all the targets part of the same working copy?"
-msgstr "Ingår samtliga mål i samma arbetskopia?"
+#: ../libsvn_client/commit_util.c:63 ../libsvn_repos/commit.c:132
+#, fuzzy, c-format
+msgid "Directory '%s' is out of date"
+msgstr "Katalogen \"%s\" saknar URL"
 
-#: libsvn_client/commit.c:1407
-msgid "Cannot non-recursively commit a directory deletion"
-msgstr ""
-"Kan inte arkivera en radering av en katalog utan att det görs rekursivt"
+#: ../libsvn_client/commit_util.c:64 ../libsvn_repos/commit.c:134
+#, fuzzy, c-format
+msgid "File '%s' is out of date"
+msgstr "Objektet är inaktuellt"
+
+#: ../libsvn_client/commit_util.c:288 ../libsvn_client/commit_util.c:479
+#: ../libsvn_client/commit_util.c:1032
+#, c-format
+msgid "Aborting commit: '%s' remains in conflict"
+msgstr "Arkiveringen avbryts: \"%s\" är fortfarande i konflikt"
+
+#: ../libsvn_client/commit_util.c:330
+#, fuzzy, c-format
+msgid "Aborting commit: '%s' remains in tree-conflict"
+msgstr "Arkiveringen avbryts: \"%s\" är fortfarande i konflikt"
 
-#: libsvn_client/commit_util.c:256 libsvn_client/commit_util.c:267
+#: ../libsvn_client/commit_util.c:424 ../libsvn_client/commit_util.c:440
 #, c-format
 msgid "Unknown entry kind for '%s'"
 msgstr "Okänd posttyp för \"%s\""
 
-#: libsvn_client/commit_util.c:284
+#: ../libsvn_client/commit_util.c:457
 #, c-format
 msgid "Entry '%s' has unexpectedly changed special status"
 msgstr "På posten \"%s\" har specialstatus ändrats oväntat"
 
-#: libsvn_client/commit_util.c:335
-#, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "Arkiveringen avbryts: \"%s\" är fortfarande i konflikt"
-
-#: libsvn_client/commit_util.c:401
-#, c-format
-msgid "Did not expect '%s' to be a working copy root"
-msgstr "Väntade inte att \"%s\" skulle vara en rot till en arbetskopia"
+#: ../libsvn_client/commit_util.c:654
+#, fuzzy, c-format
+msgid "'%s' is scheduled for addition, but is missing"
+msgstr "\"%s\" är schemalagd att läggas till i en förälder som inte är versionshanterad"
 
-#: libsvn_client/commit_util.c:419 libsvn_client/commit_util.c:1052
+#: ../libsvn_client/commit_util.c:935
 #, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL"
-msgstr ""
-"Arkiveringsobjektet \"%s\" har kopieringsflaggan satt, men saknar \"copyfrom"
-"\"-URL"
+msgid "'%s' is not under version control and is not part of the commit, yet its child '%s' is part of the commit"
+msgstr "\"%s\" ä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:709
+#: ../libsvn_client/commit_util.c:1052 ../libsvn_client/url.c:198
 #, c-format
 msgid "Entry for '%s' has no URL"
 msgstr "Posten för \"%s\" saknar URL"
 
-#: libsvn_client/commit_util.c:742
+#: ../libsvn_client/commit_util.c:1069
 #, c-format
 msgid "'%s' is scheduled for addition within unversioned parent"
-msgstr ""
-"\"%s\" är schemalagd att läggas till i en förälder som inte är "
-"versionshanterad"
-
-#: libsvn_client/commit_util.c:762
-#, c-format
-msgid ""
-"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
-"for addition.  Perhaps you're committing a target that is\n"
-"inside an unversioned (or not-yet-versioned) directory?"
-msgstr ""
-"Posten för \"%s\" är märkt som \"kopierad\", men är inte själv schemalagd "
-"att läggas till. Försöker du arkivera något som är inuti en icke (eller inte "
-"ännu) versionshanterad katalog?"
+msgstr "\"%s\" är schemalagd att läggas till i en förälder som inte är versionshanterad"
 
-#: libsvn_client/commit_util.c:803
+#: ../libsvn_client/commit_util.c:1210
 #, c-format
-msgid ""
-"'%s' is not under version control and is not part of the commit, yet its "
-"child '%s' is part of the commit"
-msgstr ""
-"\"%s\" är inte versionshanterad och är ej heller delaktig i arkiveringen, "
-"men trots det är dess barn \"%s\" en del av arkiveringen"
+msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
+msgstr "Kan inte arkivera både \"%s\" och \"%s\" eftersom de hänvisar till samma URL"
 
-#: libsvn_client/commit_util.c:907
+#: ../libsvn_client/commit_util.c:1367
 #, c-format
-msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
-msgstr ""
-"Kan inte arkivera både \"%s\" och \"%s\" eftersom de hänvisar till samma URL"
+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:1057
+#: ../libsvn_client/commit_util.c:1372
 #, 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:1822
+#: ../libsvn_client/commit_util.c:2080
 msgid "Standard properties can't be set explicitly as revision properties"
 msgstr ""
 
-#: libsvn_client/copy.c:314 libsvn_client/copy.c:1566
-#: libsvn_client/update.c:105
+#: ../libsvn_client/copy.c:500 ../libsvn_client/copy.c:1876
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "Sökvägen \"%s\" är ingen katalog"
 
-#: libsvn_client/copy.c:655
-#, c-format
-msgid ""
-"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
-"s')"
-msgstr ""
-"Källan och destinationen verkar inte vara i samma arkiv (källa: \"%s\"; "
-"destination: \"%s\")"
+#: ../libsvn_client/copy.c:669 ../libsvn_client/copy.c:710
+#, fuzzy, c-format
+msgid "Path '%s' already exists, but is not a directory"
+msgstr "\"%s\" finns redan och är ingen katalog"
+
+#: ../libsvn_client/copy.c:775
+#, fuzzy
+msgid "Source and destination URLs appear not to all point to the same repository."
+msgstr "Källan och destinationen verkar inte vara i samma arkiv (källa: \"%s\"; destination: \"%s\")"
 
-#: libsvn_client/copy.c:770
+#: ../libsvn_client/copy.c:985
 #, c-format
 msgid "Cannot move URL '%s' into itself"
 msgstr "Kan inte flytta URL:en \"%s\" till sig själv"
 
-#: libsvn_client/copy.c:779 libsvn_client/prop_commands.c:229
+#: ../libsvn_client/copy.c:1007 ../libsvn_client/prop_commands.c:229
 #, c-format
 msgid "Path '%s' does not exist in revision %ld"
 msgstr "Sökvägen \"%s\" finns inte i revision %ld"
 
-#: libsvn_client/copy.c:1391
+#: ../libsvn_client/copy.c:1536
 #, c-format
 msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr ""
-"Käll-RUL:en \"%s\" är från ett annat arkiv, låter den vara en separat "
-"arbetskopia"
+msgstr "Käll-RUL:en \"%s\" är från ett annat arkiv, låter den vara en separat arbetskopia"
+
+#: ../libsvn_client/copy.c:1638 ../libsvn_client/copy.c:1650
+#: ../libsvn_wc/adm_ops.c:941 ../libsvn_wc/copy.c:691
+#, c-format
+msgid "'%s' is already under version control"
+msgstr "\"%s\" är redan versionshanterad"
 
-#: libsvn_client/copy.c:1537
+#: ../libsvn_client/copy.c:1671
+#, c-format
+msgid "Entry for '%s' exists (though the working file is missing)"
+msgstr "Posten för \"%s\" finns (fast arbetsfilen saknas)"
+
+#: ../libsvn_client/copy.c:1844
 #, c-format
 msgid "Path '%s' not found in revision %ld"
 msgstr "Sökvägen \"%s\" finns inte i revision %ld"
 
-#: libsvn_client/copy.c:1542
+#: ../libsvn_client/copy.c:1849
 #, c-format
 msgid "Path '%s' not found in head revision"
 msgstr "Sökvägen \"%s\" finns inte i den senaste revisionen"
 
-#: libsvn_client/copy.c:1592
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "Posten för \"%s\" finns (fast arbetsfilen saknas)"
-
-#: libsvn_client/copy.c:1687 libsvn_client/log.c:302
-msgid "Revision type requires a working copy path, not a URL"
-msgstr "Revisionstypen kräver en sökväg till en arbetskopia; inte en URL"
-
-#: libsvn_client/copy.c:1722
+#: ../libsvn_client/copy.c:1970
 #, fuzzy
 msgid "Cannot mix repository and working copy sources"
 msgstr "Sökväg är inte en fil i en arbetskopia"
 
-#: libsvn_client/copy.c:1764
+#: ../libsvn_client/copy.c:2022
 #, c-format
 msgid "Cannot copy path '%s' into its own child '%s'"
 msgstr "Kan inte kopiera sökvägen \"%s\" till dess eget barn \"%s\""
 
-#: libsvn_client/copy.c:1784
+#: ../libsvn_client/copy.c:2054
 #, c-format
-msgid "Cannot move path '%s' into itself"
-msgstr "Kan inte flytta sökvägen \"%s\" till sig själv"
+msgid "Cannot move the file external at '%s'; please propedit the svn:externals description that created it"
+msgstr ""
 
-#: libsvn_client/copy.c:1793
+#: ../libsvn_client/copy.c:2069
 msgid "Moves between the working copy and the repository are not supported"
 msgstr ""
 
-#: libsvn_client/copy.c:1851
+#: ../libsvn_client/copy.c:2083
 #, c-format
-msgid "'%s' does not seem to have a URL associated with it"
-msgstr "\"%s\" verkar inte ha någon URL associerad till sig"
+msgid "Cannot move path '%s' into itself"
+msgstr "Kan inte flytta sökvägen \"%s\" till sig själv"
 
-#: libsvn_client/copy.c:2197 svn/move-cmd.c:60
-msgid "Cannot specify revisions (except HEAD) with move operations"
-msgstr "Revisioner (förutom HEAD) kan ej anges vid flyttoperationer"
+#: ../libsvn_client/copy.c:2152
+#, fuzzy, c-format
+msgid "'%s' does not have a URL associated with it"
+msgstr "\"%s\" verkar inte ha någon URL associerad till sig"
 
-#: libsvn_client/delete.c:62
+#: ../libsvn_client/delete.c:59
 #, c-format
 msgid "'%s' is in the way of the resource actually under version control"
 msgstr "\"%s\" är i vägen för den versionshanterade resursen"
 
-#: libsvn_client/delete.c:67 libsvn_wc/adm_ops.c:2800 libsvn_wc/entries.c:1256
-#: libsvn_wc/entries.c:2367 libsvn_wc/entries.c:2970
-#: libsvn_wc/update_editor.c:2178
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "\"%s\" är inte versionshanterad"
+#: ../libsvn_client/delete.c:74
+#, fuzzy, c-format
+msgid "'%s' has local modifications -- commit or revert them first"
+msgstr "\"%s\" har lokala ändringar"
 
-#: libsvn_client/delete.c:77
+#: ../libsvn_client/delete.c:104
 #, c-format
-msgid "'%s' has local modifications"
-msgstr "\"%s\" har lokala ändringar"
+msgid "Cannot remove the file external at '%s'; please propedit or propdel the svn:externals description that created it"
+msgstr ""
+
+#: ../libsvn_client/delete.c:339 ../libsvn_client/locking_commands.c:200
+#: ../svn/delete-cmd.c:68 ../svn/diff-cmd.c:288 ../svn/lock-cmd.c:116
+#, fuzzy, c-format
+msgid "Cannot mix repository and working copy targets"
+msgstr "Sökväg är inte en fil i en arbetskopia"
+
+#: ../libsvn_client/deprecated.c:714 ../svn/move-cmd.c:65
+msgid "Cannot specify revisions (except HEAD) with move operations"
+msgstr "Revisioner (förutom HEAD) kan ej anges vid flyttoperationer"
 
-#: libsvn_client/diff.c:135
+#: ../libsvn_client/deprecated.c:1331
+msgid "No commits in repository"
+msgstr "Intenting har arkiverats i arkivet"
+
+#: ../libsvn_client/deprecated.c:2094 ../libsvn_wc/deprecated.c:3370
+#, fuzzy
+msgid "Non-recursive relocation not supported"
+msgstr "Omlokalisering mellan arkiv otillåten"
+
+#: ../libsvn_client/diff.c:136
 #, fuzzy, c-format
-msgid "   Reverted %s:r%s%s"
+msgid "   Reverse-merged %s:r%s%s"
 msgstr "Återställde \"%s\"\n"
 
-#: libsvn_client/diff.c:153
+#: ../libsvn_client/diff.c:151
 #, c-format
 msgid "   Merged %s:r%s%s"
 msgstr ""
 
-#: libsvn_client/diff.c:175
-#, c-format
-msgid "%sProperty changes on: %s%s"
-msgstr "%sEgenskapsändringar för: %s%s"
-
-#: libsvn_client/diff.c:203
+#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1226
+#: ../libsvn_diff/diff_file.c:1242
 #, c-format
-msgid "Name: %s%s"
-msgstr "Namn: %s%s"
+msgid "Path '%s' must be an immediate child of the directory '%s'"
+msgstr ""
 
-#: libsvn_client/diff.c:322
+#: ../libsvn_client/diff.c:359
 #, c-format
 msgid "%s\t(revision %ld)"
 msgstr "%s\t(revision %ld)"
 
-#: libsvn_client/diff.c:324
+#: ../libsvn_client/diff.c:361
 #, c-format
 msgid "%s\t(working copy)"
 msgstr "%s\t(arbetskopia)"
 
-#: libsvn_client/diff.c:467
+#: ../libsvn_client/diff.c:637
+#, c-format
+msgid "%sProperty changes on: %s%s"
+msgstr "%sEgenskapsändringar för: %s%s"
+
+#: ../libsvn_client/diff.c:921
 #, c-format
 msgid "Cannot display: file marked as a binary type.%s"
 msgstr "Kan inte visa: filen markerad som binär.%s"
 
-#. -----------------------------------------------------------------------
-#. ** Utilities. **
-#. Sanity check -- ensure that we have valid revisions to look at.
-#: libsvn_client/diff.c:827 libsvn_client/merge.c:66
+#: ../libsvn_client/diff.c:1326
+#, fuzzy, c-format
+msgid "Path '%s' has no URL"
+msgstr "\"%s\" saknar URL"
+
+#: ../libsvn_client/diff.c:1395 ../libsvn_client/merge.c:6304
+#: ../libsvn_client/merge.c:8984
 msgid "Not all required revisions are specified"
 msgstr "Alla revisioner som krävs angavs inte"
 
-#: libsvn_client/diff.c:842
+#: ../libsvn_client/diff.c:1410
 msgid "At least one revision must be non-local for a pegged diff"
 msgstr "Åtminstone en revision måste vara icke-lokal för fixerad diff"
 
-#: libsvn_client/diff.c:954 libsvn_client/diff.c:966
+#: ../libsvn_client/diff.c:1518 ../libsvn_client/diff.c:1530
 #, c-format
 msgid "'%s' was not found in the repository at revision %ld"
 msgstr "\"%s\" fanns inte i revision %ld i arkivet"
 
-#: libsvn_client/diff.c:1025
+#: ../libsvn_client/diff.c:1588
 #, fuzzy
-msgid "Sorry, svn_client_diff4 was called in a way that is not yet supported"
+msgid "Sorry, svn_client_diff5 was called in a way that is not yet supported"
 msgstr "Tyvärr anropades svn_client_diff3 på ett sätt som inte stöds ännu"
 
-#: libsvn_client/diff.c:1067
-msgid ""
-"Only diffs between a path's text-base and its working files are supported at "
-"this time"
-msgstr ""
-"Endast skillnader mellan en arbetskopias textbas och arbetsfilerna stöds för "
-"närvarande"
+#: ../libsvn_client/diff.c:1630
+msgid "Only diffs between a path's text-base and its working files are supported at this time"
+msgstr "Endast skillnader mellan en arbetskopias textbas och arbetsfilerna stöds för närvarande"
 
-#: libsvn_client/diff.c:1212 libsvn_client/switch.c:111
+#: ../libsvn_client/diff.c:1816 ../libsvn_client/switch.c:132
 #, c-format
 msgid "Directory '%s' has no URL"
 msgstr "Katalogen \"%s\" saknar URL"
 
-#: libsvn_client/diff.c:1421
+#: ../libsvn_client/diff.c:2064
 msgid "Summarizing diff can only compare repository to repository"
 msgstr "Summerande diff kan endast jämföra arkiv med arkiv"
 
-#: libsvn_client/export.c:87
+#: ../libsvn_client/export.c:92
 #, c-format
 msgid "'%s' is not a valid EOL value"
 msgstr "\"%s\" är inte ett giltigt radslutsvärde"
 
-#: libsvn_client/export.c:260
+#: ../libsvn_client/export.c:377
 msgid "Destination directory exists, and will not be overwritten unless forced"
-msgstr ""
-"Destinationskatalogen finns och kommer inte att skrivas över om det inte "
-"framtvingas"
+msgstr "Destinationskatalogen finns och kommer inte att skrivas över om det inte framtvingas"
 
-#: libsvn_client/export.c:358 libsvn_client/export.c:501
+#: ../libsvn_client/export.c:532 ../libsvn_client/export.c:678
 #, c-format
 msgid "'%s' exists and is not a directory"
 msgstr "\"%s\" finns och är ingen katalog"
 
-#: libsvn_client/export.c:362 libsvn_client/export.c:505
+#: ../libsvn_client/export.c:536 ../libsvn_client/export.c:682
 #, c-format
 msgid "'%s' already exists"
 msgstr "\"%s\" finns redan"
 
-#: libsvn_client/export.c:676 libsvn_wc/adm_crawler.c:1048
-#: libsvn_wc/update_editor.c:1873 libsvn_wc/update_editor.c:2475
+#: ../libsvn_client/export.c:866 ../libsvn_wc/update_editor.c:4161
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch for '%s':\n"
+"   expected:  %s\n"
+"     actual:  %s\n"
+msgstr ""
+"Felaktig kontrollsumma på representationen \"%s\":\n"
+"   väntade:  %s\n"
+"      fick:  %s\n"
+
+#: ../libsvn_client/externals.c:364
+#, c-format
+msgid "Cannot insert a file external from '%s' into a working copy from a different repository rooted at '%s'"
+msgstr ""
+
+#: ../libsvn_client/externals.c:401
+#, c-format
+msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'"
+msgstr ""
+
+#: ../libsvn_client/externals.c:427
+#, c-format
+msgid "The file external from '%s' cannot be written to '%s' while '%s' remains in conflict"
+msgstr ""
+
+#: ../libsvn_client/externals.c:536
+#, fuzzy, c-format
+msgid "URL '%s' does not begin with a scheme"
+msgstr "URL:en \"%s\" finns inte"
+
+#: ../libsvn_client/externals.c:603
+#, fuzzy, c-format
+msgid "Illegal parent directory URL '%s'"
+msgstr "Ogiltig svn-arkiv-URL \"%s\""
+
+#: ../libsvn_client/externals.c:639
+#, fuzzy, c-format
+msgid "Illegal repository root URL '%s'"
+msgstr "Ogiltig svn-arkiv-URL \"%s\""
+
+#: ../libsvn_client/externals.c:686
+#, c-format
+msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
+msgstr ""
+
+#: ../libsvn_client/externals.c:714
+#, fuzzy, c-format
+msgid "Unrecognized format for the relative external URL '%s'"
+msgstr "Okänd revisionstyp begärd för \"%s\""
+
+#: ../libsvn_client/externals.c:806
+#, fuzzy, c-format
+msgid "URL '%s' at revision %ld doesn't exist"
+msgstr "URL:en \"%s\" finns inte"
+
+#: ../libsvn_client/externals.c:812
+#, fuzzy, c-format
+msgid "URL '%s' at revision %ld is not a file or a directory"
+msgstr "\"%s\" är ingen fil eller katalog"
+
+#: ../libsvn_client/externals.c:1111
 #, c-format
-msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
-msgstr "Felaktig kontrollsumma för \"%s\"; väntade \"%s\", fick \"%s\""
+msgid "Traversal of '%s' found no ambient depth"
+msgstr ""
+
+#: ../libsvn_client/externals.c:1262
+#, fuzzy, c-format
+msgid "'%s' is not a URL"
+msgstr "Sökvägen \"%s\" är inte en URL"
+
+#: ../libsvn_client/info.c:103 ../libsvn_wc/crop.c:353
+#: ../libsvn_wc/props.c:271 ../libsvn_wc/update_editor.c:5358
+#: ../libsvn_wc/wc_db.c:596 ../libsvn_wc/wc_db.c:2039
+#: ../libsvn_wc/wc_db.c:2132 ../libsvn_wc/wc_db.c:2191
+#: ../libsvn_wc/wc_db.c:2215 ../libsvn_wc/wc_db.c:5456
+#: ../libsvn_wc/wc_db.c:5884 ../libsvn_wc/wc_db.c:6834
+#: ../libsvn_wc/wc_db.c:6952 ../libsvn_wc/wc_db.c:7016
+#: ../libsvn_wc/wc_db.c:7228 ../libsvn_wc/wc_db.c:8277
+#: ../libsvn_wc/wc_db.c:8457 ../libsvn_wc/wc_db.c:8795
+#, fuzzy, c-format
+msgid "The node '%s' was not found."
+msgstr "Sökvägen \"%s\" finns inte"
 
-#: libsvn_client/info.c:377 libsvn_client/info.c:402 libsvn_client/info.c:412
+#: ../libsvn_client/info.c:565
+#, fuzzy, c-format
+msgid "Server does not support retrieving information about the repository root"
+msgstr "Servern stöder ej funktionalitet för låsning"
+
+#: ../libsvn_client/info.c:572 ../libsvn_client/info.c:587
+#: ../libsvn_client/info.c:597
 #, c-format
 msgid "URL '%s' non-existent in revision %ld"
 msgstr "URL:en \"%s\" finns inte i revision %ld"
 
-#: libsvn_client/list.c:234
+#: ../libsvn_client/list.c:249
 #, c-format
 msgid "URL '%s' non-existent in that revision"
 msgstr "URL:en \"%s\" finns inte i den revisionen"
 
-#: libsvn_client/locking_commands.c:199
+#: ../libsvn_client/locking_commands.c:237
 msgid "No common parent found, unable to operate on disjoint arguments"
 msgstr "Ingen gemensam förälder finns; kan inte arbeta med disjunkta argument"
 
-#: libsvn_client/locking_commands.c:260 libsvn_client/merge.c:2521
-#: libsvn_client/merge.c:2527 libsvn_client/merge.c:2720
-#: libsvn_client/ra.c:375 libsvn_client/ra.c:741 libsvn_client/ra.c:878
+#: ../libsvn_client/locking_commands.c:282 ../libsvn_client/merge.c:9006
+#: ../libsvn_client/merge.c:9013 ../libsvn_client/merge.c:10240
+#: ../libsvn_client/merge.c:10515 ../libsvn_client/ra.c:484
+#: ../libsvn_client/ra.c:678 ../libsvn_client/update.c:99
 #, c-format
 msgid "'%s' has no URL"
 msgstr "\"%s\" saknar URL"
 
-#: libsvn_client/locking_commands.c:284
+#: ../libsvn_client/locking_commands.c:305
 msgid "Unable to lock/unlock across multiple repositories"
 msgstr "Kan inte låsa/låsa upp i flera arkiv samtidigt"
 
-#: libsvn_client/locking_commands.c:325
+#: ../libsvn_client/locking_commands.c:346
 #, c-format
 msgid "'%s' is not locked in this working copy"
 msgstr "\"%s\" är inte låst i den här arbetskopian"
 
-#: libsvn_client/locking_commands.c:373
+#: ../libsvn_client/locking_commands.c:391
 #, c-format
 msgid "'%s' is not locked"
 msgstr "\"%s\" är inte låst"
 
-#: libsvn_client/locking_commands.c:406 libsvn_fs/fs-loader.c:993
-#: libsvn_ra/ra_loader.c:863
+#: ../libsvn_client/locking_commands.c:425 ../libsvn_fs/fs-loader.c:1269
+#: ../libsvn_ra/ra_loader.c:1056
 #, fuzzy
 msgid "Lock comment contains illegal characters"
 msgstr "Låskommentaren innehåller ogiltiga tecken"
 
-#: libsvn_client/log.c:289
+#: ../libsvn_client/log.c:299 ../libsvn_client/log.c:357
 msgid "Missing required revision specification"
 msgstr "Revisionsspecifikation saknas"
 
-#: libsvn_client/log.c:352 libsvn_client/status.c:286
-#: libsvn_client/update.c:119
+#: ../libsvn_client/log.c:401
+#, fuzzy, c-format
+msgid "'%s' is not a relative path"
+msgstr "\"%s\" är ingen fil"
+
+#: ../libsvn_client/log.c:422
+msgid "When specifying working copy paths, only one target may be given"
+msgstr "Endast ett mål kan anges då sökvägar till arbetskopiro anges"
+
+#: ../libsvn_client/log.c:448 ../libsvn_client/status.c:388
 #, c-format
 msgid "Entry '%s' has no URL"
 msgstr "Posten \"%s\" saknar URL"
 
-#: libsvn_client/log.c:584
-msgid "No commits in repository"
-msgstr "Intenting har arkiverats i arkivet"
-
-#: libsvn_client/merge.c:92
+#: ../libsvn_client/merge.c:179
 #, c-format
 msgid "URLs have no scheme ('%s' and '%s')"
 msgstr "URL:erna har inget schema (\"%s\" och \"%s\")"
 
-#: libsvn_client/merge.c:98 libsvn_client/merge.c:104
+#: ../libsvn_client/merge.c:185 ../libsvn_client/merge.c:191
 #, c-format
 msgid "URL has no scheme: '%s'"
 msgstr "URL:en har inget schema: \"%s\""
 
-#: libsvn_client/merge.c:111
+#: ../libsvn_client/merge.c:198
 #, c-format
 msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
 msgstr "Blandning av åtkomstscheman stöds inte ännu (\"%s\" och \"%s\")"
@@ -1374,2904 +1874,3659 @@ msgstr "Blandning av åtkomstscheman st� #. xgettext: the '.working', '.merge-left.r%ld' and
 #. '.merge-right.r%ld' strings are used to tag onto a file
 #. name in case of a merge conflict
-#: libsvn_client/merge.c:333
+#: ../libsvn_client/merge.c:1482
 msgid ".working"
 msgstr ".arbetskopia"
 
-#: libsvn_client/merge.c:335
+#: ../libsvn_client/merge.c:1484
 #, c-format
 msgid ".merge-left.r%ld"
 msgstr ".sammanslagning-vänster.r%ld"
 
-#: libsvn_client/merge.c:338
+#: ../libsvn_client/merge.c:1487
 #, c-format
 msgid ".merge-right.r%ld"
 msgstr ".sammanslagning-höger.r%ld"
 
-#: libsvn_client/merge.c:1066
-#, fuzzy, c-format
-msgid "Path '%s' is missing"
-msgstr "Katalogen \"%s\" saknas"
+#: ../libsvn_client/merge.c:3957
+msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
+msgstr ""
+
+#: ../libsvn_client/merge.c:4661
+#, c-format
+msgid ""
+"One or more conflicts were produced while merging r%ld:%ld into\n"
+"'%s' --\n"
+"resolve all conflicts and rerun the merge to apply the remaining\n"
+"unmerged revisions"
+msgstr ""
+
+#: ../libsvn_client/merge.c:5820
+msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
+msgstr ""
+
+#: ../libsvn_client/merge.c:8502
+msgid "Use of two URLs is not compatible with mergeinfo modification"
+msgstr ""
+
+#: ../libsvn_client/merge.c:8509 ../libsvn_client/merge.c:8793
+msgid "Merge from foreign repository is not compatible with mergeinfo modification"
+msgstr ""
 
-#: libsvn_client/merge.c:1072 libsvn_wc/util.c:282
+#: ../libsvn_client/merge.c:8522 ../libsvn_client/merge.c:9021
+#: ../libsvn_client/merge.c:10523
 #, fuzzy, c-format
-msgid "Cannot find a URL for '%s'"
-msgstr "Kan inte hitta post för \"%s\""
+msgid "Merge target '%s' does not exist in the working copy"
+msgstr "\"%s\" är inte låst i den här arbetskopian"
+
+#: ../libsvn_client/merge.c:8896
+#, fuzzy
+msgid "Cannot merge into a working copy with a switched subtree"
+msgstr "Sökväg är inte en fil i en arbetskopia"
+
+#: ../libsvn_client/merge.c:8901
+#, fuzzy
+msgid "Cannot merge into a working copy that has local modifications"
+msgstr "Sökväg är inte en fil i en arbetskopia"
+
+#: ../libsvn_client/merge.c:8918
+#, fuzzy
+msgid "Cannot determine revision of working copy"
+msgstr "Sökväg är inte en fil i en arbetskopia"
 
-#: libsvn_client/merge.c:1488
+#: ../libsvn_client/merge.c:8924
 #, c-format
-msgid ""
-"Path '%s' is in conflict, and must be resolved before the remainder of the "
-"requested merge can be applied"
+msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
+msgstr ""
+
+#: ../libsvn_client/merge.c:8987 ../svn/merge-cmd.c:348
+msgid "Merge sources must both be either paths or URLs"
 msgstr ""
 
-#: libsvn_client/merge.c:1852 libsvn_client/merge.c:2209
-msgid "Use of two URLs is not compatible with merge info modification"
+#: ../libsvn_client/merge.c:9059 ../libsvn_ra/ra_loader.c:539
+#, c-format
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr "\"%s\" är inte i samma arkiv som \"%s\""
+
+#: ../libsvn_client/merge.c:10057 ../libsvn_client/merge.c:10348
+#, c-format
+msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
 msgstr ""
 
-#: libsvn_client/merge.c:2758
+#: ../libsvn_client/merge.c:10258
+#, fuzzy, c-format
+msgid "'%s' must be from the same repository as '%s'"
+msgstr "\"%s\" är inte i samma arkiv som \"%s\""
+
+#: ../libsvn_client/merge.c:10290
+#, fuzzy, c-format
+msgid "Neither the reintegrate source nor target can be the root of the repository"
+msgstr "\"%s\" är inte arkivets rot"
+
+#: ../libsvn_client/merge.c:10376
 #, c-format
 msgid ""
-"Unable to determine merge source for '%s', please provide an explicit source"
+"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n"
+"%s"
+msgstr ""
+
+#: ../libsvn_client/mergeinfo.c:1721
+msgid "Only depths 'infinity' and 'empty' are currently supported"
 msgstr ""
 
-#: libsvn_client/prop_commands.c:73
+#: ../libsvn_client/patch.c:243
+#, fuzzy, c-format
+msgid "Cannot strip %u components from '%s'"
+msgstr "Kan inte skriva egenskapstabell för \"%s\""
+
+#: ../libsvn_client/patch.c:2754
+#, fuzzy
+msgid "strip count must be positive"
+msgstr "Argumentet till --limit måste vara positivt"
+
+#: ../libsvn_client/prop_commands.c:80
 #, c-format
 msgid "'%s' is a wcprop, thus not accessible to clients"
 msgstr "'%s' är en wcprop; ej tillgänglig för klienter"
 
-#: libsvn_client/prop_commands.c:216
+#: ../libsvn_client/prop_commands.c:216
 #, c-format
 msgid "Property '%s' is not a regular property"
 msgstr "Egenskapen \"%s\" är inte en vanlig egenskap"
 
-#: libsvn_client/prop_commands.c:320
+#: ../libsvn_client/prop_commands.c:363
 #, c-format
 msgid "Revision property '%s' not allowed in this context"
 msgstr "Revisionsegenskapen \"%s\" är inte tillåten här"
 
-#: libsvn_client/prop_commands.c:328 libsvn_client/prop_commands.c:443
+#: ../libsvn_client/prop_commands.c:370 ../libsvn_client/prop_commands.c:524
 #, c-format
 msgid "Bad property name: '%s'"
 msgstr "Felaktigt egenskapsnamn: \"%s\""
 
-#: libsvn_client/prop_commands.c:339
+#: ../libsvn_client/prop_commands.c:380
 #, c-format
 msgid "Setting property on non-local target '%s' needs a base revision"
-msgstr ""
-"Att sätta en egenskap på målet \"%s\" som inte är lokalt kräver en "
-"basrevision"
+msgstr "Att sätta en egenskap på målet \"%s\" som inte är lokalt kräver en basrevision"
 
-#: libsvn_client/prop_commands.c:345
+#: ../libsvn_client/prop_commands.c:385
 #, c-format
 msgid "Setting property recursively on non-local target '%s' is not supported"
+msgstr "Att sätta en egenskap rekursivt på målet \"%s\" som inte är lokalt stöds inte"
+
+#: ../libsvn_client/prop_commands.c:400
+#, fuzzy, c-format
+msgid "Setting property '%s' on non-local target '%s' is not supported"
+msgstr "Att sätta en egenskap rekursivt på målet \"%s\" som inte är lokalt stöds inte"
+
+#: ../libsvn_client/prop_commands.c:471
+#, c-format
+msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else deleted it?)"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:480
+#, c-format
+msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else changed it?)"
+msgstr ""
+
+#: ../libsvn_client/prop_commands.c:488
+#, c-format
+msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)"
 msgstr ""
-"Att sätta en egenskap rekursivt på målet \"%s\" som inte är lokalt stöds inte"
 
-#: libsvn_client/prop_commands.c:439
-msgid "Value will not be set unless forced"
+#: ../libsvn_client/prop_commands.c:519
+#, fuzzy
+msgid "Author name should not contain a newline; value will not be set unless forced"
 msgstr "Värdet sätts inte utan att det framtvingas"
 
-#: libsvn_client/prop_commands.c:659
+#: ../libsvn_client/prop_commands.c:764
 #, c-format
 msgid "'%s' does not exist in revision %ld"
 msgstr "\"%s\" finns inte i revision %ld"
 
-#: libsvn_client/prop_commands.c:666 libsvn_client/prop_commands.c:949
+#: ../libsvn_client/prop_commands.c:771 ../libsvn_client/prop_commands.c:1089
+#: ../libsvn_wc/crop.c:183
 #, c-format
 msgid "Unknown node kind for '%s'"
 msgstr "Okänd nodtyp för \"%s\""
 
-#: libsvn_client/ra.c:133
+#: ../libsvn_client/ra.c:145
 #, c-format
 msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
-msgstr ""
-"Försök att sätta wcporp \"%s\" på \"%s\" under en operation som ej är "
-"arkivering"
+msgstr "Försök att sätta wcporp \"%s\" på \"%s\" under en operation som ej är arkivering"
 
-#: libsvn_client/ra.c:496
+#: ../libsvn_client/ra.c:378
 #, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "Saknar information om änrade sökvägar för \"%s\" i revision %ld"
-
-#: libsvn_client/ra.c:616
-#, fuzzy, c-format
-msgid "Path '%s' doesn't exist in revision %ld"
-msgstr "Sökvägen \"%s\" finns inte i revision %ld"
+msgid "Redirect cycle detected for URL '%s'"
+msgstr ""
 
-#: libsvn_client/ra.c:663 libsvn_client/ra.c:826
+#: ../libsvn_client/ra.c:750 ../libsvn_ra/compat.c:376
 #, c-format
 msgid "Unable to find repository location for '%s' in revision %ld"
 msgstr "Kan inte hitta platsen i arkivet för \"%s\" i revision %ld"
 
-#: libsvn_client/ra.c:674
-#, c-format
-msgid "'%s' in revision %ld is an unrelated object"
-msgstr "\"%s\" i revision %ld är ett orelaterat objekt"
-
-#: libsvn_client/ra.c:831
+#: ../libsvn_client/ra.c:757
 #, c-format
-msgid ""
-"The location for '%s' for revision %ld does not exist in the repository or "
-"refers to an unrelated object"
-msgstr ""
-"Platsen för \"%s\" i revision %ld finns inte i arkivet eller är ett "
-"orelaterat objekt"
+msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object"
+msgstr "Platsen för \"%s\" i revision %ld finns inte i arkivet eller är ett orelaterat objekt"
 
-#: libsvn_client/relocate.c:101
+#: ../libsvn_client/relocate.c:115
 #, c-format
 msgid "'%s' is not the root of the repository"
 msgstr "\"%s\" är inte arkivets rot"
 
-#: libsvn_client/relocate.c:108
+#: ../libsvn_client/relocate.c:122
 #, c-format
 msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
 msgstr "Arkivet på \"%s\" har uuid \"%s\", men arbetskopian har \"%s\""
 
-#: libsvn_client/revisions.c:93
+#: ../libsvn_client/revisions.c:113 ../libsvn_client/revisions.c:136
 #, c-format
 msgid "Path '%s' has no committed revision"
 msgstr "Sökvägen \"%s\" saknar senaste arkiveringsrevision"
 
-#: libsvn_client/revisions.c:103
+#: ../libsvn_client/revisions.c:162
 #, c-format
 msgid "Unrecognized revision type requested for '%s'"
 msgstr "Okänd revisionstyp begärd för \"%s\""
 
-#: libsvn_client/switch.c:135 libsvn_ra_local/ra_plugin.c:108
-#: libsvn_ra_local/ra_plugin.c:597 libsvn_wc/update_editor.c:2617
-#, c-format
-msgid ""
-"'%s'\n"
-"is not the same repository as\n"
-"'%s'"
+#: ../libsvn_client/revisions.c:185
+msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
 msgstr ""
-"\"%s\"\n"
-"är inte samma arkiv som\n"
-"\"%s\""
 
-#: libsvn_client/switch.c:150
-#, fuzzy, c-format
-msgid "Destination does not exist: '%s'"
-msgstr "Destinationen \"%s\" finns redan"
+#: ../libsvn_client/status.c:302 ../libsvn_client/status.c:331
+#: ../libsvn_client/status.c:340 ../libsvn_client/status.c:533
+#: ../libsvn_wc/lock.c:539 ../libsvn_wc/lock.c:899 ../libsvn_wc/lock.c:1598
+#: ../libsvn_wc/wc_db.c:7808 ../libsvn_wc/wc_db_pdh.c:485
+#, c-format
+msgid "'%s' is not a working copy"
+msgstr "\"%s\" är ingen arbetskopia"
 
-#: libsvn_client/update.c:145 libsvn_wc/log.c:2573
+#: ../libsvn_client/switch.c:102
 #, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "\"%s\" är ingen katalog i en arbetskopia"
+msgid "Cannot both exclude and switch a path"
+msgstr ""
+
+#: ../libsvn_client/switch.c:175 ../libsvn_ra_local/ra_plugin.c:199
+#: ../libsvn_ra_local/ra_plugin.c:275 ../libsvn_wc/update_editor.c:5032
+#, c-format
+msgid ""
+"'%s'\n"
+"is not the same repository as\n"
+"'%s'"
+msgstr ""
+"\"%s\"\n"
+"är inte samma arkiv som\n"
+"\"%s\""
 
-#: libsvn_client/update.c:153
+#: ../libsvn_client/util.c:215
 #, fuzzy, c-format
-msgid "'%s' is neither a file nor a directory"
-msgstr "\"%s\" är varken ett fil- eller katalognamn"
+msgid "URL '%s' is not a child of repository root URL '%s'"
+msgstr "\"%s\" är inte i samma arkiv som \"%s\""
 
-#: libsvn_delta/svndiff.c:144
+#: ../libsvn_delta/svndiff.c:165
 msgid "Compression of svndiff data failed"
 msgstr "Misslyckades med att komprimera svndiff-data"
 
-#: libsvn_delta/svndiff.c:407
+#: ../libsvn_delta/svndiff.c:432
+#, fuzzy
+msgid "Decompression of svndiff data failed: no size"
+msgstr "Misslyckades med att packa upp svndiff-data"
+
+#: ../libsvn_delta/svndiff.c:435
+#, fuzzy
+msgid "Decompression of svndiff data failed: size too large"
+msgstr "Misslyckades med att packa upp svndiff-data"
+
+#: ../libsvn_delta/svndiff.c:456
 msgid "Decompression of svndiff data failed"
 msgstr "Misslyckades med att packa upp svndiff-data"
 
-#: libsvn_delta/svndiff.c:414
+#: ../libsvn_delta/svndiff.c:463
 msgid "Size of uncompressed data does not match stored original length"
 msgstr "Storleken på uppackad data stämmer inte med lagrad originallängd"
 
-#: libsvn_delta/svndiff.c:484
+#: ../libsvn_delta/svndiff.c:538
 #, c-format
 msgid "Invalid diff stream: insn %d cannot be decoded"
 msgstr "Ogiltig diff-ström: instruktionen %d kan inte avkodas"
 
-#: libsvn_delta/svndiff.c:488
-#, c-format
-msgid "Invalid diff stream: insn %d has non-positive length"
+#: ../libsvn_delta/svndiff.c:542
+#, fuzzy, c-format
+msgid "Invalid diff stream: insn %d has length zero"
 msgstr "Ogiltig diff-ström: instruktionen %d har ogiltig längd"
 
-#: libsvn_delta/svndiff.c:492
+#: ../libsvn_delta/svndiff.c:546
 #, c-format
 msgid "Invalid diff stream: insn %d overflows the target view"
 msgstr "Ogiltig diff-ström: instruktionen %d går utanför målet"
 
-#: libsvn_delta/svndiff.c:500
+#: ../libsvn_delta/svndiff.c:555
 #, c-format
 msgid "Invalid diff stream: [src] insn %d overflows the source view"
 msgstr "Ogiltig diff-ström: [src] instruktion %d går utanför källan"
 
-#: libsvn_delta/svndiff.c:507
+#: ../libsvn_delta/svndiff.c:562
 #, c-format
-msgid ""

[... 13175 lines stripped ...]


Mime
View raw message