# # # patch "po/sv.po" # from [156c2c7d973078682a4f8be91525771e58a9c4b3] # to [37e72135c4fbb13b90b63ab48919374a685cd99d] # ============================================================ --- po/sv.po 156c2c7d973078682a4f8be91525771e58a9c4b3 +++ po/sv.po 37e72135c4fbb13b90b63ab48919374a685cd99d @@ -146,8 +146,8 @@ msgstr "" msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-02 19:57+0100\n" -"PO-Revision-Date: 2006-11-02 20:03+0100\n" +"POT-Creation-Date: 2006-11-03 02:26+0100\n" +"PO-Revision-Date: 2006-11-03 02:29+0100\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -246,7 +246,7 @@ msgstr "REVID" #: automate.cc:1103 automate.cc:1129 automate.cc:1184 automate.cc:1186 #: cmd_db.cc:35 cmd_diff_log.cc:385 cmd_diff_log.cc:416 cmd_diff_log.cc:418 #: cmd_files.cc:138 cmd_files.cc:200 cmd_merging.cc:125 cmd_merging.cc:677 -#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:472 commands.cc:409 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:479 commands.cc:409 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" @@ -477,7 +477,7 @@ msgstr "det finns inga variabler med nam msgstr "det finns inga variabler med namnet %s i domänen %s" #: cmd_db.cc:155 cmd_diff_log.cc:331 cmd_diff_log.cc:541 cmd_files.cc:114 -#: cmd_files.cc:181 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:366 +#: cmd_files.cc:181 cmd_list.cc:458 cmd_merging.cc:614 cmd_ws_commit.cc:373 #: commands.cc:271 msgid "informative" msgstr "informativ" @@ -496,7 +496,7 @@ msgstr "något tecken i den partiella id msgstr "något tecken i den partiella identiteten är inte hexadecimalt" #: cmd_diff_log.cc:331 cmd_ws_commit.cc:66 cmd_ws_commit.cc:252 -#: cmd_ws_commit.cc:286 cmd_ws_commit.cc:366 cmd_ws_commit.cc:672 +#: cmd_ws_commit.cc:293 cmd_ws_commit.cc:373 cmd_ws_commit.cc:679 msgid "[PATH]..." msgstr "[SÖKVÄG]..." @@ -905,8 +905,8 @@ msgstr "" "filer, medvetet ignorerade filer, saknade filer eller ändrade filer" #: cmd_merging.cc:73 cmd_merging.cc:655 cmd_ws_commit.cc:66 -#: cmd_ws_commit.cc:252 cmd_ws_commit.cc:286 cmd_ws_commit.cc:322 -#: cmd_ws_commit.cc:347 cmd_ws_commit.cc:572 cmd_ws_commit.cc:672 +#: cmd_ws_commit.cc:252 cmd_ws_commit.cc:293 cmd_ws_commit.cc:329 +#: cmd_ws_commit.cc:354 cmd_ws_commit.cc:579 cmd_ws_commit.cc:679 msgid "workspace" msgstr "arbetskopia" @@ -1026,8 +1026,8 @@ msgstr "[ihopslagen] %s" msgstr "[ihopslagen] %s" #: cmd_merging.cc:320 cmd_merging.cc:419 cmd_merging.cc:430 cmd_merging.cc:588 -#: cmd_merging.cc:821 cmd_ws_commit.cc:432 cmd_ws_commit.cc:918 -#: cmd_ws_commit.cc:941 cmd_ws_commit.cc:955 +#: cmd_merging.cc:821 cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 +#: cmd_ws_commit.cc:948 cmd_ws_commit.cc:962 msgid "tree" msgstr "träd" @@ -1041,7 +1041,7 @@ msgstr "var god ange en gren med --branc msgstr "var god ange en gren med --branch=GREN" #: cmd_merging.cc:335 cmd_merging.cc:469 cmd_merging.cc:472 cmd_merging.cc:834 -#: cmd_ws_commit.cc:456 +#: cmd_ws_commit.cc:463 #, c-format msgid "branch '%s' is empty" msgstr "grenen '%s' är tom" @@ -1501,11 +1501,21 @@ msgstr "lägg till filer i arbetskopian" msgid "add files to workspace" msgstr "lägg till filer i arbetskopian" -#: cmd_ws_commit.cc:287 +#: cmd_ws_commit.cc:260 +#, 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:262 +#, c-format +msgid "cannot set unknown and no-ignore at the same time" +msgstr "kan inte använda --unknown och --no-respect-ignore samtidigt" + +#: cmd_ws_commit.cc:294 msgid "drop files from workspace" msgstr "överge filer i arbetskopian" -#: cmd_ws_commit.cc:323 +#: cmd_ws_commit.cc:330 msgid "" "SRC DEST\n" "SRC1 [SRC2 [...]] DEST_DIR" @@ -1513,15 +1523,15 @@ msgstr "" "KÄLLA MÅL\n" "KÄLLA1 [KÄLLA2 [...]] MÅLKATALOG" -#: cmd_ws_commit.cc:325 +#: cmd_ws_commit.cc:332 msgid "rename entries in the workspace" msgstr "byt namn på filer i arbetskopian" -#: cmd_ws_commit.cc:347 +#: cmd_ws_commit.cc:354 msgid "NEW_ROOT PUT_OLD" msgstr "NY_ROT PLACERA_GAMLA" -#: cmd_ws_commit.cc:348 +#: cmd_ws_commit.cc:355 msgid "" "rename the root directory\n" "after this command, the directory that currently has the name NEW_ROOT\n" @@ -1535,31 +1545,31 @@ msgstr "" "PLACERA_GAMLA.\n" "Det rekommenderas varmt att använda --execute." -#: cmd_ws_commit.cc:366 +#: cmd_ws_commit.cc:373 msgid "show status of workspace" msgstr "visa arbetskopians status" -#: cmd_ws_commit.cc:395 +#: cmd_ws_commit.cc:402 #, c-format msgid "Current branch: %s" msgstr "Nuvarande gren: %s" -#: cmd_ws_commit.cc:401 +#: cmd_ws_commit.cc:408 #, c-format msgid "Changes against parent %s" msgstr "Förändringar gentemot föräldern %s" -#: cmd_ws_commit.cc:406 +#: cmd_ws_commit.cc:413 #, c-format msgid " no changes" msgstr " inga ändringar" -#: cmd_ws_commit.cc:410 +#: cmd_ws_commit.cc:417 #, c-format msgid " dropped %s" msgstr " slängde %s" -#: cmd_ws_commit.cc:415 +#: cmd_ws_commit.cc:422 #, c-format msgid "" " renamed %s\n" @@ -1568,21 +1578,21 @@ msgstr "" "bytte namn på %s\n" " till %s" -#: cmd_ws_commit.cc:420 cmd_ws_commit.cc:424 +#: cmd_ws_commit.cc:427 cmd_ws_commit.cc:431 #, c-format msgid " added %s" msgstr " la till %s" -#: cmd_ws_commit.cc:428 +#: cmd_ws_commit.cc:435 #, c-format msgid " patched %s" msgstr " ändrade %s" -#: cmd_ws_commit.cc:432 cmd_ws_commit.cc:918 cmd_ws_commit.cc:941 +#: cmd_ws_commit.cc:439 cmd_ws_commit.cc:925 cmd_ws_commit.cc:948 msgid "[DIRECTORY]" msgstr "[KATALOG]" -#: cmd_ws_commit.cc:433 +#: cmd_ws_commit.cc:440 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" @@ -1594,47 +1604,47 @@ 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:451 +#: cmd_ws_commit.cc:458 #, 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:459 +#: cmd_ws_commit.cc:466 #, c-format msgid "branch %s has multiple heads:" msgstr "grenen %s har flera löv:" -#: cmd_ws_commit.cc:462 +#: cmd_ws_commit.cc:469 #, c-format msgid "choose one with '%s checkout -r'" msgstr "välj en med '%s update -r'" -#: cmd_ws_commit.cc:463 +#: cmd_ws_commit.cc:470 #, c-format msgid "branch %s has multiple heads" msgstr "grenen %s har flera löv" -#: cmd_ws_commit.cc:490 +#: cmd_ws_commit.cc:497 #, c-format msgid "revision %s is not a member of branch %s" msgstr "revisionen %s är inte med i grenen %s" -#: cmd_ws_commit.cc:507 +#: cmd_ws_commit.cc:514 #, c-format msgid "you must specify a destination directory" msgstr "du måste ange en målkatalog" -#: cmd_ws_commit.cc:520 +#: cmd_ws_commit.cc:527 #, c-format msgid "checkout directory '%s' already exists" msgstr "arbetskatalogen '%s' finns redan" -#: cmd_ws_commit.cc:554 +#: cmd_ws_commit.cc:561 #, c-format msgid "no file %s found in database for %s" msgstr "det finns ingen fil %s för %s i databasen" -#: cmd_ws_commit.cc:572 +#: cmd_ws_commit.cc:579 msgid "" "set PATH ATTR VALUE\n" "get PATH [ATTR]\n" @@ -1644,45 +1654,45 @@ msgstr "" "get SÖKVÄG [ATTR]\n" "drop SÖKVÄG [ATTR]" -#: cmd_ws_commit.cc:573 +#: cmd_ws_commit.cc:580 msgid "set, get or drop file attributes" msgstr "sätt, hämta eller ta bort attribut" -#: cmd_ws_commit.cc:590 +#: cmd_ws_commit.cc:597 #, c-format msgid "Unknown path '%s'" msgstr "Okänd sökväg '%s'" -#: cmd_ws_commit.cc:619 +#: cmd_ws_commit.cc:626 #, c-format msgid "Path '%s' does not have attribute '%s'" msgstr "Sökvägen '%s' har inget attribut '%s'" -#: cmd_ws_commit.cc:649 +#: cmd_ws_commit.cc:656 #, c-format msgid "No attributes for '%s'" msgstr "Inga attribut till '%s'" -#: cmd_ws_commit.cc:660 +#: cmd_ws_commit.cc:667 #, c-format msgid "No attribute '%s' on path '%s'" msgstr "Inget attribut '%s' för sökvägen '%s'" -#: cmd_ws_commit.cc:673 +#: cmd_ws_commit.cc:680 msgid "commit workspace to database" msgstr "arkivera arbetskopian i databasen" -#: cmd_ws_commit.cc:704 +#: cmd_ws_commit.cc:711 #, c-format msgid "no changes to commit" msgstr "inga ändringar att arkivera" -#: cmd_ws_commit.cc:724 +#: cmd_ws_commit.cc:731 #, c-format msgid "beginning commit on branch '%s'" msgstr "börjar arkivering av ändringar i grenen '%s'" -#: cmd_ws_commit.cc:733 +#: cmd_ws_commit.cc:740 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1693,37 +1703,37 @@ msgstr "" "kanske ta bort eller flytta på _MTN/log\n" "eller ta bort --message/--message-file från kommandoraden?" -#: cmd_ws_commit.cc:748 +#: cmd_ws_commit.cc:755 #, c-format msgid "empty log message; commit canceled" msgstr "tomt loggmeddelande; arkivering avbryts" -#: cmd_ws_commit.cc:770 +#: cmd_ws_commit.cc:777 #, c-format msgid "log message rejected by hook: %s" msgstr "loggmeddelandet förkastas: %s" -#: cmd_ws_commit.cc:778 +#: cmd_ws_commit.cc:785 #, c-format msgid "revision %s already in database" msgstr "revisionen %s finns redan i databasen" -#: cmd_ws_commit.cc:817 cmd_ws_commit.cc:847 +#: cmd_ws_commit.cc:824 cmd_ws_commit.cc:854 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "filen '%s' ändrades under arkivering, avbryter" -#: cmd_ws_commit.cc:829 +#: cmd_ws_commit.cc:836 #, 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:879 +#: cmd_ws_commit.cc:886 #, c-format msgid "committed revision %s" msgstr "arkiverade revisionen %s" -#: cmd_ws_commit.cc:885 +#: cmd_ws_commit.cc:892 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1732,16 +1742,16 @@ 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:919 +#: cmd_ws_commit.cc:926 msgid "setup a new workspace directory, default to current" msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)" -#: cmd_ws_commit.cc:925 +#: cmd_ws_commit.cc:932 #, c-format msgid "need --branch argument for setup" msgstr "du måste ange en gren med --branch till kommandot \"setup\"" -#: cmd_ws_commit.cc:942 +#: cmd_ws_commit.cc:949 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" @@ -1749,7 +1759,7 @@ msgstr "" "migrera en arbetskopias metadata till det senaste formatet; nuvarande " "katalog avses om inget annat anges" -#: cmd_ws_commit.cc:955 +#: cmd_ws_commit.cc:962 msgid "refresh the inodeprint cache" msgstr "uppdatera inodeprint-cachen" @@ -2452,7 +2462,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:530 +#: file_io.cc:530 work.cc:1079 #, c-format msgid "no such file or directory: '%s'" msgstr "ingen sådan fil eller katalog: '%s'" @@ -2507,7 +2517,7 @@ msgstr "Katalogen '%s' finns inte" msgid "Directory '%s' does not exist" msgstr "Katalogen '%s' finns inte" -#: lua.cc:480 rcs_import.cc:1235 work.cc:1316 +#: lua.cc:480 rcs_import.cc:1235 work.cc:1334 #, c-format msgid "'%s' is not a directory" msgstr "'%s' är inte en katalog" @@ -3198,71 +3208,75 @@ msgstr "" "ta ej med vilka filer som lagts till, tagits bort eller ändrats i loggen" #: options_list.hh:365 +msgid "do not ignore any files" +msgstr "ignorera inga filer" + +#: options_list.hh:373 msgid "exclude merges when printing logs" msgstr "ta ej med ihopslagningar i loggen" -#: options_list.hh:373 +#: options_list.hh:381 msgid "do not load ~/.monotone/monotonerc or _MTN/monotonerc lua files" msgstr "använd inte ~/.monotone/monotonerc eller _MTN/monotonerc" -#: options_list.hh:381 +#: options_list.hh:389 msgid "do not load standard lua hooks" msgstr "använd inte standard-lua-rutinerna" -#: options_list.hh:389 +#: options_list.hh:397 msgid "record process id of server" msgstr "spara serverns process-ID i denna fil" -#: options_list.hh:397 +#: options_list.hh:405 msgid "suppress verbose, informational and progress messages" msgstr "skriv inte ut informations- eller förloppsmeddelanden" -#: options_list.hh:407 +#: options_list.hh:415 msgid "load extra rc file" msgstr "använd denna lua-fil" -#: options_list.hh:415 +#: options_list.hh:423 msgid "suppress warning, verbose, informational and progress messages" msgstr "skriv inte ut varningar eller informations- eller förloppsmeddelanden" -#: options_list.hh:425 +#: options_list.hh:433 msgid "also operate on the contents of any listed directories" msgstr "ta även med innehållet för varje listad katalog" -#: options_list.hh:434 +#: options_list.hh:442 msgid "select revision id for operation" msgstr "ange den revision som operationen ska utföras på" -#: options_list.hh:442 +#: options_list.hh:450 msgid "limit search for workspace to specified root" msgstr "begränsa sökningen efter arbetskopian till denna katalog" -#: options_list.hh:450 +#: options_list.hh:458 msgid "use the current arguments as the future default" msgstr "använd de givna argumenten som framtida standardvärden" -#: options_list.hh:458 +#: options_list.hh:466 msgid "set ticker style (count|dot|none)" msgstr "sätt stilen för förloppsinformationen (count|dot|none)" -#: options_list.hh:469 +#: options_list.hh:477 #, c-format msgid "argument must be 'none', 'dot', or 'count'" msgstr "argumentet måste vara 'none', 'dot' eller 'count'" -#: options_list.hh:474 +#: options_list.hh:482 msgid "perform the operations for unknown files from workspace" msgstr "genomför operationen på okända filer i arbetskatalogen" -#: options_list.hh:482 +#: options_list.hh:490 msgid "verbose completion output" msgstr "ge utförlig information" -#: options_list.hh:490 +#: options_list.hh:498 msgid "print version number, then exit" msgstr "skriv ut versionsnumret och avsluta sedan omedelbart" -#: options_list.hh:498 +#: options_list.hh:506 msgid "insert command line arguments taken from the given file" msgstr "använd kommandoradsargument ur denna fil" @@ -3717,22 +3731,22 @@ msgstr "Misslyckades med att skriva inst msgid "Failed to write options file %s: %s" msgstr "Misslyckades med att skriva inställningsfilen %s: %s" -#: work.cc:539 +#: work.cc:541 #, c-format msgid "skipping ignorable file %s" msgstr "hoppar över ignorerbar fil %s" -#: work.cc:548 +#: work.cc:550 #, c-format msgid "skipping %s, already accounted for in workspace" msgstr "hoppar över %s, den finns redan noterad i arbetskopian" -#: work.cc:559 +#: work.cc:561 #, c-format msgid "adding %s to workspace manifest" msgstr "lägger till %s i arbetskopians manifest" -#: work.cc:565 +#: work.cc:567 #, c-format msgid "" "cannot add %s, because %s is recorded as a file in the workspace manifest" @@ -3740,57 +3754,57 @@ msgstr "" "kan inte lägga till %s eftersom %s redan är registrerat som en fil i " "arbetskopians manifest" -#: work.cc:680 +#: work.cc:682 #, c-format msgid "dropping %s" msgstr "slänger %s" -#: work.cc:691 work.cc:702 +#: work.cc:693 work.cc:704 #, c-format msgid "path %s already exists" msgstr "sökvägen %s finns redan" -#: work.cc:724 work.cc:751 +#: work.cc:726 work.cc:756 #, c-format msgid "adding %s" msgstr "lägger till %s" -#: work.cc:740 +#: work.cc:744 #, c-format msgid "path '%s' already exists, cannot create" msgstr "sökvägen '%s' finns redan, kan inte skapa den" -#: work.cc:747 +#: work.cc:752 #, c-format msgid "renaming %s to %s" msgstr "byter namn på %s till %s" -#: work.cc:782 +#: work.cc:787 #, c-format msgid "file '%s' does not exist" msgstr "filen '%s' finns inte" -#: work.cc:783 +#: work.cc:788 #, c-format msgid "file '%s' is a directory" msgstr "filen '%s' är en katalog" -#: work.cc:788 +#: work.cc:793 #, c-format msgid "content of file '%s' has changed, not overwriting" msgstr "innehållet i filen '%s' har ändrats, skriver inte över" -#: work.cc:789 +#: work.cc:794 #, c-format msgid "modifying %s" msgstr "ändrar %s" -#: work.cc:974 +#: work.cc:979 #, c-format msgid "missing %s" msgstr "saknar %s" -#: work.cc:980 +#: work.cc:985 #, c-format msgid "" "%d missing files; use '%s ls missing' to view\n" @@ -3809,96 +3823,96 @@ msgstr "" " '%s drop --missing' eller\n" " '%s revert --missing'" -#: work.cc:1113 +#: work.cc:1131 #, c-format msgid "skipping %s, not currently tracked" msgstr "hoppar över %s, ej noterad i arbetskopian för närvarande" -#: work.cc:1123 +#: work.cc:1141 #, c-format msgid "cannot remove %s/, it is not empty" msgstr "kan inte ta bort %s/, den är inte tom" -#: work.cc:1134 +#: work.cc:1152 #, c-format msgid "dropping %s from workspace manifest" msgstr "tar bort %s från arbetskopians manifest" -#: work.cc:1187 +#: work.cc:1205 #, 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:1190 +#: work.cc:1208 #, 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:1200 +#: work.cc:1218 #, c-format msgid "empty path %s is not allowed" msgstr "tom sökväg %s ej tillåten" -#: work.cc:1214 +#: work.cc:1232 #, c-format msgid "%s does not exist in current manifest" msgstr "%s finns inte i nuvarande manifest" -#: work.cc:1217 +#: work.cc:1235 #, c-format msgid "destination %s already exists in current manifest" msgstr "målet %s finns redan i nuvarande manifest" -#: work.cc:1223 +#: work.cc:1241 #, c-format msgid "destination directory %s does not exist in current manifest" msgstr "målkatalogen %s finns inte i nuvarande manifest" -#: work.cc:1225 +#: work.cc:1243 #, c-format msgid "destination directory %s is not a directory" msgstr "målkatalogen %s är inte en katalog" -#: work.cc:1234 +#: work.cc:1252 #, c-format msgid "renaming %s to %s in workspace manifest" msgstr "byter namn från %s till %s i arbetskopians manifest" -#: work.cc:1262 +#: work.cc:1280 #, c-format msgid "%s doesn't exist in workspace, skipping" msgstr "hoppar över %s, den existerar inte i arbetskopian" -#: work.cc:1266 +#: work.cc:1284 #, c-format msgid "destination %s already exists in workspace, skipping" msgstr "hoppar över %s, den finns redan noterad i arbetskopian" -#: work.cc:1296 +#: work.cc:1314 #, 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:1298 +#: work.cc:1316 #, 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:1303 +#: work.cc:1321 #, 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:1313 +#: work.cc:1331 #, 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:1319 +#: work.cc:1337 #, c-format msgid "'%s' is in the way" msgstr "'%s' är i vägen"