# # # patch "po/sv.po" # from [8c4dd6d9173208ea2bf3cca56f15f57aea9cb13e] # to [538eaaaf9502a927a6a260925ebaaaaf4ba467bf] # ============================================================ --- po/sv.po 8c4dd6d9173208ea2bf3cca56f15f57aea9cb13e +++ po/sv.po 538eaaaf9502a927a6a260925ebaaaaf4ba467bf @@ -143,13 +143,12 @@ # work set arbetsmängd # workspace arbetskopia (el. kanske arbetskatalog, ibland) # -#: cmd_key_cert.cc:158 msgid "" msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-01 12:30+0100\n" -"PO-Revision-Date: 2007-03-01 12:37+0100\n" +"POT-Creation-Date: 2007-03-11 23:40+0100\n" +"PO-Revision-Date: 2007-03-11 23:42+0100\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -182,8 +181,8 @@ msgstr "sökroten '%s' är inte en katal msgid "search root '%s' is not a directory" msgstr "sökroten '%s' är inte en katalog" -#: asciik.cc:384 cmd_files.cc:27 cmd_files.cc:40 cmd_files.cc:77 -#: cmd_files.cc:181 cmd_merging.cc:954 cmd_othervcs.cc:15 +#: asciik.cc:384 cmd_files.cc:28 cmd_files.cc:41 cmd_files.cc:78 +#: cmd_files.cc:182 cmd_merging.cc:956 cmd_othervcs.cc:15 msgid "debug" msgstr "felsökning" @@ -201,7 +200,7 @@ msgstr "visualisera revisionsträdet med #: automate.cc:1145 automate.cc:1172 automate.cc:1206 automate.cc:1318 #: automate.cc:1408 automate.cc:1467 automate.cc:1516 automate.cc:1575 #: automate.cc:1624 automate.cc:1677 automate.cc:1736 automate.cc:1767 -#: automate.cc:1790 cmd_files.cc:281 cmd_files.cc:304 cmd_list.cc:676 +#: automate.cc:1790 cmd_files.cc:282 cmd_files.cc:305 cmd_list.cc:677 #, c-format msgid "wrong argument count" msgstr "felaktigt antal givna argument" @@ -216,7 +215,7 @@ msgstr "REV1 [REV2 [REV3 [...]]]" #: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:335 #: automate.cc:370 automate.cc:374 automate.cc:434 automate.cc:459 -#: automate.cc:1213 cmd_list.cc:683 revision.cc:1823 +#: automate.cc:1213 cmd_list.cc:684 revision.cc:1823 #, c-format msgid "No such revision %s" msgstr "det finns ingen revision med identiteten %s" @@ -229,8 +228,8 @@ msgstr "FIL" msgid "FILE" msgstr "FIL" -#: automate.cc:235 automate.cc:730 automate.cc:966 cmd_files.cc:259 -#: cmd_files.cc:314 cmd_merging.cc:147 cmd_merging.cc:627 cmd_ws_commit.cc:94 +#: automate.cc:235 automate.cc:730 automate.cc:966 cmd_files.cc:260 +#: cmd_files.cc:315 cmd_merging.cc:149 cmd_merging.cc:629 cmd_ws_commit.cc:95 #, c-format msgid "this command can only be used in a single-parent workspace" msgstr "detta kommando kan enbart användas i en arbetskopia med en förälder" @@ -246,16 +245,16 @@ msgstr "NY_REV [GAMMAL_REV1 [GAMMAL_REV2 #: automate.cc:403 automate.cc:491 automate.cc:716 automate.cc:959 #: automate.cc:983 automate.cc:1269 cmd_automate.cc:77 cmd_automate.cc:331 -#: cmd_list.cc:584 +#: cmd_list.cc:585 #, c-format msgid "no arguments needed" msgstr "inga argument behövs" -#: automate.cc:428 automate.cc:453 cmd_list.cc:673 revision.cc:1817 +#: automate.cc:428 automate.cc:453 cmd_list.cc:674 revision.cc:1817 msgid "REV" msgstr "REV" -#: automate.cc:913 automate.cc:1046 cmd_merging.cc:954 +#: automate.cc:913 automate.cc:1046 cmd_merging.cc:956 msgid "[REVID]" msgstr "[REVID]" @@ -270,15 +269,15 @@ msgstr "REVID" msgstr "REVID" #: automate.cc:1100 automate.cc:1126 automate.cc:1181 automate.cc:1183 -#: automate.cc:1743 cmd_db.cc:34 cmd_diff_log.cc:394 cmd_diff_log.cc:421 -#: cmd_diff_log.cc:423 cmd_files.cc:164 cmd_files.cc:220 cmd_merging.cc:181 -#: cmd_merging.cc:783 cmd_merging.cc:798 cmd_merging.cc:801 cmd_netsync.cc:305 -#: cmd_ws_commit.cc:527 cmd_ws_commit.cc:990 commands.cc:411 +#: automate.cc:1743 cmd_db.cc:35 cmd_diff_log.cc:395 cmd_diff_log.cc:422 +#: cmd_diff_log.cc:424 cmd_files.cc:165 cmd_files.cc:221 cmd_merging.cc:183 +#: cmd_merging.cc:785 cmd_merging.cc:800 cmd_merging.cc:803 cmd_netsync.cc:316 +#: cmd_ws_commit.cc:528 cmd_ws_commit.cc:991 commands.cc:412 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" -#: automate.cc:1142 cmd_files.cc:278 +#: automate.cc:1142 cmd_files.cc:279 msgid "FILEID" msgstr "FILID" @@ -299,17 +298,17 @@ msgstr "NYCKELID LÖSEN" msgid "KEYID PASSPHRASE" msgstr "NYCKELID LÖSEN" -#: automate.cc:1423 cmd_key_cert.cc:47 +#: automate.cc:1423 cmd_key_cert.cc:48 #, c-format msgid "key '%s' already exists" msgstr "nyckeln '%s' finns redan" -#: automate.cc:1426 cmd_key_cert.cc:50 +#: automate.cc:1426 cmd_key_cert.cc:51 #, c-format msgid "generating key-pair '%s'" msgstr "skapar nyckelparet '%s'" -#: automate.cc:1428 cmd_key_cert.cc:52 +#: automate.cc:1428 cmd_key_cert.cc:53 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "lagrar nyckelparet '%s' i %s/" @@ -340,7 +339,7 @@ msgstr "[FILID] INNEHÅLL" msgid "[FILEID] CONTENTS" msgstr "[FILID] INNEHÅLL" -#: automate.cc:1642 cmd_files.cc:208 +#: automate.cc:1642 cmd_files.cc:209 #, c-format msgid "no file version %s found in database" msgstr "filversionen %s finns inte i databasen" @@ -358,11 +357,11 @@ msgstr "REVISION CERTNAMN CERTVÄRDE" msgid "REVISION-ID NAME VALUE" msgstr "REVISION CERTNAMN CERTVÄRDE" -#: automate.cc:1764 cmd_db.cc:121 +#: automate.cc:1764 cmd_db.cc:122 msgid "DOMAIN NAME VALUE" msgstr "DOMÄN NAMN VÄRDE" -#: automate.cc:1787 cmd_db.cc:137 +#: automate.cc:1787 cmd_db.cc:138 msgid "DOMAIN NAME" msgstr "DOMÄN NAMN" @@ -376,37 +375,37 @@ msgstr "tydde %s i %d:%d:E: %s" msgid "parsing a %s at %d:%d:E: %s" msgstr "tydde %s i %d:%d:E: %s" -#: cert.cc:82 +#: cert.cc:81 #, c-format msgid "ignoring bad signature by '%s' on '%s'" msgstr "ignorerar felaktig signatur på '%2$s', av '%1$s'" -#: cert.cc:90 +#: cert.cc:89 #, c-format msgid "ignoring unknown signature by '%s' on '%s'" msgstr "ignorerar okänd signatur på '%2$s', av '%1$s'" -#: cert.cc:156 +#: cert.cc:155 #, c-format msgid "trust function disliked %d signers of %s cert on manifest %s" msgstr "tillitsfunktionen ogillar %d signerare av certet %s i manifestet %s" -#: cert.cc:213 +#: cert.cc:212 #, c-format msgid "trust function disliked %d signers of %s cert on revision %s" msgstr "tillitsfunktionen ogillar %d signerare av certet %s i revisionen %s" -#: cert.cc:307 +#: cert.cc:306 #, c-format msgid "calculated cert hash '%s' does not match '%s'" msgstr "den beräknade kontrollsumman '%s' på certet skiljer sig ifrån '%s'" -#: cert.cc:391 keys.cc:662 +#: cert.cc:390 keys.cc:662 #, c-format msgid "no key pair '%s' found in key store '%s'" msgstr "nyckelparet '%s' finns inte i katalogen '%s'" -#: cert.cc:465 +#: cert.cc:464 #, c-format msgid "" "you have no private key to make signatures with\n" @@ -415,7 +414,7 @@ msgstr "" "du har ingen privat nyckel att signera med\n" "du kanske behöver göra 'genkey '" -#: cert.cc:468 +#: cert.cc:467 #, c-format msgid "" "you have multiple private keys\n" @@ -425,17 +424,17 @@ msgstr "" "välj en att användas för signaturer genom att lägga '-k' till\n" "ditt kommando" -#: cert.cc:484 +#: cert.cc:483 #, c-format msgid "no branch found for empty revision, please provide a branch name" msgstr "ingen gren funnen för tom revision, var god ange en gren" -#: cert.cc:491 +#: cert.cc:490 #, c-format msgid "no branch certs found for revision %s, please provide a branch name" msgstr "inget grencert funnet för revision %s, var god ange en gren" -#: cert.cc:495 +#: cert.cc:494 #, c-format msgid "" "multiple branch certs found for revision %s, please provide a branch name" @@ -475,16 +474,16 @@ msgstr "automatiseringsgränssnitt" msgid "automation interface" msgstr "automatiseringsgränssnitt" -#: cmd_db.cc:40 +#: cmd_db.cc:41 #, c-format msgid "revision %s already has children. We cannot kill it." msgstr "revisionen %s har barn. Vi kan inte ta bort den." -#: cmd_db.cc:45 +#: cmd_db.cc:46 msgid "database" msgstr "databas" -#: cmd_db.cc:46 +#: cmd_db.cc:47 msgid "" "init\n" "info\n" @@ -518,81 +517,81 @@ msgstr "" "regenerate_caches\n" "set_epoch GREN EPOK\n" -#: cmd_db.cc:61 +#: cmd_db.cc:62 msgid "manipulate database state" msgstr "gör ändringar direkt i databasen" -#: cmd_db.cc:110 +#: cmd_db.cc:111 #, c-format msgid "The epoch must be %s characters" msgstr "Epoken måste innehålla %s tecken" -#: cmd_db.cc:121 cmd_db.cc:137 +#: cmd_db.cc:122 cmd_db.cc:138 msgid "vars" msgstr "variabler" -#: cmd_db.cc:122 +#: cmd_db.cc:123 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:138 +#: cmd_db.cc:139 msgid "remove the database variable NAME in domain DOMAIN" msgstr "ta bort databasvariabeln NAMN från domänen DOMÄN" -#: cmd_db.cc:150 +#: cmd_db.cc:151 #, 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:154 cmd_diff_log.cc:469 cmd_diff_log.cc:598 cmd_files.cc:113 -#: cmd_files.cc:243 cmd_list.cc:478 cmd_merging.cc:720 cmd_ws_commit.cc:415 -#: commands.cc:275 +#: cmd_db.cc:155 cmd_diff_log.cc:470 cmd_diff_log.cc:599 cmd_files.cc:114 +#: cmd_files.cc:244 cmd_list.cc:479 cmd_merging.cc:722 cmd_ws_commit.cc:416 +#: commands.cc:276 msgid "informative" msgstr "informativ" -#: cmd_db.cc:154 +#: cmd_db.cc:155 msgid "(revision|file|key) PARTIAL-ID" msgstr "(revision|file|key) PARTIAL-ID" -#: cmd_db.cc:155 +#: cmd_db.cc:156 msgid "complete partial id" msgstr "utöka den partiella identiteten" -#: cmd_db.cc:164 +#: cmd_db.cc:165 #, c-format msgid "non-hex digits in partial id" msgstr "något tecken i den partiella identiteten är inte hexadecimalt" -#: cmd_diff_log.cc:119 +#: cmd_diff_log.cc:120 msgid "Deleted entries:" msgstr "Borttagna objekt:" -#: cmd_diff_log.cc:125 +#: cmd_diff_log.cc:126 msgid "Renamed entries:" msgstr "Omnämnda objekt:" -#: cmd_diff_log.cc:140 +#: cmd_diff_log.cc:141 msgid "Added files:" msgstr "Adderade filer:" -#: cmd_diff_log.cc:146 +#: cmd_diff_log.cc:147 msgid "Added directories:" msgstr "Adderade kataloger:" -#: cmd_diff_log.cc:157 +#: cmd_diff_log.cc:158 msgid "Modified files:" msgstr "Ändrade filer:" -#: cmd_diff_log.cc:174 +#: cmd_diff_log.cc:175 msgid "Modified attrs:" msgstr "Ändrade attribut:" -#: cmd_diff_log.cc:355 +#: cmd_diff_log.cc:356 #, c-format msgid "more than two revisions given" msgstr "fler än två revisioner angivna" -#: cmd_diff_log.cc:367 +#: cmd_diff_log.cc:368 #, c-format msgid "" "this workspace has more than one parent\n" @@ -601,12 +600,12 @@ msgstr "" "denna arbetskopia har mer än en förälder\n" "(ange en revision att se skillnader emot med --revision)" -#: cmd_diff_log.cc:469 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308 -#: cmd_ws_commit.cc:341 cmd_ws_commit.cc:415 cmd_ws_commit.cc:696 +#: cmd_diff_log.cc:470 cmd_ws_commit.cc:80 cmd_ws_commit.cc:309 +#: cmd_ws_commit.cc:342 cmd_ws_commit.cc:416 cmd_ws_commit.cc:697 msgid "[PATH]..." msgstr "[SÖKVÄG]..." -#: cmd_diff_log.cc:470 +#: cmd_diff_log.cc:471 msgid "" "show current diffs on stdout.\n" "If one revision is given, the diff between the workspace and\n" @@ -618,7 +617,7 @@ msgstr "" "revisionen. Om två revisioner anges visas skillnaden mellan dem. Om\n" "inget format anges används unified." -#: cmd_diff_log.cc:479 +#: cmd_diff_log.cc:480 #, c-format msgid "" "--diff-args requires --external\n" @@ -627,19 +626,19 @@ msgstr "" "--diff-args kräver att även --external anges\n" "lägg till --external eller ta bort --diff-args?" -#: cmd_diff_log.cc:503 +#: cmd_diff_log.cc:504 msgid "no changes" msgstr "inga ändringar" -#: cmd_diff_log.cc:524 +#: cmd_diff_log.cc:525 msgid "[FILE [...]]" msgstr "[FIL [...]]" -#: cmd_diff_log.cc:598 +#: cmd_diff_log.cc:599 msgid "[FILE] ..." msgstr "[FIL] ..." -#: cmd_diff_log.cc:599 +#: cmd_diff_log.cc:600 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -648,75 +647,75 @@ msgstr "" "arbetskatalogen om inga filer angivits. Om en eller flera revisioner har " "angivits används de som utgångspunkter." -#: cmd_diff_log.cc:614 +#: cmd_diff_log.cc:615 #, c-format msgid "only one of --last/--next allowed" msgstr "enbart en av --last eller --next tillåten" -#: cmd_diff_log.cc:913 +#: cmd_diff_log.cc:915 #, c-format msgid "(Revision: %s)" msgstr "(Revision: %s)" -#: cmd_files.cc:27 +#: cmd_files.cc:28 msgid "load file contents into db" msgstr "ladda in filinnehållet i databasen" -#: cmd_files.cc:40 +#: cmd_files.cc:41 msgid " " msgstr " " -#: cmd_files.cc:41 +#: cmd_files.cc:42 msgid "merge 3 files and output result" msgstr "slå ihop 3 filer och skriv ut resultatet" -#: cmd_files.cc:55 +#: cmd_files.cc:56 #, c-format msgid "ancestor file id does not exist" msgstr "förälderns filidentitet finns inte" -#: cmd_files.cc:58 +#: cmd_files.cc:59 #, c-format msgid "left file id does not exist" msgstr "vänster fils identitet finns inte" -#: cmd_files.cc:61 +#: cmd_files.cc:62 #, c-format msgid "right file id does not exist" msgstr "höger fils identitet finns inte" -#: cmd_files.cc:72 +#: cmd_files.cc:73 #, c-format msgid "merge failed" msgstr "ihopslagningen misslyckades" -#: cmd_files.cc:77 +#: cmd_files.cc:78 msgid "SRCNAME DESTNAME SRCID DESTID" msgstr "KÄLLNAMN MÅLNAMN KÄLLID MÅLID" -#: cmd_files.cc:78 +#: cmd_files.cc:79 msgid "diff 2 files and output result" msgstr "skriv ut skillnaden mellan 2 filer" -#: cmd_files.cc:95 +#: cmd_files.cc:96 #, c-format msgid "source file id does not exist" msgstr "källans filidentitet finns inte" -#: cmd_files.cc:98 +#: cmd_files.cc:99 #, c-format msgid "destination file id does not exist" msgstr "målets filidentitet finns inte" -#: cmd_files.cc:113 +#: cmd_files.cc:114 msgid "PATH" msgstr "SÖKVÄG" -#: cmd_files.cc:114 +#: cmd_files.cc:115 msgid "print annotated copy of the file from REVISION" msgstr "skriv ut filen från REVISION med extra detaljer" -#: cmd_files.cc:148 +#: cmd_files.cc:149 #, c-format msgid "" "with no revision selected, this command can only be used in a single-parent " @@ -725,39 +724,39 @@ msgstr "" "detta kommando kan bara användas för arbetskopior med en förälder när ingen " "specifik revision anges" -#: cmd_files.cc:162 +#: cmd_files.cc:163 #, c-format msgid "no revision for file '%s' in database" msgstr "filen '%s' har ingen revision i databasen" -#: cmd_files.cc:171 +#: cmd_files.cc:172 #, c-format msgid "no such file '%s' in revision '%s'" msgstr "filen '%s' finns inte i revisionen '%s'" -#: cmd_files.cc:174 +#: cmd_files.cc:175 #, c-format msgid "'%s' in revision '%s' is not a file" msgstr "'%s' i revisionen '%s' är inte en fil" -#: cmd_files.cc:181 +#: cmd_files.cc:182 msgid "[PATH]" msgstr "[SÖKVÄG]" -#: cmd_files.cc:182 +#: cmd_files.cc:183 msgid "calculate identity of PATH or stdin" msgstr "räkna ut identiteten för SÖKVÄG eller stdin" -#: cmd_files.cc:233 cmd_files.cc:237 +#: cmd_files.cc:234 cmd_files.cc:238 #, c-format msgid "no file '%s' found in revision '%s'" msgstr "filen '%s' finns inte i revisionen '%s'" -#: cmd_files.cc:244 cmd_files.cc:301 +#: cmd_files.cc:245 cmd_files.cc:302 msgid "FILENAME" msgstr "FILNAMN" -#: cmd_files.cc:245 +#: cmd_files.cc:246 msgid "write file from database to stdout" msgstr "skriv ut angiven fil från databasen" @@ -796,42 +795,42 @@ msgstr "Synonym för %s" msgid "Alias for %s" msgstr "Synonym för %s" -#: cmd_key_cert.cc:31 cmd_key_cert.cc:57 cmd_key_cert.cc:97 -#: cmd_key_cert.cc:118 cmd_key_cert.cc:157 cmd_key_cert.cc:174 +#: cmd_key_cert.cc:32 cmd_key_cert.cc:58 cmd_key_cert.cc:98 +#: cmd_key_cert.cc:119 cmd_key_cert.cc:158 cmd_key_cert.cc:174 #: cmd_key_cert.cc:202 msgid "key and cert" msgstr "nyckel och cert" -#: cmd_key_cert.cc:31 cmd_key_cert.cc:57 cmd_key_cert.cc:97 +#: cmd_key_cert.cc:32 cmd_key_cert.cc:58 cmd_key_cert.cc:98 msgid "KEYID" msgstr "NYCKELID" -#: cmd_key_cert.cc:31 +#: cmd_key_cert.cc:32 msgid "generate an RSA key-pair" msgstr "skapa ett RSA-nyckelpar" -#: cmd_key_cert.cc:58 +#: cmd_key_cert.cc:59 msgid "drop a public and private key" msgstr "släng publik och privat nyckel" -#: cmd_key_cert.cc:72 +#: cmd_key_cert.cc:73 #, c-format msgid "dropping public key '%s' from database" msgstr "tar bort den publika nyckeln '%s' ur databasen" -#: cmd_key_cert.cc:82 +#: cmd_key_cert.cc:83 #, c-format msgid "dropping key pair '%s' from keystore" msgstr "tar bort nyckelparet '%s' från nyckellagret" -#: cmd_key_cert.cc:89 +#: cmd_key_cert.cc:90 #, 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\n" "databas" -#: cmd_key_cert.cc:92 +#: cmd_key_cert.cc:93 #, c-format msgid "" "public or private key '%s' does not exist in keystore, and no database was " @@ -840,29 +839,29 @@ msgstr "" "den publika eller privata nyckeln '%s' finns inte i nyckellager och ingen " "databas angavs" -#: cmd_key_cert.cc:98 +#: cmd_key_cert.cc:99 msgid "change passphrase of a private RSA key" msgstr "ändra lösen till en privat RSA-nyckel" -#: cmd_key_cert.cc:108 +#: cmd_key_cert.cc:109 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "nyckeln '%s' finns inte i nyckellagret" -#: cmd_key_cert.cc:115 +#: cmd_key_cert.cc:116 #, c-format msgid "passphrase changed" msgstr "lösen ändrat" -#: cmd_key_cert.cc:119 +#: cmd_key_cert.cc:120 msgid "[FILENAME]" msgstr "[FILNAMN]" -#: cmd_key_cert.cc:120 +#: cmd_key_cert.cc:121 msgid "export your monotone key for use with ssh-agent" msgstr "exportera din monotonenyckel för att användas med ssh-agent" -#: cmd_key_cert.cc:129 cmd_key_cert.cc:168 +#: cmd_key_cert.cc:130 cmd_key_cert.cc:168 #, c-format msgid "the key you specified cannot be found" msgstr "kan inte hitta nyckeln du angav" @@ -915,7 +914,7 @@ msgstr "Opålitligt" msgstr "Opålitligt" #: cmd_key_cert.cc:250 cmd_key_cert.cc:263 cmd_key_cert.cc:276 -#: cmd_key_cert.cc:291 cmd_ws_commit.cc:209 +#: cmd_key_cert.cc:291 cmd_ws_commit.cc:210 msgid "review" msgstr "granskning" @@ -935,7 +934,7 @@ msgstr "notera ett testresultat för en msgid "note the results of running a test on a revision" msgstr "notera ett testresultat för en revision" -#: cmd_key_cert.cc:276 cmd_ws_commit.cc:209 +#: cmd_key_cert.cc:276 cmd_ws_commit.cc:210 msgid "REVISION" msgstr "REVISION" @@ -966,12 +965,12 @@ msgstr "tom kommentar" msgid "empty comment" msgstr "tom kommentar" -#: cmd_list.cc:66 cmd_list.cc:700 +#: cmd_list.cc:67 cmd_list.cc:701 #, c-format msgid "no public key '%s' found in database" msgstr "den publika nyckeln '%s' finns inte i databasen" -#: cmd_list.cc:76 +#: cmd_list.cc:77 #, c-format msgid "" "Key : %s\n" @@ -984,39 +983,39 @@ msgstr "" "Namn : %s\n" "Värde : %s\n" -#: cmd_list.cc:110 +#: cmd_list.cc:111 msgid "ok" msgstr "ok" -#: cmd_list.cc:113 +#: cmd_list.cc:114 msgid "bad" msgstr "felaktig" -#: cmd_list.cc:116 +#: cmd_list.cc:117 msgid "unknown" msgstr "okänd" -#: cmd_list.cc:204 +#: cmd_list.cc:205 #, c-format msgid "(*) - only in %s/" msgstr "(*) - enbart i %s/" -#: cmd_list.cc:228 +#: cmd_list.cc:229 #, c-format msgid "no keys found" msgstr "hittade inga nycklar" -#: cmd_list.cc:230 +#: cmd_list.cc:231 #, c-format msgid "no keys found matching '%s'" msgstr "hittade inga nycklar som matchar '%s'" -#: cmd_list.cc:282 +#: cmd_list.cc:283 #, c-format msgid "no epoch for branch %s" msgstr "ingen epok i grenen %s" -#: cmd_list.cc:479 +#: cmd_list.cc:480 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -1042,7 +1041,7 @@ msgstr "" "missing\n" "changed" -#: cmd_list.cc:490 +#: cmd_list.cc:491 msgid "" "show database objects, or the current workspace manifest, \n" "or known, unknown, intentionally ignored, missing, or \n" @@ -1051,12 +1050,12 @@ msgstr "" "visa databasobjekten, arbetskopians manifest, okända filer, kända \n" "filer, medvetet ignorerade filer, saknade filer eller ändrade filer" -#: cmd_merging.cc:98 +#: cmd_merging.cc:100 #, c-format msgid "target revision is not in current branch" msgstr "denna revision finns inte i den nuvarande grenen" -#: cmd_merging.cc:106 +#: cmd_merging.cc:108 #, c-format msgid "" "target revision is in multiple branches:%s\n" @@ -1067,7 +1066,7 @@ msgstr "" "\n" "försök igen med en explicit --branch" -#: cmd_merging.cc:118 +#: cmd_merging.cc:120 #, c-format msgid "" "target revision not in any branch\n" @@ -1076,14 +1075,14 @@ msgstr "" "denna revision är inte i någon gren\n" "nästa ändring hamnar i grenen %s" -#: cmd_merging.cc:126 cmd_merging.cc:761 cmd_ws_commit.cc:79 -#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:341 -#: cmd_ws_commit.cc:371 cmd_ws_commit.cc:396 cmd_ws_commit.cc:596 -#: cmd_ws_commit.cc:696 +#: cmd_merging.cc:128 cmd_merging.cc:763 cmd_ws_commit.cc:80 +#: cmd_ws_commit.cc:265 cmd_ws_commit.cc:309 cmd_ws_commit.cc:342 +#: cmd_ws_commit.cc:372 cmd_ws_commit.cc:397 cmd_ws_commit.cc:597 +#: cmd_ws_commit.cc:697 msgid "workspace" msgstr "arbetskopia" -#: cmd_merging.cc:127 +#: cmd_merging.cc:129 msgid "" "update workspace.\n" "This command modifies your workspace to be based off of a\n" @@ -1097,17 +1096,17 @@ msgstr "" "Om en revision har angivits så uppdateras arbetskopian till den,\n" "i annat fall uppdateras den till lövet i grenen." -#: cmd_merging.cc:151 +#: cmd_merging.cc:153 #, c-format msgid "this workspace is a new project; cannot update" msgstr "denna arbetskatalog är ett nytt projekt; kan inte uppdatera" -#: cmd_merging.cc:158 +#: cmd_merging.cc:160 #, c-format msgid "updating along branch '%s'" msgstr "uppdaterar längs grenen '%s'" -#: cmd_merging.cc:162 +#: cmd_merging.cc:164 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1118,197 +1117,192 @@ msgstr "" "faktum är att den inte ens matchar nuvarande revision\n" "du kanske vill ange något i stil med --revision=h:%s" -#: cmd_merging.cc:168 +#: cmd_merging.cc:170 #, c-format msgid "multiple update candidates:" msgstr "mer än en uppdateringskandidat:" -#: cmd_merging.cc:172 +#: cmd_merging.cc:174 #, c-format msgid "choose one with '%s update -r'" msgstr "välj en med '%s update -r'" -#: cmd_merging.cc:173 +#: cmd_merging.cc:175 #, c-format msgid "multiple update candidates remain after selection" msgstr "mer än en kandidat är kvar efter urval" -#: cmd_merging.cc:192 +#: cmd_merging.cc:194 #, c-format msgid "already up to date at %s" msgstr "redan uppdaterad till %s" -#: cmd_merging.cc:200 +#: cmd_merging.cc:202 #, c-format msgid "selected update target %s" msgstr "valt uppdateringsmål är %s" -#: cmd_merging.cc:206 +#: cmd_merging.cc:208 #, c-format msgid "switching to branch %s" msgstr "byter gren till %s" -#: cmd_merging.cc:274 +#: cmd_merging.cc:276 #, c-format msgid "switched branch; next commit will use branch %s" msgstr "byter gren; nästa ändring kommer att använda grenen %s" -#: cmd_merging.cc:275 +#: cmd_merging.cc:277 #, c-format msgid "updated to base revision %s" msgstr "uppdaterad till revisionen %s" -#: cmd_merging.cc:310 +#: cmd_merging.cc:312 #, c-format msgid "[left] %s" msgstr "[vänster] %s" -#: cmd_merging.cc:311 +#: cmd_merging.cc:313 #, c-format msgid "[right] %s" msgstr "[höger] %s" -#: cmd_merging.cc:324 cmd_merging.cc:597 +#: cmd_merging.cc:326 cmd_merging.cc:599 #, c-format msgid "[merged] %s" msgstr "[ihopslagen] %s" -#: cmd_merging.cc:331 cmd_merging.cc:430 cmd_merging.cc:441 cmd_merging.cc:601 -#: cmd_merging.cc:694 cmd_merging.cc:930 cmd_ws_commit.cc:487 -#: cmd_ws_commit.cc:948 cmd_ws_commit.cc:971 cmd_ws_commit.cc:1071 -#: cmd_ws_commit.cc:1085 +#: cmd_merging.cc:333 cmd_merging.cc:432 cmd_merging.cc:443 cmd_merging.cc:603 +#: cmd_merging.cc:696 cmd_merging.cc:932 cmd_ws_commit.cc:488 +#: cmd_ws_commit.cc:949 cmd_ws_commit.cc:972 cmd_ws_commit.cc:1072 +#: cmd_ws_commit.cc:1086 msgid "tree" msgstr "träd" -#: cmd_merging.cc:331 +#: cmd_merging.cc:333 msgid "merge unmerged heads of branch" msgstr "slå ihop ej ihopslagna löv i grenen" -#: cmd_merging.cc:341 cmd_merging.cc:938 +#: cmd_merging.cc:343 cmd_merging.cc:940 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "var god ange en gren med --branch=GREN" -#: cmd_merging.cc:346 cmd_merging.cc:480 cmd_merging.cc:483 cmd_merging.cc:943 -#: cmd_netsync.cc:289 cmd_ws_commit.cc:511 +#: cmd_merging.cc:348 cmd_merging.cc:482 cmd_merging.cc:485 cmd_merging.cc:945 +#: cmd_netsync.cc:300 cmd_ws_commit.cc:512 #, c-format msgid "branch '%s' is empty" msgstr "grenen '%s' är tom" -#: cmd_merging.cc:349 +#: cmd_merging.cc:351 #, c-format msgid "branch '%s' is already merged" msgstr "löven i grenen '%s' är redan ihopslagna" -#: cmd_merging.cc:353 +#: cmd_merging.cc:355 #, c-format msgid "%d head on branch '%s'" msgid_plural "%d heads on branch '%s'" msgstr[0] "%d löv i grenen '%s'" msgstr[1] "%d löv i grenen '%s'" -#: cmd_merging.cc:374 cmd_merging.cc:419 +#: cmd_merging.cc:376 cmd_merging.cc:421 #, c-format msgid "merge %d / %d:" msgstr "slår ihop %d / %d:" -#: cmd_merging.cc:375 +#: cmd_merging.cc:377 #, c-format msgid "calculating best pair of heads to merge next" msgstr "räknar ut vilket par som är bäst att slå ihop härnäst" -#: cmd_merging.cc:427 +#: cmd_merging.cc:429 #, c-format msgid "note: your workspaces have not been updated" msgstr "obs: dina arbetskopior har inte uppdaterats" -#: cmd_merging.cc:430 +#: cmd_merging.cc:432 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "KÄLLGREN MÅLGREN" -#: cmd_merging.cc:431 +#: cmd_merging.cc:433 msgid "merge from one branch to another asymmetrically" msgstr "slå ihop asymmetriskt från en gren till en annan" -#: cmd_merging.cc:441 +#: cmd_merging.cc:443 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "KÄLLGREN MÅLGREN KATALOG" -#: cmd_merging.cc:442 +#: cmd_merging.cc:444 msgid "merge one branch into a subdirectory in another branch" msgstr "slå ihop en gren till en underkatalog i en annan gren" -#: cmd_merging.cc:481 cmd_merging.cc:484 +#: cmd_merging.cc:483 cmd_merging.cc:486 #, c-format msgid "branch '%s' is not merged" msgstr "löven i grenen '%s' är inte ihopslagna" -#: cmd_merging.cc:489 +#: cmd_merging.cc:491 #, c-format msgid "propagating %s -> %s" msgstr "propagerar %s -> %s" -#: cmd_merging.cc:490 +#: cmd_merging.cc:492 #, c-format msgid "[source] %s" msgstr "[källa] %s" -#: cmd_merging.cc:491 +#: cmd_merging.cc:493 #, c-format msgid "[target] %s" msgstr "[mål] %s" -#: cmd_merging.cc:496 +#: cmd_merging.cc:498 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'" msgstr "grenen '%s' är uppdaterad med avseende på grenen '%s'" -#: cmd_merging.cc:498 +#: cmd_merging.cc:500 #, c-format msgid "no action taken" msgstr "inget utfördes" -#: cmd_merging.cc:502 +#: cmd_merging.cc:504 #, c-format msgid "no merge necessary; putting %s in branch '%s'" msgstr "ingen ihopslagning behövs; sätter %s i grenen '%s'" -#: cmd_merging.cc:542 +#: cmd_merging.cc:544 #, c-format msgid "Path %s not found in destination tree." msgstr "Sökvägen %s finns inte i målträdet." -#: cmd_merging.cc:602 +#: cmd_merging.cc:604 msgid "OTHER-REVISION" msgstr "ANNAN-REVISION" -#: cmd_merging.cc:603 +#: cmd_merging.cc:605 msgid "" "Merge OTHER-REVISION into the current workspace's base revision, and update " "the current workspace with the result. There can be no pending changes in " "the current workspace. Both OTHER-REVISION and the workspace's base " -"revision will be recorded as parents on commit. The workspace's selected " +"revision will be recorded as parents on commit. The workspace's selected " "branch is not changed." -msgstr "" -"slå ihop ANNAN-REVISION med denna arbetskopias grundrevision och uppdatera " -"denna arbetskopia med resultatet. Det får inte finnas några ej arkiverade " -"förändringar i denna arbetskopia. När arkivering görs kommer både ANNAN-" -"REVISION och arbetskopians grundrevision att anges som föräldrar till den ny " -"revisionen. Arbetskopians gren kommer inte att ändras." +msgstr "slå ihop ANNAN-REVISION med denna arbetskopias grundrevision och uppdatera denna arbetskopia med resultatet. Det får inte finnas några ej arkiverade förändringar i denna arbetskopia. När arkivering görs kommer både ANNAN-REVISION och arbetskopians grundrevision att anges som föräldrar till den ny revisionen. Arbetskopians gren kommer inte att ändras." -#: cmd_merging.cc:634 +#: cmd_merging.cc:636 #, c-format msgid "'%s' can only be used in a workspace with no pending changes" msgstr "" "'%s' kan enbart användas i en arbetskopia där alla gjorda ändringar har " "arkiverats" -#: cmd_merging.cc:642 +#: cmd_merging.cc:644 #, c-format msgid "workspace is already at revision %s" msgstr "arbetskopian är redan uppdaterad till revision %s" -#: cmd_merging.cc:689 +#: cmd_merging.cc:691 #, c-format msgid "" "updated to result of merge\n" @@ -1319,75 +1313,75 @@ msgstr "" "[vänster] %s\n" "[ höger] %s\n" -#: cmd_merging.cc:695 +#: cmd_merging.cc:697 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VÄNSTERREVISION HÖGERREVISION MÅLGREN" -#: cmd_merging.cc:696 +#: cmd_merging.cc:698 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" "slå ihop två explicit angivna revisioner, placera resultatet i angiven gren" -#: cmd_merging.cc:711 +#: cmd_merging.cc:713 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s och %s är samma revision, avbryter" -#: cmd_merging.cc:713 cmd_merging.cc:715 +#: cmd_merging.cc:715 cmd_merging.cc:717 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s är redan förfader till %s" -#: cmd_merging.cc:720 +#: cmd_merging.cc:722 msgid "REV REV" msgstr "REV REV" -#: cmd_merging.cc:721 +#: cmd_merging.cc:723 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." -#: cmd_merging.cc:731 cmd_merging.cc:733 +#: cmd_merging.cc:733 cmd_merging.cc:735 #, 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." -#: cmd_merging.cc:747 +#: cmd_merging.cc:749 #, c-format msgid "There are %s node_name_conflicts." msgstr "Det finns %s node_name-konflikter." -#: cmd_merging.cc:749 +#: cmd_merging.cc:751 #, c-format msgid "There are %s file_content_conflicts." msgstr "Det finns %s file_content-konflikter." -#: cmd_merging.cc:751 +#: cmd_merging.cc:753 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Det finns %s node_attr-konflikter." -#: cmd_merging.cc:753 +#: cmd_merging.cc:755 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Det finns %s orphaned_node-konflikter." -#: cmd_merging.cc:755 +#: cmd_merging.cc:757 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Det finns %s rename_target-konflikter." -#: cmd_merging.cc:757 +#: cmd_merging.cc:759 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Det finns %s directory_loop-konflikter." -#: cmd_merging.cc:761 +#: cmd_merging.cc:763 msgid "[-r FROM] -r TO [PATH...]" msgstr "[-r FRÅN] -r TILL [SÖKVÄG...]" -#: cmd_merging.cc:762 +#: cmd_merging.cc:764 msgid "" "Apply changes made at arbitrary places in history to current workspace.\n" "This command takes changes made at any point in history, and\n" @@ -1415,7 +1409,7 @@ msgstr "" "Om två revisioner har givits utförs alla ändringar som gjorts för att\n" "komma från den första till den andra." -#: cmd_merging.cc:787 +#: cmd_merging.cc:789 #, c-format msgid "" "revision %s is a merge\n" @@ -1426,41 +1420,41 @@ msgstr "" "för att utföra ändringarna relativt en av dess föräldrar, gör så här:\n" " %s pluck -r FÖRÄLDER -r %s" -#: cmd_merging.cc:808 +#: cmd_merging.cc:810 #, c-format msgid "no changes to apply" msgstr "inga ändringar att utföra" -#: cmd_merging.cc:865 +#: cmd_merging.cc:867 #, c-format msgid "no changes to be applied" msgstr "inga ändringar att utföra" -#: cmd_merging.cc:895 +#: cmd_merging.cc:897 #, c-format msgid "no changes were applied" msgstr "inga ändringar blev utförda" -#: cmd_merging.cc:898 +#: cmd_merging.cc:900 #, c-format msgid "applied changes to workspace" msgstr "utförde ändringarna i arbetskopian" -#: cmd_merging.cc:930 +#: cmd_merging.cc:932 msgid "show unmerged head revisions of branch" msgstr "visa ej ihopslagna lövrevisioner i grenen" -#: cmd_merging.cc:945 +#: cmd_merging.cc:947 #, c-format msgid "branch '%s' is currently merged:" msgstr "grenen '%s' har för tillfället ett löv:" -#: cmd_merging.cc:947 +#: cmd_merging.cc:949 #, c-format msgid "branch '%s' is currently unmerged:" msgstr "grenen '%s' har för tillfället mer än ett löv:" -#: cmd_merging.cc:955 +#: cmd_merging.cc:957 msgid "" "dump the roster associated with the given REVID, or the workspace if no " "REVID is given" @@ -1468,7 +1462,7 @@ msgstr "" "skriv ut den lista som hör ihop med angivet REVID, eller arbetskopian om " "REVID inte angavs" -#: cmd_netsync.cc:43 cmd_netsync.cc:237 +#: cmd_netsync.cc:43 cmd_netsync.cc:248 #, c-format msgid "setting default server to %s" msgstr "sätter standardserver till %s" @@ -1483,12 +1477,12 @@ msgstr "inget grenmönster angivet" msgid "no branch pattern given" msgstr "inget grenmönster angivet" -#: cmd_netsync.cc:95 cmd_netsync.cc:248 +#: cmd_netsync.cc:95 cmd_netsync.cc:259 #, c-format msgid "setting default branch include pattern to '%s'" msgstr "sätter standardmönstret för grenar att ta med till '%s'" -#: cmd_netsync.cc:101 cmd_netsync.cc:261 +#: cmd_netsync.cc:101 cmd_netsync.cc:272 #, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "sätter standardmönstret för grenar att INTE ta med till '%s'" @@ -1498,8 +1492,8 @@ msgstr "inget grenmönster angivet och i msgid "no branch pattern given and no default pattern set" msgstr "inget grenmönster angivet och inget standardmönster satt" -#: cmd_netsync.cc:124 cmd_netsync.cc:139 cmd_netsync.cc:155 cmd_netsync.cc:188 -#: cmd_netsync.cc:373 +#: cmd_netsync.cc:124 cmd_netsync.cc:139 cmd_netsync.cc:155 cmd_netsync.cc:197 +#: cmd_netsync.cc:384 msgid "network" msgstr "nätverk" @@ -1515,7 +1509,7 @@ msgstr "hämta grenar som matchar MÖNST 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:149 cmd_netsync.cc:242 +#: cmd_netsync.cc:149 cmd_netsync.cc:253 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication" msgstr "hämtar anonymt; använd -kNYCKELNAMN om du behöver autentisera" @@ -1524,11 +1518,11 @@ msgstr "synkronisera grenar som matchar 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:188 +#: cmd_netsync.cc:197 msgid "ADDRESS[:PORTNUMBER] [DIRECTORY]" msgstr "ADRESS[:PORTNUMMER] [KATALOG]" -#: cmd_netsync.cc:189 +#: cmd_netsync.cc:198 msgid "" "check out a revision from remote database into directory.\n" "If a revision is given, that's the one that will be checked out.\n" @@ -1540,56 +1534,56 @@ msgstr "" "anges kommer lövet i grenen (implicit eller angiven) att hämtas. Om\n" "ingen katalog anges kommer grenens namn att användas som katalognamn." -#: cmd_netsync.cc:203 +#: cmd_netsync.cc:212 #, c-format msgid "you must specify a branch to clone" msgstr "du måste ange en gren som ska klonas" -#: cmd_netsync.cc:217 +#: cmd_netsync.cc:226 #, c-format msgid "clone destination directory '%s' already exists" msgstr "klonarbetskatalogen '%s' finns redan" -#: cmd_netsync.cc:284 cmd_ws_commit.cc:506 cmd_ws_commit.cc:1004 +#: cmd_netsync.cc:295 cmd_ws_commit.cc:507 cmd_ws_commit.cc:1005 #, c-format msgid "use --revision or --branch to specify what to checkout" msgstr "använd --revision eller --branch för att tala om vad som ska hämtas" -#: cmd_netsync.cc:292 cmd_ws_commit.cc:514 cmd_ws_commit.cc:1010 +#: cmd_netsync.cc:303 cmd_ws_commit.cc:515 cmd_ws_commit.cc:1011 #, c-format msgid "branch %s has multiple heads:" msgstr "grenen %s har flera löv:" -#: cmd_netsync.cc:295 cmd_ws_commit.cc:517 cmd_ws_commit.cc:1013 +#: cmd_netsync.cc:306 cmd_ws_commit.cc:518 cmd_ws_commit.cc:1014 #, c-format msgid "choose one with '%s checkout -r'" msgstr "välj ett med '%s update -r'" -#: cmd_netsync.cc:296 cmd_ws_commit.cc:518 cmd_ws_commit.cc:1014 +#: cmd_netsync.cc:307 cmd_ws_commit.cc:519 cmd_ws_commit.cc:1015 #, c-format msgid "branch %s has multiple heads" msgstr "grenen %s har flera löv" -#: cmd_netsync.cc:312 cmd_ws_commit.cc:534 cmd_ws_commit.cc:997 +#: cmd_netsync.cc:323 cmd_ws_commit.cc:535 cmd_ws_commit.cc:998 #, c-format msgid "revision %s is not a member of branch %s" msgstr "revisionen %s är inte med i grenen %s" -#: cmd_netsync.cc:349 +#: cmd_netsync.cc:360 #, c-format msgid "pid file '%s' already exists" msgstr "pid-filen '%s' finns redan" -#: cmd_netsync.cc:351 +#: cmd_netsync.cc:362 #, c-format msgid "failed to create pid file '%s'" msgstr "misslyckades med att skapa pid-filen %s" -#: cmd_netsync.cc:374 +#: cmd_netsync.cc:385 msgid "serve the database to connecting clients" msgstr "servera databasen till anslutande klienter" -#: cmd_netsync.cc:390 +#: cmd_netsync.cc:401 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1597,7 +1591,7 @@ msgstr "" "behöver tillstånd att använda ett permanent lösenord (se lua-" "rutinenpersist_phrase_ok())" -#: cmd_netsync.cc:396 +#: cmd_netsync.cc:407 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1629,60 +1623,60 @@ msgstr "importera alla revisioner i ett msgid "import all versions in CVS repository" msgstr "importera alla revisioner i ett CVS-arkiv" -#: cmd_packet.cc:20 cmd_packet.cc:49 cmd_packet.cc:68 +#: cmd_packet.cc:21 cmd_packet.cc:50 cmd_packet.cc:69 msgid "packet i/o" msgstr "paket-I/O" -#: cmd_packet.cc:20 cmd_packet.cc:49 +#: cmd_packet.cc:21 cmd_packet.cc:50 msgid "ID" msgstr "ID" -#: cmd_packet.cc:21 +#: cmd_packet.cc:22 msgid "write public key packet to stdout" msgstr "skriv it datapaket för publik nyckel till stdout" -#: cmd_packet.cc:43 +#: cmd_packet.cc:44 #, c-format msgid "public key '%s' does not exist" msgstr "den publika nyckeln '%s' finns inte" -#: cmd_packet.cc:50 +#: cmd_packet.cc:51 msgid "write private key packet to stdout" msgstr "skriv it datapaket för privat nyckel till stdout" -#: cmd_packet.cc:58 +#: cmd_packet.cc:59 #, 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:69 +#: cmd_packet.cc:70 msgid "read packets from files or stdin" msgstr "läs paket från filer eller stdin" -#: cmd_packet.cc:77 +#: cmd_packet.cc:78 #, c-format msgid "no packets found on stdin" msgstr "inga paket hittade i stdin" -#: cmd_packet.cc:89 +#: cmd_packet.cc:90 #, 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:93 +#: cmd_packet.cc:94 #, 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:43 +#: cmd_ws_commit.cc:44 msgid "*****DELETE THIS LINE TO CONFIRM YOUR COMMIT*****" msgstr "*****TA BORT DENNA RAD FÖR ATT BEKRÄFTA DIN ARKIVERING*****" -#: cmd_ws_commit.cc:46 +#: cmd_ws_commit.cc:47 msgid "" "Enter a description of this change.\n" "Lines beginning with `MTN:' are removed automatically." @@ -1690,86 +1684,86 @@ msgstr "" "Mata in en beskrivning av denna ändring.\n" "Rader som börjar med 'MTN:' kommer att tas bort automatiskt." -#: cmd_ws_commit.cc:71 +#: cmd_ws_commit.cc:72 #, c-format msgid "edit of log message failed" msgstr "redigering av loggmeddelandet misslyckades" -#: cmd_ws_commit.cc:74 +#: cmd_ws_commit.cc:75 #, c-format msgid "failed to remove magic line; commit cancelled" msgstr "den magiska raden är inte borttagen; arkivering avbryts" -#: cmd_ws_commit.cc:80 +#: cmd_ws_commit.cc:81 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")" -#: cmd_ws_commit.cc:87 +#: cmd_ws_commit.cc:88 #, c-format msgid "you must pass at least one path to 'revert' (perhaps '.')" msgstr "du måste ange minst en sökväg till 'revert' (kanske '.')" -#: cmd_ws_commit.cc:117 +#: cmd_ws_commit.cc:118 #, c-format msgid "no missing files to revert" msgstr "inga saknade filer att återställa" -#: cmd_ws_commit.cc:172 +#: cmd_ws_commit.cc:173 #, c-format msgid "reverting %s" msgstr "återställer %s" -#: cmd_ws_commit.cc:176 +#: cmd_ws_commit.cc:177 #, c-format msgid "no file version %s found in database for %s" msgstr "filversionen %s finns inte i databasen för %s" -#: cmd_ws_commit.cc:189 +#: cmd_ws_commit.cc:190 #, c-format msgid "recreating %s/" msgstr "återställer %s/" -#: cmd_ws_commit.cc:210 +#: cmd_ws_commit.cc:211 msgid "disapprove of a particular revision" msgstr "underkänn en specifik revision" -#: cmd_ws_commit.cc:226 +#: cmd_ws_commit.cc:227 #, c-format msgid "revision %s has %d changesets, cannot invert" msgstr "revisionen '%s' har %d föräldrar, kan inte invertera" -#: cmd_ws_commit.cc:229 +#: cmd_ws_commit.cc:230 #, c-format msgid "need --branch argument for disapproval" msgstr "för underkännande behöver en gren anges med --branch" -#: cmd_ws_commit.cc:264 +#: cmd_ws_commit.cc:265 msgid "[DIRECTORY...]" msgstr "[KATALOG...]" -#: cmd_ws_commit.cc:265 +#: cmd_ws_commit.cc:266 msgid "create one or more directories and add them to the workspace" msgstr "skapa en eller flera kataloger och lägg till dem i arbetskopian" -#: cmd_ws_commit.cc:285 +#: cmd_ws_commit.cc:286 #, c-format msgid "directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: cmd_ws_commit.cc:292 +#: cmd_ws_commit.cc:293 #, c-format msgid "ignoring directory '%s' [see .mtn-ignore]" msgstr "ignorerar katalogen '%s' [se .mtn-ignore]" -#: cmd_ws_commit.cc:309 +#: cmd_ws_commit.cc:310 msgid "add files to workspace" msgstr "lägg till filer i arbetskopian" -#: cmd_ws_commit.cc:342 +#: cmd_ws_commit.cc:343 msgid "drop files from workspace" msgstr "överge filer i arbetskopian" -#: cmd_ws_commit.cc:372 +#: cmd_ws_commit.cc:373 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1777,15 +1771,15 @@ msgstr "" "KÄLLA MÅL\n" "KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG" -#: cmd_ws_commit.cc:374 +#: cmd_ws_commit.cc:375 msgid "rename entries in the workspace" msgstr "byt namn på filer i arbetskopian" -#: cmd_ws_commit.cc:396 +#: cmd_ws_commit.cc:397 msgid "NEW_ROOT PUT_OLD" msgstr "NY_ROT PLACERA_GAMLA" -#: cmd_ws_commit.cc:397 +#: cmd_ws_commit.cc:398 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1799,31 +1793,31 @@ msgstr "" "PLACERA_GAMLA.\n" "Det är INTE rekommenderat att använda --bookkeep-only." -#: cmd_ws_commit.cc:415 +#: cmd_ws_commit.cc:416 msgid "show status of workspace" msgstr "visa arbetskopians status" -#: cmd_ws_commit.cc:438 +#: cmd_ws_commit.cc:439 #, c-format msgid "Current branch: %s" msgstr "Nuvarande gren: %s" -#: cmd_ws_commit.cc:444 +#: cmd_ws_commit.cc:445 #, c-format msgid "Changes against parent %s" msgstr "Förändringar gentemot föräldern %s" -#: cmd_ws_commit.cc:449 +#: cmd_ws_commit.cc:450 #, c-format msgid " no changes" msgstr " inga ändringar" -#: cmd_ws_commit.cc:453 +#: cmd_ws_commit.cc:454 #, c-format msgid " dropped %s" msgstr " slängde %s" -#: cmd_ws_commit.cc:458 +#: cmd_ws_commit.cc:459 #, c-format msgid "" " renamed %s\n" @@ -1832,17 +1826,17 @@ msgstr "" " bytte namn på %s\n" " till %s" -#: cmd_ws_commit.cc:463 cmd_ws_commit.cc:467 +#: cmd_ws_commit.cc:464 cmd_ws_commit.cc:468 #, c-format msgid " added %s" msgstr " la till %s" -#: cmd_ws_commit.cc:471 +#: cmd_ws_commit.cc:472 #, c-format msgid " patched %s" msgstr " ändrade %s" -#: cmd_ws_commit.cc:475 +#: cmd_ws_commit.cc:476 #, c-format msgid "" " set on %s\n" @@ -1851,7 +1845,7 @@ msgstr "" " slog på på %s\n" " attr %s" -#: cmd_ws_commit.cc:481 +#: cmd_ws_commit.cc:482 #, c-format msgid "" " unset on %s\n" @@ -1860,11 +1854,11 @@ msgstr "" " slog av på %s\n" " attr %s" -#: cmd_ws_commit.cc:487 cmd_ws_commit.cc:948 cmd_ws_commit.cc:1071 +#: cmd_ws_commit.cc:488 cmd_ws_commit.cc:949 cmd_ws_commit.cc:1072 msgid "[DIRECTORY]" msgstr "[KATALOG]" -#: cmd_ws_commit.cc:488 +#: cmd_ws_commit.cc:489 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" @@ -1876,17 +1870,17 @@ msgstr "" "kommer lövet i grenen (implicit eller angiven) att hämtas. Om\n" "ingen katalog anges kommer grenens namn att användas som katalognamn." -#: cmd_ws_commit.cc:551 +#: cmd_ws_commit.cc:552 #, c-format msgid "you must specify a destination directory" msgstr "du måste ange en målkatalog" -#: cmd_ws_commit.cc:564 +#: cmd_ws_commit.cc:565 #, c-format msgid "checkout directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: cmd_ws_commit.cc:596 +#: cmd_ws_commit.cc:597 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1896,40 +1890,40 @@ msgstr "" "get SÖKVÄG [ATTR]\n" "drop SÖKVÄG [ATTR]" -#: cmd_ws_commit.cc:597 +#: cmd_ws_commit.cc:598 msgid "set, get or drop file attributes" msgstr "sätt, hämta eller ta bort attribut" -#: cmd_ws_commit.cc:613 +#: cmd_ws_commit.cc:614 #, c-format msgid "Unknown path '%s'" msgstr "Okänd sökväg '%s'" -#: cmd_ws_commit.cc:642 +#: cmd_ws_commit.cc:643 #, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "Sökvägen '%s' har inget attribut '%s'" -#: cmd_ws_commit.cc:673 +#: cmd_ws_commit.cc:674 #, c-format msgid "No attributes for '%s'" msgstr "Inga attribut till '%s'" -#: cmd_ws_commit.cc:684 +#: cmd_ws_commit.cc:685 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Inget attribut '%s' för sökvägen '%s'" -#: cmd_ws_commit.cc:697 +#: cmd_ws_commit.cc:698 msgid "commit workspace to database" msgstr "arkivera arbetskopian i databasen" -#: cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:732 #, c-format msgid "no changes to commit" msgstr "inga ändringar att arkivera" -#: cmd_ws_commit.cc:748 +#: cmd_ws_commit.cc:749 #, c-format msgid "" "parent revisions of this commit are in different branches:\n" @@ -1940,12 +1934,12 @@ msgstr "" "'%s' och '%s'.\n" "var god ange en gren för denna arkivering med --branch." -#: cmd_ws_commit.cc:759 +#: cmd_ws_commit.cc:760 #, c-format msgid "beginning commit on branch '%s'" msgstr "börjar arkivering av ändringar i grenen '%s'" -#: cmd_ws_commit.cc:768 +#: cmd_ws_commit.cc:769 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1956,37 +1950,37 @@ msgstr "" "kanske ta bort eller flytta på _MTN/log\n" "eller ta bort --message/--message-file från kommandoraden?" -#: cmd_ws_commit.cc:783 +#: cmd_ws_commit.cc:784 #, c-format msgid "empty log message; commit canceled" msgstr "tomt loggmeddelande; arkivering avbryts" -#: cmd_ws_commit.cc:805 +#: cmd_ws_commit.cc:806 #, c-format msgid "log message rejected by hook: %s" msgstr "loggmeddelandet förkastas: %s" -#: cmd_ws_commit.cc:817 +#: cmd_ws_commit.cc:818 #, c-format msgid "revision %s already in database" msgstr "revisionen %s finns redan i databasen" -#: cmd_ws_commit.cc:854 cmd_ws_commit.cc:884 +#: cmd_ws_commit.cc:855 cmd_ws_commit.cc:885 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "filen '%s' ändrades under arkivering, avbryter" -#: cmd_ws_commit.cc:866 +#: cmd_ws_commit.cc:867 #, 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:909 +#: cmd_ws_commit.cc:910 #, c-format msgid "committed revision %s" msgstr "arkiverade revisionen %s" -#: cmd_ws_commit.cc:915 +#: cmd_ws_commit.cc:916 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1995,39 +1989,39 @@ 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:949 +#: cmd_ws_commit.cc:950 msgid "setup a new workspace directory, default to current" msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)" -#: cmd_ws_commit.cc:955 +#: cmd_ws_commit.cc:956 #, c-format msgid "need --branch argument for setup" msgstr "du måste ange en gren med --branch till kommandot \"setup\"" -#: cmd_ws_commit.cc:971 +#: cmd_ws_commit.cc:972 msgid "DIRECTORY" msgstr "KATALOG" -#: cmd_ws_commit.cc:972 +#: cmd_ws_commit.cc:973 msgid "import the contents of the given directory tree into a given branch" msgstr "importera den givna katalogens innehåll till den givna grenen" -#: cmd_ws_commit.cc:983 +#: cmd_ws_commit.cc:984 #, c-format msgid "you must specify a directory to import" msgstr "du måste ange en katalog att importera" -#: cmd_ws_commit.cc:1023 +#: cmd_ws_commit.cc:1024 #, c-format msgid "import directory '%s' doesn't exists" msgstr "importkatalogen '%s' finns inte" -#: cmd_ws_commit.cc:1024 +#: cmd_ws_commit.cc:1025 #, c-format msgid "import directory '%s' is a file" msgstr "importkatalogen '%s' är en fil" -#: cmd_ws_commit.cc:1072 +#: cmd_ws_commit.cc:1073 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" @@ -2035,57 +2029,57 @@ msgstr "" "migrera en arbetskopias metadata till det senaste formatet; nuvarande " "katalog avses om inget annat anges" -#: cmd_ws_commit.cc:1085 +#: cmd_ws_commit.cc:1086 msgid "refresh the inodeprint cache" msgstr "uppdatera inodeprint-cachen" -#: commands.cc:139 commands.cc:241 +#: commands.cc:140 commands.cc:242 #, c-format msgid "unknown command '%s'" msgstr "okänt kommando '%s'" -#: commands.cc:150 +#: commands.cc:151 #, c-format msgid "command '%s' has multiple ambiguous expansions:" msgstr "kommandot '%s' har mer än en betydelse:" -#: commands.cc:183 +#: commands.cc:184 msgid "commands:" msgstr "kommandon:" -#: commands.cc:275 +#: commands.cc:276 msgid "command [ARGS...]" msgstr "kommandon [ARGUMENT...]" -#: commands.cc:276 +#: commands.cc:277 msgid "display command help" msgstr "skriv ut hjälptext" -#: commands.cc:418 +#: commands.cc:419 #, c-format msgid "expanding selection '%s'" msgstr "expanderar valet '%s'" -#: commands.cc:426 +#: commands.cc:427 #, c-format msgid "no match for selection '%s'" msgstr "det finns inget som matchar '%s'" -#: commands.cc:433 +#: commands.cc:434 #, c-format msgid "expanded to '%s'" msgstr "expanderar till '%s'" -#: commands.cc:450 +#: commands.cc:451 #, c-format msgid "selection '%s' has multiple ambiguous expansions:" msgstr "valet '%s' har mer än en möjlig betydelse:" -#: commands.cc:467 +#: commands.cc:468 msgid "note: " msgstr "obs: " -#: commands.cc:468 +#: commands.cc:469 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -2094,7 +2088,7 @@ msgstr "" "grenen '%s' har mer än ett löv\n" "du kanske borde överväga '%s merge'" -#: commands.cc:483 +#: commands.cc:484 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message och --message-file får inte anges samtidigt" @@ -2877,17 +2871,17 @@ msgstr "nodens kontrollsumma %s stämmer msgid "mismatched node hash value %s, expected %s" msgstr "nodens kontrollsumma %s stämmer inte, %s förväntad" -#: monotone.cc:272 +#: monotone.cc:273 #, c-format msgid "Usage: %s [OPTION...] command [ARG...]" msgstr "Användning: %s [FLAGGOR...] kommando [ARGUMENT...]" -#: monotone.cc:280 +#: monotone.cc:281 #, c-format msgid "Options specific to '%s %s':" msgstr "Specifika flaggor för '%s %s':" -#: monotone.cc:304 +#: monotone.cc:305 msgid "error: memory exhausted" msgstr "fel: slut på minnet" @@ -3400,7 +3394,7 @@ msgstr "blockstorlek för utdata från \ msgid "block size in bytes for \"automate stdio\" output" msgstr "blockstorlek för utdata från \"automate stdio\", i antal byte" -#: options_list.hh:32 options_list.hh:325 options_list.hh:368 +#: options_list.hh:32 options_list.hh:318 options_list.hh:361 #, c-format msgid "cannot be zero or negative" msgstr "får ej vara noll eller negativt" @@ -3433,69 +3427,69 @@ msgstr "ange annat datum och tid för ä msgid "override date/time for commit" msgstr "ange annat datum och tid för ändringarna" -#: options_list.hh:143 +#: options_list.hh:136 msgid "set name of database" msgstr "ange databasens filnamn" -#: options_list.hh:151 +#: options_list.hh:144 msgid "print debug log to stderr while running" msgstr "skriv ut felsökningslogg till stderr under körning" -#: options_list.hh:159 +#: options_list.hh:152 msgid "limit the number of levels of directories to descend" msgstr "begränsa hur djupt i katalogstrukturen monotone ska gå ned" -#: options_list.hh:164 +#: options_list.hh:157 #, c-format msgid "cannot be negative" msgstr "kan inte ha negativa värden" -#: options_list.hh:173 +#: options_list.hh:166 msgid "argument to pass external diff hook" msgstr "argument att skicka med till extern diff" -#: options_list.hh:182 +#: options_list.hh:175 msgid "use context diff format" msgstr "använd formatet 'context diff'" -#: options_list.hh:189 +#: options_list.hh:182 msgid "use external diff hook for generating diffs" msgstr "använd extern diff för att framställa skillnad mellan revisioner" -#: options_list.hh:196 +#: options_list.hh:189 msgid "use unified diff format" msgstr "använd formatet 'unified diff'" -#: options_list.hh:204 +#: options_list.hh:197 msgid "do not show the function containing each block of changes" msgstr "visa inte funktionen som innehåller varje ändringsstycke" -#: options_list.hh:211 +#: options_list.hh:204 msgid "print diffs along with logs" msgstr "skriv ut skillnaden mellan denna och tidigare revision i loggen" -#: options_list.hh:220 +#: options_list.hh:213 msgid "when rosterifying, drop attrs entries with the given key" msgstr "släng attribut med den givna nyckeln vid konvertering till listor" -#: options_list.hh:228 +#: options_list.hh:221 msgid "don't perform the operation, just show what would have happened" msgstr "utför inte operationen, visa bara vad som skulle ha hänt" -#: options_list.hh:236 +#: options_list.hh:229 msgid "file to dump debugging log to, on failure" msgstr "fil att skriva ut felsökningsloggen till om något gick fel" -#: options_list.hh:245 +#: options_list.hh:238 msgid "leave out anything described by its argument" msgstr "utelämna allt som matchar argumentet" -#: options_list.hh:253 +#: options_list.hh:246 msgid "only update monotone's internal bookkeeping, not the filesystem" msgstr "" "uppdatera enbart monotones interna administration, inte arbetskopian i övrigt" -#: options_list.hh:261 +#: options_list.hh:254 msgid "" "sign with ssh-agent, 'yes' to sign with ssh if key found, 'no' to force " "monotone to sign, 'check' to sign with both and compare" @@ -3504,141 +3498,141 @@ msgstr "" "för att tvinga monotone att signera, 'check' för att signera med båda och " "jämföra" -#: options_list.hh:269 +#: options_list.hh:262 msgid "print detailed version number, then exit" msgstr "skriv ut detaljerad versionsinformation och avsluta sedan omedelbart" -#: options_list.hh:276 +#: options_list.hh:269 msgid "display help message" msgstr "skriv ut extra hjälptext" -#: options_list.hh:285 +#: options_list.hh:278 msgid "include anything described by its argument" msgstr "ta med allt allt som matchar argumentet" -#: options_list.hh:293 +#: options_list.hh:286 msgid "set key for signatures" msgstr "ange nyckel att signera med" -#: options_list.hh:301 +#: options_list.hh:294 msgid "set location of key store" msgstr "ange i vilken katalog nycklarna finns" -#: options_list.hh:310 +#: options_list.hh:303 msgid "push the specified key even if it hasn't signed anything" msgstr "skicka med angiven nyckel även om den inte använts för att signera" -#: options_list.hh:320 +#: options_list.hh:313 msgid "limit log output to the last number of entries" msgstr "begränsa loggutskriften till detta antal poster bakåt i tiden" -#: options_list.hh:329 +#: options_list.hh:322 msgid "file to write the log to" msgstr "fil att skriva ut loggen till" -#: options_list.hh:340 +#: options_list.hh:333 msgid "set commit changelog message" msgstr "ange loggmeddelandet för arkivering" -#: options_list.hh:347 +#: options_list.hh:340 msgid "set filename containing commit changelog message" msgstr "ange filnamnet som innehåller loggmeddelandet för arkivering" -#: options_list.hh:355 +#: options_list.hh:348 msgid "perform the operations for files missing from workspace" msgstr "genomför operationen på filer som saknas i arbetskatalogen" -#: options_list.hh:363 +#: options_list.hh:356 msgid "limit log output to the next number of entries" msgstr "begränsa loggutskriften till detta antal poster framåt i tiden" -#: options_list.hh:373 +#: options_list.hh:366 msgid "exclude files when printing logs" msgstr "" "ta ej med vilka filer som lagts till, tagits bort eller ändrats i loggen" -#: options_list.hh:381 +#: options_list.hh:374 msgid "do not use ASCII graph to display ancestry" msgstr "använd inte en ASCIIgraf för att visualisera föräldraskapet" -#: options_list.hh:389 +#: options_list.hh:382 msgid "do not ignore any files" msgstr "ignorera inga filer" -#: options_list.hh:397 +#: options_list.hh:390 msgid "exclude merges when printing logs" msgstr "ta ej med ihopslagningar i loggen" -#: options_list.hh:405 +#: options_list.hh:398 msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" msgstr "använd inte ~/.monotone/monotonerc eller _MTN/monotonerc" -#: options_list.hh:413 +#: options_list.hh:406 msgid "do not load standard lua hooks" msgstr "använd inte standard-lua-rutinerna" -#: options_list.hh:421 +#: options_list.hh:414 msgid "record process id of server" msgstr "spara serverns process-ID i denna fil" -#: options_list.hh:429 +#: options_list.hh:422 msgid "suppress verbose, informational and progress messages" msgstr "skriv inte ut informations- eller förloppsmeddelanden" -#: options_list.hh:439 +#: options_list.hh:432 msgid "load extra rc file" msgstr "använd denna lua-fil" -#: options_list.hh:447 +#: options_list.hh:440 msgid "suppress warning, verbose, informational and progress messages" msgstr "skriv inte ut varningar eller informations- eller förloppsmeddelanden" -#: options_list.hh:457 +#: options_list.hh:450 msgid "also operate on the contents of any listed directories" msgstr "ta även med innehållet för varje listad katalog" -#: options_list.hh:466 +#: options_list.hh:459 msgid "select revision id for operation" msgstr "ange den revision som operationen ska utföras på" -#: options_list.hh:474 +#: options_list.hh:467 msgid "limit search for workspace to specified root" msgstr "begränsa sökningen efter arbetskopian till denna katalog" -#: options_list.hh:482 +#: options_list.hh:475 msgid "use the current arguments as the future default" msgstr "använd de givna argumenten som framtida standardvärden" -#: options_list.hh:490 +#: options_list.hh:483 msgid "set ticker style (count|dot|none)" msgstr "sätt stilen för förloppsinformationen (count|dot|none)" -#: options_list.hh:501 +#: options_list.hh:494 #, c-format msgid "argument must be 'none', 'dot', or 'count'" msgstr "argumentet måste vara 'none', 'dot' eller 'count'" -#: options_list.hh:505 +#: options_list.hh:498 msgid "revision(s) to start logging at" msgstr "revision(er) där loggen ska börja" -#: options_list.hh:512 +#: options_list.hh:505 msgid "revision(s) to stop logging at" msgstr "revision(er) där loggen ska sluta" -#: options_list.hh:520 +#: options_list.hh:513 msgid "perform the operations for unknown files from workspace" msgstr "genomför operationen på okända filer i arbetskatalogen" -#: options_list.hh:529 +#: options_list.hh:522 msgid "verbose completion output" msgstr "ge utförlig information" -#: options_list.hh:537 +#: options_list.hh:530 msgid "print version number, then exit" msgstr "skriv ut versionsnumret och avsluta sedan omedelbart" -#: options_list.hh:545 +#: options_list.hh:538 msgid "insert command line arguments taken from the given file" msgstr "använd kommandoradsargument ur denna fil" @@ -3902,27 +3896,27 @@ msgstr "Nuvarande arbetsmängd: %i delar msgid "Current work set: %i items" msgstr "Nuvarande arbetsmängd: %i delar" -#: selectors.cc:43 +#: selectors.cc:45 #, c-format msgid "expanded selector '%s' -> '%s'" msgstr "expanderar valet '%s' -> '%s'" -#: selectors.cc:80 +#: selectors.cc:82 #, c-format msgid "unknown selector type: %c" msgstr "okänd väljartyp: %c" -#: selectors.cc:89 +#: selectors.cc:91 #, c-format msgid "selector '%s' is not a valid date\n" msgstr "väljaren '%s' är inte en korrekt datumangivelse\n" -#: selectors.cc:95 +#: selectors.cc:97 #, c-format msgid "selector '%s' is not a valid date (%s)" msgstr "väljaren '%s' är inte en korrekt datumangivelse (%s)" -#: selectors.cc:98 +#: selectors.cc:100 #, c-format msgid "expanded date '%s' -> '%s'\n" msgstr "expanderade datumangivelsen '%s' -> '%s'\n" @@ -4101,7 +4095,7 @@ msgstr "Tryck [Retur] när underprocesse msgid "Press enter when the subprocess has completed" msgstr "Tryck [Retur] när underprocessen är klar" -#: transforms.cc:91 +#: transforms.cc:93 #, c-format msgid "" "%s\n"