# # # patch "po/sv.po" # from [792a689342d736893ec879094434bdd2b4331090] # to [1e3d4f9ce6ec02d3a68782df25800f64686b0fe8] # ============================================================ --- po/sv.po 792a689342d736893ec879094434bdd2b4331090 +++ po/sv.po 1e3d4f9ce6ec02d3a68782df25800f64686b0fe8 @@ -148,8 +148,8 @@ msgstr "" msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-06 14:02+0100\n" -"PO-Revision-Date: 2007-11-06 14:03+0100\n" +"POT-Creation-Date: 2007-11-10 09:35+0100\n" +"PO-Revision-Date: 2007-11-10 09:36+0100\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -187,9 +187,9 @@ msgstr "Visar en ASCII-representation av #: automate.cc:1535 automate.cc:1597 automate.cc:1650 automate.cc:1712 #: automate.cc:1762 automate.cc:1815 automate.cc:1872 automate.cc:1905 #: automate.cc:1931 cmd_files.cc:232 cmd_files.cc:327 cmd_files.cc:353 -#: cmd_list.cc:644 cmd_ws_commit.cc:638 cmd_ws_commit.cc:685 -#: cmd_ws_commit.cc:735 cmd_ws_commit.cc:787 cmd_ws_commit.cc:905 -#: cmd_ws_commit.cc:949 +#: cmd_list.cc:644 cmd_ws_commit.cc:644 cmd_ws_commit.cc:691 +#: cmd_ws_commit.cc:741 cmd_ws_commit.cc:793 cmd_ws_commit.cc:911 +#: cmd_ws_commit.cc:955 #, c-format msgid "wrong argument count" msgstr "felaktigt antal givna argument" @@ -280,9 +280,9 @@ msgstr "Visar revisionerna som matchar e msgid "Lists the revisions that match a selector" msgstr "Visar revisionerna som matchar en väljare" -#: automate.cc:857 cmd_diff_log.cc:479 cmd_ws_commit.cc:146 -#: cmd_ws_commit.cc:370 cmd_ws_commit.cc:405 cmd_ws_commit.cc:490 -#: cmd_ws_commit.cc:987 +#: automate.cc:857 cmd_diff_log.cc:481 cmd_ws_commit.cc:146 +#: cmd_ws_commit.cc:376 cmd_ws_commit.cc:411 cmd_ws_commit.cc:496 +#: cmd_ws_commit.cc:993 msgid "[PATH]..." msgstr "[SÖKVÄG]..." @@ -291,13 +291,13 @@ msgstr "Skriver ut en sammanfattning om msgstr "Skriver ut en sammanfattning om filerna funna i en arbetskopia" #: automate.cc:870 automate.cc:1062 cmd_files.cc:302 cmd_files.cc:363 -#: cmd_merging.cc:152 cmd_merging.cc:643 cmd_ws_commit.cc:163 -#: cmd_ws_commit.cc:803 +#: cmd_merging.cc:153 cmd_merging.cc:650 cmd_ws_commit.cc:163 +#: cmd_ws_commit.cc:809 #, 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:1003 automate.cc:1145 cmd_merging.cc:975 +#: automate.cc:1003 automate.cc:1145 cmd_merging.cc:983 msgid "[REVID]" msgstr "[REVID]" @@ -332,10 +332,10 @@ msgstr "Skriv ut datapaket för revision msgstr "Skriv ut datapaket för revision till stdout" #: automate.cc:1205 automate.cc:1235 automate.cc:1296 automate.cc:1298 -#: automate.cc:1879 cmd_db.cc:127 cmd_diff_log.cc:400 cmd_diff_log.cc:429 -#: cmd_diff_log.cc:431 cmd_files.cc:174 cmd_files.cc:264 cmd_merging.cc:186 -#: cmd_merging.cc:800 cmd_merging.cc:815 cmd_merging.cc:818 cmd_netsync.cc:359 -#: cmd_ws_commit.cc:559 cmd_ws_commit.cc:1279 commands.cc:908 +#: automate.cc:1879 cmd_db.cc:127 cmd_diff_log.cc:401 cmd_diff_log.cc:431 +#: cmd_diff_log.cc:433 cmd_files.cc:174 cmd_files.cc:264 cmd_merging.cc:187 +#: cmd_merging.cc:807 cmd_merging.cc:822 cmd_merging.cc:825 cmd_netsync.cc:359 +#: cmd_ws_commit.cc:565 cmd_ws_commit.cc:1285 commands.cc:908 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" @@ -868,11 +868,11 @@ msgstr "" "denna arbetskopia har mer än en förälder\n" "(ange en revision att se skillnader emot med --revision)" -#: cmd_diff_log.cc:480 +#: cmd_diff_log.cc:482 msgid "Shows current differences" msgstr "Visa nuvarande skillnader" -#: cmd_diff_log.cc:481 +#: cmd_diff_log.cc:483 msgid "" "Compares the current tree with the files in the repository and prints the " "differences on the standard output.\n" @@ -886,7 +886,7 @@ msgstr "" "revisionen. Om två revisioner anges visas skillnaden mellan dem. Om\n" "inget format anges används unified." -#: cmd_diff_log.cc:492 +#: cmd_diff_log.cc:494 #, c-format msgid "" "--diff-args requires --external\n" @@ -895,27 +895,27 @@ msgstr "" "--diff-args kräver att även --external anges\n" "lägg till --external eller ta bort --diff-args?" -#: cmd_diff_log.cc:516 +#: cmd_diff_log.cc:518 msgid "no changes" msgstr "inga ändringar" -#: cmd_diff_log.cc:541 +#: cmd_diff_log.cc:543 msgid "[FILE [...]]" msgstr "[FIL [...]]" -#: cmd_diff_log.cc:542 +#: cmd_diff_log.cc:544 msgid "Calculates diffs of files" msgstr "Räknar ut skillnaden mellan filerna" -#: cmd_diff_log.cc:618 +#: cmd_diff_log.cc:620 msgid "[FILE] ..." msgstr "[FIL] ..." -#: cmd_diff_log.cc:619 +#: cmd_diff_log.cc:621 msgid "Prints history in reverse order" msgstr "Skriver ut historien i omvänd ordning" -#: cmd_diff_log.cc:620 +#: cmd_diff_log.cc:622 msgid "" "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." @@ -924,12 +924,12 @@ msgstr "" "arbetskatalogen om inga filer angivits. Om en eller flera revisioner har " "angivits används de som utgångspunkter." -#: cmd_diff_log.cc:636 +#: cmd_diff_log.cc:638 #, c-format msgid "only one of --last/--next allowed" msgstr "enbart en av --last eller --next tillåten" -#: cmd_diff_log.cc:936 +#: cmd_diff_log.cc:938 #, c-format msgid "(Revision: %s)" msgstr "(Revision: %s)" @@ -984,7 +984,7 @@ msgstr "målets filidentitet finns inte" msgid "destination file id does not exist" msgstr "målets filidentitet finns inte" -#: cmd_files.cc:123 cmd_files.cc:226 cmd_ws_commit.cc:781 +#: cmd_files.cc:123 cmd_files.cc:226 cmd_ws_commit.cc:787 msgid "PATH" msgstr "SÖKVÄG" @@ -1213,7 +1213,7 @@ msgstr "Noterar ett testresultat för en msgid "Notes the results of running a test on a revision" msgstr "Noterar ett testresultat för en revision" -#: cmd_key_cert.cc:294 cmd_key_cert.cc:309 cmd_ws_commit.cc:279 +#: cmd_key_cert.cc:294 cmd_key_cert.cc:309 cmd_ws_commit.cc:285 msgid "REVISION" msgstr "REVISION" @@ -1367,12 +1367,12 @@ msgstr "Skriver ut alla certifikat koppl msgid "Prints all certificates attached to a revision" msgstr "Skriver ut alla certifikat kopplade till en revision" -#: cmd_merging.cc:103 +#: cmd_merging.cc:104 #, c-format msgid "target revision is not in current branch" msgstr "denna revision finns inte i den nuvarande grenen" -#: cmd_merging.cc:111 +#: cmd_merging.cc:112 #, c-format msgid "" "target revision is in multiple branches:%s\n" @@ -1383,7 +1383,7 @@ msgstr "" "\n" "försök igen med en explicit --branch" -#: cmd_merging.cc:123 +#: cmd_merging.cc:124 #, c-format msgid "" "target revision not in any branch\n" @@ -1392,11 +1392,11 @@ msgstr "" "denna revision är inte i någon gren\n" "nästa ändring hamnar i grenen %s" -#: cmd_merging.cc:132 +#: cmd_merging.cc:133 msgid "Updates the workspace" msgstr "Uppdaterar arbetskopian" -#: cmd_merging.cc:133 +#: cmd_merging.cc:134 msgid "" "This command modifies your workspace to be based off of a different " "revision, preserving uncommitted changes as it does so. If a revision is " @@ -1408,17 +1408,17 @@ msgstr "" "revision har angivits så uppdateras arbetskopian till den, i annat fall " "uppdateras den till lövet i grenen." -#: cmd_merging.cc:156 +#: cmd_merging.cc:157 #, c-format msgid "this workspace is a new project; cannot update" msgstr "denna arbetskatalog är ett nytt projekt; kan inte uppdatera" -#: cmd_merging.cc:163 +#: cmd_merging.cc:164 #, c-format msgid "updating along branch '%s'" msgstr "uppdaterar längs grenen '%s'" -#: cmd_merging.cc:167 +#: cmd_merging.cc:168 #, c-format msgid "" "your request matches no descendents of the current revision\n" @@ -1429,170 +1429,170 @@ 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:173 +#: cmd_merging.cc:174 #, c-format msgid "multiple update candidates:" msgstr "mer än en uppdateringskandidat:" -#: cmd_merging.cc:177 +#: cmd_merging.cc:178 #, c-format msgid "choose one with '%s update -r'" msgstr "välj en med '%s update -r'" -#: cmd_merging.cc:178 +#: cmd_merging.cc:179 #, c-format msgid "multiple update candidates remain after selection" msgstr "mer än en kandidat är kvar efter urval" -#: cmd_merging.cc:197 +#: cmd_merging.cc:198 #, c-format msgid "already up to date at %s" msgstr "redan uppdaterad till %s" -#: cmd_merging.cc:205 +#: cmd_merging.cc:206 #, c-format msgid "selected update target %s" msgstr "valt uppdateringsmål är %s" -#: cmd_merging.cc:211 +#: cmd_merging.cc:212 #, c-format msgid "switching to branch %s" msgstr "byter gren till %s" -#: cmd_merging.cc:279 +#: cmd_merging.cc:280 #, 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:280 +#: cmd_merging.cc:281 #, c-format msgid "updated to base revision %s" msgstr "uppdaterad till revisionen %s" -#: cmd_merging.cc:322 +#: cmd_merging.cc:323 #, c-format msgid "[left] %s" msgstr "[vänster] %s" -#: cmd_merging.cc:323 +#: cmd_merging.cc:324 #, c-format msgid "[right] %s" msgstr "[höger] %s" -#: cmd_merging.cc:338 cmd_merging.cc:612 +#: cmd_merging.cc:345 cmd_merging.cc:619 #, c-format msgid "[merged] %s" msgstr "[ihopslagen] %s" -#: cmd_merging.cc:346 +#: cmd_merging.cc:353 msgid "Merges unmerged heads of a branch" msgstr "Slår ihop ej ihopslagna löv i grenen" -#: cmd_merging.cc:357 cmd_merging.cc:959 +#: cmd_merging.cc:364 cmd_merging.cc:967 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "var god ange en gren med --branch=GREN" -#: cmd_merging.cc:362 cmd_merging.cc:500 cmd_merging.cc:503 cmd_merging.cc:964 -#: cmd_netsync.cc:343 cmd_ws_commit.cc:543 +#: cmd_merging.cc:369 cmd_merging.cc:507 cmd_merging.cc:510 cmd_merging.cc:972 +#: cmd_netsync.cc:343 cmd_ws_commit.cc:549 #, c-format msgid "branch '%s' is empty" msgstr "grenen '%s' är tom" -#: cmd_merging.cc:365 +#: cmd_merging.cc:372 #, c-format msgid "branch '%s' is already merged" msgstr "löven i grenen '%s' är redan ihopslagna" -#: cmd_merging.cc:369 +#: cmd_merging.cc:376 #, 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:390 cmd_merging.cc:435 +#: cmd_merging.cc:397 cmd_merging.cc:442 #, c-format msgid "merge %d / %d:" msgstr "slår ihop %d / %d:" -#: cmd_merging.cc:391 +#: cmd_merging.cc:398 #, 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:443 +#: cmd_merging.cc:450 #, c-format msgid "note: your workspaces have not been updated" msgstr "obs: dina arbetskopior har inte uppdaterats" -#: cmd_merging.cc:447 +#: cmd_merging.cc:454 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "KÄLLGREN MÅLGREN" -#: cmd_merging.cc:448 +#: cmd_merging.cc:455 msgid "Merges from one branch to another asymmetrically" msgstr "Slår ihop asymmetriskt från en gren till en annan" -#: cmd_merging.cc:460 +#: cmd_merging.cc:467 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "KÄLLGREN MÅLGREN KATALOG" -#: cmd_merging.cc:461 +#: cmd_merging.cc:468 msgid "Merges one branch into a subdirectory in another branch" msgstr "Slår ihop en gren till en underkatalog i en annan gren" -#: cmd_merging.cc:501 cmd_merging.cc:504 +#: cmd_merging.cc:508 cmd_merging.cc:511 #, c-format msgid "branch '%s' is not merged" msgstr "löven i grenen '%s' är inte ihopslagna" -#: cmd_merging.cc:509 +#: cmd_merging.cc:516 #, c-format msgid "propagating %s -> %s" msgstr "propagerar %s -> %s" -#: cmd_merging.cc:510 +#: cmd_merging.cc:517 #, c-format msgid "[source] %s" msgstr "[källa] %s" -#: cmd_merging.cc:511 +#: cmd_merging.cc:518 #, c-format msgid "[target] %s" msgstr "[mål] %s" -#: cmd_merging.cc:516 +#: cmd_merging.cc:523 #, 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:518 +#: cmd_merging.cc:525 #, c-format msgid "no action taken" msgstr "inget utfördes" -#: cmd_merging.cc:522 +#: cmd_merging.cc:529 #, 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:560 +#: cmd_merging.cc:567 #, c-format msgid "Path %s not found in destination tree." msgstr "Sökvägen %s finns inte i målträdet." -#: cmd_merging.cc:617 +#: cmd_merging.cc:624 msgid "OTHER-REVISION" msgstr "ANNAN-REVISION" -#: cmd_merging.cc:618 +#: cmd_merging.cc:625 msgid "Merges a revision into the current workspace's base revision" msgstr "" "Slår ihop en revision med arbetskopians basrevision och sparar det i " "arbetskopian" -#: cmd_merging.cc:619 +#: cmd_merging.cc:626 msgid "" "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 " @@ -1606,19 +1606,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:650 +#: cmd_merging.cc:657 #, 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:659 +#: cmd_merging.cc:666 #, c-format msgid "workspace is already at revision %s" msgstr "arbetskopian är redan uppdaterad till revision %s" -#: cmd_merging.cc:706 +#: cmd_merging.cc:713 #, c-format msgid "" "updated to result of merge\n" @@ -1629,88 +1629,88 @@ msgstr "" "[vänster] %s\n" "[ höger] %s\n" -#: cmd_merging.cc:712 +#: cmd_merging.cc:719 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VÄNSTERREVISION HÖGERREVISION MÅLGREN" -#: cmd_merging.cc:713 +#: cmd_merging.cc:720 msgid "Merges two explicitly given revisions" msgstr "Slår ihop två explicit angivna revisioner" -#: cmd_merging.cc:714 +#: cmd_merging.cc:721 msgid "" "The results of the merge are placed on the branch specified by DEST-BRANCH." msgstr "Ihopslagningens resultat är placerat i grenen MÅLGREN." -#: cmd_merging.cc:729 +#: cmd_merging.cc:736 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s och %s är samma revision, avbryter" -#: cmd_merging.cc:731 cmd_merging.cc:733 +#: cmd_merging.cc:738 cmd_merging.cc:740 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s är redan förfader till %s" -#: cmd_merging.cc:738 +#: cmd_merging.cc:745 msgid "REV REV" msgstr "REV REV" -#: cmd_merging.cc:739 +#: cmd_merging.cc:746 msgid "Shows what conflicts need resolution between two revisions" msgstr "" "Visar de konflikter som behöver lösas om de givna revisionerna slås ihop." -#: cmd_merging.cc:740 +#: cmd_merging.cc:747 msgid "" "The conflicts are calculated based on the two revisions given in the REV " "parameters." msgstr "Konflikten beräknas på bas av de två angivna revisionerna REV." -#: cmd_merging.cc:750 cmd_merging.cc:752 +#: cmd_merging.cc:757 cmd_merging.cc:759 #, 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:766 +#: cmd_merging.cc:773 #, c-format msgid "There are %s node_name_conflicts." msgstr "Det finns %s node_name-konflikter." -#: cmd_merging.cc:768 +#: cmd_merging.cc:775 #, c-format msgid "There are %s file_content_conflicts." msgstr "Det finns %s file_content-konflikter." -#: cmd_merging.cc:770 +#: cmd_merging.cc:777 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Det finns %s node_attr-konflikter." -#: cmd_merging.cc:772 +#: cmd_merging.cc:779 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Det finns %s orphaned_node-konflikter." -#: cmd_merging.cc:774 +#: cmd_merging.cc:781 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Det finns %s rename_target-konflikter." -#: cmd_merging.cc:776 +#: cmd_merging.cc:783 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Det finns %s directory_loop-konflikter." -#: cmd_merging.cc:780 +#: cmd_merging.cc:787 msgid "[-r FROM] -r TO [PATH...]" msgstr "[-r FRÅN] -r TILL [SÖKVÄG...]" -#: cmd_merging.cc:781 +#: cmd_merging.cc:788 msgid "Applies changes made at arbitrary places in history" msgstr "Applicerar ändringar som gjorts på godtyckliga platser i historien" -#: cmd_merging.cc:782 +#: cmd_merging.cc:789 msgid "" "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 " @@ -1732,7 +1732,7 @@ msgstr "" "Om två revisioner har givits utförs alla ändringar som gjorts för att komma " "från den första till den andra." -#: cmd_merging.cc:804 +#: cmd_merging.cc:811 #, c-format msgid "" "revision %s is a merge\n" @@ -1743,45 +1743,45 @@ 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:825 +#: cmd_merging.cc:832 #, c-format msgid "no changes to apply" msgstr "inga ändringar att utföra" -#: cmd_merging.cc:884 +#: cmd_merging.cc:892 #, c-format msgid "no changes to be applied" msgstr "inga ändringar att utföra" -#: cmd_merging.cc:914 +#: cmd_merging.cc:922 #, c-format msgid "no changes were applied" msgstr "inga ändringar blev utförda" -#: cmd_merging.cc:917 +#: cmd_merging.cc:925 #, c-format msgid "applied changes to workspace" msgstr "utförde ändringarna i arbetskopian" -#: cmd_merging.cc:950 +#: cmd_merging.cc:958 msgid "Shows unmerged head revisions of a branch" msgstr "Visar ej ihopslagna lövrevisioner i grenen" -#: cmd_merging.cc:966 +#: cmd_merging.cc:974 #, c-format msgid "branch '%s' is currently merged:" msgstr "grenen '%s' har för tillfället ett löv:" -#: cmd_merging.cc:968 +#: cmd_merging.cc:976 #, c-format msgid "branch '%s' is currently unmerged:" msgstr "grenen '%s' har för tillfället mer än ett löv:" -#: cmd_merging.cc:976 +#: cmd_merging.cc:984 msgid "Dumps the roster associated with a given identifier" msgstr "Skriver ut den lista som hör ihop med angiven identifierare" -#: cmd_merging.cc:977 +#: cmd_merging.cc:985 msgid "If no REVID is given, the workspace is used." msgstr "Om ingen REVID angivits används arbetskopian." @@ -1888,27 +1888,27 @@ msgstr "klonarbetskatalogen '%s' finns r msgid "clone destination directory '%s' already exists" msgstr "klonarbetskatalogen '%s' finns redan" -#: cmd_netsync.cc:338 cmd_ws_commit.cc:538 cmd_ws_commit.cc:1293 +#: cmd_netsync.cc:338 cmd_ws_commit.cc:544 cmd_ws_commit.cc:1299 #, 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:346 cmd_ws_commit.cc:546 cmd_ws_commit.cc:1299 +#: cmd_netsync.cc:346 cmd_ws_commit.cc:552 cmd_ws_commit.cc:1305 #, c-format msgid "branch %s has multiple heads:" msgstr "grenen %s har flera löv:" -#: cmd_netsync.cc:349 cmd_ws_commit.cc:549 cmd_ws_commit.cc:1302 +#: cmd_netsync.cc:349 cmd_ws_commit.cc:555 cmd_ws_commit.cc:1308 #, c-format msgid "choose one with '%s checkout -r'" msgstr "välj ett med '%s update -r'" -#: cmd_netsync.cc:350 cmd_ws_commit.cc:550 cmd_ws_commit.cc:1303 +#: cmd_netsync.cc:350 cmd_ws_commit.cc:556 cmd_ws_commit.cc:1309 #, c-format msgid "branch %s has multiple heads" msgstr "grenen %s har flera löv" -#: cmd_netsync.cc:366 cmd_ws_commit.cc:566 cmd_ws_commit.cc:1286 +#: cmd_netsync.cc:366 cmd_ws_commit.cc:572 cmd_ws_commit.cc:1292 #, c-format msgid "revision %s is not a member of branch %s" msgstr "revisionen %s är inte med i grenen %s" @@ -2124,62 +2124,62 @@ msgstr "inga saknade filer att återstä msgid "no missing files to revert" msgstr "inga saknade filer att återställa" -#: cmd_ws_commit.cc:242 +#: cmd_ws_commit.cc:248 #, c-format msgid "reverting %s" msgstr "återställer %s" -#: cmd_ws_commit.cc:246 +#: cmd_ws_commit.cc:252 #, 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:259 +#: cmd_ws_commit.cc:265 #, c-format msgid "recreating %s/" msgstr "återställer %s/" -#: cmd_ws_commit.cc:280 +#: cmd_ws_commit.cc:286 msgid "Disapproves a particular revision" msgstr "Underkänner en specifik revision" -#: cmd_ws_commit.cc:297 +#: cmd_ws_commit.cc:303 #, 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:300 +#: cmd_ws_commit.cc:306 #, c-format msgid "need --branch argument for disapproval" msgstr "för underkännande behöver en gren anges med --branch" -#: cmd_ws_commit.cc:333 +#: cmd_ws_commit.cc:339 msgid "[DIRECTORY...]" msgstr "[KATALOG...]" -#: cmd_ws_commit.cc:334 +#: cmd_ws_commit.cc:340 msgid "Creates directories and adds them to the workspace" msgstr "Skapar en eller flera kataloger och lägger till dem i arbetskopian" -#: cmd_ws_commit.cc:351 +#: cmd_ws_commit.cc:357 #, c-format msgid "directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: cmd_ws_commit.cc:357 +#: cmd_ws_commit.cc:363 #, c-format msgid "ignoring directory '%s' [see .mtn-ignore]" msgstr "ignorerar katalogen '%s' [se .mtn-ignore]" -#: cmd_ws_commit.cc:371 +#: cmd_ws_commit.cc:377 msgid "Adds files to the workspace" msgstr "Lägger till filer i arbetskopian" -#: cmd_ws_commit.cc:406 +#: cmd_ws_commit.cc:412 msgid "Drops files from the workspace" msgstr "Överger filer i arbetskopian" -#: cmd_ws_commit.cc:438 +#: cmd_ws_commit.cc:444 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -2187,24 +2187,24 @@ msgstr "" "KÄLLA MÅL\n" "KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG" -#: cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:446 msgid "Renames entries in the workspace" msgstr "Byter namn på filer i arbetskopian" -#: cmd_ws_commit.cc:465 +#: cmd_ws_commit.cc:471 #, c-format msgid "The specified target directory %s/ doesn't exist." msgstr "Den angivna målkatalogen %s/ finns inte." -#: cmd_ws_commit.cc:471 +#: cmd_ws_commit.cc:477 msgid "NEW_ROOT PUT_OLD" msgstr "NY_ROT PLACERA_GAMLA" -#: cmd_ws_commit.cc:472 +#: cmd_ws_commit.cc:478 msgid "Renames the root directory" msgstr "Byter namn på rotkatalogen" -#: cmd_ws_commit.cc:473 +#: cmd_ws_commit.cc:479 msgid "" "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 " @@ -2216,19 +2216,19 @@ msgstr "" "PLACERA_GAMLA.\n" "Det är INTE rekommenderat att använda --bookkeep-only." -#: cmd_ws_commit.cc:491 +#: cmd_ws_commit.cc:497 msgid "Shows workspace's status information" msgstr "Visar statusinformation för arbetskopian" -#: cmd_ws_commit.cc:519 cmd_ws_commit.cc:1235 cmd_ws_commit.cc:1361 +#: cmd_ws_commit.cc:525 cmd_ws_commit.cc:1241 cmd_ws_commit.cc:1367 msgid "[DIRECTORY]" msgstr "[KATALOG]" -#: cmd_ws_commit.cc:520 +#: cmd_ws_commit.cc:526 msgid "Checks out a revision from the database into a directory" msgstr "Hämtar en revision från databasen till en katalog" -#: cmd_ws_commit.cc:521 +#: cmd_ws_commit.cc:527 msgid "" "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 " @@ -2238,33 +2238,33 @@ msgstr "" "lövet i grenen (implicit eller angiven) att hämtas. Om ingen katalog anges " "kommer grenens namn att användas som katalognamn." -#: cmd_ws_commit.cc:583 +#: cmd_ws_commit.cc:589 #, c-format msgid "you must specify a destination directory" msgstr "du måste ange en målkatalog" -#: cmd_ws_commit.cc:596 +#: cmd_ws_commit.cc:602 #, c-format msgid "checkout directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: cmd_ws_commit.cc:627 +#: cmd_ws_commit.cc:633 msgid "Manages file attributes" msgstr "Hanterar filattribut" -#: cmd_ws_commit.cc:628 +#: cmd_ws_commit.cc:634 msgid "This command is used to set, get or drop file attributes." msgstr "Detta kommando används för att sätta, hämta eller ta bort attribut" -#: cmd_ws_commit.cc:630 cmd_ws_commit.cc:677 +#: cmd_ws_commit.cc:636 cmd_ws_commit.cc:683 msgid "PATH [ATTR]" msgstr "SÖKVÄG [ATTR]" -#: cmd_ws_commit.cc:631 +#: cmd_ws_commit.cc:637 msgid "Removes attributes from a file" msgstr "Tar bort attribut från en fil" -#: cmd_ws_commit.cc:632 +#: cmd_ws_commit.cc:638 msgid "" "If no attribute is specified, this command removes all attributes attached " "to the file given in PATH. Otherwise only removes the attribute specified " @@ -2273,22 +2273,22 @@ msgstr "" "Detta kommando tar bort alla attribut kopplade till filen SÖKVÄG om NYCKEL " "inte är givet. Om NYCKEL är givet tas enbart detta attribut bort." -#: cmd_ws_commit.cc:648 cmd_ws_commit.cc:695 cmd_ws_commit.cc:745 -#: cmd_ws_commit.cc:806 cmd_ws_commit.cc:915 cmd_ws_commit.cc:959 +#: cmd_ws_commit.cc:654 cmd_ws_commit.cc:701 cmd_ws_commit.cc:751 +#: cmd_ws_commit.cc:812 cmd_ws_commit.cc:921 cmd_ws_commit.cc:965 #, c-format msgid "Unknown path '%s'" msgstr "Okänd sökväg '%s'" -#: cmd_ws_commit.cc:663 cmd_ws_commit.cc:973 +#: cmd_ws_commit.cc:669 cmd_ws_commit.cc:979 #, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "Sökvägen '%s' har inget attribut '%s'" -#: cmd_ws_commit.cc:678 +#: cmd_ws_commit.cc:684 msgid "Gets the values of a file's attributes" msgstr "Hämta värdet för ett filattribut" -#: cmd_ws_commit.cc:679 +#: cmd_ws_commit.cc:685 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 " @@ -2297,60 +2297,60 @@ msgstr "" "Detta kommando skriver ut alla attribut kopplade till filen SÖKVÄG om NYCKEL " "inte är givet. Om NYCKEL är givet skrivs enbart detta attribut ut." -#: cmd_ws_commit.cc:711 +#: cmd_ws_commit.cc:717 #, c-format msgid "No attributes for '%s'" msgstr "Inga attribut till '%s'" -#: cmd_ws_commit.cc:723 +#: cmd_ws_commit.cc:729 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Inget attribut '%s' för sökvägen '%s'" -#: cmd_ws_commit.cc:728 +#: cmd_ws_commit.cc:734 msgid "PATH ATTR VALUE" msgstr "SÖKVÄG ATTR VÄRDE" -#: cmd_ws_commit.cc:729 +#: cmd_ws_commit.cc:735 msgid "Sets an attribute on a file" msgstr "Sätt ett attribut på en fil" -#: cmd_ws_commit.cc:730 +#: cmd_ws_commit.cc:736 msgid "" "Sets the attribute given on ATTR to the value specified in VALUE for the " "file mentioned in PATH." msgstr "Sätt attributet NYCKEL med värde VÄRDE på filen SÖKVÄG." -#: cmd_ws_commit.cc:782 +#: cmd_ws_commit.cc:788 msgid "Prints all attributes for the specified path" msgstr "Skriver ut alla attribut för den givna sökvägen" -#: cmd_ws_commit.cc:899 +#: cmd_ws_commit.cc:905 msgid "PATH KEY VALUE" msgstr "SÖKVÄG NYCKEL VÄRDE" -#: cmd_ws_commit.cc:900 +#: cmd_ws_commit.cc:906 msgid "Sets an attribute on a certain path" msgstr "Sätt ett attribut på en given sökväg" -#: cmd_ws_commit.cc:943 +#: cmd_ws_commit.cc:949 msgid "PATH [KEY]" msgstr "SÖKVÄG [NYCKEL]" -#: cmd_ws_commit.cc:944 +#: cmd_ws_commit.cc:950 msgid "Drops an attribute or all of them from a certain path" msgstr "Kata ett eller alla attribut för en given sökväg" -#: cmd_ws_commit.cc:988 +#: cmd_ws_commit.cc:994 msgid "Commits workspace changes to the database" msgstr "Arkiverar ändringar i arbetskopian till databasen" -#: cmd_ws_commit.cc:1023 +#: cmd_ws_commit.cc:1029 #, c-format msgid "no changes to commit" msgstr "inga ändringar att arkivera" -#: cmd_ws_commit.cc:1040 +#: cmd_ws_commit.cc:1046 #, c-format msgid "" "parent revisions of this commit are in different branches:\n" @@ -2361,12 +2361,12 @@ msgstr "" "'%s' och '%s'.\n" "var god ange en gren för denna arkivering med --branch." -#: cmd_ws_commit.cc:1050 +#: cmd_ws_commit.cc:1056 #, c-format msgid "beginning commit on branch '%s'" msgstr "börjar arkivering av ändringar i grenen '%s'" -#: cmd_ws_commit.cc:1060 +#: cmd_ws_commit.cc:1066 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -2377,37 +2377,37 @@ msgstr "" "kanske ta bort eller flytta på _MTN/log\n" "eller ta bort --message/--message-file från kommandoraden?" -#: cmd_ws_commit.cc:1075 +#: cmd_ws_commit.cc:1081 #, c-format msgid "empty log message; commit canceled" msgstr "tomt loggmeddelande; arkivering avbryts" -#: cmd_ws_commit.cc:1097 +#: cmd_ws_commit.cc:1103 #, c-format msgid "log message rejected by hook: %s" msgstr "loggmeddelandet förkastas: %s" -#: cmd_ws_commit.cc:1108 +#: cmd_ws_commit.cc:1114 #, c-format msgid "revision %s already in database" msgstr "revisionen %s finns redan i databasen" -#: cmd_ws_commit.cc:1146 cmd_ws_commit.cc:1175 +#: cmd_ws_commit.cc:1152 cmd_ws_commit.cc:1181 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "filen '%s' ändrades under arkivering, avbryter" -#: cmd_ws_commit.cc:1157 +#: cmd_ws_commit.cc:1163 #, 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:1199 +#: cmd_ws_commit.cc:1205 #, c-format msgid "committed revision %s" msgstr "arkiverade revisionen %s" -#: cmd_ws_commit.cc:1205 +#: cmd_ws_commit.cc:1211 #, c-format msgid "" "note: this revision creates divergence\n" @@ -2416,51 +2416,51 @@ 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:1236 +#: cmd_ws_commit.cc:1242 msgid "Sets up a new workspace directory" msgstr "Initierar en ny arbetskopie-katalog" -#: cmd_ws_commit.cc:1237 +#: cmd_ws_commit.cc:1243 msgid "If no directory is specified, uses the current directory." msgstr "Använd nuvarande katalog om inget annat anges." -#: cmd_ws_commit.cc:1243 +#: cmd_ws_commit.cc:1249 #, c-format msgid "need --branch argument for setup" msgstr "du måste ange en gren med --branch till kommandot \"setup\"" -#: cmd_ws_commit.cc:1259 +#: cmd_ws_commit.cc:1265 msgid "DIRECTORY" msgstr "KATALOG" -#: cmd_ws_commit.cc:1260 +#: cmd_ws_commit.cc:1266 msgid "Imports the contents of a directory into a branch" msgstr "Importerar den givna katalogens innehåll till den givna grenen" -#: cmd_ws_commit.cc:1272 +#: cmd_ws_commit.cc:1278 #, c-format msgid "you must specify a directory to import" msgstr "du måste ange en katalog att importera" -#: cmd_ws_commit.cc:1312 +#: cmd_ws_commit.cc:1318 #, c-format msgid "import directory '%s' doesn't exists" msgstr "importkatalogen '%s' finns inte" -#: cmd_ws_commit.cc:1313 +#: cmd_ws_commit.cc:1319 #, c-format msgid "import directory '%s' is a file" msgstr "importkatalogen '%s' är en fil" -#: cmd_ws_commit.cc:1362 +#: cmd_ws_commit.cc:1368 msgid "Migrates a workspace directory's metadata to the latest format" msgstr "Migrerar en arbetskopias metadata till det senaste formatet" -#: cmd_ws_commit.cc:1363 +#: cmd_ws_commit.cc:1369 msgid "If no directory is given, defaults to the current workspace." msgstr "Nuvarande katalog avses om inget annat anges" -#: cmd_ws_commit.cc:1376 +#: cmd_ws_commit.cc:1382 msgid "Refreshes the inodeprint cache" msgstr "Uppdaterar inodeprint-cachen" @@ -4494,21 +4494,26 @@ msgstr "" "Jag förstår bara formatet version '1'\n" "En nyare version av monotone behövs för att fortsätta" -#: roster.cc:2313 +#: roster.cc:2291 #, c-format msgid "restriction includes deletion of '%s' but excludes deletion of '%s'" msgstr "" "restriktionen inbegriper borttagning av '%s' men utesluter borttagning av '%" "s'" -#: roster.cc:2332 +#: roster.cc:2302 #, c-format msgid "restriction excludes addition of '%s' but includes addition of '%s'" msgstr "" "restriktionen utesluter tillägget av '%s' men inbegriper tillägget av '%s'" -#: roster.cc:2360 +#: roster.cc:2328 #, c-format +msgid "restriction excludes addition of root directory" +msgstr "restriktionen utesluter tillägget av rotkatalogen" + +#: roster.cc:2332 +#, c-format msgid "invalid restriction" msgstr "ogiltig restriktion"