# # # patch "ChangeLog" # from [607c6e8dd260134205beb413cedb27057913f303] # to [8625cc1978b0c07052772462b2311c520aeec071] # # patch "po/sv.po" # from [3f0baaee81beda2682e00164264788777c0f9c16] # to [c75855d2b3c8c51963c8f330e85ca68e8ddfd8d4] # ============================================================ --- ChangeLog 607c6e8dd260134205beb413cedb27057913f303 +++ ChangeLog 8625cc1978b0c07052772462b2311c520aeec071 @@ -1,3 +1,7 @@ +2006-04-29 Richard Levitte + + * po/sv.po: Updated a fuzzy. + 2006-04-28 Alex Queiroz * po/pt_BR.po: Translated more strings. ============================================================ --- po/sv.po 3f0baaee81beda2682e00164264788777c0f9c16 +++ po/sv.po c75855d2b3c8c51963c8f330e85ca68e8ddfd8d4 @@ -145,8 +145,8 @@ msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-04-23 21:30+0200\n" -"PO-Revision-Date: 2006-04-23 21:31+0200\n" +"POT-Creation-Date: 2006-04-29 09:09+0200\n" +"PO-Revision-Date: 2006-04-29 09:10+0200\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -169,47 +169,42 @@ msgid "monotone bookkeeping directory '%s' already exists in '%s'\n" msgstr "det finns redan en administrativ katalog (%s) i '%s'\n" -#: app_state.cc:174 app_state.cc:189 +#: app_state.cc:215 #, c-format -msgid "unknown path '%s'\n" -msgstr "okänd sökväg '%s'\n" - -#: app_state.cc:350 -#, c-format msgid "search root '%s' does not exist" msgstr "angiven sökrot '%s' finns inte" -#: app_state.cc:351 +#: app_state.cc:216 #, c-format msgid "search root '%s' is not a directory\n" msgstr "sökroten '%s' är inte en katalog\n" -#: app_state.cc:386 +#: app_state.cc:251 #, c-format msgid "failed to parse date string '%s': %s" msgstr "kunde inte tyda datumangivelsen '%s': %s" -#: app_state.cc:400 +#: app_state.cc:265 #, c-format msgid "negative depth not allowed\n" msgstr "negativt djup är inte tillåtet\n" -#: app_state.cc:408 +#: app_state.cc:273 #, c-format msgid "illegal argument to --last: cannot be zero or negative\n" msgstr "felaktigt argument till --last: får ej vara noll eller negativt\n" -#: app_state.cc:416 +#: app_state.cc:281 #, c-format msgid "illegal argument to --next: cannot be zero or negative\n" msgstr "felaktigt argument till --next: får ej vara noll eller negativt\n" -#: app_state.cc:552 +#: app_state.cc:417 #, c-format msgid "Failed to read options file %s" msgstr "Misslyckades med att läsa filen %s" -#: app_state.cc:569 +#: app_state.cc:434 #, c-format msgid "Failed to write options file %s" msgstr "Misslyckades med att skriva filen %s" @@ -284,216 +279,355 @@ "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:164 -#, c-format -msgid "command '%s' has multiple ambiguous expansions:\n" -msgstr "kommandot '%s' har mer än en betydelse:\n" +#: cmd_automate.cc:7 +msgid "automation" +msgstr "automatisering" -#: commands.cc:207 -msgid "commands:" -msgstr "kommandon:" +#: cmd_automate.cc:8 +msgid "" +"interface_version\n" +"heads [BRANCH]\n" +"ancestors REV1 [REV2 [REV3 [...]]]\n" +"attributes [FILE]\n" +"parents REV\n" +"descendents REV1 [REV2 [REV3 [...]]]\n" +"children REV\n" +"graph\n" +"erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n" +"toposort [REV1 [REV2 [REV3 [...]]]]\n" +"ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n" +"leaves\n" +"inventory\n" +"stdio\n" +"certs REV\n" +"select SELECTOR\n" +"get_file FILEID\n" +"get_manifest_of [REVID]\n" +"get_revision [REVID]\n" +"packet_for_rdata REVID\n" +"packets_for_certs REVID\n" +"packet_for_fdata FILEID\n" +"packet_for_fdelta OLD_FILE NEW_FILE\n" +"keys\n" +msgstr "" +"interface_version\n" +"heads [GREN]\n" +"ancestors REV1 [REV2 [REV3 [...]]]\n" +"attributes [FIL]\n" +"parents REV\n" +"descendents REV1 [REV2 [REV3 [...]]]\n" +"children REV\n" +"graph\n" +"erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n" +"toposort [REV1 [REV2 [REV3 [...]]]]\n" +"ancestry_difference NY_REV [GAMMAL_REV1 [GAMMAL_REV2 [...]]]\n" +"leaves\n" +"inventory\n" +"stdio\n" +"certs REV\n" +"select VÄLJARE\n" +"get_file FILID\n" +"get_manifest_of [REVID]\n" +"get_revision [REVID]\n" +"packet_for_rdata REVID\n" +"packets_for_certs REVID\n" +"packet_for_fdata FILID\n" +"packet_for_fdelta GAMMAL_FIL NY_FIL\n" +"keys\n" -#: commands.cc:264 +#: cmd_automate.cc:32 +msgid "automation interface" +msgstr "automatiseringsgränssnitt" + +#: cmd_db.cc:22 cmd_diff_log.cc:356 cmd_diff_log.cc:383 cmd_diff_log.cc:385 +#: cmd_files.cc:83 cmd_files.cc:140 cmd_merging.cc:105 cmd_ws_commit.cc:409 +#: commands.cc:355 #, c-format -msgid "unknown command '%s'\n" -msgstr "okänt kommando '%s'\n" +msgid "no such revision '%s'" +msgstr "det finns ingen revision med identiteten '%s'" -#: commands.cc:326 +#: cmd_db.cc:28 #, c-format -msgid "pid file '%s' already exists" -msgstr "pid-filen '%s' finns redan" +msgid "revision %s already has children. We cannot kill it." +msgstr "revisionen %s har barn. Vi kan inte ta bort den." -#: commands.cc:328 +#: cmd_db.cc:33 +msgid "database" +msgstr "databas" + +#: cmd_db.cc:34 +msgid "" +"init\n" +"info\n" +"version\n" +"dump\n" +"load\n" +"migrate\n" +"execute\n" +"kill_rev_locally ID\n" +"kill_branch_certs_locally BRANCH\n" +"kill_tag_locally TAG\n" +"check\n" +"changesetify\n" +"rosterify\n" +"set_epoch BRANCH EPOCH\n" +msgstr "" +"init\n" +"info\n" +"version\n" +"dump\n" +"load\n" +"migrate\n" +"execute\n" +"kill_rev_locally ID\n" +"kill_branch_certs_locally GREN\n" +"kill_tag_locally TAGG\n" +"check\n" +"changesetify\n" +"rosterify\n" +"set_epoch GREN EPOK\n" + +#: cmd_db.cc:48 +msgid "manipulate database state" +msgstr "gör ändringar direkt i databasen" + +#: cmd_db.cc:95 #, c-format -msgid "failed to create pid file '%s'" -msgstr "Misslyckades med att skapa pid-filen %s" +msgid "The epoch must be %s characters" +msgstr "Epoken måste innehålla %s tecken" -#: commands.cc:351 commands.cc:1360 commands.cc:1431 commands.cc:1878 -#: commands.cc:2718 commands.cc:3375 commands.cc:3610 commands.cc:3649 -#: commands.cc:4014 +#: cmd_db.cc:105 cmd_db.cc:121 +msgid "vars" +msgstr "variabler" + +#: cmd_db.cc:105 +msgid "DOMAIN NAME VALUE" +msgstr "DOMÄN NAMN VÄRDE" + +#: cmd_db.cc:106 +msgid "set the database variable NAME to VALUE, in domain DOMAIN" +msgstr "sätt databasvariabeln NAMN till VÄRDE i domänen DOMÄN" + +#: cmd_db.cc:121 +msgid "DOMAIN NAME" +msgstr "DOMÄN NAMN" + +#: cmd_db.cc:122 +msgid "remove the database variable NAME in domain DOMAIN" +msgstr "ta bort databasvariabeln NAMN från domänen DOMÄN" + +#: cmd_db.cc:133 +#, c-format +msgid "no var with name %s in domain %s" +msgstr "det finns inga variabler med namnet %s i domänen %s" + +#: cmd_db.cc:137 cmd_diff_log.cc:304 cmd_diff_log.cc:502 cmd_files.cc:61 +#: cmd_files.cc:122 cmd_list.cc:429 cmd_merging.cc:532 cmd_ws_commit.cc:291 +#: commands.cc:227 msgid "informative" msgstr "informativ" -#: commands.cc:351 -msgid "command [ARGS...]" -msgstr "kommandon [ARGUMENT...]" +#: cmd_db.cc:137 +msgid "(revision|file|key) PARTIAL-ID" +msgstr "(revision|file|key) PARTIAL-ID" -#: commands.cc:351 -msgid "display command help" -msgstr "skriv ut hjälptext" +#: cmd_db.cc:138 +msgid "complete partial id" +msgstr "utöka den partiella identiteten" -#: commands.cc:430 +#: cmd_db.cc:147 +#, c-format +msgid "non-hex digits in partial id" +msgstr "något tecken i den partiella identiteten är inte hexadecimalt" + +#: cmd_diff_log.cc:304 cmd_ws_commit.cc:36 cmd_ws_commit.cc:198 +#: cmd_ws_commit.cc:224 cmd_ws_commit.cc:291 cmd_ws_commit.cc:572 +msgid "[PATH]..." +msgstr "[SÖKVÄG]..." + +#: cmd_diff_log.cc:305 msgid "" -"Enter a description of this change.\n" -"Lines beginning with `MTN:' are removed automatically.\n" +"show current diffs on stdout.\n" +"If one revision is given, the diff between the workspace and\n" +"that revision is shown. If two revisions are given, the diff between\n" +"them is given. If no format is specified, unified is used by default." msgstr "" -"Mata in en beskrivning av denna ändring.\n" -"Rader som börjar med 'MTN:' kommer att tas bort automatiskt.\n" +"skriv ut skillnader till stdout.\n" +"Om en revision anges visas skillnaden mellan arbetskopian och den\n" +"revisionen. Om två revisioner anges visas skillnaden mellan dem. Om\n" +"inget format anges används unified." -#: commands.cc:437 +#: cmd_diff_log.cc:320 #, c-format -msgid "edit of log message failed" -msgstr "redigering av loggmeddelandet misslyckades" +msgid "" +"--diff-args requires --external\n" +"try adding --external or removing --diff-args?" +msgstr "" +"--diff-args kräver att även --external anges\n" +"lägg till --external eller ta bort --diff-args?" -#: commands.cc:446 -msgid "note: " -msgstr "obs: " +#: cmd_diff_log.cc:439 +msgid "no changes" +msgstr "inga ändringar" -#: commands.cc:447 -#, c-format +#: cmd_diff_log.cc:502 +msgid "[FILE] ..." +msgstr "[FIL] ..." + +#: cmd_diff_log.cc:503 msgid "" -"branch '%s' has multiple heads\n" -"perhaps consider '%s merge'" +"print history in reverse order (filtering by 'FILE'). If one or more\n" +"revisions are given, use them as a starting point." msgstr "" -"grenen '%s' har mer än ett löv\n" -"du kanske borde överväga '%s merge'" +"skriv ut historiken i omvänd ordning för angivna filer eller för hela\n" +"arbetskatalogen om inga filer angivits. Om en eller flera revisioner\n" +"har angivits används de som utgångspunkter." -#: commands.cc:508 commands.cc:784 commands.cc:1449 commands.cc:1533 -#: commands.cc:2770 commands.cc:2799 commands.cc:2802 commands.cc:2940 -#: commands.cc:3632 +#: cmd_diff_log.cc:563 #, c-format -msgid "no such revision '%s'" -msgstr "det finns ingen revision med identiteten '%s'" +msgid "only one of --last/--next allowed" +msgstr "enbart en av --last eller --next tillåten" -#: commands.cc:515 -#, c-format -msgid "expanding selection '%s'\n" -msgstr "expanderar valet '%s'\n" +#: cmd_files.cc:15 cmd_files.cc:28 cmd_files.cc:99 cmd_merging.cc:589 +#: cmd_othervcs.cc:5 +msgid "debug" +msgstr "felsökning" -#: commands.cc:523 -#, c-format -msgid "no match for selection '%s'" -msgstr "det finns inget som matchar '%s'" +#: cmd_files.cc:15 +msgid "load file contents into db" +msgstr "ladda in filinnehållet i databasen" -#: commands.cc:529 -#, c-format -msgid "expanded to '%s'\n" -msgstr "expanderar till '%s'\n" +#: cmd_files.cc:28 +msgid " " +msgstr " " -#: commands.cc:546 -#, c-format -msgid "selection '%s' has multiple ambiguous expansions: \n" -msgstr "valet '%s' har mer än en möjlig betydelse: \n" +#: cmd_files.cc:29 +msgid "merge 3 files and output result" +msgstr "slå ihop 3 filer och skriv ut resultatet" -#: commands.cc:564 +#: cmd_files.cc:39 #, c-format -msgid "non-hex digits in id" -msgstr "något tecken i identiteten är inte hexadecimalt" +msgid "ancestor file id does not exist" +msgstr "förälderns filidentitet finns inte" -#: commands.cc:573 +#: cmd_files.cc:42 #, c-format -msgid "partial id '%s' does not have an expansion" -msgstr "den partiella identiteten '%s' matchar inte befintliga identiteter" +msgid "left file id does not exist" +msgstr "vänster fils identitet finns inte" -#: commands.cc:576 +#: cmd_files.cc:45 #, c-format -msgid "partial id '%s' has multiple ambiguous expansions:\n" -msgstr "den partiella identiteten '%s' har mer än en uttydning:\n" +msgid "right file id does not exist" +msgstr "höger fils identitet finns inte" -#: commands.cc:583 +#: cmd_files.cc:56 #, c-format -msgid "expanded partial id '%s' to '%s'\n" -msgstr "expanderade partiell identitet '%s' till '%s'\n" +msgid "merge failed" +msgstr "ihopslagningen misslyckades" -#: commands.cc:610 netsync.cc:1749 +#: cmd_files.cc:61 +msgid "PATH" +msgstr "SÖKVÄG" + +#: cmd_files.cc:62 +msgid "print annotated copy of the file from REVISION" +msgstr "skriv ut filen ur REVISION med extra detaljer" + +#: cmd_files.cc:82 #, c-format -msgid "no public key '%s' found in database" -msgstr "den publika nyckeln '%s' finns inte i databasen" +msgid "no revision for file '%s' in database" +msgstr "filen '%s' har ingen revision i databasen" -#: commands.cc:620 +#: cmd_files.cc:92 cmd_files.cc:152 cmd_files.cc:154 #, c-format -msgid "" -"Key : %s\n" -"Sig : %s\n" -"Name : %s\n" -"Value : %s\n" -msgstr "" -"Nyckel : %s\n" -"Signatur : %s\n" -"Namn : %s\n" -"Värde : %s\n" +msgid "no file '%s' found in revision '%s'\n" +msgstr "filen '%s' finns inte i revisionen '%s'\n" -#: commands.cc:654 -msgid "ok" -msgstr "ok" +#: cmd_files.cc:99 +msgid "[PATH]" +msgstr "[SÖKVÄG]" -#: commands.cc:657 -msgid "bad" -msgstr "felaktig" +#: cmd_files.cc:100 +msgid "calculate identity of PATH or stdin" +msgstr "räkna ut identiteten för SÖKVÄG eller stdin" -#: commands.cc:660 -msgid "unknown" -msgstr "okänd" +#: cmd_files.cc:123 +msgid "FILENAME" +msgstr "FILNAMN" -#: commands.cc:747 +#: cmd_files.cc:124 +msgid "write file from database to stdout" +msgstr "skriv ut angiven fil från databasen" + +#: cmd.hh:80 #, c-format -msgid "(*) - only in %s/" -msgstr "(*) - enbart i %s/" +msgid "non-hex digits in id" +msgstr "något tecken i identiteten är inte hexadecimalt" -#: commands.cc:770 +#: cmd.hh:89 #, c-format -msgid "no keys found\n" -msgstr "hittade inga nycklar\n" +msgid "partial id '%s' does not have an expansion" +msgstr "den partiella identiteten '%s' matchar inte befintliga identiteter" -#: commands.cc:772 +#: cmd.hh:92 #, c-format -msgid "no keys found matching '%s'\n" -msgstr "hittade inga nycklar som matchar '%s'\n" +msgid "partial id '%s' has multiple ambiguous expansions:\n" +msgstr "den partiella identiteten '%s' har mer än en uttydning:\n" -#: commands.cc:790 +#: cmd.hh:99 #, c-format -msgid "revision %s already has children. We cannot kill it." -msgstr "revisionen %s har barn. Vi kan inte ta bort den." +msgid "expanded partial id '%s' to '%s'\n" +msgstr "expanderade partiell identitet '%s' till '%s'\n" -#: commands.cc:930 commands.cc:954 commands.cc:991 commands.cc:1012 -#: commands.cc:1048 +#: cmd_key_cert.cc:14 cmd_key_cert.cc:38 cmd_key_cert.cc:75 cmd_key_cert.cc:96 +#: cmd_key_cert.cc:132 msgid "key and cert" msgstr "nyckel och cert" -#: commands.cc:930 commands.cc:954 commands.cc:991 +#: cmd_key_cert.cc:14 cmd_key_cert.cc:38 cmd_key_cert.cc:75 msgid "KEYID" msgstr "NYCKELID" -#: commands.cc:930 +#: cmd_key_cert.cc:14 msgid "generate an RSA key-pair" msgstr "skapa ett RSA-nyckelpar" -#: commands.cc:945 +#: cmd_key_cert.cc:29 #, c-format msgid "key '%s' already exists" msgstr "nyckeln '%s' finns redan" -#: commands.cc:948 +#: cmd_key_cert.cc:32 #, c-format msgid "generating key-pair '%s'" msgstr "skapar nyckelparet '%s'" -#: commands.cc:950 +#: cmd_key_cert.cc:34 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "lagrar nyckelparet '%s' i %s/" -#: commands.cc:954 +#: cmd_key_cert.cc:38 msgid "drop a public and private key" msgstr "släng publik och privat nyckel" -#: commands.cc:968 +#: cmd_key_cert.cc:52 #, c-format msgid "dropping public key '%s' from database\n" msgstr "tar bort den publika nyckeln '%s' ur databasen\n" -#: commands.cc:978 +#: cmd_key_cert.cc:62 #, c-format msgid "dropping key pair '%s' from keystore\n" msgstr "tar bort nyckelparet '%s' från nyckellagret\n" -#: commands.cc:985 +#: cmd_key_cert.cc:69 #, 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:987 +#: cmd_key_cert.cc:71 #, c-format msgid "" "public or private key '%s' does not exist in keystore, and no database was " @@ -502,33 +636,33 @@ "den publika eller privata nyckeln '%s' finns inte i nyckellager och ingen " "databas angavs" -#: commands.cc:992 +#: cmd_key_cert.cc:76 msgid "change passphrase of a private RSA key" msgstr "ändra lösen till en privat RSA-nyckel" -#: commands.cc:1002 +#: cmd_key_cert.cc:86 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "nyckeln '%s' finns inte i nyckellagret" -#: commands.cc:1009 +#: cmd_key_cert.cc:93 #, c-format msgid "passphrase changed\n" msgstr "lösen ändrat\n" -#: commands.cc:1012 +#: cmd_key_cert.cc:96 msgid "REVISION CERTNAME [CERTVAL]" msgstr "REVISION CERTNAMN [CERTVÄRDE]" -#: commands.cc:1013 +#: cmd_key_cert.cc:97 msgid "create a cert for a revision" msgstr "skapa ett cert för en revision" -#: commands.cc:1048 +#: cmd_key_cert.cc:132 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "REVISION NAMN VÄRDE SIGNERARE1 [SIGNERARE2 [...]]" -#: commands.cc:1049 +#: cmd_key_cert.cc:133 msgid "" "test whether a hypothetical cert would be trusted\n" "by current settings" @@ -536,7 +670,7 @@ "kontrollera ifall ett hypotetiskt cert skulle vara pålitligt\n" "enligt nuvarande inställningar" -#: commands.cc:1082 +#: cmd_key_cert.cc:166 #, c-format msgid "" "if a cert on: %s\n" @@ -551,281 +685,117 @@ "signerades av: %s\n" "skulle det vara: %s\n" -#: commands.cc:1091 +#: cmd_key_cert.cc:175 msgid "trusted" msgstr "pålitligt" -#: commands.cc:1091 +#: cmd_key_cert.cc:175 msgid "UNtrusted" msgstr "Opålitligt" -#: commands.cc:1094 commands.cc:1107 commands.cc:1120 commands.cc:1137 -#: commands.cc:1188 +#: cmd_key_cert.cc:178 cmd_key_cert.cc:191 cmd_key_cert.cc:204 +#: cmd_key_cert.cc:220 cmd_ws_commit.cc:147 msgid "review" msgstr "granskning" -#: commands.cc:1094 +#: cmd_key_cert.cc:178 msgid "REVISION TAGNAME" msgstr "REVISION TAGNAMN" -#: commands.cc:1095 +#: cmd_key_cert.cc:179 msgid "put a symbolic tag cert on a revision" msgstr "sätt ett symboliskt tagg-cert på en revision" -#: commands.cc:1107 +#: cmd_key_cert.cc:191 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: commands.cc:1108 +#: cmd_key_cert.cc:192 msgid "note the results of running a test on a revision" msgstr "notera ett testresultat för en revision" -#: commands.cc:1120 commands.cc:1137 +#: cmd_key_cert.cc:204 cmd_ws_commit.cc:147 msgid "REVISION" msgstr "REVISION" -#: commands.cc:1121 +#: cmd_key_cert.cc:205 msgid "approve of a particular revision" msgstr "godkänn en specifik revision" -#: commands.cc:1132 +#: cmd_key_cert.cc:216 #, c-format msgid "need --branch argument for approval" msgstr "för godkännande behöver en gren anges med --branch" -#: commands.cc:1138 -msgid "disapprove of a particular revision" -msgstr "underkänn en specifik revision" - -#: commands.cc:1151 -#, 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:1155 -#, c-format -msgid "need --branch argument for disapproval" -msgstr "för underkännande behöver en gren anges med --branch" - -#: commands.cc:1188 +#: cmd_key_cert.cc:220 msgid "REVISION [COMMENT]" msgstr "REVISION [KOMMENTAR]" -#: commands.cc:1189 +#: cmd_key_cert.cc:221 msgid "comment on a particular revision" msgstr "kommentera en specifik revision" -#: commands.cc:1199 +#: cmd_key_cert.cc:231 #, c-format msgid "edit comment failed" msgstr "misslyckades med att redigera kommentaren" -#: commands.cc:1202 +#: cmd_key_cert.cc:234 #, c-format msgid "empty comment" msgstr "tom kommentar" -#: commands.cc:1215 commands.cc:1244 commands.cc:1269 commands.cc:1294 -#: commands.cc:2226 commands.cc:2345 commands.cc:2874 commands.cc:3423 -msgid "workspace" -msgstr "arbetskopia" - -#: commands.cc:1215 commands.cc:1244 commands.cc:1360 commands.cc:2345 -#: commands.cc:2718 commands.cc:3423 -msgid "[PATH]..." -msgstr "[SÖKVÄG]..." - -#: commands.cc:1216 -msgid "add files to workspace" -msgstr "lägg till filer i arbetskopian" - -#: commands.cc:1245 -msgid "drop files from workspace" -msgstr "överge filer i arbetskopian" - -#: commands.cc:1270 -msgid "" -"SRC DEST\n" -"SRC1 [SRC2 [...]] DEST_DIR" -msgstr "" -"KÄLLA MÅL\n" -"KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG" - -#: commands.cc:1272 -msgid "rename entries in the workspace" -msgstr "byt namn på filer i arbetskopian" - -#: commands.cc:1294 -msgid "NEW_ROOT PUT_OLD" -msgstr "NY_ROT PLACERA_GAMLA" - -#: commands.cc:1295 -msgid "" -"rename the root directory\n" -"after this command, the directory that currently has the name NEW_ROOT\n" -"will be the root directory, and the directory that is currently the root\n" -"directory will have name PUT_OLD.\n" -"Using --execute is strongly recommended." -msgstr "" -"Flytta på rotkatalogen\n" -"när det här kommandot är klart har katalogen som just nu heter NY_ROT\n" -"blivit rotkatalogen, och den nuvarande rotkatalogen blivit katalogen\n" -"PLACERA_GAMLA.\n" -"Det rekommenderas varmt att använda --execute." - -#: commands.cc:1314 commands.cc:1327 commands.cc:1408 commands.cc:3530 -#: commands.cc:3995 -msgid "debug" -msgstr "felsökning" - -#: commands.cc:1314 -msgid "load file contents into db" -msgstr "ladda in filinnehållet i databasen" - -#: commands.cc:1327 -msgid " " -msgstr " " - -#: commands.cc:1328 -msgid "merge 3 files and output result" -msgstr "slå ihop 3 filer och skriv ut resultatet" - -#: commands.cc:1338 +#: cmd_list.cc:45 #, c-format -msgid "ancestor file id does not exist" -msgstr "förälderns filidentitet finns inte" +msgid "no public key '%s' found in database" +msgstr "den publika nyckeln '%s' finns inte i databasen" -#: commands.cc:1341 +#: cmd_list.cc:55 #, c-format -msgid "left file id does not exist" -msgstr "vänster fils identitet finns inte" - -#: commands.cc:1344 -#, c-format -msgid "right file id does not exist" -msgstr "höger fils identitet finns inte" - -#: commands.cc:1355 -#, c-format -msgid "merge failed" -msgstr "ihopslagningen misslyckades" - -#: commands.cc:1360 -msgid "show status of workspace" -msgstr "visa arbetskopians status" - -#: commands.cc:1408 -msgid "[PATH]" -msgstr "[SÖKVÄG]" - -#: commands.cc:1409 -msgid "calculate identity of PATH or stdin" -msgstr "räkna ut identiteten för SÖKVÄG eller stdin" - -#: commands.cc:1432 -msgid "FILENAME" -msgstr "FILNAMN" - -#: commands.cc:1433 -msgid "write file from database to stdout" -msgstr "skriv ut angiven fil från databasen" - -#: commands.cc:1461 commands.cc:1463 commands.cc:3641 -#, c-format -msgid "no file '%s' found in revision '%s'\n" -msgstr "filen '%s' finns inte i revisionen '%s'\n" - -#: commands.cc:1475 commands.cc:1604 commands.cc:3108 commands.cc:3161 -#: commands.cc:3172 commands.cc:3322 commands.cc:3330 commands.cc:3902 -msgid "tree" -msgstr "träd" - -#: commands.cc:1475 -msgid "[DIRECTORY]\n" -msgstr "[KATALOG]\n" - -#: commands.cc:1476 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" -"Otherwise, it will be the head of the branch (given or implicit).\n" -"If no directory is given, the branch name will be used as directory" +"Key : %s\n" +"Sig : %s\n" +"Name : %s\n" +"Value : %s\n" msgstr "" -"hämta en revision ur databasen till den angivna katalogen.\n" -"Om en revision anges kommer den att hämtas. Om ingen revision anges\n" -"kommer lövet i grenen (implicit eller angiven) att hämtas. Om\n" -"ingen katalog anges kommer grenens namn att användas som katalognamn." +"Nyckel : %s\n" +"Signatur : %s\n" +"Namn : %s\n" +"Värde : %s\n" -#: commands.cc:1495 commands.cc:1514 -#, 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" +#: cmd_list.cc:89 +msgid "ok" +msgstr "ok" -#: commands.cc:1508 -#, c-format -msgid "checkout directory '%s' already exists" -msgstr "arbetskatalogen '%s' finns redan" +#: cmd_list.cc:92 +msgid "bad" +msgstr "felaktig" -#: commands.cc:1517 -#, c-format -msgid "branch '%s' is empty" -msgstr "grenen '%s' är tom" +#: cmd_list.cc:95 +msgid "unknown" +msgstr "okänd" -#: commands.cc:1520 +#: cmd_list.cc:182 #, c-format -msgid "branch %s has multiple heads:" -msgstr "grenen %s har flera löv:" +msgid "(*) - only in %s/" +msgstr "(*) - enbart i %s/" -#: commands.cc:1523 +#: cmd_list.cc:205 #, c-format -msgid "choose one with '%s checkout -r'" -msgstr "välj en med '%s update -r'" +msgid "no keys found\n" +msgstr "hittade inga nycklar\n" -#: commands.cc:1524 +#: cmd_list.cc:207 #, c-format -msgid "branch %s has multiple heads" -msgstr "grenen %s har flera löv" +msgid "no keys found matching '%s'\n" +msgstr "hittade inga nycklar som matchar '%s'\n" -#: commands.cc:1551 +#: cmd_list.cc:251 #, 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:1585 -#, c-format -msgid "no file %s found in database for %s" -msgstr "det finns ingen fil %s för %s i databasen" - -#: commands.cc:1604 -msgid "show unmerged head revisions of branch" -msgstr "visa ej ihopslagna lövrevisioner i grenen" - -#: commands.cc:1612 commands.cc:3117 -#, c-format -msgid "please specify a branch, with --branch=BRANCH" -msgstr "var god ange en gren med --branch=GREN" - -#: commands.cc:1617 commands.cc:3121 commands.cc:3210 commands.cc:3213 -#, c-format -msgid "branch '%s' is empty\n" -msgstr "grenen '%s' är tom\n" - -#: commands.cc:1619 -#, c-format -msgid "branch '%s' is currently merged:\n" -msgstr "grenen '%s' har för tillfället ett löv:\n" - -#: commands.cc:1621 -#, 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:1668 -#, c-format msgid "no epoch for branch %s\n" msgstr "ingen epok i grenen %s\n" -#: commands.cc:1879 +#: cmd_list.cc:430 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -851,7 +821,7 @@ "missing\n" "changed" -#: commands.cc:1890 +#: cmd_list.cc:441 msgid "" "show database objects, or the current workspace manifest, or known,\n" "unknown, intentionally ignored, missing, or changed state files" @@ -859,311 +829,14 @@ "visa databasobjekten, arbetskopians manifest, okända filer, kända\n" "filer, medvetet ignorerade filer, saknade filer eller ändrade filer" -#: commands.cc:1928 commands.cc:1956 commands.cc:1974 -msgid "packet i/o" -msgstr "paket-I/O" +#: cmd_merging.cc:36 cmd_ws_commit.cc:36 cmd_ws_commit.cc:198 +#: cmd_ws_commit.cc:224 cmd_ws_commit.cc:249 cmd_ws_commit.cc:274 +#: cmd_ws_commit.cc:479 cmd_ws_commit.cc:572 +msgid "workspace" +msgstr "arbetskopia" -#: commands.cc:1928 commands.cc:1956 -msgid "ID" -msgstr "ID" - -#: commands.cc:1928 -msgid "write public key packet to stdout" -msgstr "skriv it datapaket för publik nyckel till stdout" - -#: commands.cc:1950 -#, c-format -msgid "public key '%s' does not exist" -msgstr "den publika nyckeln '%s' finns inte" - -#: commands.cc:1956 -msgid "write private key packet to stdout" -msgstr "skriv it datapaket för privat nyckel till stdout" - -#: commands.cc:1964 -#, 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:1975 -msgid "read packets from files or stdin" -msgstr "läs paket från filer eller stdin" - -#: commands.cc:1983 -#, c-format -msgid "no packets found on stdin" -msgstr "inga paket hittade i stdin" - -#: commands.cc:1994 -#, 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:1998 -#, 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:2027 -#, c-format -msgid "setting default server to %s\n" -msgstr "sätter standardserver till %s\n" - -#: commands.cc:2033 -#, c-format -msgid "no hostname given" -msgstr "inget värdnamn angivet" - -#: commands.cc:2035 -#, c-format -msgid "no server given and no default server set" -msgstr "ingen server angiven och ingen standardserver är satt" - -#: commands.cc:2046 commands.cc:2066 -#, c-format -msgid "no branch pattern given" -msgstr "inget grenmönster angivet" - -#: commands.cc:2054 -#, 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:2060 -#, 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:2068 -#, c-format -msgid "no branch pattern given and no default pattern set" -msgstr "inget grenmönster angivet och inget standardmönster satt" - -#: commands.cc:2084 commands.cc:2099 commands.cc:2113 commands.cc:2128 -msgid "network" -msgstr "nätverk" - -#: commands.cc:2084 commands.cc:2099 commands.cc:2113 -msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" -msgstr "[ADRESS[:PORTNUMMER] [MÖNSTER]]" - -#: commands.cc:2085 -msgid "push branches matching PATTERN to netsync server at ADDRESS" -msgstr "skicka grenar som matchar MÖNSTER till netsync-server på ADRESS" - -#: commands.cc:2100 -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:2107 -#, 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:2114 -msgid "sync branches matching PATTERN with netsync server at ADDRESS" -msgstr "synkronisera grenar som matchar MÖNSTER till netsync-server på ADRESS" - -#: commands.cc:2128 -msgid "PATTERN ..." -msgstr "MÖNSTER ..." - -#: commands.cc:2129 -msgid "serve the branches specified by PATTERNs to connecting clients" -msgstr "servera de grenar som matchar MÖNSTER till anslutande klienter" - -#: commands.cc:2142 -#, c-format +#: cmd_merging.cc:37 msgid "" -"need permission to store persistent passphrase (see hook persist_phrase_ok())" -msgstr "" -"behöver tillstånd att använda ett permanent lösenord (se lua-rutinen\n" -"persist_phrase_ok())" - -#: commands.cc:2154 -msgid "database" -msgstr "databas" - -#: commands.cc:2155 -msgid "" -"init\n" -"info\n" -"version\n" -"dump\n" -"load\n" -"migrate\n" -"execute\n" -"kill_rev_locally ID\n" -"kill_branch_certs_locally BRANCH\n" -"kill_tag_locally TAG\n" -"check\n" -"changesetify\n" -"rosterify\n" -"set_epoch BRANCH EPOCH\n" -msgstr "" -"init\n" -"info\n" -"version\n" -"dump\n" -"load\n" -"migrate\n" -"execute\n" -"kill_rev_locally ID\n" -"kill_branch_certs_locally GREN\n" -"kill_tag_locally TAGG\n" -"check\n" -"changesetify\n" -"rosterify\n" -"set_epoch GREN EPOK\n" - -#: commands.cc:2169 -msgid "manipulate database state" -msgstr "gör ändringar direkt i databasen" - -#: commands.cc:2216 -#, c-format -msgid "The epoch must be %s characters" -msgstr "Epoken måste innehålla %s tecken" - -#: commands.cc:2226 -msgid "" -"set PATH ATTR VALUE\n" -"get PATH [ATTR]\n" -"drop PATH [ATTR]" -msgstr "" -"set SÖKVÄG ATTR VÄRDE\n" -"get SÖKVÄG [ATTR]\n" -"drop SÖKVÄG [ATTR]" - -#: commands.cc:2227 -msgid "set, get or drop file attributes" -msgstr "sätt, hämta eller ta bort attribut" - -#: commands.cc:2244 -#, c-format -msgid "Unknown path '%s'" -msgstr "Okänd sökväg '%s'" - -#: commands.cc:2273 -#, c-format -msgid "Path '%s' does not have attribute '%s'\n" -msgstr "Sökvägen '%s' har inget attribut '%s'\n" - -#: commands.cc:2299 -#, c-format -msgid "No attributes for '%s'" -msgstr "Inga attribut till '%s'" - -#: commands.cc:2308 -#, c-format -msgid "No attribute '%s' on path '%s'" -msgstr "Inget attribut '%s' för sökvägen '%s'" - -#: commands.cc:2327 -#, c-format -msgid "--message and --message-file are mutually exclusive" -msgstr "--message och --message-file får inte anges samtidigt" - -#: commands.cc:2346 -msgid "commit workspace to database" -msgstr "arkivera arbetskopian i databasen" - -#: commands.cc:2365 -#, c-format -msgid "no changes to commit\n" -msgstr "inga ändringar att arkivera\n" - -#: commands.cc:2379 -#, c-format -msgid "beginning commit on branch '%s'\n" -msgstr "börjar arkivering av ändringar i grenen '%s'\n" - -#: commands.cc:2388 -#, c-format -msgid "" -"_MTN/log is non-empty and log message was specified on command line\n" -"perhaps move or delete _MTN/log,\n" -"or remove --message/--message-file from the command line?" -msgstr "" -"_MTN/log är inte tom och du angav ett loggmeddelande på kommandoraden\n" -"kanske ta bort eller flytta på _MTN/log\n" -"eller ta bort --message/--message-file från kommandoraden?" - -#: commands.cc:2400 -#, c-format -msgid "empty log message; commit canceled" -msgstr "tomt loggmeddelande; arkivering avbryts" - -#: commands.cc:2419 -#, c-format -msgid "log message rejected: %s\n" -msgstr "loggmeddelandet förkastas: %s\n" - -#: commands.cc:2427 -#, c-format -msgid "revision %s already in database\n" -msgstr "revisionen %s finns redan i databasen\n" - -#: commands.cc:2465 commands.cc:2492 -#, c-format -msgid "file '%s' modified during commit, aborting" -msgstr "filen '%s' ändrades under arkivering, avbryter" - -#: commands.cc:2475 -#, c-format -msgid "Your database is missing version %s of file '%s'" -msgstr "Din databas saknar version %s av filen '%s'" - -#: commands.cc:2518 -#, c-format -msgid "committed revision %s\n" -msgstr "arkiverade revisionen %s\n" - -#: commands.cc:2524 -#, c-format -msgid "" -"note: this revision creates divergence\n" -"note: you may (or may not) wish to run '%s merge'" -msgstr "" -"obs: den här revisionen skapade divergens\n" -"obs: du kan tänkas vilja (eller kanske inte) köra '%s merge'" - -#: commands.cc:2719 -msgid "" -"show current diffs on stdout.\n" -"If one revision is given, the diff between the workspace and\n" -"that revision is shown. If two revisions are given, the diff between\n" -"them is given. If no format is specified, unified is used by default." -msgstr "" -"skriv ut skillnader till stdout.\n" -"Om en revision anges visas skillnaden mellan arbetskopian och den\n" -"revisionen. Om två revisioner anges visas skillnaden mellan dem. Om\n" -"inget format anges används unified." - -#: commands.cc:2736 -#, c-format -msgid "" -"--diff-args requires --external\n" -"try adding --external or removing --diff-args?" -msgstr "" -"--diff-args kräver att även --external anges\n" -"lägg till --external eller ta bort --diff-args?" - -#: commands.cc:2780 -#, c-format -msgid "current revision has no ancestor" -msgstr "denna revision har ingen förälder" - -#: commands.cc:2843 -msgid "no changes" -msgstr "inga ändringar" - -#: commands.cc:2875 -msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" "different revision, preserving uncommitted changes as it does so.\n" @@ -1176,17 +849,17 @@ "Om en revision har angivits så uppdateras arbetskopian till den,\n" "i annat fall uppdateras den till lövet i grenen." -#: commands.cc:2914 +#: cmd_merging.cc:79 #, c-format msgid "this workspace is a new project; cannot update" msgstr "denna arbetskatalog är ett nytt projekt; kan inte uppdatera" -#: commands.cc:2918 +#: cmd_merging.cc:83 #, c-format msgid "updating along branch '%s'" msgstr "uppdaterar längs grenen '%s'" -#: commands.cc:2922 +#: cmd_merging.cc:87 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1197,32 +870,32 @@ "faktum är att den inte ens matchar nuvarande revision\n" "du kanske vill ange --revision=" -#: commands.cc:2927 +#: cmd_merging.cc:92 #, c-format msgid "multiple update candidates:" msgstr "mer än en uppdateringskandidat:" -#: commands.cc:2931 +#: cmd_merging.cc:96 #, c-format msgid "choose one with '%s update -r'" msgstr "välj en med '%s update -r'" -#: commands.cc:2932 +#: cmd_merging.cc:97 #, c-format msgid "multiple update candidates remain after selection" msgstr "mer än en kandidat är kvar efter urval" -#: commands.cc:2947 +#: cmd_merging.cc:112 #, c-format msgid "already up to date at %s\n" msgstr "redan uppdaterad till %s\n" -#: commands.cc:2955 +#: cmd_merging.cc:120 #, c-format msgid "selected update target %s\n" msgstr "valt uppdateringsmål är %s\n" -#: commands.cc:2985 +#: cmd_merging.cc:150 #, c-format msgid "" "revision %s is a member of multiple branches:\n" @@ -1235,7 +908,7 @@ "\n" "försök igen med en explicit --branch" -#: commands.cc:2991 +#: cmd_merging.cc:156 #, c-format msgid "" "revision %s is a member of\n" @@ -1244,7 +917,7 @@ "revisionen %s är med i grenen\n" "%s, uppdaterar arbetskopians grenangivelse" -#: commands.cc:2997 +#: cmd_merging.cc:162 #, c-format msgid "" "revision %s is a member of no branches,\n" @@ -1253,157 +926,290 @@ "revisionen %s är inte med i någon gren,\n" "använder grenen %s till arbetskopian" -#: commands.cc:3098 +#: cmd_merging.cc:263 #, c-format msgid "updated to base revision %s\n" msgstr "uppdaterad till revisionen %s\n" -#: commands.cc:3108 +#: cmd_merging.cc:273 cmd_merging.cc:326 cmd_merging.cc:337 cmd_merging.cc:487 +#: cmd_merging.cc:565 cmd_ws_commit.cc:351 cmd_ws_commit.cc:795 +#: cmd_ws_commit.cc:815 +msgid "tree" +msgstr "träd" + +#: cmd_merging.cc:273 msgid "merge unmerged heads of branch" msgstr "slå ihop ej ihopslagna löv i grenen" -#: commands.cc:3124 +#: cmd_merging.cc:282 cmd_merging.cc:573 #, c-format +msgid "please specify a branch, with --branch=BRANCH" +msgstr "var god ange en gren med --branch=GREN" + +#: cmd_merging.cc:286 cmd_merging.cc:375 cmd_merging.cc:378 cmd_merging.cc:578 +#, c-format +msgid "branch '%s' is empty\n" +msgstr "grenen '%s' är tom\n" + +#: cmd_merging.cc:289 +#, c-format msgid "branch '%s' is already merged\n" msgstr "löven i grenen '%s' är redan ihopslagna\n" -#: commands.cc:3132 +#: cmd_merging.cc:297 #, c-format msgid "starting with revision 1 / %d\n" msgstr "börjar med revision 1 av %d\n" -#: commands.cc:3136 +#: cmd_merging.cc:301 #, c-format msgid "merging with revision %d / %d\n" msgstr "slår ihop med revision %d av %d\n" -#: commands.cc:3137 commands.cc:3138 commands.cc:3220 commands.cc:3353 -#: commands.cc:3354 +#: cmd_merging.cc:302 cmd_merging.cc:303 cmd_merging.cc:385 cmd_merging.cc:510 +#: cmd_merging.cc:511 #, c-format msgid "[source] %s\n" msgstr "[källa] %s\n" -#: commands.cc:3155 commands.cc:3318 commands.cc:3372 +#: cmd_merging.cc:320 cmd_merging.cc:483 cmd_merging.cc:529 #, c-format msgid "[merged] %s\n" msgstr "[ihopslagen] %s\n" -#: commands.cc:3158 +#: cmd_merging.cc:323 #, c-format msgid "note: your workspaces have not been updated\n" msgstr "obs: dina arbetskopior har inte uppdaterats\n" -#: commands.cc:3161 +#: cmd_merging.cc:326 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "KÄLLGREN MÅLGREN" -#: commands.cc:3162 +#: cmd_merging.cc:327 msgid "merge from one branch to another asymmetrically" msgstr "slå ihop asymmetriskt från en gren till en annan" -#: commands.cc:3172 +#: cmd_merging.cc:337 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "KÄLLGREN MÅLGREN KATALOG" -#: commands.cc:3173 +#: cmd_merging.cc:338 msgid "merge one branch into a subdirectory in another branch" msgstr "slå ihop en gren till en underkatalog i en annan gren" -#: commands.cc:3211 commands.cc:3214 +#: cmd_merging.cc:376 cmd_merging.cc:379 #, c-format msgid "branch '%s' is not merged\n" msgstr "löven i grenen '%s' är inte ihopslagna\n" -#: commands.cc:3219 +#: cmd_merging.cc:384 #, c-format msgid "propagating %s -> %s\n" msgstr "propagerar %s -> %s\n" -#: commands.cc:3221 +#: cmd_merging.cc:386 #, c-format msgid "[target] %s\n" msgstr "[mål] %s\n" -#: commands.cc:3226 +#: cmd_merging.cc:391 #, 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:3228 +#: cmd_merging.cc:393 #, c-format msgid "no action taken\n" msgstr "inget utfördes\n" -#: commands.cc:3232 +#: cmd_merging.cc:397 #, 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:3268 +#: cmd_merging.cc:433 #, c-format msgid "Path %s not found in destination tree." msgstr "Sökvägen %s finns inte i målträdet." -#: commands.cc:3322 -msgid "refresh the inodeprint cache" -msgstr "uppdatera inodeprint-cachen" - -#: commands.cc:3331 +#: cmd_merging.cc:488 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VÄNSTERREVISION HÖGERREVISION MÅLGREN" -#: commands.cc:3332 +#: cmd_merging.cc:489 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:3346 +#: cmd_merging.cc:503 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s och %s är samma revision, avbryter" -#: commands.cc:3348 commands.cc:3350 +#: cmd_merging.cc:505 cmd_merging.cc:507 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s är redan förfader till %s" -#: commands.cc:3375 -msgid "(revision|file|key) PARTIAL-ID" -msgstr "(revision|file|key) PARTIAL-ID" +#: cmd_merging.cc:532 +msgid "REV REV" +msgstr "REV REV" -#: commands.cc:3376 -msgid "complete partial id" -msgstr "utöka den partiella identiteten" +#: cmd_merging.cc:532 +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:3385 +#: cmd_merging.cc:541 cmd_merging.cc:543 #, c-format -msgid "non-hex digits in partial id" -msgstr "något tecken i den partiella identiteten är inte hexadecimalt" +msgid "%s is an ancestor of %s; no merge is needed." +msgstr "%s är en förfader till %s; någon ihopslagning behövs inte." -#: commands.cc:3424 -msgid "revert file(s), dir(s) or entire workspace (\".\")" -msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")" +#: cmd_merging.cc:557 +#, c-format +msgid "There are %s node_name_conflicts." +msgstr "Det finns %s node_name-konflikter." -#: commands.cc:3501 +#: cmd_merging.cc:558 #, c-format -msgid "reverting %s" -msgstr "återställer %s" +msgid "There are %s file_content_conflicts." +msgstr "Det finns %s file_content-konflikter." -#: commands.cc:3505 +#: cmd_merging.cc:559 #, c-format -msgid "no file version %s found in database for %s" -msgstr "filversionen %s finns inte i databasen för %s" +msgid "There are %s node_attr_conflicts." +msgstr "Det finns %s node_attr-konflikter." -#: commands.cc:3518 +#: cmd_merging.cc:560 #, c-format -msgid "recreating %s/" -msgstr "återställer %s/" +msgid "There are %s orphaned_node_conflicts." +msgstr "Det finns %s orphaned_node-konflikter." -#: commands.cc:3530 +#: cmd_merging.cc:561 +#, c-format +msgid "There are %s rename_target_conflicts." +msgstr "Det finns %s rename_target-konflikter." + +#: cmd_merging.cc:562 +#, c-format +msgid "There are %s directory_loop_conflicts." +msgstr "Det finns %s directory_loop-konflikter." + +#: cmd_merging.cc:565 +msgid "show unmerged head revisions of branch" +msgstr "visa ej ihopslagna lövrevisioner i grenen" + +#: cmd_merging.cc:580 +#, c-format +msgid "branch '%s' is currently merged:\n" +msgstr "grenen '%s' har för tillfället ett löv:\n" + +#: cmd_merging.cc:582 +#, c-format +msgid "branch '%s' is currently unmerged:\n" +msgstr "grenen '%s' har för tillfället mer än ett löv:\n" + +#: cmd_merging.cc:589 +msgid "REVID" +msgstr "REVID" + +#: cmd_merging.cc:590 +msgid "dump the roster associated with the given REVID" +msgstr "skriv ut den lista som hör ihop med angivet REVID" + +#: cmd_netsync.cc:36 +#, c-format +msgid "setting default server to %s\n" +msgstr "sätter standardserver till %s\n" + +#: cmd_netsync.cc:42 +#, c-format +msgid "no hostname given" +msgstr "inget värdnamn angivet" + +#: cmd_netsync.cc:44 +#, c-format +msgid "no server given and no default server set" +msgstr "ingen server angiven och ingen standardserver är satt" + +#: cmd_netsync.cc:55 cmd_netsync.cc:75 +#, c-format +msgid "no branch pattern given" +msgstr "inget grenmönster angivet" + +#: cmd_netsync.cc:63 +#, 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" + +#: cmd_netsync.cc:69 +#, 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" + +#: cmd_netsync.cc:77 +#, c-format +msgid "no branch pattern given and no default pattern set" +msgstr "inget grenmönster angivet och inget standardmönster satt" + +#: cmd_netsync.cc:93 cmd_netsync.cc:108 cmd_netsync.cc:122 cmd_netsync.cc:169 +msgid "network" +msgstr "nätverk" + +#: cmd_netsync.cc:93 cmd_netsync.cc:108 cmd_netsync.cc:122 +msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" +msgstr "[ADRESS[:PORTNUMMER] [MÖNSTER]]" + +#: cmd_netsync.cc:94 +msgid "push branches matching PATTERN to netsync server at ADDRESS" +msgstr "skicka grenar som matchar MÖNSTER till netsync-server på ADRESS" + +#: cmd_netsync.cc:109 +msgid "pull branches matching PATTERN from netsync server at ADDRESS" +msgstr "hämta grenar som matchar MÖNSTER till netsync-server på ADRESS" + +#: cmd_netsync.cc:116 +#, 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" + +#: cmd_netsync.cc:123 +msgid "sync branches matching PATTERN with netsync server at ADDRESS" +msgstr "synkronisera grenar som matchar MÖNSTER till netsync-server på ADRESS" + +#: cmd_netsync.cc:145 +#, c-format +msgid "pid file '%s' already exists" +msgstr "pid-filen '%s' finns redan" + +#: cmd_netsync.cc:147 +#, c-format +msgid "failed to create pid file '%s'" +msgstr "Misslyckades med att skapa pid-filen %s" + +#: cmd_netsync.cc:169 +msgid "PATTERN ..." +msgstr "MÖNSTER ..." + +#: cmd_netsync.cc:170 +msgid "serve the branches specified by PATTERNs to connecting clients" +msgstr "servera de grenar som matchar MÖNSTER till anslutande klienter" + +#: cmd_netsync.cc:183 +#, c-format +msgid "" +"need permission to store persistent passphrase (see hook persist_phrase_ok())" +msgstr "" +"behöver tillstånd att använda ett permanent lösenord (se lua-rutinen\n" +"persist_phrase_ok())" + +#: cmd_othervcs.cc:5 msgid "RCSFILE..." msgstr "RCSFIL..." -#: commands.cc:3531 +#: cmd_othervcs.cc:6 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " @@ -1413,205 +1219,386 @@ "detta kommando importerar inte revisioner; du vill antagligen använda\n" "cvs_import" -#: commands.cc:3547 +#: cmd_othervcs.cc:22 msgid "rcs" msgstr "rcs" -#: commands.cc:3547 +#: cmd_othervcs.cc:22 msgid "CVSROOT" msgstr "CVSROOT" -#: commands.cc:3547 +#: cmd_othervcs.cc:22 msgid "import all versions in CVS repository" msgstr "importera alla revisioner i ett CVS-arkiv" -#: commands.cc:3610 -msgid "PATH" -msgstr "SÖKVÄG" +#: cmd_packet.cc:11 cmd_packet.cc:39 cmd_packet.cc:57 +msgid "packet i/o" +msgstr "paket-I/O" -#: commands.cc:3611 -msgid "print annotated copy of the file from REVISION" -msgstr "skriv ut filen ur REVISION med extra detaljer" +#: cmd_packet.cc:11 cmd_packet.cc:39 +msgid "ID" +msgstr "ID" -#: commands.cc:3631 +#: cmd_packet.cc:11 +msgid "write public key packet to stdout" +msgstr "skriv it datapaket för publik nyckel till stdout" + +#: cmd_packet.cc:33 #, c-format -msgid "no revision for file '%s' in database" -msgstr "filen '%s' har ingen revision i databasen" +msgid "public key '%s' does not exist" +msgstr "den publika nyckeln '%s' finns inte" -#: commands.cc:3649 -msgid "[FILE] ..." -msgstr "[FIL] ..." +#: cmd_packet.cc:39 +msgid "write private key packet to stdout" +msgstr "skriv it datapaket för privat nyckel till stdout" -#: commands.cc:3650 +#: cmd_packet.cc:47 +#, c-format +msgid "public and private key '%s' do not exist in keystore" +msgstr "den publika och privata nyckeln '%s' finns inte i nyckellagret" + +#: cmd_packet.cc:58 +msgid "read packets from files or stdin" +msgstr "läs paket från filer eller stdin" + +#: cmd_packet.cc:66 +#, c-format +msgid "no packets found on stdin" +msgstr "inga paket hittade i stdin" + +#: cmd_packet.cc:77 +#, 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" + +#: cmd_packet.cc:81 +#, c-format +msgid "read %d packet" +msgid_plural "read %d packets" +msgstr[0] "läste %d paket" +msgstr[1] "läste %d paket" + +#: cmd_ws_commit.cc:26 msgid "" -"print history in reverse order (filtering by 'FILE'). If one or more\n" -"revisions are given, use them as a starting point." +"Enter a description of this change.\n" +"Lines beginning with `MTN:' are removed automatically.\n" msgstr "" -"skriv ut historiken i omvänd ordning för angivna filer eller för hela\n" -"arbetskatalogen om inga filer angivits. Om en eller flera revisioner\n" -"har angivits används de som utgångspunkter." +"Mata in en beskrivning av denna ändring.\n" +"Rader som börjar med 'MTN:' kommer att tas bort automatiskt.\n" -#: commands.cc:3701 +#: cmd_ws_commit.cc:33 #, c-format -msgid "Unknown file '%s' for log command" -msgstr "Okänd fil '%s'" +msgid "edit of log message failed" +msgstr "redigering av loggmeddelandet misslyckades" -#: commands.cc:3734 +#: cmd_ws_commit.cc:37 +msgid "revert file(s), dir(s) or entire workspace (\".\")" +msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")" + +#: cmd_ws_commit.cc:114 #, c-format -msgid "only one of --last/--next allowed" -msgstr "enbart en av --last eller --next tillåten" +msgid "reverting %s" +msgstr "återställer %s" -#: commands.cc:3902 -msgid "[DIRECTORY]" -msgstr "[KATALOG]" +#: cmd_ws_commit.cc:118 +#, c-format +msgid "no file version %s found in database for %s" +msgstr "filversionen %s finns inte i databasen för %s" -#: commands.cc:3902 -msgid "setup a new workspace directory, default to current" -msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)" +#: cmd_ws_commit.cc:131 +#, c-format +msgid "recreating %s/" +msgstr "återställer %s/" -#: commands.cc:3908 +#: cmd_ws_commit.cc:148 +msgid "disapprove of a particular revision" +msgstr "underkänn en specifik revision" + +#: cmd_ws_commit.cc:161 #, c-format -msgid "need --branch argument for setup" -msgstr "du måste ange en gren med --branch till kommandot \"setup\"" +msgid "revision '%s' has %d changesets, cannot invert\n" +msgstr "revisionen '%s' har %d föräldrar, kan inte invertera\n" -#: commands.cc:3922 -msgid "automation" -msgstr "automatisering" +#: cmd_ws_commit.cc:165 +#, c-format +msgid "need --branch argument for disapproval" +msgstr "för underkännande behöver en gren anges med --branch" -#: commands.cc:3923 +#: cmd_ws_commit.cc:199 +msgid "add files to workspace" +msgstr "lägg till filer i arbetskopian" + +#: cmd_ws_commit.cc:225 +msgid "drop files from workspace" +msgstr "överge filer i arbetskopian" + +#: cmd_ws_commit.cc:250 msgid "" -"interface_version\n" -"heads [BRANCH]\n" -"ancestors REV1 [REV2 [REV3 [...]]]\n" -"attributes [FILE]\n" -"parents REV\n" -"descendents REV1 [REV2 [REV3 [...]]]\n" -"children REV\n" -"graph\n" -"erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n" -"toposort [REV1 [REV2 [REV3 [...]]]]\n" -"ancestry_difference NEW_REV [OLD_REV1 [OLD_REV2 [...]]]\n" -"leaves\n" -"inventory\n" -"stdio\n" -"certs REV\n" -"select SELECTOR\n" -"get_file FILEID\n" -"get_manifest_of [REVID]\n" -"get_revision [REVID]\n" -"packet_for_rdata REVID\n" -"packets_for_certs REVID\n" -"packet_for_fdata FILEID\n" -"packet_for_fdelta OLD_FILE NEW_FILE\n" -"keys\n" +"SRC DEST\n" +"SRC1 [SRC2 [...]] DEST_DIR" msgstr "" -"interface_version\n" -"heads [GREN]\n" -"ancestors REV1 [REV2 [REV3 [...]]]\n" -"attributes [FIL]\n" -"parents REV\n" -"descendents REV1 [REV2 [REV3 [...]]]\n" -"children REV\n" -"graph\n" -"erase_ancestors [REV1 [REV2 [REV3 [...]]]]\n" -"toposort [REV1 [REV2 [REV3 [...]]]]\n" -"ancestry_difference NY_REV [GAMMAL_REV1 [GAMMAL_REV2 [...]]]\n" -"leaves\n" -"inventory\n" -"stdio\n" -"certs REV\n" -"select VÄLJARE\n" -"get_file FILID\n" -"get_manifest_of [REVID]\n" -"get_revision [REVID]\n" -"packet_for_rdata REVID\n" -"packets_for_certs REVID\n" -"packet_for_fdata FILID\n" -"packet_for_fdelta GAMMAL_FIL NY_FIL\n" -"keys\n" +"KÄLLA MÅL\n" +"KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG" -#: commands.cc:3947 -msgid "automation interface" -msgstr "automatiseringsgränssnitt" +#: cmd_ws_commit.cc:252 +msgid "rename entries in the workspace" +msgstr "byt namn på filer i arbetskopian" -#: commands.cc:3963 commands.cc:3979 -msgid "vars" -msgstr "variabler" +#: cmd_ws_commit.cc:274 +msgid "NEW_ROOT PUT_OLD" +msgstr "NY_ROT PLACERA_GAMLA" -#: commands.cc:3963 -msgid "DOMAIN NAME VALUE" -msgstr "DOMÄN NAMN VÄRDE" +#: cmd_ws_commit.cc:275 +msgid "" +"rename the root directory\n" +"after this command, the directory that currently has the name NEW_ROOT\n" +"will be the root directory, and the directory that is currently the root\n" +"directory will have name PUT_OLD.\n" +"Using --execute is strongly recommended." +msgstr "" +"Flytta på rotkatalogen\n" +"när det här kommandot är klart har katalogen som just nu heter NY_ROT\n" +"blivit rotkatalogen, och den nuvarande rotkatalogen blivit katalogen\n" +"PLACERA_GAMLA.\n" +"Det rekommenderas varmt att använda --execute." -#: commands.cc:3964 -msgid "set the database variable NAME to VALUE, in domain DOMAIN" -msgstr "sätt databasvariabeln NAMN till VÄRDE i domänen DOMÄN" +#: cmd_ws_commit.cc:291 +msgid "show status of workspace" +msgstr "visa arbetskopians status" -#: commands.cc:3979 -msgid "DOMAIN NAME" -msgstr "DOMÄN NAMN" +#: cmd_ws_commit.cc:351 +msgid "[DIRECTORY]\n" +msgstr "[KATALOG]\n" -#: commands.cc:3980 -msgid "remove the database variable NAME in domain DOMAIN" -msgstr "ta bort databasvariabeln NAMN från domänen DOMÄN" +#: cmd_ws_commit.cc:352 +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" +"Otherwise, it will be the head of the branch (given or implicit).\n" +"If no directory is given, the branch name will be used as directory" +msgstr "" +"hämta en revision ur databasen till den angivna katalogen.\n" +"Om en revision anges kommer den att hämtas. Om ingen revision anges\n" +"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:3991 +#: cmd_ws_commit.cc:371 cmd_ws_commit.cc:390 #, c-format -msgid "no var with name %s in domain %s" -msgstr "det finns inga variabler med namnet %s i domänen %s" +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:3995 -msgid "REVID" -msgstr "REVID" +#: cmd_ws_commit.cc:384 +#, c-format +msgid "checkout directory '%s' already exists" +msgstr "arbetskatalogen '%s' finns redan" -#: commands.cc:3996 -msgid "dump the roster associated with the given REVID" -msgstr "skriv ut den lista som hör ihop med angivet REVID" +#: cmd_ws_commit.cc:393 +#, c-format +msgid "branch '%s' is empty" +msgstr "grenen '%s' är tom" -#: commands.cc:4014 -msgid "REV REV" -msgstr "REV REV" +#: cmd_ws_commit.cc:396 +#, c-format +msgid "branch %s has multiple heads:" +msgstr "grenen %s har flera löv:" -#: commands.cc:4014 +#: cmd_ws_commit.cc:399 +#, c-format +msgid "choose one with '%s checkout -r'" +msgstr "välj en med '%s update -r'" + +#: cmd_ws_commit.cc:400 +#, c-format +msgid "branch %s has multiple heads" +msgstr "grenen %s har flera löv" + +#: cmd_ws_commit.cc:427 +#, c-format +msgid "revision %s is not a member of branch %s\n" +msgstr "revisionen %s är inte med i grenen %s\n" + +#: cmd_ws_commit.cc:461 +#, c-format +msgid "no file %s found in database for %s" +msgstr "det finns ingen fil %s för %s i databasen" + +#: cmd_ws_commit.cc:479 msgid "" -"Show what conflicts would need to be resolved to merge the given revisions." +"set PATH ATTR VALUE\n" +"get PATH [ATTR]\n" +"drop PATH [ATTR]" msgstr "" -"Visa de konflikter som behöver lösas om de givna revisionerna slås ihop." +"set SÖKVÄG ATTR VÄRDE\n" +"get SÖKVÄG [ATTR]\n" +"drop SÖKVÄG [ATTR]" -#: commands.cc:4023 commands.cc:4025 +#: cmd_ws_commit.cc:480 +msgid "set, get or drop file attributes" +msgstr "sätt, hämta eller ta bort attribut" + +#: cmd_ws_commit.cc:497 #, c-format -msgid "%s is an ancestor of %s; no merge is needed." -msgstr "%s är en förfader till %s; någon ihopslagning behövs inte." +msgid "Unknown path '%s'" +msgstr "Okänd sökväg '%s'" -#: commands.cc:4039 +#: cmd_ws_commit.cc:526 #, c-format -msgid "There are %s node_name_conflicts." -msgstr "Det finns %s node_name-konflikter." +msgid "Path '%s' does not have attribute '%s'\n" +msgstr "Sökvägen '%s' har inget attribut '%s'\n" -#: commands.cc:4040 +#: cmd_ws_commit.cc:552 #, c-format -msgid "There are %s file_content_conflicts." -msgstr "Det finns %s file_content-konflikter." +msgid "No attributes for '%s'" +msgstr "Inga attribut till '%s'" -#: commands.cc:4041 +#: cmd_ws_commit.cc:561 #, c-format -msgid "There are %s node_attr_conflicts." -msgstr "Det finns %s node_attr-konflikter." +msgid "No attribute '%s' on path '%s'" +msgstr "Inget attribut '%s' för sökvägen '%s'" -#: commands.cc:4042 +#: cmd_ws_commit.cc:573 +msgid "commit workspace to database" +msgstr "arkivera arbetskopian i databasen" + +#: cmd_ws_commit.cc:604 #, c-format -msgid "There are %s orphaned_node_conflicts." -msgstr "Det finns %s orphaned_node-konflikter." +msgid "no changes to commit\n" +msgstr "inga ändringar att arkivera\n" -#: commands.cc:4043 +#: cmd_ws_commit.cc:618 #, c-format -msgid "There are %s rename_target_conflicts." -msgstr "Det finns %s rename_target-konflikter." +msgid "beginning commit on branch '%s'\n" +msgstr "börjar arkivering av ändringar i grenen '%s'\n" -#: commands.cc:4044 +#: cmd_ws_commit.cc:627 #, c-format -msgid "There are %s directory_loop_conflicts." -msgstr "Det finns %s directory_loop-konflikter." +msgid "" +"_MTN/log is non-empty and log message was specified on command line\n" +"perhaps move or delete _MTN/log,\n" +"or remove --message/--message-file from the command line?" +msgstr "" +"_MTN/log är inte tom och du angav ett loggmeddelande på kommandoraden\n" +"kanske ta bort eller flytta på _MTN/log\n" +"eller ta bort --message/--message-file från kommandoraden?" +#: cmd_ws_commit.cc:639 +#, c-format +msgid "empty log message; commit canceled" +msgstr "tomt loggmeddelande; arkivering avbryts" + +#: cmd_ws_commit.cc:658 +#, c-format +msgid "log message rejected: %s\n" +msgstr "loggmeddelandet förkastas: %s\n" + +#: cmd_ws_commit.cc:666 +#, c-format +msgid "revision %s already in database\n" +msgstr "revisionen %s finns redan i databasen\n" + +#: cmd_ws_commit.cc:704 cmd_ws_commit.cc:731 +#, c-format +msgid "file '%s' modified during commit, aborting" +msgstr "filen '%s' ändrades under arkivering, avbryter" + +#: cmd_ws_commit.cc:714 +#, c-format +msgid "Your database is missing version %s of file '%s'" +msgstr "Din databas saknar version %s av filen '%s'" + +#: cmd_ws_commit.cc:757 +#, c-format +msgid "committed revision %s\n" +msgstr "arkiverade revisionen %s\n" + +#: cmd_ws_commit.cc:763 +#, c-format +msgid "" +"note: this revision creates divergence\n" +"note: you may (or may not) wish to run '%s merge'" +msgstr "" +"obs: den här revisionen skapade divergens\n" +"obs: du kan tänkas vilja (eller kanske inte) köra '%s merge'" + +#: cmd_ws_commit.cc:795 +msgid "[DIRECTORY]" +msgstr "[KATALOG]" + +#: cmd_ws_commit.cc:795 +msgid "setup a new workspace directory, default to current" +msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)" + +#: cmd_ws_commit.cc:801 +#, c-format +msgid "need --branch argument for setup" +msgstr "du måste ange en gren med --branch till kommandot \"setup\"" + +#: cmd_ws_commit.cc:815 +msgid "refresh the inodeprint cache" +msgstr "uppdatera inodeprint-cachen" + +#: commands.cc:106 +#, c-format +msgid "command '%s' has multiple ambiguous expansions:\n" +msgstr "kommandot '%s' har mer än en betydelse:\n" + +#: commands.cc:149 +msgid "commands:" +msgstr "kommandon:" + +#: commands.cc:206 +#, c-format +msgid "unknown command '%s'\n" +msgstr "okänt kommando '%s'\n" + +#: commands.cc:227 +msgid "command [ARGS...]" +msgstr "kommandon [ARGUMENT...]" + +#: commands.cc:227 +msgid "display command help" +msgstr "skriv ut hjälptext" + +#: commands.cc:362 +#, c-format +msgid "expanding selection '%s'\n" +msgstr "expanderar valet '%s'\n" + +#: commands.cc:370 +#, c-format +msgid "no match for selection '%s'" +msgstr "det finns inget som matchar '%s'" + +#: commands.cc:376 +#, c-format +msgid "expanded to '%s'\n" +msgstr "expanderar till '%s'\n" + +#: commands.cc:393 +#, c-format +msgid "selection '%s' has multiple ambiguous expansions: \n" +msgstr "valet '%s' har mer än en möjlig betydelse: \n" + +#: commands.cc:410 +msgid "note: " +msgstr "obs: " + +#: commands.cc:411 +#, c-format +msgid "" +"branch '%s' has multiple heads\n" +"perhaps consider '%s merge'" +msgstr "" +"grenen '%s' har mer än ett löv\n" +"du kanske borde överväga '%s merge'" + +#: commands.cc:429 +#, c-format +msgid "--message and --message-file are mutually exclusive" +msgstr "--message och --message-file får inte anges samtidigt" + #: database_check.cc:125 msgid "files" msgstr "filer" @@ -1624,7 +1611,7 @@ msgid "markings" msgstr "markeringar" -#: database_check.cc:319 netsync.cc:2797 rcs_import.cc:1226 +#: database_check.cc:319 netsync.cc:2781 rcs_import.cc:1227 msgid "revisions" msgstr "revisioner" @@ -1632,7 +1619,7 @@ msgid "ancestry" msgstr "föräldraskap" -#: database_check.cc:451 netsync.cc:2801 +#: database_check.cc:451 netsync.cc:2785 msgid "keys" msgstr "nycklar" @@ -1901,7 +1888,7 @@ msgid "database is good\n" msgstr "databasen är i gott skick\n" -#: database.cc:141 +#: database.cc:144 #, c-format msgid "" "layout of database %s doesn't match this version of monotone\n" @@ -1915,12 +1902,12 @@ "(detta går inte att ångra; du vill nog ta en säkerhetskopia av databasen\n" "först)" -#: database.cc:155 +#: database.cc:158 #, c-format msgid "this database already contains rosters" msgstr "den här databasen har redan listor" -#: database.cc:175 +#: database.cc:178 #, c-format msgid "" "database %s contains revisions but no rosters\n" @@ -1939,7 +1926,7 @@ " sedan databasen på nytt.\n" "ursäkta besväret." -#: database.cc:194 +#: database.cc:197 #, c-format msgid "" "database %s contains manifests but no revisions\n" @@ -1950,19 +1937,19 @@ "detta är en väldigt gammal databas; den behöver uppgraderas\n" "var god läs README.changesets för detaljer" -#: database.cc:230 +#: database.cc:233 #, c-format msgid "unable to probe database version in file %s" msgstr "kunde inte hitta någon databasversion i filen %s" -#: database.cc:237 +#: database.cc:240 #, c-format msgid "database %s is not an sqlite version 3 file, try dump and reload" msgstr "" "databasen %s är inte skapad med SQLite version 3; testa att dumpa och ladda " "på nytt" -#: database.cc:266 schema_migration.cc:187 +#: database.cc:269 schema_migration.cc:187 msgid "" "make sure database and containing directory are writeable\n" "and you have not run out of disk space" @@ -1971,7 +1958,7 @@ "i\n" "samt att det finns tillräckligt med ledigt utrymme på disken" -#: database.cc:272 schema_migration.cc:192 +#: database.cc:275 schema_migration.cc:192 #, c-format msgid "" "sqlite error: %s\n" @@ -1980,12 +1967,12 @@ "sqlite-fel: %s\n" "%s" -#: database.cc:318 +#: database.cc:321 #, c-format msgid "could not initialize database: %s: already exists" msgstr "kunde inte initiera databasen: %s: den finns redan" -#: database.cc:323 +#: database.cc:326 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -1996,12 +1983,12 @@ "databasen '%s'\n" "avbryter skapandet av databasen" -#: database.cc:473 +#: database.cc:476 #, c-format msgid "cannot create %s; it already exists" msgstr "kan inte skapa %s; den finns redan" -#: database.cc:537 +#: database.cc:540 #, c-format msgid "" "schema version : %s\n" @@ -2048,52 +2035,52 @@ " sidstorlek : %u\n" " cachestorlek : %u\n" -#: database.cc:597 +#: database.cc:600 #, c-format msgid "database schema version: %s" msgstr "databasens schemaversion: %s" -#: database.cc:674 +#: database.cc:677 #, c-format msgid "multiple statements in query: %s\n" msgstr "multipla kommandon i databasfråga: %s\n" -#: database.cc:680 +#: database.cc:683 #, 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:739 +#: database.cc:742 #, c-format msgid "null result in query: %s\n" msgstr "inget resultat med databasfråga: %s\n" -#: database.cc:757 +#: database.cc:760 #, 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:1777 +#: database.cc:1780 #, c-format msgid "another key with name '%s' already exists" msgstr "det finns redan en annan nyckel med namnet '%s'" -#: database.cc:2833 +#: database.cc:2831 #, c-format msgid "no database specified" msgstr "ingen databas angiven" -#: database.cc:2841 +#: database.cc:2839 #, c-format msgid "database %s does not exist" msgstr "databasen %s finns inte" -#: database.cc:2842 +#: database.cc:2840 #, c-format msgid "%s is a directory, not a database" msgstr "%s är en katalog, inte en databas" -#: database.cc:2867 +#: database.cc:2865 #, c-format msgid "could not open database '%s': %s" msgstr "kunde inte öppna databasen '%s': %s" @@ -2317,37 +2304,37 @@ msgid "passphrase for '%s' is incorrect" msgstr "lösen för '%s' stämmer inte" -#: lua.cc:539 lua.cc:568 lua.cc:583 +#: lua.cc:552 lua.cc:581 lua.cc:596 #, c-format msgid "%s called with an invalid parameter" msgstr "%s anropades med inkorrekt parameter" -#: lua.cc:586 +#: lua.cc:599 #, c-format msgid "Directory '%s' does not exist" msgstr "Katalogen '%s' finns inte" -#: lua.cc:587 rcs_import.cc:1217 work.cc:420 +#: lua.cc:600 rcs_import.cc:1218 work.cc:469 #, c-format msgid "'%s' is not a directory" msgstr "'%s' är inte en katalog" -#: lua.cc:606 lua.cc:908 +#: lua.cc:619 lua.cc:921 #, c-format msgid "lua error while loading rcfile '%s'" msgstr "lua-fel vid läsning av rcfilen '%s'" -#: lua.cc:705 +#: lua.cc:718 #, c-format msgid "bad input to parse_basic_io" msgstr "felaktigt indata till parse_basic_io" -#: lua.cc:920 +#: lua.cc:933 #, c-format msgid "lua error while loading '%s'" msgstr "lua-fel vid läsning av '%s'" -#: lua.cc:925 +#: lua.cc:938 #, c-format msgid "rcfile '%s' does not exist" msgstr "rcfilen '%s' finns inte" @@ -2568,17 +2555,17 @@ msgid "[OPTION...] command [ARGS...]\n" msgstr "[FLAGGOR...] kommando [ARGUMENT...]\n" -#: monotone.cc:568 +#: monotone.cc:569 #, c-format msgid "syntax error near the \"%s\" option: %s" msgstr "syntaxfel nära flaggan \"%s\": %s" -#: monotone.cc:610 +#: monotone.cc:611 #, c-format msgid "monotone %s doesn't use the option %s" msgstr "monotone %s använder inte flaggan %s" -#: monotone.cc:645 +#: monotone.cc:646 #, c-format msgid "Options specific to '%s %s':" msgstr "Specifika flaggor för '%s %s':" @@ -2686,41 +2673,41 @@ msgid "check of '%s' failed" msgstr "kontroll av '%s' misslyckades" -#: netsync.cc:708 +#: netsync.cc:714 msgid "bytes in" msgstr "byte in" -#: netsync.cc:710 +#: netsync.cc:716 msgid "bytes out" msgstr "byte ut" -#: netsync.cc:714 +#: netsync.cc:720 msgid "certs in" msgstr "cert in" -#: netsync.cc:716 netsync.cc:729 +#: netsync.cc:722 netsync.cc:735 msgid "revs in" msgstr "rev in" -#: netsync.cc:721 +#: netsync.cc:727 msgid "certs out" msgstr "cert ut" -#: netsync.cc:723 netsync.cc:731 +#: netsync.cc:729 netsync.cc:737 msgid "revs out" msgstr "rev ut" -#: netsync.cc:837 +#: netsync.cc:843 #, 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:1183 +#: netsync.cc:1189 #, c-format msgid "received network error: %s" msgstr "nätverksfel: %s" -#: netsync.cc:1215 +#: netsync.cc:1221 #, c-format msgid "" "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" @@ -2741,12 +2728,12 @@ "jag väntade mig %s\n" "'%s unset %s %s' åsidosätter denna kontroll\n" -#: netsync.cc:1225 +#: netsync.cc:1231 #, c-format msgid "server key changed" msgstr "serverns nyckel ändrad" -#: netsync.cc:1230 +#: netsync.cc:1236 #, c-format msgid "" "first time connecting to server %s\n" @@ -2757,48 +2744,48 @@ "jag antar att det är rätt server, men du kan tänkas vilja dubbelkolla\n" "deras nyckels fingeravtryck: %s\n" -#: netsync.cc:1237 +#: netsync.cc:1243 #, c-format msgid "saving public key for %s to database\n" msgstr "sparar publik nyckel för %s i databasen\n" -#: netsync.cc:1325 +#: netsync.cc:1331 #, 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:1332 +#: netsync.cc:1338 #, 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:1347 netsync.cc:1444 +#: netsync.cc:1353 netsync.cc:1450 #, c-format msgid "not serving branch '%s'" msgstr "serverar ej grenen %s" -#: netsync.cc:1352 +#: netsync.cc:1358 #, c-format msgid "anonymous access to branch '%s' denied by server" msgstr "anonym åtkomst av grenen '%s' nekades av servern" -#: netsync.cc:1359 +#: netsync.cc:1365 #, 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:1391 +#: netsync.cc:1397 #, c-format msgid "detected replay attack in auth netcmd\n" msgstr "upptäckte \"replay\"-attack i auth netcmd\n" -#: netsync.cc:1413 +#: netsync.cc:1419 #, 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:1430 +#: netsync.cc:1436 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' while running as pure " @@ -2807,7 +2794,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:1450 +#: netsync.cc:1456 #, c-format msgid "" "denied '%s' read permission for '%s' excluding '%s' because of branch '%s'\n" @@ -2815,18 +2802,18 @@ "nekade läsning för '%s' av alla grenar som matchar '%s' och inte '%s' på " "grund av grenen '%s'\n" -#: netsync.cc:1453 +#: netsync.cc:1459 #, c-format msgid "access to branch '%s' denied by server" msgstr "åtkomst till grenen '%s' nekades av servern" -#: netsync.cc:1463 +#: netsync.cc:1469 #, 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:1472 +#: netsync.cc:1478 #, c-format msgid "" "denied '%s' write permission for '%s' excluding '%s' while running as pure " @@ -2835,165 +2822,150 @@ "nekade skrivning för '%s' av alla grenar som matchar '%s' och inte '%s' " "under körning som \"pure source\"\n" -#: netsync.cc:1480 +#: netsync.cc:1486 #, 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:1486 +#: netsync.cc:1492 #, 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:1526 +#: netsync.cc:1532 #, c-format msgid "bad client signature\n" msgstr "felaktig signatur från klienten\n" -#: netsync.cc:1542 +#: netsync.cc:1548 #, c-format msgid "Unexpected 'refine' command on non-refined item type\n" msgstr "Oväntat kommando \"refine\" på icke-raffinerad typ\n" -#: netsync.cc:1639 +#: netsync.cc:1645 #, c-format msgid "unknown bye phase %d received" msgstr "okänd hejdå-fas %d mottagen" -#: netsync.cc:1654 +#: netsync.cc:1660 #, c-format msgid "Unexpected 'done' command on non-refined item type\n" msgstr "Oväntat kommando \"done\" på icke-raffinerad typ\n" -#: netsync.cc:1734 +#: netsync.cc:1732 #, c-format -msgid "epoch with hash '%s' does not exist in our database" -msgstr "epoken med kontrollsumman '%s' finns inte i databasen" +msgid "%s with hash '%s' does not exist in our database" +msgstr "%s med kontrollsumman '%s' finns inte i databasen" -#: netsync.cc:1763 +#: netsync.cc:1833 #, c-format -msgid "revision '%s' does not exist in our database" -msgstr "revisionen '%s' finns inte i databasen" - -#: netsync.cc:1777 -#, c-format -msgid "file '%s' does not exist in our database" -msgstr "filen '%s' finns inte i databasen" - -#: netsync.cc:1791 -#, c-format -msgid "cert '%s' does not exist in our database" -msgstr "certet '%s' finns inte i databasen" - -#: netsync.cc:1843 -#, 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:1864 +#: netsync.cc:1851 #, 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:1881 +#: netsync.cc:1865 #, c-format msgid "hash check failed for revision cert '%s'" msgstr "kontrollsummering misslyckades för revisionscertet '%s'" -#: netsync.cc:1956 +#: netsync.cc:1927 #, c-format msgid "Received warning from usher: %s" msgstr "Fick varning från usher: %s" -#: netsync.cc:2043 netsync.cc:2074 +#: netsync.cc:2014 netsync.cc:2045 msgid "source and sink" msgstr "källa och mottagare" -#: netsync.cc:2044 netsync.cc:2075 +#: netsync.cc:2015 netsync.cc:2046 msgid "source" msgstr "källa" -#: netsync.cc:2044 netsync.cc:2075 +#: netsync.cc:2015 netsync.cc:2046 msgid "sink" msgstr "mottagare" -#: netsync.cc:2229 +#: netsync.cc:2200 #, c-format msgid "input buffer for peer %s is overfull after netcmd dispatch\n" msgstr "indatabuffert för %s är överfull\n" -#: netsync.cc:2241 netsync.cc:2298 +#: netsync.cc:2212 netsync.cc:2269 #, c-format msgid "protocol error while processing peer %s: '%s'\n" msgstr "protokollfel vid behandling av %s: '%s'\n" -#: netsync.cc:2247 +#: netsync.cc:2218 #, c-format msgid "error: %s\n" msgstr "fel: %s\n" -#: netsync.cc:2277 +#: netsync.cc:2248 #, c-format msgid "connecting to %s\n" msgstr "ansluter till %s\n" -#: netsync.cc:2313 +#: netsync.cc:2284 #, 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:2328 +#: netsync.cc:2299 #, c-format msgid "got OOB data from peer %s, disconnecting\n" msgstr "fick OOB-data från %s, kopplar ifrån\n" -#: netsync.cc:2343 +#: netsync.cc:2314 #, 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:2360 +#: netsync.cc:2331 #, c-format msgid "successful exchange with %s\n" msgstr "lyckat utbyte med %s\n" -#: netsync.cc:2366 +#: netsync.cc:2337 #, 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:2371 +#: netsync.cc:2342 #, 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:2400 +#: netsync.cc:2371 #, 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:2432 +#: netsync.cc:2403 #, c-format msgid "accepted new client connection from %s : %s\n" msgstr "tar emot ny klientanslutning från %s: %s\n" -#: netsync.cc:2466 +#: netsync.cc:2437 #, 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:2477 +#: netsync.cc:2448 #, 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:2482 +#: netsync.cc:2453 #, c-format msgid "" "peer %s read failed in shutdown state (possibly client misreported error)\n" @@ -3001,17 +2973,17 @@ "läsning från %s fallerade i tillståndet \"shutdown\" (klienten kan felaktigt " "ha rapporterat ett fel)\n" -#: netsync.cc:2488 +#: netsync.cc:2459 #, 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:2509 +#: netsync.cc:2480 #, 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:2514 +#: netsync.cc:2485 #, c-format msgid "" "peer %s write failed in shutdown state (possibly client misreported error)\n" @@ -3019,57 +2991,57 @@ "skrivning till %s fallerade i tillståndet \"shutdown\" (klienten kan " "felaktigt ha rapporterat ett fel)\n" -#: netsync.cc:2520 +#: netsync.cc:2491 #, 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:2547 +#: netsync.cc:2518 #, c-format msgid "peer %s processing finished, disconnecting\n" msgstr "behandling av %s slutförd, kopplar ifrån\n" -#: netsync.cc:2569 +#: netsync.cc:2540 #, 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:2637 +#: netsync.cc:2608 #, c-format msgid "beginning service on %s : %s\n" msgstr "startar tjänst på %s : %s\n" -#: netsync.cc:2638 +#: netsync.cc:2609 msgid "" msgstr "" -#: netsync.cc:2652 +#: netsync.cc:2623 #, 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:2707 +#: netsync.cc:2688 #, c-format msgid "got OOB from peer %s, disconnecting\n" msgstr "fick OOB-data från %s, kopplar ifrån\n" -#: netsync.cc:2791 +#: netsync.cc:2775 #, c-format msgid "finding items to synchronize:\n" msgstr "letar efter saker att synkronisera:\n" -#: netsync.cc:2799 +#: netsync.cc:2783 msgid "certificates" msgstr "certifikat" -#: netsync.cc:2908 +#: netsync.cc:2896 #, c-format msgid "Cannot find key '%s'" msgstr "Kan inte hitta nyckeln '%s'" -#: netsync.cc:2948 +#: netsync.cc:2936 #, c-format msgid "" "include branch pattern contains a quote character:\n" @@ -3078,7 +3050,7 @@ "grenmönstret givet med --include innehåller ett citattecken:\n" "%s\n" -#: netsync.cc:2954 +#: netsync.cc:2942 #, c-format msgid "" "exclude branch pattern contains a quote character:\n" @@ -3087,7 +3059,7 @@ "grenmönstret givet med --exclude innehåller ett citattecken:\n" "%s\n" -#: netsync.cc:2977 netsync.cc:2981 +#: netsync.cc:2965 netsync.cc:2969 #, c-format msgid "network error: %s" msgstr "nätverksfel: %s" @@ -3157,37 +3129,37 @@ msgid "unknown packet type: '%s'" msgstr "okänd pakettyp: '%s'" -#: rcs_file.cc:344 +#: rcs_file.cc:345 #, c-format msgid "parse failure %d:%d: expecting %s, got %s with value '%s'\n" msgstr "uttydning misslyckades %d:%d: %s förväntat, fick %s med värdet '%s'\n" -#: rcs_file.cc:363 +#: rcs_file.cc:364 #, c-format msgid "parse failure %d:%d: expecting word '%s'\n" msgstr "uttydning misslyckades %d:%d: ordet '%s' förväntat\n" -#: rcs_file.cc:378 +#: rcs_file.cc:379 #, c-format msgid "parse failure %d:%d: expecting word\n" msgstr "uttydning misslyckades %d:%d: ord förväntat\n" -#: rcs_import.cc:703 +#: rcs_import.cc:704 #, c-format msgid "parsing RCS file %s\n" msgstr "uttyder RCS-fil %s\n" -#: rcs_import.cc:706 +#: rcs_import.cc:707 #, c-format msgid "parsed RCS file %s OK\n" msgstr "uttydning av RCS-filen %s gick bra\n" -#: rcs_import.cc:895 +#: rcs_import.cc:896 #, c-format msgid "error reading RCS file %s: %s\n" msgstr "fel vid läsning av RCS-filen %s: %s\n" -#: rcs_import.cc:1192 +#: rcs_import.cc:1193 #, c-format msgid "" "%s appears to be a CVS repository root directory\n" @@ -3196,61 +3168,61 @@ "%s verkar vara rotkatalogen till ett CVS-arkiv\n" "försök importera en modul istället, med 'cvs_import %s/" -#: rcs_import.cc:1204 +#: rcs_import.cc:1205 #, c-format msgid "need base --branch argument for importing" msgstr "behöver en gren angiven med --branch att importera till" -#: rcs_import.cc:1216 +#: rcs_import.cc:1217 #, c-format msgid "path %s does not exist" msgstr "sökvägen %s finns inte" -#: rcs_import.cc:1251 +#: rcs_import.cc:1252 msgid "tags" msgstr "taggar" -#: revision.cc:700 +#: revision.cc:710 #, c-format msgid "scanning for bogus merge edges\n" msgstr "letar efter felaktiga ihopslagningsbågar\n" -#: revision.cc:742 +#: revision.cc:752 #, c-format msgid "optimizing out redundant edge %d -> %d\n" msgstr "optimerar bort onödig båge %d -> %d\n" -#: revision.cc:751 +#: revision.cc:761 #, c-format msgid "failed to eliminate edge %d -> %d\n" msgstr "misslyckades med att ta bort bågen %d -> %d\n" -#: revision.cc:762 +#: revision.cc:772 #, c-format msgid "rebuilding %d nodes\n" msgstr "bygger om %d noder\n" -#: revision.cc:967 +#: revision.cc:977 #, c-format msgid "Path %s added to child roster multiple times\n" msgstr "Sökvägen %s tillagd till listan mer än en gång\n" -#: revision.cc:980 +#: revision.cc:990 #, c-format msgid "Directory for path %s cannot be added, as there is a file in the way\n" msgstr "Katalogen %s kan inte läggas till, det finns en fil i vägen\n" -#: revision.cc:991 +#: revision.cc:1001 #, c-format msgid "Path %s cannot be added, as there is a directory in the way\n" msgstr "Filen %s kan inte läggas till, det finns en katalog i vägen\n" -#: revision.cc:994 +#: revision.cc:1004 #, c-format msgid "Path %s added twice with differing content\n" msgstr "Sökvägen %s tillagd två gånger med olika innehåll\n" -#: revision.cc:1281 +#: revision.cc:1291 #, c-format msgid "" "unknown attribute '%s' on path '%s'\n" @@ -3265,17 +3237,17 @@ "attributet hjälper vi gärna till att klura ut ett bra sätt att hantera\n" "det på)" -#: revision.cc:1393 +#: revision.cc:1403 #, 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:1448 +#: revision.cc:1458 #, c-format msgid "rebuilding revision graph from manifest certs\n" msgstr "bygger om revisionsgrafen från manifestcert\n" -#: revision.cc:1551 +#: revision.cc:1561 #, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" @@ -3487,169 +3459,187 @@ msgid "Invalid hmac length of %d bytes" msgstr "felaktig HMAC-längd, %d byte" -#: work.cc:118 +#: work.cc:167 #, c-format msgid "skipping ignorable file %s" msgstr "hoppar över ignorerbar fil %s" -#: work.cc:127 +#: work.cc:176 #, c-format msgid "skipping %s, already accounted for in workspace" msgstr "hoppar över %s, den finns redan noterad i arbetskopian" -#: work.cc:131 +#: work.cc:180 #, c-format msgid "adding %s to workspace manifest" msgstr "lägger till %s i arbetskopians manifest" -#: work.cc:221 +#: work.cc:270 #, c-format msgid "skipping %s, not currently tracked" msgstr "hoppar över %s, ej noterad i arbetskopian för närvarande" -#: work.cc:231 +#: work.cc:280 #, c-format msgid "cannot remove %s/, it is not empty" msgstr "kan inte ta bort %s/, den är inte tom" -#: work.cc:242 +#: work.cc:291 #, c-format msgid "dropping %s from workspace manifest" msgstr "tar bort %s från arbetskopians manifest" -#: work.cc:305 +#: work.cc:354 #, c-format msgid "destination dir %s/ does not exist in current revision" msgstr "målkatalogen %s/ finns inte i nuvarande revision" -#: work.cc:308 +#: work.cc:357 #, c-format msgid "destination %s is an existing file in current revision" msgstr "målet %s är en existerande fil i nuvarande revision" -#: work.cc:318 +#: work.cc:367 #, c-format msgid "empty path %s is not allowed" msgstr "tom sökväg %s ej tillåten" -#: work.cc:332 +#: work.cc:381 #, c-format msgid "%s does not exist in current revision" msgstr "%s finns inte i nuvarande revision" -#: work.cc:335 +#: work.cc:384 #, c-format msgid "destination %s already exists in current revision" msgstr "målet %s finns redan i nuvarande revision" -#: work.cc:344 +#: work.cc:393 #, c-format msgid "renaming %s to %s in workspace manifest" msgstr "byter namn från %s till %s i arbetskopians manifest" -#: work.cc:369 +#: work.cc:418 #, c-format msgid "%s doesn't exist in workspace, skipping" msgstr "hoppar över %s, den existerar inte i arbetskopian" -#: work.cc:373 +#: work.cc:422 #, c-format msgid "destination %s already exists in workspace, skipping" msgstr "hoppar över %s, den finns redan noterad i arbetskopian" -#: work.cc:400 +#: work.cc:449 #, c-format msgid "proposed new root directory '%s' is not versioned or does not exist" msgstr "" "den föreslagna nya rotkatalogen '%s' är inte noterad i arbetskopian eller " "finns inte" -#: work.cc:402 +#: work.cc:451 #, c-format msgid "proposed new root directory '%s' is not a directory" msgstr "den föreslagna nya rotkatalogen '%s' är inte en katalog" -#: work.cc:407 +#: work.cc:456 #, c-format msgid "proposed new root directory '%s' contains illegal path %s" msgstr "" "den föreslagna nya rotkatalogen '%s' innehåller den otillåtna sökvägen %s" -#: work.cc:417 +#: work.cc:466 #, c-format msgid "directory '%s' is not versioned or does not exist" msgstr "katalogen '%s' är inte noterad i arbetskopian eller finns inte" -#: work.cc:423 +#: work.cc:472 #, c-format msgid "'%s' is in the way" msgstr "'%s' är i vägen" -#: work.cc:520 +#: work.cc:569 #, c-format msgid "workspace is corrupt: %s does not exist" msgstr "arbetskopian är korrupt: %s finns inte" -#: work.cc:521 +#: work.cc:570 #, c-format msgid "workspace is corrupt: %s is a directory" msgstr "arbetskopian är korrupt: %s är en katalog" -#: work.cc:531 +#: work.cc:580 #, c-format msgid "Problem with workspace: %s is unreadable" msgstr "Problem med arbetskatalogen: %s är oläsbar" -#: work.cc:557 +#: work.cc:606 #, c-format msgid "base revision %s does not exist in database\n" msgstr "grundrevisionen %s finns inte i databasen\n" -#: work.cc:894 +#: work.cc:928 #, c-format msgid "dropping %s" msgstr "slänger %s" -#: work.cc:905 work.cc:916 +#: work.cc:939 work.cc:950 #, c-format msgid "path %s already exists" msgstr "sökvägen %s finns redan" -#: work.cc:938 work.cc:965 +#: work.cc:972 work.cc:999 #, c-format msgid "adding %s" msgstr "lägger till %s" -#: work.cc:954 +#: work.cc:988 #, c-format msgid "path '%s' already exists, cannot create" msgstr "sökvägen '%s' finns redan, kan inte skapa den" -#: work.cc:961 +#: work.cc:995 #, c-format msgid "renaming %s to %s" msgstr "byter namn på %s till %s" -#: work.cc:996 +#: work.cc:1030 #, c-format msgid "file '%s' does not exist" msgstr "filen '%s' finns inte" -#: work.cc:997 +#: work.cc:1031 #, c-format msgid "file '%s' is a directory" msgstr "filen '%s' är en katalog" -#: work.cc:1002 +#: work.cc:1036 #, c-format msgid "content of file '%s' has changed, not overwriting" msgstr "innehållet i filen '%s' har ändrats, skriver inte över" -#: work.cc:1003 +#: work.cc:1037 #, c-format msgid "updating %s" msgstr "uppdaterar %s" +#~ msgid "unknown path '%s'\n" +#~ msgstr "okänd sökväg '%s'\n" + +#~ msgid "current revision has no ancestor" +#~ msgstr "denna revision har ingen förälder" + +#~ msgid "Unknown file '%s' for log command" +#~ msgstr "Okänd fil '%s'" + +#~ msgid "revision '%s' does not exist in our database" +#~ msgstr "revisionen '%s' finns inte i databasen" + +#~ msgid "file '%s' does not exist in our database" +#~ msgstr "filen '%s' finns inte i databasen" + +#~ msgid "cert '%s' does not exist in our database" +#~ msgstr "certet '%s' finns inte i databasen" + #~ msgid "negative or zero last not allowed\n" #~ msgstr "talet angett med --last får inte vara negativt eller noll\n"