Modified: subversion/branches/shelve-checkpoint/subversion/po/sv.po URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/po/sv.po?rev=1829257&r1=1829256&r2=1829257&view=diff ============================================================================== --- subversion/branches/shelve-checkpoint/subversion/po/sv.po [UTF-8] (original) +++ subversion/branches/shelve-checkpoint/subversion/po/sv.po [UTF-8] Mon Apr 16 12:21:02 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: 2013-07-19 18:01+0200\n" -"PO-Revision-Date: 2013-05-04 12:03+0200\n" +"POT-Creation-Date: 2018-03-12 16:55+0100\n" +"PO-Revision-Date: 2018-03-12 16:58+0100\n" "Last-Translator: Subversion Developers <d...@subversion.apache.org>\n" "Language-Team: Swedish <d...@subversion.apache.org>\n" "Language: sv\n" @@ -123,72 +123,72 @@ msgstr "" #. 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:81 +#: ../include/private/svn_fs_util.h:86 #, 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:86 +#: ../include/private/svn_fs_util.h:91 #, 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:97 +#: ../include/private/svn_fs_util.h:102 #, 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:102 +#: ../include/private/svn_fs_util.h:107 #, 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:110 +#: ../include/private/svn_fs_util.h:115 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:117 +#: ../include/private/svn_fs_util.h:122 #, 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:124 +#: ../include/private/svn_fs_util.h:129 #, 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:131 +#: ../include/private/svn_fs_util.h:136 #, 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:139 +#: ../include/private/svn_fs_util.h:144 #, 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:146 +#: ../include/private/svn_fs_util.h:151 #, 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:153 +#: ../include/private/svn_fs_util.h:158 #, 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:160 +#: ../include/private/svn_fs_util.h:165 #, c-format msgid "No username is currently associated with filesystem '%s'" msgstr "Inget användarnamn är kopplat till filsystemet \"%s\"" @@ -196,1237 +196,1437 @@ msgstr "Inget användarnamn är kopplat #. 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:169 +#: ../include/private/svn_fs_util.h:174 #, 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:164 +#: ../include/svn_error_codes.h:166 msgid "Bad parent pool passed to svn_make_pool()" msgstr "Felaktig föräldrapool skickad till svn_make_pool()" -#: ../include/svn_error_codes.h:168 +#: ../include/svn_error_codes.h:170 msgid "Bogus filename" msgstr "Felaktigt filnamn" -#: ../include/svn_error_codes.h:172 +#: ../include/svn_error_codes.h:174 msgid "Bogus URL" msgstr "Felaktig URL" -#: ../include/svn_error_codes.h:176 +#: ../include/svn_error_codes.h:178 msgid "Bogus date" msgstr "Felaktigt datum" -#: ../include/svn_error_codes.h:180 +#: ../include/svn_error_codes.h:182 msgid "Bogus mime-type" msgstr "Felaktig MIME-typ" -#: ../include/svn_error_codes.h:190 +#: ../include/svn_error_codes.h:192 msgid "Wrong or unexpected property value" msgstr "Felaktigt eller oväntat egenskapsvärde" -#: ../include/svn_error_codes.h:194 +#: ../include/svn_error_codes.h:196 msgid "Version file format not correct" msgstr "Felaktigt format på versionsfil" -#: ../include/svn_error_codes.h:198 +#: ../include/svn_error_codes.h:200 msgid "Path is not an immediate child of the specified directory" msgstr "Sökvägen står inte omedelbart under angiven katalog" -#: ../include/svn_error_codes.h:202 +#: ../include/svn_error_codes.h:204 msgid "Bogus UUID" msgstr "Felaktig UUID" -#: ../include/svn_error_codes.h:207 ../include/svn_error_codes.h:959 +#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1041 msgid "Invalid configuration value" msgstr "Ogiltigt konfigurationsvärde" -#: ../include/svn_error_codes.h:211 +#: ../include/svn_error_codes.h:213 msgid "Bogus server specification" msgstr "Felaktig serverangivelse" -#: ../include/svn_error_codes.h:215 +#: ../include/svn_error_codes.h:217 msgid "Unsupported checksum type" msgstr "Kontrollsummetypen stöds ej" -#: ../include/svn_error_codes.h:219 +#: ../include/svn_error_codes.h:221 msgid "Invalid character in hex checksum" msgstr "Ogiltigt tecken i hexadecimal kontrollsumma" -#: ../include/svn_error_codes.h:224 +#: ../include/svn_error_codes.h:226 msgid "Unknown string value of token" msgstr "Okänt strängvärde på identifierare" -#: ../include/svn_error_codes.h:229 +#: ../include/svn_error_codes.h:231 msgid "Invalid changelist name" msgstr "Ogiltig namn på ändringslista" -#: ../include/svn_error_codes.h:234 +#: ../include/svn_error_codes.h:236 msgid "Invalid atomic" msgstr "Ogiltig odelbar operation" -#: ../include/svn_error_codes.h:239 -#, fuzzy +#: ../include/svn_error_codes.h:241 msgid "Invalid compression method" -msgstr "Ogiltig fixerad revision %ld" +msgstr "Ogiltig kompressionsmetod" + +#: ../include/svn_error_codes.h:246 +msgid "Unexpected line ending in the property value" +msgstr "Oväntat radslut i egenskapsvärdet" -#: ../include/svn_error_codes.h:245 +#: ../include/svn_error_codes.h:252 msgid "No such XML tag attribute" msgstr "XML-attribut saknas" -#: ../include/svn_error_codes.h:249 +#: ../include/svn_error_codes.h:256 msgid "<delta-pkg> is missing ancestry" msgstr "<delta-pkg> saknar ursprung" -#: ../include/svn_error_codes.h:253 +#: ../include/svn_error_codes.h:260 msgid "Unrecognized binary data encoding; can't decode" msgstr "Okänd kodning av binärdata; kan inte avkoda" -#: ../include/svn_error_codes.h:257 +#: ../include/svn_error_codes.h:264 msgid "XML data was not well-formed" msgstr "XML var inte välformad" -#: ../include/svn_error_codes.h:261 +#: ../include/svn_error_codes.h:268 msgid "Data cannot be safely XML-escaped" msgstr "Data kan inte skyddas för lagring som XML" -#: ../include/svn_error_codes.h:266 -#, fuzzy +#: ../include/svn_error_codes.h:273 msgid "Unexpected XML element found" -msgstr "Oväntad nodtyp funnen" +msgstr "Oväntat XML-element funnet" -#: ../include/svn_error_codes.h:272 +#: ../include/svn_error_codes.h:279 msgid "Inconsistent line ending style" msgstr "Inkonsekventa radslutstecken" -#: ../include/svn_error_codes.h:276 +#: ../include/svn_error_codes.h:283 msgid "Unrecognized line ending style" msgstr "Okänt sätt att markera radslut" -#: ../include/svn_error_codes.h:281 +#: ../include/svn_error_codes.h:288 msgid "Line endings other than expected" msgstr "Andra radslutstecken än väntat" -#: ../include/svn_error_codes.h:285 +#: ../include/svn_error_codes.h:292 msgid "Ran out of unique names" msgstr "Kunde inte generera fler unika namn" -#: ../include/svn_error_codes.h:290 +#: ../include/svn_error_codes.h:297 msgid "Framing error in pipe protocol" msgstr "Ramfel i rörprotokoll" -#: ../include/svn_error_codes.h:295 +#: ../include/svn_error_codes.h:302 msgid "Read error in pipe" msgstr "Läsfel i rör" -#: ../include/svn_error_codes.h:299 ../libsvn_subr/cmdline.c:362 -#: ../libsvn_subr/cmdline.c:385 ../svn/util.c:564 ../svnlook/svnlook.c:2008 +#. is errno on POSIX +#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:435 +#: ../libsvn_subr/cmdline.c:466 ../libsvn_subr/cmdline.c:489 ../svn/util.c:571 +#: ../svnlook/svnlook.c:2034 #, c-format msgid "Write error" msgstr "Fel vid skrivning" -#: ../include/svn_error_codes.h:304 +#: ../include/svn_error_codes.h:311 msgid "Write error in pipe" msgstr "Skrivfel i rör" -#: ../include/svn_error_codes.h:310 +#: ../include/svn_error_codes.h:317 msgid "Unexpected EOF on stream" msgstr "Oväntat filslut i ström" -#: ../include/svn_error_codes.h:314 +#: ../include/svn_error_codes.h:321 msgid "Malformed stream data" msgstr "Felaktig data i ström" -#: ../include/svn_error_codes.h:318 +#: ../include/svn_error_codes.h:325 msgid "Unrecognized stream data" msgstr "Okänd data i ström" -#: ../include/svn_error_codes.h:323 +#: ../include/svn_error_codes.h:330 msgid "Stream doesn't support seeking" msgstr "Strömmen stöder ej positionering" -#: ../include/svn_error_codes.h:329 +#: ../include/svn_error_codes.h:335 +msgid "Stream doesn't support this capability" +msgstr "Strömmen stöder ej denna förmåga" + +#: ../include/svn_error_codes.h:341 msgid "Unknown svn_node_kind" msgstr "Okänd svn_node_kind" -#: ../include/svn_error_codes.h:333 +#: ../include/svn_error_codes.h:345 msgid "Unexpected node kind found" msgstr "Oväntad nodtyp funnen" -#: ../include/svn_error_codes.h:339 +#: ../include/svn_error_codes.h:351 msgid "Can't find an entry" msgstr "Kan inte hitta post" -#: ../include/svn_error_codes.h:345 +#: ../include/svn_error_codes.h:357 msgid "Entry already exists" msgstr "Posten finns redan" -#: ../include/svn_error_codes.h:349 +#: ../include/svn_error_codes.h:361 msgid "Entry has no revision" msgstr "Posten saknar revision" -#: ../include/svn_error_codes.h:353 +#: ../include/svn_error_codes.h:365 msgid "Entry has no URL" msgstr "Posten saknar URL" -#: ../include/svn_error_codes.h:357 +#: ../include/svn_error_codes.h:369 msgid "Entry has an invalid attribute" msgstr "Ogiltigt attribut i post" -#: ../include/svn_error_codes.h:361 +#: ../include/svn_error_codes.h:373 msgid "Can't create an entry for a forbidden name" msgstr "Kan inte skapa post för otillåtet namn" -#: ../include/svn_error_codes.h:367 +#: ../include/svn_error_codes.h:379 msgid "Obstructed update" msgstr "Blockerad uppdatering" -#: ../include/svn_error_codes.h:372 +#: ../include/svn_error_codes.h:384 msgid "Mismatch popping the WC unwind stack" msgstr "Fel vid upprullning av arbetskopiestacken" -#: ../include/svn_error_codes.h:377 +#: ../include/svn_error_codes.h:389 msgid "Attempt to pop empty WC unwind stack" msgstr "Försök att rulla upp tom arbetskopiestack" -#: ../include/svn_error_codes.h:382 +#: ../include/svn_error_codes.h:394 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:386 +#: ../include/svn_error_codes.h:398 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:390 +#: ../include/svn_error_codes.h:402 msgid "Working copy not locked; this is probably a bug, please report" msgstr "Arbetskopian är inte låst; detta är troligen ett programfel, vänligen rapportera det" -#: ../include/svn_error_codes.h:395 +#: ../include/svn_error_codes.h:407 msgid "Invalid lock" msgstr "Ogiltigt lås" -#: ../include/svn_error_codes.h:401 ../include/svn_error_codes.h:407 +#: ../include/svn_error_codes.h:413 ../include/svn_error_codes.h:419 msgid "Path is not a working copy directory" msgstr "Sökvägen är ingen katalog i en arbetskopia" -#: ../include/svn_error_codes.h:411 +#: ../include/svn_error_codes.h:423 msgid "Path is not a working copy file" msgstr "Sökväg är inte en fil i en arbetskopia" -#: ../include/svn_error_codes.h:415 +#: ../include/svn_error_codes.h:427 msgid "Problem running log" msgstr "Problem vid körning av logg" -#: ../include/svn_error_codes.h:419 +#: ../include/svn_error_codes.h:431 msgid "Can't find a working copy path" msgstr "Kan inte hitta sökväg till arbetskopia" -#: ../include/svn_error_codes.h:423 +#: ../include/svn_error_codes.h:435 msgid "Working copy is not up-to-date" msgstr "Arbetskopian är inaktuell" -#: ../include/svn_error_codes.h:427 +#: ../include/svn_error_codes.h:439 msgid "Left locally modified or unversioned files" msgstr "Lämnade kvar lokalt ändrade eller icke versionshanterade filer" -#: ../include/svn_error_codes.h:431 +#: ../include/svn_error_codes.h:443 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:435 +#: ../include/svn_error_codes.h:447 msgid "Found a working copy path" msgstr "Hittade sökväg till arbetskopia" -#: ../include/svn_error_codes.h:439 +#: ../include/svn_error_codes.h:451 msgid "A conflict in the working copy obstructs the current operation" msgstr "En konflikt i arbetskopian blockerar operationen" -#: ../include/svn_error_codes.h:443 +#: ../include/svn_error_codes.h:455 msgid "Working copy is corrupt" msgstr "Förstörd arbetskopia" -#: ../include/svn_error_codes.h:447 +#: ../include/svn_error_codes.h:459 msgid "Working copy text base is corrupt" msgstr "Förstörd textbas i arbetskopia" -#: ../include/svn_error_codes.h:451 +#: ../include/svn_error_codes.h:463 msgid "Cannot change node kind" msgstr "Kan inte ändra nodtyp" -#: ../include/svn_error_codes.h:455 +#: ../include/svn_error_codes.h:467 msgid "Invalid operation on the current working directory" msgstr "Ogiltig operation på aktuell katalog" -#: ../include/svn_error_codes.h:459 +#: ../include/svn_error_codes.h:471 msgid "Problem on first log entry in a working copy" msgstr "Problem med första loggposten i arbetskopia" -#: ../include/svn_error_codes.h:463 +#: ../include/svn_error_codes.h:475 msgid "Unsupported working copy format" msgstr "Formatet på arbetskopian stöds ej" -#: ../include/svn_error_codes.h:467 +#: ../include/svn_error_codes.h:479 msgid "Path syntax not supported in this context" msgstr "Sökvägssyntax stöds ej i detta sammanhang" -#: ../include/svn_error_codes.h:472 +#: ../include/svn_error_codes.h:484 msgid "Invalid schedule" msgstr "Ogiltig schemaläggning" -#: ../include/svn_error_codes.h:477 +#: ../include/svn_error_codes.h:489 msgid "Invalid relocation" msgstr "Ogiltig omlokalisering" -#: ../include/svn_error_codes.h:482 +#: ../include/svn_error_codes.h:494 msgid "Invalid switch" msgstr "Ogiltig flagga" -#: ../include/svn_error_codes.h:487 +#: ../include/svn_error_codes.h:499 msgid "Changelist doesn't match" msgstr "Ändringslistan stämmer inte" -#: ../include/svn_error_codes.h:492 +#: ../include/svn_error_codes.h:504 msgid "Conflict resolution failed" msgstr "Konfliktlösningen misslyckades" -#: ../include/svn_error_codes.h:496 +#: ../include/svn_error_codes.h:508 msgid "Failed to locate 'copyfrom' path in working copy" msgstr "Hittade inte \"copyfrom\"-sökvägen i arbetskopian" -#: ../include/svn_error_codes.h:504 +#: ../include/svn_error_codes.h:516 msgid "Moving a path from one changelist to another" msgstr "Flyttar en sökväg från en ändringslista till en annan" -#: ../include/svn_error_codes.h:509 +#: ../include/svn_error_codes.h:521 msgid "Cannot delete a file external" msgstr "Kan inte radera en extern fil" -#: ../include/svn_error_codes.h:514 +#: ../include/svn_error_codes.h:526 msgid "Cannot move a file external" msgstr "Kan inte flytta en extern fil" -#: ../include/svn_error_codes.h:519 +#: ../include/svn_error_codes.h:531 msgid "Something's amiss with the wc sqlite database" msgstr "Något är på tok med arbetskopians sqlite-databas" -#: ../include/svn_error_codes.h:524 +#: ../include/svn_error_codes.h:536 msgid "The working copy is missing" msgstr "Arbetskopian saknas" -#: ../include/svn_error_codes.h:529 +#: ../include/svn_error_codes.h:541 msgid "The specified node is not a symlink" msgstr "Angiven nod är ej en länk" -#: ../include/svn_error_codes.h:534 +#: ../include/svn_error_codes.h:546 msgid "The specified path has an unexpected status" msgstr "Den angivna sökvägen befinner sig i ett oväntat tillstånd" -#: ../include/svn_error_codes.h:539 +#: ../include/svn_error_codes.h:551 msgid "The working copy needs to be upgraded" msgstr "Arbetskopian måste uppgraderas" -#: ../include/svn_error_codes.h:544 +#: ../include/svn_error_codes.h:556 msgid "Previous operation has not finished; run 'cleanup' if it was interrupted" msgstr "En tidigare handling är inte färdig; kör \"cleanup\" om den avbröts" -#: ../include/svn_error_codes.h:550 +#: ../include/svn_error_codes.h:562 msgid "The operation cannot be performed with the specified depth" msgstr "Handlingen kan inte utföras med det angivna djupet" -#: ../include/svn_error_codes.h:555 +#: ../include/svn_error_codes.h:567 msgid "Couldn't open a working copy file because access was denied" msgstr "Kunde inte öppna en fil i arbetskopian eftersom åtkomst nekades" -#: ../include/svn_error_codes.h:560 +#: ../include/svn_error_codes.h:572 msgid "Mixed-revision working copy was found but not expected" msgstr "Arbetskopia med blandad revision hittades men väntades ej" -#: ../include/svn_error_codes.h:565 +#: ../include/svn_error_codes.h:577 msgid "Duplicate targets in svn:externals property" msgstr "Dubblettmål i svn:externals-egenskap" -#: ../include/svn_error_codes.h:571 +#: ../include/svn_error_codes.h:583 msgid "General filesystem error" msgstr "Allmänt filsystemsfel" -#: ../include/svn_error_codes.h:575 +#: ../include/svn_error_codes.h:587 msgid "Error closing filesystem" msgstr "Fel vid stängning av filsystem" -#: ../include/svn_error_codes.h:579 +#: ../include/svn_error_codes.h:591 msgid "Filesystem is already open" msgstr "Filsystemet är redan öppet" -#: ../include/svn_error_codes.h:583 +#: ../include/svn_error_codes.h:595 msgid "Filesystem is not open" msgstr "Filsystemet är ej öppet" -#: ../include/svn_error_codes.h:587 +#: ../include/svn_error_codes.h:599 msgid "Filesystem is corrupt" msgstr "Förstört filsystem" -#: ../include/svn_error_codes.h:591 +#: ../include/svn_error_codes.h:603 msgid "Invalid filesystem path syntax" msgstr "Ogiltig syntax för sökväg i filsystem" -#: ../include/svn_error_codes.h:595 +#: ../include/svn_error_codes.h:607 msgid "Invalid filesystem revision number" msgstr "Ogiltigt revisionsnummer för filsystem" -#: ../include/svn_error_codes.h:599 +#: ../include/svn_error_codes.h:611 msgid "Invalid filesystem transaction name" msgstr "Ogiltigt transaktionsnamn för filsystem" -#: ../include/svn_error_codes.h:603 +#: ../include/svn_error_codes.h:615 msgid "Filesystem directory has no such entry" msgstr "Katalog i filsystem saknar post med det namnet" -#: ../include/svn_error_codes.h:607 +#: ../include/svn_error_codes.h:619 msgid "Filesystem has no such representation" msgstr "Representation saknas i filsystem" -#: ../include/svn_error_codes.h:611 +#: ../include/svn_error_codes.h:623 msgid "Filesystem has no such string" msgstr "Sträng saknas i filsystem" -#: ../include/svn_error_codes.h:615 +#: ../include/svn_error_codes.h:627 msgid "Filesystem has no such copy" msgstr "Kopia saknas i filsystem" -#: ../include/svn_error_codes.h:619 +#: ../include/svn_error_codes.h:631 msgid "The specified transaction is not mutable" msgstr "Angiven transaktion går ej att ändra" -#: ../include/svn_error_codes.h:623 +#: ../include/svn_error_codes.h:635 msgid "Filesystem has no item" msgstr "Filsystem saknar objekt" -#: ../include/svn_error_codes.h:627 +#: ../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:631 +#: ../include/svn_error_codes.h:643 msgid "String does not represent a node or node-rev-id" msgstr "Strängen representerar ingen nod eller node-rev-id" -#: ../include/svn_error_codes.h:635 +#: ../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:639 +#: ../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:643 +#: ../include/svn_error_codes.h:655 msgid "Name is not a single path component" msgstr "Namnet är ej en ensam sökvägskomponent" -#: ../include/svn_error_codes.h:647 +#: ../include/svn_error_codes.h:659 msgid "Attempt to change immutable filesystem node" msgstr "Försök att ändra filsystemsnod som ej får ändras" -#: ../include/svn_error_codes.h:651 +#: ../include/svn_error_codes.h:663 msgid "Item already exists in filesystem" msgstr "Objektet finns redan i filsystemet" -#: ../include/svn_error_codes.h:655 +#: ../include/svn_error_codes.h:667 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:659 +#: ../include/svn_error_codes.h:671 msgid "Object is not a transaction root" msgstr "Objektet är ingen transaktionsrot" -#: ../include/svn_error_codes.h:663 +#: ../include/svn_error_codes.h:675 msgid "Object is not a revision root" msgstr "Objektet är ingen revisionsrot" -#: ../include/svn_error_codes.h:667 +#: ../include/svn_error_codes.h:679 msgid "Merge conflict during commit" msgstr "Sammanslagningskonflikt vid arkivering" -#: ../include/svn_error_codes.h:671 +#: ../include/svn_error_codes.h:683 msgid "A representation vanished or changed between reads" msgstr "Representation försvann eller ändrades mellan läsningar" -#: ../include/svn_error_codes.h:675 +#: ../include/svn_error_codes.h:687 msgid "Tried to change an immutable representation" msgstr "Försök att ändra representation som ej får ändras" -#: ../include/svn_error_codes.h:679 +#: ../include/svn_error_codes.h:691 msgid "Malformed skeleton data" msgstr "Felaktig skelettdata" -#: ../include/svn_error_codes.h:683 +#: ../include/svn_error_codes.h:695 msgid "Transaction is out of date" msgstr "Transaktionen är inaktuell" -#: ../include/svn_error_codes.h:687 +#: ../include/svn_error_codes.h:699 msgid "Berkeley DB error" msgstr "Fel i Berkeley DB" -#: ../include/svn_error_codes.h:691 +#: ../include/svn_error_codes.h:703 msgid "Berkeley DB deadlock error" msgstr "Berkeley DB i baklås" -#: ../include/svn_error_codes.h:695 +#: ../include/svn_error_codes.h:707 msgid "Transaction is dead" msgstr "Transaktionen är död" -#: ../include/svn_error_codes.h:699 +#: ../include/svn_error_codes.h:711 msgid "Transaction is not dead" msgstr "Transaktionen är inte död" -#: ../include/svn_error_codes.h:704 +#: ../include/svn_error_codes.h:716 msgid "Unknown FS type" msgstr "Okänd filsystemstyp" -#: ../include/svn_error_codes.h:709 +#: ../include/svn_error_codes.h:721 msgid "No user associated with filesystem" msgstr "Ingen användare kopplad till filsystemet" -#: ../include/svn_error_codes.h:714 +#: ../include/svn_error_codes.h:726 msgid "Path is already locked" msgstr "Sökvägen är redan låst" -#: ../include/svn_error_codes.h:719 ../include/svn_error_codes.h:901 +#: ../include/svn_error_codes.h:731 ../include/svn_error_codes.h:978 msgid "Path is not locked" msgstr "Sökvägen är inte låst" -#: ../include/svn_error_codes.h:724 +#: ../include/svn_error_codes.h:736 msgid "Lock token is incorrect" msgstr "Låsidentifieraren är felaktig" -#: ../include/svn_error_codes.h:729 +#: ../include/svn_error_codes.h:741 msgid "No lock token provided" msgstr "Ingen låsidentifierare tillhandahölls" -#: ../include/svn_error_codes.h:734 +#: ../include/svn_error_codes.h:746 msgid "Username does not match lock owner" msgstr "Användarnamnet matchar inte låsägaren" -#: ../include/svn_error_codes.h:739 +#: ../include/svn_error_codes.h:751 msgid "Filesystem has no such lock" msgstr "Låset saknas i filsystemet" -#: ../include/svn_error_codes.h:744 +#: ../include/svn_error_codes.h:756 msgid "Lock has expired" msgstr "Låset har gått ut" -#: ../include/svn_error_codes.h:749 ../include/svn_error_codes.h:888 +#: ../include/svn_error_codes.h:761 ../include/svn_error_codes.h:965 msgid "Item is out of date" msgstr "Objektet är inaktuellt" -#: ../include/svn_error_codes.h:761 +#: ../include/svn_error_codes.h:773 msgid "Unsupported FS format" msgstr "Formatet på filsystemet stöds ej" -#: ../include/svn_error_codes.h:766 +#: ../include/svn_error_codes.h:778 msgid "Representation is being written" msgstr "Representationen håller på att skrivas" -#: ../include/svn_error_codes.h:771 +#: ../include/svn_error_codes.h:783 msgid "The generated transaction name is too long" msgstr "Det genererade transaktionsnamnet är för långt" -#: ../include/svn_error_codes.h:776 +#: ../include/svn_error_codes.h:788 msgid "Filesystem has no such node origin record" msgstr "Filsystemet saknar en sådan nodursprungspost" -#: ../include/svn_error_codes.h:781 +#: ../include/svn_error_codes.h:793 msgid "Filesystem upgrade is not supported" msgstr "Filsystemsuppgradering stöds ej" -#: ../include/svn_error_codes.h:786 +#: ../include/svn_error_codes.h:798 msgid "Filesystem has no such checksum-representation index record" msgstr "Indexpost för kontrollsummerepresentation saknas i filsystem" -#: ../include/svn_error_codes.h:791 +#: ../include/svn_error_codes.h:803 msgid "Property value in filesystem differs from the provided base value" msgstr "Egenskapsvärde i filsystem skiljer sig från givet basvärde" -#: ../include/svn_error_codes.h:797 +#: ../include/svn_error_codes.h:809 msgid "The filesystem editor completion process was not followed" msgstr "Filsystemseditorns avslutningsprocess följdes inte" -#: ../include/svn_error_codes.h:802 +#: ../include/svn_error_codes.h:814 msgid "A packed revprop could not be read" msgstr "En packad revisionsegenskap kunde inte läsas" -#: ../include/svn_error_codes.h:807 +#: ../include/svn_error_codes.h:819 msgid "Could not initialize the revprop caching infrastructure." msgstr "Kunde inte initiera infrastrukturen för cachning av revisionsegenskaper" -#: ../include/svn_error_codes.h:813 +#: ../include/svn_error_codes.h:824 +msgid "Malformed transaction ID string." +msgstr "Felaktig ID-sträng för transaktion." + +#: ../include/svn_error_codes.h:829 +msgid "Corrupt index file." +msgstr "Trasig indexfil." + +#: ../include/svn_error_codes.h:834 +msgid "Revision not covered by index." +msgstr "Revisionen täcks ej av indexet." + +#: ../include/svn_error_codes.h:839 +msgid "Item index too large for this revision." +msgstr "Objektindex för stort för denna revision." + +#: ../include/svn_error_codes.h:844 +msgid "Container index out of range." +msgstr "Behållarindex utanför giltigt område." + +#: ../include/svn_error_codes.h:849 +msgid "Index files are inconsistent." +msgstr "Indexfilerna stämmer inte överens." + +#: ../include/svn_error_codes.h:854 +msgid "Lock operation failed" +msgstr "Låsning misslyckades" + +#: ../include/svn_error_codes.h:859 +msgid "Unsupported FS type" +msgstr "Filsystemstypen stöds ej" + +#: ../include/svn_error_codes.h:864 +msgid "Container capacity exceeded." +msgstr "Slut på plats i behållare." + +#: ../include/svn_error_codes.h:869 +msgid "Malformed node revision ID string." +msgstr "Felaktig ID-sträng för nodrevision." + +#: ../include/svn_error_codes.h:874 +msgid "Invalid generation number data." +msgstr "Ogiltigt generationsnummersdata." + +#: ../include/svn_error_codes.h:879 +msgid "Revprop manifest corrupt." +msgstr "Förstörd innehållsförteckning för revisionsegenskap." + +#: ../include/svn_error_codes.h:884 +msgid "Property list is corrupt." +msgstr "Förstörd egenskapslista." + +#: ../include/svn_error_codes.h:889 +msgid "Content checksums supposedly match but content does not." +msgstr "Innehållens kontrollsummor stämmer men innehållen skiljer sig åt." + +#: ../include/svn_error_codes.h:895 msgid "The repository is locked, perhaps for db recovery" msgstr "Arkivet är låst, kanske för reparation" -#: ../include/svn_error_codes.h:817 +#: ../include/svn_error_codes.h:899 msgid "A repository hook failed" msgstr "Ett krokskript i arkivet misslyckades" -#: ../include/svn_error_codes.h:821 +#: ../include/svn_error_codes.h:903 msgid "Incorrect arguments supplied" msgstr "Felaktiga argument" -#: ../include/svn_error_codes.h:825 +#: ../include/svn_error_codes.h:907 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:829 +#: ../include/svn_error_codes.h:911 msgid "Bogus revision report" msgstr "Felaktig revisionsrapport" -#: ../include/svn_error_codes.h:838 +#: ../include/svn_error_codes.h:920 msgid "Unsupported repository version" msgstr "Arkivversionen stöds ej" -#: ../include/svn_error_codes.h:842 +#: ../include/svn_error_codes.h:924 msgid "Disabled repository feature" msgstr "Funktionen är avslagen i arkivet" -#: ../include/svn_error_codes.h:846 +#: ../include/svn_error_codes.h:928 msgid "Error running post-commit hook" msgstr "Fel vid körning av krokskript efter arkivering (\"post-commit\")" -#: ../include/svn_error_codes.h:851 +#: ../include/svn_error_codes.h:933 msgid "Error running post-lock hook" msgstr "Fel vid körning av krokskript efter låsning (\"post-lock\")" -#: ../include/svn_error_codes.h:856 +#: ../include/svn_error_codes.h:938 msgid "Error running post-unlock hook" msgstr "Fel vid körning av krokskript efter upplåsning (\"post-unlock\")" -#: ../include/svn_error_codes.h:861 +#: ../include/svn_error_codes.h:943 msgid "Repository upgrade is not supported" msgstr "Uppgradering av arkiv stöds ej" -#: ../include/svn_error_codes.h:866 -#, fuzzy -msgid "Repository is corrupt" -msgstr "Förstörd arbetskopia" - -#: ../include/svn_error_codes.h:872 +#: ../include/svn_error_codes.h:949 msgid "Bad URL passed to RA layer" msgstr "Felaktig URL skickad till RA-skiktet" -#: ../include/svn_error_codes.h:876 +#: ../include/svn_error_codes.h:953 msgid "Authorization failed" msgstr "Behörighetskontroll misslyckades" -#: ../include/svn_error_codes.h:880 +#: ../include/svn_error_codes.h:957 msgid "Unknown authorization method" msgstr "Okänd metod för behörighetskontroll" -#: ../include/svn_error_codes.h:884 +#: ../include/svn_error_codes.h:961 msgid "Repository access method not implemented" msgstr "Metod för arkivåtkomst ej implementerad" -#: ../include/svn_error_codes.h:892 +#: ../include/svn_error_codes.h:969 msgid "Repository has no UUID" msgstr "Arkivet saknar UUID" -#: ../include/svn_error_codes.h:896 +#: ../include/svn_error_codes.h:973 msgid "Unsupported RA plugin ABI version" msgstr "ABI-versionen för insticksmodulen för arkivåtkomst stöds ej" -#: ../include/svn_error_codes.h:906 +#: ../include/svn_error_codes.h:983 msgid "Server can only replay from the root of a repository" msgstr "Servern kan bara spela upp från arkivroten" -#: ../include/svn_error_codes.h:911 +#: ../include/svn_error_codes.h:988 msgid "Repository UUID does not match expected UUID" msgstr "Arkivets UUID matchar inte den förväntade UUID:n" -#: ../include/svn_error_codes.h:916 +#: ../include/svn_error_codes.h:993 msgid "Repository root URL does not match expected root URL" msgstr "Arkivets rot-URL matchar inte den förväntade rot-URL:en" -#: ../include/svn_error_codes.h:921 +#: ../include/svn_error_codes.h:998 msgid "Session URL does not match expected session URL" msgstr "Sessionens URL matchar inte den förväntade sessions-URL:en" -#: ../include/svn_error_codes.h:926 ../libsvn_ra_svn/client.c:492 +#: ../include/svn_error_codes.h:1003 ../libsvn_ra_svn/client.c:506 #, c-format msgid "Can't create tunnel" msgstr "Kan inte skapa tunnel" -#: ../include/svn_error_codes.h:932 +#: ../include/svn_error_codes.h:1008 +msgid "Can't create session" +msgstr "Kan inte skapa session" + +#: ../include/svn_error_codes.h:1014 msgid "RA layer failed to init socket layer" msgstr "RA-skiktet kunde inte initiera uttagsskiktet (socket layer)" -#: ../include/svn_error_codes.h:936 +#: ../include/svn_error_codes.h:1018 msgid "RA layer failed to create HTTP request" msgstr "RA-skiktet kunde inte skapa en HTTP-förfrågan" -#: ../include/svn_error_codes.h:940 +#: ../include/svn_error_codes.h:1022 msgid "RA layer request failed" msgstr "Förfrågan misslyckad i RA-skiktet" -#: ../include/svn_error_codes.h:944 +#: ../include/svn_error_codes.h:1026 msgid "RA layer didn't receive requested OPTIONS info" msgstr "RA-skiktet mottog ej begärd OPTIONS-information" -#: ../include/svn_error_codes.h:948 +#: ../include/svn_error_codes.h:1030 msgid "RA layer failed to fetch properties" msgstr "RA-skiktet misslyckades med att erhålla egenskaper" -#: ../include/svn_error_codes.h:952 +#: ../include/svn_error_codes.h:1034 msgid "RA layer file already exists" msgstr "RA-skiktsfil finns redan" -#: ../include/svn_error_codes.h:966 +#: ../include/svn_error_codes.h:1048 msgid "HTTP Path Not Found" msgstr "HTTP-sökväg finns inte" -#: ../include/svn_error_codes.h:970 +#: ../include/svn_error_codes.h:1052 msgid "Failed to execute WebDAV PROPPATCH" msgstr "Misslyckades med att utföra WebDAV PROPPATCH" #. If condition COND is not met, return a "malformed network data" error. #. -#: ../include/svn_error_codes.h:975 ../include/svn_error_codes.h:1428 -#: ../libsvn_ra_svn/marshal.c:1142 ../libsvn_ra_svn/marshal.c:1364 -#: ../libsvn_ra_svn/marshal.c:1394 ../libsvn_ra_svn/marshal.c:2455 +#: ../include/svn_error_codes.h:1057 ../include/svn_error_codes.h:1560 +#: ../libsvn_ra_svn/marshal.c:1459 ../libsvn_ra_svn/marshal.c:1716 +#: ../libsvn_ra_svn/marshal.c:1745 ../libsvn_ra_svn/marshal.c:3000 msgid "Malformed network data" msgstr "Felaktig nätverksdata" -#: ../include/svn_error_codes.h:980 +#: ../include/svn_error_codes.h:1062 msgid "Unable to extract data from response header" msgstr "Kunde inte läsa data från responshuvud" -#: ../include/svn_error_codes.h:985 +#: ../include/svn_error_codes.h:1067 msgid "Repository has been moved" msgstr "Arkivet har flyttats" -#: ../include/svn_error_codes.h:990 ../libsvn_ra_serf/update.c:2960 -#: ../libsvn_ra_serf/util.c:764 +#: ../include/svn_error_codes.h:1072 ../libsvn_ra_serf/util.c:937 msgid "Connection timed out" msgstr "Nätverksanslutningen gick ut" -#: ../include/svn_error_codes.h:995 +#: ../include/svn_error_codes.h:1077 msgid "URL access forbidden for unknown reason" msgstr "Åtkomst till URL tilläts ej av okänd anledning" -#: ../include/svn_error_codes.h:1001 ../include/svn_error_codes.h:1432 +#: ../include/svn_error_codes.h:1082 +msgid "The server state conflicts with the requested preconditions" +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 "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" msgstr "Kunde inte hitta något arkiv" -#: ../include/svn_error_codes.h:1005 +#: ../include/svn_error_codes.h:1097 msgid "Couldn't open a repository" msgstr "Kunde inte öppna arkivet" -#: ../include/svn_error_codes.h:1011 +#: ../include/svn_error_codes.h:1103 msgid "Svndiff data has invalid header" msgstr "Svndiff-data har ogiltigt huvud" -#: ../include/svn_error_codes.h:1015 +#: ../include/svn_error_codes.h:1107 msgid "Svndiff data contains corrupt window" msgstr "Svndiff-data innehåller trasigt fönster" -#: ../include/svn_error_codes.h:1019 +#: ../include/svn_error_codes.h:1111 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:1023 +#: ../include/svn_error_codes.h:1115 msgid "Svndiff data contains invalid instruction" msgstr "Ogiltig instruktion i svndiff-data" -#: ../include/svn_error_codes.h:1027 +#: ../include/svn_error_codes.h:1119 msgid "Svndiff data ends unexpectedly" msgstr "Svndiff-data tog oväntat slut" -#: ../include/svn_error_codes.h:1031 +#: ../include/svn_error_codes.h:1123 msgid "Svndiff compressed data is invalid" msgstr "Komprimerad svndiff-data är ogiltig" -#: ../include/svn_error_codes.h:1037 +#: ../include/svn_error_codes.h:1129 msgid "Apache has no path to an SVN filesystem" msgstr "Apache saknar sökväg till SVN-filsystem" -#: ../include/svn_error_codes.h:1041 +#: ../include/svn_error_codes.h:1133 msgid "Apache got a malformed URI" msgstr "Apache fick en felaktig URI" -#: ../include/svn_error_codes.h:1045 +#: ../include/svn_error_codes.h:1137 msgid "Activity not found" msgstr "Aktiviteten hittades ej" -#: ../include/svn_error_codes.h:1049 +#: ../include/svn_error_codes.h:1141 msgid "Baseline incorrect" msgstr "Felaktig utgångspunkt" -#: ../include/svn_error_codes.h:1053 +#: ../include/svn_error_codes.h:1145 msgid "Input/output error" msgstr "In/ut-fel" -#: ../include/svn_error_codes.h:1059 +#: ../include/svn_error_codes.h:1151 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:1063 +#: ../include/svn_error_codes.h:1155 msgid "Repository access is needed for this operation" msgstr "Operationen kräver åtkomst till ett arkiv" -#: ../include/svn_error_codes.h:1067 +#: ../include/svn_error_codes.h:1159 msgid "Bogus revision information given" msgstr "Felaktig revisionsinformation angiven" -#: ../include/svn_error_codes.h:1071 +#: ../include/svn_error_codes.h:1163 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:1075 +#: ../include/svn_error_codes.h:1167 msgid "Operation does not apply to binary file" msgstr "Operationen kan ej utföras på binär fil" -#: ../include/svn_error_codes.h:1081 +#: ../include/svn_error_codes.h:1173 msgid "Format of an svn:externals property was invalid" msgstr "Felaktigt format på svn:externals-egenskap" -#: ../include/svn_error_codes.h:1085 +#: ../include/svn_error_codes.h:1177 msgid "Attempting restricted operation for modified resource" msgstr "Operationen tillåter ej att källan är modifierad" -#: ../include/svn_error_codes.h:1089 +#: ../include/svn_error_codes.h:1181 msgid "Operation does not apply to directory" msgstr "Operationen kan ej utföras på en katalog" -#: ../include/svn_error_codes.h:1093 +#: ../include/svn_error_codes.h:1185 ../svnadmin/svnadmin.c:1810 +#, c-format msgid "Revision range is not allowed" msgstr "Revisionsområde otillåtet" -#: ../include/svn_error_codes.h:1097 +#: ../include/svn_error_codes.h:1189 msgid "Inter-repository relocation not allowed" msgstr "Omlokalisering mellan arkiv otillåten" -#: ../include/svn_error_codes.h:1101 +#: ../include/svn_error_codes.h:1193 msgid "Author name cannot contain a newline" msgstr "Författarnamn kan ej innehålla radslut" -#: ../include/svn_error_codes.h:1105 +#: ../include/svn_error_codes.h:1197 msgid "Bad property name" msgstr "Felaktigt egenskapsnamn" -#: ../include/svn_error_codes.h:1110 +#: ../include/svn_error_codes.h:1202 msgid "Two versioned resources are unrelated" msgstr "Två orelaterade versionshanterade resurser" -#: ../include/svn_error_codes.h:1115 +#: ../include/svn_error_codes.h:1207 msgid "Path has no lock token" msgstr "Sökvägen saknar låsidentifierare" -#: ../include/svn_error_codes.h:1120 +#: ../include/svn_error_codes.h:1212 msgid "Operation does not support multiple sources" msgstr "Operationen klarar ej flera källor" -#: ../include/svn_error_codes.h:1125 +#: ../include/svn_error_codes.h:1217 msgid "No versioned parent directories" msgstr "Inga versionshanterade föräldrakataloger" -#: ../include/svn_error_codes.h:1130 ../include/svn_error_codes.h:1150 +#: ../include/svn_error_codes.h:1222 ../include/svn_error_codes.h:1242 msgid "Working copy and merge source not ready for reintegration" msgstr "Arbetskopia och källa för sammanslagning inte klara för återförening" -#: ../include/svn_error_codes.h:1135 +#: ../include/svn_error_codes.h:1227 msgid "A file external cannot overwrite an existing versioned item" msgstr "En extern fil kan inte skriva över ett befintligt versionshanterat objekt" -#: ../include/svn_error_codes.h:1140 +#: ../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:1145 +#: ../include/svn_error_codes.h:1237 msgid "Detected a cycle while processing the operation" msgstr "En rundgång upptäcktes när operationen behandlades" -#: ../include/svn_error_codes.h:1155 +#: ../include/svn_error_codes.h:1247 msgid "Invalid mergeinfo detected in merge target" msgstr "Ogiltig sammanslagningsinformation upptäcktes i målet" -#: ../include/svn_error_codes.h:1160 +#: ../include/svn_error_codes.h:1252 msgid "Can't perform this operation without a valid lock token" msgstr "Kan inte utföra denna operation utan giltig låsidentifierare" -#: ../include/svn_error_codes.h:1165 +#: ../include/svn_error_codes.h:1257 msgid "The operation is forbidden by the server" msgstr "Operationen tillåts inte av servern" -#: ../include/svn_error_codes.h:1171 +#: ../include/svn_error_codes.h:1262 +msgid "The conflict resolution option is not applicable" +msgstr "Konfliktlösningsvalet är ej tillämpbart" + +#: ../include/svn_error_codes.h:1268 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:1175 +#: ../include/svn_error_codes.h:1272 msgid "Failure loading plugin" msgstr "Fel vid inladdning av insticksmodul" -#: ../include/svn_error_codes.h:1179 +#: ../include/svn_error_codes.h:1276 msgid "Malformed file" msgstr "Felaktig fil" -#: ../include/svn_error_codes.h:1183 +#: ../include/svn_error_codes.h:1280 msgid "Incomplete data" msgstr "Ofullständig data" -#: ../include/svn_error_codes.h:1187 +#: ../include/svn_error_codes.h:1284 msgid "Incorrect parameters given" msgstr "Felaktiga parametrar angivna" -#: ../include/svn_error_codes.h:1191 +#: ../include/svn_error_codes.h:1288 msgid "Tried a versioning operation on an unversioned resource" msgstr "Försökte utföra en versionshanteringsoperation på en resurs som ej är versionshanterad" -#: ../include/svn_error_codes.h:1195 +#: ../include/svn_error_codes.h:1292 msgid "Test failed" msgstr "Test misslyckades" -#: ../include/svn_error_codes.h:1199 +#: ../include/svn_error_codes.h:1296 msgid "Trying to use an unsupported feature" msgstr "Försöker använda en funktion som ej stöds" -#: ../include/svn_error_codes.h:1203 +#: ../include/svn_error_codes.h:1300 msgid "Unexpected or unknown property kind" msgstr "Oväntad eller okänd egenskapstyp" -#: ../include/svn_error_codes.h:1207 +#: ../include/svn_error_codes.h:1304 msgid "Illegal target for the requested operation" msgstr "Otillåtet mål för begärd operation" -#: ../include/svn_error_codes.h:1211 +#: ../include/svn_error_codes.h:1308 msgid "MD5 checksum is missing" msgstr "MD5-kontrollsumma saknas" -#: ../include/svn_error_codes.h:1215 +#: ../include/svn_error_codes.h:1312 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:1219 +#: ../include/svn_error_codes.h:1316 msgid "Error calling external program" msgstr "Fel vid anrop av externt program" -#: ../include/svn_error_codes.h:1223 +#: ../include/svn_error_codes.h:1320 msgid "Python exception has been set with the error" msgstr "Python-undantag har satts för felet" -#: ../include/svn_error_codes.h:1227 +#: ../include/svn_error_codes.h:1324 msgid "A checksum mismatch occurred" msgstr "Felaktig kontrollsumma" -#: ../include/svn_error_codes.h:1231 +#: ../include/svn_error_codes.h:1328 msgid "The operation was interrupted" msgstr "Operationen avbröts" -#: ../include/svn_error_codes.h:1235 +#: ../include/svn_error_codes.h:1332 msgid "The specified diff option is not supported" msgstr "Den angivna diff-flaggan stöds ej" -#: ../include/svn_error_codes.h:1239 +#: ../include/svn_error_codes.h:1336 msgid "Property not found" msgstr "Egenskapen finns ej" -#: ../include/svn_error_codes.h:1243 +#: ../include/svn_error_codes.h:1340 msgid "No auth file path available" msgstr "Sökväg för auth-fil ej tillgänglig" -#: ../include/svn_error_codes.h:1248 +#: ../include/svn_error_codes.h:1345 msgid "Incompatible library version" msgstr "Biblioteksversioner inte kompatibla" -#: ../include/svn_error_codes.h:1253 +#: ../include/svn_error_codes.h:1350 msgid "Mergeinfo parse error" msgstr "Syntaxfel i sammanslagningsinformation" -#: ../include/svn_error_codes.h:1258 +#: ../include/svn_error_codes.h:1355 msgid "Cease invocation of this API" msgstr "Avsluta anropet av detta API" -#: ../include/svn_error_codes.h:1263 +#: ../include/svn_error_codes.h:1360 msgid "Error parsing revision number" msgstr "Syntaxfel i revisionsnummer" -#: ../include/svn_error_codes.h:1268 +#: ../include/svn_error_codes.h:1365 msgid "Iteration terminated before completion" msgstr "Upprepning avslutades före fullbordan" -#: ../include/svn_error_codes.h:1273 +#: ../include/svn_error_codes.h:1370 msgid "Unknown changelist" msgstr "Okänd ändringslista" -#: ../include/svn_error_codes.h:1278 +#: ../include/svn_error_codes.h:1375 msgid "Reserved directory name in command line arguments" msgstr "Reserverat katalognamn i kommandoradsargumenten" -#: ../include/svn_error_codes.h:1283 +#: ../include/svn_error_codes.h:1380 msgid "Inquiry about unknown capability" msgstr "Förfrågan om okänd förmåga" -#: ../include/svn_error_codes.h:1288 +#: ../include/svn_error_codes.h:1385 msgid "Test skipped" msgstr "Test hoppades över" -#: ../include/svn_error_codes.h:1293 +#: ../include/svn_error_codes.h:1390 msgid "APR memcache library not available" msgstr "APR memcache-bibliotek ej tillgängligt" -#: ../include/svn_error_codes.h:1298 +#: ../include/svn_error_codes.h:1395 msgid "Couldn't perform atomic initialization" msgstr "Kunde inte genomföra atomisk initiering" -#: ../include/svn_error_codes.h:1303 +#: ../include/svn_error_codes.h:1400 msgid "SQLite error" msgstr "SQLite-fel" -#: ../include/svn_error_codes.h:1308 +#: ../include/svn_error_codes.h:1405 msgid "Attempted to write to readonly SQLite db" msgstr "Försök att skriva till skrivskyddad SQLite-databas" -#: ../include/svn_error_codes.h:1315 +#: ../include/svn_error_codes.h:1412 msgid "Unsupported schema found in SQLite db" msgstr "Schemat i SQLite-databasen stöds ej" -#: ../include/svn_error_codes.h:1320 +#: ../include/svn_error_codes.h:1417 msgid "The SQLite db is busy" msgstr "SQLite-databasen är upptagen" -#: ../include/svn_error_codes.h:1325 +#: ../include/svn_error_codes.h:1422 msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback" msgstr "SQLite upptagen vid transaktionsåterladding; återställer alla upptagna SQLite-satser för att tillåta återladdning" -#: ../include/svn_error_codes.h:1331 +#: ../include/svn_error_codes.h:1428 msgid "Constraint error in SQLite db" msgstr "Restriktionsfel i SQLite-databas" -#: ../include/svn_error_codes.h:1336 +#: ../include/svn_error_codes.h:1433 msgid "Too many memcached servers configured" msgstr "För många konfigurerade memcached-servrar" -#: ../include/svn_error_codes.h:1341 +#: ../include/svn_error_codes.h:1438 msgid "Failed to parse version number string" msgstr "Syntaxfel i sträng med versionsnummer" -#: ../include/svn_error_codes.h:1346 +#: ../include/svn_error_codes.h:1443 msgid "Atomic data storage is corrupt" msgstr "Förstörd atomisk datalagring" -#: ../include/svn_error_codes.h:1351 +#: ../include/svn_error_codes.h:1448 msgid "utf8proc library error" -msgstr "" +msgstr "biblioteksfel i utf8proc" -#: ../include/svn_error_codes.h:1356 +#: ../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 +msgid "Packed data stream is corrupt" +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 +msgid "Parser error: invalid input" +msgstr "Syntaxfel: felaktig indata" + +#: ../include/svn_error_codes.h:1473 +msgid "SQLite transaction rollback failed" +msgstr "SQLite-transaktionsåterladdning misslyckades" + +#: ../include/svn_error_codes.h:1478 +msgid "LZ4 compression failed" +msgstr "LZ4-kompression misslyckades" + +#: ../include/svn_error_codes.h:1483 +msgid "LZ4 decompression failed" +msgstr "LZ4-dekompression misslyckades" -#: ../include/svn_error_codes.h:1362 +#: ../include/svn_error_codes.h:1489 msgid "Error parsing arguments" msgstr "Syntaxfel i argument" -#: ../include/svn_error_codes.h:1366 +#: ../include/svn_error_codes.h:1493 msgid "Not enough arguments provided" msgstr "För få argument givna" -#: ../include/svn_error_codes.h:1370 +#: ../include/svn_error_codes.h:1497 msgid "Mutually exclusive arguments specified" msgstr "De angivna argumenten kan inte användas samtidigt" -#: ../include/svn_error_codes.h:1374 +#: ../include/svn_error_codes.h:1501 msgid "Attempted command in administrative dir" msgstr "Försökte utföra kommando i förvaltningskatalog" -#: ../include/svn_error_codes.h:1378 +#: ../include/svn_error_codes.h:1505 msgid "The log message file is under version control" msgstr "Filen med loggmeddelandet är versionshanterad" -#: ../include/svn_error_codes.h:1382 +#: ../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:1386 +#: ../include/svn_error_codes.h:1513 msgid "Committing in directory scheduled for addition" msgstr "Arkiverar i katalog schemalagd att läggas till" -#: ../include/svn_error_codes.h:1390 +#: ../include/svn_error_codes.h:1517 msgid "No external editor available" msgstr "Ingen extern editor tillgänglig" -#: ../include/svn_error_codes.h:1394 +#: ../include/svn_error_codes.h:1521 msgid "Something is wrong with the log message's contents" msgstr "Fel i loggmeddelandets innehåll" -#: ../include/svn_error_codes.h:1398 +#: ../include/svn_error_codes.h:1525 msgid "A log message was given where none was necessary" msgstr "Ett loggmeddelande angavs utan att det var nödvändigt" -#: ../include/svn_error_codes.h:1402 +#: ../include/svn_error_codes.h:1529 msgid "No external merge tool available" msgstr "Ingen externt sammanslagningsverktyg tillgängligt" -#: ../include/svn_error_codes.h:1406 +#: ../include/svn_error_codes.h:1533 msgid "Failed processing one or more externals definitions" msgstr "Misslyckad behandling av en eller fler external-definitioner" -#: ../include/svn_error_codes.h:1412 +#: ../include/svn_error_codes.h:1538 +msgid "Repository verification failed" +msgstr "Arkivkontroll misslyckades" + +#: ../include/svn_error_codes.h:1544 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:1416 +#: ../include/svn_error_codes.h:1548 msgid "Unknown svn protocol command" msgstr "Okänt kommando i svn-protokollet" -#: ../include/svn_error_codes.h:1420 +#: ../include/svn_error_codes.h:1552 msgid "Network connection closed unexpectedly" msgstr "Nätverksanslutningen stängdes oväntat" -#: ../include/svn_error_codes.h:1424 +#: ../include/svn_error_codes.h:1556 msgid "Network read/write error" msgstr "Läs/skrivfel till nätverket" -#: ../include/svn_error_codes.h:1436 +#: ../include/svn_error_codes.h:1568 msgid "Client/server version mismatch" msgstr "Klient- och serverversion stämmer ej överens" -#: ../include/svn_error_codes.h:1441 +#: ../include/svn_error_codes.h:1573 msgid "Cannot negotiate authentication mechanism" msgstr "Kan inte förhandla om autentiseringsmekanism" -#: ../include/svn_error_codes.h:1446 +#: ../include/svn_error_codes.h:1578 msgid "Editor drive was aborted" msgstr "Editorkörning avbröts" -#: ../include/svn_error_codes.h:1454 +#: ../include/svn_error_codes.h:1583 +msgid "Client request too long" +msgstr "Klientbegäran för lång" + +#: ../include/svn_error_codes.h:1588 +msgid "Server response too long" +msgstr "För långt svar från server" + +#: ../include/svn_error_codes.h:1596 msgid "Credential data unavailable" msgstr "Klientreferenser otillgängliga" -#: ../include/svn_error_codes.h:1458 +#: ../include/svn_error_codes.h:1600 msgid "No authentication provider available" msgstr "Ingen tillhandahållare av autentisering tillgänglig" -#: ../include/svn_error_codes.h:1462 +#: ../include/svn_error_codes.h:1604 msgid "All authentication providers exhausted" msgstr "Alla tillhandahållare av autentisering förbrukade" -#: ../include/svn_error_codes.h:1466 +#: ../include/svn_error_codes.h:1608 msgid "Credentials not saved" msgstr "Klientreferenser sparades inte" -#: ../include/svn_error_codes.h:1471 +#: ../include/svn_error_codes.h:1613 ../libsvn_subr/gpg_agent.c:512 msgid "Authentication failed" msgstr "Autentisering misslyckades" -#: ../include/svn_error_codes.h:1477 +#: ../include/svn_error_codes.h:1619 msgid "Read access denied for root of edit" msgstr "Läsning nekas till roten för editeringen" -#: ../include/svn_error_codes.h:1482 +#: ../include/svn_error_codes.h:1624 msgid "Item is not readable" msgstr "Objektet är inte läsbart" -#: ../include/svn_error_codes.h:1487 +#: ../include/svn_error_codes.h:1629 msgid "Item is partially readable" msgstr "Objektet är delvis läsbart" -#: ../include/svn_error_codes.h:1491 +#: ../include/svn_error_codes.h:1633 msgid "Invalid authz configuration" msgstr "Ogiltig behörighetskonfiguration" -#: ../include/svn_error_codes.h:1496 +#: ../include/svn_error_codes.h:1638 msgid "Item is not writable" msgstr "Objektet är inte skrivbart" -#: ../include/svn_error_codes.h:1503 +#: ../include/svn_error_codes.h:1645 msgid "Diff data source modified unexpectedly" msgstr "Datakälla för diff ändrades oväntat" -#: ../include/svn_error_codes.h:1509 +#: ../include/svn_error_codes.h:1650 +msgid "Diff data unexpected" +msgstr "Oväntad diff-data" + +#: ../include/svn_error_codes.h:1657 msgid "Initialization of SSPI library failed" msgstr "Misslyckad initiering av SSPI-biblioteket" -#: ../include/svn_error_codes.h:1513 +#: ../include/svn_error_codes.h:1663 msgid "Server SSL certificate untrusted" msgstr "Ej betrott SSL-certifikat för server" -#: ../include/svn_error_codes.h:1518 +#: ../include/svn_error_codes.h:1668 msgid "Initialization of the GSSAPI context failed" msgstr "Misslyckad initiering av GSSAPI-kontext" -#: ../include/svn_error_codes.h:1526 +#: ../include/svn_error_codes.h:1673 msgid "While handling serf response:" msgstr "När svar från serf behandlades:" -#: ../include/svn_error_codes.h:1532 +#: ../include/svn_error_codes.h:1678 +msgid "Can't read from stream" +msgstr "Kan inte läsa från ström" + +#: ../include/svn_error_codes.h:1684 msgid "Assertion failure" msgstr "Fel upptäckt vid invariantkontroll" -#: ../include/svn_error_codes.h:1536 +#: ../include/svn_error_codes.h:1688 msgid "No non-tracing links found in the error chain" msgstr "Inga icke-spårande länkar hittades i felkedjan" -#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:274 +#: ../include/svn_error_codes.h:1696 +msgid "Unexpected end of ASN1 data" +msgstr "Oväntat slut på ASN1-data" + +#: ../include/svn_error_codes.h:1700 +msgid "Unexpected ASN1 tag" +msgstr "Oväntat slut på ASN1-märke" + +#: ../include/svn_error_codes.h:1704 +msgid "Invalid ASN1 length" +msgstr "Ogiltig ASN1-längd" + +#: ../include/svn_error_codes.h:1708 +msgid "ASN1 length mismatch" +msgstr "ANS1-längd stämmer ej" + +#: ../include/svn_error_codes.h:1712 +msgid "Invalid ASN1 data" +msgstr "Ogiltig ASN1-data" + +#: ../include/svn_error_codes.h:1716 +msgid "Unavailable X509 feature" +msgstr "Otillgänglig X509-funktion" + +#: ../include/svn_error_codes.h:1720 +msgid "Invalid PEM certificate" +msgstr "Ogiltigt PEM-certifikat" + +#: ../include/svn_error_codes.h:1724 +msgid "Invalid certificate format" +msgstr "Ogiltigt certifikatsformat" + +#: ../include/svn_error_codes.h:1728 +msgid "Invalid certificate version" +msgstr "Ogiltig certifikatversion" + +#: ../include/svn_error_codes.h:1732 +msgid "Invalid certificate serial number" +msgstr "Ogiltigt serienummer för certifikat" + +#: ../include/svn_error_codes.h:1736 +msgid "Found invalid algorithm in certificate" +msgstr "Ogiltig algoritm hittad i certifikat" + +#: ../include/svn_error_codes.h:1740 +msgid "Found invalid name in certificate" +msgstr "Ogiltigt namn hittat i certifikat" + +#: ../include/svn_error_codes.h:1744 +msgid "Found invalid date in certificate" +msgstr "Ogiltigt datum hittat i certifikat" + +#: ../include/svn_error_codes.h:1748 +msgid "Found invalid public key in certificate" +msgstr "Ogiltig öppen nyckel hittad i certifikat" + +#: ../include/svn_error_codes.h:1752 +msgid "Found invalid signature in certificate" +msgstr "Ogiltig signatur hittad i certifikat" + +#: ../include/svn_error_codes.h:1756 +msgid "Found invalid extensions in certificate" +msgstr "Ogiltig utvidgning hittad i certifikat" + +#: ../include/svn_error_codes.h:1760 +msgid "Unknown certificate version" +msgstr "Okänd certifikatversion" + +#: ../include/svn_error_codes.h:1764 +msgid "Certificate uses unknown public key algorithm" +msgstr "Certifikatet använder okänd öppen nyckelalgoritm" + +#: ../include/svn_error_codes.h:1768 +msgid "Certificate signature mismatch" +msgstr "Certifikatssignaturen stämmer ej" + +#: ../include/svn_error_codes.h:1772 +msgid "Certficate verification failed" +msgstr "Certifikatskontrollen misslyckades" + +#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:290 msgid "GNOME Keyring is locked and we are non-interactive" msgstr "GNOMEs nyckelkedja är låst och vi är inte interaktiva" -#: ../libsvn_client/add.c:606 ../libsvn_client/cmdline.c:356 -#: ../libsvn_subr/opt.c:930 +#: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365 +#: ../libsvn_subr/opt.c:1234 #, c-format msgid "'%s' ends in a reserved name" msgstr "\"%s\" slutar med ett reserverat namn" -#: ../libsvn_client/add.c:872 +#: ../libsvn_client/add.c:822 #, c-format msgid "'%s' prevents creating parent of '%s'" msgstr "\"%s\" hindrar att förälder till \"%s\" skapas" -#: ../libsvn_client/add.c:911 ../libsvn_wc/adm_ops.c:732 +#: ../libsvn_client/add.c:862 ../libsvn_wc/adm_ops.c:445 #, c-format msgid "'%s' is an existing item in conflict; please mark the conflict as resolved before adding a new item here" msgstr "\"%s\" är ett befintligt objekt i konflikt; markera konflikten som löst innan ett nytt objekt läggs till här" -#: ../libsvn_client/add.c:918 ../libsvn_wc/adm_ops.c:687 -#: ../libsvn_wc/workqueue.c:900 ../libsvn_wc/workqueue.c:994 +#: ../libsvn_client/add.c:869 ../libsvn_wc/adm_ops.c:400 +#: ../libsvn_wc/workqueue.c:874 ../libsvn_wc/workqueue.c:968 #, c-format msgid "'%s' not found" msgstr "\"%s\" finns inte" -#: ../libsvn_client/add.c:924 ../libsvn_wc/adm_ops.c:692 +#: ../libsvn_client/add.c:875 ../libsvn_wc/adm_ops.c:405 #: ../libsvn_wc/delete.c:98 #, c-format msgid "Unsupported node kind for path '%s'" msgstr "Nodtypen för sökvägen \"%s\" stöds inte" -#: ../libsvn_client/add.c:957 ../libsvn_client/changelist.c:65 -#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:233 -#: ../libsvn_client/export.c:1392 ../libsvn_client/import.c:820 -#: ../libsvn_client/patch.c:3012 ../libsvn_client/relocate.c:232 -#: ../libsvn_client/resolved.c:121 ../libsvn_client/revert.c:136 -#: ../libsvn_client/status.c:353 ../libsvn_client/switch.c:471 -#: ../libsvn_client/update.c:646 ../libsvn_client/upgrade.c:105 -#: ../svn/util.c:979 +#: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65 +#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3197 +#: ../libsvn_client/export.c:1389 ../libsvn_client/import.c:861 +#: ../libsvn_client/patch.c: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/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 #, c-format msgid "'%s' is not a local path" msgstr "\"%s\" är ingen lokal sökväg" -#: ../libsvn_client/add.c:998 ../libsvn_client/copy_foreign.c:489 -#: ../libsvn_wc/adm_ops.c:766 ../libsvn_wc/copy.c:715 +#: ../libsvn_client/add.c:949 ../libsvn_client/copy_foreign.c:491 +#: ../libsvn_wc/adm_ops.c:479 ../libsvn_wc/copy.c:786 #, c-format msgid "'%s' is already under version control" msgstr "\"%s\" är redan versionshanterad" -#: ../libsvn_client/add.c:1131 ../libsvn_client/add.c:1158 -#, fuzzy, c-format +#: ../libsvn_client/add.c:1082 ../libsvn_client/add.c:1109 +#, c-format msgid "There is no valid URI above '%s'" msgstr "Det finns ingen giltig URI ovanför \"%s\"" -#: ../libsvn_client/blame.c:660 +#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:764 #, c-format msgid "Cannot calculate blame information for binary file '%s'" msgstr "Kan inte beräkna skuldinformation för den binära filen \"%s\"" -#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:610 -#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:829 -#: ../libsvn_client/prop_commands.c:1384 ../libsvn_client/revisions.c:104 -#: ../libsvn_wc/adm_ops.c:1197 ../libsvn_wc/adm_ops.c:1247 -#: ../libsvn_wc/copy.c:563 ../libsvn_wc/copy.c:624 ../libsvn_wc/entries.c:1301 -#: ../libsvn_wc/entries.c:2681 ../libsvn_wc/entries.c:2712 -#: ../svn/notify.c:1104 +#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:612 +#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:817 +#: ../libsvn_client/prop_commands.c:1398 ../libsvn_client/revisions.c:107 +#: ../libsvn_wc/adm_ops.c:913 ../libsvn_wc/adm_ops.c:967 +#: ../libsvn_wc/copy.c:628 ../libsvn_wc/copy.c:689 ../libsvn_wc/entries.c:1407 +#: ../libsvn_wc/entries.c:2803 ../libsvn_wc/entries.c:2834 ../svn/notify.c:1157 +#: ../svnbench/notify.c:968 #, c-format msgid "'%s' is not under version control" msgstr "\"%s\" är inte versionshanterad" @@ -1441,11 +1641,11 @@ msgstr "\"%s\" pekar på en katalog" msgid "'%s' has no pristine version until it is committed" msgstr "\"%s\" har ingen orörd revision förrän den arkiveras" -#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:388 +#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:390 msgid "(local)" msgstr "(lokal)" -#: ../libsvn_client/cat.c:247 +#: ../libsvn_client/cat.c:255 #, c-format msgid "URL '%s' refers to a directory" msgstr "URL:en \"%s\" pekar på en katalog" @@ -1454,67 +1654,63 @@ 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:113 ../libsvn_client/export.c:1445 +#: ../libsvn_client/checkout.c:133 ../libsvn_client/export.c:1446 +#: ../svnbench/null-export-cmd.c:293 #, c-format msgid "URL '%s' doesn't exist" msgstr "URL:en \"%s\" finns inte" -#: ../libsvn_client/checkout.c:117 +#: ../libsvn_client/checkout.c:137 #, 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:151 +#: ../libsvn_client/checkout.c:175 #, c-format msgid "'%s' is already a working copy for a different URL" msgstr "\"%s\" är redan en arbetskopia för en annan URL" -#: ../libsvn_client/checkout.c:159 +#: ../libsvn_client/checkout.c:183 #, c-format msgid "'%s' already exists and is not a directory" msgstr "\"%s\" finns redan och är ingen katalog" -#: ../libsvn_client/cleanup.c:87 -#, fuzzy, c-format -msgid "Working copy at '%s' is already locked." -msgstr "Arbetskopian \"%s\" är inte låst" - #: ../libsvn_client/cmdline.c:104 #, c-format msgid "All non-relative targets must have the same root URL" msgstr "Alla icke-relativa mål måste ha samma rot-URL" -#: ../libsvn_client/cmdline.c:312 +#: ../libsvn_client/cmdline.c:207 +#, c-format +msgid "'%s' is just a peg revision. Maybe try '%s@' instead?" +msgstr "\"%s\" är bara en fixerad revision. Kanske du menade \"%s@\" istället?" + +#: ../libsvn_client/cmdline.c:321 msgid "Resolving '^/': no repository root found in the target arguments or in the current directory" msgstr "Uppslagning av \"^/\": ingen arkivrot hittades i målargumenten eller i arbetskatalogen" -#: ../libsvn_client/commit.c:155 ../libsvn_client/copy.c:1510 +#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2303 msgid "Commit failed (details follow):" msgstr "Arkiveringen misslyckades (mer information följer):" -#: ../libsvn_client/commit.c:163 +#: ../libsvn_client/commit.c:165 msgid "Commit succeeded, but other errors follow:" msgstr "Arkiveringen lyckades, men andra fel följer:" -#: ../libsvn_client/commit.c:170 +#: ../libsvn_client/commit.c:172 msgid "Error unlocking locked dirs (details follow):" msgstr "Fel vid upplåsning av låsta kataloger (mer information följer):" -#: ../libsvn_client/commit.c:181 +#: ../libsvn_client/commit.c:183 msgid "Error bumping revisions post-commit (details follow):" msgstr "Fel vid höjning av revisionsnummer efter arkivering (mer information följer):" -#: ../libsvn_client/commit.c:314 -#, c-format -msgid "Cannot delete the directory '%s' in a non-recursive commit because it has children" -msgstr "Kan inte radera katalogen \"%s\" icke-rekursivt eftersom den inte är tom" - -#: ../libsvn_client/commit.c:613 +#: ../libsvn_client/commit.c:554 #, c-format msgid "'%s' is a URL, but URLs cannot be commit targets" msgstr "\"%s\" är en URL, men URL:er kan inte vara mål vid arkivering" -#: ../libsvn_client/commit.c:735 +#: ../libsvn_client/commit.c:656 msgid "" "Commit can only commit to a single repository at a time.\n" "Are all targets part of the same working copy?" @@ -1522,9039 +1718,12635 @@ msgstr "" "Arkivering kan bara ske till ett enda arkiv åt gången.\n" "Ingår samtliga mål i samma arbetskopia?" -#: ../libsvn_client/commit.c:851 +#: ../libsvn_client/commit.c:722 #, c-format msgid "Cannot commit '%s' because it was moved from '%s' which is not part of the commit; both sides of the move must be committed together" msgstr "Kan inte arkivera \"%s\" eftersom den flyttades från \"%s\" som inte ingår i arkiveringen; bägge sidor av flytten måste arkiveras tillsammans" -#: ../libsvn_client/commit.c:895 +#: ../libsvn_client/commit.c:777 #, c-format msgid "Cannot commit '%s' because it was moved to '%s' which is not part of the commit; both sides of the move must be committed together" msgstr "Kan inte arkivera \"%s\" eftersom den flyttades till \"%s\" som inte ingår i arkiveringen; bägge sidor av flytten måste arkiveras tillsammans" -#: ../libsvn_client/commit_util.c:94 ../libsvn_repos/commit.c:167 +#: ../libsvn_client/commit_util.c:96 ../libsvn_repos/commit.c:169 #, c-format msgid "Directory '%s' is out of date" msgstr "Katalogen \"%s\" är inaktuell" -#: ../libsvn_client/commit_util.c:95 ../libsvn_repos/commit.c:169 +#: ../libsvn_client/commit_util.c:97 ../libsvn_repos/commit.c:171 #, c-format msgid "File '%s' is out of date" msgstr "Objektet \"%s\" är inaktuellt" -#: ../libsvn_client/commit_util.c:130 +#: ../libsvn_client/commit_util.c:133 #, c-format msgid "Directory '%s' is locked in another working copy" msgstr "Katalogen \"%s\" är låst i en annan arbetskopia" -#: ../libsvn_client/commit_util.c:131 +#: ../libsvn_client/commit_util.c:134 #, c-format msgid "File '%s' is locked in another working copy" msgstr "Filen \"%s\" är låst i en annan arbetskopia" -#: ../libsvn_client/commit_util.c:166 +#: ../libsvn_client/commit_util.c:169 #, c-format msgid "Changing directory '%s' is forbidden by the server" msgstr "Servern tillåter inte att katalogen \"%s\" ändras" -#: ../libsvn_client/commit_util.c:167 +#: ../libsvn_client/commit_util.c:170 #, c-format msgid "Changing file '%s' is forbidden by the server" msgstr "Servern tillåter inte att filen \"%s\" ändras" -#: ../libsvn_client/commit_util.c:315 +#: ../libsvn_client/commit_util.c:318 #, c-format msgid "Aborting commit: '%s' remains in tree-conflict" msgstr "Arkiveringen avbryts: \"%s\" är fortfarande i trädkonflikt" -#: ../libsvn_client/commit_util.c:666 +#: ../libsvn_client/commit_util.c:668 #, c-format msgid "Aborting commit: '%s' remains in conflict" msgstr "Arkiveringen avbryts: \"%s\" är fortfarande i konflikt" -#: ../libsvn_client/commit_util.c:685 +#: ../libsvn_client/commit_util.c:687 #, c-format msgid "Node '%s' has unexpectedly changed kind" msgstr "Noden \"%s\" bytte oväntat typ" -#: ../libsvn_client/commit_util.c:726 +#: ../libsvn_client/commit_util.c:728 #, c-format msgid "'%s' is scheduled for addition, but is missing" msgstr "\"%s\" är schemalagd att läggas till men finns inte" -#: ../libsvn_client/commit_util.c:1212 +#: ../libsvn_client/commit_util.c:1279 #, c-format msgid "'%s' is not known to exist in the repository and is not part of the commit, yet its child '%s' is part of the commit" msgstr "\"%s\" är inte versionshanterad och är ej heller delaktig i arkiveringen, men trots det är dess barn \"%s\" en del av arkiveringen" -#: ../libsvn_client/commit_util.c:1351 +#: ../libsvn_client/commit_util.c:1421 #, c-format msgid "Cannot commit both '%s' and '%s' as they refer to the same URL" msgstr "Kan inte arkivera både \"%s\" och \"%s\" eftersom de syftar på samma URL" -#: ../libsvn_client/commit_util.c:1502 +#: ../libsvn_client/commit_util.c:1576 #, c-format msgid "Commit item '%s' has copy flag but no copyfrom URL" msgstr "Arkiveringsobjektet \"%s\" har kopieringsflaggan satt, men saknar \"copyfrom\"-URL" -#: ../libsvn_client/commit_util.c:1507 +#: ../libsvn_client/commit_util.c:1581 #, 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:1969 +#: ../libsvn_client/commit_util.c:2056 msgid "Standard properties can't be set explicitly as revision properties" msgstr "Standardegenskaper kan inte sättas direkt som revisionsegenskaper" -#: ../libsvn_client/copy.c:427 -#, c-format -msgid "Path '%s' exists, but is excluded" -msgstr "Sökvägen \"%s\" finns men är utesluten" +#: ../libsvn_client/conflicts.c:734 ../libsvn_client/conflicts.c:1095 +#: ../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 +msgid "unknown author" +msgstr "okänd författare" -#: ../libsvn_client/copy.c:433 ../libsvn_client/copy.c:1050 -#: ../libsvn_client/copy.c:1309 ../libsvn_client/copy.c:1884 -#: ../libsvn_client/import.c:868 -#, c-format -msgid "Path '%s' already exists" -msgstr "Sökvägen \"%s\" finns redan" +#: ../libsvn_client/conflicts.c:1126 +msgid "A file containing uncommitted changes was found in the working copy." +msgstr "En fil med oarkiverade ändringar hittades i arbetskopian." -#: ../libsvn_client/copy.c:488 -#, c-format -msgid "Path '%s' already exists as unversioned node" -msgstr "Sökvägen \"%s\" finns redan men är ej versionshanterad" +#: ../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 "En fil som skiljer sig från motsvarande fil i källgrenen för sammanslagningen hittades i arbetskopian." -#: ../libsvn_client/copy.c:510 ../libsvn_client/copy.c:520 -#: ../libsvn_client/copy.c:1900 -#, c-format -msgid "Path '%s' is not a directory" -msgstr "Sökvägen \"%s\" är ingen katalog" +#: ../libsvn_client/conflicts.c:1134 +msgid "A file which already occupies this path was found in the working copy." +msgstr "En fil som redan upptar denna sökväg hittades i arbetskopian." -#: ../libsvn_client/copy.c:559 ../libsvn_client/merge.c:10117 -#: ../svnlook/svnlook.c:1424 -#, c-format -msgid "Path '%s' does not exist" -msgstr "Sökvägen \"%s\" finns inte" +#: ../libsvn_client/conflicts.c:1138 +msgid "An unversioned file was found in the working copy." +msgstr "En icke versionshanterad fil fanns i arbetskopian." -#: ../libsvn_client/copy.c:729 ../libsvn_client/copy.c:770 -#, c-format -msgid "Path '%s' already exists, but is not a directory" -msgstr "\"%s\" finns redan men är ingen katalog" +#: ../libsvn_client/conflicts.c:1142 +msgid "A deleted file was found in the working copy." +msgstr "En raderad fil hittades i arbetskopian." -#: ../libsvn_client/copy.c:831 -msgid "Source and destination URLs appear not to point to the same repository." -msgstr "Käll- och destinations-URL:erna verkar inte syfta på samma arkiv." +#: ../libsvn_client/conflicts.c:1147 +msgid "No such file was found in the working copy." +msgstr "Ingen sådan fil hittades i arbetskopian." -#: ../libsvn_client/copy.c:1040 ../libsvn_client/prop_commands.c:167 -#, c-format -msgid "Path '%s' does not exist in revision %ld" -msgstr "Sökvägen \"%s\" finns inte i revision %ld" +#. ### display deleted revision +#: ../libsvn_client/conflicts.c:1151 +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?" -#: ../libsvn_client/copy.c:1868 -#, c-format -msgid "Path '%s' not found in revision %ld" -msgstr "Sökvägen \"%s\" finns inte i revision %ld" +#. ### 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 "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. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### 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 "Filen i arbetskopian var bortflyttad när denna konflikt registrerades." -#: ../libsvn_client/copy.c:1873 +#: ../libsvn_client/conflicts.c:1207 ../libsvn_client/conflicts.c:1240 #, c-format -msgid "Path '%s' not found in head revision" -msgstr "Sökvägen \"%s\" finns inte i den senaste revisionen" +msgid "" +"The file in the working copy was moved away to\n" +"'%s'." +msgstr "" +"Filen i arbetskopian var bortflyttad till\n" +"\"%s\"." -#: ../libsvn_client/copy.c:2001 -msgid "Cannot mix repository and working copy sources" -msgstr "Kan inte blanda källor från arkiv och arbetskopia" +#. The move no longer exists. +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### 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 "En fil hade flyttats hit i arbetskopian när denna konflikt registrerades." -#: ../libsvn_client/copy.c:2053 +#: ../libsvn_client/conflicts.c:1281 ../libsvn_client/conflicts.c:1314 #, 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\"" +msgid "" +"A file was moved here in the working copy from\n" +"'%s'." +msgstr "" +"En fil hade flyttats hit i arbetskopian från\n" +"\"%s\"." -#: ../libsvn_client/copy.c:2089 -#, c-format -msgid "Cannot move the external at '%s'; please edit the svn:externals property on '%s'." -msgstr "Kan inte flytta externa objektet \"%s\"; var god redigera egenskapen svn:externals på \"%s\"." +#: ../libsvn_client/conflicts.c:1350 +msgid "A directory containing uncommitted changes was found in the working copy." +msgstr "En katalog med oarkiverade ändringar hittades i arbetskopian." -#: ../libsvn_client/copy.c:2104 -msgid "Moves between the working copy and the repository are not supported" -msgstr "Flytt mellan arbetskopian och arkivet stöds ej" +#: ../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 "En katalog som skiljer sig från motsvarande katalog i källgrenen för sammanslagningen hittades i arbetskopian." -#: ../libsvn_client/copy.c:2119 -#, c-format -msgid "Cannot move URL '%s' into itself" -msgstr "Kan inte flytta URL:en \"%s\" till sig själv" +#: ../libsvn_client/conflicts.c:1358 +msgid "A directory which already occupies this path was found in the working copy." +msgstr "En katalog som redan upptar denna sökväg hittades i arbetskopian." -#: ../libsvn_client/copy.c:2120 -#, c-format -msgid "Cannot move path '%s' into itself" -msgstr "Kan inte flytta sökvägen \"%s\" till sig själv" +#: ../libsvn_client/conflicts.c:1362 +msgid "An unversioned directory was found in the working copy." +msgstr "En icke versionshanterad katalog hittades i arbetskopian." -#: ../libsvn_client/copy.c:2187 -#, c-format -msgid "'%s' does not have a URL associated with it" -msgstr "\"%s\" verkar inte ha någon URL kopplad till sig" +#: ../libsvn_client/conflicts.c:1366 +msgid "A deleted directory was found in the working copy." +msgstr "En raderad katalog hittades i arbetskopian." -#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:282 -#: ../libsvn_client/externals.c:904 ../libsvn_client/externals.c:1103 -#: ../libsvn_wc/update_editor.c:1119 -#, c-format -msgid "Path '%s' is not in the working copy" -msgstr "Sökvägen \"%s\" finns inte i arbetskopian" +#: ../libsvn_client/conflicts.c:1372 +msgid "No such directory was found in the working copy." +msgstr "Ingen sådan katalog hittades i arbetskopian." -#: ../libsvn_client/copy_foreign.c:372 ../libsvn_client/export.c:812 -#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1051 -#: ../libsvn_ra_svn/client.c:1208 ../libsvn_wc/diff_editor.c:1981 -#: ../libsvn_wc/diff_editor.c:2060 ../libsvn_wc/externals.c:651 -#: ../libsvn_wc/update_editor.c:4235 -#, c-format -msgid "Checksum mismatch for '%s'" -msgstr "Felaktig kontrollsumma för \"%s\"" +#. ### display deleted revision +#: ../libsvn_client/conflicts.c:1376 +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?" -#: ../libsvn_client/copy_foreign.c:479 -#, c-format -msgid "'%s' is not a valid location inside a repository" -msgstr "\"%s\" är inte en giltig plats inuti arkivet" +#. ### 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 "En katalog schemalagd för att läggas till i nästa arkivering hittades i arbetskopian." -#: ../libsvn_client/copy_foreign.c:510 -#, c-format -msgid "Can't add '%s', because no parent directory is found" -msgstr "Kan inte lägga till \"%s\" eftersom ingen föräldrakatalog kan hittas" +#. 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 "Katalogen i arbetskopian hade flyttas bort när denna konflikt registrerades." -#: ../libsvn_client/delete.c:76 +#: ../libsvn_client/conflicts.c:1433 #, 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" +msgid "" +"The directory in the working copy was moved away to\n" +"'%s'." +msgstr "" +"Katalogen i arbetskopian var bortflyttad till\n" +"\"%s\"." -#: ../libsvn_client/delete.c:95 +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### find deleted/moved revision? +#: ../libsvn_client/conflicts.c:1450 +msgid "The directory had been moved away at the time this conflict was recorded." +msgstr "Katalogen hade flyttats bort när denna konflikt registrerades." + +#: ../libsvn_client/conflicts.c:1466 #, c-format -msgid "'%s' has local modifications -- commit or revert them first" -msgstr "\"%s\" har lokala ändringar; arkivera eller återställ dem först" +msgid "" +"The directory was moved away to\n" +"'%s'." +msgstr "" +"Katalogen var bortflyttad till\n" +"\"%s\"." -#: ../libsvn_client/delete.c:127 +#. The move no longer exists. +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### 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 "En katalog hade flyttats hit när denna konflikt registrerades." + +#: ../libsvn_client/conflicts.c:1507 #, c-format -msgid "Cannot remove the external at '%s'; please edit or delete the svn:externals property on '%s'" -msgstr "Kan inte ta bort externa objektet \"%s\"; var god redigera eller ta bort egenskapen svn:externals på \"%s\"" +msgid "" +"A directory was moved here from\n" +"'%s'." +msgstr "" +"En katalog hade flyttats hit från\n" +"\"%s\"." -#: ../libsvn_client/deprecated.c:862 ../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/conflicts.c:1540 +#, c-format +msgid "" +"A directory was moved here in the working copy from\n" +"'%s'." +msgstr "" +"En katalog hade flyttats hit i arbetskopian från\n" +"\"%s\"." -#: ../libsvn_client/deprecated.c:1624 -msgid "No commits in repository" -msgstr "Ingenting har arkiverats i arkivet" +#: ../libsvn_client/conflicts.c:2759 +msgid "An item containing uncommitted changes was found in the working copy." +msgstr "Ett objekt med oarkiverade ändringar hittades i arbetskopian." -#: ../libsvn_client/deprecated.c:2930 ../libsvn_wc/deprecated.c:4095 -msgid "Non-recursive relocation not supported" -msgstr "Icke-rekursiv omlokalisering otillåten" +#: ../libsvn_client/conflicts.c:2763 +msgid "An item which already occupies this path was found in the working copy." +msgstr "Ett objekt som redan upptar denna sökväg hittades i arbetskopian." -#. Utilities -#: ../libsvn_client/diff.c:64 -#, c-format -msgid "Path '%s' must be an immediate child of the directory '%s'" -msgstr "Sökvägen \"%s\" måste stå omedelbart under katalogen \"%s\"" +#: ../libsvn_client/conflicts.c:2767 +msgid "A deleted item was found in the working copy." +msgstr "Ett raderat objekt hittades i arbetskopian." -#: ../libsvn_client/diff.c:258 -#, c-format -msgid "%s\t(revision %ld)" -msgstr "%s\t(revision %ld)" +#: ../libsvn_client/conflicts.c:2772 +msgid "No such file or directory was found in the working copy." +msgstr "Ingen sådan fil eller katalog hittades i arbetskopian." -#: ../libsvn_client/diff.c:260 -#, c-format -msgid "%s\t(working copy)" -msgstr "%s\t(arbetskopia)" +#. ### display deleted revision +#: ../libsvn_client/conflicts.c:2777 +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/diff.c:512 ../svnlook/svnlook.c:794 -#, c-format -msgid "%sProperty changes on: %s%s" -msgstr "%sEgenskapsändringar för: %s%s" +#: ../libsvn_client/conflicts.c:2784 +msgid "An unversioned item was found in the working copy." +msgstr "Ett icke versionshanterat objekt hittades i arbetskopian." -#: ../libsvn_client/diff.c:760 -#, c-format -msgid "Cannot display: file marked as a binary type.%s" -msgstr "Kan inte visa: filen markerad som binär.%s" +#: ../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 "Ett objekt schemalagt för att läggas till i nästa arkivering hittades i arbetskopian." -#: ../libsvn_client/diff.c:1265 ../libsvn_client/merge.c:7178 -#: ../libsvn_client/merge.c:10524 -msgid "Not all required revisions are specified" -msgstr "Alla revisioner som krävs angavs inte" +#: ../libsvn_client/conflicts.c:2794 +msgid "The item in the working copy had been moved away at the time this conflict was recorded." +msgstr "Objektet i arbetskopian hade flyttas bort när denna konflikt registrerades." -#: ../libsvn_client/diff.c:1279 -msgid "At least one revision must be something other than BASE or WORKING when diffing a URL" -msgstr "Åtminstone en revision måste vara något annat än BASE eller WORKING för diff av en URL" +#: ../libsvn_client/conflicts.c:2798 +msgid "An item had been moved here in the working copy at the time this conflict was recorded." +msgstr "Ett objekt hade flyttats hit i arbetskopian när denna konflikt registrerades." -#: ../libsvn_client/diff.c:1316 +#: ../libsvn_client/conflicts.c:2826 #, c-format -msgid "Diff target '%s' was not found in the repository at revision '%ld'" -msgstr "\"%s\" fanns inte i revision %ld i arkivet" +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/diff.c:1321 -#, c-format -msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'" -msgstr "\"%s\" fanns inte i revision %ld eller %ld i arkivet" +#: ../libsvn_client/conflicts.c:2891 +msgid "No such file or directory was found in the merge target working copy.\n" +msgstr "Ingen sådan fil eller katalog hittades i sammanslagningsmålets arbetskopia.\n" -#: ../libsvn_client/diff.c:1496 +#: ../libsvn_client/conflicts.c:2900 #, c-format -msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'" -msgstr "\"%s\" fanns inte i revision %ld och %ld i arkivet" +msgid "%sThe file was moved to '^/%s' in r%ld by %s." +msgstr "%sFilen flyttades till \"^/%s\" i r%ld av %s."
[... 28153 lines stripped ...]
