# # # patch "po/sv.po" # from [563e41fb5fccc4c9c1df6442d95122819b288b52] # to [9b72ff2ea7e180a8fa51c6b81b6ad7c15b5cfa1d] # ============================================================ --- po/sv.po 563e41fb5fccc4c9c1df6442d95122819b288b52 +++ po/sv.po 9b72ff2ea7e180a8fa51c6b81b6ad7c15b5cfa1d @@ -147,8 +147,8 @@ msgstr "" msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-07 20:19+0200\n" -"PO-Revision-Date: 2007-05-07 20:20+0200\n" +"POT-Creation-Date: 2007-05-10 13:19+0200\n" +"PO-Revision-Date: 2007-05-10 13:42+0200\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -186,7 +186,7 @@ msgstr "felsökning" msgid "debug" msgstr "felsökning" -#: asciik.cc:368 automate.cc:555 +#: asciik.cc:368 automate.cc:433 msgid "SELECTOR" msgstr "VÄLJARE" @@ -194,14 +194,14 @@ msgstr "visualisera revisionsträdet med msgid "prints an ASCII representation of the graph" msgstr "visualisera revisionsträdet med i ASCII" -#: asciik.cc:372 automate.cc:67 automate.cc:91 automate.cc:138 automate.cc:218 -#: automate.cc:364 automate.cc:455 automate.cc:480 automate.cc:558 -#: automate.cc:940 automate.cc:1073 automate.cc:1116 automate.cc:1142 -#: automate.cc:1169 automate.cc:1196 automate.cc:1230 automate.cc:1342 -#: automate.cc:1432 automate.cc:1491 automate.cc:1540 automate.cc:1599 -#: automate.cc:1648 automate.cc:1698 automate.cc:1752 automate.cc:1782 -#: automate.cc:1805 cmd_files.cc:221 cmd_files.cc:314 cmd_files.cc:337 -#: cmd_list.cc:678 +#: 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 #, c-format msgid "wrong argument count" msgstr "felaktigt antal givna argument" @@ -210,163 +210,155 @@ msgstr "[GREN]" msgid "[BRANCH]" msgstr "[GREN]" -#: automate.cc:88 automate.cc:135 automate.cc:1227 +#: automate.cc:88 automate.cc:135 automate.cc:1105 msgid "REV1 [REV2 [REV3 [...]]]" msgstr "REV1 [REV2 [REV3 [...]]]" -#: automate.cc:98 automate.cc:145 automate.cc:189 automate.cc:335 -#: automate.cc:370 automate.cc:374 automate.cc:458 automate.cc:483 -#: automate.cc:1237 cmd_list.cc:685 revision.cc:1778 +#: 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 #, c-format msgid "No such revision %s" msgstr "det finns ingen revision med identiteten %s" -#: automate.cc:183 automate.cc:329 +#: automate.cc:183 automate.cc:207 msgid "[REV1 [REV2 [REV3 [...]]]]" msgstr "[REV1 [REV2 [REV3 [...]]]]" -#: automate.cc:215 -msgid "FILE" -msgstr "FIL" - -#: automate.cc:235 automate.cc:754 automate.cc:990 cmd_files.cc:292 -#: cmd_files.cc:347 cmd_merging.cc:150 cmd_merging.cc:624 cmd_ws_commit.cc:159 -#, 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:240 -#, c-format -msgid "file %s is unknown to the current workspace" -msgstr "filen '%s' är okänd i denna arbetskopia" - -#: automate.cc:361 +#: automate.cc:239 msgid "NEW_REV [OLD_REV1 [OLD_REV2 [...]]]" msgstr "NY_REV [GAMMAL_REV1 [GAMMAL_REV2 [...]]]" -#: automate.cc:403 automate.cc:430 automate.cc:515 automate.cc:740 -#: automate.cc:983 automate.cc:1007 automate.cc:1293 cmd_automate.cc:78 +#: 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 #, c-format msgid "no arguments needed" msgstr "inga argument behövs" -#: automate.cc:452 automate.cc:477 cmd_list.cc:675 revision.cc:1772 +#: automate.cc:330 automate.cc:355 cmd_list.cc:675 revision.cc:1772 msgid "REV" msgstr "REV" -#: automate.cc:937 automate.cc:1070 cmd_merging.cc:951 +#: 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 +#, 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 msgid "[REVID]" msgstr "[REVID]" -#: automate.cc:965 automate.cc:1091 automate.cc:1548 automate.cc:1606 -#: automate.cc:1611 +#: automate.cc:843 automate.cc:969 automate.cc:1426 automate.cc:1484 +#: automate.cc:1489 #, c-format msgid "no revision %s found in database" msgstr "revisionen %s finns inte i databasen" -#: automate.cc:1113 automate.cc:1139 +#: automate.cc:991 automate.cc:1017 msgid "REVID" msgstr "REVID" -#: automate.cc:1124 automate.cc:1150 automate.cc:1205 automate.cc:1207 -#: automate.cc:1759 cmd_db.cc:37 cmd_diff_log.cc:396 cmd_diff_log.cc:423 +#: 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:545 cmd_ws_commit.cc:1005 commands.cc:407 +#: cmd_ws_commit.cc:546 cmd_ws_commit.cc:1222 commands.cc:407 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" -#: automate.cc:1166 cmd_files.cc:311 +#: automate.cc:1044 cmd_files.cc:311 msgid "FILEID" msgstr "FILID" -#: automate.cc:1177 +#: automate.cc:1055 #, c-format msgid "no such file '%s'" msgstr "filen '%s' finns inte" -#: automate.cc:1193 +#: automate.cc:1071 msgid "OLD_FILE NEW_FILE" msgstr "GAMMAL_FIL NY_FIL" -#: automate.cc:1339 +#: automate.cc:1217 msgid "[BRANCH_PATTERN]" msgstr "[GRENMÖNSTER]" -#: automate.cc:1429 +#: automate.cc:1307 msgid "KEYID PASSPHRASE" msgstr "NYCKELID LÖSEN" -#: automate.cc:1447 cmd_key_cert.cc:48 +#: automate.cc:1325 cmd_key_cert.cc:48 #, c-format msgid "key '%s' already exists" msgstr "nyckeln '%s' finns redan" -#: automate.cc:1450 cmd_key_cert.cc:51 +#: automate.cc:1328 cmd_key_cert.cc:51 #, c-format msgid "generating key-pair '%s'" msgstr "skapar nyckelparet '%s'" -#: automate.cc:1452 cmd_key_cert.cc:53 +#: automate.cc:1330 cmd_key_cert.cc:53 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "lagrar nyckelparet '%s' i %s/" -#: automate.cc:1488 +#: automate.cc:1366 msgid "OPTION" msgstr "FLAGGA" -#: automate.cc:1514 +#: automate.cc:1392 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "'%s' är en okänd inställning i arbetskopians metadata" -#: automate.cc:1537 +#: automate.cc:1415 msgid "REV FILE" msgstr "REV FIL" -#: automate.cc:1554 automate.cc:1617 +#: automate.cc:1432 automate.cc:1495 #, c-format msgid "file %s is unknown for revision %s" msgstr "filen %s är okänd i revision %s" -#: automate.cc:1596 +#: automate.cc:1474 msgid "REV1 FILE REV2" msgstr "REV1 FIL REV2" -#: automate.cc:1645 +#: automate.cc:1523 msgid "[FILEID] CONTENTS" msgstr "[FILID] INNEHÅLL" -#: automate.cc:1665 cmd_files.cc:241 +#: automate.cc:1543 cmd_files.cc:241 #, c-format msgid "no file version %s found in database" msgstr "filversionen %s finns inte i databasen" -#: automate.cc:1695 +#: automate.cc:1573 msgid "REVISION-DATA" msgstr "REVISIONS-DATA" -#: automate.cc:1732 +#: automate.cc:1610 #, 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:1749 +#: automate.cc:1627 msgid "REVISION-ID NAME VALUE" msgstr "REVISION CERTNAMN CERTVÄRDE" -#: automate.cc:1779 cmd_db.cc:124 +#: automate.cc:1657 cmd_db.cc:124 msgid "DOMAIN NAME VALUE" msgstr "DOMÄN NAMN VÄRDE" -#: automate.cc:1802 cmd_db.cc:140 +#: automate.cc:1680 cmd_db.cc:140 msgid "DOMAIN NAME" msgstr "DOMÄN NAMN" -#: automate.cc:1817 +#: automate.cc:1695 #, c-format msgid "variable not found" msgstr "variabeln finns inte" @@ -545,7 +537,7 @@ msgstr "det finns inga variabler med nam 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:478 +#: cmd_files.cc:276 cmd_list.cc:480 cmd_merging.cc:717 cmd_ws_commit.cc:479 #: commands.cc:284 msgid "informative" msgstr "informativ" @@ -601,8 +593,8 @@ 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:144 cmd_ws_commit.cc:371 -#: cmd_ws_commit.cc:404 cmd_ws_commit.cc:478 cmd_ws_commit.cc:714 +#: 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 msgid "[PATH]..." msgstr "[SÖKVÄG]..." @@ -708,7 +700,7 @@ msgstr "målets filidentitet finns inte" msgid "destination file id does not exist" msgstr "målets filidentitet finns inte" -#: cmd_files.cc:117 cmd_files.cc:218 +#: cmd_files.cc:117 cmd_files.cc:218 cmd_ws_commit.cc:732 msgid "PATH" msgstr "SÖKVÄG" @@ -900,7 +892,7 @@ msgstr "Opålitligt" 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:274 +#: cmd_key_cert.cc:292 cmd_ws_commit.cc:275 msgid "review" msgstr "granskning" @@ -920,7 +912,7 @@ msgstr "notera ett testresultat för en msgid "note the results of running a test on a revision" msgstr "notera ett testresultat för en revision" -#: cmd_key_cert.cc:278 cmd_ws_commit.cc:274 +#: cmd_key_cert.cc:278 cmd_ws_commit.cc:275 msgid "REVISION" msgstr "REVISION" @@ -1061,10 +1053,10 @@ 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:144 -#: cmd_ws_commit.cc:327 cmd_ws_commit.cc:371 cmd_ws_commit.cc:404 -#: cmd_ws_commit.cc:434 cmd_ws_commit.cc:459 cmd_ws_commit.cc:614 -#: cmd_ws_commit.cc:714 +#: 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" @@ -1159,9 +1151,9 @@ msgstr "[ihopslagen] %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:505 -#: cmd_ws_commit.cc:963 cmd_ws_commit.cc:986 cmd_ws_commit.cc:1086 -#: cmd_ws_commit.cc:1100 +#: 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" @@ -1175,7 +1167,7 @@ msgstr "var god ange en gren med --branc 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:529 +#: cmd_netsync.cc:300 cmd_ws_commit.cc:530 #, c-format msgid "branch '%s' is empty" msgstr "grenen '%s' är tom" @@ -1535,27 +1527,27 @@ msgstr "klonarbetskatalogen '%s' finns r msgid "clone destination directory '%s' already exists" msgstr "klonarbetskatalogen '%s' finns redan" -#: cmd_netsync.cc:295 cmd_ws_commit.cc:524 cmd_ws_commit.cc:1019 +#: cmd_netsync.cc:295 cmd_ws_commit.cc:525 cmd_ws_commit.cc:1236 #, 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:532 cmd_ws_commit.cc:1025 +#: cmd_netsync.cc:303 cmd_ws_commit.cc:533 cmd_ws_commit.cc:1242 #, c-format msgid "branch %s has multiple heads:" msgstr "grenen %s har flera löv:" -#: cmd_netsync.cc:306 cmd_ws_commit.cc:535 cmd_ws_commit.cc:1028 +#: cmd_netsync.cc:306 cmd_ws_commit.cc:536 cmd_ws_commit.cc:1245 #, 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:536 cmd_ws_commit.cc:1029 +#: cmd_netsync.cc:307 cmd_ws_commit.cc:537 cmd_ws_commit.cc:1246 #, c-format msgid "branch %s has multiple heads" msgstr "grenen %s har flera löv" -#: cmd_netsync.cc:323 cmd_ws_commit.cc:552 cmd_ws_commit.cc:1012 +#: cmd_netsync.cc:323 cmd_ws_commit.cc:553 cmd_ws_commit.cc:1229 #, c-format msgid "revision %s is not a member of branch %s" msgstr "revisionen %s är inte med i grenen %s" @@ -1663,27 +1655,27 @@ msgstr[1] "läste %d paket" msgstr[0] "läste %d paket" msgstr[1] "läste %d paket" -#: cmd_ws_commit.cc:42 +#: cmd_ws_commit.cc:43 #, c-format msgid "Current branch: %s" msgstr "Nuvarande gren: %s" -#: cmd_ws_commit.cc:48 +#: cmd_ws_commit.cc:49 #, c-format msgid "Changes against parent %s" msgstr "Förändringar gentemot föräldern %s" -#: cmd_ws_commit.cc:53 +#: cmd_ws_commit.cc:54 #, c-format msgid " no changes" msgstr " inga ändringar" -#: cmd_ws_commit.cc:57 +#: cmd_ws_commit.cc:58 #, c-format msgid " dropped %s" msgstr " slängde %s" -#: cmd_ws_commit.cc:62 +#: cmd_ws_commit.cc:63 #, c-format msgid "" " renamed %s\n" @@ -1692,17 +1684,17 @@ msgstr "" " bytte namn på %s\n" " till %s" -#: cmd_ws_commit.cc:67 cmd_ws_commit.cc:71 +#: cmd_ws_commit.cc:68 cmd_ws_commit.cc:72 #, c-format msgid " added %s" msgstr " la till %s" -#: cmd_ws_commit.cc:75 +#: cmd_ws_commit.cc:76 #, c-format msgid " patched %s" msgstr " ändrade %s" -#: cmd_ws_commit.cc:79 +#: cmd_ws_commit.cc:80 #, c-format msgid "" " attr on %s\n" @@ -1713,7 +1705,7 @@ msgstr "" " attr %s\n" " värde %s" -#: cmd_ws_commit.cc:87 +#: cmd_ws_commit.cc:88 #, c-format msgid "" " unset on %s\n" @@ -1722,7 +1714,7 @@ msgstr "" " slog av på %s\n" " attr %s" -#: cmd_ws_commit.cc:104 +#: cmd_ws_commit.cc:105 #, c-format msgid "" "branch \"%s\"\n" @@ -1731,11 +1723,11 @@ msgstr "" "gren \"%s\"\n" "\n" -#: cmd_ws_commit.cc:108 +#: cmd_ws_commit.cc:109 msgid "*****DELETE THIS LINE TO CONFIRM YOUR COMMIT*****" msgstr "*****TA BORT DENNA RAD FÖR ATT BEKRÄFTA DIN ARKIVERING*****" -#: cmd_ws_commit.cc:111 +#: cmd_ws_commit.cc:112 msgid "" "Enter a description of this change.\n" "Lines beginning with `MTN:' are removed automatically." @@ -1743,86 +1735,86 @@ msgstr "" "Mata in en beskrivning av denna ändring.\n" "Rader som börjar med 'MTN:' kommer att tas bort automatiskt." -#: cmd_ws_commit.cc:136 +#: cmd_ws_commit.cc:137 #, c-format msgid "edit of log message failed" msgstr "redigering av loggmeddelandet misslyckades" -#: cmd_ws_commit.cc:139 +#: cmd_ws_commit.cc:140 #, c-format msgid "failed to remove magic line; commit cancelled" msgstr "den magiska raden är inte borttagen; arkivering avbryts" -#: cmd_ws_commit.cc:145 +#: cmd_ws_commit.cc:146 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")" -#: cmd_ws_commit.cc:152 +#: cmd_ws_commit.cc:153 #, 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:182 +#: cmd_ws_commit.cc:183 #, c-format msgid "no missing files to revert" msgstr "inga saknade filer att återställa" -#: cmd_ws_commit.cc:237 +#: cmd_ws_commit.cc:238 #, c-format msgid "reverting %s" msgstr "återställer %s" -#: cmd_ws_commit.cc:241 +#: cmd_ws_commit.cc:242 #, 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:254 +#: cmd_ws_commit.cc:255 #, c-format msgid "recreating %s/" msgstr "återställer %s/" -#: cmd_ws_commit.cc:275 +#: cmd_ws_commit.cc:276 msgid "disapprove of a particular revision" msgstr "underkänn en specifik revision" -#: cmd_ws_commit.cc:291 +#: cmd_ws_commit.cc:292 #, 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:294 +#: cmd_ws_commit.cc:295 #, c-format msgid "need --branch argument for disapproval" msgstr "för underkännande behöver en gren anges med --branch" -#: cmd_ws_commit.cc:327 +#: cmd_ws_commit.cc:328 msgid "[DIRECTORY...]" msgstr "[KATALOG...]" -#: cmd_ws_commit.cc:328 +#: cmd_ws_commit.cc:329 msgid "create one or more directories and add them to the workspace" msgstr "skapa en eller flera kataloger och lägg till dem i arbetskopian" -#: cmd_ws_commit.cc:348 +#: cmd_ws_commit.cc:349 #, c-format msgid "directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: cmd_ws_commit.cc:355 +#: cmd_ws_commit.cc:356 #, c-format msgid "ignoring directory '%s' [see .mtn-ignore]" msgstr "ignorerar katalogen '%s' [se .mtn-ignore]" -#: cmd_ws_commit.cc:372 +#: cmd_ws_commit.cc:373 msgid "add files to workspace" msgstr "lägg till filer i arbetskopian" -#: cmd_ws_commit.cc:405 +#: cmd_ws_commit.cc:406 msgid "drop files from workspace" msgstr "överge filer i arbetskopian" -#: cmd_ws_commit.cc:435 +#: cmd_ws_commit.cc:436 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1830,15 +1822,15 @@ msgstr "" "KÄLLA MÅL\n" "KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG" -#: cmd_ws_commit.cc:437 +#: cmd_ws_commit.cc:438 msgid "rename entries in the workspace" msgstr "byt namn på filer i arbetskopian" -#: cmd_ws_commit.cc:459 +#: cmd_ws_commit.cc:460 msgid "NEW_ROOT PUT_OLD" msgstr "NY_ROT PLACERA_GAMLA" -#: cmd_ws_commit.cc:460 +#: cmd_ws_commit.cc:461 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1852,15 +1844,15 @@ msgstr "" "PLACERA_GAMLA.\n" "Det är INTE rekommenderat att använda --bookkeep-only." -#: cmd_ws_commit.cc:478 +#: cmd_ws_commit.cc:479 msgid "show status of workspace" msgstr "visa arbetskopians status" -#: cmd_ws_commit.cc:505 cmd_ws_commit.cc:963 cmd_ws_commit.cc:1086 +#: cmd_ws_commit.cc:506 cmd_ws_commit.cc:1180 cmd_ws_commit.cc:1303 msgid "[DIRECTORY]" msgstr "[KATALOG]" -#: cmd_ws_commit.cc:506 +#: cmd_ws_commit.cc:507 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" @@ -1872,17 +1864,17 @@ msgstr "" "kommer lövet i grenen (implicit eller angiven) att hämtas. Om\n" "ingen katalog anges kommer grenens namn att användas som katalognamn." -#: cmd_ws_commit.cc:569 +#: cmd_ws_commit.cc:570 #, c-format msgid "you must specify a destination directory" msgstr "du måste ange en målkatalog" -#: cmd_ws_commit.cc:582 +#: cmd_ws_commit.cc:583 #, c-format msgid "checkout directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: cmd_ws_commit.cc:614 +#: cmd_ws_commit.cc:615 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1892,40 +1884,49 @@ msgstr "" "get SÖKVÄG [ATTR]\n" "drop SÖKVÄG [ATTR]" -#: cmd_ws_commit.cc:615 +#: 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:631 +#: cmd_ws_commit.cc:632 cmd_ws_commit.cc:755 cmd_ws_commit.cc:859 +#: cmd_ws_commit.cc:902 #, c-format msgid "Unknown path '%s'" msgstr "Okänd sökväg '%s'" -#: cmd_ws_commit.cc:660 +#: cmd_ws_commit.cc:661 cmd_ws_commit.cc:916 #, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "Sökvägen '%s' har inget attribut '%s'" -#: cmd_ws_commit.cc:691 +#: cmd_ws_commit.cc:692 #, c-format msgid "No attributes for '%s'" msgstr "Inga attribut till '%s'" -#: cmd_ws_commit.cc:702 +#: cmd_ws_commit.cc:703 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Inget attribut '%s' för sökvägen '%s'" -#: cmd_ws_commit.cc:715 +#: cmd_ws_commit.cc:844 +msgid "PATH KEY VALUE" +msgstr "SÖKVÄG NYCKEL VÄRDE" + +#: cmd_ws_commit.cc:887 +msgid "PATH [KEY]" +msgstr "SÖKVÄG [NYCKEL]" + +#: cmd_ws_commit.cc:932 msgid "commit workspace to database" msgstr "arkivera arbetskopian i databasen" -#: cmd_ws_commit.cc:749 +#: cmd_ws_commit.cc:966 #, c-format msgid "no changes to commit" msgstr "inga ändringar att arkivera" -#: cmd_ws_commit.cc:766 +#: cmd_ws_commit.cc:983 #, c-format msgid "" "parent revisions of this commit are in different branches:\n" @@ -1936,12 +1937,12 @@ msgstr "" "'%s' och '%s'.\n" "var god ange en gren för denna arkivering med --branch." -#: cmd_ws_commit.cc:777 +#: cmd_ws_commit.cc:994 #, c-format msgid "beginning commit on branch '%s'" msgstr "börjar arkivering av ändringar i grenen '%s'" -#: cmd_ws_commit.cc:786 +#: cmd_ws_commit.cc:1003 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1952,37 +1953,37 @@ msgstr "" "kanske ta bort eller flytta på _MTN/log\n" "eller ta bort --message/--message-file från kommandoraden?" -#: cmd_ws_commit.cc:801 +#: cmd_ws_commit.cc:1018 #, c-format msgid "empty log message; commit canceled" msgstr "tomt loggmeddelande; arkivering avbryts" -#: cmd_ws_commit.cc:823 +#: cmd_ws_commit.cc:1040 #, c-format msgid "log message rejected by hook: %s" msgstr "loggmeddelandet förkastas: %s" -#: cmd_ws_commit.cc:834 +#: cmd_ws_commit.cc:1051 #, c-format msgid "revision %s already in database" msgstr "revisionen %s finns redan i databasen" -#: cmd_ws_commit.cc:871 cmd_ws_commit.cc:900 +#: cmd_ws_commit.cc:1088 cmd_ws_commit.cc:1117 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "filen '%s' ändrades under arkivering, avbryter" -#: cmd_ws_commit.cc:882 +#: cmd_ws_commit.cc:1099 #, 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:924 +#: cmd_ws_commit.cc:1141 #, c-format msgid "committed revision %s" msgstr "arkiverade revisionen %s" -#: cmd_ws_commit.cc:930 +#: cmd_ws_commit.cc:1147 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1991,39 +1992,39 @@ msgstr "" "obs: den här revisionen skapade divergens\n" "obs: du kan tänkas vilja (eller kanske inte) köra '%s merge'" -#: cmd_ws_commit.cc:964 +#: cmd_ws_commit.cc:1181 msgid "setup a new workspace directory, default to current" msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)" -#: cmd_ws_commit.cc:970 +#: cmd_ws_commit.cc:1187 #, c-format msgid "need --branch argument for setup" msgstr "du måste ange en gren med --branch till kommandot \"setup\"" -#: cmd_ws_commit.cc:986 +#: cmd_ws_commit.cc:1203 msgid "DIRECTORY" msgstr "KATALOG" -#: cmd_ws_commit.cc:987 +#: cmd_ws_commit.cc:1204 msgid "import the contents of the given directory tree into a given branch" msgstr "importera den givna katalogens innehåll till den givna grenen" -#: cmd_ws_commit.cc:998 +#: cmd_ws_commit.cc:1215 #, c-format msgid "you must specify a directory to import" msgstr "du måste ange en katalog att importera" -#: cmd_ws_commit.cc:1038 +#: cmd_ws_commit.cc:1255 #, c-format msgid "import directory '%s' doesn't exists" msgstr "importkatalogen '%s' finns inte" -#: cmd_ws_commit.cc:1039 +#: cmd_ws_commit.cc:1256 #, c-format msgid "import directory '%s' is a file" msgstr "importkatalogen '%s' är en fil" -#: cmd_ws_commit.cc:1087 +#: cmd_ws_commit.cc:1304 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" @@ -2031,7 +2032,7 @@ msgstr "" "migrera en arbetskopias metadata till det senaste formatet; nuvarande " "katalog avses om inget annat anges" -#: cmd_ws_commit.cc:1100 +#: cmd_ws_commit.cc:1317 msgid "refresh the inodeprint cache" msgstr "uppdatera inodeprint-cachen" @@ -4735,6 +4736,12 @@ 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 "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"