##// END OF EJS Templates
i18n-sv: synchronized with 7ed056f1e97d
Jens Bäckman -
r15973:c6464e94 stable
parent child Browse files
Show More
This diff has been collapsed as it changes many lines, (2495 lines changed) Show them Hide them
@@ -1,6 +1,6 b''
1 # Swedish translation for Mercurial
1 # Swedish translation for Mercurial
2 # Svensk översättning för Mercurial
2 # Svensk översättning för Mercurial
3 # Copyright (C) 2009-2011 Matt Mackall and others
3 # Copyright (C) 2009-2012 Matt Mackall and others
4 #
4 #
5 # Translation dictionary:
5 # Translation dictionary:
6 #
6 #
@@ -13,8 +13,8 b' msgid ""'
13 msgstr ""
13 msgstr ""
14 "Project-Id-Version: Mercurial\n"
14 "Project-Id-Version: Mercurial\n"
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
15 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
16 "POT-Creation-Date: 2011-07-29 20:08+0200\n"
16 "POT-Creation-Date: 2012-01-20 10:47+0100\n"
17 "PO-Revision-Date: 2011-07-30 09:39+0200\n"
17 "PO-Revision-Date: 2012-01-20 11:10+0100\n"
18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
18 "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
19 "Language-Team: Swedish\n"
19 "Language-Team: Swedish\n"
20 "Language: Swedish\n"
20 "Language: Swedish\n"
@@ -289,8 +289,12 b' msgid "acl: user \\"%s\\" not allowed on b'
289 msgstr ""
289 msgstr ""
290
290
291 #, python-format
291 #, python-format
292 msgid "acl: access denied for changeset %s"
292 msgid "acl: user \"%s\" denied on \"%s\" (changeset \"%s\")"
293 msgstr ""
293 msgstr "acl: användaren \"%s\" nekades på \"%s\" (ändringen \"%s\")"
294
295 #, python-format
296 msgid "acl: user \"%s\" not allowed on \"%s\" (changeset \"%s\")"
297 msgstr "acl: användaren \"%s\" tillåts inte på \"%s\" (ändringen \"%s\")"
294
298
295 msgid "hooks for integrating with the Bugzilla bug tracker"
299 msgid "hooks for integrating with the Bugzilla bug tracker"
296 msgstr ""
300 msgstr ""
@@ -946,6 +950,13 b' msgstr ""'
946 " branches.inactive = none"
950 " branches.inactive = none"
947
951
948 msgid ""
952 msgid ""
953 " tags.normal = green\n"
954 " tags.local = black bold"
955 msgstr ""
956 " tags.normal = green\n"
957 " tags.local = black bold"
958
959 msgid ""
949 "The available effects in terminfo mode are 'blink', 'bold', 'dim',\n"
960 "The available effects in terminfo mode are 'blink', 'bold', 'dim',\n"
950 "'inverse', 'invisible', 'italic', 'standout', and 'underline'; in\n"
961 "'inverse', 'invisible', 'italic', 'standout', and 'underline'; in\n"
951 "ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and\n"
962 "ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and\n"
@@ -1243,8 +1254,8 b' msgstr ""'
1243
1254
1244 msgid ""
1255 msgid ""
1245 " :convert.hg.saverev: store original revision ID in changeset\n"
1256 " :convert.hg.saverev: store original revision ID in changeset\n"
1246 " (forces target IDs to change). It takes and boolean argument\n"
1257 " (forces target IDs to change). It takes a boolean argument and\n"
1247 " and defaults to False."
1258 " defaults to False."
1248 msgstr ""
1259 msgstr ""
1249
1260
1250 msgid ""
1261 msgid ""
@@ -1916,6 +1927,10 b' msgstr ""'
1916 msgid "Mercurial failed to run itself, check hg executable is in PATH"
1927 msgid "Mercurial failed to run itself, check hg executable is in PATH"
1917 msgstr ""
1928 msgstr ""
1918
1929
1930 #, python-format
1931 msgid "log stream exception '%s'"
1932 msgstr ""
1933
1919 msgid ""
1934 msgid ""
1920 "svn: cannot probe remote repository, assume it could be a subversion "
1935 "svn: cannot probe remote repository, assume it could be a subversion "
1921 "repository. Use --source-type if you know better.\n"
1936 "repository. Use --source-type if you know better.\n"
@@ -2079,9 +2094,10 b' msgid ""'
2079 msgstr ""
2094 msgstr ""
2080
2095
2081 msgid ""
2096 msgid ""
2082 "The extension uses an optional ``[eol]`` section in your hgrc file\n"
2097 "The extension uses an optional ``[eol]`` section read from both the\n"
2083 "(not the ``.hgeol`` file) for settings that control the overall\n"
2098 "normal Mercurial configuration files and the ``.hgeol`` file, with the\n"
2084 "behavior. There are two settings:"
2099 "latter overriding the former. You can use that section to control the\n"
2100 "overall behavior. There are three settings:"
2085 msgstr ""
2101 msgstr ""
2086
2102
2087 msgid ""
2103 msgid ""
@@ -2100,6 +2116,12 b' msgid ""'
2100 msgstr ""
2116 msgstr ""
2101
2117
2102 msgid ""
2118 msgid ""
2119 "- ``eol.fix-trailing-newline`` (default False) can be set to True to\n"
2120 " ensure that converted files end with a EOL character (either ``\\n``\n"
2121 " or ``\\r\\n`` as per the configured patterns)."
2122 msgstr ""
2123
2124 msgid ""
2103 "The extension provides ``cleverencode:`` and ``cleverdecode:`` filters\n"
2125 "The extension provides ``cleverencode:`` and ``cleverdecode:`` filters\n"
2104 "like the deprecated win32text extension does. This means that you can\n"
2126 "like the deprecated win32text extension does. This means that you can\n"
2105 "disable win32text and enable eol and your filters will still work. You\n"
2127 "disable win32text and enable eol and your filters will still work. You\n"
@@ -2714,8 +2736,9 b' msgstr ""'
2714 msgid "hg debug-merge-base REV REV"
2736 msgid "hg debug-merge-base REV REV"
2715 msgstr ""
2737 msgstr ""
2716
2738
2739 #. i18n: bisect changeset status
2717 msgid "ignored"
2740 msgid "ignored"
2718 msgstr ""
2741 msgstr "ignorerad"
2719
2742
2720 msgid "hg debug-rev-parse REV"
2743 msgid "hg debug-rev-parse REV"
2721 msgstr ""
2744 msgstr ""
@@ -3196,6 +3219,451 b' msgid ""'
3196 " "
3219 " "
3197 msgstr ""
3220 msgstr ""
3198
3221
3222 msgid "track large binary files"
3223 msgstr "spåra stora binärfiler"
3224
3225 msgid ""
3226 "Large binary files tend to be not very compressible, not very\n"
3227 "diffable, and not at all mergeable. Such files are not handled\n"
3228 "efficiently by Mercurial's storage format (revlog), which is based on\n"
3229 "compressed binary deltas; storing large binary files as regular\n"
3230 "Mercurial files wastes bandwidth and disk space and increases\n"
3231 "Mercurial's memory usage. The largefiles extension addresses these\n"
3232 "problems by adding a centralized client-server layer on top of\n"
3233 "Mercurial: largefiles live in a *central store* out on the network\n"
3234 "somewhere, and you only fetch the revisions that you need when you\n"
3235 "need them."
3236 msgstr ""
3237
3238 msgid ""
3239 "largefiles works by maintaining a \"standin file\" in .hglf/ for each\n"
3240 "largefile. The standins are small (41 bytes: an SHA-1 hash plus\n"
3241 "newline) and are tracked by Mercurial. Largefile revisions are\n"
3242 "identified by the SHA-1 hash of their contents, which is written to\n"
3243 "the standin. largefiles uses that revision ID to get/put largefile\n"
3244 "revisions from/to the central store. This saves both disk space and\n"
3245 "bandwidth, since you don't need to retrieve all historical revisions\n"
3246 "of large files when you clone or pull."
3247 msgstr ""
3248
3249 msgid ""
3250 "To start a new repository or add new large binary files, just add\n"
3251 "--large to your :hg:`add` command. For example::"
3252 msgstr ""
3253
3254 msgid ""
3255 " $ dd if=/dev/urandom of=randomdata count=2000\n"
3256 " $ hg add --large randomdata\n"
3257 " $ hg commit -m 'add randomdata as a largefile'"
3258 msgstr ""
3259
3260 msgid ""
3261 "When you push a changeset that adds/modifies largefiles to a remote\n"
3262 "repository, its largefile revisions will be uploaded along with it.\n"
3263 "Note that the remote Mercurial must also have the largefiles extension\n"
3264 "enabled for this to work."
3265 msgstr ""
3266
3267 msgid ""
3268 "When you pull a changeset that affects largefiles from a remote\n"
3269 "repository, Mercurial behaves as normal. However, when you update to\n"
3270 "such a revision, any largefiles needed by that revision are downloaded\n"
3271 "and cached (if they have never been downloaded before). This means\n"
3272 "that network access may be required to update to changesets you have\n"
3273 "not previously updated to."
3274 msgstr ""
3275
3276 msgid ""
3277 "If you already have large files tracked by Mercurial without the\n"
3278 "largefiles extension, you will need to convert your repository in\n"
3279 "order to benefit from largefiles. This is done with the\n"
3280 ":hg:`lfconvert` command::"
3281 msgstr ""
3282
3283 msgid " $ hg lfconvert --size 10 oldrepo newrepo"
3284 msgstr ""
3285
3286 msgid ""
3287 "In repositories that already have largefiles in them, any new file\n"
3288 "over 10MB will automatically be added as a largefile. To change this\n"
3289 "threshold, set ``largefiles.minsize`` in your Mercurial config file\n"
3290 "to the minimum size in megabytes to track as a largefile, or use the\n"
3291 "--lfsize option to the add command (also in megabytes)::"
3292 msgstr ""
3293
3294 msgid ""
3295 " [largefiles]\n"
3296 " minsize = 2"
3297 msgstr ""
3298
3299 msgid " $ hg add --lfsize 2"
3300 msgstr ""
3301
3302 msgid ""
3303 "The ``largefiles.patterns`` config option allows you to specify a list\n"
3304 "of filename patterns (see :hg:`help patterns`) that should always be\n"
3305 "tracked as largefiles::"
3306 msgstr ""
3307
3308 msgid ""
3309 " [largefiles]\n"
3310 " patterns =\n"
3311 " *.jpg\n"
3312 " re:.*\\.(png|bmp)$\n"
3313 " library.zip\n"
3314 " content/audio/*"
3315 msgstr ""
3316
3317 msgid ""
3318 "Files that match one of these patterns will be added as largefiles\n"
3319 "regardless of their size."
3320 msgstr ""
3321
3322 msgid ""
3323 "The ``largefiles.minsize`` and ``largefiles.patterns`` config options\n"
3324 "will be ignored for any repositories not already containing a\n"
3325 "largefile. To add the first largefile to a repository, you must\n"
3326 "explicitly do so with the --large flag passed to the :hg:`add`\n"
3327 "command.\n"
3328 msgstr ""
3329
3330 msgid "convert a normal repository to a largefiles repository"
3331 msgstr "konvertera ett normalt arkiv till ett largefiles-arkiv"
3332
3333 msgid ""
3334 " Convert repository SOURCE to a new repository DEST, identical to\n"
3335 " SOURCE except that certain files will be converted as largefiles:\n"
3336 " specifically, any file that matches any PATTERN *or* whose size is\n"
3337 " above the minimum size threshold is converted as a largefile. The\n"
3338 " size used to determine whether or not to track a file as a\n"
3339 " largefile is the size of the first version of the file. The\n"
3340 " minimum size can be specified either with --size or in\n"
3341 " configuration as ``largefiles.size``."
3342 msgstr ""
3343
3344 msgid ""
3345 " After running this command you will need to make sure that\n"
3346 " largefiles is enabled anywhere you intend to push the new\n"
3347 " repository."
3348 msgstr ""
3349
3350 msgid ""
3351 " Use --to-normal to convert largefiles back to normal files; after\n"
3352 " this, the DEST repository can be used without largefiles at all."
3353 msgstr ""
3354
3355 msgid "getting largefiles"
3356 msgstr "hämtar largefiles"
3357
3358 #, python-format
3359 msgid "getting %s:%s\n"
3360 msgstr "hämtar %s:%s\n"
3361
3362 #, python-format
3363 msgid "%s: data corruption (expected %s, got %s)\n"
3364 msgstr "%s: datakorruption (förväntade mig %s, fick %s)\n"
3365
3366 #, python-format
3367 msgid "searching %d changesets for largefiles\n"
3368 msgstr "söker i %d ändringar efter largefiles\n"
3369
3370 #, python-format
3371 msgid "verified contents of %d revisions of %d largefiles\n"
3372 msgstr ""
3373
3374 #, python-format
3375 msgid "verified existence of %d revisions of %d largefiles\n"
3376 msgstr ""
3377
3378 #, python-format
3379 msgid "unsupported URL scheme %r"
3380 msgstr ""
3381
3382 #, python-format
3383 msgid "%s does not appear to be a largefile store"
3384 msgstr "%s verkar inte vara en largefiles-lagring"
3385
3386 #, python-format
3387 msgid "%s is not a local Mercurial repo"
3388 msgstr "%s är inte ett lokalt Mercurial-arkiv"
3389
3390 #, python-format
3391 msgid "initializing destination %s\n"
3392 msgstr ""
3393
3394 msgid "converting revisions"
3395 msgstr "konverterar revisioner"
3396
3397 #, python-format
3398 msgid "renamed/copied largefile %s becomes symlink"
3399 msgstr ""
3400
3401 #, python-format
3402 msgid "largefile %s becomes symlink"
3403 msgstr ""
3404
3405 #, python-format
3406 msgid "skipping incorrectly formatted tag %s\n"
3407 msgstr "hoppar över felformaterat märke %s\n"
3408
3409 #, python-format
3410 msgid "skipping incorrectly formatted id %s\n"
3411 msgstr "hoppar över flrformaterad id %s\n"
3412
3413 #, python-format
3414 msgid "no mapping for id %s\n"
3415 msgstr ""
3416
3417 msgid "uploading largefiles"
3418 msgstr ""
3419
3420 #, python-format
3421 msgid "largefile %s missing from store (needs to be uploaded)"
3422 msgstr ""
3423
3424 msgid "getting changed largefiles\n"
3425 msgstr ""
3426
3427 #, python-format
3428 msgid "%d largefiles updated, %d removed\n"
3429 msgstr ""
3430
3431 msgid "minimum size (MB) for files to be converted as largefiles"
3432 msgstr ""
3433
3434 msgid "convert from a largefiles repo to a normal repo"
3435 msgstr ""
3436
3437 msgid "hg lfconvert SOURCE DEST [FILE ...]"
3438 msgstr ""
3439
3440 #, python-format
3441 msgid "largefiles: size must be number (not %s)\n"
3442 msgstr ""
3443
3444 msgid "minimum size for largefiles must be specified"
3445 msgstr ""
3446
3447 #, python-format
3448 msgid "unknown operating system: %s\n"
3449 msgstr "okänt operativsystem: %s\n"
3450
3451 #, python-format
3452 msgid "Found %s in store\n"
3453 msgstr ""
3454
3455 #, python-format
3456 msgid "Found %s in system cache\n"
3457 msgstr ""
3458
3459 msgid "Can't get file locally"
3460 msgstr ""
3461
3462 #, python-format
3463 msgid ""
3464 "changeset %s: %s missing\n"
3465 " (looked for hash %s)\n"
3466 msgstr ""
3467
3468 #, python-format
3469 msgid ""
3470 "changeset %s: %s: contents differ\n"
3471 " (%s:\n"
3472 " expected hash %s,\n"
3473 " but got %s)\n"
3474 msgstr ""
3475
3476 #, python-format
3477 msgid "%s already a largefile\n"
3478 msgstr "%s är redan en largefile\n"
3479
3480 #, python-format
3481 msgid "adding %s as a largefile\n"
3482 msgstr "lägger till %s som en largefile\n"
3483
3484 msgid "no files specified"
3485 msgstr "inga filer angivna"
3486
3487 #, python-format
3488 msgid "not removing %s: %s (use forget to undo)\n"
3489 msgstr "raderar inte %s: %s (använd forget för att ångra)\n"
3490
3491 msgid "file still exists"
3492 msgstr "filen existerar fortfarande"
3493
3494 msgid "file is modified"
3495 msgstr "filen är modifierad"
3496
3497 msgid "file has been marked for add"
3498 msgstr "filen har markerats för addering"
3499
3500 #, python-format
3501 msgid "removing %s\n"
3502 msgstr "tar bort %s\n"
3503
3504 msgid "uncommitted local changes"
3505 msgstr "oarkiverade lokala ändringar"
3506
3507 msgid "&Largefile"
3508 msgstr "&Largefile"
3509
3510 msgid "&Normal file"
3511 msgstr "&Normal fil"
3512
3513 #, python-format
3514 msgid ""
3515 "%s has been turned into a largefile\n"
3516 "use (l)argefile or keep as (n)ormal file?"
3517 msgstr ""
3518
3519 #, python-format
3520 msgid ""
3521 "%s has been turned into a normal file\n"
3522 "keep as (l)argefile or use (n)ormal file?"
3523 msgstr ""
3524
3525 #, python-format
3526 msgid "merging %s and %s to %s\n"
3527 msgstr ""
3528
3529 #, python-format
3530 msgid "merging %s\n"
3531 msgstr ""
3532
3533 #, python-format
3534 msgid ""
3535 "largefile %s has a merge conflict\n"
3536 "keep (l)ocal or take (o)ther?"
3537 msgstr ""
3538
3539 msgid "&Local"
3540 msgstr ""
3541
3542 msgid "&Other"
3543 msgstr ""
3544
3545 msgid "destination largefile already exists"
3546 msgstr ""
3547
3548 msgid "no files to copy"
3549 msgstr "inga filer att kopiera"
3550
3551 msgid "caching new largefiles\n"
3552 msgstr "cachar nya largefiles\n"
3553
3554 #, python-format
3555 msgid "%d largefiles cached\n"
3556 msgstr "%d largefiles cachade\n"
3557
3558 #, python-format
3559 msgid "unknown archive type '%s'"
3560 msgstr "okänd arkivtyp '%s'"
3561
3562 msgid "cannot give prefix when archiving to files"
3563 msgstr ""
3564
3565 #, python-format
3566 msgid "largefile %s not found in repo store or system cache"
3567 msgstr ""
3568
3569 #, python-format
3570 msgid "not removing %s: file is already untracked\n"
3571 msgstr ""
3572
3573 msgid "largefiles: No remote repo\n"
3574 msgstr ""
3575
3576 msgid "largefiles to upload:\n"
3577 msgstr ""
3578
3579 #, python-format
3580 msgid "largefiles: %d to upload\n"
3581 msgstr ""
3582
3583 msgid "largefile contents do not match hash"
3584 msgstr ""
3585
3586 #, python-format
3587 msgid "largefiles: failed to put %s into store: %s"
3588 msgstr ""
3589
3590 #, python-format
3591 msgid "requested largefile %s not present in cache"
3592 msgstr ""
3593
3594 msgid "remote: "
3595 msgstr "fjärr: "
3596
3597 #, python-format
3598 msgid "unexpected putlfile response: %s"
3599 msgstr "oväntat putlfile-svar: %s"
3600
3601 msgid "putlfile failed:"
3602 msgstr "putlfile misslyckades:"
3603
3604 msgid "putlfile failed (unexpected response):"
3605 msgstr "putlfile misslyckades (oväntat svar):"
3606
3607 msgid "unexpected response:"
3608 msgstr "oväntat svar:"
3609
3610 #, python-format
3611 msgid "remotestore: could not put %s to remote store %s"
3612 msgstr ""
3613
3614 #, python-format
3615 msgid "remotestore: put %s to remote store %s"
3616 msgstr ""
3617
3618 #, python-format
3619 msgid "remotestore: could not open file %s: %s"
3620 msgstr ""
3621
3622 #, python-format
3623 msgid "remotestore: largefile %s is invalid"
3624 msgstr ""
3625
3626 #, python-format
3627 msgid "remotestore: largefile %s is missing"
3628 msgstr ""
3629
3630 #, python-format
3631 msgid "changeset %s: %s: contents differ\n"
3632 msgstr ""
3633
3634 #, python-format
3635 msgid "changeset %s: %s missing\n"
3636 msgstr "ändring %s: %s saknas\n"
3637
3638 #, python-format
3639 msgid ""
3640 "largefiles: repo method %r appears to have already been wrapped by another "
3641 "extension: largefiles may behave incorrectly\n"
3642 msgstr ""
3643
3644 #, python-format
3645 msgid "file \"%s\" is a largefile standin"
3646 msgstr ""
3647
3648 msgid "add as largefile"
3649 msgstr ""
3650
3651 msgid ""
3652 "add all files above this size (in megabytes) as largefiles (default: 10)"
3653 msgstr ""
3654
3655 msgid "verify largefiles"
3656 msgstr ""
3657
3658 msgid "verify all revisions of largefiles not just current"
3659 msgstr ""
3660
3661 msgid "verify largefile contents not just existence"
3662 msgstr ""
3663
3664 msgid "display outgoing largefiles"
3665 msgstr "visa utgående largefiles"
3666
3199 msgid "manage a stack of patches"
3667 msgid "manage a stack of patches"
3200 msgstr "hantera en uppsättning patchar"
3668 msgstr "hantera en uppsättning patchar"
3201
3669
@@ -3635,6 +4103,13 b' msgid "revision %d has unmanaged childre'
3635 msgstr ""
4103 msgstr ""
3636
4104
3637 #, python-format
4105 #, python-format
4106 msgid "revision %d is not mutable"
4107 msgstr ""
4108
4109 msgid "see \"hg help phases\" for details"
4110 msgstr ""
4111
4112 #, python-format
3638 msgid "cannot import merge revision %d"
4113 msgid "cannot import merge revision %d"
3639 msgstr ""
4114 msgstr ""
3640
4115
@@ -3678,8 +4153,9 b' msgstr ""'
3678
4153
3679 msgid ""
4154 msgid ""
3680 " The patches must not be applied, and at least one patch is required. "
4155 " The patches must not be applied, and at least one patch is required. "
3681 "With\n"
4156 "Exact\n"
3682 " -k/--keep, the patch files are preserved in the patch directory."
4157 " patch identifiers must be given. With -k/--keep, the patch files are\n"
4158 " preserved in the patch directory."
3683 msgstr ""
4159 msgstr ""
3684
4160
3685 msgid ""
4161 msgid ""
@@ -4262,6 +4738,11 b' msgstr ""'
4262 msgid "copy %s to %s\n"
4738 msgid "copy %s to %s\n"
4263 msgstr ""
4739 msgstr ""
4264
4740
4741 msgid ""
4742 "strip specified revision (optional, can specify revisions without this "
4743 "option)"
4744 msgstr ""
4745
4265 msgid "force removal of changesets, discard uncommitted changes (no backup)"
4746 msgid "force removal of changesets, discard uncommitted changes (no backup)"
4266 msgstr ""
4747 msgstr ""
4267 "tvinga radering av ändringar, kassera oarkiverade ändringar (ingen backup)"
4748 "tvinga radering av ändringar, kassera oarkiverade ändringar (ingen backup)"
@@ -4441,9 +4922,15 b' msgstr ""'
4441 msgid "no revisions specified"
4922 msgid "no revisions specified"
4442 msgstr ""
4923 msgstr ""
4443
4924
4925 msgid "warning: uncommitted changes in the working directory\n"
4926 msgstr "varning: oarkiverade ändringar i arbetskatalogen\n"
4927
4444 msgid "list all available queues"
4928 msgid "list all available queues"
4445 msgstr "visa alla tillgängliga köer"
4929 msgstr "visa alla tillgängliga köer"
4446
4930
4931 msgid "print name of active queue"
4932 msgstr "visa namnet på aktiv kö"
4933
4447 msgid "create new queue"
4934 msgid "create new queue"
4448 msgstr "skapa ny kö"
4935 msgstr "skapa ny kö"
4449
4936
@@ -4451,7 +4938,7 b' msgid "rename active queue"'
4451 msgstr "döp om aktiv kö"
4938 msgstr "döp om aktiv kö"
4452
4939
4453 msgid "delete reference to queue"
4940 msgid "delete reference to queue"
4454 msgstr ""
4941 msgstr "radera referens till kö"
4455
4942
4456 msgid "delete queue, and remove patch dir"
4943 msgid "delete queue, and remove patch dir"
4457 msgstr ""
4944 msgstr ""
@@ -4472,7 +4959,9 b' msgid ""'
4472 "registered\n"
4959 "registered\n"
4473 " queues - by default the \"normal\" patches queue is registered. The "
4960 " queues - by default the \"normal\" patches queue is registered. The "
4474 "currently\n"
4961 "currently\n"
4475 " active queue will be marked with \"(active)\"."
4962 " active queue will be marked with \"(active)\". Specifying --active will "
4963 "print\n"
4964 " only the name of the active queue."
4476 msgstr ""
4965 msgstr ""
4477
4966
4478 msgid ""
4967 msgid ""
@@ -4568,94 +5057,191 b' msgstr "mq tar inga argument"'
4568 msgid "operate on patch repository"
5057 msgid "operate on patch repository"
4569 msgstr "arbeta med patcharkiv"
5058 msgstr "arbeta med patcharkiv"
4570
5059
4571 msgid "hooks for sending email notifications at commit/push time"
5060 msgid "hooks for sending email push notifications"
4572 msgstr ""
5061 msgstr ""
4573
5062
4574 msgid ""
5063 msgid ""
4575 "Subscriptions can be managed through a hgrc file. Default mode is to\n"
5064 "This extension let you run hooks sending email notifications when\n"
4576 "print messages to stdout, for testing and configuring."
5065 "changesets are being pushed, from the sending or receiving side."
4577 msgstr ""
5066 msgstr ""
4578
5067
4579 msgid ""
5068 msgid ""
4580 "To use, configure the notify extension and enable it in hgrc like\n"
5069 "First, enable the extension as explained in :hg:`help extensions`, and\n"
4581 "this::"
5070 "register the hook you want to run. ``incoming`` and ``outgoing`` hooks\n"
4582 msgstr ""
5071 "are run by the changesets receiver while the ``outgoing`` one is for\n"
4583
5072 "the sender::"
4584 msgid ""
4585 " [extensions]\n"
4586 " notify ="
4587 msgstr ""
5073 msgstr ""
4588
5074
4589 msgid ""
5075 msgid ""
4590 " [hooks]\n"
5076 " [hooks]\n"
4591 " # one email for each incoming changeset\n"
5077 " # one email for each incoming changeset\n"
4592 " incoming.notify = python:hgext.notify.hook\n"
5078 " incoming.notify = python:hgext.notify.hook\n"
4593 " # batch emails when many changesets incoming at one time\n"
5079 " # one email for all incoming changesets\n"
4594 " changegroup.notify = python:hgext.notify.hook\n"
5080 " changegroup.notify = python:hgext.notify.hook"
4595 " # batch emails when many changesets outgoing at one time (client side)\n"
5081 msgstr ""
5082
5083 msgid ""
5084 " # one email for all outgoing changesets\n"
4596 " outgoing.notify = python:hgext.notify.hook"
5085 " outgoing.notify = python:hgext.notify.hook"
4597 msgstr ""
5086 msgstr ""
4598
5087
4599 msgid ""
5088 msgid ""
4600 " [notify]\n"
5089 "Now the hooks are running, subscribers must be assigned to\n"
4601 " # config items go here"
5090 "repositories. Use the ``[usersubs]`` section to map repositories to a\n"
4602 msgstr ""
5091 "given email or the ``[reposubs]`` section to map emails to a single\n"
4603
5092 "repository::"
4604 msgid "Required configuration items::"
4605 msgstr ""
4606
4607 msgid " config = /path/to/file # file containing subscriptions"
4608 msgstr ""
4609
4610 msgid "Optional configuration items::"
4611 msgstr ""
4612
4613 msgid ""
4614 " test = True # print messages to stdout for testing\n"
4615 " strip = 3 # number of slashes to strip for url paths\n"
4616 " domain = example.com # domain to use if committer missing domain\n"
4617 " style = ... # style file to use when formatting email\n"
4618 " template = ... # template to use when formatting email\n"
4619 " incoming = ... # template to use when run as incoming hook\n"
4620 " outgoing = ... # template to use when run as outgoing hook\n"
4621 " changegroup = ... # template to use when run as changegroup hook\n"
4622 " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n"
4623 " maxsubject = 67 # truncate subject line longer than this\n"
4624 " diffstat = True # add a diffstat before the diff content\n"
4625 " sources = serve # notify if source of incoming changes in this "
4626 "list\n"
4627 " # (serve == ssh or http, push, pull, bundle)\n"
4628 " merge = False # send notification for merges (default True)\n"
4629 " [email]\n"
4630 " from = user@host.com # email address to send as if none given\n"
4631 " [web]\n"
4632 " baseurl = http://hgserver/... # root of hg web site for browsing commits"
4633 msgstr ""
4634
4635 msgid ""
4636 "The notify config file has same format as a regular hgrc file. It has\n"
4637 "two sections so you can express subscriptions in whatever way is\n"
4638 "handier for you."
4639 msgstr ""
5093 msgstr ""
4640
5094
4641 msgid ""
5095 msgid ""
4642 " [usersubs]\n"
5096 " [usersubs]\n"
4643 " # key is subscriber email, value is \",\"-separated list of glob patterns\n"
5097 " # key is subscriber email, value is a comma-separated list of glob\n"
5098 " # patterns\n"
4644 " user@host = pattern"
5099 " user@host = pattern"
4645 msgstr ""
5100 msgstr ""
4646
5101
4647 msgid ""
5102 msgid ""
4648 " [reposubs]\n"
5103 " [reposubs]\n"
4649 " # key is glob pattern, value is \",\"-separated list of subscriber emails\n"
5104 " # key is glob pattern, value is a comma-separated list of subscriber\n"
5105 " # emails\n"
4650 " pattern = user@host"
5106 " pattern = user@host"
4651 msgstr ""
5107 msgstr ""
4652
5108
4653 msgid "Glob patterns are matched against path to repository root."
5109 msgid ""
4654 msgstr ""
5110 "Glob patterns are matched against absolute path to repository\n"
4655
5111 "root. The subscriptions can be defined in their own file and\n"
4656 msgid ""
5112 "referenced with::"
4657 "If you like, you can put notify config file in repository that users\n"
5113 msgstr ""
4658 "can push changes to, they can manage their own subscriptions.\n"
5114
5115 msgid ""
5116 " [notify]\n"
5117 " config = /path/to/subscriptionsfile"
5118 msgstr ""
5119
5120 msgid ""
5121 "Alternatively, they can be added to Mercurial configuration files by\n"
5122 "setting the previous entry to an empty value."
5123 msgstr ""
5124
5125 msgid ""
5126 "At this point, notifications should be generated but will not be sent until "
5127 "you\n"
5128 "set the ``notify.test`` entry to ``False``."
5129 msgstr ""
5130
5131 msgid ""
5132 "Notifications content can be tweaked with the following configuration "
5133 "entries:"
5134 msgstr ""
5135
5136 msgid ""
5137 "notify.test\n"
5138 " If ``True``, print messages to stdout instead of sending them. Default: "
5139 "True."
5140 msgstr ""
5141
5142 msgid ""
5143 "notify.sources\n"
5144 " Space separated list of change sources. Notifications are sent only\n"
5145 " if it includes the incoming or outgoing changes source. Incoming\n"
5146 " sources can be ``serve`` for changes coming from http or ssh,\n"
5147 " ``pull`` for pulled changes, ``unbundle`` for changes added by\n"
5148 " :hg:`unbundle` or ``push`` for changes being pushed\n"
5149 " locally. Outgoing sources are the same except for ``unbundle`` which\n"
5150 " is replaced by ``bundle``. Default: serve."
5151 msgstr ""
5152
5153 msgid ""
5154 "notify.strip\n"
5155 " Number of leading slashes to strip from url paths. By default, "
5156 "notifications\n"
5157 " references repositories with their absolute path. ``notify.strip`` let "
5158 "you\n"
5159 " turn them into relative paths. For example, ``notify.strip=3`` will "
5160 "change\n"
5161 " ``/long/path/repository`` into ``repository``. Default: 0."
5162 msgstr ""
5163
5164 msgid ""
5165 "notify.domain\n"
5166 " If subscribers emails or the from email have no domain set, complete them\n"
5167 " with this value."
5168 msgstr ""
5169
5170 msgid ""
5171 "notify.style\n"
5172 " Style file to use when formatting emails."
5173 msgstr ""
5174
5175 msgid ""
5176 "notify.template\n"
5177 " Template to use when formatting emails."
5178 msgstr ""
5179
5180 msgid ""
5181 "notify.incoming\n"
5182 " Template to use when run as incoming hook, override ``notify.template``."
5183 msgstr ""
5184
5185 msgid ""
5186 "notify.outgoing\n"
5187 " Template to use when run as outgoing hook, override ``notify.template``."
5188 msgstr ""
5189
5190 msgid ""
5191 "notify.changegroup\n"
5192 " Template to use when running as changegroup hook, override\n"
5193 " ``notify.template``."
5194 msgstr ""
5195
5196 msgid ""
5197 "notify.maxdiff\n"
5198 " Maximum number of diff lines to include in notification email. Set to 0\n"
5199 " to disable the diff, -1 to include all of it. Default: 300."
5200 msgstr ""
5201
5202 msgid ""
5203 "notify.maxsubject\n"
5204 " Maximum number of characters in emails subject line. Default: 67."
5205 msgstr ""
5206
5207 msgid ""
5208 "notify.diffstat\n"
5209 " Set to True to include a diffstat before diff content. Default: True."
5210 msgstr ""
5211
5212 msgid ""
5213 "notify.merge\n"
5214 " If True, send notifications for merge changesets. Default: True."
5215 msgstr ""
5216
5217 msgid ""
5218 "notify.mbox\n"
5219 " If set, append mails to this mbox file instead of sending. Default: None."
5220 msgstr ""
5221
5222 msgid ""
5223 "notify.fromauthor\n"
5224 " If set, use the first committer of the changegroup for the \"From\" field "
5225 "of\n"
5226 " the notification mail. If not set, take the user from the pushing repo.\n"
5227 " Default: False."
5228 msgstr ""
5229
5230 msgid ""
5231 "If set, the following entries will also be used to customize the "
5232 "notifications:"
5233 msgstr ""
5234
5235 msgid ""
5236 "email.from\n"
5237 " Email ``From`` address to use if none can be found in generated email "
5238 "content."
5239 msgstr ""
5240
5241 msgid ""
5242 "web.baseurl\n"
5243 " Root repository browsing URL to combine with repository paths when making\n"
5244 " references. See also ``notify.strip``."
4659 msgstr ""
5245 msgstr ""
4660
5246
4661 #, python-format
5247 #, python-format
@@ -4846,13 +5432,6 b' msgstr ""'
4846 "patchbomb-utäkningen automatiskt kan skicka patchbomber från kommandoraden.\n"
5432 "patchbomb-utäkningen automatiskt kan skicka patchbomber från kommandoraden.\n"
4847 "Se sektionerna [email] och [smtp] i hgrc(5) för detaljer.\n"
5433 "Se sektionerna [email] och [smtp] i hgrc(5) för detaljer.\n"
4848
5434
4849 #, python-format
4850 msgid "%s Please enter a valid value"
4851 msgstr "%s Ange ett giltigt värde"
4852
4853 msgid "Please enter a valid value.\n"
4854 msgstr "Ange ett giltigt värde.\n"
4855
4856 msgid "send patches as attachments"
5435 msgid "send patches as attachments"
4857 msgstr ""
5436 msgstr ""
4858
5437
@@ -5075,6 +5654,9 b' msgstr ""'
5075 msgid "This patch series consists of %d patches."
5654 msgid "This patch series consists of %d patches."
5076 msgstr ""
5655 msgstr ""
5077
5656
5657 msgid "no recipient addresses provided"
5658 msgstr "inga mottagaradresser angavs"
5659
5078 msgid ""
5660 msgid ""
5079 "\n"
5661 "\n"
5080 "Final summary:"
5662 "Final summary:"
@@ -5095,18 +5677,15 b' msgstr ""'
5095 msgid "Displaying "
5677 msgid "Displaying "
5096 msgstr "Visar "
5678 msgstr "Visar "
5097
5679
5098 msgid "Writing "
5099 msgstr "Skriver "
5100
5101 msgid "writing"
5102 msgstr "skriver"
5103
5104 msgid "Sending "
5680 msgid "Sending "
5105 msgstr "Sänder "
5681 msgstr "Sänder "
5106
5682
5107 msgid "sending"
5683 msgid "sending"
5108 msgstr "sänder"
5684 msgstr "sänder"
5109
5685
5686 msgid "writing"
5687 msgstr "skriver"
5688
5110 msgid "show progress bars for some actions"
5689 msgid "show progress bars for some actions"
5111 msgstr ""
5690 msgstr ""
5112
5691
@@ -5123,6 +5702,9 b' msgstr ""'
5123 msgid ""
5702 msgid ""
5124 " [progress]\n"
5703 " [progress]\n"
5125 " delay = 3 # number of seconds (float) before showing the progress bar\n"
5704 " delay = 3 # number of seconds (float) before showing the progress bar\n"
5705 " changedelay = 1 # changedelay: minimum delay before showing a new topic.\n"
5706 " # If set to less than 3 * refresh, that value will\n"
5707 " # be used instead.\n"
5126 " refresh = 0.1 # time in seconds between refreshes of the progress bar\n"
5708 " refresh = 0.1 # time in seconds between refreshes of the progress bar\n"
5127 " format = topic bar number estimate # format of the progress bar\n"
5709 " format = topic bar number estimate # format of the progress bar\n"
5128 " width = <none> # if set, the maximum width of the progress information\n"
5710 " width = <none> # if set, the maximum width of the progress information\n"
@@ -5269,6 +5851,9 b' msgid ""'
5269 "ancestor of base and dest)"
5851 "ancestor of base and dest)"
5270 msgstr ""
5852 msgstr ""
5271
5853
5854 msgid "rebase these revisions"
5855 msgstr ""
5856
5272 msgid "rebase onto the specified changeset"
5857 msgid "rebase onto the specified changeset"
5273 msgstr ""
5858 msgstr ""
5274
5859
@@ -5278,6 +5863,9 b' msgstr ""'
5278 msgid "use text as collapse commit message"
5863 msgid "use text as collapse commit message"
5279 msgstr "använd text som kollapsarkiveringsmeddelande"
5864 msgstr "använd text som kollapsarkiveringsmeddelande"
5280
5865
5866 msgid "invoke editor on commit messages"
5867 msgstr "starta editor för arkiveringsmeddelande"
5868
5281 msgid "read collapse commit message from file"
5869 msgid "read collapse commit message from file"
5282 msgstr "läs kollapsarkiveringsmeddelandet från fil"
5870 msgstr "läs kollapsarkiveringsmeddelandet från fil"
5283
5871
@@ -5387,15 +5975,34 b' msgstr ""'
5387 msgid "tool option will be ignored\n"
5975 msgid "tool option will be ignored\n"
5388 msgstr ""
5976 msgstr ""
5389
5977
5978 msgid "cannot specify both a source and a base"
5979 msgstr "kan inte ange både en källa och en bas"
5980
5390 msgid "cannot specify both a revision and a base"
5981 msgid "cannot specify both a revision and a base"
5391 msgstr ""
5982 msgstr ""
5392
5983
5984 msgid "cannot specify both a revision and a source"
5985 msgstr "kan inte ange både en revision och en källa"
5986
5393 msgid "detach requires a revision to be specified"
5987 msgid "detach requires a revision to be specified"
5394 msgstr "detach kräver att en revision anges"
5988 msgstr "detach kräver att en revision anges"
5395
5989
5396 msgid "cannot specify a base with detach"
5990 msgid "cannot specify a base with detach"
5397 msgstr "kan inte ange en bas med detach"
5991 msgstr "kan inte ange en bas med detach"
5398
5992
5993 msgid "can't remove original changesets with unrebased descendants"
5994 msgstr ""
5995
5996 msgid "use --keep to keep original changesets"
5997 msgstr "använd --keep för att bevara originaländringarna"
5998
5999 #, python-format
6000 msgid "Can't rebase immutable changeset %s"
6001 msgstr ""
6002
6003 msgid "see hg help phases for details"
6004 msgstr ""
6005
5399 msgid "nothing to rebase\n"
6006 msgid "nothing to rebase\n"
5400 msgstr ""
6007 msgstr ""
5401
6008
@@ -5438,6 +6045,9 b' msgstr ""'
5438 msgid "no rebase in progress"
6045 msgid "no rebase in progress"
5439 msgstr ""
6046 msgstr ""
5440
6047
6048 msgid "warning: immutable rebased changeset detected, can't abort\n"
6049 msgstr ""
6050
5441 msgid "warning: new changesets detected on target branch, can't abort\n"
6051 msgid "warning: new changesets detected on target branch, can't abort\n"
5442 msgstr ""
6052 msgstr ""
5443
6053
@@ -5447,12 +6057,15 b' msgstr ""'
5447 msgid "cannot rebase onto an applied mq patch"
6057 msgid "cannot rebase onto an applied mq patch"
5448 msgstr ""
6058 msgstr ""
5449
6059
6060 msgid "no matching revisions"
6061 msgstr ""
6062
6063 msgid "can't rebase multiple roots"
6064 msgstr ""
6065
5450 msgid "source is ancestor of destination"
6066 msgid "source is ancestor of destination"
5451 msgstr ""
6067 msgstr ""
5452
6068
5453 msgid "source is descendant of destination"
5454 msgstr ""
5455
5456 msgid "--tool can only be used with --rebase"
6069 msgid "--tool can only be used with --rebase"
5457 msgstr ""
6070 msgstr ""
5458
6071
@@ -5774,6 +6387,17 b' msgid ""'
5774 " "
6387 " "
5775 msgstr ""
6388 msgstr ""
5776
6389
6390 msgid "convert a shared repository to a normal one"
6391 msgstr "konvertera ett delat arkiv till ett normalt"
6392
6393 msgid ""
6394 " Copy the store data to the repo and remove the sharedpath data.\n"
6395 " "
6396 msgstr ""
6397
6398 msgid "this is not a shared repo"
6399 msgstr "det här är inte ett delat arkiv"
6400
5777 msgid "do not create a working copy"
6401 msgid "do not create a working copy"
5778 msgstr ""
6402 msgstr ""
5779
6403
@@ -6176,17 +6800,14 b' msgstr ""'
6176 msgid "archive prefix contains illegal components"
6800 msgid "archive prefix contains illegal components"
6177 msgstr ""
6801 msgstr ""
6178
6802
6179 msgid "cannot give prefix when archiving to files"
6180 msgstr ""
6181
6182 #, python-format
6183 msgid "unknown archive type '%s'"
6184 msgstr ""
6185
6186 msgid "archiving"
6803 msgid "archiving"
6187 msgstr "arkiverar"
6804 msgstr "arkiverar"
6188
6805
6189 #, python-format
6806 #, python-format
6807 msgid "malformed line in .hg/bookmarks: %r\n"
6808 msgstr "defekt rad i .hg/bookmarks: %r\n"
6809
6810 #, python-format
6190 msgid "bookmark '%s' contains illegal character"
6811 msgid "bookmark '%s' contains illegal character"
6191 msgstr "bokmärket '%s' innehåller ogiltiga tecken"
6812 msgstr "bokmärket '%s' innehåller ogiltiga tecken"
6192
6813
@@ -6199,8 +6820,8 b' msgid "updating bookmark %s\\n"'
6199 msgstr "uppdaterar bokmärket %s\n"
6820 msgstr "uppdaterar bokmärket %s\n"
6200
6821
6201 #, python-format
6822 #, python-format
6202 msgid "not updating divergent bookmark %s\n"
6823 msgid "divergent bookmark %s stored as %s\n"
6203 msgstr "uppdaterar inte divergent bokmärke %s\n"
6824 msgstr "divergent bokmärke %s lagrat som %s\n"
6204
6825
6205 msgid "searching for changed bookmarks\n"
6826 msgid "searching for changed bookmarks\n"
6206 msgstr "söker efter ändrade bokmärken\n"
6827 msgstr "söker efter ändrade bokmärken\n"
@@ -6246,6 +6867,10 b' msgstr "anv\xc3\xa4ndarnamnet %s inneh\xc3\xa5ller en radbrytning"'
6246 msgid "the name '%s' is reserved"
6867 msgid "the name '%s' is reserved"
6247 msgstr "namnet '%s' är reserverat"
6868 msgstr "namnet '%s' är reserverat"
6248
6869
6870 #, python-format
6871 msgid "uncommitted changes in subrepo %s"
6872 msgstr "oarkiverade ändringar i underarkivet %s"
6873
6249 msgid "options --message and --logfile are mutually exclusive"
6874 msgid "options --message and --logfile are mutually exclusive"
6250 msgstr ""
6875 msgstr ""
6251
6876
@@ -6332,9 +6957,6 b' msgstr ""'
6332 msgid "destination %s is not a directory"
6957 msgid "destination %s is not a directory"
6333 msgstr ""
6958 msgstr ""
6334
6959
6335 msgid "no files to copy"
6336 msgstr ""
6337
6338 msgid "(consider using --after)\n"
6960 msgid "(consider using --after)\n"
6339 msgstr ""
6961 msgstr ""
6340
6962
@@ -6358,6 +6980,10 b' msgid "tag: %s\\n"'
6358 msgstr "märke: %s\n"
6980 msgstr "märke: %s\n"
6359
6981
6360 #, python-format
6982 #, python-format
6983 msgid "phase: %s\n"
6984 msgstr "fas: %s\n"
6985
6986 #, python-format
6361 msgid "parent: %d:%s\n"
6987 msgid "parent: %d:%s\n"
6362 msgstr "förälder: %d:%s\n"
6988 msgstr "förälder: %d:%s\n"
6363
6989
@@ -6795,6 +7421,21 b' msgstr ""'
6795 " Arkivtypen upptäcks automatiskt baserat på filändelsen (eller tvinga\n"
7421 " Arkivtypen upptäcks automatiskt baserat på filändelsen (eller tvinga\n"
6796 " med hjälp av -t/--type)."
7422 " med hjälp av -t/--type)."
6797
7423
7424 msgid " Examples:"
7425 msgstr " Exempel:"
7426
7427 msgid " - create a zip file containing the 1.0 release::"
7428 msgstr " - skapa en zip-fil som innehåller 1.0-releasen::"
7429
7430 msgid " hg archive -r 1.0 project-1.0.zip"
7431 msgstr " hg archive -r 1.0 project-1.0.zip"
7432
7433 msgid " - create a tarball excluding .hg files::"
7434 msgstr " - skapa en tarboll utan .hg-filer::"
7435
7436 msgid " hg archive project.tar.gz -X \".hg*\""
7437 msgstr " hg archive project.tar.gz -X \".hg*\""
7438
6798 msgid " Valid types are:"
7439 msgid " Valid types are:"
6799 msgstr " Giltiga typer är:"
7440 msgstr " Giltiga typer är:"
6800
7441
@@ -6842,8 +7483,8 b' msgstr "kan inte arkivera rena filer til'
6842 msgid "merge with old dirstate parent after backout"
7483 msgid "merge with old dirstate parent after backout"
6843 msgstr "sammanfoga med gamla dirstate-föräldern efter återkallning"
7484 msgstr "sammanfoga med gamla dirstate-föräldern efter återkallning"
6844
7485
6845 msgid "parent to choose when backing out merge"
7486 msgid "parent to choose when backing out merge (DEPRECATED)"
6846 msgstr "förälder att välja när en sammanfogning återkallas"
7487 msgstr "förälder att välja när en sammanfogning återkallas (FÖRLEGAD)"
6847
7488
6848 msgid "revision to backout"
7489 msgid "revision to backout"
6849 msgstr "revision att återkalla"
7490 msgstr "revision att återkalla"
@@ -6870,26 +7511,35 b' msgstr ""'
6870 " sammanfogade resultatet lämnas oarkiverat."
7511 " sammanfogade resultatet lämnas oarkiverat."
6871
7512
6872 msgid ""
7513 msgid ""
6873 " By default, the pending changeset will have one parent,\n"
7514 " .. note::\n"
6874 " maintaining a linear history. With --merge, the pending changeset\n"
7515 " backout cannot be used to fix either an unwanted or\n"
6875 " will instead have two parents: the old parent of the working\n"
7516 " incorrect merge."
6876 " directory and a new child of REV that simply undoes REV."
7517 msgstr ""
6877 msgstr ""
7518 " .. note::\n"
6878 " Som standard kommer ändringen att ha en förälder, för att bibehålla en\n"
7519 " backout kan inte användas för att fixa en oönskad eller felaktig\n"
6879 " linjär historik. Med --merge kommer ändringen istället att ha två\n"
7520 " sammanfogning."
6880 " föräldrar: den gamla föräldern från arbetskatalogen och ett nytt barn\n"
7521
6881 " av REV som helt enkelt ogör REV."
7522 msgid ""
6882
7523 " By default, the pending changeset will have one parent,\n"
6883 msgid ""
7524 " maintaining a linear history. With --merge, the pending\n"
6884 " Before version 1.7, the behavior without --merge was equivalent to\n"
7525 " changeset will instead have two parents: the old parent of the\n"
6885 " specifying --merge followed by :hg:`update --clean .` to cancel\n"
7526 " working directory and a new child of REV that simply undoes REV."
6886 " the merge and leave the child of REV as a head to be merged\n"
7527 msgstr ""
6887 " separately."
7528 " Som standard kommer ändringen att ha en förälder, för att bibehålla\n"
6888 msgstr ""
7529 " en linjär historik. Med --merge kommer ändringen istället att ha två\n"
6889 " Innan version 1.7, så var beteendet utan --merge ekvivalent med att\n"
7530 " föräldrar: den gamla föräldern från arbetskatalogen och ett nytt\n"
6890 " ange --merge följt av :hg:`update --clean .` för att ångra\n"
7531 " barn av REV som helt enkelt ogör REV."
6891 " sammanfogningen och lämna barnet till REV som ett huvud att\n"
7532
6892 " sammanfogas separat."
7533 msgid ""
7534 " Before version 1.7, the behavior without --merge was equivalent\n"
7535 " to specifying --merge followed by :hg:`update --clean .` to\n"
7536 " cancel the merge and leave the child of REV as a head to be\n"
7537 " merged separately."
7538 msgstr ""
7539 " Innan version 1.7, så var beteendet utan --merge ekvivalent med att\n"
7540 " ange --merge följt av :hg:`update --clean .` för att ångra\n"
7541 " sammanfogningen och lämna barnet till REV som ett huvud att\n"
7542 " sammanfogas separat."
6893
7543
6894 msgid "please specify just one revision"
7544 msgid "please specify just one revision"
6895 msgstr "ange bara en revision"
7545 msgstr "ange bara en revision"
@@ -6903,8 +7553,8 b' msgstr "kan inte \xc3\xa5terkalla en \xc3\xa4ndring p\xc3\xa5 en annan gren"'
6903 msgid "cannot backout a change with no parents"
7553 msgid "cannot backout a change with no parents"
6904 msgstr "kan inte återkalla en ändring utan föräldrar"
7554 msgstr "kan inte återkalla en ändring utan föräldrar"
6905
7555
6906 msgid "cannot backout a merge changeset without --parent"
7556 msgid "cannot backout a merge changeset"
6907 msgstr "kan inte återkalla en sammanfogande ändring utan --parent"
7557 msgstr "kan inte återkalla en sammanfogning"
6908
7558
6909 #, python-format
7559 #, python-format
6910 msgid "%s is not a parent of %s"
7560 msgid "%s is not a parent of %s"
@@ -6986,6 +7636,101 b' msgstr ""'
6986 " revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n"
7636 " revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n"
6987 " genomsökningen, och alla andra värden betyder att revisionen är dålig."
7637 " genomsökningen, och alla andra värden betyder att revisionen är dålig."
6988
7638
7639 msgid " Some examples:"
7640 msgstr " Några exempel:"
7641
7642 msgid ""
7643 " - start a bisection with known bad revision 12, and good revision 34::"
7644 msgstr ""
7645 " - starta en sökning med känd dålig revision 12, och bra revision 34::"
7646
7647 msgid ""
7648 " hg bisect --bad 34\n"
7649 " hg bisect --good 12"
7650 msgstr ""
7651 " hg bisect --bad 34\n"
7652 " hg bisect --good 12"
7653
7654 msgid ""
7655 " - advance the current bisection by marking current revision as good "
7656 "or\n"
7657 " bad::"
7658 msgstr ""
7659 " - stega den nuvarande sökningen genom att markera nuvarande revision\n"
7660 " som bra eller dålig::"
7661
7662 msgid ""
7663 " hg bisect --good\n"
7664 " hg bisect --bad"
7665 msgstr ""
7666 " hg bisect --good\n"
7667 " hg bisect --bad"
7668
7669 msgid ""
7670 " - mark the current revision, or a known revision, to be skipped (eg. "
7671 "if\n"
7672 " that revision is not usable because of another issue)::"
7673 msgstr ""
7674 " - markera att den nuvarande revisionen, eller en känd revision, ska\n"
7675 " hoppas över (ex. om den revisionen är oanvändbar på grund av annat\n"
7676 " fel)::"
7677
7678 msgid ""
7679 " hg bisect --skip\n"
7680 " hg bisect --skip 23"
7681 msgstr ""
7682 " hg bisect --skip\n"
7683 " hg bisect --skip 23"
7684
7685 msgid " - forget the current bisection::"
7686 msgstr " - glöm den aktuella genomsökningen::"
7687
7688 msgid " hg bisect --reset"
7689 msgstr " hg bisect --reset"
7690
7691 msgid ""
7692 " - use 'make && make tests' to automatically find the first broken\n"
7693 " revision::"
7694 msgstr ""
7695 " - använd 'make && make tests' för att automatiskt hitta den första\n"
7696 " defekta revisionen::"
7697
7698 msgid ""
7699 " hg bisect --reset\n"
7700 " hg bisect --bad 34\n"
7701 " hg bisect --good 12\n"
7702 " hg bisect --command 'make && make tests'"
7703 msgstr ""
7704 " hg bisect --reset\n"
7705 " hg bisect --bad 34\n"
7706 " hg bisect --good 12\n"
7707 " hg bisect --command 'make && make tests'"
7708
7709 msgid ""
7710 " - see all changesets whose states are already known in the current\n"
7711 " bisection::"
7712 msgstr ""
7713 " - visa alla ändringar vars status redan är kända i den nuvarande\n"
7714 " genomsökningen::"
7715
7716 msgid " hg log -r \"bisect(pruned)\""
7717 msgstr " hg log -r \"bisect(pruned)\""
7718
7719 msgid " - see all changesets that took part in the current bisection::"
7720 msgstr " - se alla ändringar som var med i den nuvarande genomsökningen::"
7721
7722 msgid " hg log -r \"bisect(range)\""
7723 msgstr " hg log -r \"bisect(range)\""
7724
7725 msgid " - with the graphlog extension, you can even get a nice graph::"
7726 msgstr " - med graphlog-utökningen så kan du få en söt graf::"
7727
7728 msgid " hg log --graph -r \"bisect(range)\""
7729 msgstr " hg log --graph -r \"bisect(range)\""
7730
7731 msgid " See :hg:`help revsets` for more about the `bisect()` keyword."
7732 msgstr " Se :hg:`help revsets` för mer om nyckelordet `bisect()`."
7733
6989 msgid "The first good revision is:\n"
7734 msgid "The first good revision is:\n"
6990 msgstr "Den första bra revisionen är:\n"
7735 msgstr "Den första bra revisionen är:\n"
6991
7736
@@ -7061,15 +7806,16 b' msgid "track a line of development with '
7061 msgstr "spåra viss utveckling med flyttbara markörer"
7806 msgstr "spåra viss utveckling med flyttbara markörer"
7062
7807
7063 msgid ""
7808 msgid ""
7064 " Bookmarks are pointers to certain commits that move when\n"
7809 " Bookmarks are pointers to certain commits that move when committing.\n"
7065 " committing. Bookmarks are local. They can be renamed, copied and\n"
7810 " Bookmarks are local. They can be renamed, copied and deleted. It is\n"
7066 " deleted. It is possible to use bookmark names in :hg:`merge` and\n"
7811 " possible to use :hg:`merge NAME` to merge from a given bookmark, and\n"
7067 " :hg:`update` to merge and update respectively to a given bookmark."
7812 " :hg:`update NAME` to update to a given bookmark."
7068 msgstr ""
7813 msgstr ""
7069 " Bokmärken är pekare till utvalda arkiveringar som flyttar vid\n"
7814 " Bokmärken är pekare till utvalda arkiveringar som flyttar vid\n"
7070 " arkivering. Bokmärken är lokala. De kan döpas om, kopieras och\n"
7815 " arkivering. Bokmärken är lokala. De kan döpas om, kopieras och\n"
7071 " raderas. Det är möjligt att använda bokmärkesnamn i :hg:`merge` och\n"
7816 " raderas. Det är möjligt att använda bokmärkesnamn i :hg:`merge NAMN`\n"
7072 " :hg:`update` för att sammanfoga och uppdatera till ett visst bokmärke."
7817 " för att sammanfoga från ett bokmärke, och :hg:`update NAMN` för att\n"
7818 " uppdatera till ett visst bokmärke."
7073
7819
7074 msgid ""
7820 msgid ""
7075 " You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
7821 " You can use :hg:`bookmark NAME` to set a bookmark on the working\n"
@@ -7096,6 +7842,9 b' msgstr ""'
7096 " bookmarks-utökningen måste vara aktiverad.\n"
7842 " bookmarks-utökningen måste vara aktiverad.\n"
7097 " "
7843 " "
7098
7844
7845 msgid "bookmark name required"
7846 msgstr "bokmärkesnamn krävs"
7847
7099 #, python-format
7848 #, python-format
7100 msgid "bookmark '%s' does not exist"
7849 msgid "bookmark '%s' does not exist"
7101 msgstr "bokmärket '%s' existerar inte"
7850 msgstr "bokmärket '%s' existerar inte"
@@ -7107,9 +7856,6 b' msgstr "bokm\xc3\xa4rket \'%s\' existerar redan (anv\xc3\xa4nd -f f\xc3\xb6r att tvinga)"'
7107 msgid "new bookmark name required"
7856 msgid "new bookmark name required"
7108 msgstr "nytt bokmärkesnamn krävs"
7857 msgstr "nytt bokmärkesnamn krävs"
7109
7858
7110 msgid "bookmark name required"
7111 msgstr "bokmärkesnamn krävs"
7112
7113 msgid "bookmark name cannot contain newlines"
7859 msgid "bookmark name cannot contain newlines"
7114 msgstr "bokmärkesnamn kan inte innehålla radbrytningar"
7860 msgstr "bokmärkesnamn kan inte innehålla radbrytningar"
7115
7861
@@ -7135,6 +7881,18 b' msgid "set or show the current branch na'
7135 msgstr "sätt eller visa det aktuella grennamnet"
7881 msgstr "sätt eller visa det aktuella grennamnet"
7136
7882
7137 msgid ""
7883 msgid ""
7884 " .. note::\n"
7885 " Branch names are permanent and global. Use :hg:`bookmark` to create "
7886 "a\n"
7887 " light-weight bookmark instead. See :hg:`help glossary` for more\n"
7888 " information about named branches and bookmarks."
7889 msgstr ""
7890 " .. note::\n"
7891 " Grennamn är permanenta och globala. Använd :hg:`bookmark` för att\n"
7892 " skapa ett lättviktsbokmärke istället. Se :hg:`help glossary` för\n"
7893 " mer information om namngivna grenar och bokmärken."
7894
7895 msgid ""
7138 " With no argument, show the current branch name. With one argument,\n"
7896 " With no argument, show the current branch name. With one argument,\n"
7139 " set the working directory branch name (the branch will not exist\n"
7897 " set the working directory branch name (the branch will not exist\n"
7140 " in the repository until the next commit). Standard practice\n"
7898 " in the repository until the next commit). Standard practice\n"
@@ -7169,18 +7927,6 b' msgstr ""'
7169 " Använd kommandot :hg:`update` för att byta till en existerande gren.\n"
7927 " Använd kommandot :hg:`update` för att byta till en existerande gren.\n"
7170 " Använd :hg:`commit --close-branch` för att markera grenen som stängd."
7928 " Använd :hg:`commit --close-branch` för att markera grenen som stängd."
7171
7929
7172 msgid " .. note::"
7173 msgstr " .. notera::"
7174
7175 msgid ""
7176 " Branch names are permanent. Use :hg:`bookmark` to create a\n"
7177 " light-weight bookmark instead. See :hg:`help glossary` for more\n"
7178 " information about named branches and bookmarks."
7179 msgstr ""
7180 " Grennamnar är permanenta. Använd :hg:`bookmark` för att skapa ett\n"
7181 " lättviktsbokmärke istället. Se :hg:`help glossary` för mer\n"
7182 " information om namngivna grenar och bokmärken."
7183
7184 #, python-format
7930 #, python-format
7185 msgid "reset working directory to branch %s\n"
7931 msgid "reset working directory to branch %s\n"
7186 msgstr "återställ arbetskatalogen till grenen %s\n"
7932 msgstr "återställ arbetskatalogen till grenen %s\n"
@@ -7190,12 +7936,15 b' msgstr "ett grennamn med det namnet exis'
7190
7936
7191 #. i18n: "it" refers to an existing branch
7937 #. i18n: "it" refers to an existing branch
7192 msgid "use 'hg update' to switch to it"
7938 msgid "use 'hg update' to switch to it"
7193 msgstr ""
7939 msgstr "använd 'hg update' för att byta till den"
7194
7940
7195 #, python-format
7941 #, python-format
7196 msgid "marked working directory as branch %s\n"
7942 msgid "marked working directory as branch %s\n"
7197 msgstr "markerade arbetskatalogen som grenen %s\n"
7943 msgstr "markerade arbetskatalogen som grenen %s\n"
7198
7944
7945 msgid "(branches are permanent and global, did you want a bookmark?)\n"
7946 msgstr "(grenar är permanenta och globala, ville du ha ett bokmärke?)\n"
7947
7199 msgid "show only branches that have unmerged heads"
7948 msgid "show only branches that have unmerged heads"
7200 msgstr "visa bara grenar som har icke-sammanfogade huvuden"
7949 msgstr "visa bara grenar som har icke-sammanfogade huvuden"
7201
7950
@@ -7399,111 +8148,153 b' msgstr ""'
7399 " Källans plats kommer att läggas till i det nya arkivets\n"
8148 " Källans plats kommer att läggas till i det nya arkivets\n"
7400 " ``.hg/hgrc``-fil som standardplats att användas för framtida dragningar."
8149 " ``.hg/hgrc``-fil som standardplats att användas för framtida dragningar."
7401
8150
7402 msgid " See :hg:`help urls` for valid source format details."
8151 msgid ""
7403 msgstr " Se :hg:`help urls` för detaljer om giltiga källformat."
8152 " Only local paths and ``ssh://`` URLs are supported as\n"
7404
8153 " destinations. For ``ssh://`` destinations, no working directory or\n"
7405 msgid ""
8154 " ``.hg/hgrc`` will be created on the remote side."
7406 " It is possible to specify an ``ssh://`` URL as the destination, but no\n"
8155 msgstr ""
7407 " ``.hg/hgrc`` and working directory will be created on the remote side.\n"
8156 " Bara lokala sökvägar och ``ssh://``-URLer stödjs som destinationer. För\n"
7408 " Please see :hg:`help urls` for important details about ``ssh://`` URLs."
8157 " ``ssh://``-destinationer så kommer ingen arbetskatalog eller\n"
7409 msgstr ""
8158 " ``.hg/hgrc`` att skapas på fjärrsidan."
7410 " Det är möjligt att ange en ``ssh://``-URL som destination, men ingen\n"
8159
7411 " ``.hg/hgrc`` och arbetskatalog skapas på fjärrsidan.\n"
8160 msgid ""
7412 " Se :hg:`help urls` för viktiga detaljer om ``ssh://``-URLer."
8161 " To pull only a subset of changesets, specify one or more revisions\n"
7413
8162 " identifiers with -r/--rev or branches with -b/--branch. The\n"
7414 msgid ""
8163 " resulting clone will contain only the specified changesets and\n"
7415 " A set of changesets (tags, or branch names) to pull may be specified\n"
8164 " their ancestors. These options (or 'clone src#rev dest') imply\n"
7416 " by listing each changeset (tag, or branch name) with -r/--rev.\n"
8165 " --pull, even for local source repositories. Note that specifying a\n"
7417 " If -r/--rev is used, the cloned repository will contain only a subset\n"
8166 " tag will include the tagged changeset but not the changeset\n"
7418 " of the changesets of the source repository. Only the set of changesets\n"
8167 " containing the tag."
7419 " defined by all -r/--rev options (including all their ancestors)\n"
8168 msgstr ""
7420 " will be pulled into the destination repository.\n"
8169 " För att dra bara en delmängd av ändringarna, angå en eller fler\n"
7421 " No subsequent changesets (including subsequent tags) will be present\n"
8170 " revisionidentifierare med -r/--rev eller grenar med -b/--branch. Den\n"
7422 " in the destination."
8171 " resulterande klonen kommer bara att innehålla de angivna ändringarna\n"
7423 msgstr ""
8172 " och deras anfäder. Dessa flaggor (eller 'clone källa#rev dest') har\n"
7424 " En grupp ändringar (märken, eller grennamn) att dra kan anges genom\n"
8173 " implicit --pull, även för lokala arkiv. Notera att angivandet av ett\n"
7425 " att lista varje ändring (märke, eller grennamn) med -r/--rev. Om\n"
8174 " märke kommer att hämta ut den märkta ändringen, men inte ändringen som\n"
7426 " -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
8175 " innehåller märket."
7427 " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n"
8176
7428 " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n"
8177 msgid ""
7429 " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n"
8178 " To check out a particular version, use -u/--update, or\n"
7430 " att finnas i destinationen."
8179 " -U/--noupdate to create a clone with no working directory."
7431
8180 msgstr ""
7432 msgid ""
8181 " För att hämta ut en speciell version, använd -u/--update, eller\n"
7433 " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n"
8182 " -U/--noupdate för att skapa en klon utan en arbetskatalog."
7434 " local source repositories."
8183
7435 msgstr ""
8184 msgid ""
7436 " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n"
8185 " For efficiency, hardlinks are used for cloning whenever the\n"
7437 " --pull, även för lokala arkiv."
8186 " source and destination are on the same filesystem (note this\n"
7438
8187 " applies only to the repository data, not to the working\n"
7439 msgid ""
8188 " directory). Some filesystems, such as AFS, implement hardlinking\n"
7440 " For efficiency, hardlinks are used for cloning whenever the source\n"
8189 " incorrectly, but do not report errors. In these cases, use the\n"
7441 " and destination are on the same filesystem (note this applies only\n"
8190 " --pull option to avoid hardlinking."
7442 " to the repository data, not to the working directory). Some\n"
8191 msgstr ""
7443 " filesystems, such as AFS, implement hardlinking incorrectly, but\n"
8192 " Av effektivitestskäl används hårda länkar när källan och\n"
7444 " do not report errors. In these cases, use the --pull option to\n"
8193 " destinationen är på samma filsystem (notera att detta bara gäller för\n"
7445 " avoid hardlinking."
8194 " arkivdatat, inte arbetskopian). Vissa filsystem såsom AFS\n"
7446 msgstr ""
8195 " implementerar hårda länkar felaktigt, men rapporterar inga fel.\n"
7447 " Av effektivitestskäl används hårda länkar när källan och destinationen\n"
8196 " Använd flaggan --pull för att undvika användning av hårda länkar."
7448 " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
8197
7449 " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
8198 msgid ""
7450 " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
8199 " In some cases, you can clone repositories and the working\n"
7451 " för att undvika användning av hårda länkar."
8200 " directory using full hardlinks with ::"
7452
8201 msgstr ""
7453 msgid ""
8202 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
7454 " In some cases, you can clone repositories and the working directory\n"
8203 " hårdlänkade, med ::"
7455 " using full hardlinks with ::"
8204
7456 msgstr ""
8205 msgid " $ cp -al REPO REPOCLONE"
7457 " I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
8206 msgstr " $ cp -al ARKIV ARKIVKLON"
7458 " hårdlänkade, med ::"
8207
7459
8208 msgid ""
7460 msgid " $ cp -al REPO REPOCLONE"
8209 " This is the fastest way to clone, but it is not always safe. The\n"
7461 msgstr " $ cp -al ARKIV ARKIVKLON"
8210 " operation is not atomic (making sure REPO is not modified during\n"
7462
8211 " the operation is up to you) and you have to make sure your\n"
7463 msgid ""
8212 " editor breaks hardlinks (Emacs and most Linux Kernel tools do\n"
7464 " This is the fastest way to clone, but it is not always safe. The\n"
8213 " so). Also, this is not compatible with certain extensions that\n"
7465 " operation is not atomic (making sure REPO is not modified during\n"
8214 " place their metadata under the .hg directory, such as mq."
7466 " the operation is up to you) and you have to make sure your editor\n"
8215 msgstr ""
7467 " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
8216 " Detta är det snabbaste sättet att klona, men det är inte alltid\n"
7468 " this is not compatible with certain extensions that place their\n"
8217 " säkert. Operationen är inte atomisk (att ARKIV inte modifieras under\n"
7469 " metadata under the .hg directory, such as mq."
8218 " operationen är upp till dig) och du måste se till att din editor\n"
7470 msgstr ""
8219 " bryter hårda länkar (Emacs och de flesta Linux-kernelverktyg gör\n"
7471 " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n"
8220 " det). Det är inte heller kompatibelt med vissa utökningar som\n"
7472 " Operationen är inte atomisk (att ARKIV inte modifieras under\n"
8221 " placerar sin metadata under katalogen .hg, som mq."
7473 " operationen är upp till dig) och du måste se till att din editor bryter\n"
8222
7474 " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
8223 msgid ""
7475 " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
8224 " Mercurial will update the working directory to the first applicable\n"
7476 " under katalogen .hg, som mq."
8225 " revision from this list:"
7477
8226 msgstr ""
7478 msgid ""
8227 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
7479 " Mercurial will update the working directory to the first applicable\n"
8228 " revisionen från den här listan:"
7480 " revision from this list:"
8229
7481 msgstr ""
8230 msgid ""
7482 " Mercurial uppdaterar arbetskatalogen till den första passande\n"
8231 " a) null if -U or the source repository has no changesets\n"
7483 " revisionen från den här listan:"
8232 " b) if -u . and the source repository is local, the first parent of\n"
7484
8233 " the source repository's working directory\n"
7485 msgid ""
8234 " c) the changeset specified with -u (if a branch name, this means the\n"
7486 " a) null if -U or the source repository has no changesets\n"
8235 " latest head of that branch)\n"
7487 " b) if -u . and the source repository is local, the first parent of\n"
8236 " d) the changeset specified with -r\n"
7488 " the source repository's working directory\n"
8237 " e) the tipmost head specified with -b\n"
7489 " c) the changeset specified with -u (if a branch name, this means the\n"
8238 " f) the tipmost head specified with the url#branch source syntax\n"
7490 " latest head of that branch)\n"
8239 " g) the tipmost head of the default branch\n"
7491 " d) the changeset specified with -r\n"
8240 " h) tip"
7492 " e) the tipmost head specified with -b\n"
8241 msgstr ""
7493 " f) the tipmost head specified with the url#branch source syntax\n"
8242 " a) null med -U eller källarkivet inte har några ändringar\n"
7494 " g) the tipmost head of the default branch\n"
8243 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
7495 " h) tip"
8244 " arbetskatalog\n"
7496 msgstr ""
8245 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
7497 " a) null med -U eller källarkivet inte har några ändringar\n"
8246 " huvudet på den grenen)\n"
7498 " b) med -u . och källarkivet, den första föräldern av källarkivets\n"
8247 " d) ändringen angiven med -r\n"
7499 " arbetskatalog\n"
8248 " e) det högsta huvudet angivet med -b\n"
7500 " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
8249 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
7501 " huvudet på den grenen)\n"
8250 " g) det högsta huvudet på default-grenen\n"
7502 " d) ändringen angiven med -r\n"
8251 " h) tip"
7503 " e) det högsta huvudet angivet med -b\n"
8252
7504 " f) det högsta huvudet angivent med källsyntaxen url#gren\n"
8253 msgid " - clone a remote repository to a new directory named hg/::"
7505 " g) det högsta huvudet på default-grenen\n"
8254 msgstr " - klona ett fjärrarkiv till en ny katalog med namnet hg/::"
7506 " h) tip"
8255
8256 msgid " hg clone http://selenic.com/hg"
8257 msgstr " hg clone http://selenic.com/hg"
8258
8259 msgid " - create a lightweight local clone::"
8260 msgstr " - skapa en lättviktig lokal klon::"
8261
8262 msgid " hg clone project/ project-feature/"
8263 msgstr " hg clone project/ project-feature/"
8264
8265 msgid ""
8266 " - clone from an absolute path on an ssh server (note double-slash)::"
8267 msgstr ""
8268 " - klona från en absolut sökväg på en ssh-server (notera dubbel-slash)::"
8269
8270 msgid " hg clone ssh://user@server//home/projects/alpha/"
8271 msgstr " hg clone ssh://user@server//home/projects/alpha/"
8272
8273 msgid ""
8274 " - do a high-speed clone over a LAN while checking out a\n"
8275 " specified version::"
8276 msgstr ""
8277 " - gör en höghastighetsklon över ett LAN samtidigt som en specificerad\n"
8278 " version hämtas ut::"
8279
8280 msgid " hg clone --uncompressed http://server/repo -u 1.5"
8281 msgstr " hg clone --uncompressed http://server/repo -u 1.5"
8282
8283 msgid ""
8284 " - create a repository without changesets after a particular revision::"
8285 msgstr " - skapa ett arkiv utan ändringarna efter en viss revision::"
8286
8287 msgid " hg clone -r 04e544 experimental/ good/"
8288 msgstr " hg clone -r 04e544 experimental/ good/"
8289
8290 msgid " - clone (and track) a particular named branch::"
8291 msgstr " - klona (och spåra) en viss namngiven gren::"
8292
8293 msgid " hg clone http://selenic.com/hg#stable"
8294 msgstr " hg clone http://selenic.com/hg#stable"
8295
8296 msgid " See :hg:`help urls` for details on specifying URLs."
8297 msgstr " Se :hg:`help urls` för detaljer om att ange URLer."
7507
8298
7508 msgid "cannot specify both --noupdate and --updaterev"
8299 msgid "cannot specify both --noupdate and --updaterev"
7509 msgstr "kan inte ange både --noupdate och --updaterev"
8300 msgstr "kan inte ange både --noupdate och --updaterev"
@@ -7846,7 +8637,7 b' msgid "no ignore patterns found"'
7846 msgstr "inget ignoreringsmönster hittades"
8637 msgstr "inget ignoreringsmönster hittades"
7847
8638
7848 msgid "revlog format"
8639 msgid "revlog format"
7849 msgstr ""
8640 msgstr "revlog-format"
7850
8641
7851 msgid "[-f FORMAT] -c|-m|FILE"
8642 msgid "[-f FORMAT] -c|-m|FILE"
7852 msgstr ""
8643 msgstr ""
@@ -7881,8 +8672,9 b' msgstr ""'
7881 msgid " (check that you compiled the extensions)\n"
8672 msgid " (check that you compiled the extensions)\n"
7882 msgstr ""
8673 msgstr ""
7883
8674
7884 msgid "Checking templates...\n"
8675 #, python-format
7885 msgstr ""
8676 msgid "Checking templates (%s)...\n"
8677 msgstr "Kontrollerar mallar (%s)...\n"
7886
8678
7887 msgid " (templates seem to have been installed incorrectly)\n"
8679 msgid " (templates seem to have been installed incorrectly)\n"
7888 msgstr ""
8680 msgstr ""
@@ -8061,6 +8853,45 b' msgstr ""'
8061 " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n"
8853 " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n"
8062 " mer information, läs :hg:`help diffs`."
8854 " mer information, läs :hg:`help diffs`."
8063
8855
8856 msgid " - compare a file in the current working directory to its parent::"
8857 msgstr " - jämför en fil i arbetskatalogen med dess förälder::"
8858
8859 msgid " hg diff foo.c"
8860 msgstr " hg diff foo.c"
8861
8862 msgid ""
8863 " - compare two historical versions of a directory, with rename info::"
8864 msgstr ""
8865 " - jämför två historiska versioner of en katalog, med namnändringar::"
8866
8867 msgid " hg diff --git -r 1.0:1.2 lib/"
8868 msgstr " hg diff --git -r 1.0:1.2 lib/"
8869
8870 msgid " - get change stats relative to the last change on some date::"
8871 msgstr ""
8872 " - hämta ändringsstatus relativ ttill den sista ändringen på ett datum::"
8873
8874 msgid " hg diff --stat -r \"date('may 2')\""
8875 msgstr " hg diff --stat -r \"date('may 2')\""
8876
8877 msgid " - diff all newly-added files that contain a keyword::"
8878 msgstr " - diffa alla nytillagda filer som innehåller ett nyckelord::"
8879
8880 msgid " hg diff \"set:added() and grep(GNU)\""
8881 msgstr " hg diff \"set:added() and grep(GNU)\""
8882
8883 msgid " - compare a revision and its parents::"
8884 msgstr " - jämför en revision och dess föräldrar::"
8885
8886 msgid ""
8887 " hg diff -c 9353 # compare against first parent\n"
8888 " hg diff -r 9353^:9353 # same using revset syntax\n"
8889 " hg diff -r 9353^2:9353 # compare against the second parent"
8890 msgstr ""
8891 " hg diff -c 9353 # jämför mot den första föräldern\n"
8892 " hg diff -r 9353^:9353 # samma med revset-syntax\n"
8893 " hg diff -r 9353^2:9353 # jämför mot den andra föräldern"
8894
8064 msgid "diff against the second parent"
8895 msgid "diff against the second parent"
8065 msgstr "diffa mot den andra föräldern"
8896 msgstr "diffa mot den andra föräldern"
8066
8897
@@ -8109,6 +8940,8 b' msgid ""'
8109 " :``%R``: changeset revision number\n"
8940 " :``%R``: changeset revision number\n"
8110 " :``%b``: basename of the exporting repository\n"
8941 " :``%b``: basename of the exporting repository\n"
8111 " :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
8942 " :``%h``: short-form changeset hash (12 hexadecimal digits)\n"
8943 " :``%m``: first line of the commit message (only alphanumeric "
8944 "characters)\n"
8112 " :``%n``: zero-padded sequence number, starting at 1\n"
8945 " :``%n``: zero-padded sequence number, starting at 1\n"
8113 " :``%r``: zero-padded changeset revision number"
8946 " :``%r``: zero-padded changeset revision number"
8114 msgstr ""
8947 msgstr ""
@@ -8118,6 +8951,8 b' msgstr ""'
8118 " :``%R``: ändringens revisionsnummer\n"
8951 " :``%R``: ändringens revisionsnummer\n"
8119 " :``%b``: basnamn för det exporterande arkivet\n"
8952 " :``%b``: basnamn för det exporterande arkivet\n"
8120 " :``%h``: kort ändringshash (12 hexadecimala siffror)\n"
8953 " :``%h``: kort ändringshash (12 hexadecimala siffror)\n"
8954 " :``%m``: första raden i arkiveringsmeddelandet (bara alfanumeriska "
8955 "tecken)\n"
8121 " :``%n``: nollpaddat sekvensnummer, börjar med 1\n"
8956 " :``%n``: nollpaddat sekvensnummer, börjar med 1\n"
8122 " :``%r``: nollpaddat ändringsrevisionsnummer"
8957 " :``%r``: nollpaddat ändringsrevisionsnummer"
8123
8958
@@ -8144,14 +8979,44 b' msgstr ""'
8144 " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n"
8979 " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n"
8145 " föräldern. Det kan vara användbart för att granska en sammanfogning."
8980 " föräldern. Det kan vara användbart för att granska en sammanfogning."
8146
8981
8982 msgid ""
8983 " - use export and import to transplant a bugfix to the current\n"
8984 " branch::"
8985 msgstr ""
8986 " - använd export och import för att transplantera en buggfix på den\n"
8987 " nuvarande grenen::"
8988
8989 msgid " hg export -r 9353 | hg import -"
8990 msgstr " hg export -r 9353 | hg import -"
8991
8992 msgid ""
8993 " - export all the changesets between two revisions to a file with\n"
8994 " rename information::"
8995 msgstr ""
8996 " - exportera alla ändringar mellan två revisioner till en fil med\n"
8997 " namnändringsinformation::"
8998
8999 msgid " hg export --git -r 123:150 > changes.txt"
9000 msgstr " hg export --git -r 123:150 > changes.txt"
9001
9002 msgid ""
9003 " - split outgoing changes into a series of patches with\n"
9004 " descriptive names::"
9005 msgstr ""
9006 " - dela upp utgående ändringar till en serie patchar med beskrivande\n"
9007 " namn::"
9008
9009 msgid " hg export -r \"outgoing()\" -o \"%n-%m.patch\""
9010 msgstr " hg export -r \"outgoing()\" -o \"%n-%m.patch\""
9011
8147 msgid "export requires at least one changeset"
9012 msgid "export requires at least one changeset"
8148 msgstr ""
9013 msgstr "export kräver minst en ändring"
8149
9014
8150 msgid "exporting patches:\n"
9015 msgid "exporting patches:\n"
8151 msgstr ""
9016 msgstr "exporterar patchar:\n"
8152
9017
8153 msgid "exporting patch:\n"
9018 msgid "exporting patch:\n"
8154 msgstr ""
9019 msgstr "exporterar patch:\n"
8155
9020
8156 msgid "forget the specified files on the next commit"
9021 msgid "forget the specified files on the next commit"
8157 msgstr "glöm de angivna filerna vid nästa arkivering"
9022 msgstr "glöm de angivna filerna vid nästa arkivering"
@@ -8174,16 +9039,130 b' msgstr ""'
8174 msgid " To undo a forget before the next commit, see :hg:`add`."
9039 msgid " To undo a forget before the next commit, see :hg:`add`."
8175 msgstr " För att ångra en forget innan nästa arkivering, se :hg:`add`."
9040 msgstr " För att ångra en forget innan nästa arkivering, se :hg:`add`."
8176
9041
8177 msgid "no files specified"
9042 msgid " - forget newly-added binary files::"
8178 msgstr ""
9043 msgstr " - glöm bort nytillagda binärfiler::"
8179
9044
8180 #, python-format
9045 msgid " hg forget \"set:added() and binary()\""
8181 msgid "not removing %s: file is already untracked\n"
9046 msgstr " hg forget \"set:added() and binary()\""
8182 msgstr ""
9047
8183
9048 msgid " - forget files that would be excluded by .hgignore::"
8184 #, python-format
9049 msgstr " - glöm bort filer som skulle exkluderas av .hgignore::"
8185 msgid "removing %s\n"
9050
8186 msgstr "tar bort %s\n"
9051 msgid " hg forget \"set:hgignore()\""
9052 msgstr " hg forget \"set:hgignore()\""
9053
9054 msgid "resume interrupted graft"
9055 msgstr "återuppta avbruten ympning"
9056
9057 msgid "record the current date as commit date"
9058 msgstr "lagra det nuvarande datumet som arkiveringsdatumet"
9059
9060 msgid "record the current user as committer"
9061 msgstr "lagra den nuvarande användaren som arkiverare"
9062
9063 msgid "[OPTION]... REVISION..."
9064 msgstr "[FLAGGA]... REVISION..."
9065
9066 msgid "copy changes from other branches onto the current branch"
9067 msgstr "kopiera ändringar från andra grenar till den nuvarande grenen"
9068
9069 msgid ""
9070 " This command uses Mercurial's merge logic to copy individual\n"
9071 " changes from other branches without merging branches in the\n"
9072 " history graph. This is sometimes known as 'backporting' or\n"
9073 " 'cherry-picking'. By default, graft will copy user, date, and\n"
9074 " description from the source changesets."
9075 msgstr ""
9076
9077 msgid ""
9078 " Changesets that are ancestors of the current revision, that have\n"
9079 " already been grafted, or that are merges will be skipped."
9080 msgstr ""
9081
9082 msgid ""
9083 " If a graft merge results in conflicts, the graft process is\n"
9084 " interrupted so that the current merge can be manually resolved.\n"
9085 " Once all conflicts are addressed, the graft process can be\n"
9086 " continued with the -c/--continue option."
9087 msgstr ""
9088
9089 msgid ""
9090 " .. note::\n"
9091 " The -c/--continue option does not reapply earlier options."
9092 msgstr ""
9093
9094 msgid ""
9095 " - copy a single change to the stable branch and edit its description::"
9096 msgstr ""
9097
9098 msgid ""
9099 " hg update stable\n"
9100 " hg graft --edit 9393"
9101 msgstr ""
9102 " hg update stable\n"
9103 " hg graft --edit 9393"
9104
9105 msgid ""
9106 " - graft a range of changesets with one exception, updating dates::"
9107 msgstr ""
9108
9109 msgid " hg graft -D \"2085::2093 and not 2091\""
9110 msgstr " hg graft -D \"2085::2093 and not 2091\""
9111
9112 msgid " - continue a graft after resolving conflicts::"
9113 msgstr ""
9114
9115 msgid " hg graft -c"
9116 msgstr " hg graft -c"
9117
9118 msgid " - show the source of a grafted changeset::"
9119 msgstr ""
9120
9121 msgid " hg log --debug -r tip"
9122 msgstr " hg log --debug -r tip"
9123
9124 msgid ""
9125 " Returns 0 on successful completion.\n"
9126 " "
9127 msgstr ""
9128 " Returnerar 0 om kommandot lyckades.\n"
9129 " "
9130
9131 msgid "can't specify --continue and revisions"
9132 msgstr "kan inte specificera --continue och revisioner"
9133
9134 msgid "no graft state found, can't continue"
9135 msgstr ""
9136
9137 #, python-format
9138 msgid "skipping ungraftable merge revision %s\n"
9139 msgstr ""
9140
9141 #, python-format
9142 msgid "skipping ancestor revision %s\n"
9143 msgstr ""
9144
9145 #, python-format
9146 msgid "skipping already grafted revision %s\n"
9147 msgstr ""
9148
9149 #, python-format
9150 msgid "skipping already grafted revision %s (same origin %d)\n"
9151 msgstr ""
9152
9153 #, python-format
9154 msgid "skipping already grafted revision %s (was grafted from %d)\n"
9155 msgstr ""
9156
9157 #, python-format
9158 msgid "grafting revision %s\n"
9159 msgstr "ympar revision %s\n"
9160
9161 msgid "unresolved conflicts, can't continue"
9162 msgstr "olösta konflikter, kan inte fortsätta"
9163
9164 msgid "use hg resolve and hg graft --continue"
9165 msgstr "använd hg resolve och hg graft --continue"
8187
9166
8188 msgid "end fields with NUL"
9167 msgid "end fields with NUL"
8189 msgstr "avsluta fält med NUL"
9168 msgstr "avsluta fält med NUL"
@@ -8287,10 +9266,14 b' msgstr ""'
8287
9266
8288 msgid ""
9267 msgid ""
8289 " If one or more REVs are given, only branch heads on the branches\n"
9268 " If one or more REVs are given, only branch heads on the branches\n"
8290 " associated with the specified changesets are shown."
9269 " associated with the specified changesets are shown. This means\n"
9270 " that you can use :hg:`heads foo` to see the heads on a branch\n"
9271 " named ``foo``."
8291 msgstr ""
9272 msgstr ""
8292 " Om en eller flera REV anges, kommer bara grenhuvuden på grenar\n"
9273 " Om en eller flera REV anges, kommer bara grenhuvuden på grenar\n"
8293 " som är associerade med de angivna ändringarna att visas."
9274 " som är associerade med de angivna ändringarna att visas. Det betyder\n"
9275 " att du kan använda :hg:`heads foo` för att se huvuden på en gren vid\n"
9276 " namn ``foo``."
8294
9277
8295 msgid ""
9278 msgid ""
8296 " If -c/--closed is specified, also show branch heads marked closed\n"
9279 " If -c/--closed is specified, also show branch heads marked closed\n"
@@ -8359,6 +9342,19 b' msgstr ""'
8359 " Returnerar 0 om kommandot lyckades.\n"
9342 " Returnerar 0 om kommandot lyckades.\n"
8360 " "
9343 " "
8361
9344
9345 msgid "VALUE"
9346 msgstr "VÄRDE"
9347
9348 msgid "DEPRECATED"
9349 msgstr "FÖRLEGAD"
9350
9351 msgid ""
9352 "\n"
9353 "[+] marked option can be specified multiple times\n"
9354 msgstr ""
9355 "\n"
9356 "flaggor markerade med [+] kan anges flera gånger\n"
9357
8362 msgid "global options:"
9358 msgid "global options:"
8363 msgstr "globala flaggor:"
9359 msgstr "globala flaggor:"
8364
9360
@@ -8379,11 +9375,8 b' msgstr ""'
8379 "använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor"
9375 "använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor"
8380
9376
8381 #, python-format
9377 #, python-format
8382 msgid "use \"hg -v help %s\" to show global options"
9378 msgid "use \"hg -v help %s\" to show more info"
8383 msgstr "använd \"hg -v help %s\" för att visa globala flaggor"
9379 msgstr "använd \"hg -v help %s\" för att visa mer info"
8384
8385 msgid "list of commands:"
8386 msgstr "kommandolista:"
8387
9380
8388 #, python-format
9381 #, python-format
8389 msgid ""
9382 msgid ""
@@ -8413,23 +9406,44 b' msgid "%s"'
8413 msgstr "%s"
9406 msgstr "%s"
8414
9407
8415 #, python-format
9408 #, python-format
9409 msgid "use \"hg help -e %s\" to show help for the %s extension"
9410 msgstr "använd \"hg help -e %s\" för att visa hjälp för utökningen %s"
9411
9412 #, python-format
8416 msgid ""
9413 msgid ""
8417 "\n"
9414 "\n"
8418 "use \"hg -v help %s\" to show verbose help\n"
9415 "use \"hg help %s\" to show the full help text\n"
8419 msgstr ""
9416 msgstr ""
8420 "\n"
9417 "\n"
8421 "använd \"hg -v help %s\" för att visa utförlig hjälp\n"
9418 "använd \"hg help %s\" för att visa fullständig hjälptext\n"
8422
9419
8423 msgid "options:\n"
9420 #, python-format
8424 msgstr "flaggor:\n"
9421 msgid ""
8425
9422 "\n"
8426 #, python-format
9423 "use \"hg -v help %s\" to show more info\n"
8427 msgid "use \"hg help -e %s\" to show help for the %s extension"
9424 msgstr ""
8428 msgstr "använd \"hg help -e %s\" för att visa hjälp för utökningen %s"
9425 "\n"
9426 "använd \"hg -v help %s\" för att visa mer information\n"
9427
9428 msgid "basic commands:"
9429 msgstr "grundläggande kommandon:"
9430
9431 msgid "list of commands:"
9432 msgstr "kommandolista:"
8429
9433
8430 msgid "no commands defined\n"
9434 msgid "no commands defined\n"
8431 msgstr "inga kommandon definierade\n"
9435 msgstr "inga kommandon definierade\n"
8432
9436
9437 msgid "enabled extensions:"
9438 msgstr "aktiverade utökningar:"
9439
9440 msgid ""
9441 "\n"
9442 "additional help topics:"
9443 msgstr ""
9444 "\n"
9445 "ytterligare hjälpämnen:"
9446
8433 #, python-format
9447 #, python-format
8434 msgid ""
9448 msgid ""
8435 "\n"
9449 "\n"
@@ -8456,32 +9470,6 b' msgstr "\'%s\' tillhandah\xc3\xa5lls av f\xc3\xb6ljande ut\xc3\xb6kning:"'
8456 msgid "Mercurial Distributed SCM\n"
9470 msgid "Mercurial Distributed SCM\n"
8457 msgstr "Mercurial Distribuerad SCM\n"
9471 msgstr "Mercurial Distribuerad SCM\n"
8458
9472
8459 msgid "basic commands:"
8460 msgstr "grundläggande kommandon:"
8461
8462 msgid "enabled extensions:"
8463 msgstr "aktiverade utökningar:"
8464
8465 msgid "VALUE"
8466 msgstr "VÄRDE"
8467
8468 msgid "DEPRECATED"
8469 msgstr "FÖRLEGAD"
8470
8471 msgid ""
8472 "\n"
8473 "[+] marked option can be specified multiple times"
8474 msgstr ""
8475 "\n"
8476 "flaggor markerade med [+] kan anges flera gånger"
8477
8478 msgid ""
8479 "\n"
8480 "additional help topics:"
8481 msgstr ""
8482 "\n"
8483 "ytterligare hjälpämnen:"
8484
8485 msgid "identify the specified revision"
9473 msgid "identify the specified revision"
8486 msgstr "identifiera den angivna revisionen"
9474 msgstr "identifiera den angivna revisionen"
8487
9475
@@ -8531,6 +9519,24 b' msgstr ""'
8531 " Specificering av en sökväg till ett arkiv eller Mercurial-bunt\n"
9519 " Specificering av en sökväg till ett arkiv eller Mercurial-bunt\n"
8532 " gör att kommandot jobbar mot arkivet/bunten som är angiven."
9520 " gör att kommandot jobbar mot arkivet/bunten som är angiven."
8533
9521
9522 msgid " - generate a build identifier for the working directory::"
9523 msgstr " - skapa en byggidentifierare för arbetskatalogen::"
9524
9525 msgid " hg id --id > build-id.dat"
9526 msgstr " hg id --id > build-id.dat"
9527
9528 msgid " - find the revision corresponding to a tag::"
9529 msgstr " - hitta revisionen för ett märke::"
9530
9531 msgid " hg id -n -r 1.3"
9532 msgstr " hg id -n -r 1.3"
9533
9534 msgid " - check the most recent revision of a remote repository::"
9535 msgstr " - kontrollera den senaste revisionen i ett fjärrarkiv::"
9536
9537 msgid " hg id -r tip http://selenic.com/hg/"
9538 msgstr " hg id -r tip http://selenic.com/hg/"
9539
8534 msgid "can't query remote revision number, branch, or tags"
9540 msgid "can't query remote revision number, branch, or tags"
8535 msgstr "kan inte efterfråga revisionsnummer, gren, eller märken"
9541 msgstr "kan inte efterfråga revisionsnummer, gren, eller märken"
8536
9542
@@ -8609,7 +9615,7 b' msgstr ""'
8609
9615
8610 msgid ""
9616 msgid ""
8611 " With -s/--similarity, hg will attempt to discover renames and\n"
9617 " With -s/--similarity, hg will attempt to discover renames and\n"
8612 " copies in the patch in the same way as 'addremove'."
9618 " copies in the patch in the same way as :hg:`addremove`."
8613 msgstr ""
9619 msgstr ""
8614
9620
8615 msgid ""
9621 msgid ""
@@ -8618,6 +9624,38 b' msgid ""'
8618 " See :hg:`help dates` for a list of formats valid for -d/--date."
9624 " See :hg:`help dates` for a list of formats valid for -d/--date."
8619 msgstr ""
9625 msgstr ""
8620
9626
9627 msgid " - import a traditional patch from a website and detect renames::"
9628 msgstr ""
9629 " - importera en vanlig patch från en webbsida och upptäck namnbyten::"
9630
9631 msgid " hg import -s 80 http://example.com/bugfix.patch"
9632 msgstr " hg import -s 80 http://example.com/bugfix.patch"
9633
9634 msgid " - import a changeset from an hgweb server::"
9635 msgstr " - importera en ändring från en hgweb-server::"
9636
9637 msgid " hg import http://www.selenic.com/hg/rev/5ca8c111e9aa"
9638 msgstr " hg import http://www.selenic.com/hg/rev/5ca8c111e9aa"
9639
9640 msgid " - import all the patches in an Unix-style mbox::"
9641 msgstr " - importera alla patchar i en Unix-liknande mbox::"
9642
9643 msgid " hg import incoming-patches.mbox"
9644 msgstr " hg import incoming-patches.mbox"
9645
9646 msgid ""
9647 " - attempt to exactly restore an exported changeset (not always\n"
9648 " possible)::"
9649 msgstr ""
9650 " - försök att exakt återställa en exporterad ändring (inte alltid\n"
9651 " möjligt)::"
9652
9653 msgid " hg import --exact proposed-fix.patch"
9654 msgstr " hg import --exact proposed-fix.patch"
9655
9656 msgid "need at least one patch to import"
9657 msgstr "behöver minst en patch att importera"
9658
8621 msgid "cannot use --no-commit with --bypass"
9659 msgid "cannot use --no-commit with --bypass"
8622 msgstr "kan inte använda --no-commit med --bypass"
9660 msgstr "kan inte använda --no-commit med --bypass"
8623
9661
@@ -8627,21 +9665,23 b' msgstr "kan inte anv\xc3\xa4nda --similarity med --bypass"'
8627 msgid "patch is damaged or loses information"
9665 msgid "patch is damaged or loses information"
8628 msgstr "patchen är skadad eller tappar information"
9666 msgstr "patchen är skadad eller tappar information"
8629
9667
8630 msgid "to working directory"
9668 msgid "applied to working directory"
8631 msgstr "till arbetskatalog"
9669 msgstr "applicerad på arbetskatalog"
8632
9670
8633 msgid "not a Mercurial patch"
9671 msgid "not a Mercurial patch"
8634 msgstr "inte en Mercurial-patch"
9672 msgstr "inte en Mercurial-patch"
8635
9673
9674 #. i18n: refers to a short changeset id
9675 #, python-format
9676 msgid "created %s"
9677 msgstr "skapade %s"
9678
8636 msgid "applying patch from stdin\n"
9679 msgid "applying patch from stdin\n"
8637 msgstr ""
9680 msgstr ""
8638
9681
8639 #, python-format
9682 #, python-format
8640 msgid "applied %s\n"
9683 msgid "%s: no diffs found"
8641 msgstr "applicerade %s\n"
9684 msgstr "%s: inga diffar hittades"
8642
8643 msgid "no diffs found"
8644 msgstr ""
8645
9685
8646 msgid "run even if remote repository is unrelated"
9686 msgid "run even if remote repository is unrelated"
8647 msgstr "kör även om fjärrarkivet är obesläktat"
9687 msgstr "kör även om fjärrarkivet är obesläktat"
@@ -8771,8 +9811,8 b' msgstr ""'
8771 " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n"
9811 " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n"
8772 " innehåller blanktecken som multipla filnamn"
9812 " innehåller blanktecken som multipla filnamn"
8773
9813
8774 msgid "only follow the first parent of merge changesets"
9814 msgid "only follow the first parent of merge changesets (DEPRECATED)"
8775 msgstr "följ bara den första föräldern vid sammanfogningar"
9815 msgstr "följ bara den första föräldern vid sammanfogningar (FÖRLEGAD)"
8776
9816
8777 msgid "show revisions matching date spec"
9817 msgid "show revisions matching date spec"
8778 msgstr "visa revisioner som matchar datumspecen"
9818 msgstr "visa revisioner som matchar datumspecen"
@@ -8786,8 +9826,8 b' msgstr "g\xc3\xb6r versalok\xc3\xa4nslig s\xc3\xb6kning efter en given text"'
8786 msgid "include revisions where files were removed"
9826 msgid "include revisions where files were removed"
8787 msgstr "inkludera revisioner där filer togs bort"
9827 msgstr "inkludera revisioner där filer togs bort"
8788
9828
8789 msgid "show only merges"
9829 msgid "show only merges (DEPRECATED)"
8790 msgstr "visa bara sammanfogningar"
9830 msgstr "visa bara sammanfogningar (FÖRLEGAD)"
8791
9831
8792 msgid "revisions committed by user"
9832 msgid "revisions committed by user"
8793 msgstr "revisioner arkiverade av användare"
9833 msgstr "revisioner arkiverade av användare"
@@ -8801,8 +9841,8 b' msgstr "visa \xc3\xa4ndringar i den namngivna grenen"'
8801 msgid "do not display revision or any of its ancestors"
9841 msgid "do not display revision or any of its ancestors"
8802 msgstr "visa inte revision eller någon av dess föräldrar"
9842 msgstr "visa inte revision eller någon av dess föräldrar"
8803
9843
8804 msgid "show hidden changesets"
9844 msgid "show hidden changesets (DEPRECATED)"
8805 msgstr "visa dolda ändringar"
9845 msgstr "visa dolda ändringar (FÖRLEGAD)"
8806
9846
8807 msgid "[OPTION]... [FILE]"
9847 msgid "[OPTION]... [FILE]"
8808 msgstr "[FLAGGA]... [FIL]"
9848 msgstr "[FLAGGA]... [FIL]"
@@ -8818,28 +9858,24 b' msgstr ""'
8818 " projektet."
9858 " projektet."
8819
9859
8820 msgid ""
9860 msgid ""
9861 " If no revision range is specified, the default is ``tip:0`` unless\n"
9862 " --follow is set, in which case the working directory parent is\n"
9863 " used as the starting revision."
9864 msgstr ""
9865 " Om ingen revisionsserie specificeras, används ``tip:0`` som standard om\n"
9866 " inte --follow är satt, då arbetskatalogens förälder används som första\n"
9867 " revision."
9868
9869 msgid ""
8821 " File history is shown without following rename or copy history of\n"
9870 " File history is shown without following rename or copy history of\n"
8822 " files. Use -f/--follow with a filename to follow history across\n"
9871 " files. Use -f/--follow with a filename to follow history across\n"
8823 " renames and copies. --follow without a filename will only show\n"
9872 " renames and copies. --follow without a filename will only show\n"
8824 " ancestors or descendants of the starting revision. --follow-first\n"
9873 " ancestors or descendants of the starting revision."
8825 " only follows the first parent of merge revisions."
8826 msgstr ""
9874 msgstr ""
8827 " Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n"
9875 " Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n"
8828 " filer. Använd -f/--follow med ett filnamn för att följa historiken även\n"
9876 " filer. Använd -f/--follow med ett filnamn för att följa historiken även\n"
8829 " vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n"
9877 " vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n"
8830 " visa föräldrar eller ättlingar från startrevisionen. --follow-first\n"
9878 " visa föräldrar eller ättlingar från startrevisionen."
8831 " följer bara den första föräldern i revisoner med sammanfogningar."
8832
8833 msgid ""
8834 " If no revision range is specified, the default is ``tip:0`` unless\n"
8835 " --follow is set, in which case the working directory parent is\n"
8836 " used as the starting revision. You can specify a revision set for\n"
8837 " log, see :hg:`help revsets` for more information."
8838 msgstr ""
8839 " Om ingen revisionsserie specificeras, används ``tip:0`` som standard om\n"
8840 " inte --follow är satt, då arbetskatalogens förälder används som första\n"
8841 " revision. Du kan ange ett revisionsset för log, se :hg:`help revsets`\n"
8842 " för mer information."
8843
9879
8844 msgid ""
9880 msgid ""
8845 " By default this command prints revision number and changeset id,\n"
9881 " By default this command prints revision number and changeset id,\n"
@@ -8865,6 +9901,86 b' msgstr ""'
8865 " den första förälder. Dessutom kommer bara filer som skiljer sig från\n"
9901 " den första förälder. Dessutom kommer bara filer som skiljer sig från\n"
8866 " BÅDA föräldrarna att visas i filer:."
9902 " BÅDA föräldrarna att visas i filer:."
8867
9903
9904 msgid ""
9905 " .. note::\n"
9906 " for performance reasons, log FILE may omit duplicate changes\n"
9907 " made on branches and will not show deletions. To see all\n"
9908 " changes including duplicates and deletions, use the --removed\n"
9909 " switch."
9910 msgstr ""
9911 " .. note::\n"
9912 " av prestandaskäl så kan 'log FILE' hoppa över duplicerade ändringar\n"
9913 " gjorda på grenar och kommer inte att visa raderingar. För att se\n"
9914 " alla ändringar inklusive dupliceringar och raderingar, använd\n"
9915 " flaggan --removed."
9916
9917 msgid " - changesets with full descriptions and file lists::"
9918 msgstr " - ändringar med fulla beskrivningar och fillistor::"
9919
9920 msgid " hg log -v"
9921 msgstr " hg log -v"
9922
9923 msgid " - changesets ancestral to the working directory::"
9924 msgstr " - ändringar som är anfädrar arbetskatalogen::"
9925
9926 msgid " hg log -f"
9927 msgstr " hg log -f"
9928
9929 msgid " - last 10 commits on the current branch::"
9930 msgstr " - sista 10 arkiveringarna på aktuell gren::"
9931
9932 msgid " hg log -l 10 -b ."
9933 msgstr " hg log -l 10 -b ."
9934
9935 msgid ""
9936 " - changesets showing all modifications of a file, including removals::"
9937 msgstr ""
9938 " - alla ändringar och modifikationer för en fil, inklusive raderingar::"
9939
9940 msgid " hg log --removed file.c"
9941 msgstr " hg log --removed file.c"
9942
9943 msgid ""
9944 " - all changesets that touch a directory, with diffs, excluding merges::"
9945 msgstr ""
9946 " - alla ändringar som rör en katalog, med diffar, utan sammanfogningar::"
9947
9948 msgid " hg log -Mp lib/"
9949 msgstr " hg log -Mp lib/"
9950
9951 msgid " - all revision numbers that match a keyword::"
9952 msgstr " - alla revisionsnummer som matchar ett nyckelord::"
9953
9954 msgid " hg log -k bug --template \"{rev}\\n\""
9955 msgstr " hg log -k bug --template \"{rev}\\n\""
9956
9957 msgid " - check if a given changeset is included is a tagged release::"
9958 msgstr " - kontrollera om en ändring inkluderas i en märkt release::"
9959
9960 msgid " hg log -r \"a21ccf and ancestor(1.9)\""
9961 msgstr " hg log -r \"a21ccf and ancestor(1.9)\""
9962
9963 msgid " - find all changesets by some user in a date range::"
9964 msgstr " - hitta alla ändringar av en användare i ett datumintervall::"
9965
9966 msgid " hg log -k alice -d \"may 2008 to jul 2008\""
9967 msgstr " hg log -k alice -d \"may 2008 to jul 2008\""
9968
9969 msgid " - summary of all changesets after the last tag::"
9970 msgstr " - sammanfattning av alla ändringar efter det senaste märket::"
9971
9972 msgid ""
9973 " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\""
9974 msgstr ""
9975 " hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\""
9976
9977 msgid ""
9978 " See :hg:`help revisions` and :hg:`help revsets` for more about\n"
9979 " specifying revisions."
9980 msgstr ""
9981 " Se :hg:`help revisions` och :hg:`help revsets` för mer om hur man anger\n"
9982 " revisioner."
9983
8868 msgid "revision to display"
9984 msgid "revision to display"
8869 msgstr "revision att visa"
9985 msgstr "revision att visa"
8870
9986
@@ -8990,12 +10106,11 b' msgstr "grenen \'%s\' har ett huvud - samm'
8990 msgid "run 'hg heads' to see all heads"
10106 msgid "run 'hg heads' to see all heads"
8991 msgstr "kör 'hg heads' för att se alla huvuden"
10107 msgstr "kör 'hg heads' för att se alla huvuden"
8992
10108
8993 msgid "there is nothing to merge"
10109 msgid "nothing to merge"
8994 msgstr "det finns inget att sammanfoga"
10110 msgstr "inget att sammanfoga"
8995
10111
8996 #, python-format
10112 msgid "use 'hg update' instead"
8997 msgid "%s - use \"hg update\" instead"
10113 msgstr "använd 'hg update' istället"
8998 msgstr "%s - använd \"hg update\" istället"
8999
10114
9000 msgid "working directory not at a head revision"
10115 msgid "working directory not at a head revision"
9001 msgstr "arbetskatalogen är inte vid en huvudrevision"
10116 msgstr "arbetskatalogen är inte vid en huvudrevision"
@@ -9110,6 +10225,63 b' msgstr " Se :hg:`help urls` f\xc3\xb6r mer information."'
9110 msgid "not found!\n"
10225 msgid "not found!\n"
9111 msgstr "hittades inte!\n"
10226 msgstr "hittades inte!\n"
9112
10227
10228 msgid "set changeset phase to public"
10229 msgstr "sätt ändringsfas till public"
10230
10231 msgid "set changeset phase to draft"
10232 msgstr "sätt ändringsfas till draft"
10233
10234 msgid "set changeset phase to secret"
10235 msgstr "sätt ändringsfas till secret"
10236
10237 msgid "allow to move boundary backward"
10238 msgstr ""
10239
10240 msgid "target revision"
10241 msgstr "målrevision"
10242
10243 msgid "[-p|-d|-s] [-f] [-r] REV..."
10244 msgstr "[-p|-d|-s] [-f] [-r] REV..."
10245
10246 msgid "set or show the current phase name"
10247 msgstr "sätt eller visa det aktuella fasnamnet"
10248
10249 msgid " With no argument, show the phase name of specified revisions."
10250 msgstr ""
10251
10252 msgid ""
10253 " With one of -p/--public, -d/--draft or -s/--secret, change the\n"
10254 " phase value of the specified revisions."
10255 msgstr ""
10256
10257 msgid ""
10258 " Unless -f/--force is specified, :hg:`phase` won't move changeset from a\n"
10259 " lower phase to an higher phase. Phases are ordered as follows::"
10260 msgstr ""
10261
10262 msgid " public < draft < secret"
10263 msgstr ""
10264
10265 msgid ""
10266 " Return 0 on success, 1 if no phases were changed.\n"
10267 " "
10268 msgstr ""
10269 " Returnerar 0 om kommandot lyckades, 1 om inga faser ändrades.\n"
10270 " "
10271
10272 msgid "only one phase can be specified"
10273 msgstr "bara en fas kan vara angiven"
10274
10275 msgid "no revisions specified!"
10276 msgstr "inga revisioner angivna!"
10277
10278 #, python-format
10279 msgid "phase change for %i changesets\n"
10280 msgstr "fasändring för %i ändringar\n"
10281
10282 msgid "no phases changed\n"
10283 msgstr "inga faser ändrage\n"
10284
9113 #, python-format
10285 #, python-format
9114 msgid "not updating: %s\n"
10286 msgid "not updating: %s\n"
9115 msgstr "uppdaterar inte: %s\n"
10287 msgstr "uppdaterar inte: %s\n"
@@ -9328,61 +10500,66 b' msgstr "radera (och ta bort) filer \xc3\xa4ven om tillagda eller modifierade"'
9328 msgid "remove the specified files on the next commit"
10500 msgid "remove the specified files on the next commit"
9329 msgstr "ta bort de specificerade filerna vid nästa arkivering"
10501 msgstr "ta bort de specificerade filerna vid nästa arkivering"
9330
10502
9331 msgid " Schedule the indicated files for removal from the repository."
10503 msgid " Schedule the indicated files for removal from the current branch."
9332 msgstr " Markera de indikerade filerna för borttagning från arkivet."
10504 msgstr " Markera de indikerade filerna för borttagning från aktuell gren."
9333
9334 msgid ""
9335 " This only removes files from the current branch, not from the\n"
9336 " entire project history. -A/--after can be used to remove only\n"
9337 " files that have already been deleted, -f/--force can be used to\n"
9338 " force deletion, and -Af can be used to remove files from the next\n"
9339 " revision without deleting them from the working directory."
9340 msgstr ""
9341 " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n"
9342 " projektets historik. -A/--after kan användas för att bara ta bort filer\n"
9343 " som redan raderats, -f/--force kan användas för att tvinga radering,\n"
9344 " och -Af kan ta bort filer från nästa revision utan att radera dem från\n"
9345 " arbetskopian."
9346
9347 msgid ""
9348 " The following table details the behavior of remove for different\n"
9349 " file states (columns) and option combinations (rows). The file\n"
9350 " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n"
9351 " reported by :hg:`status`). The actions are Warn, Remove (from\n"
9352 " branch) and Delete (from disk)::"
9353 msgstr ""
9354 " Följande tabell visar hur remove uppför sig för olika filstatus\n"
9355 " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n"
9356 " Modifierad [M] och Saknad [!] (som rapporteras av :hg:`status`).\n"
9357 " Aktionerna är Varna, Radera (från gren) och Ta bort (från disk)::"
9358
9359 msgid ""
9360 " A C M !\n"
9361 " none W RD W R\n"
9362 " -f R RD RD R\n"
9363 " -A W W W R\n"
9364 " -Af R R R R"
9365 msgstr ""
9366 " A C M !\n"
9367 " ingen V RT V R\n"
9368 " -f R RT RT R\n"
9369 " -A V V V R\n"
9370 " -Af R R R R"
9371
9372 msgid ""
9373 " Note that remove never deletes files in Added [A] state from the\n"
9374 " working directory, not even if option --force is specified."
9375 msgstr ""
9376 " Notera att remove aldrig tar bort filer som är Adderade [A] från\n"
9377 " arbetskatalogen, inte ens om --force är angivet."
9378
10505
9379 msgid ""
10506 msgid ""
9380 " This command schedules the files to be removed at the next commit.\n"
10507 " This command schedules the files to be removed at the next commit.\n"
9381 " To undo a remove before that, see :hg:`revert`."
10508 " To undo a remove before that, see :hg:`revert`. To undo added\n"
10509 " files, see :hg:`forget`."
9382 msgstr ""
10510 msgstr ""
9383 " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n"
10511 " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n"
9384 " att ångra en remove innan dess, se :hg:`revert` .\n"
10512 " att ångra en remove innan dess, se :hg:`revert`. För att ångra tillagda\n"
9385 " "
10513 " filer, se :hg:`forget`."
10514
10515 msgid ""
10516 " -A/--after can be used to remove only files that have already\n"
10517 " been deleted, -f/--force can be used to force deletion, and -Af\n"
10518 " can be used to remove files from the next revision without\n"
10519 " deleting them from the working directory."
10520 msgstr ""
10521 " -A/--after kan användas för att bara ta bort filer som redan\n"
10522 " raderats, -f/--force kan användas för att tvinga radering, och -Af\n"
10523 " kan ta bort filer från nästa revision utan att radera dem från\n"
10524 " arbetskopian."
10525
10526 msgid ""
10527 " The following table details the behavior of remove for different\n"
10528 " file states (columns) and option combinations (rows). The file\n"
10529 " states are Added [A], Clean [C], Modified [M] and Missing [!]\n"
10530 " (as reported by :hg:`status`). The actions are Warn, Remove\n"
10531 " (from branch) and Delete (from disk):"
10532 msgstr ""
10533 " Följande tabell visar hur remove uppför sig för olika filstatus\n"
10534 " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n"
10535 " Modifierad [M] och Saknad [!] (som rapporteras av :hg:`status`).\n"
10536 " Aktionerna är Varna, Radera (från gren) och Ta bort (från disk):"
10537
10538 msgid ""
10539 " ======= == == == ==\n"
10540 " A C M !\n"
10541 " ======= == == == ==\n"
10542 " none W RD W R\n"
10543 " -f R RD RD R\n"
10544 " -A W W W R\n"
10545 " -Af R R R R\n"
10546 " ======= == == == =="
10547 msgstr ""
10548 " ======= == == == ==\n"
10549 " A C M !\n"
10550 " ======= == == == ==\n"
10551 " ingen V RT V R\n"
10552 " -f R RT RT R\n"
10553 " -A V V V R\n"
10554 " -Af R R R R\n"
10555 " ======= == == == =="
10556
10557 msgid ""
10558 " Note that remove never deletes files in Added [A] state from the\n"
10559 " working directory, not even if option --force is specified."
10560 msgstr ""
10561 " Notera att remove aldrig tar bort filer som är Adderade [A] från\n"
10562 " arbetskatalogen, inte ens om --force är angivet."
9386
10563
9387 msgid ""
10564 msgid ""
9388 " Returns 0 on success, 1 if any warnings encountered.\n"
10565 " Returns 0 on success, 1 if any warnings encountered.\n"
@@ -9404,9 +10581,8 b' msgid "not removing %s: file is modified'
9404 msgstr "raderar inte %s: filen är ändrad (använd -f för att tvinga)\n"
10581 msgstr "raderar inte %s: filen är ändrad (använd -f för att tvinga)\n"
9405
10582
9406 #, python-format
10583 #, python-format
9407 msgid ""
10584 msgid "not removing %s: file has been marked for add (use forget to undo)\n"
9408 "not removing %s: file has been marked for add (use -f to force removal)\n"
10585 msgstr "raderar inte %s: filen har lagts till (använd forget för att ångra)\n"
9409 msgstr "raderar inte %s: filen har lags till (använd -f för att tvinga)\n"
9410
10586
9411 msgid "record a rename that has already occurred"
10587 msgid "record a rename that has already occurred"
9412 msgstr "spara en namnändring som redan har inträffat"
10588 msgstr "spara en namnändring som redan har inträffat"
@@ -9469,9 +10645,10 b' msgid ""'
9469 "specified\n"
10645 "specified\n"
9470 " files, discarding any previous merge attempts. Re-merging is not\n"
10646 " files, discarding any previous merge attempts. Re-merging is not\n"
9471 " performed for files already marked as resolved. Use ``--all/-a``\n"
10647 " performed for files already marked as resolved. Use ``--all/-a``\n"
9472 " to selects all unresolved files. ``--tool`` can be used to specify\n"
10648 " to select all unresolved files. ``--tool`` can be used to specify\n"
9473 " the merge tool used for the given files. It overrides the HGMERGE\n"
10649 " the merge tool used for the given files. It overrides the HGMERGE\n"
9474 " environment variable and your configuration files."
10650 " environment variable and your configuration files. Previous file\n"
10651 " contents are saved with a ``.orig`` suffix."
9475 msgstr ""
10652 msgstr ""
9476
10653
9477 msgid ""
10654 msgid ""
@@ -9643,6 +10820,9 b' msgstr "filen hanteras inte: %s\\n"'
9643 msgid "no changes needed to %s\n"
10820 msgid "no changes needed to %s\n"
9644 msgstr "inga ändringar behövs för %s\n"
10821 msgstr "inga ändringar behövs för %s\n"
9645
10822
10823 msgid "ignore safety measures"
10824 msgstr "ignorera säkerhetsåtgärder"
10825
9646 msgid "roll back the last transaction (dangerous)"
10826 msgid "roll back the last transaction (dangerous)"
9647 msgstr "återgång från den senaste transaktionen (farligt)"
10827 msgstr "återgång från den senaste transaktionen (farligt)"
9648
10828
@@ -9684,6 +10864,15 b' msgstr ""'
9684 " - unbundle"
10864 " - unbundle"
9685
10865
9686 msgid ""
10866 msgid ""
10867 " To avoid permanent data loss, rollback will refuse to rollback a\n"
10868 " commit transaction if it isn't checked out. Use --force to\n"
10869 " override this protection."
10870 msgstr ""
10871 " För att undvika permanent dataförlust så vägrar rollback att köras på\n"
10872 " en arkivering om den inte är uthämtad. Använd --force för att gå förbi\n"
10873 " det här skyddet."
10874
10875 msgid ""
9687 " This command is not intended for use on public repositories. Once\n"
10876 " This command is not intended for use on public repositories. Once\n"
9688 " changes are visible for pull by other users, rolling a transaction\n"
10877 " changes are visible for pull by other users, rolling a transaction\n"
9689 " back locally is ineffective (someone else may already have pulled\n"
10878 " back locally is ineffective (someone else may already have pulled\n"
@@ -9949,6 +11138,28 b' msgstr ""'
9949 " I = ignorerad\n"
11138 " I = ignorerad\n"
9950 " = källa för den tidigare filen listad som A (adderad)"
11139 " = källa för den tidigare filen listad som A (adderad)"
9951
11140
11141 msgid ""
11142 " - show changes in the working directory relative to a\n"
11143 " changeset::"
11144 msgstr ""
11145 " - visa modifikationer i arbetskatalogen relativt till en ändring::"
11146
11147 msgid " hg status --rev 9353"
11148 msgstr " hg status --rev 9353"
11149
11150 msgid " - show all changes including copies in an existing changeset::"
11151 msgstr " - visa alla ändringar inklusive kopior i en ändring::"
11152
11153 msgid " hg status --copies --change 9353"
11154 msgstr " hg status --copies --change 9353"
11155
11156 msgid " - get a NUL separated list of added files, suitable for xargs::"
11157 msgstr ""
11158 " - visa en NUL-separerad lista med tillagda filer, lämpligt för xargs::"
11159
11160 msgid " hg status -an0"
11161 msgstr " hg status -an0"
11162
9952 msgid "check for push and pull"
11163 msgid "check for push and pull"
9953 msgstr "sök efter inkommande och utgående ändringar"
11164 msgstr "sök efter inkommande och utgående ändringar"
9954
11165
@@ -9983,6 +11194,9 b' msgstr " (ingen revision uth\xc3\xa4mtad)"'
9983 msgid "branch: %s\n"
11194 msgid "branch: %s\n"
9984 msgstr "gren: %s\n"
11195 msgstr "gren: %s\n"
9985
11196
11197 msgid "bookmarks:"
11198 msgstr "bokmärken:"
11199
9986 #, python-format
11200 #, python-format
9987 msgid "%d modified"
11201 msgid "%d modified"
9988 msgstr "%d modifierad"
11202 msgstr "%d modifierad"
@@ -10253,11 +11467,11 b' msgstr "uppdatera arbetskatalogen (eller v\xc3\xa4xla mellan revisioner)"'
10253 msgid ""
11467 msgid ""
10254 " Update the repository's working directory to the specified\n"
11468 " Update the repository's working directory to the specified\n"
10255 " changeset. If no changeset is specified, update to the tip of the\n"
11469 " changeset. If no changeset is specified, update to the tip of the\n"
10256 " current named branch."
11470 " current named branch and move the current bookmark."
10257 msgstr ""
11471 msgstr ""
10258 " Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n"
11472 " Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n"
10259 " ändring anes, så uppdateras till toppen på den nuvarande namngivna\n"
11473 " ändring anges, så uppdateras till toppen på den nuvarande namngivna\n"
10260 " grenen."
11474 " grenen och nuvarande bokmärket flyttas."
10261
11475
10262 msgid ""
11476 msgid ""
10263 " If the changeset is not a descendant of the working directory's\n"
11477 " If the changeset is not a descendant of the working directory's\n"
@@ -10328,9 +11542,6 b' msgstr ""'
10328 msgid "cannot specify both -c/--check and -C/--clean"
11542 msgid "cannot specify both -c/--check and -C/--clean"
10329 msgstr "kan inte både ange -c/--check och -C/--clean"
11543 msgstr "kan inte både ange -c/--check och -C/--clean"
10330
11544
10331 msgid "uncommitted local changes"
10332 msgstr "oarkiverade lokala ändringar"
10333
10334 msgid "verify the integrity of the repository"
11545 msgid "verify the integrity of the repository"
10335 msgstr "verifiera arkivets integritet"
11546 msgstr "verifiera arkivets integritet"
10336
11547
@@ -10358,11 +11569,11 b' msgid "(see http://mercurial.selenic.com'
10358 msgstr "(se http://mercurial.selenic.com för mer information)"
11569 msgstr "(se http://mercurial.selenic.com för mer information)"
10359
11570
10360 msgid ""
11571 msgid ""
10361 "Copyright (C) 2005-2011 Matt Mackall and others\n"
11572 "Copyright (C) 2005-2012 Matt Mackall and others\n"
10362 "This is free software; see the source for copying conditions. There is NO\n"
11573 "This is free software; see the source for copying conditions. There is NO\n"
10363 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
11574 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
10364 msgstr ""
11575 msgstr ""
10365 "Copyright (C) 2005-2011 Matt Mackall och andra\n"
11576 "Copyright (C) 2005-2012 Matt Mackall och andra\n"
10366 "Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n"
11577 "Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n"
10367 "garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n"
11578 "garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n"
10368
11579
@@ -10485,7 +11696,7 b' msgstr "anv\xc3\xa4nd \'hg push --new-branch\' f\xc3\xb6r att skapa nya fj\xc3\xa4rrgrenar"'
10485
11696
10486 #, python-format
11697 #, python-format
10487 msgid "push creates new remote head %s on branch '%s'!"
11698 msgid "push creates new remote head %s on branch '%s'!"
10488 msgstr "push skapar nyt fjärrhuvud %s på grenen '%s'!"
11699 msgstr "push skapar nytt fjärrhuvud %s på grenen '%s'!"
10489
11700
10490 #, python-format
11701 #, python-format
10491 msgid "push creates new remote head %s!"
11702 msgid "push creates new remote head %s!"
@@ -10497,6 +11708,14 b' msgstr "du kan dra och sammanfoga eller anv\xc3\xa4nda push -f f\xc3\xb6r att tvinga"'
10497 msgid "did you forget to merge? use push -f to force"
11708 msgid "did you forget to merge? use push -f to force"
10498 msgstr "glömde du att sammanfoga? använd push -f för att tvinga"
11709 msgstr "glömde du att sammanfoga? använd push -f för att tvinga"
10499
11710
11711 #, python-format
11712 msgid "new remote heads on branch '%s'\n"
11713 msgstr "nya fjärrhuvuden på grenen '%s'!\n"
11714
11715 #, python-format
11716 msgid "new remote head %s\n"
11717 msgstr "nytt fjärrhuvud %s\n"
11718
10500 msgid "note: unsynced remote changes!\n"
11719 msgid "note: unsynced remote changes!\n"
10501 msgstr "notera: osynkade fjärrändringar!\n"
11720 msgstr "notera: osynkade fjärrändringar!\n"
10502
11721
@@ -10535,7 +11754,7 b' msgstr ""'
10535
11754
10536 #, python-format
11755 #, python-format
10537 msgid "abort: %s: %s\n"
11756 msgid "abort: %s: %s\n"
10538 msgstr ""
11757 msgstr "avbryter: %s: %s\n"
10539
11758
10540 #, python-format
11759 #, python-format
10541 msgid "abort: could not lock %s: %s\n"
11760 msgid "abort: could not lock %s: %s\n"
@@ -10549,23 +11768,26 b' msgstr ""'
10549 msgid "hg: %s\n"
11768 msgid "hg: %s\n"
10550 msgstr ""
11769 msgstr ""
10551
11770
11771 msgid "abort: remote error:\n"
11772 msgstr "avbryter: fjärrfel:\n"
11773
10552 #, python-format
11774 #, python-format
10553 msgid "abort: %s!\n"
11775 msgid "abort: %s!\n"
10554 msgstr ""
11776 msgstr "avbryter: %s!\n"
10555
11777
10556 #, python-format
11778 #, python-format
10557 msgid "abort: %s"
11779 msgid "abort: %s"
10558 msgstr ""
11780 msgstr "avbryter: %s"
10559
11781
10560 msgid " empty string\n"
11782 msgid " empty string\n"
10561 msgstr ""
11783 msgstr " tom sträng\n"
10562
11784
10563 msgid "killed!\n"
11785 msgid "killed!\n"
10564 msgstr ""
11786 msgstr "dödad!\n"
10565
11787
10566 #, python-format
11788 #, python-format
10567 msgid "hg: unknown command '%s'\n"
11789 msgid "hg: unknown command '%s'\n"
10568 msgstr ""
11790 msgstr "hg: okänt kommando '%s'\n"
10569
11791
10570 msgid "(did you forget to compile extensions?)\n"
11792 msgid "(did you forget to compile extensions?)\n"
10571 msgstr ""
11793 msgstr ""
@@ -10581,7 +11803,7 b' msgid "broken pipe\\n"'
10581 msgstr ""
11803 msgstr ""
10582
11804
10583 msgid "interrupted!\n"
11805 msgid "interrupted!\n"
10584 msgstr ""
11806 msgstr "avbruten!\n"
10585
11807
10586 msgid ""
11808 msgid ""
10587 "\n"
11809 "\n"
@@ -10646,7 +11868,7 b' msgid "option --cwd may not be abbreviat'
10646 msgstr ""
11868 msgstr ""
10647
11869
10648 msgid ""
11870 msgid ""
10649 "Option -R has to be separated from other options (e.g. not -qR) and --"
11871 "option -R has to be separated from other options (e.g. not -qR) and --"
10650 "repository may only be abbreviated as --repo!"
11872 "repository may only be abbreviated as --repo!"
10651 msgstr ""
11873 msgstr ""
10652
11874
@@ -10708,20 +11930,6 b' msgid ""'
10708 "keep (l)ocal or take (o)ther?"
11930 "keep (l)ocal or take (o)ther?"
10709 msgstr ""
11931 msgstr ""
10710
11932
10711 msgid "&Local"
10712 msgstr ""
10713
10714 msgid "&Other"
10715 msgstr ""
10716
10717 #, python-format
10718 msgid "merging %s and %s to %s\n"
10719 msgstr ""
10720
10721 #, python-format
10722 msgid "merging %s\n"
10723 msgstr ""
10724
10725 #, python-format
11933 #, python-format
10726 msgid "%s.premerge not valid ('%s' is neither boolean nor %s)"
11934 msgid "%s.premerge not valid ('%s' is neither boolean nor %s)"
10727 msgstr ""
11935 msgstr ""
@@ -10737,6 +11945,10 b' msgid ""'
10737 msgstr ""
11945 msgstr ""
10738
11946
10739 #, python-format
11947 #, python-format
11948 msgid "merging %s incomplete! (edit conflicts, then use 'hg resolve --mark')\n"
11949 msgstr ""
11950
11951 #, python-format
10740 msgid "merging %s failed!\n"
11952 msgid "merging %s failed!\n"
10741 msgstr ""
11953 msgstr ""
10742
11954
@@ -10940,6 +12152,33 b' msgstr ""'
10940 msgid "unknown bisect kind %s"
12152 msgid "unknown bisect kind %s"
10941 msgstr ""
12153 msgstr ""
10942
12154
12155 msgid "invalid bisect state"
12156 msgstr "ogiltigt bisect-tillständ"
12157
12158 #. i18n: bisect changeset status
12159 msgid "good"
12160 msgstr "bra"
12161
12162 #. i18n: bisect changeset status
12163 msgid "bad"
12164 msgstr "dålig"
12165
12166 #. i18n: bisect changeset status
12167 msgid "skipped"
12168 msgstr "hoppade över"
12169
12170 #. i18n: bisect changeset status
12171 msgid "untested"
12172 msgstr "otestad"
12173
12174 #. i18n: bisect changeset status
12175 msgid "good (implicit)"
12176 msgstr "bra (implicit)"
12177
12178 #. i18n: bisect changeset status
12179 msgid "bad (implicit)"
12180 msgstr "dålig (implicit)"
12181
10943 msgid "disabled extensions:"
12182 msgid "disabled extensions:"
10944 msgstr "deaktiverade utökningar:"
12183 msgstr "deaktiverade utökningar:"
10945
12184
@@ -11332,6 +12571,46 b' msgid ""'
11332 msgstr ""
12571 msgstr ""
11333
12572
11334 msgid ""
12573 msgid ""
12574 ".. note:: Some global configuration options such as ``-R`` are\n"
12575 " processed before shell aliases and will thus not be passed to\n"
12576 " aliases."
12577 msgstr ""
12578
12579 msgid ""
12580 "\n"
12581 "``annotate``\n"
12582 "\"\"\"\"\"\"\"\"\"\"\"\""
12583 msgstr ""
12584
12585 msgid ""
12586 "Settings used when displaying file annotations. All values are\n"
12587 "Booleans and default to False. See ``diff`` section for related\n"
12588 "options for the diff command."
12589 msgstr ""
12590
12591 msgid ""
12592 "``ignorews``\n"
12593 " Ignore white space when comparing lines."
12594 msgstr ""
12595 "``ignorews``\n"
12596 " Ignorera blanktecken när rader jämförs."
12597
12598 msgid ""
12599 "``ignorewsamount``\n"
12600 " Ignore changes in the amount of white space."
12601 msgstr ""
12602 "``ignorewsamount``\n"
12603 " Ignorera ändringar av antalet blanktecken."
12604
12605 msgid ""
12606 "``ignoreblanklines``\n"
12607 " Ignore changes whose lines are all blank."
12608 msgstr ""
12609 "``ignoreblanklines``\n"
12610 " Ignorera ändringar vars rader är tomma."
12611
12612 msgid ""
12613 "\n"
11335 "``auth``\n"
12614 "``auth``\n"
11336 "\"\"\"\"\"\"\"\""
12615 "\"\"\"\"\"\"\"\""
11337 msgstr ""
12616 msgstr ""
@@ -11386,7 +12665,9 b' msgid ""'
11386 " Optional. Username to authenticate with. If not given, and the\n"
12665 " Optional. Username to authenticate with. If not given, and the\n"
11387 " remote site requires basic or digest authentication, the user will\n"
12666 " remote site requires basic or digest authentication, the user will\n"
11388 " be prompted for it. Environment variables are expanded in the\n"
12667 " be prompted for it. Environment variables are expanded in the\n"
11389 " username letting you do ``foo.username = $USER``."
12668 " username letting you do ``foo.username = $USER``. If the URI\n"
12669 " includes a username, only ``[auth]`` entries with a matching\n"
12670 " username or without a username will be considered."
11390 msgstr ""
12671 msgstr ""
11391
12672
11392 msgid ""
12673 msgid ""
@@ -11528,8 +12809,9 b' msgid ""'
11528 msgstr ""
12809 msgstr ""
11529
12810
11530 msgid ""
12811 msgid ""
11531 "Settings used when displaying diffs. Everything except for ``unified`` is a\n"
12812 "Settings used when displaying diffs. Everything except for ``unified``\n"
11532 "Boolean and defaults to False."
12813 "is a Boolean and defaults to False. See ``annotate`` section for\n"
12814 "related options for the annotate command."
11533 msgstr ""
12815 msgstr ""
11534
12816
11535 msgid ""
12817 msgid ""
@@ -11552,27 +12834,6 b' msgstr ""'
11552 " Visa vilken funktion varje ändring är i."
12834 " Visa vilken funktion varje ändring är i."
11553
12835
11554 msgid ""
12836 msgid ""
11555 "``ignorews``\n"
11556 " Ignore white space when comparing lines."
11557 msgstr ""
11558 "``ignorews``\n"
11559 " Ignorera blanktecken när rader jämförs."
11560
11561 msgid ""
11562 "``ignorewsamount``\n"
11563 " Ignore changes in the amount of white space."
11564 msgstr ""
11565 "``ignorewsamount``\n"
11566 " Ignorera ändringar av antalet blanktecken."
11567
11568 msgid ""
11569 "``ignoreblanklines``\n"
11570 " Ignore changes whose lines are all blank."
11571 msgstr ""
11572 "``ignoreblanklines``\n"
11573 " Ignorera ändringar vars rader är tomma."
11574
11575 msgid ""
11576 "``unified``\n"
12837 "``unified``\n"
11577 " Number of lines of context to show."
12838 " Number of lines of context to show."
11578 msgstr ""
12839 msgstr ""
@@ -11928,7 +13189,10 b' msgid ""'
11928 "various actions such as starting or finishing a commit. Multiple\n"
13189 "various actions such as starting or finishing a commit. Multiple\n"
11929 "hooks can be run for the same action by appending a suffix to the\n"
13190 "hooks can be run for the same action by appending a suffix to the\n"
11930 "action. Overriding a site-wide hook can be done by changing its\n"
13191 "action. Overriding a site-wide hook can be done by changing its\n"
11931 "value or setting it to an empty string."
13192 "value or setting it to an empty string. Hooks can be prioritized\n"
13193 "by adding a prefix of ``priority`` to the hook name on a new line\n"
13194 "and setting the priority. The default priority is 0 if\n"
13195 "not specified."
11932 msgstr ""
13196 msgstr ""
11933
13197
11934 msgid "Example ``.hg/hgrc``::"
13198 msgid "Example ``.hg/hgrc``::"
@@ -11941,7 +13205,9 b' msgid ""'
11941 " # do not use the site-wide hook\n"
13205 " # do not use the site-wide hook\n"
11942 " incoming =\n"
13206 " incoming =\n"
11943 " incoming.email = /my/email/hook\n"
13207 " incoming.email = /my/email/hook\n"
11944 " incoming.autobuild = /my/build/hook"
13208 " incoming.autobuild = /my/build/hook\n"
13209 " # force autobuild hook to run before other incoming hooks\n"
13210 " priority.incoming.autobuild = 1"
11945 msgstr ""
13211 msgstr ""
11946
13212
11947 msgid ""
13213 msgid ""
@@ -12450,7 +13716,7 b' msgid ""'
12450 " Whether to commit modified subrepositories when committing the\n"
13716 " Whether to commit modified subrepositories when committing the\n"
12451 " parent repository. If False and one subrepository has uncommitted\n"
13717 " parent repository. If False and one subrepository has uncommitted\n"
12452 " changes, abort the commit.\n"
13718 " changes, abort the commit.\n"
12453 " Default is True."
13719 " Default is False."
12454 msgstr ""
13720 msgstr ""
12455
13721
12456 msgid ""
13722 msgid ""
@@ -12669,6 +13935,15 b' msgid ""'
12669 msgstr ""
13935 msgstr ""
12670
13936
12671 msgid ""
13937 msgid ""
13938 "``guessmime``\n"
13939 " Control MIME types for raw download of file content.\n"
13940 " Set to True to let hgweb guess the content type from the file\n"
13941 " extension. This will serve HTML files as ``text/html`` and might\n"
13942 " allow cross-site scripting attacks when serving untrusted\n"
13943 " repositories. Default is False."
13944 msgstr ""
13945
13946 msgid ""
12672 "``allow_read``\n"
13947 "``allow_read``\n"
12673 " If the user has not already been denied repository access due to\n"
13948 " If the user has not already been denied repository access due to\n"
12674 " the contents of deny_read, this list determines whether to grant\n"
13949 " the contents of deny_read, this list determines whether to grant\n"
@@ -12807,6 +14082,14 b' msgid ""'
12807 msgstr ""
14082 msgstr ""
12808
14083
12809 msgid ""
14084 msgid ""
14085 "``logoimg``\n"
14086 " File name of the logo image that some templates display on each page.\n"
14087 " The file name is relative to ``staticurl``. That is, the full path to\n"
14088 " the logo image is \"staticurl/logoimg\".\n"
14089 " If unset, ``hglogo.png`` will be used."
14090 msgstr ""
14091
14092 msgid ""
12810 "``logourl``\n"
14093 "``logourl``\n"
12811 " Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n"
14094 " Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n"
12812 " will be used."
14095 " will be used."
@@ -13292,7 +14575,7 b' msgstr ""'
13292 msgid "- Find C files in a non-standard encoding::"
14575 msgid "- Find C files in a non-standard encoding::"
13293 msgstr ""
14576 msgstr ""
13294
14577
13295 msgid " hg locate \"set:**.c and not encoding(ascii)\""
14578 msgid " hg locate \"set:**.c and not encoding('UTF-8')\""
13296 msgstr ""
14579 msgstr ""
13297
14580
13298 msgid "- Revert copies of large binary files::"
14581 msgid "- Revert copies of large binary files::"
@@ -14631,8 +15914,12 b' msgstr ""'
14631 msgid ""
15914 msgid ""
14632 "Subrepositories let you nest external repositories or projects into a\n"
15915 "Subrepositories let you nest external repositories or projects into a\n"
14633 "parent Mercurial repository, and make commands operate on them as a\n"
15916 "parent Mercurial repository, and make commands operate on them as a\n"
14634 "group. External Mercurial and Subversion projects are currently\n"
15917 "group."
14635 "supported."
15918 msgstr ""
15919
15920 msgid ""
15921 "Mercurial currently supports Mercurial, Git, and Subversion\n"
15922 "subrepositories."
14636 msgstr ""
15923 msgstr ""
14637
15924
14638 msgid "Subrepositories are made of three components:"
15925 msgid "Subrepositories are made of three components:"
@@ -14640,8 +15927,7 b' msgstr ""'
14640
15927
14641 msgid ""
15928 msgid ""
14642 "1. Nested repository checkouts. They can appear anywhere in the\n"
15929 "1. Nested repository checkouts. They can appear anywhere in the\n"
14643 " parent working directory, and are Mercurial clones or Subversion\n"
15930 " parent working directory."
14644 " checkouts."
14645 msgstr ""
15931 msgstr ""
14646
15932
14647 msgid ""
15933 msgid ""
@@ -14653,14 +15939,19 b' msgstr ""'
14653 msgid " path/to/nested = https://example.com/nested/repo/path"
15939 msgid " path/to/nested = https://example.com/nested/repo/path"
14654 msgstr ""
15940 msgstr ""
14655
15941
15942 msgid " Git and Subversion subrepos are also supported:"
15943 msgstr ""
15944
15945 msgid ""
15946 " path/to/nested = [git]git://example.com/nested/repo/path\n"
15947 " path/to/nested = [svn]https://example.com/nested/trunk/path"
15948 msgstr ""
15949
14656 msgid ""
15950 msgid ""
14657 " where ``path/to/nested`` is the checkout location relatively to the\n"
15951 " where ``path/to/nested`` is the checkout location relatively to the\n"
14658 " parent Mercurial root, and ``https://example.com/nested/repo/path``\n"
15952 " parent Mercurial root, and ``https://example.com/nested/repo/path``\n"
14659 " is the source repository path. The source can also reference a\n"
15953 " is the source repository path. The source can also reference a\n"
14660 " filesystem path. Subversion repositories are defined with:"
15954 " filesystem path."
14661 msgstr ""
14662
14663 msgid " path/to/nested = [svn]https://example.com/nested/trunk/path"
14664 msgstr ""
15955 msgstr ""
14665
15956
14666 msgid ""
15957 msgid ""
@@ -14733,7 +16024,9 b' msgstr ""'
14733
16024
14734 msgid ""
16025 msgid ""
14735 ":add: add does not recurse in subrepos unless -S/--subrepos is\n"
16026 ":add: add does not recurse in subrepos unless -S/--subrepos is\n"
14736 " specified. Subversion subrepositories are currently silently\n"
16027 " specified. However, if you specify the full path of a file in a\n"
16028 " subrepo, it will be added even without -S/--subrepos specified.\n"
16029 " Git and Subversion subrepositories are currently silently\n"
14737 " ignored."
16030 " ignored."
14738 msgstr ""
16031 msgstr ""
14739
16032
@@ -14744,31 +16037,37 b' msgstr ""'
14744
16037
14745 msgid ""
16038 msgid ""
14746 ":commit: commit creates a consistent snapshot of the state of the\n"
16039 ":commit: commit creates a consistent snapshot of the state of the\n"
14747 " entire project and its subrepositories. It does this by first\n"
16040 " entire project and its subrepositories. If any subrepositories\n"
14748 " attempting to commit all modified subrepositories, then recording\n"
16041 " have been modified, Mercurial will abort. Mercurial can be made\n"
14749 " their state and finally committing it in the parent\n"
16042 " to instead commit all modified subrepositories by specifying\n"
14750 " repository. Mercurial can be made to abort if any subrepository\n"
16043 " -S/--subrepos, or setting \"ui.commitsubrepos=True\" in a\n"
14751 " content is modified by setting \"ui.commitsubrepos=no\" in a\n"
16044 " configuration file (see :hg:`help config`). After there are no\n"
14752 " configuration file (see :hg:`help config`)."
16045 " longer any modified subrepositories, it records their state and\n"
16046 " finally commits it in the parent repository."
14753 msgstr ""
16047 msgstr ""
14754
16048
14755 msgid ""
16049 msgid ""
14756 ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
16050 ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n"
14757 " specified. Changes are displayed as usual, on the subrepositories\n"
16051 " specified. Changes are displayed as usual, on the subrepositories\n"
14758 " elements. Subversion subrepositories are currently silently\n"
16052 " elements. Git and Subversion subrepositories are currently\n"
14759 " ignored."
16053 " silently ignored."
16054 msgstr ""
16055
16056 msgid ""
16057 ":forget: forget currently only handles exact file matches in subrepos.\n"
16058 " Git and Subversion subrepositories are currently silently ignored."
14760 msgstr ""
16059 msgstr ""
14761
16060
14762 msgid ""
16061 msgid ""
14763 ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
16062 ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n"
14764 " is specified. Subversion subrepositories are currently silently\n"
16063 " is specified. Git and Subversion subrepositories are currently\n"
14765 " ignored."
16064 " silently ignored."
14766 msgstr ""
16065 msgstr ""
14767
16066
14768 msgid ""
16067 msgid ""
14769 ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
16068 ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n"
14770 " is specified. Subversion subrepositories are currently silently\n"
16069 " is specified. Git and Subversion subrepositories are currently\n"
14771 " ignored."
16070 " silently ignored."
14772 msgstr ""
16071 msgstr ""
14773
16072
14774 msgid ""
16073 msgid ""
@@ -14783,7 +16082,7 b' msgid ""'
14783 ":push: Mercurial will automatically push all subrepositories first\n"
16082 ":push: Mercurial will automatically push all subrepositories first\n"
14784 " when the parent repository is being pushed. This ensures new\n"
16083 " when the parent repository is being pushed. This ensures new\n"
14785 " subrepository changes are available when referenced by top-level\n"
16084 " subrepository changes are available when referenced by top-level\n"
14786 " repositories."
16085 " repositories. Push is a no-op for Subversion subrepositories."
14787 msgstr ""
16086 msgstr ""
14788
16087
14789 msgid ""
16088 msgid ""
@@ -15166,9 +16465,6 b' msgstr ""'
15166 msgid "'%s' uses newer protocol %s"
16465 msgid "'%s' uses newer protocol %s"
15167 msgstr ""
16466 msgstr ""
15168
16467
15169 msgid "unexpected response:"
15170 msgstr "oväntat svar:"
15171
15172 #, python-format
16468 #, python-format
15173 msgid "push failed: %s"
16469 msgid "push failed: %s"
15174 msgstr "tryckning misslyckades: %s"
16470 msgstr "tryckning misslyckades: %s"
@@ -15231,6 +16527,9 b' msgstr ""'
15231 msgid "no interrupted transaction available\n"
16527 msgid "no interrupted transaction available\n"
15232 msgstr ""
16528 msgstr ""
15233
16529
16530 msgid "no rollback information available\n"
16531 msgstr ""
16532
15234 #, python-format
16533 #, python-format
15235 msgid "repository tip rolled back to revision %s (undo %s: %s)\n"
16534 msgid "repository tip rolled back to revision %s (undo %s: %s)\n"
15236 msgstr "arkivtopp tillbakadragen till revision %s (ångra %s: %s)\n"
16535 msgstr "arkivtopp tillbakadragen till revision %s (ångra %s: %s)\n"
@@ -15242,8 +16541,14 b' msgstr "arkivtopp tillbakadragen till revision %s (\xc3\xa5ngra %s)\\n"'
15242 msgid "rolling back unknown transaction\n"
16541 msgid "rolling back unknown transaction\n"
15243 msgstr "återkallar okänd transaktion\n"
16542 msgstr "återkallar okänd transaktion\n"
15244
16543
15245 #, python-format
16544 msgid "rollback of last commit while not checked out may lose data"
15246 msgid "named branch could not be reset, current branch is still: %s\n"
16545 msgstr ""
16546
16547 msgid "use -f to force"
16548 msgstr ""
16549
16550 #, python-format
16551 msgid "named branch could not be reset: current branch is still '%s'\n"
15247 msgstr ""
16552 msgstr ""
15248
16553
15249 #, python-format
16554 #, python-format
@@ -15254,9 +16559,6 b' msgstr "arbetskatalogen \xc3\xa4r nu baserad p\xc3\xa5 revisionerna %d och %d\\n"'
15254 msgid "working directory now based on revision %d\n"
16559 msgid "working directory now based on revision %d\n"
15255 msgstr "arbetskatalogen är nu baserad på revision %d\n"
16560 msgstr "arbetskatalogen är nu baserad på revision %d\n"
15256
16561
15257 msgid "no rollback information available\n"
15258 msgstr ""
15259
15260 #, python-format
16562 #, python-format
15261 msgid "waiting for lock on %s held by %r\n"
16563 msgid "waiting for lock on %s held by %r\n"
15262 msgstr ""
16564 msgstr ""
@@ -15280,9 +16582,8 b' msgstr ""'
15280 msgid "can't commit subrepos without .hgsub"
16582 msgid "can't commit subrepos without .hgsub"
15281 msgstr "kan inte arkivera underarkiv utan .hgsub"
16583 msgstr "kan inte arkivera underarkiv utan .hgsub"
15282
16584
15283 #, python-format
16585 msgid "use --subrepos for recursive commit"
15284 msgid "uncommitted changes in subrepo %s"
16586 msgstr ""
15285 msgstr "oarkiverade ändringar i underarkivet %s"
15286
16587
15287 msgid "file not found!"
16588 msgid "file not found!"
15288 msgstr "filen hittades inte!"
16589 msgstr "filen hittades inte!"
@@ -15319,6 +16620,10 b' msgstr ""'
15319 "changegroupsubset."
16620 "changegroupsubset."
15320
16621
15321 #, python-format
16622 #, python-format
16623 msgid "updating %s to public failed!\n"
16624 msgstr "uppdatera %s till publik misslyckades!\n"
16625
16626 #, python-format
15322 msgid "%d changesets found\n"
16627 msgid "%d changesets found\n"
15323 msgstr "%d ändringar hittades\n"
16628 msgstr "%d ändringar hittades\n"
15324
16629
@@ -15452,9 +16757,11 b' msgid "diff context lines count must be '
15452 msgstr ""
16757 msgstr ""
15453
16758
15454 #, python-format
16759 #, python-format
15455 msgid ""
16760 msgid "%s: untracked file differs\n"
15456 "untracked file in working directory differs from file in requested revision: "
16761 msgstr ""
15457 "'%s'"
16762
16763 msgid ""
16764 "untracked files in working directory differ from files in requested revision"
15458 msgstr ""
16765 msgstr ""
15459
16766
15460 #, python-format
16767 #, python-format
@@ -15522,11 +16829,11 b' msgstr "notera: m\xc3\xb6jlig konflikt - %s d\xc3\xb6ptes om flera g\xc3\xa5nger till:\\n"'
15522 msgid "merging with a working directory ancestor has no effect"
16829 msgid "merging with a working directory ancestor has no effect"
15523 msgstr ""
16830 msgstr ""
15524
16831
15525 msgid "nothing to merge (use 'hg update' or check 'hg heads')"
16832 msgid "use 'hg update' or check 'hg heads'"
15526 msgstr ""
16833 msgstr "använd 'hg update' eller kontrollera 'hg heads'"
15527
16834
15528 msgid "outstanding uncommitted changes (use 'hg status' to list changes)"
16835 msgid "use 'hg status' to list changes"
15529 msgstr ""
16836 msgstr "använd 'hg status' för att visa modifikationer"
15530
16837
15531 #, python-format
16838 #, python-format
15532 msgid "outstanding uncommitted changes in subrepository '%s'"
16839 msgid "outstanding uncommitted changes in subrepository '%s'"
@@ -15551,7 +16858,7 b' msgid "Error:"'
15551 msgstr "Fel:"
16858 msgstr "Fel:"
15552
16859
15553 msgid "Hint:"
16860 msgid "Hint:"
15554 msgstr ""
16861 msgstr "Tips:"
15555
16862
15556 msgid "Important:"
16863 msgid "Important:"
15557 msgstr "Viktigt:"
16864 msgstr "Viktigt:"
@@ -15659,6 +16966,18 b' msgid "patch failed to apply"'
15659 msgstr ""
16966 msgstr ""
15660
16967
15661 #, python-format
16968 #, python-format
16969 msgid "Removing unknown node %(n)s from %(p)i-phase boundary"
16970 msgstr ""
16971
16972 #, python-format
16973 msgid "ignoring inconsistense public root from remote: %s"
16974 msgstr ""
16975
16976 #, python-format
16977 msgid "ignoring unexpected root from remote: %i %s"
16978 msgstr ""
16979
16980 #, python-format
15662 msgid "exited with status %d"
16981 msgid "exited with status %d"
15663 msgstr ""
16982 msgstr ""
15664
16983
@@ -15775,16 +17094,22 b' msgid "author requires a string"'
15775 msgstr "author kräver en sträng"
17094 msgstr "author kräver en sträng"
15776
17095
15777 msgid ""
17096 msgid ""
15778 "``bisected(string)``\n"
17097 "``bisect(string)``\n"
15779 " Changesets marked in the specified bisect state (good, bad, skip)."
17098 " Changesets marked in the specified bisect status:"
17099 msgstr ""
17100
17101 msgid ""
17102 " - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip\n"
17103 " - ``goods``, ``bads`` : csets topologicaly good/bad\n"
17104 " - ``range`` : csets taking part in the bisection\n"
17105 " - ``pruned`` : csets that are goods, bads or skipped\n"
17106 " - ``untested`` : csets whose fate is yet unknown\n"
17107 " - ``ignored`` : csets ignored due to DAG topology"
15780 msgstr ""
17108 msgstr ""
15781
17109
15782 msgid "bisect requires a string"
17110 msgid "bisect requires a string"
15783 msgstr "bisect kräver en sträng"
17111 msgstr "bisect kräver en sträng"
15784
17112
15785 msgid "invalid bisect state"
15786 msgstr "ogiltigt bisect-tillständ"
15787
15788 msgid ""
17113 msgid ""
15789 "``bookmark([name])``\n"
17114 "``bookmark([name])``\n"
15790 " The named bookmark or all bookmarks."
17115 " The named bookmark or all bookmarks."
@@ -15853,6 +17178,14 b' msgid ""'
15853 msgstr ""
17178 msgstr ""
15854
17179
15855 msgid ""
17180 msgid ""
17181 "``draft()``\n"
17182 " Changeset in draft phase."
17183 msgstr ""
17184
17185 msgid "draft takes no arguments"
17186 msgstr "draft tar inga argument"
17187
17188 msgid ""
15856 "``filelog(pattern)``\n"
17189 "``filelog(pattern)``\n"
15857 " Changesets connected to the specified filelog."
17190 " Changesets connected to the specified filelog."
15858 msgstr ""
17191 msgstr ""
@@ -15861,6 +17194,11 b' msgid "filelog requires a pattern"'
15861 msgstr "filelog kräver ett mönster"
17194 msgstr "filelog kräver ett mönster"
15862
17195
15863 msgid ""
17196 msgid ""
17197 "``first(set, [n])``\n"
17198 " An alias for limit()."
17199 msgstr ""
17200
17201 msgid ""
15864 "``follow([file])``\n"
17202 "``follow([file])``\n"
15865 " An alias for ``::.`` (ancestors of the working copy's first parent).\n"
17203 " An alias for ``::.`` (ancestors of the working copy's first parent).\n"
15866 " If a filename is specified, the history of the given file is followed,\n"
17204 " If a filename is specified, the history of the given file is followed,\n"
@@ -15936,13 +17274,13 b' msgid "keyword requires a string"'
15936 msgstr "keyword kräver en sträng"
17274 msgstr "keyword kräver en sträng"
15937
17275
15938 msgid ""
17276 msgid ""
15939 "``limit(set, n)``\n"
17277 "``limit(set, [n])``\n"
15940 " First n members of set."
17278 " First n members of set, defaulting to 1."
15941 msgstr ""
17279 msgstr ""
15942
17280
15943 #. i18n: "limit" is a keyword
17281 #. i18n: "limit" is a keyword
15944 msgid "limit requires two arguments"
17282 msgid "limit requires one or two arguments"
15945 msgstr "limit kräver två argument"
17283 msgstr "limit kräver ett eller två argument"
15946
17284
15947 #. i18n: "limit" is a keyword
17285 #. i18n: "limit" is a keyword
15948 msgid "limit requires a number"
17286 msgid "limit requires a number"
@@ -15953,13 +17291,13 b' msgid "limit expects a number"'
15953 msgstr "limit förväntar sig ett nummer"
17291 msgstr "limit förväntar sig ett nummer"
15954
17292
15955 msgid ""
17293 msgid ""
15956 "``last(set, n)``\n"
17294 "``last(set, [n])``\n"
15957 " Last n members of set."
17295 " Last n members of set, defaulting to 1."
15958 msgstr ""
17296 msgstr ""
15959
17297
15960 #. i18n: "last" is a keyword
17298 #. i18n: "last" is a keyword
15961 msgid "last requires two arguments"
17299 msgid "last requires one or two arguments"
15962 msgstr "last kräver två argument"
17300 msgstr "last kräver ett eller två argument"
15963
17301
15964 #. i18n: "last" is a keyword
17302 #. i18n: "last" is a keyword
15965 msgid "last requires a number"
17303 msgid "last requires a number"
@@ -16050,6 +17388,33 b' msgid ""'
16050 msgstr ""
17388 msgstr ""
16051
17389
16052 msgid ""
17390 msgid ""
17391 "``public()``\n"
17392 " Changeset in public phase."
17393 msgstr ""
17394
17395 msgid "public takes no arguments"
17396 msgstr "public tar inga argument"
17397
17398 msgid ""
17399 "``remote([id], [path])``\n"
17400 " Local revision that corresponds to the given identifier in a\n"
17401 " remote repository, if present. Here, the '.' identifier is a\n"
17402 " synonym for the current local branch."
17403 msgstr ""
17404
17405 #. i18n: "remote" is a keyword
17406 msgid "outgoing takes one or two arguments"
17407 msgstr "outgoing tar ett eller två argument"
17408
17409 #. i18n: "remote" is a keyword
17410 msgid "remote requires a string id"
17411 msgstr "remotee kräver ett sträng-id"
17412
17413 #. i18n: "remote" is a keyword
17414 msgid "remote requires a repository path"
17415 msgstr "remote kräver en arkivsökväg"
17416
17417 msgid ""
16053 "``removes(pattern)``\n"
17418 "``removes(pattern)``\n"
16054 " Changesets which remove files matching pattern."
17419 " Changesets which remove files matching pattern."
16055 msgstr ""
17420 msgstr ""
@@ -16086,6 +17451,14 b' msgid ""'
16086 msgstr ""
17451 msgstr ""
16087
17452
16088 msgid ""
17453 msgid ""
17454 "``secret()``\n"
17455 " Changeset in secret phase."
17456 msgstr ""
17457
17458 msgid "secret takes no arguments"
17459 msgstr "secret tar inga argument"
17460
17461 msgid ""
16089 "``sort(set[, [-]key...])``\n"
17462 "``sort(set[, [-]key...])``\n"
16090 " Sort set by keys. The default sort order is ascending, specify a key\n"
17463 " Sort set by keys. The default sort order is ascending, specify a key\n"
16091 " as ``-key`` to sort in descending order."
17464 " as ``-key`` to sort in descending order."
@@ -16161,7 +17534,7 b' msgid "path contains illegal component: '
16161 msgstr ""
17534 msgstr ""
16162
17535
16163 #, python-format
17536 #, python-format
16164 msgid "path %r is inside nested repo %r"
17537 msgid "path '%s' is inside nested repo %r"
16165 msgstr ""
17538 msgstr ""
16166
17539
16167 #, python-format
17540 #, python-format
@@ -16191,8 +17564,14 b' msgstr "ok\xc3\xa4nt arkivformat: kr\xc3\xa4ver att \'%s\' fungerar (uppgradera Mercurial)"'
16191 msgid "searching for changes\n"
17564 msgid "searching for changes\n"
16192 msgstr "söker efter ändringar\n"
17565 msgstr "söker efter ändringar\n"
16193
17566
17567 msgid "all local heads known remotely\n"
17568 msgstr ""
17569
17570 msgid "sampling from both directions\n"
17571 msgstr ""
17572
16194 msgid "queries"
17573 msgid "queries"
16195 msgstr "frågor"
17574 msgstr "frågar"
16196
17575
16197 msgid "searching"
17576 msgid "searching"
16198 msgstr "söker"
17577 msgstr "söker"
@@ -16232,13 +17611,16 b' msgstr ""'
16232 msgid "no suitable response from remote hg"
17611 msgid "no suitable response from remote hg"
16233 msgstr ""
17612 msgstr ""
16234
17613
16235 msgid "remote: "
16236 msgstr "fjärr: "
16237
16238 #, python-format
17614 #, python-format
16239 msgid "push refused: %s"
17615 msgid "push refused: %s"
16240 msgstr ""
17616 msgstr ""
16241
17617
17618 msgid "ssl connection failed"
17619 msgstr "ssl-anslutning misslyckades"
17620
17621 msgid "Python SSL support not found"
17622 msgstr "Pythons SSL-stöd hittades inte"
17623
16242 msgid "certificate checking requires Python 2.6"
17624 msgid "certificate checking requires Python 2.6"
16243 msgstr "certifikatkontroll kräver Python 2.6"
17625 msgstr "certifikatkontroll kräver Python 2.6"
16244
17626
@@ -16260,14 +17642,35 b' msgid "could not find web.cacerts: %s"'
16260 msgstr "kunde inte hitta web.cacerts: %s"
17642 msgstr "kunde inte hitta web.cacerts: %s"
16261
17643
16262 #, python-format
17644 #, python-format
16263 msgid "%s certificate error: %s (use --insecure to connect insecurely)"
17645 msgid "host fingerprint for %s can't be verified (Python too old)"
16264 msgstr "%s-certifikatfel: %s (använd --insecure för att ansluta osäkert)"
17646 msgstr ""
17647
17648 #, python-format
17649 msgid "warning: certificate for %s can't be verified (Python too old)\n"
17650 msgstr "varning: certificatet för %s kan inte verifieras (för gammal Python)\n"
17651
17652 #, python-format
17653 msgid "%s ssl connection error"
17654 msgstr ""
17655
17656 #, python-format
17657 msgid "%s certificate error: no certificate received"
17658 msgstr "%s certifikatfel: inget certifikat mottaget"
16265
17659
16266 #, python-format
17660 #, python-format
16267 msgid "invalid certificate for %s with fingerprint %s"
17661 msgid "invalid certificate for %s with fingerprint %s"
16268 msgstr "ogiltigt certifikat för %s med fingeravtrycket %s"
17662 msgstr "ogiltigt certifikat för %s med fingeravtrycket %s"
16269
17663
16270 #, python-format
17664 #, python-format
17665 msgid "%s certificate error: %s"
17666 msgstr "%s certifikatfel: %s"
17667
17668 #, python-format
17669 msgid "configure hostfingerprint %s or use --insecure to connect insecurely"
17670 msgstr ""
17671 "konfigurera hostfingerprint %s eller använd --insecure för att ansluta osäkert"
17672
17673 #, python-format
16271 msgid ""
17674 msgid ""
16272 "warning: %s certificate with fingerprint %s not verified (check "
17675 "warning: %s certificate with fingerprint %s not verified (check "
16273 "hostfingerprints or web.cacerts config setting)\n"
17676 "hostfingerprints or web.cacerts config setting)\n"
@@ -16276,14 +17679,6 b' msgstr ""'
16276 "inställningen för hostfingerprints eller web.cacerts)\n"
17679 "inställningen för hostfingerprints eller web.cacerts)\n"
16277
17680
16278 #, python-format
17681 #, python-format
16279 msgid "host fingerprint for %s can't be verified (Python too old)"
16280 msgstr ""
16281
16282 #, python-format
16283 msgid "warning: certificate for %s can't be verified (Python too old)\n"
16284 msgstr "varning: certificatet för %s kan inte verifieras (för gammal Python)\n"
16285
16286 #, python-format
16287 msgid "'%s' does not appear to be an hg repository"
17682 msgid "'%s' does not appear to be an hg repository"
16288 msgstr "'%s' verkar inte vara ett hg-arkiv"
17683 msgstr "'%s' verkar inte vara ett hg-arkiv"
16289
17684
@@ -16305,13 +17700,13 b' msgstr ""'
16305 msgid "subrepo spec file %s not found"
17700 msgid "subrepo spec file %s not found"
16306 msgstr ""
17701 msgstr ""
16307
17702
16308 msgid "missing ] in subrepo source"
16309 msgstr ""
16310
16311 #, python-format
17703 #, python-format
16312 msgid "bad subrepository pattern in %s: %s"
17704 msgid "bad subrepository pattern in %s: %s"
16313 msgstr ""
17705 msgstr ""
16314
17706
17707 msgid "missing ] in subrepo source"
17708 msgstr ""
17709
16315 #, python-format
17710 #, python-format
16316 msgid ""
17711 msgid ""
16317 " subrepository sources for %s differ\n"
17712 " subrepository sources for %s differ\n"
@@ -16377,6 +17772,10 b' msgstr "drar underarkivet %s fr\xc3\xa5n %s\\n"'
16377 msgid "pushing subrepo %s to %s\n"
17772 msgid "pushing subrepo %s to %s\n"
16378 msgstr "trycker underarkivet %s till %s\n"
17773 msgstr "trycker underarkivet %s till %s\n"
16379
17774
17775 #, python-format
17776 msgid "'svn' executable not found for subrepo '%s'"
17777 msgstr ""
17778
16380 msgid "cannot retrieve svn tool version"
17779 msgid "cannot retrieve svn tool version"
16381 msgstr "kan inte hämta version på svn-verktyg"
17780 msgstr "kan inte hämta version på svn-verktyg"
16382
17781
@@ -16530,6 +17929,13 b' msgid ""'
16530 " i.e. a 12 hexadecimal digit string."
17929 " i.e. a 12 hexadecimal digit string."
16531 msgstr ""
17930 msgstr ""
16532
17931
17932 msgid ""
17933 ":shortbisect: Any text. Treats `text` as a bisection status, and\n"
17934 " returns a single-character representing the status (G: good, B: bad,\n"
17935 " S: skipped, U: untested, I: ignored). Returns single space if `text`\n"
17936 " is not a valid bisection status."
17937 msgstr ""
17938
16533 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
17939 msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
16534 msgstr ""
17940 msgstr ""
16535
17941
@@ -16562,6 +17968,9 b' msgstr ""'
16562 msgid ":author: String. The unmodified author of the changeset."
17968 msgid ":author: String. The unmodified author of the changeset."
16563 msgstr ""
17969 msgstr ""
16564
17970
17971 msgid ":bisect: String. The changeset bisection status."
17972 msgstr ""
17973
16565 msgid ""
17974 msgid ""
16566 ":branch: String. The name of the branch on which the changeset was\n"
17975 ":branch: String. The name of the branch on which the changeset was\n"
16567 " committed."
17976 " committed."
@@ -16629,6 +18038,12 b' msgid ""'
16629 " digit string."
18038 " digit string."
16630 msgstr ""
18039 msgstr ""
16631
18040
18041 msgid ":rev: String. The changeset phase name."
18042 msgstr ""
18043
18044 msgid ":rev: Integer. The changeset phase index."
18045 msgstr ""
18046
16632 msgid ":rev: Integer. The repository-local changeset revision number."
18047 msgid ":rev: Integer. The repository-local changeset revision number."
16633 msgstr ""
18048 msgstr ""
16634
18049
General Comments 0
You need to be logged in to leave comments. Login now