# # # patch "ChangeLog" # from [28c34ad37e389db82fc367b02ef86369e1bbf426] # to [81a42625e236ba05588e1df45b1cda277f8fff38] # # patch "po/sv.po" # from [02079d7308d3cef9445136d356e61d2ea9919f84] # to [45adf3b4910aec4d865dd121560989177897d344] # ============================================================ --- ChangeLog 28c34ad37e389db82fc367b02ef86369e1bbf426 +++ ChangeLog 81a42625e236ba05588e1df45b1cda277f8fff38 @@ -1,5 +1,9 @@ +2006-04-04 Richard Levitte + + * po/sv.po: Updated and additional translations. + 2006-04-02 Matthew Nicholson - + * contrib/get_passphrase_from_file.lua: Added. This hook reads passphrases from 'confdir/passphrases'. ============================================================ --- po/sv.po 02079d7308d3cef9445136d356e61d2ea9919f84 +++ po/sv.po 45adf3b4910aec4d865dd121560989177897d344 @@ -145,8 +145,8 @@ msgstr "" "Project-Id-Version: monotone 0.26pre1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 16:21+0200\n" -"PO-Revision-Date: 2006-03-28 16:22+0200\n" +"POT-Creation-Date: 2006-04-04 10:07+0200\n" +"PO-Revision-Date: 2006-04-04 10:09+0200\n" "Last-Translator: Joel Rosdahl \n" "Language-Team: Richard Levitte \n" "MIME-Version: 1.0\n" @@ -304,8 +304,8 @@ msgstr "pid-filen '%s' finns redan" #: commands.cc:350 commands.cc:1359 commands.cc:1429 commands.cc:1865 -#: commands.cc:2711 commands.cc:3363 commands.cc:3598 commands.cc:3637 -#: commands.cc:3982 +#: commands.cc:2711 commands.cc:3364 commands.cc:3599 commands.cc:3638 +#: commands.cc:3983 msgid "informative" msgstr "informativ" @@ -344,8 +344,8 @@ "du kanske borde överväga '%s merge'" #: commands.cc:507 commands.cc:783 commands.cc:1447 commands.cc:1531 -#: commands.cc:2761 commands.cc:2789 commands.cc:2792 commands.cc:2928 -#: commands.cc:3620 +#: commands.cc:2761 commands.cc:2789 commands.cc:2792 commands.cc:2929 +#: commands.cc:3621 #, c-format msgid "no such revision '%s'" msgstr "det finns ingen revision med identiteten '%s'" @@ -621,12 +621,12 @@ msgstr "tom kommentar" #: commands.cc:1214 commands.cc:1243 commands.cc:1268 commands.cc:1293 -#: commands.cc:2212 commands.cc:2330 commands.cc:2864 commands.cc:3411 +#: commands.cc:2212 commands.cc:2330 commands.cc:2864 commands.cc:3412 msgid "workspace" msgstr "arbetskopia" #: commands.cc:1214 commands.cc:1243 commands.cc:1359 commands.cc:2330 -#: commands.cc:2711 commands.cc:3411 +#: commands.cc:2711 commands.cc:3412 msgid "[PATH]..." msgstr "[SÖKVÄG]..." @@ -668,8 +668,8 @@ "PLACERA_GAMLA.\n" "Det rekommenderas varmt att använda --execute." -#: commands.cc:1313 commands.cc:1326 commands.cc:1406 commands.cc:3518 -#: commands.cc:3963 +#: commands.cc:1313 commands.cc:1326 commands.cc:1406 commands.cc:3519 +#: commands.cc:3964 msgid "debug" msgstr "felsökning" @@ -725,13 +725,13 @@ msgid "write file from database to stdout" msgstr "skriv ut angiven fil från databasen" -#: commands.cc:1459 commands.cc:1461 commands.cc:3629 +#: commands.cc:1459 commands.cc:1461 commands.cc:3630 #, c-format msgid "no file '%s' found in revision '%s'\n" msgstr "filen '%s' finns inte i revisionen '%s'\n" -#: commands.cc:1473 commands.cc:1602 commands.cc:3096 commands.cc:3149 -#: commands.cc:3160 commands.cc:3310 commands.cc:3318 commands.cc:3872 +#: commands.cc:1473 commands.cc:1602 commands.cc:3097 commands.cc:3150 +#: commands.cc:3161 commands.cc:3311 commands.cc:3319 commands.cc:3873 msgid "tree" msgstr "träd" @@ -795,12 +795,12 @@ msgid "show unmerged head revisions of branch" msgstr "visa ej ihopslagna lövrevisioner i grenen" -#: commands.cc:1610 commands.cc:3105 +#: commands.cc:1610 commands.cc:3106 #, c-format msgid "please specify a branch, with --branch=BRANCH" msgstr "var god ange en gren med --branch=GREN" -#: commands.cc:1615 commands.cc:3109 commands.cc:3198 commands.cc:3201 +#: commands.cc:1615 commands.cc:3110 commands.cc:3199 commands.cc:3202 #, c-format msgid "branch '%s' is empty\n" msgstr "grenen '%s' är tom\n" @@ -1048,6 +1048,16 @@ msgid "Path '%s' does not have attribute '%s'\n" msgstr "Sökvägen '%s' har inget attribut '%s'\n" +#: commands.cc:2284 +#, c-format +msgid "No attributes for '%s'" +msgstr "Inga attribut till '%s'" + +#: commands.cc:2293 +#, c-format +msgid "No attribute '%s' on path '%s'" +msgstr "Inget attribut '%s' för sökvägen '%s'" + #: commands.cc:2312 #, c-format msgid "--message and --message-file are mutually exclusive" @@ -1161,8 +1171,13 @@ msgid "this workspace is a new project; cannot update" msgstr "denna arbetskatalog är ett nytt projekt; kan inte uppdatera" -#: commands.cc:2910 +#: commands.cc:2907 #, c-format +msgid "updating along branch '%s'..." +msgstr "uppdaterar längs grenen '%s'..." + +#: commands.cc:2911 +#, c-format msgid "" "your request matches no descendents of the current revision\n" "in fact, it doesn't even match the current revision\n" @@ -1172,32 +1187,32 @@ "faktum är att den inte ens matchar nuvarande revision\n" "du kanske vill ange --revision=" -#: commands.cc:2915 +#: commands.cc:2916 #, c-format msgid "multiple update candidates:" msgstr "mer än en uppdateringskandidat:" -#: commands.cc:2919 +#: commands.cc:2920 #, c-format msgid "choose one with '%s update -r'" msgstr "välj en med '%s update -r'" -#: commands.cc:2920 +#: commands.cc:2921 #, c-format msgid "multiple update candidates remain after selection" msgstr "mer än en kandidat är kvar efter urval" -#: commands.cc:2935 +#: commands.cc:2936 #, c-format msgid "already up to date at %s\n" msgstr "redan uppdaterad till %s\n" -#: commands.cc:2943 +#: commands.cc:2944 #, c-format msgid "selected update target %s\n" msgstr "valt uppdateringsmål är %s\n" -#: commands.cc:2973 +#: commands.cc:2974 #, c-format msgid "" "revision %s is a member of multiple branches:\n" @@ -1210,7 +1225,7 @@ "\n" "försök igen med en explicit --branch" -#: commands.cc:2979 +#: commands.cc:2980 #, c-format msgid "" "revision %s is a member of\n" @@ -1219,7 +1234,7 @@ "revisionen %s är med i grenen\n" "%s, uppdaterar arbetskopians grenangivelse" -#: commands.cc:2985 +#: commands.cc:2986 #, c-format msgid "" "revision %s is a member of no branches,\n" @@ -1228,157 +1243,157 @@ "revisionen %s är inte med i någon gren,\n" "använder grenen %s till arbetskopian" -#: commands.cc:3086 +#: commands.cc:3087 #, c-format msgid "updated to base revision %s\n" msgstr "uppdaterad till revisionen %s\n" -#: commands.cc:3096 +#: commands.cc:3097 msgid "merge unmerged heads of branch" msgstr "slå ihop ej ihopslagna löv i grenen" -#: commands.cc:3112 +#: commands.cc:3113 #, c-format msgid "branch '%s' is already merged\n" msgstr "löven i grenen '%s' är redan ihopslagna\n" -#: commands.cc:3120 +#: commands.cc:3121 #, c-format msgid "starting with revision 1 / %d\n" msgstr "börjar med revision 1 av %d\n" -#: commands.cc:3124 +#: commands.cc:3125 #, c-format msgid "merging with revision %d / %d\n" msgstr "slår ihop med revision %d av %d\n" -#: commands.cc:3125 commands.cc:3126 commands.cc:3208 commands.cc:3341 -#: commands.cc:3342 +#: commands.cc:3126 commands.cc:3127 commands.cc:3209 commands.cc:3342 +#: commands.cc:3343 #, c-format msgid "[source] %s\n" msgstr "[källa] %s\n" -#: commands.cc:3143 commands.cc:3306 commands.cc:3360 +#: commands.cc:3144 commands.cc:3307 commands.cc:3361 #, c-format msgid "[merged] %s\n" msgstr "[ihopslagen] %s\n" -#: commands.cc:3146 +#: commands.cc:3147 #, c-format msgid "note: your workspaces have not been updated\n" msgstr "obs: dina arbetskopior har inte uppdaterats\n" -#: commands.cc:3149 +#: commands.cc:3150 msgid "SOURCE-BRANCH DEST-BRANCH" msgstr "KÄLLGREN MÅLGREN" -#: commands.cc:3150 +#: commands.cc:3151 msgid "merge from one branch to another asymmetrically" msgstr "slå ihop asymmetriskt från en gren till en annan" -#: commands.cc:3160 +#: commands.cc:3161 msgid "SOURCE-BRANCH DEST-BRANCH DIR" msgstr "KÄLLGREN MÅLGREN KATALOG" -#: commands.cc:3161 +#: commands.cc:3162 msgid "merge one branch into a subdirectory in another branch" msgstr "slå ihop en gren till en underkatalog i en annan gren" -#: commands.cc:3199 commands.cc:3202 +#: commands.cc:3200 commands.cc:3203 #, c-format msgid "branch '%s' is not merged\n" msgstr "löven i grenen '%s' är inte ihopslagna\n" -#: commands.cc:3207 +#: commands.cc:3208 #, c-format msgid "propagating %s -> %s\n" msgstr "propagerar %s -> %s\n" -#: commands.cc:3209 +#: commands.cc:3210 #, c-format msgid "[target] %s\n" msgstr "[mål] %s\n" -#: commands.cc:3214 +#: commands.cc:3215 #, c-format msgid "branch '%s' is up-to-date with respect to branch '%s'\n" msgstr "grenen '%s' är uppdaterad med avseende på grenen '%s'\n" -#: commands.cc:3216 +#: commands.cc:3217 #, c-format msgid "no action taken\n" msgstr "inget utfördes\n" -#: commands.cc:3220 +#: commands.cc:3221 #, c-format msgid "no merge necessary; putting %s in branch '%s'\n" msgstr "ingen ihopslagning behövs; sätter %s i grenen '%s'\n" -#: commands.cc:3256 +#: commands.cc:3257 #, c-format msgid "Path %s not found in destination tree." msgstr "Sökvägen %s finns inte i målträdet." -#: commands.cc:3310 +#: commands.cc:3311 msgid "refresh the inodeprint cache" msgstr "uppdatera inodeprint-cachen" -#: commands.cc:3319 +#: commands.cc:3320 msgid "LEFT-REVISION RIGHT-REVISION DEST-BRANCH" msgstr "VÄNSTERREVISION HÖGERREVISION MÅLGREN" -#: commands.cc:3320 +#: commands.cc:3321 msgid "merge two explicitly given revisions, placing result in given branch" msgstr "" "slå ihop två explicit angivna revisioner, placera resultatet i angiven gren" -#: commands.cc:3334 +#: commands.cc:3335 #, c-format msgid "%s and %s are the same revision, aborting" msgstr "%s och %s är samma revision, avbryter" -#: commands.cc:3336 commands.cc:3338 +#: commands.cc:3337 commands.cc:3339 #, c-format msgid "%s is already an ancestor of %s" msgstr "%s är redan förfader till %s" -#: commands.cc:3363 +#: commands.cc:3364 msgid "(revision|file|key) PARTIAL-ID" msgstr "(revision|file|key) PARTIAL-ID" -#: commands.cc:3364 +#: commands.cc:3365 msgid "complete partial id" msgstr "utöka den partiella identiteten" -#: commands.cc:3373 +#: commands.cc:3374 #, c-format msgid "non-hex digits in partial id" msgstr "något tecken i den partiella identiteten är inte hexadecimalt" -#: commands.cc:3412 +#: commands.cc:3413 msgid "revert file(s), dir(s) or entire workspace (\".\")" msgstr "återställ fil(er), katalog(er) eller hela arbetskopian (\".\")" -#: commands.cc:3489 +#: commands.cc:3490 #, c-format msgid "reverting %s" msgstr "återställer %s" -#: commands.cc:3493 +#: commands.cc:3494 #, c-format msgid "no file version %s found in database for %s" msgstr "filversionen %s finns inte i databasen för %s" -#: commands.cc:3506 +#: commands.cc:3507 #, c-format msgid "recreating %s/" msgstr "återställer %s/" -#: commands.cc:3518 +#: commands.cc:3519 msgid "RCSFILE..." msgstr "RCSFIL..." -#: commands.cc:3519 +#: commands.cc:3520 msgid "" "parse versions in RCS files\n" "this command doesn't reconstruct or import revisions.you probably want " @@ -1388,36 +1403,36 @@ "detta kommando importerar inte revisioner; du vill antagligen använda\n" "cvs_import" -#: commands.cc:3535 +#: commands.cc:3536 msgid "rcs" msgstr "rcs" -#: commands.cc:3535 +#: commands.cc:3536 msgid "CVSROOT" msgstr "CVSROOT" -#: commands.cc:3535 +#: commands.cc:3536 msgid "import all versions in CVS repository" msgstr "importera alla revisioner i ett CVS-arkiv" -#: commands.cc:3598 +#: commands.cc:3599 msgid "PATH" msgstr "SÖKVÄG" -#: commands.cc:3599 +#: commands.cc:3600 msgid "print annotated copy of the file from REVISION" msgstr "skriv ut filen ur REVISION med extra detaljer" -#: commands.cc:3619 +#: commands.cc:3620 #, c-format msgid "no revision for file '%s' in database" msgstr "filen '%s' har ingen revision i databasen" -#: commands.cc:3637 +#: commands.cc:3638 msgid "[FILE] ..." msgstr "[FIL] ..." -#: commands.cc:3638 +#: commands.cc:3639 msgid "" "print history in reverse order (filtering by 'FILE'). If one or more\n" "revisions are given, use them as a starting point." @@ -1426,34 +1441,34 @@ "arbetskatalogen om inga filer angivits. Om en eller flera revisioner\n" "har angivits används de som utgångspunkter." -#: commands.cc:3686 +#: commands.cc:3687 #, c-format msgid "Unknown file '%s' for log command" msgstr "Okänd fil '%s'" -#: commands.cc:3704 +#: commands.cc:3705 #, c-format msgid "only one of --last/--next allowed" msgstr "enbart en av --last eller --next tillåten" -#: commands.cc:3872 +#: commands.cc:3873 msgid "[DIRECTORY]" msgstr "[KATALOG]" -#: commands.cc:3872 +#: commands.cc:3873 msgid "setup a new workspace directory, default to current" msgstr "initiera en ny arbetskatalog (nuvarande om katalog ej anges)" -#: commands.cc:3878 +#: commands.cc:3879 #, c-format msgid "need --branch argument for setup" msgstr "du måste ange en gren med --branch till kommandot \"setup\"" -#: commands.cc:3892 +#: commands.cc:3893 msgid "automation" msgstr "automatisering" -#: commands.cc:3893 +#: commands.cc:3894 msgid "" "interface_version\n" "heads [BRANCH]\n" @@ -1505,84 +1520,84 @@ "packet_for_fdelta GAMMAL_FIL NY_FIL\n" "keys\n" -#: commands.cc:3917 +#: commands.cc:3918 msgid "automation interface" msgstr "automatiseringsgränssnitt" -#: commands.cc:3931 commands.cc:3947 +#: commands.cc:3932 commands.cc:3948 msgid "vars" msgstr "variabler" -#: commands.cc:3931 +#: commands.cc:3932 msgid "DOMAIN NAME VALUE" msgstr "DOMÄN NAMN VÄRDE" -#: commands.cc:3932 +#: commands.cc:3933 msgid "set the database variable NAME to VALUE, in domain DOMAIN" msgstr "sätt databasvariabeln NAMN till VÄRDE i domänen DOMÄN" -#: commands.cc:3947 +#: commands.cc:3948 msgid "DOMAIN NAME" msgstr "DOMÄN NAMN" -#: commands.cc:3948 +#: commands.cc:3949 msgid "remove the database variable NAME in domain DOMAIN" msgstr "ta bort databasvariabeln NAMN från domänen DOMÄN" -#: commands.cc:3959 +#: commands.cc:3960 #, c-format msgid "no var with name %s in domain %s" msgstr "det finns inga variabler med namnet %s i domänen %s" -#: commands.cc:3963 +#: commands.cc:3964 msgid "REVID" msgstr "REVID" -#: commands.cc:3964 +#: commands.cc:3965 msgid "dump the roster associated with the given REVID" msgstr "skriv ut den lista som hör ihop med angivet REVID" -#: commands.cc:3982 +#: commands.cc:3983 msgid "REV REV" msgstr "REV REV" -#: commands.cc:3982 +#: commands.cc:3983 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." -#: commands.cc:3991 commands.cc:3993 +#: commands.cc:3992 commands.cc:3994 #, c-format msgid "%s in an ancestor of %s; no merge is needed." msgstr "%s är en förfader till %s; någon ihopslagning behövs inte." -#: commands.cc:4007 +#: commands.cc:4008 #, c-format msgid "There are %s node_name_conflicts." msgstr "Det finns %s node_name-konflikter." -#: commands.cc:4008 +#: commands.cc:4009 #, c-format msgid "There are %s file_content_conflicts." msgstr "Det finns %s file_content-konflikter." -#: commands.cc:4009 +#: commands.cc:4010 #, c-format msgid "There are %s node_attr_conflicts." msgstr "Det finns %s node_attr-konflikter." -#: commands.cc:4010 +#: commands.cc:4011 #, c-format msgid "There are %s orphaned_node_conflicts." msgstr "Det finns %s orphaned_node-konflikter." -#: commands.cc:4011 +#: commands.cc:4012 #, c-format msgid "There are %s rename_target_conflicts." msgstr "Det finns %s rename_target-konflikter." -#: commands.cc:4012 +#: commands.cc:4013 #, c-format msgid "There are %s directory_loop_conflicts." msgstr "Det finns %s directory_loop-konflikter." @@ -3218,7 +3233,7 @@ msgid "Path %s added twice with differing content\n" msgstr "Sökvägen %s tillagd två gånger med olika innehåll\n" -#: revision.cc:1264 +#: revision.cc:1273 #, c-format msgid "" "unknown attribute '%s' on path '%s'\n" @@ -3233,17 +3248,17 @@ "attributet hjälper vi gärna till att klura ut ett bra sätt att hantera\n" "det på)" -#: revision.cc:1376 +#: revision.cc:1385 #, c-format msgid "converting existing revision graph to new roster-style revisions\n" msgstr "konverterar existerande revisionsgraf till nya revisioner i liststil\n" -#: revision.cc:1431 +#: revision.cc:1440 #, c-format msgid "rebuilding revision graph from manifest certs\n" msgstr "bygger om revisionsgrafen från manifestcert\n" -#: revision.cc:1534 +#: revision.cc:1543 #, c-format msgid "" "encountered a revision with unknown format, version '%s'\n" @@ -3614,8 +3629,8 @@ #: work.cc:1003 #, c-format -msgid "updating %s to %s" -msgstr "uppdaterar %s till %s" +msgid "updating %s" +msgstr "uppdaterar %s" #~ msgid "failure extracting schema from sqlite_master" #~ msgstr "kunde inte extrahera schemat ur sqlite_master"