# # # patch "ChangeLog" # from [0963ea40da90391247b3ad96104271f6aa11e3aa] # to [1ddb8c6d364c313121b7443f2070036431ca7257] # # patch "po/sv.po" # from [975be80dcc2c406341e4ab17d491c46ff807749a] # to [931ea57daac9e163c978aca94246b8015e03dda3] # ============================================================ --- ChangeLog 0963ea40da90391247b3ad96104271f6aa11e3aa +++ ChangeLog 1ddb8c6d364c313121b7443f2070036431ca7257 @@ -1,3 +1,7 @@ +2006-10-09 Richard Levitte
+ + * po/sv.po: 35 fuzzies cleared, + 2006-10-04 Timothy Brownawell * automate.cc: Fix automate inventory. ============================================================ --- po/sv.po 975be80dcc2c406341e4ab17d491c46ff807749a +++ po/sv.po 931ea57daac9e163c978aca94246b8015e03dda3 @@ -146,8 +146,8 @@ msgstr "" msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-18 02:29+0200\n" -"PO-Revision-Date: 2006-09-18 02:29+0200\n" +"POT-Creation-Date: 2006-10-09 00:32+0200\n" +"PO-Revision-Date: 2006-10-09 00:36+0200\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -177,8 +177,8 @@ msgstr "angiven sökrot '%s' finns inte" #: app_state.cc:246 #, c-format -msgid "search root '%s' is not a directory\n" -msgstr "sökroten '%s' är inte en katalog\n" +msgid "search root '%s' is not a directory" +msgstr "sökroten '%s' är inte en katalog" #: app_state.cc:280 #, c-format @@ -187,37 +187,35 @@ msgstr "kunde inte tyda datumangivelsen #: app_state.cc:295 #, c-format -msgid "negative depth not allowed\n" -msgstr "negativt djup är inte tillÃ¥tet\n" +msgid "negative depth not allowed" +msgstr "negativt djup är inte tillÃ¥tet" #: app_state.cc:303 #, c-format -msgid "illegal argument to --last: cannot be zero or negative\n" -msgstr "felaktigt argument till --last: fÃ¥r ej vara noll eller negativt\n" +msgid "illegal argument to --last: cannot be zero or negative" +msgstr "felaktigt argument till --last: fÃ¥r ej vara noll eller negativt" #: app_state.cc:311 #, c-format -msgid "illegal argument to --next: cannot be zero or negative\n" -msgstr "felaktigt argument till --next: fÃ¥r ej vara noll eller negativt\n" +msgid "illegal argument to --next: cannot be zero or negative" +msgstr "felaktigt argument till --next: fÃ¥r ej vara noll eller negativt" #: app_state.cc:388 #, c-format -msgid "illegal argument to --automate-stdio-size: cannot be zero or negative\n" -msgstr "" -"felaktigt argument till --automate-stdio-size: fÃ¥r ej vara noll eller " -"negativt\n" +msgid "illegal argument to --automate-stdio-size: cannot be zero or negative" +msgstr "felaktigt argument till --automate-stdio-size: fÃ¥r ej vara noll eller negativt" #: automate.cc:65 msgid "[BRANCH]" msgstr "[GREN]" -#: automate.cc:89 automate.cc:136 automate.cc:1202 +#: automate.cc:89 automate.cc:136 automate.cc:1207 msgid "REV1 [REV2 [REV3 [...]]]" msgstr "REV1 [REV2 [REV3 [...]]]" #: automate.cc:99 automate.cc:146 automate.cc:190 automate.cc:331 #: automate.cc:366 automate.cc:370 automate.cc:429 automate.cc:453 -#: automate.cc:1212 cmd_list.cc:661 +#: automate.cc:1217 cmd_list.cc:661 #, c-format msgid "No such revision %s" msgstr "det finns ingen revision med identiteten %s" @@ -247,88 +245,88 @@ msgstr "VÃLJARE" msgid "SELECTOR" msgstr "VÃLJARE" -#: automate.cc:889 automate.cc:1019 +#: automate.cc:894 automate.cc:1024 msgid "[REVID]" msgstr "[REVID]" -#: automate.cc:918 automate.cc:1041 automate.cc:1525 automate.cc:1584 -#: automate.cc:1589 +#: automate.cc:923 automate.cc:1046 automate.cc:1530 automate.cc:1589 +#: automate.cc:1594 #, c-format msgid "no revision %s found in database" msgstr "revisionen %s finns inte i i databasen" -#: automate.cc:1062 automate.cc:1141 +#: automate.cc:1067 automate.cc:1146 msgid "FILEID" msgstr "FILID" -#: automate.cc:1069 +#: automate.cc:1074 #, c-format msgid "no file version %s found in database" msgstr "filversionen %s finns inte i databasen" -#: automate.cc:1088 automate.cc:1114 cmd_merging.cc:845 +#: automate.cc:1093 automate.cc:1119 cmd_merging.cc:845 msgid "REVID" msgstr "REVID" -#: automate.cc:1099 automate.cc:1125 automate.cc:1180 automate.cc:1182 +#: automate.cc:1104 automate.cc:1130 automate.cc:1185 automate.cc:1187 #: 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:461 commands.cc:390 +#: cmd_merging.cc:692 cmd_merging.cc:695 cmd_ws_commit.cc:461 commands.cc:388 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" -#: automate.cc:1152 +#: automate.cc:1157 #, c-format msgid "no such file '%s'" msgstr "filen '%s' finns inte" -#: automate.cc:1168 +#: automate.cc:1173 msgid "OLD_FILE NEW_FILE" msgstr "GAMMAL_FIL NYTT_FIL" -#: automate.cc:1313 +#: automate.cc:1318 msgid "[BRANCH_PATTERN]" msgstr "[GREN_MÃNSTER]" -#: automate.cc:1409 +#: automate.cc:1414 msgid "KEYID PASSPHRASE" msgstr "NYCKELID LÃSENFRAS" -#: automate.cc:1427 cmd_key_cert.cc:41 +#: automate.cc:1432 cmd_key_cert.cc:41 #, c-format msgid "key '%s' already exists" msgstr "nyckeln '%s' finns redan" -#: automate.cc:1430 cmd_key_cert.cc:44 +#: automate.cc:1435 cmd_key_cert.cc:44 #, c-format msgid "generating key-pair '%s'" msgstr "skapar nyckelparet '%s'" -#: automate.cc:1432 cmd_key_cert.cc:46 +#: automate.cc:1437 cmd_key_cert.cc:46 #, c-format msgid "storing key-pair '%s' in %s/" msgstr "lagrar nyckelparet '%s' i %s/" -#: automate.cc:1468 +#: automate.cc:1473 msgid "OPTION" msgstr "FLAGGA" -#: automate.cc:1491 +#: automate.cc:1496 #, c-format msgid "'%s' is not a recognized workspace option" msgstr "'%s' är en okänd inställning i arbetskopians metadata" -#: automate.cc:1514 +#: automate.cc:1519 msgid "REV FILE" msgstr "REV FIL" -#: automate.cc:1531 automate.cc:1595 +#: automate.cc:1536 automate.cc:1600 #, c-format msgid "file %s is unknown for revision %s" msgstr "filen %s är okänd i revision %s" -#: automate.cc:1574 +#: automate.cc:1579 msgid "REV1 FILE REV2" msgstr "REV1 FIL REV2" @@ -499,7 +497,7 @@ msgstr "det finns inga variabler med nam #: 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:457 cmd_merging.cc:614 cmd_ws_commit.cc:355 -#: commands.cc:254 +#: commands.cc:252 msgid "informative" msgstr "informativ" @@ -675,8 +673,8 @@ msgstr "den partiella identiteten '%s' m #: cmd.hh:121 #, c-format -msgid "partial id '%s' has multiple ambiguous expansions:\n" -msgstr "den partiella identiteten '%s' har mer än en uttydning:\n" +msgid "partial id '%s' has multiple ambiguous expansions:" +msgstr "den partiella identiteten '%s' har mer än en uttydning:" #: cmd.hh:129 #, c-format @@ -772,13 +770,13 @@ msgid "" "with key: %s\n" "and value: %s\n" "was signed by: %s\n" -"it would be: %s\n" +"it would be: %s" msgstr "" "om ett cert pÃ¥: %s\n" "med nyckelordet: %s\n" "och värdet: %s\n" "signerades av: %s\n" -"skulle det vara: %s\n" +"skulle det vara: %s" #: cmd_key_cert.cc:191 msgid "trusted" @@ -788,54 +786,54 @@ msgstr "OpÃ¥litligt" msgid "UNtrusted" msgstr "OpÃ¥litligt" -#: cmd_key_cert.cc:194 cmd_key_cert.cc:207 cmd_key_cert.cc:220 -#: cmd_key_cert.cc:236 cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:195 cmd_key_cert.cc:208 cmd_key_cert.cc:221 +#: cmd_key_cert.cc:237 cmd_ws_commit.cc:189 msgid "review" msgstr "granskning" -#: cmd_key_cert.cc:194 +#: cmd_key_cert.cc:195 msgid "REVISION TAGNAME" msgstr "REVISION TAGNAMN" -#: cmd_key_cert.cc:195 +#: cmd_key_cert.cc:196 msgid "put a symbolic tag cert on a revision" msgstr "sätt ett symboliskt tagg-cert pÃ¥ en revision" -#: cmd_key_cert.cc:207 +#: cmd_key_cert.cc:208 msgid "ID (pass|fail|true|false|yes|no|1|0)" msgstr "ID (pass|fail|true|false|yes|no|1|0)" -#: cmd_key_cert.cc:208 +#: cmd_key_cert.cc:209 msgid "note the results of running a test on a revision" msgstr "notera ett testresultat för en revision" -#: cmd_key_cert.cc:220 cmd_ws_commit.cc:189 +#: cmd_key_cert.cc:221 cmd_ws_commit.cc:189 msgid "REVISION" msgstr "REVISION" -#: cmd_key_cert.cc:221 +#: cmd_key_cert.cc:222 msgid "approve of a particular revision" msgstr "godkänn en specifik revision" -#: cmd_key_cert.cc:232 +#: cmd_key_cert.cc:233 #, c-format msgid "need --branch argument for approval" msgstr "för godkännande behöver en gren anges med --branch" -#: cmd_key_cert.cc:236 +#: cmd_key_cert.cc:237 msgid "REVISION [COMMENT]" msgstr "REVISION [KOMMENTAR]" -#: cmd_key_cert.cc:237 +#: cmd_key_cert.cc:238 msgid "comment on a particular revision" msgstr "kommentera en specifik revision" -#: cmd_key_cert.cc:249 +#: cmd_key_cert.cc:250 #, c-format msgid "edit comment failed" msgstr "misslyckades med att redigera kommentaren" -#: cmd_key_cert.cc:254 +#: cmd_key_cert.cc:255 #, c-format msgid "empty comment" msgstr "tom kommentar" @@ -1047,8 +1045,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:421 cmd_ws_commit.cc:901 -#: cmd_ws_commit.cc:924 cmd_ws_commit.cc:938 +#: cmd_merging.cc:821 cmd_ws_commit.cc:421 cmd_ws_commit.cc:907 +#: cmd_ws_commit.cc:930 cmd_ws_commit.cc:944 msgid "tree" msgstr "träd" @@ -1295,85 +1293,85 @@ msgstr "skriv ut den lista som hör ihop msgid "dump the roster associated with the given REVID" msgstr "skriv ut den lista som hör ihop med angivet REVID" -#: cmd_netsync.cc:40 +#: cmd_netsync.cc:42 #, c-format msgid "setting default server to %s" msgstr "sätter standardserver till %s" -#: cmd_netsync.cc:46 +#: cmd_netsync.cc:48 #, c-format msgid "no hostname given" msgstr "inget värdnamn angivet" -#: cmd_netsync.cc:48 +#: cmd_netsync.cc:50 #, c-format msgid "no server given and no default server set" msgstr "ingen server angiven och ingen standardserver är satt" -#: cmd_netsync.cc:59 cmd_netsync.cc:79 +#: cmd_netsync.cc:78 cmd_netsync.cc:98 #, c-format msgid "no branch pattern given" msgstr "inget grenmönster angivet" -#: cmd_netsync.cc:67 +#: 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:73 +#: 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:81 +#: cmd_netsync.cc:100 #, 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:97 cmd_netsync.cc:112 cmd_netsync.cc:126 cmd_netsync.cc:173 +#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144 cmd_netsync.cc:188 msgid "network" msgstr "nätverk" -#: cmd_netsync.cc:97 cmd_netsync.cc:112 cmd_netsync.cc:126 +#: cmd_netsync.cc:116 cmd_netsync.cc:129 cmd_netsync.cc:144 msgid "[ADDRESS[:PORTNUMBER] [PATTERN]]" msgstr "[ADRESS[:PORTNUMMER] [MÃNSTER]]" -#: cmd_netsync.cc:98 +#: cmd_netsync.cc:117 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:113 +#: cmd_netsync.cc:130 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:120 +#: cmd_netsync.cc:138 #, 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:127 +#: cmd_netsync.cc:145 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:149 +#: cmd_netsync.cc:164 #, c-format msgid "pid file '%s' already exists" msgstr "pid-filen '%s' finns redan" -#: cmd_netsync.cc:151 +#: cmd_netsync.cc:166 #, c-format msgid "failed to create pid file '%s'" msgstr "Misslyckades med att skapa pid-filen %s" -#: cmd_netsync.cc:173 +#: cmd_netsync.cc:188 msgid "PATTERN ..." msgstr "MÃNSTER ..." -#: cmd_netsync.cc:174 +#: cmd_netsync.cc:189 msgid "serve the branches specified by PATTERNs to connecting clients" msgstr "servera de grenar som matchar MÃNSTER till anslutande klienter" -#: cmd_netsync.cc:190 +#: cmd_netsync.cc:205 #, c-format msgid "" "need permission to store persistent passphrase (see hook persist_phrase_ok())" @@ -1381,7 +1379,7 @@ msgstr "" "behöver tillstÃ¥nd att använda ett permanent lösenord (se lua-" "rutinenpersist_phrase_ok())" -#: cmd_netsync.cc:196 +#: cmd_netsync.cc:211 #, c-format msgid "" "The --no-transport-auth option is only permitted in combination with --stdio" @@ -1510,8 +1508,8 @@ msgstr "underkänn en specifik revision" #: cmd_ws_commit.cc:203 #, c-format -msgid "revision '%s' has %d changesets, cannot invert\n" -msgstr "revisionen '%s' har %d föräldrar, kan inte invertera\n" +msgid "revision %s has %d changesets, cannot invert" +msgstr "revisionen '%s' har %d föräldrar, kan inte invertera" #: cmd_ws_commit.cc:207 #, c-format @@ -1599,9 +1597,9 @@ msgstr " ändrade %s" msgid " patched %s" msgstr " ändrade %s" -#: cmd_ws_commit.cc:421 -msgid "[DIRECTORY]\n" -msgstr "[KATALOG]\n" +#: cmd_ws_commit.cc:421 cmd_ws_commit.cc:907 cmd_ws_commit.cc:930 +msgid "[DIRECTORY]" +msgstr "[KATALOG]" #: cmd_ws_commit.cc:422 msgid "" @@ -1676,8 +1674,8 @@ msgstr "Okänd sökväg '%s'" #: cmd_ws_commit.cc:608 #, c-format -msgid "Path '%s' does not have attribute '%s'\n" -msgstr "Sökvägen '%s' har inget attribut '%s'\n" +msgid "Path '%s' does not have attribute '%s'" +msgstr "Sökvägen '%s' har inget attribut '%s'" #: cmd_ws_commit.cc:638 #, c-format @@ -1698,12 +1696,12 @@ msgstr "inga ändringar att arkivera" msgid "no changes to commit" msgstr "inga ändringar att arkivera" -#: cmd_ws_commit.cc:707 +#: cmd_ws_commit.cc:713 #, c-format msgid "beginning commit on branch '%s'" msgstr "börjar arkivering av ändringar i grenen '%s'" -#: cmd_ws_commit.cc:716 +#: cmd_ws_commit.cc:722 #, c-format msgid "" "_MTN/log is non-empty and log message was specified on command line\n" @@ -1714,37 +1712,37 @@ msgstr "" "kanske ta bort eller flytta pÃ¥ _MTN/log\n" "eller ta bort --message/--message-file frÃ¥n kommandoraden?" -#: cmd_ws_commit.cc:731 +#: cmd_ws_commit.cc:737 #, c-format msgid "empty log message; commit canceled" msgstr "tomt loggmeddelande; arkivering avbryts" -#: cmd_ws_commit.cc:753 +#: cmd_ws_commit.cc:759 #, c-format msgid "log message rejected by hook: %s" msgstr "loggmeddelandet förkastas: %s" -#: cmd_ws_commit.cc:761 +#: cmd_ws_commit.cc:767 #, c-format msgid "revision %s already in database" msgstr "revisionen %s finns redan i databasen" -#: cmd_ws_commit.cc:800 cmd_ws_commit.cc:830 +#: cmd_ws_commit.cc:806 cmd_ws_commit.cc:836 #, c-format msgid "file '%s' modified during commit, aborting" msgstr "filen '%s' ändrades under arkivering, avbryter" -#: cmd_ws_commit.cc:812 +#: cmd_ws_commit.cc:818 #, 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:862 +#: cmd_ws_commit.cc:868 #, c-format msgid "committed revision %s" msgstr "arkiverade revisionen %s" -#: cmd_ws_commit.cc:868 +#: cmd_ws_commit.cc:874 #, c-format msgid "" "note: this revision creates divergence\n" @@ -1753,20 +1751,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:901 cmd_ws_commit.cc:924 -msgid "[DIRECTORY]" -msgstr "[KATALOG]" - -#: cmd_ws_commit.cc:902 +#: cmd_ws_commit.cc:908 msgid "setup a new workspace directory, default to current" msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)" -#: cmd_ws_commit.cc:908 +#: cmd_ws_commit.cc:914 #, c-format msgid "need --branch argument for setup" msgstr "du mÃ¥ste ange en gren med --branch till kommandot \"setup\"" -#: cmd_ws_commit.cc:925 +#: cmd_ws_commit.cc:931 msgid "" "migrate a workspace directory's metadata to the latest format; defaults to " "the current workspace" @@ -1774,57 +1768,57 @@ msgstr "" "migrera en arbetskopias metadata till det senaste formatet; nuvarande " "katalog avses om inget annat anges" -#: cmd_ws_commit.cc:938 +#: cmd_ws_commit.cc:944 msgid "refresh the inodeprint cache" msgstr "uppdatera inodeprint-cachen" -#: commands.cc:133 commands.cc:235 +#: commands.cc:131 commands.cc:233 #, c-format msgid "unknown command '%s'" msgstr "okänt kommando '%s'" -#: commands.cc:144 +#: commands.cc:142 #, c-format -msgid "command '%s' has multiple ambiguous expansions:\n" -msgstr "kommandot '%s' har mer än en betydelse:\n" +msgid "command '%s' has multiple ambiguous expansions:" +msgstr "kommandot '%s' har mer än en betydelse:" -#: commands.cc:177 +#: commands.cc:175 msgid "commands:" msgstr "kommandon:" -#: commands.cc:254 +#: commands.cc:252 msgid "command [ARGS...]" msgstr "kommandon [ARGUMENT...]" -#: commands.cc:254 +#: commands.cc:252 msgid "display command help" msgstr "skriv ut hjälptext" -#: commands.cc:397 +#: commands.cc:395 #, c-format msgid "expanding selection '%s'" msgstr "expanderar valet '%s'" -#: commands.cc:405 +#: commands.cc:403 #, c-format msgid "no match for selection '%s'" msgstr "det finns inget som matchar '%s'" -#: commands.cc:411 +#: commands.cc:409 #, c-format msgid "expanded to '%s'" msgstr "expanderar till '%s'" -#: commands.cc:428 +#: commands.cc:426 #, c-format -msgid "selection '%s' has multiple ambiguous expansions: \n" -msgstr "valet '%s' har mer än en möjlig betydelse: \n" +msgid "selection '%s' has multiple ambiguous expansions:" +msgstr "valet '%s' har mer än en möjlig betydelse:" -#: commands.cc:445 +#: commands.cc:443 msgid "note: " msgstr "obs: " -#: commands.cc:446 +#: commands.cc:444 #, c-format msgid "" "branch '%s' has multiple heads\n" @@ -1833,7 +1827,7 @@ msgstr "" "grenen '%s' har mer än ett löv\n" "du kanske borde överväga '%s merge'" -#: commands.cc:460 +#: commands.cc:458 #, c-format msgid "--message and --message-file are mutually exclusive" msgstr "--message och --message-file fÃ¥r inte anges samtidigt" @@ -2233,7 +2227,7 @@ msgid "" " total : %u\n" "database:\n" " page size : %u\n" -" cache size : %u\n" +" cache size : %u" msgstr "" "schemaversion : %s\n" "antal:\n" @@ -2256,54 +2250,54 @@ msgstr "" " total : %u\n" "database:\n" " sidstorlek : %u\n" -" cachestorlek : %u\n" +" cachestorlek : %u" -#: database.cc:637 +#: database.cc:638 #, c-format msgid "database schema version: %s" msgstr "databasens schemaversion: %s" -#: database.cc:714 +#: database.cc:715 #, c-format -msgid "multiple statements in query: %s\n" -msgstr "multipla kommandon i databasfrÃ¥ga: %s\n" +msgid "multiple statements in query: %s" +msgstr "multipla kommandon i databasfrÃ¥ga: %s" -#: database.cc:720 +#: database.cc:721 #, c-format msgid "wanted %d columns got %d in query: %s" msgstr "ville ha %d kolumner, fick %d i databasfrÃ¥ga: %s" -#: database.cc:786 +#: database.cc:787 #, c-format msgid "null result in query: %s" msgstr "inget resultat med databasfrÃ¥ga: %s" -#: database.cc:804 +#: database.cc:805 #, c-format msgid "wanted %d rows got %d in query: %s" msgstr "ville ha %d rader, fick %d i databasfrÃ¥ga: %s" -#: database.cc:1951 +#: database.cc:1952 #, c-format msgid "another key with name '%s' already exists" msgstr "det finns redan en annan nyckel med namnet '%s'" -#: database.cc:2948 +#: database.cc:2949 #, c-format msgid "no database specified" msgstr "ingen databas angiven" -#: database.cc:2956 +#: database.cc:2957 #, c-format msgid "database %s does not exist" msgstr "databasen %s finns inte" -#: database.cc:2957 +#: database.cc:2958 #, c-format msgid "%s is a directory, not a database" msgstr "%s är en katalog, inte en databas" -#: database.cc:2982 +#: database.cc:2983 #, c-format msgid "could not open database '%s': %s" msgstr "kunde inte öppna databasen '%s': %s" @@ -2330,13 +2324,13 @@ msgid "" "[ancestor] %s\n" "[ left] %s\n" "[ right] %s\n" -"[ merged] %s\n" +"[ merged] %s" msgstr "" "behöver hjälp med 3-vägs ihopslagning\n" "[ förfader] %s\n" "[ vänster] %s\n" "[ höger] %s\n" -"[ihopslagen] %s\n" +"[ihopslagen] %s" #: file_io.cc:176 file_io.cc:183 #, c-format @@ -2549,8 +2543,8 @@ msgstr "lös filnamnskonflikterna och fà #: merge.cc:124 #, c-format -msgid "merge failed due to unresolved conflicts\n" -msgstr "ihopslagningen misslyckades pÃ¥ grund av olösta konflikter.\n" +msgid "merge failed due to unresolved conflicts" +msgstr "ihopslagningen misslyckades pÃ¥ grund av olösta konflikter." #: merkle_tree.cc:290 #, c-format @@ -2567,16 +2561,6 @@ msgstr "OtillÃ¥ten \\ i filen given med msgid "Invalid escape in --xargs file" msgstr "OtillÃ¥ten \\ i filen given med --xargs" -#: monotone.cc:665 -#, c-format -msgid "%s:\n" -msgstr "%s:\n" - -#: monotone.cc:673 -#, c-format -msgid "%s" -msgstr "%s" - #: monotone.cc:683 #, c-format msgid "Usage: %s [OPTION...] command [ARG...]" @@ -2647,10 +2631,10 @@ msgid "" #, c-format msgid "" "bad HMAC checksum (got %s, wanted %s)\n" -"this suggests data was corrupted in transit\n" +"this suggests data was corrupted in transit" msgstr "" "felaktig HMAC-kontrollsumma (fick %s, ville ha %s)\n" -"detta tyder pÃ¥ att data var korrupt under överföringen\n" +"detta tyder pÃ¥ att data var korrupt under överföringen" #: netcmd.cc:272 netcmd.cc:318 #, c-format @@ -2755,11 +2739,11 @@ msgid "" msgid "" "first time connecting to server %s\n" "I'll assume it's really them, but you might want to double-check\n" -"their key's fingerprint: %s\n" +"their key's fingerprint: %s" msgstr "" "ansluter till server %s för första gÃ¥ngen\n" "jag antar att det är rätt server, men du kan tänkas vilja dubbelkolla\n" -"deras nyckels fingeravtryck: %s\n" +"deras nyckels fingeravtryck: %s" #: netsync.cc:1258 #, c-format @@ -2914,8 +2898,8 @@ msgstr "mottagare" #: netsync.cc:2226 #, c-format -msgid "input buffer for peer %s is overfull after netcmd dispatch\n" -msgstr "indatabuffert för %s är överfull\n" +msgid "input buffer for peer %s is overfull after netcmd dispatch" +msgstr "indatabuffert för %s är överfull" #: netsync.cc:2238 netsync.cc:2337 #, c-format @@ -2934,13 +2918,13 @@ msgstr "ansluter till %s" #: netsync.cc:2352 #, c-format -msgid "timed out waiting for I/O with peer %s, disconnecting\n" -msgstr "att vänta pÃ¥ I/O frÃ¥n %s tog för lÃ¥ng tid, kopplar ifrÃ¥n\n" +msgid "timed out waiting for I/O with peer %s, disconnecting" +msgstr "att vänta pÃ¥ I/O frÃ¥n %s tog för lÃ¥ng tid, kopplar ifrÃ¥n" #: netsync.cc:2375 #, c-format -msgid "processing failure while talking to peer %s, disconnecting\n" -msgstr "tar hand om misslyckande i samtal med %s, kopplar ifrÃ¥n\n" +msgid "processing failure while talking to peer %s, disconnecting" +msgstr "tar hand om misslyckande i samtal med %s, kopplar ifrÃ¥n" #: netsync.cc:2392 #, c-format @@ -2954,8 +2938,8 @@ msgstr "%s kopplade ifrÃ¥n efter att vi #: netsync.cc:2403 #, c-format -msgid "I/O failure while talking to peer %s, disconnecting\n" -msgstr "I/O-fel i samtal med %s, kopplar ifrÃ¥n\n" +msgid "I/O failure while talking to peer %s, disconnecting" +msgstr "I/O-fel i samtal med %s, kopplar ifrÃ¥n" #: netsync.cc:2469 #, c-format @@ -2980,10 +2964,8 @@ msgid "" #: netsync.cc:2554 #, c-format msgid "" -"peer %s read failed in shutdown state (possibly client misreported error)\n" -msgstr "" -"läsning frÃ¥n %s fallerade i tillstÃ¥ndet \"shutdown\" (klienten kan felaktigt " -"ha rapporterat ett fel)\n" +"peer %s read failed in shutdown state (possibly client misreported error)" +msgstr "läsning frÃ¥n %s fallerade i tillstÃ¥ndet \"shutdown\" (klienten kan felaktigt ha rapporterat ett fel)" #: netsync.cc:2560 #, c-format @@ -2998,10 +2980,8 @@ msgid "" #: netsync.cc:2586 #, c-format msgid "" -"peer %s write failed in shutdown state (possibly client misreported error)\n" -msgstr "" -"skrivning till %s fallerade i tillstÃ¥ndet \"shutdown\" (klienten kan " -"felaktigt ha rapporterat ett fel)\n" +"peer %s write failed in shutdown state (possibly client misreported error)" +msgstr "skrivning till %s fallerade i tillstÃ¥ndet \"shutdown\" (klienten kan felaktigt ha rapporterat ett fel)" #: netsync.cc:2592 #, c-format @@ -3029,10 +3009,8 @@ msgstr "