# # # patch "po/sv.po" # from [9b72ff2ea7e180a8fa51c6b81b6ad7c15b5cfa1d] # to [99febf5cd51ec8e882aa2df5c905badb818e37e0] # ============================================================ --- po/sv.po 9b72ff2ea7e180a8fa51c6b81b6ad7c15b5cfa1d +++ po/sv.po 99febf5cd51ec8e882aa2df5c905badb818e37e0 @@ -147,8 +147,8 @@ msgstr "" msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-10 13:19+0200\n" -"PO-Revision-Date: 2007-05-10 13:42+0200\n" +"POT-Creation-Date: 2007-05-20 17:31+0200\n" +"PO-Revision-Date: 2007-05-20 14:27+0200\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -181,27 +181,24 @@ 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:368 cmd_files.cc:29 cmd_files.cc:44 cmd_files.cc:81 -#: cmd_files.cc:185 cmd_merging.cc:951 cmd_othervcs.cc:16 -msgid "debug" -msgstr "felsökning" - -#: asciik.cc:368 automate.cc:433 +#: asciik.cc:368 automate.cc:467 msgid "SELECTOR" msgstr "VÄLJARE" #: asciik.cc:369 -msgid "prints an ASCII representation of the graph" +#, fuzzy +msgid "Prints an ASCII representation of the revisions' graph" msgstr "visualisera revisionsträdet med i ASCII" -#: asciik.cc:372 automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:242 -#: automate.cc:333 automate.cc:358 automate.cc:436 automate.cc:818 -#: automate.cc:951 automate.cc:994 automate.cc:1020 automate.cc:1047 -#: automate.cc:1074 automate.cc:1108 automate.cc:1220 automate.cc:1310 -#: automate.cc:1369 automate.cc:1418 automate.cc:1477 automate.cc:1526 -#: automate.cc:1576 automate.cc:1630 automate.cc:1660 automate.cc:1683 -#: cmd_files.cc:221 cmd_files.cc:314 cmd_files.cc:337 cmd_list.cc:678 -#: cmd_ws_commit.cc:735 cmd_ws_commit.cc:847 cmd_ws_commit.cc:890 +#: asciik.cc:374 automate.cc:70 automate.cc:97 automate.cc:147 automate.cc:261 +#: automate.cc:361 automate.cc:389 automate.cc:473 automate.cc:861 +#: automate.cc:1003 automate.cc:1049 automate.cc:1079 automate.cc:1109 +#: automate.cc:1139 automate.cc:1177 automate.cc:1295 automate.cc:1388 +#: automate.cc:1450 automate.cc:1503 automate.cc:1566 automate.cc:1618 +#: automate.cc:1671 automate.cc:1728 automate.cc:1761 automate.cc:1787 +#: cmd_files.cc:233 cmd_files.cc:331 cmd_files.cc:357 cmd_list.cc:661 +#: cmd_ws_commit.cc:630 cmd_ws_commit.cc:679 cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:785 cmd_ws_commit.cc:900 cmd_ws_commit.cc:946 #, c-format msgid "wrong argument count" msgstr "felaktigt antal givna argument" @@ -210,155 +207,313 @@ msgstr "[GREN]" msgid "[BRANCH]" msgstr "[GREN]" -#: automate.cc:88 automate.cc:135 automate.cc:1105 +#: automate.cc:65 +msgid "Prints the heads of the given branch" +msgstr "Visar lövet i den givna grenen" + +#: automate.cc:91 automate.cc:141 automate.cc:1170 msgid "REV1 [REV2 [REV3 [...]]]" msgstr "REV1 [REV2 [REV3 [...]]]" -#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:213 -#: automate.cc:248 automate.cc:252 automate.cc:336 automate.cc:361 -#: automate.cc:1115 cmd_list.cc:685 revision.cc:1778 +#: automate.cc:92 +#, fuzzy +msgid "Prints the ancestors of the given revisions" +msgstr "notera ett testresultat för en revision" + +#: automate.cc:104 automate.cc:154 automate.cc:201 automate.cc:228 +#: automate.cc:267 automate.cc:271 automate.cc:364 automate.cc:392 +#: automate.cc:1184 cmd_list.cc:668 revision.cc:1780 #, c-format msgid "No such revision %s" msgstr "det finns ingen revision med identiteten %s" -#: automate.cc:183 automate.cc:207 +#: automate.cc:142 +#, fuzzy +msgid "Prints the descendents of the given revisions" +msgstr "notera ett testresultat för en revision" + +#: automate.cc:192 automate.cc:219 msgid "[REV1 [REV2 [REV3 [...]]]]" msgstr "[REV1 [REV2 [REV3 [...]]]]" -#: automate.cc:239 +#: automate.cc:193 +#, fuzzy +msgid "Erases the ancestors in a list of revisions" +msgstr "notera ett testresultat för en revision" + +#: automate.cc:220 +msgid "Topologically sorts a list of revisions" +msgstr "Sorterar listan med revisioner topologiskt" + +#: automate.cc:254 msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "NY_REV [GAMMAL_REV1 [GAMMAL_REV2 [...]]]" -#: automate.cc:281 automate.cc:308 automate.cc:393 automate.cc:618 -#: automate.cc:861 automate.cc:885 automate.cc:1171 cmd_automate.cc:78 -#: cmd_automate.cc:332 cmd_list.cc:586 +#: automate.cc:255 +msgid "Lists the ancestors of the first revision given, not in the others" +msgstr "" +"Visar föräldrarna till den första givna revisionen som inte är föräldrar " +"till de övriga" + +#: automate.cc:298 +msgid "Lists the leaves of the revision graph" +msgstr "Visar revisionsgrafens löv" + +#: automate.cc:303 automate.cc:333 automate.cc:427 automate.cc:658 +#: automate.cc:907 automate.cc:934 automate.cc:1243 cmd_automate.cc:67 +#: cmd_automate.cc:324 cmd_db.cc:58 cmd_db.cc:69 cmd_db.cc:80 cmd_db.cc:93 +#: cmd_db.cc:106 cmd_db.cc:119 cmd_db.cc:176 cmd_db.cc:187 cmd_db.cc:198 +#: cmd_db.cc:209 cmd_list.cc:566 #, c-format msgid "no arguments needed" msgstr "inga argument behövs" -#: automate.cc:330 automate.cc:355 cmd_list.cc:675 revision.cc:1772 +#: automate.cc:328 +msgid "Lists the roots of the revision graph" +msgstr "Visar revisionsgrafens rötter" + +#: automate.cc:355 automate.cc:383 cmd_list.cc:655 revision.cc:1772 msgid "REV" msgstr "REV" -#: automate.cc:632 automate.cc:868 cmd_files.cc:292 cmd_files.cc:347 -#: cmd_merging.cc:150 cmd_merging.cc:624 cmd_ws_commit.cc:160 -#: cmd_ws_commit.cc:752 +#: automate.cc:356 +#, fuzzy +msgid "Prints the parents of a revision" +msgstr "skapa ett cert för en revision" + +#: automate.cc:384 +#, fuzzy +msgid "Prints the children of a revision" +msgstr "skapa ett cert för en revision" + +#: automate.cc:422 +msgid "Prints the complete ancestry graph" +msgstr "Skriver ut den fullständiga föräldragrafen" + +#: automate.cc:468 +msgid "Lists the revisions that match a selector" +msgstr "Visar revisionerna som matchar en väljare" + +#: automate.cc:653 +#, fuzzy +msgid "Prints a summary of files found in the workspace" +msgstr "byt namn på filer i arbetskopian" + +#: automate.cc:672 automate.cc:914 cmd_files.cc:306 cmd_files.cc:367 +#: cmd_merging.cc:151 cmd_merging.cc:632 cmd_ws_commit.cc:162 +#: cmd_ws_commit.cc:802 #, 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" -#: automate.cc:815 automate.cc:948 cmd_merging.cc:951 +#: automate.cc:855 automate.cc:997 cmd_merging.cc:962 msgid "[REVID]" msgstr "[REVID]" -#: automate.cc:843 automate.cc:969 automate.cc:1426 automate.cc:1484 -#: automate.cc:1489 +#: automate.cc:856 +#, fuzzy +msgid "Shows change information for a revision" +msgstr "skapa ett cert för en revision" + +#: automate.cc:886 automate.cc:1021 automate.cc:1511 automate.cc:1573 +#: automate.cc:1578 #, c-format msgid "no revision %s found in database" msgstr "revisionen %s finns inte i databasen" -#: automate.cc:991 automate.cc:1017 +#: automate.cc:902 +msgid "Shows the revision on which the workspace is based" +msgstr "Visar revisionen denna arbetskopia grundar sig på" + +#: automate.cc:929 +#, fuzzy +msgid "Shows the revision of the current workspace" +msgstr "filen '%s' är okänd i denna arbetskopia" + +#: automate.cc:998 +msgid "Shows the manifest associated with a revision" +msgstr "Visar manifestet kopplad till en revision" + +#: automate.cc:1043 automate.cc:1072 msgid "REVID" msgstr "REVID" -#: automate.cc:1002 automate.cc:1028 automate.cc:1083 automate.cc:1085 -#: automate.cc:1637 cmd_db.cc:37 cmd_diff_log.cc:396 cmd_diff_log.cc:423 -#: cmd_diff_log.cc:425 cmd_files.cc:168 cmd_files.cc:253 cmd_merging.cc:184 -#: cmd_merging.cc:780 cmd_merging.cc:795 cmd_merging.cc:798 cmd_netsync.cc:316 -#: cmd_ws_commit.cc:546 cmd_ws_commit.cc:1222 commands.cc:407 +#: automate.cc:1044 +#, fuzzy +msgid "Prints the revision data in packet format" +msgstr "skriv ut datapaket för revision till stdout" + +#: automate.cc:1057 automate.cc:1087 automate.cc:1148 automate.cc:1150 +#: automate.cc:1735 cmd_db.cc:41 cmd_diff_log.cc:396 cmd_diff_log.cc:423 +#: cmd_diff_log.cc:425 cmd_files.cc:175 cmd_files.cc:265 cmd_merging.cc:185 +#: cmd_merging.cc:789 cmd_merging.cc:804 cmd_merging.cc:807 cmd_netsync.cc:326 +#: cmd_ws_commit.cc:551 cmd_ws_commit.cc:1277 commands.cc:806 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" -#: automate.cc:1044 cmd_files.cc:311 +#: automate.cc:1073 +msgid "Prints the certs associated with a revision in packet format" +msgstr "Skriver ut certificate tillhörande en revision i paketformat" + +#: automate.cc:1103 cmd_files.cc:325 msgid "FILEID" msgstr "FILID" -#: automate.cc:1055 +#: automate.cc:1104 +#, fuzzy +msgid "Prints the file data in packet format" +msgstr "skriv ut datapaket för fil till stdout" + +#: automate.cc:1117 #, c-format msgid "no such file '%s'" msgstr "filen '%s' finns inte" -#: automate.cc:1071 +#: automate.cc:1133 msgid "OLD_FILE NEW_FILE" msgstr "GAMMAL_FIL NY_FIL" -#: automate.cc:1217 +#: automate.cc:1134 +#, fuzzy +msgid "Prints the file delta in packet format" +msgstr "skriv ut datapaket för fildelta till stdout" + +#: automate.cc:1171 +msgid "Prints revisions that are common ancestors of a list of revisions" +msgstr "Skriver ut revisionernas gemensamma föräldrar" + +#: automate.cc:1238 +msgid "Prints all branch certs in the revision graph" +msgstr "Skriver ut revisionsgrafens samtliga grencertifikat" + +#: automate.cc:1289 msgid "[BRANCH_PATTERN]" msgstr "[GRENMÖNSTER]" -#: automate.cc:1307 +#: automate.cc:1290 +msgid "Prints all tags attached to a set of branches" +msgstr "Skriva ut de givna grenarnas samtliga taggar" + +#: automate.cc:1382 msgid "KEYID PASSPHRASE" msgstr "NYCKELID LÖSEN" -#: automate.cc:1325 cmd_key_cert.cc:48 +#: automate.cc:1383 +#, fuzzy +msgid "Generates a key" +msgstr "skapa ett RSA-nyckelpar" + +#: automate.cc:1403 cmd_key_cert.cc:50 #, c-format msgid "key '%s' already exists" msgstr "nyckeln '%s' finns redan" -#: automate.cc:1328 cmd_key_cert.cc:51 +#: automate.cc:1406 cmd_key_cert.cc:53 #, c-format msgid "generating key-pair '%s'" msgstr "skapar nyckelparet '%s'" -#: automate.cc:1330 cmd_key_cert.cc:53 +#: automate.cc:1408 cmd_key_cert.cc:55 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "lagrar nyckelparet '%s' i %s/" -#: automate.cc:1366 +#: automate.cc:1444 msgid "OPTION" msgstr "FLAGGA" -#: automate.cc:1392 +#: automate.cc:1445 +msgid "Shows the value of an option" +msgstr "Visar en inställnings värde" + +#: automate.cc:1473 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "'%s' är en okänd inställning i arbetskopians metadata" -#: automate.cc:1415 +#: automate.cc:1496 msgid "REV FILE" msgstr "REV FIL" -#: automate.cc:1432 automate.cc:1495 +#: automate.cc:1497 +msgid "" +"Lists the revisions that changed the content relative to another revision" +msgstr "" +"Visar revisionerna som ändrade innehållet i förhållande till en annan " +"revision" + +#: automate.cc:1517 automate.cc:1584 #, c-format msgid "file %s is unknown for revision %s" msgstr "filen %s är okänd i revision %s" -#: automate.cc:1474 +#: automate.cc:1559 msgid "REV1 FILE REV2" msgstr "REV1 FIL REV2" -#: automate.cc:1523 +#: automate.cc:1560 +msgid "" +"Prints the name of a file in a target revision relative to a given revision" +msgstr "" +"Skriver ut namnet på en fil i målrevisionen i förhållande till en given " +"revision" + +#: automate.cc:1612 msgid "[FILEID] CONTENTS" msgstr "[FILID] INNEHÅLL" -#: automate.cc:1543 cmd_files.cc:241 +#: automate.cc:1613 +#, fuzzy +msgid "Stores a file in the database" +msgstr "filen '%s' har ingen revision i databasen" + +#: automate.cc:1635 cmd_files.cc:253 #, c-format msgid "no file version %s found in database" msgstr "filversionen %s finns inte i databasen" -#: automate.cc:1573 +#: automate.cc:1665 msgid "REVISION-DATA" msgstr "REVISIONS-DATA" -#: automate.cc:1610 +#: automate.cc:1666 +#, fuzzy +msgid "Stores a revision into the database" +msgstr "revisionen %s finns inte i databasen" + +#: automate.cc:1705 #, c-format msgid "missing prerequisite for revision %s" msgstr "saknar nödvändiga förutsättningar för att stoppa in revision %s" -#: automate.cc:1627 +#: automate.cc:1722 msgid "REVISION-ID NAME VALUE" msgstr "REVISION CERTNAMN CERTVÄRDE" -#: automate.cc:1657 cmd_db.cc:124 +#: automate.cc:1723 +msgid "Adds a revision certificate" +msgstr "Lägger till ett certifikat till revision" + +#: automate.cc:1755 cmd_db.cc:239 msgid "DOMAIN NAME VALUE" msgstr "DOMÄN NAMN VÄRDE" -#: automate.cc:1680 cmd_db.cc:140 +#: automate.cc:1756 cmd_db.cc:240 +#, fuzzy +msgid "Sets a database variable" +msgstr "(%s (databasen har inga tabeller!)" + +#: automate.cc:1781 cmd_db.cc:258 msgid "DOMAIN NAME" msgstr "DOMÄN NAMN" -#: automate.cc:1695 +#: automate.cc:1782 +#, fuzzy +msgid "Gets a database variable" +msgstr "(%s (databasen har inga tabeller!)" + +#: automate.cc:1799 #, c-format msgid "variable not found" msgstr "variabeln finns inte" @@ -433,128 +588,218 @@ msgstr "flera grencert funna för revisi "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" -#: cmd_automate.cc:150 +#: cmd_automate.cc:26 +msgid "Interface for scripted execution" +msgstr "Gränssnitt till skriptat körning" + +#: cmd_automate.cc:62 +#, fuzzy +msgid "Prints the automation interface's version" +msgstr "automatiseringsgränssnitt" + +#: cmd_automate.cc:139 #, c-format msgid "Bad input to automate stdio: expected ':' after string size" msgstr "" "Felaktigt indata till automate stdio: ':' förväntad efter strängstorlek" -#: cmd_automate.cc:169 +#: cmd_automate.cc:158 #, c-format msgid "Bad input to automate stdio: unexpected EOF" msgstr "Felaktigt indata till automate stdio: oväntat filslut" -#: cmd_automate.cc:197 +#: cmd_automate.cc:186 #, c-format msgid "Bad input to automate stdio: unknown start token '%c'" msgstr "felaktigt indata till automate stdio: '%c' är ett okänt nyckelord" -#: cmd_automate.cc:219 +#: cmd_automate.cc:208 #, c-format msgid "Bad input to automate stdio: expected '%c' token" msgstr "Felaktigt indata till automate stdio: nyckelordet '%c' förväntat" -#: cmd_automate.cc:348 +#: cmd_automate.cc:319 +msgid "Automates several commands in one run" +msgstr "Automatiserar flera kommandon i en och sammam körning" + +#: cmd_automate.cc:339 #, c-format msgid "Bad input to automate stdio: command name is missing" msgstr "Felaktigt indata till automate stdio: saknar kommandonamn" -#: cmd_automate.cc:377 -msgid "automation" -msgstr "automatisering" +#: cmd_automate.cc:362 +#, fuzzy, c-format +msgid "invalid automation specified" +msgstr "ingen databas angiven" -#: cmd_automate.cc:378 -msgid "automation interface" -msgstr "automatiseringsgränssnitt" +#: cmd_db.cc:28 +#, fuzzy +msgid "Deals with the database" +msgstr "ange databasens filnamn" -#: cmd_db.cc:43 +#: cmd_db.cc:47 #, 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:48 -msgid "database" -msgstr "databas" +#: cmd_db.cc:53 +#, fuzzy +msgid "Initializes a database" +msgstr "optimerar databasen" -#: cmd_db.cc:49 +#: cmd_db.cc:54 +msgid "Creates a new database file and initializes it." +msgstr "Skapar en ny databasfil och initierar den." + +#: cmd_db.cc:64 +msgid "Shows information about the database" +msgstr "Visar information om databasen" + +#: cmd_db.cc:75 +#, fuzzy +msgid "Shows the database's version" +msgstr "databasens schemaversion: %s" + +#: cmd_db.cc:86 +#, fuzzy +msgid "Dumps the contents of the database" +msgstr "ange databasens filnamn" + +#: cmd_db.cc:87 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" -"regenerate_caches\n" -"set_epoch BRANCH EPOCH\n" +"Generates a list of SQL instructions that represent the whole contents of " +"the database. The resulting output is useful to later restore the database " +"from a text file that serves as a backup." 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" -"regenerate_caches\n" -"set_epoch GREN EPOK\n" +"Genererar en lista med SQL-kommandon som representerar databasens hela " +"innehåll. Resultatet kan användas till att återställa en databas från en " +"textfile." -#: cmd_db.cc:64 -msgid "manipulate database state" -msgstr "gör ändringar direkt i databasen" +#: cmd_db.cc:99 +#, fuzzy +msgid "Loads the contents of the database" +msgstr "ladda in filinnehållet i databasen" +#: cmd_db.cc:100 +msgid "" +"Reads a list of SQL instructions that regenerate the contents of the " +"database. This is supposed to be used in conjunction with the output " +"generated by the 'dump' command." +msgstr "" + +#: cmd_db.cc:112 +#, fuzzy +msgid "Migrates the database to a newer schema" +msgstr "servera databasen till anslutande klienter" + #: cmd_db.cc:113 +msgid "" +"Updates the database's internal schema to the most recent one. Needed to " +"automatically resolve incompatibilities that may be introduced in newer " +"versions of monotone." +msgstr "" + +#: cmd_db.cc:125 +msgid "Executes an SQL command on the database" +msgstr "" + +#: cmd_db.cc:126 +msgid "Directly executes the given SQL command on the database" +msgstr "" + +#: cmd_db.cc:136 +#, fuzzy +msgid "Kills a revision from the local database" +msgstr "filen '%s' har ingen revision i databasen" + +#: cmd_db.cc:148 +msgid "Kills branch certificates from the local database" +msgstr "" + +#: cmd_db.cc:159 +msgid "Kills a tag from the local database" +msgstr "" + +#: cmd_db.cc:170 +msgid "Does some sanity checks on the database" +msgstr "" + +#: cmd_db.cc:171 +msgid "Ensures that the database is consistent by issuing multiple checks." +msgstr "" + +#: cmd_db.cc:182 +msgid "Converts the database to the changeset format" +msgstr "" + +#: cmd_db.cc:193 +msgid "Converst the database to the rosters format" +msgstr "" + +#: cmd_db.cc:204 +msgid "Regenerates the caches stored in the database" +msgstr "" + +#: cmd_db.cc:215 +msgid "Clears the database's epoch" +msgstr "" + +#: cmd_db.cc:226 +msgid "Sets the database's epoch" +msgstr "" + +#: cmd_db.cc:235 #, c-format msgid "The epoch must be %s characters" msgstr "Epoken måste innehålla %s tecken" -#: cmd_db.cc:124 cmd_db.cc:140 -msgid "vars" -msgstr "variabler" +#: cmd_db.cc:241 +msgid "" +"This command modifies (or adds if it did not exist before) the variable " +"named NAME, stored in the database, and sets it to the given value in " +"VALUE. The variable is placed in the domain DOMAIN." +msgstr "" -#: cmd_db.cc:125 -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:259 +#, fuzzy +msgid "Unsets a database variable" +msgstr "ange databasens filnamn" -#: cmd_db.cc:141 -msgid "remove the database variable NAME in domain DOMAIN" -msgstr "ta bort databasvariabeln NAMN från domänen DOMÄN" +#: cmd_db.cc:260 +msgid "" +"This command removes the variable NAME from domain DOMAIN, whichwas " +"previously stored in the database." +msgstr "" -#: cmd_db.cc:153 +#: cmd_db.cc:273 #, 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:157 cmd_diff_log.cc:471 cmd_diff_log.cc:600 cmd_files.cc:117 -#: cmd_files.cc:276 cmd_list.cc:480 cmd_merging.cc:717 cmd_ws_commit.cc:479 -#: commands.cc:284 -msgid "informative" -msgstr "informativ" - -#: cmd_db.cc:157 +#: cmd_db.cc:278 msgid "(revision|file|key) PARTIAL-ID" msgstr "(revision|file|key) PARTIAL-ID" -#: cmd_db.cc:158 -msgid "complete partial id" +#: cmd_db.cc:279 +#, fuzzy +msgid "Completes a partial identifier" msgstr "utöka den partiella identiteten" -#: cmd_db.cc:167 +#: cmd_db.cc:289 #, c-format msgid "non-hex digits in partial id" msgstr "något tecken i den partiella identiteten är inte hexadecimalt" +#: cmd_db.cc:329 +msgid "Runs one step of migration on the specified database" +msgstr "" + +#: cmd_db.cc:330 +msgid "" +"This command migrates the given database from the specified schema in SCHEMA " +"to its successor." +msgstr "" + #: cmd_diff_log.cc:121 msgid "Deleted entries:" msgstr "Borttagna objekt:" @@ -593,24 +838,30 @@ msgstr "" "denna arbetskopia har mer än en förälder\n" "(ange en revision att se skillnader emot med --revision)" -#: cmd_diff_log.cc:471 cmd_ws_commit.cc:145 cmd_ws_commit.cc:372 -#: cmd_ws_commit.cc:405 cmd_ws_commit.cc:479 cmd_ws_commit.cc:931 +#: cmd_diff_log.cc:471 cmd_ws_commit.cc:145 cmd_ws_commit.cc:376 +#: cmd_ws_commit.cc:410 cmd_ws_commit.cc:482 cmd_ws_commit.cc:986 msgid "[PATH]..." msgstr "[SÖKVÄG]..." #: cmd_diff_log.cc:472 +msgid "Shows current differences" +msgstr "" + +#: cmd_diff_log.cc:473 +#, fuzzy 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." +"Compares the current tree with the files in the repository and prints the " +"differences on the standard output.\n" +"If one revision is given, the diff between the workspace and that revision " +"is shown. If two revisions are given, the diff between 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." -#: cmd_diff_log.cc:481 +#: cmd_diff_log.cc:484 #, c-format msgid "" "--diff-args requires --external\n" @@ -619,96 +870,116 @@ msgstr "" "--diff-args kräver att även --external anges\n" "lägg till --external eller ta bort --diff-args?" -#: cmd_diff_log.cc:505 +#: cmd_diff_log.cc:508 msgid "no changes" msgstr "inga ändringar" -#: cmd_diff_log.cc:526 +#: cmd_diff_log.cc:529 msgid "[FILE [...]]" msgstr "[FIL [...]]" -#: cmd_diff_log.cc:600 +#: cmd_diff_log.cc:530 +msgid "Calculates diffs of files" +msgstr "" + +#: cmd_diff_log.cc:606 msgid "[FILE] ..." msgstr "[FIL] ..." -#: cmd_diff_log.cc:601 +#: cmd_diff_log.cc:607 +msgid "Prints history in reverse order" +msgstr "" + +#: cmd_diff_log.cc:608 +#, fuzzy msgid "" -"print history in reverse order (filtering by 'FILE'). If one or more\n" -"revisions are given, use them as a starting point." +"This command prints history in reverse order, filtering it by FILE if " +"given. If one or more revisions are given, uses them as a starting point." msgstr "" "skriv ut historiken i omvänd ordning för angivna filer eller för hela " "arbetskatalogen om inga filer angivits. Om en eller flera revisioner har " "angivits används de som utgångspunkter." -#: cmd_diff_log.cc:616 +#: cmd_diff_log.cc:624 #, c-format msgid "only one of --last/--next allowed" msgstr "enbart en av --last eller --next tillåten" -#: cmd_diff_log.cc:916 +#: cmd_diff_log.cc:924 #, c-format msgid "(Revision: %s)" msgstr "(Revision: %s)" -#: cmd_files.cc:29 -msgid "load file contents into db" +#: cmd_files.cc:30 +#, fuzzy +msgid "Loads a file's contents into the database" msgstr "ladda in filinnehållet i databasen" -#: cmd_files.cc:44 +#: cmd_files.cc:47 msgid " " msgstr " " -#: cmd_files.cc:45 -msgid "merge 3 files and output result" +#: cmd_files.cc:48 +#, fuzzy +msgid "Merges 3 files and outputs the result" msgstr "slå ihop 3 filer och skriv ut resultatet" -#: cmd_files.cc:59 +#: cmd_files.cc:63 #, c-format msgid "ancestor file id does not exist" msgstr "förälderns filidentitet finns inte" -#: cmd_files.cc:62 +#: cmd_files.cc:66 #, c-format msgid "left file id does not exist" msgstr "vänster fils identitet finns inte" -#: cmd_files.cc:65 +#: cmd_files.cc:69 #, c-format msgid "right file id does not exist" msgstr "höger fils identitet finns inte" -#: cmd_files.cc:76 +#: cmd_files.cc:80 #, c-format msgid "merge failed" msgstr "ihopslagningen misslyckades" -#: cmd_files.cc:81 +#: cmd_files.cc:85 msgid "SRCNAME DESTNAME SRCID DESTID" msgstr "KÄLLNAMN MÅLNAMN KÄLLID MÅLID" -#: cmd_files.cc:82 -msgid "diff 2 files and output result" +#: cmd_files.cc:86 +#, fuzzy +msgid "Differences 2 files and outputs the result" msgstr "skriv ut skillnaden mellan 2 filer" -#: cmd_files.cc:99 +#: cmd_files.cc:104 #, c-format msgid "source file id does not exist" msgstr "källans filidentitet finns inte" -#: cmd_files.cc:102 +#: cmd_files.cc:107 #, c-format msgid "destination file id does not exist" msgstr "målets filidentitet finns inte" -#: cmd_files.cc:117 cmd_files.cc:218 cmd_ws_commit.cc:732 +#: cmd_files.cc:122 cmd_files.cc:227 cmd_ws_commit.cc:779 msgid "PATH" msgstr "SÖKVÄG" -#: cmd_files.cc:118 -msgid "print annotated copy of the file from REVISION" +#: cmd_files.cc:123 +#, fuzzy +msgid "Prints an annotated copy of a file" msgstr "skriv ut filen från REVISION med extra detaljer" -#: cmd_files.cc:152 +#: cmd_files.cc:124 +#, fuzzy +msgid "" +"Calculates and prints an annotated copy of the given file from the specified " +"REVISION." +msgstr "skriv ut filen från REVISION med extra detaljer" + +#: cmd_files.cc:159 #, c-format msgid "" "with no revision selected, this command can only be used in a single-parent " @@ -717,98 +988,115 @@ msgstr "" "detta kommando kan bara användas för arbetskopior med en förälder när ingen " "specifik revision anges" -#: cmd_files.cc:166 +#: cmd_files.cc:173 #, c-format msgid "no revision for file '%s' in database" msgstr "filen '%s' har ingen revision i databasen" -#: cmd_files.cc:175 +#: cmd_files.cc:182 #, c-format msgid "no such file '%s' in revision '%s'" msgstr "filen '%s' finns inte i revisionen '%s'" -#: cmd_files.cc:178 +#: cmd_files.cc:185 #, c-format msgid "'%s' in revision '%s' is not a file" msgstr "'%s' i revisionen '%s' är inte en fil" -#: cmd_files.cc:185 +#: cmd_files.cc:192 msgid "[PATH]" msgstr "[SÖKVÄG]" -#: cmd_files.cc:186 -msgid "calculate identity of PATH or stdin" +#: cmd_files.cc:193 +#, fuzzy +msgid "Calculates the identity of a file or stdin" msgstr "räkna ut identiteten för SÖKVÄG eller stdin" -#: cmd_files.cc:226 +#: cmd_files.cc:194 +msgid "" +"If any PATH is given, calculates their identity; otherwise, the one from the " +"standard input is calculated." +msgstr "" + +#: cmd_files.cc:228 +msgid "Prints the file identifier of a file" +msgstr "" + +#: cmd_files.cc:238 #, c-format msgid "Cannot read from stdin" msgstr "Kan inte läsa från stdin" -#: cmd_files.cc:266 cmd_files.cc:270 +#: cmd_files.cc:278 cmd_files.cc:282 #, c-format msgid "no file '%s' found in revision '%s'" msgstr "filen '%s' finns inte i revisionen '%s'" -#: cmd_files.cc:277 cmd_files.cc:334 +#: cmd_files.cc:289 cmd_files.cc:351 msgid "FILENAME" msgstr "FILNAMN" -#: cmd_files.cc:278 -msgid "write file from database to stdout" +#: cmd_files.cc:290 +#, fuzzy +msgid "Prints a file from the database" msgstr "skriv ut angiven fil från databasen" -#: cmd.hh:56 +#: cmd_files.cc:291 +msgid "" +"Fetches the given file FILENAME from the database and prints it to the " +"standard output." +msgstr "" + +#: cmd_files.cc:326 +msgid "Prints the contents of a file (given an identifier)" +msgstr "" + +#: cmd_files.cc:352 +msgid "Prints the contents of a file (given a name)" +msgstr "" + +#: cmd.hh:126 #, c-format msgid "ignored bookkeeping path '%s'" msgstr "ignorerad administrativ sökväg '%s'" -#: cmd.hh:66 +#: cmd.hh:136 #, c-format msgid "all arguments given were bookkeeping paths; aborting" msgstr "alla givna argument är administrativa sökvägar; avbryter" -#: cmd.hh:167 -#, c-format -msgid "Alias for %s" -msgstr "Synonym för %s" - -#: cmd_key_cert.cc:32 cmd_key_cert.cc:58 cmd_key_cert.cc:98 -#: cmd_key_cert.cc:119 cmd_key_cert.cc:159 cmd_key_cert.cc:175 -#: cmd_key_cert.cc:206 -msgid "key and cert" -msgstr "nyckel och cert" - -#: cmd_key_cert.cc:32 cmd_key_cert.cc:58 cmd_key_cert.cc:98 +#: cmd_key_cert.cc:32 cmd_key_cert.cc:60 cmd_key_cert.cc:102 msgid "KEYID" msgstr "NYCKELID" -#: cmd_key_cert.cc:32 -msgid "generate an RSA key-pair" +#: cmd_key_cert.cc:33 +#, fuzzy +msgid "Generates an RSA key-pair" msgstr "skapa ett RSA-nyckelpar" -#: cmd_key_cert.cc:59 -msgid "drop a public and private key" +#: cmd_key_cert.cc:61 +#, fuzzy +msgid "Drops a public and/or private key" msgstr "släng publik och privat nyckel" -#: cmd_key_cert.cc:73 +#: cmd_key_cert.cc:77 #, c-format msgid "dropping public key '%s' from database" msgstr "tar bort den publika nyckeln '%s' ur databasen" -#: cmd_key_cert.cc:83 +#: cmd_key_cert.cc:87 #, c-format msgid "dropping key pair '%s' from keystore" msgstr "tar bort nyckelparet '%s' från nyckellagret" -#: cmd_key_cert.cc:90 +#: cmd_key_cert.cc:94 #, 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:93 +#: cmd_key_cert.cc:97 #, c-format msgid "" "public or private key '%s' does not exist in keystore, and no database was " @@ -817,58 +1105,65 @@ msgstr "" "den publika eller privata nyckeln '%s' finns inte i nyckellager och ingen " "databas angavs" -#: cmd_key_cert.cc:99 -msgid "change passphrase of a private RSA key" +#: cmd_key_cert.cc:103 +#, fuzzy +msgid "Changes the passphrase of a private RSA key" msgstr "ändra lösen till en privat RSA-nyckel" -#: cmd_key_cert.cc:109 +#: cmd_key_cert.cc:114 #, c-format msgid "key '%s' does not exist in the keystore" msgstr "nyckeln '%s' finns inte i nyckellagret" -#: cmd_key_cert.cc:116 +#: cmd_key_cert.cc:121 #, c-format msgid "passphrase changed" msgstr "lösen ändrat" -#: cmd_key_cert.cc:120 +#: cmd_key_cert.cc:125 msgid "[FILENAME]" msgstr "[FILNAMN]" -#: cmd_key_cert.cc:121 -msgid "export your monotone key for use with ssh-agent" +#: cmd_key_cert.cc:126 +#, fuzzy +msgid "Exports a private key for use with ssh-agent" msgstr "exportera din monotonenyckel för att användas med ssh-agent" -#: cmd_key_cert.cc:130 cmd_key_cert.cc:169 +#: cmd_key_cert.cc:136 cmd_key_cert.cc:176 #, c-format msgid "the key you specified cannot be found" msgstr "kan inte hitta nyckeln du angav" -#: cmd_key_cert.cc:160 -msgid "Add your monotone key to ssh-agent" +#: cmd_key_cert.cc:166 +#, fuzzy +msgid "Adds a private key to ssh-agent" msgstr "Lägg till din monotonenyckel till ssh-agent" -#: cmd_key_cert.cc:175 +#: cmd_key_cert.cc:183 msgid "REVISION CERTNAME [CERTVAL]" msgstr "REVISION CERTNAMN [CERTVÄRDE]" -#: cmd_key_cert.cc:176 -msgid "create a cert for a revision" +#: cmd_key_cert.cc:184 +#, fuzzy +msgid "Creates a certificate for a revision" msgstr "skapa ett cert för en revision" -#: cmd_key_cert.cc:207 +#: cmd_key_cert.cc:217 msgid "REVISION NAME VALUE SIGNER1 [SIGNER2 [...]]" msgstr "REVISION NAMN VÄRDE SIGNERARE1 [SIGNERARE2 [...]]" -#: cmd_key_cert.cc:208 -msgid "" -"test whether a hypothetical cert would be trusted\n" -"by current settings" +#: cmd_key_cert.cc:218 +#, fuzzy +msgid "Tests whether a hypothetical certificate would be trusted" msgstr "" "kontrollera ifall ett hypotetiskt cert skulle vara pålitligt\n" "enligt nuvarande inställningar" -#: cmd_key_cert.cc:241 +#: cmd_key_cert.cc:219 +msgid "The current settings are used to run the test." +msgstr "" + +#: cmd_key_cert.cc:251 #, c-format msgid "" "if a cert on: %s\n" @@ -883,72 +1178,90 @@ msgstr "" "signerades av: %s\n" "skulle det vara: %s" -#: cmd_key_cert.cc:250 +#: cmd_key_cert.cc:260 msgid "trusted" msgstr "pålitligt" -#: cmd_key_cert.cc:250 +#: cmd_key_cert.cc:260 msgid "UNtrusted" msgstr "Opålitligt" -#: cmd_key_cert.cc:254 cmd_key_cert.cc:266 cmd_key_cert.cc:278 -#: cmd_key_cert.cc:292 cmd_ws_commit.cc:275 -msgid "review" -msgstr "granskning" - -#: cmd_key_cert.cc:254 +#: cmd_key_cert.cc:264 msgid "REVISION TAGNAME" msgstr "REVISION TAGNAMN" -#: cmd_key_cert.cc:255 -msgid "put a symbolic tag cert on a revision" +#: cmd_key_cert.cc:265 +#, fuzzy +msgid "Puts a symbolic tag certificate on a revision" msgstr "sätt ett symboliskt tagg-cert på en revision" -#: cmd_key_cert.cc:266 +#: cmd_key_cert.cc:279 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: cmd_key_cert.cc:267 -msgid "note the results of running a test on a revision" +#: cmd_key_cert.cc:280 +#, fuzzy +msgid "Notes the results of running a test on a revision" msgstr "notera ett testresultat för en revision" -#: cmd_key_cert.cc:278 cmd_ws_commit.cc:275 +#: cmd_key_cert.cc:293 cmd_ws_commit.cc:277 msgid "REVISION" msgstr "REVISION" -#: cmd_key_cert.cc:279 -msgid "approve of a particular revision" +#: cmd_key_cert.cc:294 +#, fuzzy +msgid "Approves a particular revision" msgstr "godkänn en specifik revision" -#: cmd_key_cert.cc:288 +#: cmd_key_cert.cc:304 #, c-format msgid "need --branch argument for approval" msgstr "för godkännande behöver en gren anges med --branch" -#: cmd_key_cert.cc:292 +#: cmd_key_cert.cc:308 msgid "REVISION [COMMENT]" msgstr "REVISION [KOMMENTAR]" -#: cmd_key_cert.cc:293 -msgid "comment on a particular revision" +#: cmd_key_cert.cc:309 +#, fuzzy +msgid "Comments on a particular revision" msgstr "kommentera en specifik revision" -#: cmd_key_cert.cc:305 +#: cmd_key_cert.cc:323 #, c-format msgid "edit comment failed" msgstr "misslyckades med att redigera kommentaren" -#: cmd_key_cert.cc:310 +#: cmd_key_cert.cc:328 #, c-format msgid "empty comment" msgstr "tom kommentar" -#: cmd_list.cc:68 cmd_list.cc:702 +#: cmd_list.cc:43 +#, fuzzy +msgid "Shows database objects" +msgstr "ingen databas angiven" + +#: cmd_list.cc:44 +#, fuzzy +msgid "" +"This command is used to query information from the database. It shows " +"database objects, or the current workspace manifest, or known, unknown, " +"intentionally ignored, missing, or changed-state files." +msgstr "" +"visa databasobjekten, arbetskopians manifest, okända filer, kända \n" +"filer, medvetet ignorerade filer, saknade filer eller ändrade filer" + +#: cmd_list.cc:50 +msgid "Lists certificates attached to an identifier" +msgstr "" + +#: cmd_list.cc:77 cmd_list.cc:685 #, c-format msgid "no public key '%s' found in database" msgstr "den publika nyckeln '%s' finns inte i databasen" -#: cmd_list.cc:78 +#: cmd_list.cc:87 #, c-format msgid "" "Key : %s\n" @@ -961,79 +1274,91 @@ msgstr "" "Namn : %s\n" "Värde : %s\n" -#: cmd_list.cc:112 +#: cmd_list.cc:121 msgid "ok" msgstr "ok" -#: cmd_list.cc:115 +#: cmd_list.cc:124 msgid "bad" msgstr "felaktig" -#: cmd_list.cc:118 +#: cmd_list.cc:127 msgid "unknown" msgstr "okänd" -#: cmd_list.cc:206 +#: cmd_list.cc:153 +msgid "Lists keys that match a pattern" +msgstr "" + +#: cmd_list.cc:216 #, c-format msgid "(*) - only in %s/" msgstr "(*) - enbart i %s/" -#: cmd_list.cc:230 +#: cmd_list.cc:240 #, c-format msgid "no keys found" msgstr "hittade inga nycklar" -#: cmd_list.cc:232 +#: cmd_list.cc:242 #, c-format msgid "no keys found matching '%s'" msgstr "hittade inga nycklar som matchar '%s'" -#: cmd_list.cc:284 +#: cmd_list.cc:247 +msgid "Lists branches in the database that match a pattern" +msgstr "" + +#: cmd_list.cc:275 +msgid "Lists the current epoch of branches that match a pattern" +msgstr "" + +#: cmd_list.cc:298 #, c-format msgid "no epoch for branch %s" msgstr "ingen epok i grenen %s" -#: cmd_list.cc:481 -msgid "" -"certs ID\n" -"keys [PATTERN]\n" -"branches [PATTERN]\n" -"epochs [BRANCH [...]]\n" -"tags\n" -"vars [DOMAIN]\n" -"known\n" -"unknown\n" -"ignored\n" -"missing\n" -"changed" +#: cmd_list.cc:305 +#, fuzzy +msgid "Lists all tags in the database" +msgstr "revisionen %s finns redan i databasen" + +#: cmd_list.cc:321 +msgid "Lists variables in the whole database or a domain" msgstr "" -"certs ID\n" -"keys [MÖNSTER]\n" -"branches [MÖNSTER]\n" -"epochs [GREN [...]]\n" -"tags\n" -"vars [DOMÄN]\n" -"known\n" -"unknown\n" -"ignored\n" -"missing\n" -"changed" -#: cmd_list.cc:492 -msgid "" -"show database objects, or the current workspace manifest, \n" -"or known, unknown, intentionally ignored, missing, or \n" -"changed-state files" +#: cmd_list.cc:355 +msgid "Lists workspace files that belong to the current branch" msgstr "" -"visa databasobjekten, arbetskopians manifest, okända filer, kända \n" -"filer, medvetet ignorerade filer, saknade filer eller ändrade filer" -#: cmd_merging.cc:101 +#: cmd_list.cc:397 +msgid "Lists workspace files that do not belong to the current branch" +msgstr "" + +#: cmd_list.cc:429 +#, fuzzy +msgid "Lists files that belong to the branch but are not in the workspace" +msgstr "filen '%s' är okänd i denna arbetskopia" + +#: cmd_list.cc:453 +msgid "Lists files that have changed with respect to the current revision" +msgstr "" + +#: cmd_list.cc:561 +#, fuzzy +msgid "Lists all keys in the keystore" +msgstr "nyckeln '%s' finns inte i nyckellagret" + +#: cmd_list.cc:656 +msgid "Prints all certificates attached to a revision" +msgstr "" + +#: cmd_merging.cc:102 #, c-format msgid "target revision is not in current branch" msgstr "denna revision finns inte i den nuvarande grenen" -#: cmd_merging.cc:109 +#: cmd_merging.cc:110 #, c-format msgid "" "target revision is in multiple branches:%s\n" @@ -1044,7 +1369,7 @@ msgstr "" "\n" "försök igen med en explicit --branch" -#: cmd_merging.cc:121 +#: cmd_merging.cc:122 #, c-format msgid "" "target revision not in any branch\n" @@ -1053,20 +1378,18 @@ msgstr "" "denna revision är inte i någon gren\n" "nästa ändring hamnar i grenen %s" -#: cmd_merging.cc:129 cmd_merging.cc:758 cmd_ws_commit.cc:145 -#: cmd_ws_commit.cc:328 cmd_ws_commit.cc:372 cmd_ws_commit.cc:405 -#: cmd_ws_commit.cc:435 cmd_ws_commit.cc:460 cmd_ws_commit.cc:615 -#: cmd_ws_commit.cc:931 -msgid "workspace" -msgstr "arbetskopia" +#: cmd_merging.cc:131 +#, fuzzy +msgid "Updates the workspace" +msgstr "lägg till filer i arbetskopian" -#: cmd_merging.cc:130 +#: cmd_merging.cc:132 +#, fuzzy 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" -"If a revision is given, update the workspace to that revision.\n" -"If not, update the workspace to the head of the branch." +"This command modifies your workspace to be based off of a different " +"revision, preserving uncommitted changes as it does so. If a revision is " +"given, update the workspace to that revision. If not, update the workspace " +"to the head of the branch." msgstr "" "uppdaterar arbetskopian.\n" "Detta kommando ändrar din arbetskopia så att den baseras på en annan\n" @@ -1074,17 +1397,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:154 +#: cmd_merging.cc:155 #, c-format msgid "this workspace is a new project; cannot update" msgstr "denna arbetskatalog är ett nytt projekt; kan inte uppdatera" -#: cmd_merging.cc:161 +#: cmd_merging.cc:162 #, c-format msgid "updating along branch '%s'" msgstr "uppdaterar längs grenen '%s'" -#: cmd_merging.cc:165 +#: cmd_merging.cc:166 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1095,173 +1418,175 @@ 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:171 +#: cmd_merging.cc:172 #, c-format msgid "multiple update candidates:" msgstr "mer än en uppdateringskandidat:" -#: cmd_merging.cc:175 +#: cmd_merging.cc:176 #, c-format msgid "choose one with '%s update -r'" msgstr "välj en med '%s update -r'" -#: cmd_merging.cc:176 +#: cmd_merging.cc:177 #, c-format msgid "multiple update candidates remain after selection" msgstr "mer än en kandidat är kvar efter urval" -#: cmd_merging.cc:195 +#: cmd_merging.cc:196 #, c-format msgid "already up to date at %s" msgstr "redan uppdaterad till %s" -#: cmd_merging.cc:203 +#: cmd_merging.cc:204 #, c-format msgid "selected update target %s" msgstr "valt uppdateringsmål är %s" -#: cmd_merging.cc:209 +#: cmd_merging.cc:210 #, c-format msgid "switching to branch %s" msgstr "byter gren till %s" -#: cmd_merging.cc:277 +#: cmd_merging.cc:278 #, 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:278 +#: cmd_merging.cc:279 #, c-format msgid "updated to base revision %s" msgstr "uppdaterad till revisionen %s" -#: cmd_merging.cc:313 +#: cmd_merging.cc:314 #, c-format msgid "[left] %s" msgstr "[vänster] %s" -#: cmd_merging.cc:314 +#: cmd_merging.cc:315 #, c-format msgid "[right] %s" msgstr "[höger] %s" -#: cmd_merging.cc:325 cmd_merging.cc:594 +#: cmd_merging.cc:326 cmd_merging.cc:601 #, c-format msgid "[merged] %s" msgstr "[ihopslagen] %s" -#: cmd_merging.cc:332 cmd_merging.cc:431 cmd_merging.cc:442 cmd_merging.cc:598 -#: cmd_merging.cc:691 cmd_merging.cc:927 cmd_ws_commit.cc:506 -#: cmd_ws_commit.cc:1180 cmd_ws_commit.cc:1203 cmd_ws_commit.cc:1303 -#: cmd_ws_commit.cc:1317 -msgid "tree" -msgstr "träd" - -#: cmd_merging.cc:332 -msgid "merge unmerged heads of branch" +#: cmd_merging.cc:334 +#, fuzzy +msgid "Merges unmerged heads of a branch" msgstr "slå ihop ej ihopslagna löv i grenen" -#: cmd_merging.cc:342 cmd_merging.cc:935 +#: cmd_merging.cc:345 cmd_merging.cc:946 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "var god ange en gren med --branch=GREN" -#: cmd_merging.cc:347 cmd_merging.cc:481 cmd_merging.cc:484 cmd_merging.cc:940 -#: cmd_netsync.cc:300 cmd_ws_commit.cc:530 +#: cmd_merging.cc:350 cmd_merging.cc:488 cmd_merging.cc:491 cmd_merging.cc:951 +#: cmd_netsync.cc:310 cmd_ws_commit.cc:535 #, c-format msgid "branch '%s' is empty" msgstr "grenen '%s' är tom" -#: cmd_merging.cc:350 +#: cmd_merging.cc:353 #, c-format msgid "branch '%s' is already merged" msgstr "löven i grenen '%s' är redan ihopslagna" -#: cmd_merging.cc:354 +#: cmd_merging.cc:357 #, 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:375 cmd_merging.cc:420 +#: cmd_merging.cc:378 cmd_merging.cc:423 #, c-format msgid "merge %d / %d:" msgstr "slår ihop %d / %d:" -#: cmd_merging.cc:376 +#: cmd_merging.cc:379 #, 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:428 +#: cmd_merging.cc:431 #, c-format msgid "note: your workspaces have not been updated" msgstr "obs: dina arbetskopior har inte uppdaterats" -#: cmd_merging.cc:431 +#: cmd_merging.cc:435 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "KÄLLGREN MÅLGREN" -#: cmd_merging.cc:432 -msgid "merge from one branch to another asymmetrically" +#: cmd_merging.cc:436 +#, fuzzy +msgid "Merges from one branch to another asymmetrically" msgstr "slå ihop asymmetriskt från en gren till en annan" -#: cmd_merging.cc:442 +#: cmd_merging.cc:448 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "KÄLLGREN MÅLGREN KATALOG" -#: cmd_merging.cc:443 -msgid "merge one branch into a subdirectory in another branch" +#: cmd_merging.cc:449 +#, fuzzy +msgid "Merges one branch into a subdirectory in another branch" msgstr "slå ihop en gren till en underkatalog i en annan gren" -#: cmd_merging.cc:482 cmd_merging.cc:485 +#: cmd_merging.cc:489 cmd_merging.cc:492 #, c-format msgid "branch '%s' is not merged" msgstr "löven i grenen '%s' är inte ihopslagna" -#: cmd_merging.cc:490 +#: cmd_merging.cc:497 #, c-format msgid "propagating %s -> %s" msgstr "propagerar %s -> %s" -#: cmd_merging.cc:491 +#: cmd_merging.cc:498 #, c-format msgid "[source] %s" msgstr "[källa] %s" -#: cmd_merging.cc:492 +#: cmd_merging.cc:499 #, c-format msgid "[target] %s" msgstr "[mål] %s" -#: cmd_merging.cc:497 +#: cmd_merging.cc:504 #, 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:499 +#: cmd_merging.cc:506 #, c-format msgid "no action taken" msgstr "inget utfördes" -#: cmd_merging.cc:503 +#: cmd_merging.cc:510 #, 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:541 +#: cmd_merging.cc:548 #, c-format msgid "Path %s not found in destination tree." msgstr "Sökvägen %s finns inte i målträdet." -#: cmd_merging.cc:599 +#: cmd_merging.cc:606 msgid "OTHER-REVISION" msgstr "ANNAN-REVISION" -#: cmd_merging.cc:600 +#: cmd_merging.cc:607 +#, fuzzy +msgid "Merges a revision into the current workspace's base revision" +msgstr "filen '%s' är okänd i denna arbetskopia" + +#: cmd_merging.cc:608 +#, fuzzy msgid "" -"Merge OTHER-REVISION into the current workspace's base revision, and update " +"Merges 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 " @@ -1273,19 +1598,19 @@ msgstr "" "REVISION och arbetskopians grundrevision att anges som föräldrar till den ny " "revisionen. Arbetskopians gren kommer inte att ändras." -#: cmd_merging.cc:631 +#: cmd_merging.cc:639 #, 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:639 +#: cmd_merging.cc:648 #, c-format msgid "workspace is already at revision %s" msgstr "arbetskopian är redan uppdaterad till revision %s" -#: cmd_merging.cc:686 +#: cmd_merging.cc:695 #, c-format msgid "" "updated to result of merge\n" @@ -1296,88 +1621,102 @@ msgstr "" "[vänster] %s\n" "[ höger] %s\n" -#: cmd_merging.cc:692 +#: cmd_merging.cc:701 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VÄNSTERREVISION HÖGERREVISION MÅLGREN" -#: cmd_merging.cc:693 -msgid "merge two explicitly given revisions, placing result in given branch" +#: cmd_merging.cc:702 +#, fuzzy +msgid "Merges two explicitly given revisions" msgstr "" "slå ihop två explicit angivna revisioner, placera resultatet i angiven gren" -#: cmd_merging.cc:708 +#: cmd_merging.cc:703 +msgid "" +"The results of the merge are placed on the branch specified by DEST-BRANCH." +msgstr "" + +#: cmd_merging.cc:718 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s och %s är samma revision, avbryter" -#: cmd_merging.cc:710 cmd_merging.cc:712 +#: cmd_merging.cc:720 cmd_merging.cc:722 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s är redan förfader till %s" -#: cmd_merging.cc:717 +#: cmd_merging.cc:727 msgid "REV REV" msgstr "REV REV" -#: cmd_merging.cc:718 -msgid "" -"Show what conflicts would need to be resolved to merge the given revisions." +#: cmd_merging.cc:728 +#, fuzzy +msgid "Shows what conflicts need resolution between two revisions" msgstr "" "Visa de konflikter som behöver lösas om de givna revisionerna slås ihop." -#: cmd_merging.cc:728 cmd_merging.cc:730 +#: cmd_merging.cc:729 +msgid "" +"The conflicts are calculated based on the two revisions given in the REV " +"parameters." +msgstr "" + +#: cmd_merging.cc:739 cmd_merging.cc:741 #, 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:744 +#: cmd_merging.cc:755 #, c-format msgid "There are %s node_name_conflicts." msgstr "Det finns %s node_name-konflikter." -#: cmd_merging.cc:746 +#: cmd_merging.cc:757 #, c-format msgid "There are %s file_content_conflicts." msgstr "Det finns %s file_content-konflikter." -#: cmd_merging.cc:748 +#: cmd_merging.cc:759 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Det finns %s node_attr-konflikter." -#: cmd_merging.cc:750 +#: cmd_merging.cc:761 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Det finns %s orphaned_node-konflikter." -#: cmd_merging.cc:752 +#: cmd_merging.cc:763 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Det finns %s rename_target-konflikter." -#: cmd_merging.cc:754 +#: cmd_merging.cc:765 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Det finns %s directory_loop-konflikter." -#: cmd_merging.cc:758 +#: cmd_merging.cc:769 msgid "[-r FROM] -r TO [PATH...]" msgstr "[-r FRÅN] -r TILL [SÖKVÄG...]" -#: cmd_merging.cc:759 +#: cmd_merging.cc:770 +msgid "Applies changes made at arbitrary places in history" +msgstr "" + +#: cmd_merging.cc:771 +#, fuzzy 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" -"edits your current workspace to include those changes. The end result\n" -"is identical to 'mtn diff -r FROM -r TO | patch -p0', except that\n" -"this command uses monotone's merger, and thus intelligently handles\n" -"renames, conflicts, and so on.\n" -"\n" -"If one revision is given, applies the changes made in that revision\n" -"compared to its parent.\n" -"\n" -"If two revisions are given, applies the changes made to get from the\n" -"first revision to the second." +"This command takes changes made at any point in history, and edits your " +"current workspace to include those changes. The end result is identical to " +"'mtn diff -r FROM -r TO | patch -p0', except that this command uses " +"monotone's merger, and thus intelligently handles renames, conflicts, and so " +"on.\n" +"If one revision is given, applies the changes made in that revision compared " +"to its parent.\n" +"If two revisions are given, applies the changes made to get from the first " +"revision to the second." msgstr "" "Tar ändringar från vald(a) revision(er) och utför dem i arbetskopian.\n" "Det här kommandot plockar ändringar från någon punkt i historien och\n" @@ -1392,7 +1731,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:784 +#: cmd_merging.cc:793 #, c-format msgid "" "revision %s is a merge\n" @@ -1403,49 +1742,53 @@ 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:805 +#: cmd_merging.cc:814 #, c-format msgid "no changes to apply" msgstr "inga ändringar att utföra" -#: cmd_merging.cc:862 +#: cmd_merging.cc:871 #, c-format msgid "no changes to be applied" msgstr "inga ändringar att utföra" -#: cmd_merging.cc:892 +#: cmd_merging.cc:901 #, c-format msgid "no changes were applied" msgstr "inga ändringar blev utförda" -#: cmd_merging.cc:895 +#: cmd_merging.cc:904 #, c-format msgid "applied changes to workspace" msgstr "utförde ändringarna i arbetskopian" -#: cmd_merging.cc:927 -msgid "show unmerged head revisions of branch" +#: cmd_merging.cc:937 +#, fuzzy +msgid "Shows unmerged head revisions of a branch" msgstr "visa ej ihopslagna lövrevisioner i grenen" -#: cmd_merging.cc:942 +#: cmd_merging.cc:953 #, c-format msgid "branch '%s' is currently merged:" msgstr "grenen '%s' har för tillfället ett löv:" -#: cmd_merging.cc:944 +#: cmd_merging.cc:955 #, c-format msgid "branch '%s' is currently unmerged:" msgstr "grenen '%s' har för tillfället mer än ett löv:" -#: cmd_merging.cc:952 -msgid "" -"dump the roster associated with the given REVID, or the workspace if no " -"REVID is given" +#: cmd_merging.cc:963 +#, fuzzy +msgid "Dumps the roster associated with a given identifier" 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:248 +#: cmd_merging.cc:964 +msgid "If no REVID is given, the workspace is used." +msgstr "" + +#: cmd_netsync.cc:43 cmd_netsync.cc:258 #, c-format msgid "setting default server to %s" msgstr "sätter standardserver till %s" @@ -1460,12 +1803,12 @@ msgstr "inget grenmönster angivet" msgid "no branch pattern given" msgstr "inget grenmönster angivet" -#: cmd_netsync.cc:95 cmd_netsync.cc:259 +#: cmd_netsync.cc:95 cmd_netsync.cc:269 #, 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:272 +#: cmd_netsync.cc:101 cmd_netsync.cc:282 #, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "sätter standardmönstret för grenar att INTE ta med till '%s'" @@ -1475,98 +1818,122 @@ 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:197 -#: cmd_netsync.cc:384 -msgid "network" -msgstr "nätverk" - -#: cmd_netsync.cc:124 cmd_netsync.cc:139 cmd_netsync.cc:155 +#: cmd_netsync.cc:125 cmd_netsync.cc:143 cmd_netsync.cc:162 msgid "[ADDRESS[:PORTNUMBER] [PATTERN ...]]" msgstr "[ADRESS[:PORTNUMMER] [MÖNSTER ...]]" -#: cmd_netsync.cc:125 -msgid "push branches matching PATTERN to netsync server at ADDRESS" +#: cmd_netsync.cc:126 +#, fuzzy +msgid "Pushes branches to a netsync server" msgstr "skicka grenar som matchar MÖNSTER till netsync-server på ADRESS" -#: cmd_netsync.cc:140 -msgid "pull branches matching PATTERN from netsync server at ADDRESS" +#: cmd_netsync.cc:127 +#, fuzzy +msgid "" +"This will push all branches that match the pattern given in PATTERN to the " +"netsync server at the address ADDRESS." +msgstr "skicka grenar som matchar MÖNSTER till netsync-server på ADRESS" + +#: cmd_netsync.cc:144 +#, fuzzy +msgid "Pulls branches from a netsync server" msgstr "hämta grenar som matchar MÖNSTER till netsync-server på ADRESS" -#: cmd_netsync.cc:149 cmd_netsync.cc:253 +#: cmd_netsync.cc:145 +#, fuzzy +msgid "" +"This pulls all branches that match the pattern given in PATTERN from the " +"netsync server at the address ADDRESS." +msgstr "hämta grenar som matchar MÖNSTER till netsync-server på ADRESS" + +#: cmd_netsync.cc:155 cmd_netsync.cc:263 #, c-format msgid "doing anonymous pull; use -kKEYNAME if you need authentication" msgstr "hämtar anonymt; använd -kNYCKELNAMN om du behöver autentisera" -#: cmd_netsync.cc:156 -msgid "sync branches matching PATTERN with netsync server at ADDRESS" +#: cmd_netsync.cc:163 +#, fuzzy +msgid "Synchronizes branches with a netsync server" msgstr "synkronisera grenar som matchar MÖNSTER till netsync-server på ADRESS" -#: cmd_netsync.cc:197 +#: cmd_netsync.cc:164 +#, fuzzy +msgid "" +"This synchronizes branches that match the pattern given in PATTERN with the " +"netsync server at the address ADDRESS." +msgstr "synkronisera grenar som matchar MÖNSTER till netsync-server på ADRESS" + +#: cmd_netsync.cc:207 msgid "ADDRESS[:PORTNUMBER] [DIRECTORY]" msgstr "ADRESS[:PORTNUMMER] [KATALOG]" -#: cmd_netsync.cc:198 +#: cmd_netsync.cc:208 +msgid "Checks out a revision from remote a database into a directory" +msgstr "" + +#: cmd_netsync.cc:209 +#, fuzzy 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" -"Otherwise, it will be the head of the branch supplied.\n" -"If no directory is given, the branch name will be used as directory" +"If a revision is given, that's the one that will be checked out. Otherwise, " +"it will be the head of the branch supplied. If no directory is given, the " +"branch name will be used as directory" msgstr "" "hämta en revision från servern till den angivna katalogen.\n" "Om en revision anges kommer just den att hämtas. Om ingen revision\n" "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:212 +#: cmd_netsync.cc:222 #, c-format msgid "you must specify a branch to clone" msgstr "du måste ange en gren som ska klonas" -#: cmd_netsync.cc:226 +#: cmd_netsync.cc:236 #, c-format msgid "clone destination directory '%s' already exists" msgstr "klonarbetskatalogen '%s' finns redan" -#: cmd_netsync.cc:295 cmd_ws_commit.cc:525 cmd_ws_commit.cc:1236 +#: cmd_netsync.cc:305 cmd_ws_commit.cc:530 cmd_ws_commit.cc:1291 #, 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:303 cmd_ws_commit.cc:533 cmd_ws_commit.cc:1242 +#: cmd_netsync.cc:313 cmd_ws_commit.cc:538 cmd_ws_commit.cc:1297 #, c-format msgid "branch %s has multiple heads:" msgstr "grenen %s har flera löv:" -#: cmd_netsync.cc:306 cmd_ws_commit.cc:536 cmd_ws_commit.cc:1245 +#: cmd_netsync.cc:316 cmd_ws_commit.cc:541 cmd_ws_commit.cc:1300 #, c-format msgid "choose one with '%s checkout -r'" msgstr "välj ett med '%s update -r'" -#: cmd_netsync.cc:307 cmd_ws_commit.cc:537 cmd_ws_commit.cc:1246 +#: cmd_netsync.cc:317 cmd_ws_commit.cc:542 cmd_ws_commit.cc:1301 #, c-format msgid "branch %s has multiple heads" msgstr "grenen %s har flera löv" -#: cmd_netsync.cc:323 cmd_ws_commit.cc:553 cmd_ws_commit.cc:1229 +#: cmd_netsync.cc:333 cmd_ws_commit.cc:558 cmd_ws_commit.cc:1284 #, c-format msgid "revision %s is not a member of branch %s" msgstr "revisionen %s är inte med i grenen %s" -#: cmd_netsync.cc:360 +#: cmd_netsync.cc:370 #, c-format msgid "pid file '%s' already exists" msgstr "pid-filen '%s' finns redan" -#: cmd_netsync.cc:362 +#: cmd_netsync.cc:372 #, c-format msgid "failed to create pid file '%s'" msgstr "misslyckades med att skapa pid-filen %s" -#: cmd_netsync.cc:385 -msgid "serve the database to connecting clients" +#: cmd_netsync.cc:395 +#, fuzzy +msgid "Serves the database to connecting clients" msgstr "servera databasen till anslutande klienter" -#: cmd_netsync.cc:401 +#: cmd_netsync.cc:412 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1574,7 +1941,7 @@ msgstr "" "behöver tillstånd att använda ett permanent lösenord (se lua-" "rutinenpersist_phrase_ok())" -#: cmd_netsync.cc:407 +#: cmd_netsync.cc:418 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1585,70 +1952,75 @@ msgstr "RCSFIL..." msgstr "RCSFIL..." #: cmd_othervcs.cc:17 +#, fuzzy +msgid "Parses versions in RCS files" +msgstr "uttyder RCS-fil %s" + +#: cmd_othervcs.cc:18 +#, fuzzy msgid "" -"parse versions in RCS files\n" -"this command doesn't reconstruct or import revisions.you probably want " -"cvs_import" +"This command doesn't reconstruct or import revisions. You probably want to " +"use cvs_import." msgstr "" "läser versioner från RCS-filer\n" "detta kommando importerar inte revisioner; du vill antagligen använda\n" "cvs_import" #: cmd_othervcs.cc:33 -msgid "rcs" -msgstr "rcs" - -#: cmd_othervcs.cc:33 msgid "CVSROOT" msgstr "CVSROOT" #: cmd_othervcs.cc:34 -msgid "import all versions in CVS repository" +#, fuzzy +msgid "Imports all versions in a CVS repository" msgstr "importera alla revisioner i ett CVS-arkiv" -#: cmd_packet.cc:22 cmd_packet.cc:51 cmd_packet.cc:131 -msgid "packet i/o" -msgstr "paket-I/O" - -#: cmd_packet.cc:22 cmd_packet.cc:51 +#: cmd_packet.cc:22 cmd_packet.cc:52 msgid "ID" msgstr "ID" #: cmd_packet.cc:23 -msgid "write public key packet to stdout" +#, fuzzy +msgid "Prints a public key packet" msgstr "skriv it datapaket för publik nyckel till stdout" -#: cmd_packet.cc:45 +#: cmd_packet.cc:46 #, c-format msgid "public key '%s' does not exist" msgstr "den publika nyckeln '%s' finns inte" -#: cmd_packet.cc:52 -msgid "write private key packet to stdout" +#: cmd_packet.cc:53 +#, fuzzy +msgid "Prints a private key packet" msgstr "skriv it datapaket för privat nyckel till stdout" -#: cmd_packet.cc:60 +#: cmd_packet.cc:62 #, 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:132 -msgid "read packets from files or stdin" +#: cmd_packet.cc:134 +#, fuzzy +msgid "Reads packets from files" msgstr "läs paket från filer eller stdin" -#: cmd_packet.cc:140 +#: cmd_packet.cc:135 +msgid "If no files are provided, the standard input is used." +msgstr "" + +#: cmd_packet.cc:143 #, c-format msgid "no packets found on stdin" msgstr "inga paket hittade i stdin" -#: cmd_packet.cc:152 +#: cmd_packet.cc:155 #, 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:156 +#: cmd_packet.cc:159 #, c-format msgid "read %d packet" msgid_plural "read %d packets" @@ -1746,75 +2118,85 @@ msgstr "den magiska raden är inte bortt msgstr "den magiska raden är inte borttagen; arkivering avbryts" #: cmd_ws_commit.cc:146 -msgid "revert file(s), dir(s) or entire workspace (\".\")" -msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")" +#, fuzzy +msgid "Reverts files and/or directories" +msgstr "ingen sådan fil eller katalog: '%s'" -#: cmd_ws_commit.cc:153 +#: cmd_ws_commit.cc:147 +msgid "" +"In order to revert the entire workspace, specify \".\" as the file name." +msgstr "" + +#: cmd_ws_commit.cc:155 #, 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:183 +#: cmd_ws_commit.cc:185 #, c-format msgid "no missing files to revert" msgstr "inga saknade filer att återställa" -#: cmd_ws_commit.cc:238 +#: cmd_ws_commit.cc:240 #, c-format msgid "reverting %s" msgstr "återställer %s" -#: cmd_ws_commit.cc:242 +#: cmd_ws_commit.cc:244 #, 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:255 +#: cmd_ws_commit.cc:257 #, c-format msgid "recreating %s/" msgstr "återställer %s/" -#: cmd_ws_commit.cc:276 -msgid "disapprove of a particular revision" +#: cmd_ws_commit.cc:278 +#, fuzzy +msgid "Disapproves a particular revision" msgstr "underkänn en specifik revision" -#: cmd_ws_commit.cc:292 +#: cmd_ws_commit.cc:295 #, 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:295 +#: cmd_ws_commit.cc:298 #, c-format msgid "need --branch argument for disapproval" msgstr "för underkännande behöver en gren anges med --branch" -#: cmd_ws_commit.cc:328 +#: cmd_ws_commit.cc:331 msgid "[DIRECTORY...]" msgstr "[KATALOG...]" -#: cmd_ws_commit.cc:329 -msgid "create one or more directories and add them to the workspace" +#: cmd_ws_commit.cc:332 +#, fuzzy +msgid "Creates directories and adds them to the workspace" msgstr "skapa en eller flera kataloger och lägg till dem i arbetskopian" -#: cmd_ws_commit.cc:349 +#: cmd_ws_commit.cc:353 #, c-format msgid "directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: cmd_ws_commit.cc:356 +#: cmd_ws_commit.cc:360 #, c-format msgid "ignoring directory '%s' [see .mtn-ignore]" msgstr "ignorerar katalogen '%s' [se .mtn-ignore]" -#: cmd_ws_commit.cc:373 -msgid "add files to workspace" +#: cmd_ws_commit.cc:377 +#, fuzzy +msgid "Adds files to the workspace" msgstr "lägg till filer i arbetskopian" -#: cmd_ws_commit.cc:406 -msgid "drop files from workspace" +#: cmd_ws_commit.cc:411 +#, fuzzy +msgid "Drops files from the workspace" msgstr "överge filer i arbetskopian" -#: cmd_ws_commit.cc:436 +#: cmd_ws_commit.cc:440 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1822,19 +2204,25 @@ msgstr "" "KÄLLA MÅL\n" "KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG" -#: cmd_ws_commit.cc:438 -msgid "rename entries in the workspace" +#: cmd_ws_commit.cc:442 +#, fuzzy +msgid "Renames entries in the workspace" msgstr "byt namn på filer i arbetskopian" -#: cmd_ws_commit.cc:460 +#: cmd_ws_commit.cc:463 msgid "NEW_ROOT PUT_OLD" msgstr "NY_ROT PLACERA_GAMLA" -#: cmd_ws_commit.cc:461 +#: cmd_ws_commit.cc:464 +#, fuzzy +msgid "Renames the root directory" +msgstr "kan inte ta bort rotkatalogen" + +#: cmd_ws_commit.cc:465 +#, fuzzy 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" +"After this command, the directory that currently has the name NEW_ROOT will " +"be the root directory, and the directory that is currently the root " "directory will have name PUT_OLD.\n" "Use of --bookkeep-only is NOT recommended." msgstr "" @@ -1844,89 +2232,146 @@ msgstr "" "PLACERA_GAMLA.\n" "Det är INTE rekommenderat att använda --bookkeep-only." -#: cmd_ws_commit.cc:479 -msgid "show status of workspace" -msgstr "visa arbetskopians status" +#: cmd_ws_commit.cc:483 +msgid "Shows workspace's status information" +msgstr "" -#: cmd_ws_commit.cc:506 cmd_ws_commit.cc:1180 cmd_ws_commit.cc:1303 +#: cmd_ws_commit.cc:511 cmd_ws_commit.cc:1233 cmd_ws_commit.cc:1359 msgid "[DIRECTORY]" msgstr "[KATALOG]" -#: cmd_ws_commit.cc:507 +#: cmd_ws_commit.cc:512 +msgid "Checks out a revision from the database into a directory" +msgstr "" + +#: cmd_ws_commit.cc:513 +#, fuzzy 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" +"If a revision is given, that's the one that will be checked out. Otherwise, " +"it will be the head of the branch (given or implicit). 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." -#: cmd_ws_commit.cc:570 +#: cmd_ws_commit.cc:575 #, c-format msgid "you must specify a destination directory" msgstr "du måste ange en målkatalog" -#: cmd_ws_commit.cc:583 +#: cmd_ws_commit.cc:588 #, c-format msgid "checkout directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: cmd_ws_commit.cc:615 +#: cmd_ws_commit.cc:619 +#, fuzzy +msgid "Manages file attributes" +msgstr "sätt, hämta eller ta bort attribut" + +#: cmd_ws_commit.cc:620 +#, fuzzy +msgid "This command is used to set, get or drop file attributes." +msgstr "sätt, hämta eller ta bort attribut" + +#: cmd_ws_commit.cc:622 cmd_ws_commit.cc:671 +#, fuzzy +msgid "PATH [ATTR]" +msgstr "SÖKVÄG [NYCKEL]" + +#: cmd_ws_commit.cc:623 +#, fuzzy +msgid "Removes attributes from a file" +msgstr "Inga attribut till '%s'" + +#: cmd_ws_commit.cc:624 msgid "" -"set PATH ATTR VALUE\n" -"get PATH [ATTR]\n" -"drop PATH [ATTR]" +"If no attribute is specified, this command removes all attributes attached " +"to the file given in PATH. Otherwise only removes the attribute specified " +"in ATTR." msgstr "" -"set SÖKVÄG ATTR VÄRDE\n" -"get SÖKVÄG [ATTR]\n" -"drop SÖKVÄG [ATTR]" -#: cmd_ws_commit.cc:616 -msgid "set, get or drop file attributes" -msgstr "sätt, hämta eller ta bort attribut" - -#: cmd_ws_commit.cc:632 cmd_ws_commit.cc:755 cmd_ws_commit.cc:859 -#: cmd_ws_commit.cc:902 +#: cmd_ws_commit.cc:642 cmd_ws_commit.cc:691 cmd_ws_commit.cc:743 +#: cmd_ws_commit.cc:805 cmd_ws_commit.cc:912 cmd_ws_commit.cc:958 #, c-format msgid "Unknown path '%s'" msgstr "Okänd sökväg '%s'" -#: cmd_ws_commit.cc:661 cmd_ws_commit.cc:916 +#: cmd_ws_commit.cc:657 cmd_ws_commit.cc:972 #, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "Sökvägen '%s' har inget attribut '%s'" -#: cmd_ws_commit.cc:692 +#: cmd_ws_commit.cc:672 +#, fuzzy +msgid "Gets the values of a file's attributes" +msgstr "sätt, hämta eller ta bort attribut" + +#: cmd_ws_commit.cc:673 +msgid "" +"If no attribute is specified, this command prints all attributes attached to " +"the file given in PATH. Otherwise it only prints the attribute specified in " +"ATTR." +msgstr "" + +#: cmd_ws_commit.cc:707 #, c-format msgid "No attributes for '%s'" msgstr "Inga attribut till '%s'" -#: cmd_ws_commit.cc:703 +#: cmd_ws_commit.cc:719 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Inget attribut '%s' för sökvägen '%s'" -#: cmd_ws_commit.cc:844 +#: cmd_ws_commit.cc:724 +#, fuzzy +msgid "PATH ATTR VALUE" +msgstr "SÖKVÄG NYCKEL VÄRDE" + +#: cmd_ws_commit.cc:725 +msgid "Sets an attribute on a file" +msgstr "" + +#: cmd_ws_commit.cc:726 +msgid "" +"Sets the attribute given on ATTR to the value specified in VALUE for the " +"file mentioned in PATH." +msgstr "" + +#: cmd_ws_commit.cc:780 +msgid "Prints all attributes for the specified path" +msgstr "" + +#: cmd_ws_commit.cc:894 msgid "PATH KEY VALUE" msgstr "SÖKVÄG NYCKEL VÄRDE" -#: cmd_ws_commit.cc:887 +#: cmd_ws_commit.cc:895 +msgid "Sets an attribute on a certain path" +msgstr "" + +#: cmd_ws_commit.cc:940 msgid "PATH [KEY]" msgstr "SÖKVÄG [NYCKEL]" -#: cmd_ws_commit.cc:932 -msgid "commit workspace to database" +#: cmd_ws_commit.cc:941 +msgid "Drops an attribute or all of them from a certain path" +msgstr "" + +#: cmd_ws_commit.cc:987 +#, fuzzy +msgid "Commits workspace changes to the database" msgstr "arkivera arbetskopian i databasen" -#: cmd_ws_commit.cc:966 +#: cmd_ws_commit.cc:1022 #, c-format msgid "no changes to commit" msgstr "inga ändringar att arkivera" -#: cmd_ws_commit.cc:983 +#: cmd_ws_commit.cc:1039 #, c-format msgid "" "parent revisions of this commit are in different branches:\n" @@ -1937,12 +2382,12 @@ msgstr "" "'%s' och '%s'.\n" "var god ange en gren för denna arkivering med --branch." -#: cmd_ws_commit.cc:994 +#: cmd_ws_commit.cc:1050 #, c-format msgid "beginning commit on branch '%s'" msgstr "börjar arkivering av ändringar i grenen '%s'" -#: cmd_ws_commit.cc:1003 +#: cmd_ws_commit.cc:1059 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1953,37 +2398,37 @@ msgstr "" "kanske ta bort eller flytta på _MTN/log\n" "eller ta bort --message/--message-file från kommandoraden?" -#: cmd_ws_commit.cc:1018 +#: cmd_ws_commit.cc:1074 #, c-format msgid "empty log message; commit canceled" msgstr "tomt loggmeddelande; arkivering avbryts" -#: cmd_ws_commit.cc:1040 +#: cmd_ws_commit.cc:1096 #, c-format msgid "log message rejected by hook: %s" msgstr "loggmeddelandet förkastas: %s" -#: cmd_ws_commit.cc:1051 +#: cmd_ws_commit.cc:1107 #, c-format msgid "revision %s already in database" msgstr "revisionen %s finns redan i databasen" -#: cmd_ws_commit.cc:1088 cmd_ws_commit.cc:1117 +#: cmd_ws_commit.cc:1144 cmd_ws_commit.cc:1173 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "filen '%s' ändrades under arkivering, avbryter" -#: cmd_ws_commit.cc:1099 +#: cmd_ws_commit.cc:1155 #, 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:1141 +#: cmd_ws_commit.cc:1197 #, c-format msgid "committed revision %s" msgstr "arkiverade revisionen %s" -#: cmd_ws_commit.cc:1147 +#: cmd_ws_commit.cc:1203 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1992,97 +2437,179 @@ 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:1181 -msgid "setup a new workspace directory, default to current" +#: cmd_ws_commit.cc:1234 +#, fuzzy +msgid "Sets up a new workspace directory" msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)" -#: cmd_ws_commit.cc:1187 +#: cmd_ws_commit.cc:1235 +#, fuzzy +msgid "If no directory is specified, uses the current directory." +msgstr "målkatalogen %s är inte en katalog" + +#: cmd_ws_commit.cc:1241 #, c-format msgid "need --branch argument for setup" msgstr "du måste ange en gren med --branch till kommandot \"setup\"" -#: cmd_ws_commit.cc:1203 +#: cmd_ws_commit.cc:1257 msgid "DIRECTORY" msgstr "KATALOG" -#: cmd_ws_commit.cc:1204 -msgid "import the contents of the given directory tree into a given branch" +#: cmd_ws_commit.cc:1258 +#, fuzzy +msgid "Imports the contents of a directory into a branch" msgstr "importera den givna katalogens innehåll till den givna grenen" -#: cmd_ws_commit.cc:1215 +#: cmd_ws_commit.cc:1270 #, c-format msgid "you must specify a directory to import" msgstr "du måste ange en katalog att importera" -#: cmd_ws_commit.cc:1255 +#: cmd_ws_commit.cc:1310 #, c-format msgid "import directory '%s' doesn't exists" msgstr "importkatalogen '%s' finns inte" -#: cmd_ws_commit.cc:1256 +#: cmd_ws_commit.cc:1311 #, c-format msgid "import directory '%s' is a file" msgstr "importkatalogen '%s' är en fil" -#: cmd_ws_commit.cc:1304 -msgid "" -"migrate a workspace directory's metadata to the latest format; defaults to " -"the current workspace" +#: cmd_ws_commit.cc:1360 +#, fuzzy +msgid "Migrates a workspace directory's metadata to the latest format" msgstr "" "migrera en arbetskopias metadata till det senaste formatet; nuvarande " "katalog avses om inget annat anges" -#: cmd_ws_commit.cc:1317 -msgid "refresh the inodeprint cache" +#: cmd_ws_commit.cc:1361 +#, fuzzy +msgid "If no directory is given, defaults to the current workspace." +msgstr "filen '%s' är okänd i denna arbetskopia" + +#: cmd_ws_commit.cc:1374 +#, fuzzy +msgid "Refreshes the inodeprint cache" msgstr "uppdatera inodeprint-cachen" -#: commands.cc:142 commands.cc:250 +#: commands.cc:57 +msgid "Commands that aid in scripted execution" +msgstr "" + +#: commands.cc:60 +#, fuzzy +msgid "Commands that manipulate the database" +msgstr "gör ändringar direkt i databasen" + +#: commands.cc:63 +msgid "Commands that aid in program debugging" +msgstr "" + +#: commands.cc:66 +msgid "Commands for information retrieval" +msgstr "" + +#: commands.cc:69 +msgid "Commands to manage keys and certificates" +msgstr "" + +#: commands.cc:72 +msgid "Commands that access the network" +msgstr "" + +#: commands.cc:75 +msgid "Commands for packet reading and writing" +msgstr "" + +#: commands.cc:78 +msgid "Commands for interaction with RCS and CVS" +msgstr "" + +#: commands.cc:81 +#, fuzzy +msgid "Commands to review revisions" +msgstr "uppdaterad till revisionen %s" + +#: commands.cc:84 +msgid "Commands to manipulate the tree" +msgstr "" + +#: commands.cc:87 +msgid "Commands to manage persistent variables" +msgstr "" + +#: commands.cc:90 +msgid "Commands that deal with the workspace" +msgstr "" + +#: commands.cc:466 #, c-format msgid "unknown command '%s'" msgstr "okänt kommando '%s'" -#: commands.cc:153 +#: commands.cc:476 #, c-format -msgid "command '%s' has multiple ambiguous expansions:" -msgstr "kommandot '%s' har mer än en betydelse:" +msgid "'%s' is ambiguous; possible completions are:" +msgstr "" -#: commands.cc:186 -msgid "commands:" -msgstr "kommandon:" +#: commands.cc:610 +#, fuzzy, c-format +msgid "Aliases: %s." +msgstr "Synonym för %s" -#: commands.cc:284 +#: commands.cc:654 +#, c-format +msgid "command '%s' is invalid; it is a group" +msgstr "" + +#: commands.cc:657 +#, fuzzy, c-format +msgid "no subcommand specified for '%s'" +msgstr "filen '%s' finns inte" + +#: commands.cc:660 +#, c-format +msgid "could not match '%s' to a subcommand of '%s'" +msgstr "" + +#: commands.cc:681 msgid "command [ARGS...]" msgstr "kommandon [ARGUMENT...]" -#: commands.cc:285 -msgid "display command help" -msgstr "skriv ut hjälptext" +#: commands.cc:682 +msgid "Displays help about commands and options" +msgstr "" -#: commands.cc:414 +#: commands.cc:699 +msgid "Triggers the specified kind of crash" +msgstr "" + +#: commands.cc:813 #, c-format msgid "expanding selection '%s'" msgstr "expanderar valet '%s'" -#: commands.cc:422 +#: commands.cc:821 #, c-format msgid "no match for selection '%s'" msgstr "det finns inget som matchar '%s'" -#: commands.cc:429 +#: commands.cc:828 #, c-format msgid "expanded to '%s'" msgstr "expanderar till '%s'" -#: commands.cc:446 +#: commands.cc:845 #, c-format msgid "selection '%s' has multiple ambiguous expansions:" msgstr "valet '%s' har mer än en möjlig betydelse:" -#: commands.cc:463 +#: commands.cc:862 msgid "note: " msgstr "obs: " -#: commands.cc:464 +#: commands.cc:863 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -2091,7 +2618,7 @@ msgstr "" "grenen '%s' har mer än ett löv\n" "du kanske borde överväga '%s merge'" -#: commands.cc:479 +#: commands.cc:878 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message och --message-file får inte anges samtidigt" @@ -2442,7 +2969,7 @@ msgstr "" "detta är en väldigt gammal databas; den behöver uppgraderas\n" "var god läs README.changesets för detaljer" -#: database.cc:487 sanity.cc:231 schema_migration.cc:61 +#: database.cc:487 sanity.cc:232 schema_migration.cc:61 msgid "error: " msgstr "fel: " @@ -2458,7 +2985,7 @@ msgstr " (är inte en monotonedatabas)" msgid " (not a monotone database)" msgstr " (är inte en monotonedatabas)" -#: database.cc:573 database.cc:604 database.cc:1043 database.cc:1063 +#: database.cc:573 database.cc:604 database.cc:1063 database.cc:1083 #, c-format msgid "%u" msgstr "%u" @@ -2541,67 +3068,67 @@ msgstr "ville ha %d rader, fick %d i dat msgid "wanted %d rows got %d in query: %s" msgstr "ville ha %d rader, fick %d i databasfråga: %s" -#: database.cc:1706 +#: database.cc:1721 #, c-format msgid "file preimage '%s' missing in db" msgstr "\"preimage\" för filen '%s' saknas i databasen" -#: database.cc:1707 +#: database.cc:1722 #, c-format msgid "dropping delta '%s' -> '%s'" msgstr "slänger deltat '%s' -> '%s'" -#: database.cc:1984 +#: database.cc:2005 #, c-format msgid "missing prerequisite revision '%s'" msgstr "saknar nödvändig revision '%s'" -#: database.cc:1985 database.cc:1996 database.cc:2012 database.cc:2020 +#: database.cc:2006 database.cc:2017 database.cc:2033 database.cc:2041 #, c-format msgid "dropping revision '%s'" msgstr "slänger revisionen '%s'" -#: database.cc:1995 +#: database.cc:2016 #, c-format msgid "missing prerequisite file '%s'" msgstr "saknar nödvändig fil '%s'" -#: database.cc:2010 +#: database.cc:2031 #, c-format msgid "missing prerequisite file pre-delta '%s'" msgstr "saknar nödvändigt predelta till fil '%s'" -#: database.cc:2018 +#: database.cc:2039 #, c-format msgid "missing prerequisite file post-delta '%s'" msgstr "saknar nödvändigt postdelta till fil '%s'" -#: database.cc:2309 +#: database.cc:2330 #, c-format msgid "key '%s' is not equal to key '%s' in database" msgstr "nyckeln '%s' är inte samma som nyckeln '%s' i databasen" -#: database.cc:2531 +#: database.cc:2552 #, c-format msgid "cert revision '%s' does not exist in db" msgstr "certrevision '%s' finns inte i databasen" -#: database.cc:2533 +#: database.cc:2554 #, c-format msgid "dropping cert" msgstr "slänger cert" -#: database.cc:3317 +#: database.cc:3338 #, c-format msgid "no database specified" msgstr "ingen databas angiven" -#: database.cc:3327 +#: database.cc:3348 #, c-format msgid "database %s does not exist" msgstr "databasen %s finns inte" -#: database.cc:3345 +#: database.cc:3366 #, c-format msgid "" "You gave a database option of: \n" @@ -2614,17 +3141,17 @@ msgstr "" "Det är en arbetskopia. Du kanske menade: \n" "%s" -#: database.cc:3350 +#: database.cc:3371 #, c-format msgid "%s is a directory, not a database" msgstr "%s är en katalog, inte en databas" -#: database.cc:3360 +#: database.cc:3381 #, c-format msgid "database %s already exists" msgstr "databasen %s finns redan" -#: database.cc:3365 +#: database.cc:3386 #, c-format msgid "" "existing (possibly stale) journal file '%s' has same stem as new database '%" @@ -2635,22 +3162,22 @@ msgstr "" "databasen '%s'\n" "avbryter skapandet av databasen" -#: diff_patch.cc:613 +#: diff_patch.cc:621 #, c-format msgid "file '%s' does not exist in workspace" msgstr "filen '%s' existerar inte i arbetskopian" -#: diff_patch.cc:614 +#: diff_patch.cc:622 #, c-format msgid "'%s' in workspace is a directory, not a file" msgstr "'%s' i arbetskopian är en katalog, inte en fil" -#: diff_patch.cc:618 +#: diff_patch.cc:626 #, c-format msgid "file %s in workspace has id %s, wanted %s" msgstr "filen %s i arbetskopian har identiteten %s, %s eftersöktes" -#: diff_patch.cc:743 +#: diff_patch.cc:751 #, c-format msgid "" "help required for 3-way merge\n" @@ -2799,7 +3326,7 @@ msgstr "fick felet %s när sökväg för msgid "caught runtime error %s constructing file path for %s" msgstr "fick felet %s när sökväg för %s byggdes" -#: file_io.cc:542 work.cc:1312 +#: file_io.cc:542 work.cc:1313 #, c-format msgid "no such file or directory: '%s'" msgstr "ingen sådan fil eller katalog: '%s'" @@ -2894,7 +3421,7 @@ msgstr "Katalogen '%s' finns inte" msgid "Directory '%s' does not exist" msgstr "Katalogen '%s' finns inte" -#: lua.cc:487 lua.cc:522 rcs_import.cc:1229 work.cc:1603 +#: lua.cc:487 lua.cc:522 rcs_import.cc:1229 work.cc:1604 #, c-format msgid "'%s' is not a directory" msgstr "'%s' är inte en katalog" @@ -2924,26 +3451,35 @@ 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:275 +#: monotone.cc:288 #, c-format msgid "Usage: %s [OPTION...] command [ARG...]" msgstr "Användning: %s [FLAGGOR...] kommando [ARGUMENT...]" -#: monotone.cc:283 +#: monotone.cc:299 #, c-format msgid "Options specific to '%s %s':" msgstr "Specifika flaggor för '%s %s':" -#: monotone.cc:307 +#: monotone.cc:325 msgid "error: memory exhausted" msgstr "fel: slut på minnet" #: mt_version.cc:35 +msgid "Shows the program version" +msgstr "" + +#: mt_version.cc:40 +#, fuzzy, c-format +msgid "no arguments allowed" +msgstr "inga argument behövs" + +#: mt_version.cc:53 #, c-format msgid "%s (base revision: %s)" msgstr "%s (grundrevision: %s)" -#: mt_version.cc:55 +#: mt_version.cc:73 #, c-format msgid "" "Running on : %s\n" @@ -3552,7 +4088,8 @@ msgstr "" "jämföra" #: options_list.hh:262 -msgid "print detailed version number, then exit" +#, fuzzy +msgid "print detailed version number" msgstr "skriv ut detaljerad versionsinformation och avsluta sedan omedelbart" #: options_list.hh:269 @@ -3859,12 +4396,16 @@ msgstr "färdig med återskapandet av ca msgid "finished regenerating cached rosters and heights" msgstr "färdig med återskapandet av cachade listor och höjder" -#: revision.cc:1781 +#: revision.cc:1773 +msgid "Shows a revision's height" +msgstr "" + +#: revision.cc:1783 #, c-format msgid "cached height: %s" msgstr "cachade höjder: %s" -#: revision.cc:1864 +#: revision.cc:1866 #, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" @@ -3902,17 +4443,17 @@ msgstr "missbruk: " msgid "misuse: " msgstr "missbruk: " -#: sanity.cc:238 +#: sanity.cc:239 #, c-format msgid "%s:%d: invariant '%s' violated" msgstr "%s:%d: invariant '%s' ej uppfylld" -#: sanity.cc:252 +#: sanity.cc:253 #, c-format msgid "%s:%d: index '%s' = %d overflowed vector '%s' with size %d" msgstr "%s:%d; index '%s' = %d blev större än vektorn '%s' med storlek %d" -#: sanity.cc:273 +#: sanity.cc:274 #, c-format msgid "Current work set: %i items" msgstr "Nuvarande arbetsmängd: %i delar" @@ -3927,17 +4468,17 @@ msgstr "okänd väljartyp: %c" msgid "unknown selector type: %c" msgstr "okänd väljartyp: %c" -#: selectors.cc:91 +#: selectors.cc:93 #, c-format msgid "selector '%s' is not a valid date\n" msgstr "väljaren '%s' är inte en korrekt datumangivelse\n" -#: selectors.cc:97 +#: selectors.cc:111 #, c-format msgid "selector '%s' is not a valid date (%s)" msgstr "väljaren '%s' är inte en korrekt datumangivelse (%s)" -#: selectors.cc:100 +#: selectors.cc:115 #, c-format msgid "expanded date '%s' -> '%s'\n" msgstr "expanderade datumangivelsen '%s' -> '%s'\n" @@ -4161,11 +4702,11 @@ msgstr "varning: " msgstr "varning: " #: ui.cc:477 -#, c-format +#, fuzzy, c-format msgid "" "fatal: %s\n" "this is almost certainly a bug in monotone.\n" -"please send this error message, the output of '%s --full-version',\n" +"please send this error message, the output of '%s version --full',\n" "and a description of what you were doing to %s." msgstr "" "allvarligt: %s\n" @@ -4281,87 +4822,87 @@ msgstr "" "kan inte lägga till %s eftersom %s redan är registrerad som en fil i " "arbetskopians manifest" -#: work.cc:807 +#: work.cc:808 #, c-format msgid "dropping %s" msgstr "slänger %s" -#: work.cc:818 work.cc:829 +#: work.cc:819 work.cc:830 #, c-format msgid "path %s already exists" msgstr "sökvägen %s finns redan" -#: work.cc:848 +#: work.cc:849 #, c-format msgid "renaming %s to %s" msgstr "byter namn på %s till %s" -#: work.cc:852 +#: work.cc:853 #, c-format msgid "adding %s" msgstr "lägger till %s" -#: work.cc:884 +#: work.cc:885 #, c-format msgid "file '%s' does not exist" msgstr "filen '%s' finns inte" -#: work.cc:885 +#: work.cc:886 #, c-format msgid "file '%s' is a directory" msgstr "filen '%s' är en katalog" -#: work.cc:890 +#: work.cc:891 #, c-format msgid "content of file '%s' has changed, not overwriting" msgstr "innehållet i filen '%s' har ändrats, skriver inte över" -#: work.cc:891 +#: work.cc:892 #, c-format msgid "modifying %s" msgstr "ändrar %s" -#: work.cc:945 +#: work.cc:946 #, c-format msgid "cannot drop non-empty directory '%s'" msgstr "kan inte ta bort den icke-tomma katalogen '%s'" -#: work.cc:976 +#: work.cc:977 #, c-format msgid "attach node %d blocked by unversioned path '%s'" msgstr "bindning av nod %d blockerad av icke-noterad sökväg '%s'" -#: work.cc:990 +#: work.cc:991 #, c-format msgid "attach node %d blocked by blocked parent '%s'" msgstr "bindning av nod %d blockerad av icke-noterad sökväg '%s'" -#: work.cc:1021 +#: work.cc:1022 #, c-format msgid "%d workspace conflicts" msgstr "%d konflikter i arbetskopian" -#: work.cc:1185 +#: work.cc:1186 #, c-format msgid "missing directory '%s'" msgstr "saknar katalogen '%s'" -#: work.cc:1190 +#: work.cc:1191 #, c-format msgid "not a directory '%s'" msgstr "'%s' är inte en katalog" -#: work.cc:1203 +#: work.cc:1204 #, c-format msgid "missing file '%s'" msgstr "saknar filen '%s'" -#: work.cc:1208 +#: work.cc:1209 #, c-format msgid "not a file '%s'" msgstr "'%s' är inte en fil" -#: work.cc:1219 +#: work.cc:1220 #, c-format msgid "" "%d missing items; use '%s ls missing' to view\n" @@ -4381,103 +4922,103 @@ msgstr "" " '%s drop --missing' eller\n" " '%s revert --missing'" -#: work.cc:1380 +#: work.cc:1381 #, c-format msgid "unable to drop the root directory" msgstr "kan inte ta bort rotkatalogen" -#: work.cc:1383 +#: work.cc:1384 #, c-format msgid "skipping %s, not currently tracked" msgstr "hoppar över %s, ej noterad i arbetskopian för närvarande" -#: work.cc:1393 +#: work.cc:1394 #, c-format msgid "cannot remove %s/, it is not empty" msgstr "kan inte ta bort %s/, den är inte tom" -#: work.cc:1411 +#: work.cc:1412 #, c-format msgid "directory %s not empty - it will be dropped but not deleted" msgstr "" "katalogen %s är inte tom - den kommer att slängas administrativt men inte " "fysiskt" -#: work.cc:1421 +#: work.cc:1422 #, c-format msgid "file %s changed - it will be dropped but not deleted" msgstr "" "filen %s är ändrad - den kommer att slängas administrativt men inte fysiskt" -#: work.cc:1424 +#: work.cc:1425 #, c-format msgid "dropping %s from workspace manifest" msgstr "tar bort %s från arbetskopians manifest" -#: work.cc:1465 +#: work.cc:1466 #, c-format msgid "source file %s is not versioned" msgstr "källfilen %s är inte versionshanterad" -#: work.cc:1467 +#: work.cc:1468 #, c-format msgid "destination name %s already exists as an unversioned directory" msgstr "målet %s finns redan som en katalog som inte är versionshanterad" -#: work.cc:1475 +#: work.cc:1476 #, c-format msgid "destination dir %s/ is not versioned (perhaps add it?)" msgstr "" "målkatalogen %s/ är inte noterad i arbetskopian (kanske du ska addera den?)" -#: work.cc:1478 +#: work.cc:1479 #, 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:1488 +#: work.cc:1489 #, c-format msgid "empty path %s is not allowed" msgstr "tom sökväg %s ej tillåten" -#: work.cc:1502 +#: work.cc:1503 #, c-format msgid "%s does not exist in current manifest" msgstr "%s finns inte i nuvarande manifest" -#: work.cc:1505 +#: work.cc:1506 #, c-format msgid "destination %s already exists in current manifest" msgstr "målet %s finns redan i nuvarande manifest" -#: work.cc:1511 +#: work.cc:1512 #, c-format msgid "destination directory %s does not exist in current manifest" msgstr "målkatalogen %s finns inte i nuvarande manifest" -#: work.cc:1513 +#: work.cc:1514 #, c-format msgid "destination directory %s is not a directory" msgstr "målkatalogen %s är inte en katalog" -#: work.cc:1522 +#: work.cc:1523 #, c-format msgid "renaming %s to %s in workspace manifest" msgstr "byter namn från %s till %s i arbetskopians manifest" -#: work.cc:1550 +#: work.cc:1551 #, c-format msgid "%s doesn't exist in workspace, skipping" msgstr "hoppar över %s, den existerar inte i arbetskopian" -#: work.cc:1554 +#: work.cc:1555 #, c-format msgid "destination %s already exists in workspace, skipping filesystem rename" msgstr "" "byter inte namn till %s i filsystemet, för den finns redan noterad i " "arbetskopian" -#: work.cc:1558 +#: work.cc:1559 #, c-format msgid "" "skipping move_path in filesystem %s->%s, source doesn't exist, destination " @@ -4486,35 +5027,35 @@ msgstr "" "kommer inte att genomföra namnbytet %s -> %s fysiskt, för källan finns inte " "och målet finns" -#: work.cc:1583 +#: work.cc:1584 #, 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:1585 +#: work.cc:1586 #, 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:1590 +#: work.cc:1591 #, 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:1600 +#: work.cc:1601 #, 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:1606 +#: work.cc:1607 #, c-format msgid "'%s' is in the way" msgstr "'%s' är i vägen" -#: work.cc:1646 +#: work.cc:1647 #, c-format msgid "" "workspace is locked\n" @@ -4602,57 +5143,57 @@ msgstr "denna arbetskopia är i aktuellt msgid "this workspace is in the current format, no migration is necessary." msgstr "denna arbetskopia är i aktuellt format, ingen migrering behövs." -#: unix/fs.cc:30 win32/fs.cc:27 +#: unix/fs.cc:32 win32/fs.cc:29 #, c-format msgid "cannot get working directory: %s" msgstr "kan inte finna katalogen vi står i: %s" -#: unix/fs.cc:38 win32/fs.cc:38 +#: unix/fs.cc:40 win32/fs.cc:40 #, c-format msgid "cannot change to directory %s: %s" msgstr "kan inte byta till katalog %s: %s" -#: unix/fs.cc:58 +#: unix/fs.cc:60 #, c-format msgid "could not find home directory for uid %d" msgstr "kunde inte finna hemkatalogen för uid %d" -#: unix/fs.cc:86 +#: unix/fs.cc:88 #, c-format msgid "could not find home directory for user %s" msgstr "kunde inte finns hemkatalogen för användaren %s" -#: unix/fs.cc:109 +#: unix/fs.cc:111 #, c-format msgid "error accessing file %s: %s" msgstr "fel när jag försökte nå filen %s: %s" -#: unix/fs.cc:118 +#: unix/fs.cc:120 #, c-format msgid "cannot handle special file %s" msgstr "kan inte hantera specialfilen %s" -#: unix/fs.cc:126 +#: unix/fs.cc:128 #, c-format msgid "renaming '%s' to '%s' failed: %s" msgstr "byta namn på '%s' till '%s' misslyckades: %s" -#: unix/fs.cc:190 win32/fs.cc:270 +#: unix/fs.cc:192 win32/fs.cc:272 #, c-format msgid "cannot create temp file %s: %s" msgstr "kan inte skapa tillfällig fil %s: %s" -#: unix/fs.cc:199 +#: unix/fs.cc:201 #, c-format msgid "all %d possible temporary file names are in use" msgstr "Alla %d möjliga tillfälliga filnamn används" -#: unix/fs.cc:239 win32/fs.cc:330 +#: unix/fs.cc:241 win32/fs.cc:332 #, c-format msgid "error writing to temp file %s: %s" msgstr "fel vid skrivning till tillfällig fil %s: %s" -#: unix/fs.cc:244 win32/fs.cc:337 +#: unix/fs.cc:246 win32/fs.cc:339 #, c-format msgid "" "giving up after four zero-length writes to %s (%d byte written, %d left)" @@ -4706,22 +5247,22 @@ msgstr "%u extra bytes från ssh-agent" msgid "%u extra bytes from ssh-agent" msgstr "%u extra bytes från ssh-agent" -#: win32/fs.cc:55 +#: win32/fs.cc:57 #, c-format msgid "could not determine configuration path" msgstr "kunde inte räkna ut vägen till konfigurationen" -#: win32/fs.cc:209 +#: win32/fs.cc:211 #, c-format msgid "renaming '%s' to '%s' failed: %s (%d)" msgstr "namnbyte av '%s' till '%s' misslyckades: %s (%d)" -#: win32/fs.cc:278 +#: win32/fs.cc:280 #, c-format msgid "cannot find a temporary file (tried %d possibilities)" msgstr "kan inte finna någon tillfällig fil (provade %d möjligheter)" -#: win32/fs.cc:305 +#: win32/fs.cc:307 #, c-format msgid "%s will be accessible to all users of this computer\n" msgstr "%s kommer att vara åtkomlig för alla användare på den här datorn\n" @@ -4736,12 +5277,133 @@ msgstr "Windows %s (%d.%d build %d, %s) msgid "Windows %s (%d.%d, build %d, %s) on %s" msgstr "Windows %s (%d.%d build %d, %s) på %s" +#~ msgid "debug" +#~ msgstr "felsökning" + +#~ msgid "automation" +#~ msgstr "automatisering" + +#~ msgid "database" +#~ msgstr "databas" + +#~ 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" +#~ "regenerate_caches\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" +#~ "regenerate_caches\n" +#~ "set_epoch GREN EPOK\n" + +#~ msgid "vars" +#~ msgstr "variabler" + +#~ msgid "set the database variable NAME to VALUE, in domain DOMAIN" +#~ msgstr "sätt databasvariabeln NAMN till VÄRDE i domänen DOMÄN" + +#~ msgid "remove the database variable NAME in domain DOMAIN" +#~ msgstr "ta bort databasvariabeln NAMN från domänen DOMÄN" + +#~ msgid "informative" +#~ msgstr "informativ" + +#~ msgid "key and cert" +#~ msgstr "nyckel och cert" + +#~ msgid "review" +#~ msgstr "granskning" + +#~ msgid "" +#~ "certs ID\n" +#~ "keys [PATTERN]\n" +#~ "branches [PATTERN]\n" +#~ "epochs [BRANCH [...]]\n" +#~ "tags\n" +#~ "vars [DOMAIN]\n" +#~ "known\n" +#~ "unknown\n" +#~ "ignored\n" +#~ "missing\n" +#~ "changed" +#~ msgstr "" +#~ "certs ID\n" +#~ "keys [MÖNSTER]\n" +#~ "branches [MÖNSTER]\n" +#~ "epochs [GREN [...]]\n" +#~ "tags\n" +#~ "vars [DOMÄN]\n" +#~ "known\n" +#~ "unknown\n" +#~ "ignored\n" +#~ "missing\n" +#~ "changed" + +#~ msgid "workspace" +#~ msgstr "arbetskopia" + +#~ msgid "tree" +#~ msgstr "träd" + +#~ msgid "network" +#~ msgstr "nätverk" + +#~ msgid "rcs" +#~ msgstr "rcs" + +#~ msgid "packet i/o" +#~ msgstr "paket-I/O" + +#~ msgid "revert file(s), dir(s) or entire workspace (\".\")" +#~ msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")" + +#~ msgid "show status of workspace" +#~ msgstr "visa arbetskopians status" + +#~ 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]" + +#~ msgid "command '%s' has multiple ambiguous expansions:" +#~ msgstr "kommandot '%s' har mer än en betydelse:" + +#~ msgid "commands:" +#~ msgstr "kommandon:" + +#~ msgid "display command help" +#~ msgstr "skriv ut hjälptext" + #~ msgid "FILE" #~ msgstr "FIL" -#~ msgid "file %s is unknown to the current workspace" -#~ msgstr "filen '%s' är okänd i denna arbetskopia" - #~ msgid "cannot open file %s for writing" #~ msgstr "kan inte öppna filen %s för skrivning" @@ -5085,15 +5747,6 @@ msgstr "Windows %s (%d.%d build %d, %s) #~ "var god kontakta %s så vi kan komma fram till ett bra sätt att migrera " #~ "detta" -#~ msgid "write file delta packet to stdout" -#~ msgstr "skriv ut datapaket för fildelta till stdout" - -#~ msgid "write revision data packet to stdout" -#~ msgstr "skriv ut datapaket för revision till stdout" - -#~ msgid "write file data packet to stdout" -#~ msgstr "skriv ut datapaket för fil till stdout" - #~ msgid "write cert packets to stdout" #~ msgstr "skriv ut datapaket för cert till stdout"