# # # patch "ChangeLog" # from [04befd3a9c3c718d9f595a71475ecfe19850b7d7] # to [0c9f3593a8424b8289b6d628baf9caae4244ec2a] # # patch "po/sv.po" # from [04140260756af558ecab14b70a31ab33b23d6d50] # to [827661f47302ef571540784a549fed767d853cd7] # ============================================================ --- ChangeLog 04befd3a9c3c718d9f595a71475ecfe19850b7d7 +++ ChangeLog 0c9f3593a8424b8289b6d628baf9caae4244ec2a @@ -1,7 +1,8 @@ 2006-03-16 Richard Levitte * revision.cc (construct_revisions_from_ancestry): Linguistics: Close a parenthesis. + * po/sv.po: Translation update. 2006-03-15 Richard Levitte ============================================================ --- po/sv.po 04140260756af558ecab14b70a31ab33b23d6d50 +++ po/sv.po 827661f47302ef571540784a549fed767d853cd7 @@ -145,8 +145,8 @@ msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-08 15:30+0100\n" -"PO-Revision-Date: 2006-03-08 15:32+0100\n" +"POT-Creation-Date: 2006-03-16 05:56+0100\n" +"PO-Revision-Date: 2006-03-16 05:56+0100\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -154,62 +154,62 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: app_state.cc:110 +#: app_state.cc:118 #, c-format msgid "workspace required but not found%s%s" msgstr "arbetskatalog behövs men kunde inte hittas%s%s" -#: app_state.cc:118 +#: app_state.cc:126 #, c-format msgid "invalid directory ''" msgstr "katalogen '' är ogiltig" -#: app_state.cc:126 +#: app_state.cc:134 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'\n" msgstr "det finns redan en administrativ katalog (%s) i '%s'\n" -#: app_state.cc:165 app_state.cc:180 +#: app_state.cc:173 app_state.cc:188 #, c-format msgid "unknown path '%s'\n" msgstr "okänd sökväg '%s'\n" -#: app_state.cc:341 +#: app_state.cc:349 #, c-format msgid "search root '%s' does not exist" msgstr "angiven sökrot '%s' finns inte" -#: app_state.cc:342 +#: app_state.cc:350 #, c-format msgid "search root '%s' is not a directory\n" msgstr "sökroten '%s' är inte en katalog\n" -#: app_state.cc:377 +#: app_state.cc:385 #, c-format msgid "failed to parse date string '%s': %s" msgstr "kunde inte tyda datumangivelsen '%s': %s" -#: app_state.cc:391 +#: app_state.cc:399 #, c-format msgid "negative depth not allowed\n" msgstr "negativt djup är inte tillåtet\n" -#: app_state.cc:399 +#: app_state.cc:407 #, c-format msgid "negative or zero last not allowed\n" msgstr "talet angett med --last får inte vara negativt eller noll\n" -#: app_state.cc:407 +#: app_state.cc:415 #, c-format msgid "negative or zero next not allowed\n" msgstr "talet angett med --next får inte vara negativt eller noll\n" -#: app_state.cc:536 +#: app_state.cc:544 #, c-format msgid "Failed to read options file %s" msgstr "Misslyckades med att läsa filen %s" -#: app_state.cc:553 +#: app_state.cc:561 #, c-format msgid "Failed to write options file %s" msgstr "Misslyckades med att skriva filen %s" @@ -284,40 +284,40 @@ "multiple branch certs found for revision %s, please provide a branch name" msgstr "flera grencert funna för revision %s, var god ange en gren" -#: commands.cc:160 +#: commands.cc:163 #, c-format msgid "command '%s' has multiple ambiguous expansions:\n" msgstr "kommandot '%s' har mer än en betydelse:\n" -#: commands.cc:203 +#: commands.cc:206 msgid "commands:" msgstr "kommandon:" -#: commands.cc:254 +#: commands.cc:263 #, c-format msgid "unknown command '%s'\n" msgstr "okänt kommando '%s'\n" -#: commands.cc:301 +#: commands.cc:323 #, c-format msgid "pid file '%s' already exists" msgstr "pid-filen '%s' finns redan" -#: commands.cc:325 commands.cc:1334 commands.cc:1404 commands.cc:1840 -#: commands.cc:2686 commands.cc:3307 commands.cc:3542 commands.cc:3581 -#: commands.cc:3926 +#: commands.cc:347 commands.cc:1356 commands.cc:1426 commands.cc:1862 +#: commands.cc:2708 commands.cc:3329 commands.cc:3564 commands.cc:3603 +#: commands.cc:3948 msgid "informative" msgstr "informativ" -#: commands.cc:325 +#: commands.cc:347 msgid "command [ARGS...]" msgstr "kommandon [ARGUMENT...]" -#: commands.cc:325 +#: commands.cc:347 msgid "display command help" msgstr "skriv ut hjälptext" -#: commands.cc:404 +#: commands.cc:426 msgid "" "Enter a description of this change.\n" "Lines beginning with `MT:' are removed automatically.\n" @@ -325,16 +325,16 @@ "Mata in en beskrivning av denna ändring.\n" "Rader som börjar med 'MT:' kommer att tas bort automatiskt.\n" -#: commands.cc:411 +#: commands.cc:433 #, c-format msgid "edit of log message failed" msgstr "redigering av loggmeddelandet misslyckades" -#: commands.cc:420 +#: commands.cc:442 msgid "note: " msgstr "obs: " -#: commands.cc:421 +#: commands.cc:443 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -343,59 +343,59 @@ "grenen '%s' har mer än ett löv\n" "du kanske borde överväga '%s merge'" -#: commands.cc:482 commands.cc:758 commands.cc:1422 commands.cc:1506 -#: commands.cc:2736 commands.cc:2764 commands.cc:2767 commands.cc:2903 -#: commands.cc:3564 +#: commands.cc:504 commands.cc:780 commands.cc:1444 commands.cc:1528 +#: commands.cc:2758 commands.cc:2786 commands.cc:2789 commands.cc:2925 +#: commands.cc:3586 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" -#: commands.cc:489 +#: commands.cc:511 #, c-format msgid "expanding selection '%s'\n" msgstr "expanderar valet '%s'\n" -#: commands.cc:497 +#: commands.cc:519 #, c-format msgid "no match for selection '%s'" msgstr "det finns inget som matchar '%s'" -#: commands.cc:503 +#: commands.cc:525 #, c-format msgid "expanded to '%s'\n" msgstr "expanderar till '%s'\n" -#: commands.cc:520 +#: commands.cc:542 #, c-format msgid "selection '%s' has multiple ambiguous expansions: \n" msgstr "valet '%s' har mer än en möjlig betydelse: \n" -#: commands.cc:538 +#: commands.cc:560 #, c-format msgid "non-hex digits in id" msgstr "något tecken i identiteten är inte hexadecimalt" -#: commands.cc:547 +#: commands.cc:569 #, c-format msgid "partial id '%s' does not have an expansion" msgstr "den partiella identiteten '%s' matchar inte befintliga identiteter" -#: commands.cc:550 +#: commands.cc:572 #, c-format msgid "partial id '%s' has multiple ambiguous expansions:\n" msgstr "den partiella identiteten '%s' har mer än en uttydning:\n" -#: commands.cc:557 +#: commands.cc:579 #, c-format msgid "expanded partial id '%s' to '%s'\n" msgstr "expanderade partiell identitet '%s' till '%s'\n" -#: commands.cc:584 netsync.cc:1727 +#: commands.cc:606 netsync.cc:1732 #, c-format msgid "no public key '%s' found in database" msgstr "den publika nyckeln '%s' finns inte i databasen" -#: commands.cc:594 +#: commands.cc:616 #, c-format msgid "" "Key : %s\n" @@ -408,87 +408,87 @@ "Namn : %s\n" "Värde : %s\n" -#: commands.cc:628 +#: commands.cc:650 msgid "ok" msgstr "ok" -#: commands.cc:631 +#: commands.cc:653 msgid "bad" msgstr "felaktig" -#: commands.cc:634 +#: commands.cc:656 msgid "unknown" msgstr "okänd" -#: commands.cc:721 +#: commands.cc:743 #, c-format msgid "(*) - only in %s/" msgstr "(*) - enbart i %s/" -#: commands.cc:744 +#: commands.cc:766 #, c-format msgid "no keys found\n" msgstr "hittade inga nycklar\n" -#: commands.cc:746 +#: commands.cc:768 #, c-format msgid "no keys found matching '%s'\n" msgstr "hittade inga nycklar som matchar '%s'\n" -#: commands.cc:764 +#: commands.cc:786 #, c-format msgid "revision %s already has children. We cannot kill it." msgstr "revisionen %s har barn. Vi kan inte ta bort den." -#: commands.cc:904 commands.cc:928 commands.cc:965 commands.cc:986 -#: commands.cc:1022 +#: commands.cc:926 commands.cc:950 commands.cc:987 commands.cc:1008 +#: commands.cc:1044 msgid "key and cert" msgstr "nyckel och cert" -#: commands.cc:904 commands.cc:928 commands.cc:965 +#: commands.cc:926 commands.cc:950 commands.cc:987 msgid "KEYID" msgstr "NYCKELID" -#: commands.cc:904 +#: commands.cc:926 msgid "generate an RSA key-pair" msgstr "skapa ett RSA-nyckelpar" -#: commands.cc:919 +#: commands.cc:941 #, c-format msgid "key '%s' already exists" msgstr "nyckeln '%s' finns redan" -#: commands.cc:922 +#: commands.cc:944 #, c-format msgid "generating key-pair '%s'" msgstr "skapar nyckelparet '%s'" -#: commands.cc:924 +#: commands.cc:946 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "lagrar nyckelparet '%s' i %s/" -#: commands.cc:928 +#: commands.cc:950 msgid "drop a public and private key" msgstr "släng publik och privat nyckel" -#: commands.cc:942 +#: commands.cc:964 #, c-format msgid "dropping public key '%s' from database\n" msgstr "tar bort den publika nyckeln '%s' ur databasen\n" -#: commands.cc:952 +#: commands.cc:974 #, c-format msgid "dropping key pair '%s' from keystore\n" msgstr "tar bort nyckelparet '%s' från nyckellagret\n" -#: commands.cc:959 +#: commands.cc:981 #, c-format msgid "public or private key '%s' does not exist in keystore or database" msgstr "" "den publika eller privata nyckeln '%s' finns inte i nyckellager eller databas" -#: commands.cc:961 +#: commands.cc:983 #, c-format msgid "" "public or private key '%s' does not exist in keystore, and no database was " @@ -497,33 +497,33 @@ "den publika eller privata nyckeln '%s' finns inte i nyckellager och ingen " "databas angavs" -#: commands.cc:966 +#: commands.cc:988 msgid "change passphrase of a private RSA key" msgstr "ändra lösen till en privat RSA-nyckel" -#: commands.cc:976 +#: commands.cc:998 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "nyckeln '%s' finns inte i nyckellagret" -#: commands.cc:983 +#: commands.cc:1005 #, c-format msgid "passphrase changed\n" msgstr "lösen ändrat\n" -#: commands.cc:986 +#: commands.cc:1008 msgid "REVISION CERTNAME [CERTVAL]" msgstr "REVISION CERTNAMN [CERTVÄRDE]" -#: commands.cc:987 +#: commands.cc:1009 msgid "create a cert for a revision" msgstr "skapa ett cert för en revision" -#: commands.cc:1022 +#: commands.cc:1044 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "REVISION NAMN VÄRDE SIGNERARE1 [SIGNERARE2 [...]]" -#: commands.cc:1023 +#: commands.cc:1045 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" @@ -531,7 +531,7 @@ "kontrollera ifall ett hypotetiskt cert skulle vara pålitligt\n" "enligt nuvarande inställningar" -#: commands.cc:1056 +#: commands.cc:1078 #, c-format msgid "" "if a cert on: %s\n" @@ -546,99 +546,99 @@ "signerades av: %s\n" "skulle det vara: %s\n" -#: commands.cc:1065 +#: commands.cc:1087 msgid "trusted" msgstr "pålitligt" -#: commands.cc:1065 +#: commands.cc:1087 msgid "UNtrusted" msgstr "Opålitligt" -#: commands.cc:1068 commands.cc:1081 commands.cc:1094 commands.cc:1111 -#: commands.cc:1162 +#: commands.cc:1090 commands.cc:1103 commands.cc:1116 commands.cc:1133 +#: commands.cc:1184 msgid "review" msgstr "granskning" -#: commands.cc:1068 +#: commands.cc:1090 msgid "REVISION TAGNAME" msgstr "REVISION TAGNAMN" -#: commands.cc:1069 +#: commands.cc:1091 msgid "put a symbolic tag cert on a revision" msgstr "sätt ett symboliskt tagg-cert på en revision" -#: commands.cc:1081 +#: commands.cc:1103 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: commands.cc:1082 +#: commands.cc:1104 msgid "note the results of running a test on a revision" msgstr "notera ett testresultat för en revision" -#: commands.cc:1094 commands.cc:1111 +#: commands.cc:1116 commands.cc:1133 msgid "REVISION" msgstr "REVISION" -#: commands.cc:1095 +#: commands.cc:1117 msgid "approve of a particular revision" msgstr "godkänn en specifik revision" -#: commands.cc:1106 +#: commands.cc:1128 #, c-format msgid "need --branch argument for approval" msgstr "för godkännande behöver en gren anges med --branch" -#: commands.cc:1112 +#: commands.cc:1134 msgid "disapprove of a particular revision" msgstr "underkänn en specifik revision" -#: commands.cc:1125 +#: commands.cc:1147 #, c-format msgid "revision '%s' has %d changesets, cannot invert\n" msgstr "revisionen '%s' har %d föräldrar, kan inte invertera\n" -#: commands.cc:1129 +#: commands.cc:1151 #, c-format msgid "need --branch argument for disapproval" msgstr "för underkännande behöver en gren anges med --branch" -#: commands.cc:1162 +#: commands.cc:1184 msgid "REVISION [COMMENT]" msgstr "REVISION [KOMMENTAR]" -#: commands.cc:1163 +#: commands.cc:1185 msgid "comment on a particular revision" msgstr "kommentera en specifik revision" -#: commands.cc:1173 +#: commands.cc:1195 #, c-format msgid "edit comment failed" msgstr "misslyckades med att redigera kommentaren" -#: commands.cc:1176 +#: commands.cc:1198 #, c-format msgid "empty comment" msgstr "tom kommentar" -#: commands.cc:1189 commands.cc:1218 commands.cc:1243 commands.cc:1268 -#: commands.cc:2187 commands.cc:2305 commands.cc:2839 commands.cc:3355 +#: commands.cc:1211 commands.cc:1240 commands.cc:1265 commands.cc:1290 +#: commands.cc:2209 commands.cc:2327 commands.cc:2861 commands.cc:3377 msgid "workspace" msgstr "arbetskopia" -#: commands.cc:1189 commands.cc:1218 commands.cc:1334 commands.cc:2305 -#: commands.cc:2686 commands.cc:3355 +#: commands.cc:1211 commands.cc:1240 commands.cc:1356 commands.cc:2327 +#: commands.cc:2708 commands.cc:3377 msgid "[PATH]..." msgstr "[SÖKVÄG]..." -#: commands.cc:1190 +#: commands.cc:1212 msgid "add files to workspace" msgstr "lägg till filer i arbetskopian" -#: commands.cc:1219 +#: commands.cc:1241 msgid "drop files from workspace" msgstr "överge filer i arbetskopian" -#: commands.cc:1244 +#: commands.cc:1266 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -646,15 +646,15 @@ "KÄLLA MÅL\n" "KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG" -#: commands.cc:1246 +#: commands.cc:1268 msgid "rename entries in the workspace" msgstr "byt namn på filer i arbetskopian" -#: commands.cc:1268 +#: commands.cc:1290 msgid "NEW_ROOT PUT_OLD" msgstr "NY_ROT PLACERA_GAMLA" -#: commands.cc:1269 +#: commands.cc:1291 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -668,78 +668,78 @@ "PLACERA_GAMLA.\n" "Det rekommenderas varmt att använda --execute." -#: commands.cc:1288 commands.cc:1301 commands.cc:1381 commands.cc:3462 -#: commands.cc:3907 +#: commands.cc:1310 commands.cc:1323 commands.cc:1403 commands.cc:3484 +#: commands.cc:3929 msgid "debug" msgstr "felsökning" -#: commands.cc:1288 +#: commands.cc:1310 msgid "load file contents into db" msgstr "ladda in filinnehållet i databasen" -#: commands.cc:1301 +#: commands.cc:1323 msgid " " msgstr " " -#: commands.cc:1302 +#: commands.cc:1324 msgid "merge 3 files and output result" msgstr "slå ihop 3 filer och skriv ut resultatet" -#: commands.cc:1312 +#: commands.cc:1334 #, c-format msgid "ancestor file id does not exist" msgstr "förälderns filidentitet finns inte" -#: commands.cc:1315 +#: commands.cc:1337 #, c-format msgid "left file id does not exist" msgstr "vänster fils identitet finns inte" -#: commands.cc:1318 +#: commands.cc:1340 #, c-format msgid "right file id does not exist" msgstr "höger fils identitet finns inte" -#: commands.cc:1329 +#: commands.cc:1351 #, c-format msgid "merge failed" msgstr "ihopslagningen misslyckades" -#: commands.cc:1334 +#: commands.cc:1356 msgid "show status of workspace" msgstr "visa arbetskopians status" -#: commands.cc:1381 +#: commands.cc:1403 msgid "[PATH]" msgstr "[SÖKVÄG]" -#: commands.cc:1382 +#: commands.cc:1404 msgid "calculate identity of PATH or stdin" msgstr "räkna ut identiteten för SÖKVÄG eller stdin" -#: commands.cc:1405 +#: commands.cc:1427 msgid "FILENAME" msgstr "FILNAMN" -#: commands.cc:1406 +#: commands.cc:1428 msgid "write file from database to stdout" msgstr "skriv ut angiven fil från databasen" -#: commands.cc:1434 commands.cc:1436 commands.cc:3573 +#: commands.cc:1456 commands.cc:1458 commands.cc:3595 #, c-format msgid "no file '%s' found in revision '%s'\n" msgstr "filen '%s' finns inte i revisionen '%s'\n" -#: commands.cc:1448 commands.cc:1577 commands.cc:3040 commands.cc:3093 -#: commands.cc:3104 commands.cc:3254 commands.cc:3262 commands.cc:3816 +#: commands.cc:1470 commands.cc:1599 commands.cc:3062 commands.cc:3115 +#: commands.cc:3126 commands.cc:3276 commands.cc:3284 commands.cc:3838 msgid "tree" msgstr "träd" -#: commands.cc:1448 +#: commands.cc:1470 msgid "[DIRECTORY]\n" msgstr "[KATALOG]\n" -#: commands.cc:1449 +#: commands.cc:1471 msgid "" "check out a revision from database into directory.\n" "If a revision is given, that's the one that will be checked out.\n" @@ -751,76 +751,76 @@ "kommer lövet i grenen (implicit eller angiven) att hämtas. Om\n" "ingen katalog anges kommer grenens namn att användas som katalognamn." -#: commands.cc:1468 commands.cc:1487 +#: commands.cc:1490 commands.cc:1509 #, c-format msgid "need --branch argument for branch-based checkout" msgstr "--branch behövs för att kunna hämta en revision med given gren" -#: commands.cc:1481 +#: commands.cc:1503 #, c-format msgid "checkout directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: commands.cc:1490 +#: commands.cc:1512 #, c-format msgid "branch '%s' is empty" msgstr "grenen '%s' är tom" -#: commands.cc:1493 +#: commands.cc:1515 #, c-format msgid "branch %s has multiple heads:" msgstr "grenen %s har flera löv:" -#: commands.cc:1496 +#: commands.cc:1518 #, c-format msgid "choose one with '%s checkout -r'" msgstr "välj en med '%s update -r'" -#: commands.cc:1497 +#: commands.cc:1519 #, c-format msgid "branch %s has multiple heads" msgstr "grenen %s har flera löv" -#: commands.cc:1524 +#: commands.cc:1546 #, c-format msgid "revision %s is not a member of branch %s\n" msgstr "revisionen %s är inte med i grenen %s\n" -#: commands.cc:1558 +#: commands.cc:1580 #, c-format msgid "no file %s found in database for %s" msgstr "det finns ingen fil %s för %s i databasen" -#: commands.cc:1577 +#: commands.cc:1599 msgid "show unmerged head revisions of branch" msgstr "visa ej ihopslagna lövrevisioner i grenen" -#: commands.cc:1585 commands.cc:3049 +#: commands.cc:1607 commands.cc:3071 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "var god ange en gren med --branch=GREN" -#: commands.cc:1590 commands.cc:3053 commands.cc:3142 commands.cc:3145 +#: commands.cc:1612 commands.cc:3075 commands.cc:3164 commands.cc:3167 #, c-format msgid "branch '%s' is empty\n" msgstr "grenen '%s' är tom\n" -#: commands.cc:1592 +#: commands.cc:1614 #, c-format msgid "branch '%s' is currently merged:\n" msgstr "grenen '%s' har för tillfället ett löv:\n" -#: commands.cc:1594 +#: commands.cc:1616 #, c-format msgid "branch '%s' is currently unmerged:\n" msgstr "grenen '%s' har för tillfället mer än ett löv:\n" -#: commands.cc:1633 +#: commands.cc:1655 #, c-format msgid "no epoch for branch %s\n" msgstr "ingen epok i grenen %s\n" -#: commands.cc:1841 +#: commands.cc:1863 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -846,7 +846,7 @@ "missing\n" "changed" -#: commands.cc:1852 +#: commands.cc:1874 msgid "" "show database objects, or the current workspace manifest, or known,\n" "unknown, intentionally ignored, missing, or changed state files" @@ -854,124 +854,124 @@ "visa databasobjekten, arbetskopians manifest, okända filer, kända\n" "filer, medvetet ignorerade filer, saknade filer eller ändrade filer" -#: commands.cc:1890 commands.cc:1918 commands.cc:1936 +#: commands.cc:1912 commands.cc:1940 commands.cc:1958 msgid "packet i/o" msgstr "paket-I/O" -#: commands.cc:1890 commands.cc:1918 +#: commands.cc:1912 commands.cc:1940 msgid "ID" msgstr "ID" -#: commands.cc:1890 +#: commands.cc:1912 msgid "write public key packet to stdout" msgstr "skriv it datapaket för publik nyckel till stdout" -#: commands.cc:1912 +#: commands.cc:1934 #, c-format msgid "public key '%s' does not exist" msgstr "den publika nyckeln '%s' finns inte" -#: commands.cc:1918 +#: commands.cc:1940 msgid "write private key packet to stdout" msgstr "skriv it datapaket för privat nyckel till stdout" -#: commands.cc:1926 +#: commands.cc:1948 #, c-format msgid "public and private key '%s' do not exist in keystore" msgstr "den publika och privata nyckeln '%s' finns inte i nyckellagret" -#: commands.cc:1937 +#: commands.cc:1959 msgid "read packets from files or stdin" msgstr "läs paket från filer eller stdin" -#: commands.cc:1945 +#: commands.cc:1967 #, c-format msgid "no packets found on stdin" msgstr "inga paket hittade i stdin" -#: commands.cc:1956 +#: commands.cc:1978 #, c-format msgid "no packets found in given file" msgid_plural "no packets found in given files" msgstr[0] "inga paket funna i den angivna filen" msgstr[1] "inga paket funna i de angivna filerna" -#: commands.cc:1960 +#: commands.cc:1982 #, c-format msgid "read %d packet" msgid_plural "read %d packets" msgstr[0] "läste %d paket" msgstr[1] "läste %d paket" -#: commands.cc:1989 +#: commands.cc:2011 #, c-format msgid "setting default server to %s\n" msgstr "sätter standardserver till %s\n" -#: commands.cc:1995 +#: commands.cc:2017 #, c-format msgid "no hostname given" msgstr "inget värdnamn angivet" -#: commands.cc:1997 +#: commands.cc:2019 #, c-format msgid "no server given and no default server set" msgstr "ingen server angiven och ingen standardserver är satt" -#: commands.cc:2015 +#: commands.cc:2037 #, c-format msgid "setting default branch include pattern to '%s'\n" msgstr "sätter standardmönstret för grenar att ta med till '%s'\n" -#: commands.cc:2021 +#: commands.cc:2043 #, c-format msgid "setting default branch exclude pattern to '%s'\n" msgstr "sätter standardmönstret för grenar att INTE ta med till '%s'\n" -#: commands.cc:2027 +#: commands.cc:2049 #, c-format msgid "no branch pattern given" msgstr "inget grenmönster angivet" -#: commands.cc:2029 +#: commands.cc:2051 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "inget grenmönster angivet och inget standardmönster satt" -#: commands.cc:2045 commands.cc:2060 commands.cc:2074 commands.cc:2089 +#: commands.cc:2067 commands.cc:2082 commands.cc:2096 commands.cc:2111 msgid "network" msgstr "nätverk" -#: commands.cc:2045 commands.cc:2060 commands.cc:2074 +#: commands.cc:2067 commands.cc:2082 commands.cc:2096 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADRESS[:PORTNUMMER] [MÖNSTER]]" -#: commands.cc:2046 +#: commands.cc:2068 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "skicka grenar som matchar MÖNSTER till netsync-server på ADRESS" -#: commands.cc:2061 +#: commands.cc:2083 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "hämta grenar som matchar MÖNSTER till netsync-server på ADRESS" -#: commands.cc:2068 +#: commands.cc:2090 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication\n" msgstr "hämtar anonymt; använd -kNYCKELNAMN om du behöver autentisera\n" -#: commands.cc:2075 +#: commands.cc:2097 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "synkronisera grenar som matchar MÖNSTER till netsync-server på ADRESS" -#: commands.cc:2089 +#: commands.cc:2111 msgid "PATTERN ..." msgstr "MÖNSTER ..." -#: commands.cc:2090 +#: commands.cc:2112 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "servera de grenar som matchar MÖNSTER till anslutande klienter" -#: commands.cc:2103 +#: commands.cc:2125 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -979,11 +979,11 @@ "behöver tillstånd att använda ett permanent lösenord (se lua-rutinen\n" "persist_phrase_ok())" -#: commands.cc:2115 +#: commands.cc:2137 msgid "database" msgstr "databas" -#: commands.cc:2116 +#: commands.cc:2138 msgid "" "init\n" "info\n" @@ -1015,16 +1015,16 @@ "rosterify\n" "set_epoch GREN EPOK\n" -#: commands.cc:2130 +#: commands.cc:2152 msgid "manipulate database state" msgstr "gör ändringar direkt i databasen" -#: commands.cc:2177 +#: commands.cc:2199 #, c-format msgid "The epoch must be %s characters" msgstr "Epoken måste innehålla %s tecken" -#: commands.cc:2187 +#: commands.cc:2209 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1034,40 +1034,40 @@ "get SÖKVÄG [ATTR]\n" "drop SÖKVÄG [ATTR]" -#: commands.cc:2188 +#: commands.cc:2210 msgid "set, get or drop file attributes" msgstr "sätt, hämta eller ta bort attribut" -#: commands.cc:2204 +#: commands.cc:2226 #, c-format msgid "Unknown path '%s'" msgstr "Okänd sökväg '%s'" -#: commands.cc:2233 +#: commands.cc:2255 #, c-format msgid "Path '%s' does not have attribute '%s'\n" msgstr "Sökvägen '%s' har inget attribut '%s'\n" -#: commands.cc:2287 +#: commands.cc:2309 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message och --message-file får inte anges samtidigt" -#: commands.cc:2306 +#: commands.cc:2328 msgid "commit workspace to database" msgstr "arkivera arbetskopian i databasen" -#: commands.cc:2324 +#: commands.cc:2346 #, c-format msgid "no changes to commit\n" msgstr "inga ändringar att arkivera\n" -#: commands.cc:2338 +#: commands.cc:2360 #, c-format msgid "beginning commit on branch '%s'\n" msgstr "börjar arkivering av ändringar i grenen '%s'\n" -#: commands.cc:2347 +#: commands.cc:2369 #, c-format msgid "" "MT/log is non-empty and log message was specified on command line\n" @@ -1078,32 +1078,32 @@ "kanske ta bort eller flytta på MT/log\n" "eller ta bort --message/--message-file från kommandoraden?" -#: commands.cc:2359 +#: commands.cc:2381 #, c-format msgid "empty log message; commit canceled" msgstr "tomt loggmeddelande; arkivering avbryts" -#: commands.cc:2378 +#: commands.cc:2400 #, c-format msgid "log message rejected: %s\n" msgstr "loggmeddelandet förkastas: %s\n" -#: commands.cc:2386 +#: commands.cc:2408 #, c-format msgid "revision %s already in database\n" msgstr "revisionen %s finns redan i databasen\n" -#: commands.cc:2424 commands.cc:2441 commands.cc:2460 +#: commands.cc:2446 commands.cc:2463 commands.cc:2482 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "filen '%s' ändrades under arkivering, avbryter" -#: commands.cc:2486 +#: commands.cc:2508 #, c-format msgid "committed revision %s\n" msgstr "arkiverade revisionen %s\n" -#: commands.cc:2492 +#: commands.cc:2514 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1112,7 +1112,7 @@ "obs: den här revisionen skapade divergens\n" "obs: du kan tänkas vilja (eller kanske inte) köra '%s merge'" -#: commands.cc:2687 +#: commands.cc:2709 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -1124,7 +1124,7 @@ "revisionen. Om två revisioner anges visas skillnaden mellan dem. Om\n" "inget format anges används unified." -#: commands.cc:2703 +#: commands.cc:2725 #, c-format msgid "" "--diff-args requires --external\n" @@ -1133,16 +1133,16 @@ "--diff-args kräver att även --external anges\n" "lägg till --external eller ta bort --diff-args?" -#: commands.cc:2745 +#: commands.cc:2767 #, c-format msgid "current revision has no ancestor" msgstr "denna revision har ingen förälder" -#: commands.cc:2808 +#: commands.cc:2830 msgid "no changes" msgstr "inga ändringar" -#: commands.cc:2840 +#: commands.cc:2862 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -1156,12 +1156,12 @@ "Om en revision har angivits så uppdateras arbetskopian till den,\n" "i annat fall uppdateras den till lövet i grenen." -#: commands.cc:2878 +#: commands.cc:2900 #, c-format msgid "this workspace is a new project; cannot update" msgstr "denna arbetskatalog är ett nytt projekt; kan inte uppdatera" -#: commands.cc:2885 +#: commands.cc:2907 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1172,32 +1172,32 @@ "faktum är att den inte ens matchar nuvarande revision\n" "du kanske vill ange --revision=" -#: commands.cc:2890 +#: commands.cc:2912 #, c-format msgid "multiple update candidates:" msgstr "mer än en uppdateringskandidat:" -#: commands.cc:2894 +#: commands.cc:2916 #, c-format msgid "choose one with '%s update -r'" msgstr "välj en med '%s update -r'" -#: commands.cc:2895 +#: commands.cc:2917 #, c-format msgid "multiple update candidates remain after selection" msgstr "mer än en kandidat är kvar efter urval" -#: commands.cc:2910 +#: commands.cc:2932 #, c-format msgid "already up to date at %s\n" msgstr "redan uppdaterad till %s\n" -#: commands.cc:2918 +#: commands.cc:2940 #, c-format msgid "selected update target %s\n" msgstr "valt uppdateringsmål är %s\n" -#: commands.cc:2930 +#: commands.cc:2952 #, c-format msgid "" "revision %s is not a member of branch %s\n" @@ -1206,157 +1206,157 @@ "revisionen %s är inte i grenen %s\n" "försök igen med en explicit --branch\n" -#: commands.cc:3030 +#: commands.cc:3052 #, c-format msgid "updated to base revision %s\n" msgstr "uppdaterad till revisionen %s\n" -#: commands.cc:3040 +#: commands.cc:3062 msgid "merge unmerged heads of branch" msgstr "slå ihop ej ihopslagna löv i grenen" -#: commands.cc:3056 +#: commands.cc:3078 #, c-format msgid "branch '%s' is already merged\n" msgstr "löven i grenen '%s' är redan ihopslagna\n" -#: commands.cc:3064 +#: commands.cc:3086 #, c-format msgid "starting with revision 1 / %d\n" msgstr "börjar med revision 1 av %d\n" -#: commands.cc:3068 +#: commands.cc:3090 #, c-format msgid "merging with revision %d / %d\n" msgstr "slår ihop med revision %d av %d\n" -#: commands.cc:3069 commands.cc:3070 commands.cc:3152 commands.cc:3285 -#: commands.cc:3286 +#: commands.cc:3091 commands.cc:3092 commands.cc:3174 commands.cc:3307 +#: commands.cc:3308 #, c-format msgid "[source] %s\n" msgstr "[källa] %s\n" -#: commands.cc:3087 commands.cc:3250 commands.cc:3304 +#: commands.cc:3109 commands.cc:3272 commands.cc:3326 #, c-format msgid "[merged] %s\n" msgstr "[ihopslagen] %s\n" -#: commands.cc:3090 +#: commands.cc:3112 #, c-format msgid "note: your workspaces have not been updated\n" msgstr "obs: dina arbetskopior har inte uppdaterats\n" -#: commands.cc:3093 +#: commands.cc:3115 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "KÄLLGREN MÅLGREN" -#: commands.cc:3094 +#: commands.cc:3116 msgid "merge from one branch to another asymmetrically" msgstr "slå ihop asymmetriskt från en gren till en annan" -#: commands.cc:3104 +#: commands.cc:3126 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "KÄLLGREN MÅLGREN KATALOG" -#: commands.cc:3105 +#: commands.cc:3127 msgid "merge one branch into a subdirectory in another branch" msgstr "slå ihop en gren till en underkatalog i en annan gren" -#: commands.cc:3143 commands.cc:3146 +#: commands.cc:3165 commands.cc:3168 #, c-format msgid "branch '%s' is not merged\n" msgstr "löven i grenen '%s' är inte ihopslagna\n" -#: commands.cc:3151 +#: commands.cc:3173 #, c-format msgid "propagating %s -> %s\n" msgstr "propagerar %s -> %s\n" -#: commands.cc:3153 +#: commands.cc:3175 #, c-format msgid "[target] %s\n" msgstr "[mål] %s\n" -#: commands.cc:3158 +#: commands.cc:3180 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "grenen '%s' är uppdaterad med avseende på grenen '%s'\n" -#: commands.cc:3160 +#: commands.cc:3182 #, c-format msgid "no action taken\n" msgstr "inget utfördes\n" -#: commands.cc:3164 +#: commands.cc:3186 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "ingen ihopslagning behövs; sätter %s i grenen '%s'\n" -#: commands.cc:3200 +#: commands.cc:3222 #, c-format msgid "Path %s not found in destination tree." msgstr "Sökvägen %s finns inte i målträdet." -#: commands.cc:3254 +#: commands.cc:3276 msgid "refresh the inodeprint cache" msgstr "uppdatera inodeprint-cachen" -#: commands.cc:3263 +#: commands.cc:3285 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VÄNSTERREVISION HÖGERREVISION MÅLGREN" -#: commands.cc:3264 +#: commands.cc:3286 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" "slå ihop två explicit angivna revisioner, placera resultatet i angiven gren" -#: commands.cc:3278 +#: commands.cc:3300 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s och %s är samma revision, avbryter" -#: commands.cc:3280 commands.cc:3282 +#: commands.cc:3302 commands.cc:3304 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s är redan förfader till %s" -#: commands.cc:3307 +#: commands.cc:3329 msgid "(revision|file|key) PARTIAL-ID" msgstr "(revision|file|key) PARTIAL-ID" -#: commands.cc:3308 +#: commands.cc:3330 msgid "complete partial id" msgstr "utöka den partiella identiteten" -#: commands.cc:3317 +#: commands.cc:3339 #, c-format msgid "non-hex digits in partial id" msgstr "något tecken i den partiella identiteten är inte hexadecimalt" -#: commands.cc:3356 +#: commands.cc:3378 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")" -#: commands.cc:3433 +#: commands.cc:3455 #, c-format msgid "reverting %s" msgstr "återställer %s" -#: commands.cc:3437 +#: commands.cc:3459 #, c-format msgid "no file version %s found in database for %s" msgstr "filversionen %s finns inte i databasen för %s" -#: commands.cc:3450 +#: commands.cc:3472 #, c-format msgid "recreating %s/" msgstr "återställer %s/" -#: commands.cc:3462 +#: commands.cc:3484 msgid "RCSFILE..." msgstr "RCSFIL..." -#: commands.cc:3463 +#: commands.cc:3485 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " @@ -1366,36 +1366,36 @@ "detta kommando importerar inte revisioner; du vill antagligen använda\n" "cvs_import" -#: commands.cc:3479 +#: commands.cc:3501 msgid "rcs" msgstr "rcs" -#: commands.cc:3479 +#: commands.cc:3501 msgid "CVSROOT" msgstr "CVSROOT" -#: commands.cc:3479 +#: commands.cc:3501 msgid "import all versions in CVS repository" msgstr "importera alla revisioner i ett CVS-arkiv" -#: commands.cc:3542 +#: commands.cc:3564 msgid "PATH" msgstr "SÖKVÄG" -#: commands.cc:3543 +#: commands.cc:3565 msgid "print annotated copy of the file from REVISION" msgstr "skriv ut filen ur REVISION med extra detaljer" -#: commands.cc:3563 +#: commands.cc:3585 #, c-format msgid "no revision for file '%s' in database" msgstr "filen '%s' har ingen revision i databasen" -#: commands.cc:3581 +#: commands.cc:3603 msgid "[FILE] ..." msgstr "[FIL] ..." -#: commands.cc:3582 +#: commands.cc:3604 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -1404,34 +1404,34 @@ "arbetskatalogen om inga filer angivits. Om en eller flera revisioner\n" "har angivits används de som utgångspunkter." -#: commands.cc:3630 +#: commands.cc:3652 #, c-format msgid "Unknown file '%s' for log command" msgstr "Okänd fil '%s'" -#: commands.cc:3648 +#: commands.cc:3670 #, c-format msgid "only one of --last/--next allowed" msgstr "enbart en av --last eller --next tillåten" -#: commands.cc:3816 +#: commands.cc:3838 msgid "[DIRECTORY]" msgstr "[KATALOG]" -#: commands.cc:3816 +#: commands.cc:3838 msgid "setup a new workspace directory, default to current" msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)" -#: commands.cc:3822 +#: commands.cc:3844 #, c-format msgid "need --branch argument for setup" msgstr "du måste ange en gren med --branch till kommandot \"setup\"" -#: commands.cc:3836 +#: commands.cc:3858 msgid "automation" msgstr "automatisering" -#: commands.cc:3837 +#: commands.cc:3859 msgid "" "interface_version\n" "heads [BRANCH]\n" @@ -1483,84 +1483,84 @@ "packet_for_fdelta GAMMAL_FIL NY_FIL\n" "keys\n" -#: commands.cc:3861 +#: commands.cc:3883 msgid "automation interface" msgstr "automatiseringsgränssnitt" -#: commands.cc:3875 commands.cc:3891 +#: commands.cc:3897 commands.cc:3913 msgid "vars" msgstr "variabler" -#: commands.cc:3875 +#: commands.cc:3897 msgid "DOMAIN NAME VALUE" msgstr "DOMÄN NAMN VÄRDE" -#: commands.cc:3876 +#: commands.cc:3898 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "sätt databasvariabeln NAMN till VÄRDE i domänen DOMÄN" -#: commands.cc:3891 +#: commands.cc:3913 msgid "DOMAIN NAME" msgstr "DOMÄN NAMN" -#: commands.cc:3892 +#: commands.cc:3914 msgid "remove the database variable NAME in domain DOMAIN" msgstr "ta bort databasvariabeln NAMN från domänen DOMÄN" -#: commands.cc:3903 +#: commands.cc:3925 #, c-format msgid "no var with name %s in domain %s" msgstr "det finns inga variabler med namnet %s i domänen %s" -#: commands.cc:3907 +#: commands.cc:3929 msgid "REVID" msgstr "REVID" -#: commands.cc:3908 +#: commands.cc:3930 msgid "dump the roster associated with the given REVID" msgstr "skriv ut den lista som hör ihop med angivet REVID" -#: commands.cc:3926 +#: commands.cc:3948 msgid "REV REV" msgstr "REV REV" -#: commands.cc:3926 +#: commands.cc:3948 msgid "" "Show what conflicts would need to be resolved to merge the given revisions." msgstr "" "Visa de konflikter som behöver lösas om de givna revisionerna slås ihop." -#: commands.cc:3935 commands.cc:3937 +#: commands.cc:3957 commands.cc:3959 #, c-format msgid "%s in an ancestor of %s; no merge is needed." msgstr "%s är en förfader till %s; någon ihopslagning behövs inte." -#: commands.cc:3951 +#: commands.cc:3973 #, c-format msgid "There are %s node_name_conflicts." msgstr "Det finns %s node_name-konflikter." -#: commands.cc:3952 +#: commands.cc:3974 #, c-format msgid "There are %s file_content_conflicts." msgstr "Det finns %s file_content-konflikter." -#: commands.cc:3953 +#: commands.cc:3975 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Det finns %s node_attr-konflikter." -#: commands.cc:3954 +#: commands.cc:3976 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Det finns %s orphaned_node-konflikter." -#: commands.cc:3955 +#: commands.cc:3977 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Det finns %s rename_target-konflikter." -#: commands.cc:3956 +#: commands.cc:3978 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Det finns %s directory_loop-konflikter." @@ -1577,7 +1577,7 @@ msgid "markings" msgstr "markeringar" -#: database_check.cc:319 database_check.cc:507 netsync.cc:2760 +#: database_check.cc:319 database_check.cc:507 netsync.cc:2765 #: rcs_import.cc:1226 msgid "revisions" msgstr "revisioner" @@ -1586,7 +1586,7 @@ msgid "ancestry" msgstr "föräldraskap" -#: database_check.cc:451 netsync.cc:2764 +#: database_check.cc:451 netsync.cc:2769 msgid "keys" msgstr "nycklar" @@ -1636,7 +1636,9 @@ msgid "" "revision %s missing (%d revision references; %d cert references; %d parent " "references; %d child references; %d roster references)\n" -msgstr "revisionen %s saknas (%d revisionsreferenser; %d certreferenser; %d föräldrareferenser; %d barnreferenser; %d listreferenser)\n" +msgstr "" +"revisionen %s saknas (%d revisionsreferenser; %d certreferenser; %d " +"föräldrareferenser; %d barnreferenser; %d listreferenser)\n" #: database_check.cc:631 #, c-format @@ -1948,7 +1950,7 @@ msgid "cannot create %s; it already exists" msgstr "kan inte skapa %s; den finns redan" -#: database.cc:514 +#: database.cc:517 #, c-format msgid "" "schema version : %s\n" @@ -1989,72 +1991,72 @@ " cert : %u\n" " total : %u\n" -#: database.cc:569 +#: database.cc:572 #, c-format msgid "database schema version: %s" msgstr "databasens schemaversion: %s" -#: database.cc:646 +#: database.cc:649 #, c-format msgid "multiple statements in query: %s\n" msgstr "multipla kommandon i databasfråga: %s\n" -#: database.cc:652 +#: database.cc:655 #, c-format msgid "wanted %d columns got %d in query: %s\n" msgstr "ville ha %d kolumner, fick %d i databasfråga: %s\n" -#: database.cc:711 +#: database.cc:714 #, c-format msgid "null result in query: %s\n" msgstr "inget resultat med databasfråga: %s\n" -#: database.cc:729 +#: database.cc:732 #, c-format msgid "wanted %d rows got %s in query: %s\n" msgstr "ville ha %d rader, fick %s i databasfråga: %s\n" -#: database.cc:1728 +#: database.cc:1731 #, c-format msgid "another key with name '%s' already exists" msgstr "det finns redan en annan nyckel med namnet '%s'" -#: database.cc:2784 +#: database.cc:2787 #, c-format msgid "no database specified" msgstr "ingen databas angiven" -#: database.cc:2792 +#: database.cc:2795 #, c-format msgid "database %s does not exist" msgstr "databasen %s finns inte" -#: database.cc:2793 +#: database.cc:2796 #, c-format msgid "%s is a directory, not a database" msgstr "%s är en katalog, inte en databas" -#: database.cc:2818 +#: database.cc:2821 #, c-format msgid "could not open database '%s': %s" msgstr "kunde inte öppna databasen '%s': %s" -#: diff_patch.cc:588 +#: diff_patch.cc:590 #, c-format msgid "file '%s' does not exist in workspace" msgstr "filen '%s' existerar inte i arbetskopian" -#: diff_patch.cc:589 +#: diff_patch.cc:591 #, c-format msgid "'%s' in workspace is a directory, not a file" msgstr "'%s' i arbetskopian är en katalog, inte en fil" -#: diff_patch.cc:593 +#: diff_patch.cc:595 #, c-format msgid "file %s in workspace has id %s, wanted %s" msgstr "filen %s i arbetskopian har identiteten %s, %s eftersöktes" -#: diff_patch.cc:714 +#: diff_patch.cc:716 #, c-format msgid "" "help required for 3-way merge\n" @@ -2514,12 +2516,12 @@ msgid "syntax error near the \"%s\" option: %s" msgstr "syntaxfel nära flaggan \"%s\": %s" -#: monotone.cc:590 +#: monotone.cc:593 #, c-format msgid "monotone %s doesn't use the option %s" msgstr "monotone %s använder inte flaggan %s" -#: monotone.cc:625 +#: monotone.cc:628 #, c-format msgid "Options specific to '%s %s':" msgstr "Specifika flaggor för '%s %s':" @@ -2643,17 +2645,17 @@ msgid "revs out" msgstr "rev ut" -#: netsync.cc:815 +#: netsync.cc:820 #, c-format msgid "underflow on count of %s items to receive" msgstr "underflöde vid räkning av %s enheter att ta emot" -#: netsync.cc:1161 +#: netsync.cc:1166 #, c-format msgid "received network error: %s" msgstr "nätverksfel: %s" -#: netsync.cc:1193 +#: netsync.cc:1198 #, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -2674,12 +2676,12 @@ "jag väntade mig %s\n" "'%s unset %s %s' åsidosätter denna kontroll\n" -#: netsync.cc:1203 +#: netsync.cc:1208 #, c-format msgid "server key changed" msgstr "serverns nyckel ändrad" -#: netsync.cc:1208 +#: netsync.cc:1213 #, c-format msgid "" "first time connecting to server %s\n" @@ -2690,48 +2692,48 @@ "jag antar att det är rätt server, men du kan tänkas vilja dubbelkolla\n" "deras nyckels fingeravtryck: %s\n" -#: netsync.cc:1215 +#: netsync.cc:1220 #, c-format msgid "saving public key for %s to database\n" msgstr "sparar publik nyckel för %s i databasen\n" -#: netsync.cc:1303 +#: netsync.cc:1308 #, c-format msgid "rejected attempt at anonymous connection for write\n" msgstr "nekade försök att ansluta anonymt för skrivning\n" -#: netsync.cc:1310 +#: netsync.cc:1315 #, c-format msgid "rejected attempt at anonymous connection while running as sink\n" msgstr "nekade försök att ansluta anonymt under körning som \"sink\"\n" -#: netsync.cc:1325 netsync.cc:1422 +#: netsync.cc:1330 netsync.cc:1427 #, c-format msgid "not serving branch '%s'" msgstr "serverar ej grenen %s" -#: netsync.cc:1330 +#: netsync.cc:1335 #, c-format msgid "anonymous access to branch '%s' denied by server" msgstr "anonym åtkomst av grenen '%s' nekades av servern" -#: netsync.cc:1337 +#: netsync.cc:1342 #, c-format msgid "allowed anonymous read permission for '%s' excluding '%s'\n" msgstr "tillät anonym läsning av alla grenar som matchar '%s' och inte '%s'\n" -#: netsync.cc:1369 +#: netsync.cc:1374 #, c-format msgid "detected replay attack in auth netcmd\n" msgstr "upptäckte \"replay\"-attack i auth netcmd\n" -#: netsync.cc:1391 +#: netsync.cc:1396 #, c-format msgid "remote public key hash '%s' is unknown\n" msgstr "" "publik nyckel med kontrollsumman '%s' som kommer från andra sidan är okänd\n" -#: netsync.cc:1408 +#: netsync.cc:1413 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " @@ -2740,7 +2742,7 @@ "nekade läsning för '%s' av alla grenar som matchar '%s' och inte '%s' under " "körning som \"pure sink\"\n" -#: netsync.cc:1428 +#: netsync.cc:1433 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" @@ -2748,18 +2750,18 @@ "nekade läsning för '%s' av alla grenar som matchar '%s' och inte '%s' på " "grund av grenen '%s'\n" -#: netsync.cc:1431 +#: netsync.cc:1436 #, c-format msgid "access to branch '%s' denied by server" msgstr "åtkomst till grenen '%s' nekades av servern" -#: netsync.cc:1441 +#: netsync.cc:1446 #, c-format msgid "allowed '%s' read permission for '%s' excluding '%s'\n" msgstr "" "tillät läsning för '%s' av alla grenar som matchar '%s' och inte '%s'\n" -#: netsync.cc:1450 +#: netsync.cc:1455 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " @@ -2768,165 +2770,165 @@ "nekade skrivning för '%s' av alla grenar som matchar '%s' och inte '%s' " "under körning som \"pure source\"\n" -#: netsync.cc:1458 +#: netsync.cc:1463 #, c-format msgid "denied '%s' write permission for '%s' excluding '%s'\n" msgstr "" "nekade skrivning för '%s' av alla grenar som matchar '%s' och inte '%s'\n" -#: netsync.cc:1464 +#: netsync.cc:1469 #, c-format msgid "allowed '%s' write permission for '%s' excluding '%s'\n" msgstr "" "tillät skrivning för '%s' av alla grenar som matchar '%s' och inte '%s'\n" -#: netsync.cc:1504 +#: netsync.cc:1509 #, c-format msgid "bad client signature\n" msgstr "felaktig signatur från klienten\n" -#: netsync.cc:1520 +#: netsync.cc:1525 #, c-format msgid "Unexpected 'refine' command on non-refined item type\n" msgstr "Oväntat kommando \"refine\" på icke-raffinerad typ\n" -#: netsync.cc:1617 +#: netsync.cc:1622 #, c-format msgid "unknown bye phase %d received" msgstr "okänd hejdå-fas %d mottagen" -#: netsync.cc:1632 +#: netsync.cc:1637 #, c-format msgid "Unexpected 'done' command on non-refined item type\n" msgstr "Oväntat kommando \"done\" på icke-raffinerad typ\n" -#: netsync.cc:1712 +#: netsync.cc:1717 #, c-format msgid "epoch with hash '%s' does not exist in our database" msgstr "epoken med kontrollsumman '%s' finns inte i databasen" -#: netsync.cc:1741 +#: netsync.cc:1746 #, c-format msgid "revision '%s' does not exist in our database" msgstr "revisionen '%s' finns inte i databasen" -#: netsync.cc:1755 +#: netsync.cc:1760 #, c-format msgid "file '%s' does not exist in our database" msgstr "filen '%s' finns inte i databasen" -#: netsync.cc:1769 +#: netsync.cc:1774 #, c-format msgid "cert '%s' does not exist in our database" msgstr "certet '%s' finns inte i databasen" -#: netsync.cc:1821 +#: netsync.cc:1826 #, c-format msgid "Mismatched epoch on branch %s. Server has '%s', client has '%s'." msgstr "" "I grenen %s har servern epok '%s' medan klienten har '%s'; dessa stämmer " "inte överens." -#: netsync.cc:1842 +#: netsync.cc:1847 #, c-format msgid "hash check failed for public key '%s' (%s); wanted '%s' got '%s'" msgstr "" "kontrollsummering misslyckades för den publika nyckeln '%s' (%s); ville ha '%" "s' men fick '%s'" -#: netsync.cc:1859 +#: netsync.cc:1864 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "kontrollsummering misslyckades för revisionscertet '%s'" -#: netsync.cc:1934 +#: netsync.cc:1939 #, c-format msgid "Received warning from usher: %s" msgstr "Fick varning från usher: %s" -#: netsync.cc:2021 netsync.cc:2052 +#: netsync.cc:2026 netsync.cc:2057 msgid "source and sink" msgstr "källa och mottagare" -#: netsync.cc:2022 netsync.cc:2053 +#: netsync.cc:2027 netsync.cc:2058 msgid "source" msgstr "källa" -#: netsync.cc:2022 netsync.cc:2053 +#: netsync.cc:2027 netsync.cc:2058 msgid "sink" msgstr "mottagare" -#: netsync.cc:2207 +#: netsync.cc:2212 #, c-format msgid "input buffer for peer %s is overfull after netcmd dispatch\n" msgstr "indatabuffert för %s är överfull\n" -#: netsync.cc:2219 netsync.cc:2276 +#: netsync.cc:2224 netsync.cc:2281 #, c-format msgid "protocol error while processing peer %s: '%s'\n" msgstr "protokollfel vid behandling av %s: '%s'\n" -#: netsync.cc:2225 +#: netsync.cc:2230 #, c-format msgid "error: %s\n" msgstr "fel: %s\n" -#: netsync.cc:2255 +#: netsync.cc:2260 #, c-format msgid "connecting to %s\n" msgstr "ansluter till %s\n" -#: netsync.cc:2291 +#: netsync.cc:2296 #, c-format msgid "timed out waiting for I/O with peer %s, disconnecting\n" msgstr "att vänta på I/O från %s tog för lång tid, kopplar ifrån\n" -#: netsync.cc:2306 +#: netsync.cc:2311 #, c-format msgid "got OOB data from peer %s, disconnecting\n" msgstr "fick OOB-data från %s, kopplar ifrån\n" -#: netsync.cc:2321 +#: netsync.cc:2326 #, c-format msgid "processing failure while talking to peer %s, disconnecting\n" msgstr "tar hand om misslyckande i samtal med %s, kopplar ifrån\n" -#: netsync.cc:2338 +#: netsync.cc:2343 #, c-format msgid "successful exchange with %s\n" msgstr "lyckat utbyte med %s\n" -#: netsync.cc:2344 +#: netsync.cc:2349 #, c-format msgid "peer %s disconnected after we informed them of error\n" msgstr "%s kopplade ifrån efter att vi informerade den om ett fel\n" -#: netsync.cc:2349 +#: netsync.cc:2354 #, c-format msgid "I/O failure while talking to peer %s, disconnecting\n" msgstr "I/O-fel i samtal med %s, kopplar ifrån\n" -#: netsync.cc:2378 +#: netsync.cc:2383 #, c-format msgid "protocol error while processing peer %s: '%s', marking as bad\n" msgstr "protokollfel i samtal med %s: '%s', markerar det som felaktigt\n" -#: netsync.cc:2410 +#: netsync.cc:2415 #, c-format msgid "accepted new client connection from %s : %s\n" msgstr "tar emot ny klientanslutning från %s: %s\n" -#: netsync.cc:2444 +#: netsync.cc:2449 #, c-format msgid "protocol error while processing peer %s: '%s', disconnecting\n" msgstr "protokollfel i samtal med %s: '%s', kopplar ifrån\n" -#: netsync.cc:2455 +#: netsync.cc:2460 #, c-format msgid "peer %s read failed in working state (error)\n" msgstr "läsning från %s fallerade i tillståndet \"working\" (fel)\n" -#: netsync.cc:2460 +#: netsync.cc:2465 #, c-format msgid "" "peer %s read failed in shutdown state (possibly client misreported error)\n" @@ -2934,17 +2936,17 @@ "läsning från %s fallerade i tillståndet \"shutdown\" (klienten kan felaktigt " "ha rapporterat ett fel)\n" -#: netsync.cc:2466 +#: netsync.cc:2471 #, c-format msgid "peer %s read failed in confirmed state (success)\n" msgstr "läsning från %s fallerade i tillståndet \"confirmed\" (framgång)\n" -#: netsync.cc:2487 +#: netsync.cc:2492 #, c-format msgid "peer %s write failed in working state (error)\n" msgstr "skrivning till %s fallerade i tillståndet \"working\" (fel)\n" -#: netsync.cc:2492 +#: netsync.cc:2497 #, c-format msgid "" "peer %s write failed in shutdown state (possibly client misreported error)\n" @@ -2952,57 +2954,57 @@ "skrivning till %s fallerade i tillståndet \"shutdown\" (klienten kan " "felaktigt ha rapporterat ett fel)\n" -#: netsync.cc:2498 +#: netsync.cc:2503 #, c-format msgid "peer %s write failed in confirmed state (success)\n" msgstr "skrivning till %s fallerade i tillståndet \"confirmed\" (framgång)\n" -#: netsync.cc:2525 +#: netsync.cc:2530 #, c-format msgid "peer %s processing finished, disconnecting\n" msgstr "behandling av %s slutförd, kopplar ifrån\n" -#: netsync.cc:2547 +#: netsync.cc:2552 #, c-format msgid "fd %d (peer %s) has been idle too long, disconnecting\n" msgstr "fd %d (%s) har varit inaktiv för länge, kopplar ifrån\n" -#: netsync.cc:2615 +#: netsync.cc:2620 #, c-format msgid "beginning service on %s : %s\n" msgstr "startar tjänst på %s : %s\n" -#: netsync.cc:2616 +#: netsync.cc:2621 msgid "" msgstr "" -#: netsync.cc:2630 +#: netsync.cc:2635 #, c-format msgid "session limit %d reached, some connections will be refused\n" msgstr "" "gränsen för antalet sessioner, %d, är nådd, en del uppkopplingar kommer att " "nekas\n" -#: netsync.cc:2685 +#: netsync.cc:2690 #, c-format msgid "got OOB from peer %s, disconnecting\n" msgstr "fick OOB-data från %s, kopplar ifrån\n" -#: netsync.cc:2754 +#: netsync.cc:2759 #, c-format msgid "finding items to synchronize:\n" msgstr "letar efter saker att synkronisera:\n" -#: netsync.cc:2762 +#: netsync.cc:2767 msgid "certificates" msgstr "certifikat" -#: netsync.cc:2871 +#: netsync.cc:2876 #, c-format msgid "Cannot find key '%s'" msgstr "Kan inte hitta nyckeln '%s'" -#: netsync.cc:2911 +#: netsync.cc:2916 #, c-format msgid "" "include branch pattern contains a quote character:\n" @@ -3011,7 +3013,7 @@ "grenmönstret givet med --include innehåller ett citattecken:\n" "%s\n" -#: netsync.cc:2917 +#: netsync.cc:2922 #, c-format msgid "" "exclude branch pattern contains a quote character:\n" @@ -3020,7 +3022,7 @@ "grenmönstret givet med --exclude innehåller ett citattecken:\n" "%s\n" -#: netsync.cc:2940 netsync.cc:2944 +#: netsync.cc:2945 netsync.cc:2949 #, c-format msgid "network error: %s" msgstr "nätverksfel: %s" @@ -3186,23 +3188,29 @@ #: revision.cc:1264 #, c-format msgid "" -"unknown attribute %s on path %s\n" -"please contact %s so we can work out the right way to migrate this" +"unknown attribute '%s' on path '%s'\n" +"please contact %s so we can work out the right way to migrate this\n" +"(if you just want it to go away, see the switch --drop-attr, but\n" +"seriously, if you'd like to keep it, we're happy to figure out how)" msgstr "" -"okänt attribut %s på sökvägen %s\n" -"var god kontakta %s så vi kan komma fram till ett bra sätt att migrera detta" +"sökvägen '%2$s' har ett okänt attribut '%1$s'\n" +"var god ta kontakt med '%3$s' så att ni kan komma överens om det rätta\n" +"sättet att migrera (om du bara vill att det här felet försvinner kan\n" +"du prova --drop-attr, men allvarligt talat, om du vill behålla det här\n" +"attributet hjälper vi gärna till att klura ut ett bra sätt att hantera\n" +"det på)" -#: revision.cc:1373 +#: revision.cc:1375 #, c-format msgid "converting existing revision graph to new roster-style revisions\n" msgstr "konverterar existerande revisionsgraf till nya revisioner i liststil\n" -#: revision.cc:1427 +#: revision.cc:1429 #, c-format msgid "rebuilding revision graph from manifest certs\n" msgstr "bygger om revisionsgrafen från manifestcert\n" -#: revision.cc:1530 +#: revision.cc:1532 #, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" @@ -3581,6 +3589,14 @@ msgid "updating %s to %s" msgstr "uppdaterar %s till %s" +#~ msgid "" +#~ "unknown attribute %s on path %s\n" +#~ "please contact %s so we can work out the right way to migrate this" +#~ msgstr "" +#~ "okänt attribut %s på sökvägen %s\n" +#~ "var god kontakta %s så vi kan komma fram till ett bra sätt att migrera " +#~ "detta" + #~ msgid "OLDID NEWID" #~ msgstr "GAMMALT-ID NYTT-ID"