# # # patch "po/sv.po" # from [b054e381afb9289ad02165e3b4ba8d9e08cbda1d] # to [d3da7a8a22e2555ec3d8dbc72bdc16a8098d2e70] # ============================================================ --- po/sv.po b054e381afb9289ad02165e3b4ba8d9e08cbda1d +++ po/sv.po d3da7a8a22e2555ec3d8dbc72bdc16a8098d2e70 @@ -147,8 +147,8 @@ msgstr "" msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-19 12:46+0100\n" -"PO-Revision-Date: 2007-02-19 12:47+0100\n" +"POT-Creation-Date: 2007-02-23 14:32+0100\n" +"PO-Revision-Date: 2007-02-23 14:33+0100\n" "Last-Translator: Joel Rosdahl
\n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -156,50 +156,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: app_state.cc:129 +#: app_state.cc:136 #, c-format msgid "workspace required but not found%s%s" msgstr "arbetskatalog behövs men kunde inte hittas%s%s" -#: app_state.cc:137 +#: app_state.cc:144 #, c-format msgid "invalid directory ''" msgstr "katalogen '' är ogiltig" -#: app_state.cc:145 +#: app_state.cc:152 #, c-format msgid "monotone bookkeeping directory '%s' already exists in '%s'" msgstr "det finns redan en administrativ katalog (%s) i '%s'" -#: app_state.cc:207 +#: app_state.cc:214 #, c-format msgid "search root '%s' does not exist" msgstr "angiven sökrot '%s' finns inte" -#: app_state.cc:208 +#: app_state.cc:215 #, c-format msgid "search root '%s' is not a directory" msgstr "sökroten '%s' är inte en katalog" -#: asciik.cc:381 cmd_files.cc:27 cmd_files.cc:40 cmd_files.cc:77 -#: cmd_files.cc:181 cmd_merging.cc:952 cmd_othervcs.cc:15 +#: asciik.cc:385 cmd_files.cc:27 cmd_files.cc:40 cmd_files.cc:77 +#: cmd_files.cc:181 cmd_merging.cc:954 cmd_othervcs.cc:15 msgid "debug" msgstr "felsökning" -#: asciik.cc:381 automate.cc:530 +#: asciik.cc:385 automate.cc:530 msgid "SELECTOR" msgstr "VÃLJARE" -#: asciik.cc:382 +#: asciik.cc:386 msgid "prints an ASCII representation of the graph" msgstr "visualisera revisionsträdet med i ASCII" -#: asciik.cc:385 automate.cc:66 automate.cc:90 automate.cc:137 automate.cc:217 +#: asciik.cc:389 automate.cc:66 automate.cc:90 automate.cc:137 automate.cc:217 #: automate.cc:363 automate.cc:430 automate.cc:455 automate.cc:533 #: automate.cc:915 automate.cc:1048 automate.cc:1091 automate.cc:1117 #: automate.cc:1144 automate.cc:1171 automate.cc:1205 automate.cc:1317 -#: automate.cc:1407 automate.cc:1466 automate.cc:1512 automate.cc:1571 -#: cmd_files.cc:281 cmd_files.cc:304 cmd_list.cc:674 +#: automate.cc:1407 automate.cc:1466 automate.cc:1515 automate.cc:1574 +#: cmd_files.cc:281 cmd_files.cc:304 cmd_list.cc:677 #, c-format msgid "wrong argument count" msgstr "felaktigt antal givna argument" @@ -214,7 +214,7 @@ msgstr "REV1 [REV2 [REV3 [...]]]" #: automate.cc:97 automate.cc:144 automate.cc:188 automate.cc:334 #: automate.cc:369 automate.cc:373 automate.cc:433 automate.cc:458 -#: automate.cc:1212 cmd_list.cc:681 revision.cc:1819 +#: automate.cc:1212 cmd_list.cc:684 revision.cc:1819 #, c-format msgid "No such revision %s" msgstr "det finns ingen revision med identiteten %s" @@ -228,7 +228,7 @@ msgstr "FIL" msgstr "FIL" #: automate.cc:234 automate.cc:729 automate.cc:965 cmd_files.cc:259 -#: cmd_files.cc:314 cmd_merging.cc:147 cmd_merging.cc:625 cmd_ws_commit.cc:94 +#: cmd_files.cc:314 cmd_merging.cc:147 cmd_merging.cc:627 cmd_ws_commit.cc:94 #, 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" @@ -244,21 +244,21 @@ msgstr "NY_REV [GAMMAL_REV1 [GAMMAL_REV2 #: automate.cc:402 automate.cc:490 automate.cc:715 automate.cc:958 #: automate.cc:982 automate.cc:1268 cmd_automate.cc:77 cmd_automate.cc:331 -#: cmd_list.cc:582 +#: cmd_list.cc:585 #, c-format msgid "no arguments needed" msgstr "inga argument behövs" -#: automate.cc:427 automate.cc:452 cmd_list.cc:671 revision.cc:1813 +#: automate.cc:427 automate.cc:452 cmd_list.cc:674 revision.cc:1813 msgid "REV" msgstr "REV" -#: automate.cc:912 automate.cc:1045 cmd_merging.cc:952 +#: automate.cc:912 automate.cc:1045 cmd_merging.cc:954 msgid "[REVID]" msgstr "[REVID]" -#: automate.cc:940 automate.cc:1066 automate.cc:1520 automate.cc:1578 -#: automate.cc:1583 +#: automate.cc:940 automate.cc:1066 automate.cc:1523 automate.cc:1581 +#: automate.cc:1586 #, c-format msgid "no revision %s found in database" msgstr "revisionen %s finns inte i databasen" @@ -269,9 +269,9 @@ msgstr "REVID" #: automate.cc:1099 automate.cc:1125 automate.cc:1180 automate.cc:1182 #: cmd_db.cc:34 cmd_diff_log.cc:394 cmd_diff_log.cc:421 cmd_diff_log.cc:423 -#: cmd_files.cc:164 cmd_files.cc:220 cmd_merging.cc:181 cmd_merging.cc:781 -#: cmd_merging.cc:796 cmd_merging.cc:799 cmd_ws_commit.cc:517 -#: cmd_ws_commit.cc:980 commands.cc:412 +#: cmd_files.cc:164 cmd_files.cc:220 cmd_merging.cc:181 cmd_merging.cc:783 +#: cmd_merging.cc:798 cmd_merging.cc:801 cmd_ws_commit.cc:515 +#: cmd_ws_commit.cc:978 commands.cc:412 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" @@ -316,21 +316,21 @@ msgstr "FLAGGA" msgid "OPTION" msgstr "FLAGGA" -#: automate.cc:1486 +#: automate.cc:1489 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "'%s' är en okänd inställning i arbetskopians metadata" -#: automate.cc:1509 +#: automate.cc:1512 msgid "REV FILE" msgstr "REV FIL" -#: automate.cc:1526 automate.cc:1589 +#: automate.cc:1529 automate.cc:1592 #, c-format msgid "file %s is unknown for revision %s" msgstr "filen %s är okänd i revision %s" -#: automate.cc:1568 +#: automate.cc:1571 msgid "REV1 FILE REV2" msgstr "REV1 FIL REV2" @@ -516,7 +516,7 @@ msgstr "det finns inga variabler med nam msgstr "det finns inga variabler med namnet %s i domänen %s" #: cmd_db.cc:154 cmd_diff_log.cc:469 cmd_diff_log.cc:598 cmd_files.cc:113 -#: cmd_files.cc:243 cmd_list.cc:476 cmd_merging.cc:718 cmd_ws_commit.cc:417 +#: cmd_files.cc:243 cmd_list.cc:479 cmd_merging.cc:720 cmd_ws_commit.cc:415 #: commands.cc:276 msgid "informative" msgstr "informativ" @@ -573,7 +573,7 @@ msgstr "" "(ange en revision att se skillnader emot med --revision)" #: cmd_diff_log.cc:469 cmd_ws_commit.cc:79 cmd_ws_commit.cc:308 -#: cmd_ws_commit.cc:343 cmd_ws_commit.cc:417 cmd_ws_commit.cc:686 +#: cmd_ws_commit.cc:341 cmd_ws_commit.cc:415 cmd_ws_commit.cc:684 msgid "[PATH]..." msgstr "[SÃKVÃG]..." @@ -924,12 +924,12 @@ msgstr "tom kommentar" msgid "empty comment" msgstr "tom kommentar" -#: cmd_list.cc:66 cmd_list.cc:698 +#: cmd_list.cc:67 cmd_list.cc:701 #, c-format msgid "no public key '%s' found in database" msgstr "den publika nyckeln '%s' finns inte i databasen" -#: cmd_list.cc:76 +#: cmd_list.cc:77 #, c-format msgid "" "Key : %s\n" @@ -942,39 +942,39 @@ msgstr "" "Namn : %s\n" "Värde : %s\n" -#: cmd_list.cc:110 +#: cmd_list.cc:111 msgid "ok" msgstr "ok" -#: cmd_list.cc:113 +#: cmd_list.cc:114 msgid "bad" msgstr "felaktig" -#: cmd_list.cc:116 +#: cmd_list.cc:117 msgid "unknown" msgstr "okänd" -#: cmd_list.cc:204 +#: cmd_list.cc:205 #, c-format msgid "(*) - only in %s/" msgstr "(*) - enbart i %s/" -#: cmd_list.cc:228 +#: cmd_list.cc:229 #, c-format msgid "no keys found" msgstr "hittade inga nycklar" -#: cmd_list.cc:230 +#: cmd_list.cc:231 #, c-format msgid "no keys found matching '%s'" msgstr "hittade inga nycklar som matchar '%s'" -#: cmd_list.cc:280 +#: cmd_list.cc:283 #, c-format msgid "no epoch for branch %s" msgstr "ingen epok i grenen %s" -#: cmd_list.cc:477 +#: cmd_list.cc:480 msgid "" "certs ID\n" "keys [PATTERN]\n" @@ -1000,7 +1000,7 @@ msgstr "" "missing\n" "changed" -#: cmd_list.cc:488 +#: cmd_list.cc:491 msgid "" "show database objects, or the current workspace manifest, \n" "or known, unknown, intentionally ignored, missing, or \n" @@ -1034,10 +1034,10 @@ msgstr "" "denna revision är inte i nÃ¥gon gren\n" "nästa ändring hamnar i grenen %s" -#: cmd_merging.cc:126 cmd_merging.cc:759 cmd_ws_commit.cc:79 -#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:343 -#: cmd_ws_commit.cc:373 cmd_ws_commit.cc:398 cmd_ws_commit.cc:586 -#: cmd_ws_commit.cc:686 +#: cmd_merging.cc:126 cmd_merging.cc:761 cmd_ws_commit.cc:79 +#: cmd_ws_commit.cc:264 cmd_ws_commit.cc:308 cmd_ws_commit.cc:341 +#: cmd_ws_commit.cc:371 cmd_ws_commit.cc:396 cmd_ws_commit.cc:584 +#: cmd_ws_commit.cc:684 msgid "workspace" msgstr "arbetskopia" @@ -1126,15 +1126,15 @@ msgstr "[höger] %s" msgid "[right] %s" msgstr "[höger] %s" -#: cmd_merging.cc:324 cmd_merging.cc:595 +#: cmd_merging.cc:324 cmd_merging.cc:597 #, c-format msgid "[merged] %s" msgstr "[ihopslagen] %s" -#: cmd_merging.cc:331 cmd_merging.cc:430 cmd_merging.cc:441 cmd_merging.cc:599 -#: cmd_merging.cc:692 cmd_merging.cc:928 cmd_ws_commit.cc:477 -#: cmd_ws_commit.cc:938 cmd_ws_commit.cc:961 cmd_ws_commit.cc:1060 -#: cmd_ws_commit.cc:1074 +#: cmd_merging.cc:331 cmd_merging.cc:430 cmd_merging.cc:441 cmd_merging.cc:601 +#: cmd_merging.cc:694 cmd_merging.cc:930 cmd_ws_commit.cc:475 +#: cmd_ws_commit.cc:936 cmd_ws_commit.cc:959 cmd_ws_commit.cc:1059 +#: cmd_ws_commit.cc:1073 msgid "tree" msgstr "träd" @@ -1142,13 +1142,13 @@ msgstr "slÃ¥ ihop ej ihopslagna löv i g msgid "merge unmerged heads of branch" msgstr "slÃ¥ ihop ej ihopslagna löv i grenen" -#: cmd_merging.cc:341 cmd_merging.cc:936 +#: cmd_merging.cc:341 cmd_merging.cc:938 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "var god ange en gren med --branch=GREN" -#: cmd_merging.cc:346 cmd_merging.cc:480 cmd_merging.cc:483 cmd_merging.cc:941 -#: cmd_ws_commit.cc:501 +#: cmd_merging.cc:346 cmd_merging.cc:480 cmd_merging.cc:483 cmd_merging.cc:943 +#: cmd_ws_commit.cc:499 #, c-format msgid "branch '%s' is empty" msgstr "grenen '%s' är tom" @@ -1231,16 +1231,16 @@ msgstr "ingen ihopslagning behövs; sät msgid "no merge necessary; putting %s in branch '%s'" msgstr "ingen ihopslagning behövs; sätter %s i grenen '%s'" -#: cmd_merging.cc:540 +#: cmd_merging.cc:542 #, c-format msgid "Path %s not found in destination tree." msgstr "Sökvägen %s finns inte i mÃ¥lträdet." -#: cmd_merging.cc:600 +#: cmd_merging.cc:602 msgid "OTHER-REVISION" msgstr "ANNAN-REVISION" -#: cmd_merging.cc:601 +#: cmd_merging.cc:603 msgid "" "Merge OTHER-REVISION into the current workspace's base revision, and update " "the current workspace with the result. There can be no pending changes in " @@ -1254,19 +1254,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:632 +#: cmd_merging.cc:634 #, 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:640 +#: cmd_merging.cc:642 #, c-format msgid "workspace is already at revision %s" msgstr "arbetskopian är redan uppdaterad till revision %s" -#: cmd_merging.cc:687 +#: cmd_merging.cc:689 #, c-format msgid "" "updated to result of merge\n" @@ -1277,75 +1277,75 @@ msgstr "" "[vänster] %s\n" "[ höger] %s\n" -#: cmd_merging.cc:693 +#: cmd_merging.cc:695 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VÃNSTERREVISION HÃGERREVISION Mà LGREN" -#: cmd_merging.cc:694 +#: cmd_merging.cc:696 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" "slÃ¥ ihop tvÃ¥ explicit angivna revisioner, placera resultatet i angiven gren" -#: cmd_merging.cc:709 +#: cmd_merging.cc:711 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s och %s är samma revision, avbryter" -#: cmd_merging.cc:711 cmd_merging.cc:713 +#: cmd_merging.cc:713 cmd_merging.cc:715 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s är redan förfader till %s" -#: cmd_merging.cc:718 +#: cmd_merging.cc:720 msgid "REV REV" msgstr "REV REV" -#: cmd_merging.cc:719 +#: cmd_merging.cc:721 msgid "" "Show what conflicts would need to be resolved to merge the given revisions." msgstr "" "Visa de konflikter som behöver lösas om de givna revisionerna slÃ¥s ihop." -#: cmd_merging.cc:729 cmd_merging.cc:731 +#: cmd_merging.cc:731 cmd_merging.cc:733 #, 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:745 +#: cmd_merging.cc:747 #, c-format msgid "There are %s node_name_conflicts." msgstr "Det finns %s node_name-konflikter." -#: cmd_merging.cc:747 +#: cmd_merging.cc:749 #, c-format msgid "There are %s file_content_conflicts." msgstr "Det finns %s file_content-konflikter." -#: cmd_merging.cc:749 +#: cmd_merging.cc:751 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Det finns %s node_attr-konflikter." -#: cmd_merging.cc:751 +#: cmd_merging.cc:753 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Det finns %s orphaned_node-konflikter." -#: cmd_merging.cc:753 +#: cmd_merging.cc:755 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Det finns %s rename_target-konflikter." -#: cmd_merging.cc:755 +#: cmd_merging.cc:757 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Det finns %s directory_loop-konflikter." -#: cmd_merging.cc:759 +#: cmd_merging.cc:761 msgid "[-r FROM] -r TO [PATH...]" msgstr "[-r FRà N] -r TILL [SÃKVÃG...]" -#: cmd_merging.cc:760 +#: cmd_merging.cc:762 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" @@ -1373,7 +1373,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:785 +#: cmd_merging.cc:787 #, c-format msgid "" "revision %s is a merge\n" @@ -1384,41 +1384,41 @@ msgstr "" "för att utföra ändringarna relativt en av dess föräldrar, gör sÃ¥ här:\n" " %s pluck -r FÃRÃLDER -r %s" -#: cmd_merging.cc:806 +#: cmd_merging.cc:808 #, c-format msgid "no changes to apply" msgstr "inga ändringar att utföra" -#: cmd_merging.cc:863 +#: cmd_merging.cc:865 #, c-format msgid "no changes to be applied" msgstr "inga ändringar att utföra" -#: cmd_merging.cc:893 +#: cmd_merging.cc:895 #, c-format msgid "no changes were applied" msgstr "inga ändringar blev utförda" -#: cmd_merging.cc:896 +#: cmd_merging.cc:898 #, c-format msgid "applied changes to workspace" msgstr "utförde ändringarna i arbetskopian" -#: cmd_merging.cc:928 +#: cmd_merging.cc:930 msgid "show unmerged head revisions of branch" msgstr "visa ej ihopslagna lövrevisioner i grenen" -#: cmd_merging.cc:943 +#: cmd_merging.cc:945 #, c-format msgid "branch '%s' is currently merged:" msgstr "grenen '%s' har för tillfället ett löv:" -#: cmd_merging.cc:945 +#: cmd_merging.cc:947 #, c-format msgid "branch '%s' is currently unmerged:" msgstr "grenen '%s' har för tillfället mer än ett löv:" -#: cmd_merging.cc:953 +#: cmd_merging.cc:955 msgid "" "dump the roster associated with the given REVID, or the workspace if no " "REVID is given" @@ -1426,76 +1426,76 @@ msgstr "" "skriv ut den lista som hör ihop med angivet REVID, eller arbetskopian om " "REVID inte angavs" -#: cmd_netsync.cc:33 +#: cmd_netsync.cc:34 #, c-format msgid "setting default server to %s" msgstr "sätter standardserver till %s" -#: cmd_netsync.cc:40 +#: cmd_netsync.cc:41 #, c-format msgid "no server given and no default server set" msgstr "ingen server angiven och ingen standardserver är satt" -#: cmd_netsync.cc:72 +#: cmd_netsync.cc:73 #, c-format msgid "no branch pattern given" msgstr "inget grenmönster angivet" -#: cmd_netsync.cc:80 +#: cmd_netsync.cc:86 #, 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:86 +#: cmd_netsync.cc:92 #, c-format msgid "setting default branch exclude pattern to '%s'" msgstr "sätter standardmönstret för grenar att INTE ta med till '%s'" -#: cmd_netsync.cc:93 +#: cmd_netsync.cc:99 #, c-format msgid "no branch pattern given and no default pattern set" msgstr "inget grenmönster angivet och inget standardmönster satt" -#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 cmd_netsync.cc:184 +#: cmd_netsync.cc:115 cmd_netsync.cc:130 cmd_netsync.cc:146 cmd_netsync.cc:193 msgid "network" msgstr "nätverk" -#: cmd_netsync.cc:109 cmd_netsync.cc:123 cmd_netsync.cc:138 +#: cmd_netsync.cc:115 cmd_netsync.cc:130 cmd_netsync.cc:146 msgid "[ADDRESS[:PORTNUMBER] [PATTERN ...]]" msgstr "[ADRESS[:PORTNUMMER] [MÃNSTER ...]]" -#: cmd_netsync.cc:110 +#: cmd_netsync.cc:116 msgid "push branches matching PATTERN to netsync server at ADDRESS" msgstr "skicka grenar som matchar MÃNSTER till netsync-server pÃ¥ ADRESS" -#: cmd_netsync.cc:124 +#: cmd_netsync.cc:131 msgid "pull branches matching PATTERN from netsync server at ADDRESS" msgstr "hämta grenar som matchar MÃNSTER till netsync-server pÃ¥ ADRESS" -#: cmd_netsync.cc:132 +#: cmd_netsync.cc:140 #, 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:139 +#: cmd_netsync.cc:147 msgid "sync branches matching PATTERN with netsync server at ADDRESS" msgstr "synkronisera grenar som matchar MÃNSTER till netsync-server pÃ¥ ADRESS" -#: cmd_netsync.cc:160 +#: cmd_netsync.cc:169 #, c-format msgid "pid file '%s' already exists" msgstr "pid-filen '%s' finns redan" -#: cmd_netsync.cc:162 +#: cmd_netsync.cc:171 #, c-format msgid "failed to create pid file '%s'" msgstr "misslyckades med att skapa pid-filen %s" -#: cmd_netsync.cc:185 +#: cmd_netsync.cc:194 msgid "serve the database to connecting clients" msgstr "servera databasen till anslutande klienter" -#: cmd_netsync.cc:201 +#: cmd_netsync.cc:210 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1503,7 +1503,7 @@ msgstr "" "behöver tillstÃ¥nd att använda ett permanent lösenord (se lua-" "rutinenpersist_phrase_ok())" -#: cmd_netsync.cc:207 +#: cmd_netsync.cc:216 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1671,21 +1671,11 @@ msgstr "lägg till filer i arbetskopian" msgid "add files to workspace" msgstr "lägg till filer i arbetskopian" -#: cmd_ws_commit.cc:316 -#, c-format -msgid "cannot set '--unknown' and '--recursive' at the same time" -msgstr "kan inte använda '--unknown' och '--recursive' samtidigt" - -#: cmd_ws_commit.cc:318 -#, c-format -msgid "cannot set '--unknown' and '--no-respect-ignore' at the same time" -msgstr "kan inte använda '--unknown' och '--no-respect-ignore' samtidigt" - -#: cmd_ws_commit.cc:344 +#: cmd_ws_commit.cc:342 msgid "drop files from workspace" msgstr "överge filer i arbetskopian" -#: cmd_ws_commit.cc:374 +#: cmd_ws_commit.cc:372 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1693,15 +1683,15 @@ msgstr "" "KÃLLA Mà L\n" "KÃLLA1 [KÃLLA2 [...]] Mà LKATALOG" -#: cmd_ws_commit.cc:376 +#: cmd_ws_commit.cc:374 msgid "rename entries in the workspace" msgstr "byt namn pÃ¥ filer i arbetskopian" -#: cmd_ws_commit.cc:398 +#: cmd_ws_commit.cc:396 msgid "NEW_ROOT PUT_OLD" msgstr "NY_ROT PLACERA_GAMLA" -#: cmd_ws_commit.cc:399 +#: cmd_ws_commit.cc:397 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1715,31 +1705,31 @@ msgstr "" "PLACERA_GAMLA.\n" "Det rekommenderas varmt att använda --execute." -#: cmd_ws_commit.cc:417 +#: cmd_ws_commit.cc:415 msgid "show status of workspace" msgstr "visa arbetskopians status" -#: cmd_ws_commit.cc:440 +#: cmd_ws_commit.cc:438 #, c-format msgid "Current branch: %s" msgstr "Nuvarande gren: %s" -#: cmd_ws_commit.cc:446 +#: cmd_ws_commit.cc:444 #, c-format msgid "Changes against parent %s" msgstr "Förändringar gentemot föräldern %s" -#: cmd_ws_commit.cc:451 +#: cmd_ws_commit.cc:449 #, c-format msgid " no changes" msgstr " inga ändringar" -#: cmd_ws_commit.cc:455 +#: cmd_ws_commit.cc:453 #, c-format msgid " dropped %s" msgstr " slängde %s" -#: cmd_ws_commit.cc:460 +#: cmd_ws_commit.cc:458 #, c-format msgid "" " renamed %s\n" @@ -1748,21 +1738,21 @@ msgstr "" "bytte namn pÃ¥ %s\n" " till %s" -#: cmd_ws_commit.cc:465 cmd_ws_commit.cc:469 +#: cmd_ws_commit.cc:463 cmd_ws_commit.cc:467 #, c-format msgid " added %s" msgstr " la till %s" -#: cmd_ws_commit.cc:473 +#: cmd_ws_commit.cc:471 #, c-format msgid " patched %s" msgstr " ändrade %s" -#: cmd_ws_commit.cc:477 cmd_ws_commit.cc:938 cmd_ws_commit.cc:1060 +#: cmd_ws_commit.cc:475 cmd_ws_commit.cc:936 cmd_ws_commit.cc:1059 msgid "[DIRECTORY]" msgstr "[KATALOG]" -#: cmd_ws_commit.cc:478 +#: cmd_ws_commit.cc:476 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" @@ -1774,42 +1764,42 @@ 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:496 cmd_ws_commit.cc:994 +#: cmd_ws_commit.cc:494 cmd_ws_commit.cc:992 #, 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_ws_commit.cc:504 cmd_ws_commit.cc:1000 +#: cmd_ws_commit.cc:502 cmd_ws_commit.cc:998 #, c-format msgid "branch %s has multiple heads:" msgstr "grenen %s har flera löv:" -#: cmd_ws_commit.cc:507 cmd_ws_commit.cc:1003 +#: cmd_ws_commit.cc:505 cmd_ws_commit.cc:1001 #, c-format msgid "choose one with '%s checkout -r