diff options
Diffstat (limited to 'i18n/sv.po')
| -rw-r--r-- | i18n/sv.po | 5876 |
1 files changed, 1400 insertions, 4476 deletions
@@ -1,23 +1,20 @@ # Swedish translation for Mercurial # Svensk översättning för Mercurial -# Copyright (C) 2009-2012 Matt Mackall and others +# Copyright (C) 2009-2011 Matt Mackall and others # # Translation dictionary: # -# amend förändra # changeset ändring # commit arkivera -# graft ympa # merge sammanfoga -# strip avlägsna # tag märke # msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2012-07-28 14:35+0200\n" -"PO-Revision-Date: 2012-07-28 22:58+0200\n" +"POT-Creation-Date: 2011-07-29 20:08+0200\n" +"PO-Revision-Date: 2011-07-30 09:39+0200\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" "Language: Swedish\n" @@ -91,10 +88,10 @@ msgstr "" msgid "" "Branch-based Access Control\n" -"---------------------------" +"..........................." msgstr "" "Grenbaserad Åtkomstkontroll\n" -"---------------------------" +"..........................." msgid "" "Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" @@ -116,16 +113,11 @@ msgid "" msgstr "" msgid "" -"You can add the \"!\" prefix to a user or group name to invert the sense\n" -"of the match." -msgstr "" - -msgid "" "Path-based Access Control\n" -"-------------------------" +"........................." msgstr "" "Sökvägsbaserad Åtkomstkontroll\n" -"------------------------------" +".............................." msgid "" "Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" @@ -136,10 +128,10 @@ msgstr "" msgid "" "Groups\n" -"------" +"......" msgstr "" "Grupper\n" -"-------" +"......." msgid "" "Group names must be prefixed with an ``@`` symbol. Specifying a group\n" @@ -155,10 +147,10 @@ msgstr "" msgid "" "Example Configuration\n" -"---------------------" +"....................." msgstr "" "Exempelkonfiguration\n" -"--------------------" +"...................." msgid "::" msgstr "::" @@ -270,73 +262,15 @@ msgid "" msgstr "" msgid "" -" # Everyone (except for \"user6\" and \"@hg-denied\" - see acl.deny above)\n" -" # will have write access to any file under the \"resources\" folder\n" -" # (except for 1 file. See acl.deny):\n" +" # Everyone (except for \"user6\" - see acl.deny above) will have write\n" +" # access to any file under the \"resources\" folder (except for 1\n" +" # file. See acl.deny):\n" " src/main/resources/** = *" msgstr "" msgid " .hgtags = release_engineer" msgstr "" -msgid "" -"Examples using the \"!\" prefix\n" -"............................." -msgstr "" - -msgid "" -"Suppose there's a branch that only a given user (or group) should be able " -"to\n" -"push to, and you don't want to restrict access to any other branch that may\n" -"be created." -msgstr "" - -msgid "" -"The \"!\" prefix allows you to prevent anyone except a given user or group " -"to\n" -"push changesets in a given branch or path." -msgstr "" - -msgid "" -"In the examples below, we will:\n" -"1) Deny access to branch \"ring\" to anyone but user \"gollum\"\n" -"2) Deny access to branch \"lake\" to anyone but members of the group \"hobbit" -"\"\n" -"3) Deny access to a file to anyone but user \"gollum\"" -msgstr "" - -msgid "" -" [acl.allow.branches]\n" -" # Empty" -msgstr "" - -msgid "" -" # 1) only 'gollum' can commit to branch 'ring';\n" -" # 'gollum' and anyone else can still commit to any other branch.\n" -" ring = !gollum" -msgstr "" - -msgid "" -" # 2) only members of the group 'hobbit' can commit to branch 'lake';\n" -" # 'hobbit' members and anyone else can still commit to any other branch.\n" -" lake = !@hobbit" -msgstr "" - -msgid " # You can also deny access based on file paths:" -msgstr "" - -msgid "" -" [acl.allow]\n" -" # Empty" -msgstr "" - -msgid "" -" [acl.deny]\n" -" # 3) only 'gollum' can change the file below;\n" -" # 'gollum' and anyone else can still change any other file.\n" -" /misty/mountains/cave/ring = !gollum" -msgstr "" - #, python-format msgid "group '%s' is undefined" msgstr "" @@ -355,12 +289,8 @@ msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")" msgstr "" #, python-format -msgid "acl: user \"%s\" denied on \"%s\" (changeset \"%s\")" -msgstr "acl: användaren \"%s\" nekades på \"%s\" (ändringen \"%s\")" - -#, python-format -msgid "acl: user \"%s\" not allowed on \"%s\" (changeset \"%s\")" -msgstr "acl: användaren \"%s\" tillåts inte på \"%s\" (ändringen \"%s\")" +msgid "acl: access denied for changeset %s" +msgstr "" msgid "hooks for integrating with the Bugzilla bug tracker" msgstr "" @@ -371,9 +301,7 @@ msgid "" "the Mercurial template mechanism." msgstr "" -msgid "" -"The bug references can optionally include an update for Bugzilla of the\n" -"hours spent working on the bug. Bugs can also be marked fixed." +msgid "The hook does not change bug status." msgstr "" msgid "Three basic modes of access to Bugzilla are provided:" @@ -402,7 +330,7 @@ msgid "" "MySQL user and password to have full access rights to the Bugzilla\n" "database. For these reasons this access mode is now considered\n" "deprecated, and will not be updated for new Bugzilla versions going\n" -"forward. Only adding comments is supported in this access mode." +"forward." msgstr "" msgid "" @@ -410,8 +338,7 @@ msgid "" "in the configuration. Comments are added under that username. Since the\n" "configuration must be readable by all Mercurial users, it is recommended\n" "that the rights of that user are restricted in Bugzilla to the minimum\n" -"necessary to add comments. Marking bugs fixed requires Bugzilla 4.0 and " -"later." +"necessary to add comments." msgstr "" msgid "" @@ -421,8 +348,7 @@ msgid "" "user, so the comment appears to come from the Mercurial user. In the event\n" "that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n" "user, the email associated with the Bugzilla username used to log into\n" -"Bugzilla is used instead as the source of the comment. Marking bugs fixed\n" -"works on all supported Bugzilla versions." +"Bugzilla is used instead as the source of the comment." msgstr "" msgid "Configuration items common to all access modes:" @@ -445,43 +371,11 @@ msgstr "" msgid "" "bugzilla.regexp\n" -" Regular expression to match bug IDs for update in changeset commit " -"message.\n" -" It must contain one \"()\" named group ``<ids>`` containing the bug\n" -" IDs separated by non-digit characters. It may also contain\n" -" a named group ``<hours>`` with a floating-point number giving the\n" -" hours worked on the bug. If no named groups are present, the first\n" -" \"()\" group is assumed to contain the bug IDs, and work time is not\n" -" updated. The default expression matches ``Bug 1234``, ``Bug no. 1234``,\n" -" ``Bug number 1234``, ``Bugs 1234,5678``, ``Bug 1234 and 5678`` and\n" -" variations thereof, followed by an hours number prefixed by ``h`` or\n" -" ``hours``, e.g. ``hours 1.5``. Matching is case insensitive." -msgstr "" - -msgid "" -"bugzilla.fixregexp\n" -" Regular expression to match bug IDs for marking fixed in changeset\n" -" commit message. This must contain a \"()\" named group ``<ids>` " -"containing\n" -" the bug IDs separated by non-digit characters. It may also contain\n" -" a named group ``<hours>`` with a floating-point number giving the\n" -" hours worked on the bug. If no named groups are present, the first\n" -" \"()\" group is assumed to contain the bug IDs, and work time is not\n" -" updated. The default expression matches ``Fixes 1234``, ``Fixes bug " -"1234``,\n" -" ``Fixes bugs 1234,5678``, ``Fixes 1234 and 5678`` and\n" -" variations thereof, followed by an hours number prefixed by ``h`` or\n" -" ``hours``, e.g. ``hours 1.5``. Matching is case insensitive." -msgstr "" - -msgid "" -"bugzilla.fixstatus\n" -" The status to set a bug to when marking fixed. Default ``RESOLVED``." -msgstr "" - -msgid "" -"bugzilla.fixresolution\n" -" The resolution to set a bug to when marking fixed. Default ``FIXED``." +" Regular expression to match bug IDs in changeset commit message.\n" +" Must contain one \"()\" group. The default expression matches ``Bug\n" +" 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n" +" ``Bug 1234 and 5678`` and variations thereof. Matching is case\n" +" insensitive." msgstr "" msgid "" @@ -753,10 +647,6 @@ msgid "unknown database schema" msgstr "" #, python-format -msgid "bug %d does not exist\n" -msgstr "bugg %d existerar inte\n" - -#, python-format msgid "bug %d already knows about changeset %s\n" msgstr "" @@ -790,12 +680,6 @@ msgstr "" msgid "cannot find bugzilla user id for %s or %s" msgstr "" -msgid "Bugzilla/MySQL cannot update bug state\n" -msgstr "" - -msgid "Bugzilla/XMLRPC needs Bugzilla 4.0 or later to mark bugs fixed\n" -msgstr "" - msgid "configuration 'bzemail' missing" msgstr "'bzemail' inte konfigurerad" @@ -807,10 +691,6 @@ msgstr "" msgid "bugzilla version %s not supported" msgstr "bugzilla version %s stöds inte" -#, python-format -msgid "%s: invalid hours\n" -msgstr "%s: ogiltiga timmar\n" - msgid "" "changeset {node|short} in repo {root} refers to bug {bug}.\n" "details:\n" @@ -825,15 +705,8 @@ msgstr "" msgid "Bugzilla error: %s" msgstr "Bugzilla-fel: %s" -msgid "command to display child changesets (DEPRECATED)" -msgstr "kommando för att visa barnändringar (FÖRLEGAD)" - -msgid "" -"This extension is deprecated. You should use :hg:`log -r\n" -"\"children(REV)\"` instead.\n" +msgid "command to display child changesets" msgstr "" -"Detta är en förlegad utökning. Du kan avända :hg:`log -r\n" -"\"children(REV)\"` instead.\n" msgid "show the children of the given or working directory revision" msgstr "" @@ -860,7 +733,7 @@ msgid "command to display statistics about repository history" msgstr "" #, python-format -msgid "revision %d is a merge, ignoring...\n" +msgid "Revision %d is a merge, ignoring...\n" msgstr "" msgid "analyzing" @@ -1073,13 +946,6 @@ msgstr "" " branches.inactive = none" msgid "" -" tags.normal = green\n" -" tags.local = black bold" -msgstr "" -" tags.normal = green\n" -" tags.local = black bold" - -msgid "" "The available effects in terminfo mode are 'blink', 'bold', 'dim',\n" "'inverse', 'invisible', 'italic', 'standout', and 'underline'; in\n" "ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and\n" @@ -1359,10 +1225,10 @@ msgstr "" msgid "" " Mercurial Source\n" -" ################" +" ''''''''''''''''" msgstr "" " Mercurial-källa\n" -" ###############" +" '''''''''''''''" msgid "" " The Mercurial source recognizes the following configuration\n" @@ -1377,8 +1243,8 @@ msgstr "" msgid "" " :convert.hg.saverev: store original revision ID in changeset\n" -" (forces target IDs to change). It takes a boolean argument and\n" -" defaults to False." +" (forces target IDs to change). It takes and boolean argument\n" +" and defaults to False." msgstr "" msgid "" @@ -1388,10 +1254,10 @@ msgstr "" msgid "" " CVS Source\n" -" ##########" +" ''''''''''" msgstr "" " CVS-källa\n" -" #########" +" '''''''''" msgid "" " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" @@ -1447,7 +1313,7 @@ msgstr "" msgid "" " :hook.cvschangesets: Specify a Python function to be called after\n" -" the changesets are calculated from the CVS log. The\n" +" the changesets are calculated from the the CVS log. The\n" " function is passed a list with the changeset entries, and can\n" " modify the changesets in-place, or add or delete them." msgstr "" @@ -1461,10 +1327,10 @@ msgstr "" msgid "" " Subversion Source\n" -" #################" +" '''''''''''''''''" msgstr "" " Subversion-källa\n" -" ################" +" ''''''''''''''''" msgid "" " Subversion source detects classical trunk/branches/tags layouts.\n" @@ -1510,10 +1376,10 @@ msgstr "" msgid "" " Perforce Source\n" -" ###############" +" '''''''''''''''" msgstr "" " Perforce-källa\n" -" ##############" +" ''''''''''''''" msgid "" " The Perforce (P4) importer can be given a p4 depot path or a\n" @@ -1536,10 +1402,10 @@ msgstr "" msgid "" " Mercurial Destination\n" -" #####################" +" '''''''''''''''''''''" msgstr "" " Mercurial-destination\n" -" #####################" +" '''''''''''''''''''''" msgid " The following options are supported:" msgstr "" @@ -1670,8 +1536,8 @@ msgid "bzr source type could not be determined\n" msgstr "" #, python-format -msgid "%s is not a valid revision" -msgstr "%s är inte en giltig revision" +msgid "%s is not a valid revision in current branch" +msgstr "" #, python-format msgid "%s is not available in %s anymore" @@ -1698,10 +1564,6 @@ msgid "could not open map file %r: %s" msgstr "" #, python-format -msgid "syntax error in %s(%d): child parent1[,parent2] expected" -msgstr "" - -#, python-format msgid "%s: invalid source repository type" msgstr "%s: ogiltig typ för källarkiv" @@ -1731,14 +1593,6 @@ msgid "scanning" msgstr "skannar" #, python-format -msgid "splice map revision %s is not being converted, ignoring\n" -msgstr "" - -#, python-format -msgid "unknown splice map parent: %s" -msgstr "" - -#, python-format msgid "unknown sort mode: %s" msgstr "" @@ -1750,11 +1604,11 @@ msgid "not all revisions were sorted" msgstr "" #, python-format -msgid "writing author map file %s\n" +msgid "Writing author map file %s\n" msgstr "" #, python-format -msgid "ignoring bad line in author map file %s: %s\n" +msgid "Ignoring bad line in author map file %s: %s\n" msgstr "" #, python-format @@ -1999,12 +1853,6 @@ msgid "updating bookmarks\n" msgstr "uppdaterar bokmärken\n" #, python-format -msgid "" -"revision %s not found in destination repository (lookups with " -"clonebranches=true are not implemented)" -msgstr "" - -#, python-format msgid "%s is not a valid start revision" msgstr "" @@ -2065,16 +1913,9 @@ msgstr "" msgid "collecting p4 changelists\n" msgstr "" -msgid "debugsvnlog could not load Subversion python bindings" -msgstr "" - msgid "Mercurial failed to run itself, check hg executable is in PATH" msgstr "" -#, python-format -msgid "log stream exception '%s'" -msgstr "" - msgid "" "svn: cannot probe remote repository, assume it could be a subversion " "repository. Use --source-type if you know better.\n" @@ -2084,7 +1925,7 @@ msgstr "" msgid "%s does not look like a Subversion repository" msgstr "%s verkar inte vara ett Subversion-arkiv" -msgid "could not load Subversion python bindings" +msgid "Could not load Subversion python bindings" msgstr "" #, python-format @@ -2130,10 +1971,6 @@ msgid "svn: no revision found after start revision %d" msgstr "" #, python-format -msgid "svn: revision %s not found" -msgstr "svn: revisionen %s hittades inte" - -#, python-format msgid "%s not found up to revision %d" msgstr "" @@ -2169,12 +2006,6 @@ msgstr "" msgid "writing Subversion tags is not yet implemented\n" msgstr "" -#, python-format -msgid "" -"splice map revision %s not found in subversion child map (revision lookups " -"are not implemented)" -msgstr "" - msgid "automatically manage newlines in repository files" msgstr "" @@ -2248,10 +2079,9 @@ msgid "" msgstr "" msgid "" -"The extension uses an optional ``[eol]`` section read from both the\n" -"normal Mercurial configuration files and the ``.hgeol`` file, with the\n" -"latter overriding the former. You can use that section to control the\n" -"overall behavior. There are three settings:" +"The extension uses an optional ``[eol]`` section in your hgrc file\n" +"(not the ``.hgeol`` file) for settings that control the overall\n" +"behavior. There are two settings:" msgstr "" msgid "" @@ -2270,12 +2100,6 @@ msgid "" msgstr "" msgid "" -"- ``eol.fix-trailing-newline`` (default False) can be set to True to\n" -" ensure that converted files end with a EOL character (either ``\\n``\n" -" or ``\\r\\n`` as per the configured patterns)." -msgstr "" - -msgid "" "The extension provides ``cleverencode:`` and ``cleverdecode:`` filters\n" "like the deprecated win32text extension does. This means that you can\n" "disable win32text and enable eol and your filters will still work. You\n" @@ -2361,8 +2185,7 @@ msgid "" " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" " # your .vimrc\n" -" vimdiff = gvim -f \"+next\" \\\n" -" \"+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))\"" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" msgstr "" msgid "Tool arguments can include variables that are expanded at runtime::" @@ -2475,56 +2298,7 @@ msgstr "" msgid "hg %s [OPTION]... [FILE]..." msgstr "" -msgid "http authentication with factotum" -msgstr "" - -msgid "" -"This extension allows the factotum(4) facility on Plan 9 from Bell Labs\n" -"platforms to provide authentication information for HTTP access. " -"Configuration\n" -"entries specified in the auth section as well as authentication information\n" -"provided in the repository URL are fully supported. If no prefix is " -"specified,\n" -"a value of \"*\" will be assumed." -msgstr "" - -msgid "By default, keys are specified as::" -msgstr "" - -msgid "" -" proto=pass service=hg prefix=<prefix> user=<username> !password=<password>" -msgstr "" - -msgid "" -"If the factotum extension is unable to read the required key, one will be\n" -"requested interactively." -msgstr "" - -msgid "" -"A configuration section is available to customize runtime behavior. By\n" -"default, these entries are::" -msgstr "" - -msgid "" -" [factotum]\n" -" executable = /bin/auth/factotum\n" -" mountpoint = /mnt/factotum\n" -" service = hg" -msgstr "" - -msgid "" -"The executable entry defines the full path to the factotum binary. The\n" -"mountpoint entry defines the path to the factotum file service. Lastly, the\n" -"service entry controls the service name used when reading keys." -msgstr "" - -msgid "factotum not interactive" -msgstr "" - -msgid "factotum not responding" -msgstr "" - -msgid "pull, update and merge in one command (DEPRECATED)" +msgid "pull, update and merge in one command" msgstr "" msgid "pull changes from a remote repository, merge new changes if needed." @@ -2543,9 +2317,10 @@ msgid "" msgstr "" msgid "" -" When a merge is needed, the working directory is first updated to\n" -" the newly pulled changes. Local changes are then merged into the\n" -" pulled changes. To switch the merge order, use --switch-parent." +" When a merge occurs, the newly pulled changes are assumed to be\n" +" \"authoritative\". The head of the new changes is used as the first\n" +" parent, with local changes as the second. To switch the merge\n" +" order, use --switch-parent." msgstr "" msgid " See :hg:`help dates` for a list of formats valid for -d/--date." @@ -2584,10 +2359,10 @@ msgid "pulling from %s\n" msgstr "drar från %s\n" msgid "" -"other repository doesn't support revision lookup, so a rev cannot be " +"Other repository doesn't support revision lookup, so a rev cannot be " "specified." msgstr "" -"det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " +"Det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " "anges." #, python-format @@ -2653,15 +2428,15 @@ msgstr "visa signerade ändringar" msgid "%s:%d node does not exist\n" msgstr "%s:%d noden existerar inte\n" -msgid "hg sigcheck REV" -msgstr "hg sigcheck REV" +msgid "hg sigcheck REVISION" +msgstr "hg sigcheck REVISION" msgid "verify all the signatures there may be for a particular revision" msgstr "verifiera alla signaturerna som finns för en viss revision" #, python-format -msgid "no valid signature for %s\n" -msgstr "ingen giltig signatur för %s\n" +msgid "No valid signature for %s\n" +msgstr "Ingen giltig signatur för %s\n" msgid "make the signature local" msgstr "gör signaturen lokal" @@ -2684,8 +2459,8 @@ msgstr "TEXT" msgid "commit message" msgstr "arkiveringsmeddelande" -msgid "hg sign [OPTION]... [REV]..." -msgstr "hg sign [FLAGGA]... [REV]..." +msgid "hg sign [OPTION]... [REVISION]..." +msgstr "hg sign [FLAGGA]... [REVISION]..." msgid "add a signature for the current or given revision" msgstr "lägg till en signatur för den aktuella eller angivna revisionen" @@ -2708,8 +2483,8 @@ msgid "uncommitted merge - please provide a specific revision" msgstr "oarkiverad sammanfogning - ange en specifik revision" #, python-format -msgid "signing %d:%s\n" -msgstr "signerar %d:%s\n" +msgid "Signing %d:%s\n" +msgstr "Signerar %d:%s\n" msgid "error while signing" msgstr "fel vid signering" @@ -2736,54 +2511,27 @@ msgstr "" "outgoing och log. När flaggan anges, visas också en ASCII-version av\n" "revisionsgrafen.\n" -msgid "follow changeset history, or file history across copies and renames" -msgstr "" -"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" +#, python-format +msgid "-G/--graph option is incompatible with --%s" +msgstr "flaggan -G/--graph är inkompatibel med --%s" -msgid "only follow the first parent of merge changesets (DEPRECATED)" -msgstr "följ bara den första föräldern vid sammanfogningar (FÖRLEGAD)" +msgid "-G/--graph option is incompatible with --follow with file argument" +msgstr "flaggan -G/--graph är inkompatibel med --follow med filargument" -msgid "show revisions matching date spec" -msgstr "visa revisioner som matchar datumspecen" +msgid "NUM" +msgstr "NUM" -msgid "show copied files" -msgstr "visa kopierade filer" +msgid "limit number of changes displayed" +msgstr "begränsa antalet visade ändringar" -msgid "do case-insensitive search for a given text" -msgstr "gör versalokänslig sökning efter en given text" +msgid "show patch" +msgstr "visa patch" msgid "show the specified revision or range" msgstr "visa den specifika revisionen eller serien" -msgid "include revisions where files were removed" -msgstr "inkludera revisioner där filer togs bort" - -msgid "show only merges (DEPRECATED)" -msgstr "visa bara sammanfogningar (FÖRLEGAD)" - -msgid "USER" -msgstr "ANVÄNDARE" - -msgid "revisions committed by user" -msgstr "revisioner arkiverade av användare" - -msgid "show only changesets within the given named branch (DEPRECATED)" -msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)" - -msgid "BRANCH" -msgstr "GREN" - -msgid "show changesets within the given named branch" -msgstr "visa ändringar i den namngivna grenen" - -msgid "do not display revision or any of its ancestors" -msgstr "visa inte revision eller någon av dess föräldrar" - -msgid "show hidden changesets (DEPRECATED)" -msgstr "visa dolda ändringar (FÖRLEGAD)" - -msgid "[OPTION]... [FILE]" -msgstr "[FLAGGA]... [FIL]" +msgid "hg glog [OPTION]... [FILE]" +msgstr "hg glog [FLAGGA]... [FIL]" msgid "show revision history alongside an ASCII revision graph" msgstr "visa revisionshistorik vid sidan av en ASCII-revisionsgraf" @@ -2803,6 +2551,9 @@ msgstr "" " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n" " " +msgid "show the revision DAG" +msgstr "visa revisionsdiagram" + msgid "hooks for integrating with the CIA.vc notification service" msgstr "" @@ -2930,12 +2681,6 @@ msgstr "" msgid "start interactive history viewer" msgstr "" -msgid "NUM" -msgstr "NUM" - -msgid "limit number of changes displayed" -msgstr "begränsa antalet visade ändringar" - msgid "hg view [-l LIMIT] [REVRANGE]" msgstr "" @@ -2969,9 +2714,8 @@ msgstr "" msgid "hg debug-merge-base REV REV" msgstr "" -#. i18n: bisect changeset status msgid "ignored" -msgstr "ignorerad" +msgstr "" msgid "hg debug-rev-parse REV" msgstr "" @@ -2992,323 +2736,24 @@ msgid "hg debug-rev-list [OPTION]... REV..." msgstr "" msgid "syntax highlighting for hgweb (requires Pygments)" -msgstr "syntaxfärgning för hgweb (kräver Pygments)" +msgstr "" msgid "" "It depends on the Pygments syntax highlighting library:\n" "http://pygments.org/" msgstr "" -"Den beror på syntaxfärgningsbiblioteket Pygments:\n" -"http://pygments.org/" msgid "There is a single configuration option::" -msgstr "Det finns ett enda konfigurationsalternativ::" +msgstr "" msgid "" " [web]\n" " pygments_style = <style>" msgstr "" -" [web]\n" -" pygments_style = <style>" msgid "The default is 'colorful'.\n" -msgstr "Som standard används 'colorful'.\n" - -msgid "interactive history editing" -msgstr "interaktiv historieredigering" - -msgid "" -"With this extension installed, Mercurial gains one new command: histedit. " -"Usage\n" -"is as follows, assuming the following history::" -msgstr "" -"Med denna utökning installerad, så får Mercurial ett nytt kommando: \n" -"histedit. Det används som följer, förutsatt denna historia::" - -msgid "" -" @ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42\n" -" | Add delta\n" -" |\n" -" o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42\n" -" | Add gamma\n" -" |\n" -" o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42\n" -" | Add beta\n" -" |\n" -" o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42\n" -" Add alpha" -msgstr "" -" @ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42\n" -" | Add delta\n" -" |\n" -" o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42\n" -" | Add gamma\n" -" |\n" -" o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42\n" -" | Add beta\n" -" |\n" -" o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42\n" -" Add alpha" - -msgid "" -"If you were to run ``hg histedit c561b4e977df``, you would see the " -"following\n" -"file open in your editor::" -msgstr "" -"Om du skulle köra ``hg histedit c561b4e977df``, så skulle den följande \n" -"filen öppnas i din editor::" - -msgid "" -" pick c561b4e977df Add beta\n" -" pick 030b686bedc4 Add gamma\n" -" pick 7c2fd3b9020c Add delta" -msgstr "" -" pick c561b4e977df Add beta\n" -" pick 030b686bedc4 Add gamma\n" -" pick 7c2fd3b9020c Add delta" - -msgid "" -" # Edit history between 633536316234 and 7c2fd3b9020c\n" -" #\n" -" # Commands:\n" -" # p, pick = use commit\n" -" # e, edit = use commit, but stop for amending\n" -" # f, fold = use commit, but fold into previous commit\n" -" # d, drop = remove commit from history\n" -" # m, mess = edit message without changing commit content\n" -" #\n" -" 0 files updated, 0 files merged, 0 files removed, 0 files unresolved" -msgstr "" - -msgid "" -"In this file, lines beginning with ``#`` are ignored. You must specify a " -"rule\n" -"for each revision in your history. For example, if you had meant to add " -"gamma\n" -"before beta, and then wanted to add delta in the same revision as beta, you\n" -"would reorganize the file to look like this::" -msgstr "" - -msgid "" -" pick 030b686bedc4 Add gamma\n" -" pick c561b4e977df Add beta\n" -" fold 7c2fd3b9020c Add delta" -msgstr "" -" pick 030b686bedc4 Add gamma\n" -" pick c561b4e977df Add beta\n" -" fold 7c2fd3b9020c Add delta" - -msgid "" -"At which point you close the editor and ``histedit`` starts working. When " -"you\n" -"specify a ``fold`` operation, ``histedit`` will open an editor when it " -"folds\n" -"those revisions together, offering you a chance to clean up the commit " -"message::" -msgstr "" - -msgid "" -" Add beta\n" -" ***\n" -" Add delta" -msgstr "" - -msgid "" -"Edit the commit message to your liking, then close the editor. For\n" -"this example, let's assume that the commit message was changed to\n" -"``Add beta and delta.`` After histedit has run and had a chance to\n" -"remove any old or temporary revisions it needed, the history looks\n" -"like this::" -msgstr "" - -msgid "" -" @ 2[tip] 989b4d060121 2009-04-27 18:04 -0500 durin42\n" -" | Add beta and delta.\n" -" |\n" -" o 1 081603921c3f 2009-04-27 18:04 -0500 durin42\n" -" | Add gamma\n" -" |\n" -" o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42\n" -" Add alpha" -msgstr "" - -msgid "" -"Note that ``histedit`` does *not* remove any revisions (even its own " -"temporary\n" -"ones) until after it has completed all the editing operations, so it will\n" -"probably perform several strip operations when it's done. For the above " -"example,\n" -"it had to run strip twice. Strip can be slow depending on a variety of " -"factors,\n" -"so you might need to be a little patient. You can choose to keep the " -"original\n" -"revisions by passing the ``--keep`` flag." -msgstr "" - -msgid "" -"The ``edit`` operation will drop you back to a command prompt,\n" -"allowing you to edit files freely, or even use ``hg record`` to commit\n" -"some changes as a separate commit. When you're done, any remaining\n" -"uncommitted changes will be committed as well. When done, run ``hg\n" -"histedit --continue`` to finish this step. You'll be prompted for a\n" -"new commit message, but the default commit message will be the\n" -"original message for the ``edit`` ed revision." -msgstr "" - -msgid "" -"The ``message`` operation will give you a chance to revise a commit\n" -"message without changing the contents. It's a shortcut for doing\n" -"``edit`` immediately followed by `hg histedit --continue``." -msgstr "" - -msgid "" -"If ``histedit`` encounters a conflict when moving a revision (while\n" -"handling ``pick`` or ``fold``), it'll stop in a similar manner to\n" -"``edit`` with the difference that it won't prompt you for a commit\n" -"message when done. If you decide at this point that you don't like how\n" -"much work it will be to rearrange history, or that you made a mistake,\n" -"you can use ``hg histedit --abort`` to abandon the new changes you\n" -"have made and return to the state before you attempted to edit your\n" -"history." -msgstr "" - -msgid "" -"If we clone the example repository above and add three more changes, such " -"that\n" -"we have the following history::" -msgstr "" - -msgid "" -" @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan\n" -" | Add theta\n" -" |\n" -" o 5 140988835471 2009-04-27 18:04 -0500 stefan\n" -" | Add eta\n" -" |\n" -" o 4 122930637314 2009-04-27 18:04 -0500 stefan\n" -" | Add zeta\n" -" |\n" -" o 3 836302820282 2009-04-27 18:04 -0500 stefan\n" -" | Add epsilon\n" -" |\n" -" o 2 989b4d060121 2009-04-27 18:04 -0500 durin42\n" -" | Add beta and delta.\n" -" |\n" -" o 1 081603921c3f 2009-04-27 18:04 -0500 durin42\n" -" | Add gamma\n" -" |\n" -" o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42\n" -" Add alpha" -msgstr "" - -msgid "" -"If you run ``hg histedit --outgoing`` on the clone then it is the same\n" -"as running ``hg histedit 836302820282``. If you need plan to push to a\n" -"repository that Mercurial does not detect to be related to the source\n" -"repo, you can add a ``--force`` option.\n" -msgstr "" - -msgid "cannot edit history that would orphan nodes" -msgstr "" - -msgid "can't edit history with merges" -msgstr "kan inte redigera historik med sammanfogningar" - -#, python-format -msgid "%s: empty changeset" -msgstr "%s: tom ändring" - -msgid "Fix up the change and run hg histedit --continue" -msgstr "Fixa ändringen och kör hg histedit --continue" - -msgid "" -"Make changes as needed, you may commit or record as needed now.\n" -"When you are finished, run hg histedit --continue to resume." -msgstr "" - -msgid "Read history edits from the specified file." -msgstr "Läs historieändringar från den angivna filen" - -msgid "continue an edit already in progress" -msgstr "" - -msgid "don't strip old nodes after edit is complete" -msgstr "" - -msgid "abort an edit in progress" -msgstr "" - -msgid "changesets not found in destination" -msgstr "visa ändringar som inte hittas i destinationen" - -msgid "force outgoing even for unrelated repositories" msgstr "" -msgid "first revision to be edited" -msgstr "första revision att redigera" - -msgid "[PARENT]" -msgstr "[FÖRÄLDER]" - -msgid "" -"interactively edit changeset history\n" -" " -msgstr "" - -msgid "source has mq patches applied" -msgstr "" - -msgid "only one repo argument allowed with --outgoing" -msgstr "" - -#, python-format -msgid "comparing with %s\n" -msgstr "jämför med %s\n" - -msgid "--force only allowed with --outgoing" -msgstr "" - -msgid "no arguments allowed with --continue" -msgstr "" - -msgid "no arguments allowed with --abort" -msgstr "" - -msgid "history edit already in progress, try --continue or --abort" -msgstr "" - -msgid "histedit requires exactly one parent revision" -msgstr "histedit kräver exakt en förälderrevision" - -msgid "histedit: Should update metadata for the following changes:\n" -msgstr "" - -#, python-format -msgid "histedit: %s to %s\n" -msgstr "histedit: %s till %s\n" - -#, python-format -msgid "histedit: moving bookmarks %s\n" -msgstr "histedit: flyttar bokmärken %s\n" - -msgid "must specify a rule for each changeset once" -msgstr "" - -#, python-format -msgid "malformed line \"%s\"" -msgstr "defekt rad \"%s\"" - -msgid "may not use changesets other than the ones listed" -msgstr "" - -#, python-format -msgid "unknown changeset %s listed" -msgstr "okänd ändring %s angiven" - -#, python-format -msgid "unknown action \"%s\"" -msgstr "okänd handling \"%s\"" - msgid "accelerate status report using Linux's inotify service" msgstr "" @@ -3751,479 +3196,6 @@ msgid "" " " msgstr "" -msgid "track large binary files" -msgstr "spåra stora binärfiler" - -msgid "" -"Large binary files tend to be not very compressible, not very\n" -"diffable, and not at all mergeable. Such files are not handled\n" -"efficiently by Mercurial's storage format (revlog), which is based on\n" -"compressed binary deltas; storing large binary files as regular\n" -"Mercurial files wastes bandwidth and disk space and increases\n" -"Mercurial's memory usage. The largefiles extension addresses these\n" -"problems by adding a centralized client-server layer on top of\n" -"Mercurial: largefiles live in a *central store* out on the network\n" -"somewhere, and you only fetch the revisions that you need when you\n" -"need them." -msgstr "" - -msgid "" -"largefiles works by maintaining a \"standin file\" in .hglf/ for each\n" -"largefile. The standins are small (41 bytes: an SHA-1 hash plus\n" -"newline) and are tracked by Mercurial. Largefile revisions are\n" -"identified by the SHA-1 hash of their contents, which is written to\n" -"the standin. largefiles uses that revision ID to get/put largefile\n" -"revisions from/to the central store. This saves both disk space and\n" -"bandwidth, since you don't need to retrieve all historical revisions\n" -"of large files when you clone or pull." -msgstr "" - -msgid "" -"To start a new repository or add new large binary files, just add\n" -"--large to your :hg:`add` command. For example::" -msgstr "" - -msgid "" -" $ dd if=/dev/urandom of=randomdata count=2000\n" -" $ hg add --large randomdata\n" -" $ hg commit -m 'add randomdata as a largefile'" -msgstr "" - -msgid "" -"When you push a changeset that adds/modifies largefiles to a remote\n" -"repository, its largefile revisions will be uploaded along with it.\n" -"Note that the remote Mercurial must also have the largefiles extension\n" -"enabled for this to work." -msgstr "" - -msgid "" -"When you pull a changeset that affects largefiles from a remote\n" -"repository, Mercurial behaves as normal. However, when you update to\n" -"such a revision, any largefiles needed by that revision are downloaded\n" -"and cached (if they have never been downloaded before). This means\n" -"that network access may be required to update to changesets you have\n" -"not previously updated to." -msgstr "" - -msgid "" -"If you already have large files tracked by Mercurial without the\n" -"largefiles extension, you will need to convert your repository in\n" -"order to benefit from largefiles. This is done with the\n" -":hg:`lfconvert` command::" -msgstr "" - -msgid " $ hg lfconvert --size 10 oldrepo newrepo" -msgstr "" - -msgid "" -"In repositories that already have largefiles in them, any new file\n" -"over 10MB will automatically be added as a largefile. To change this\n" -"threshold, set ``largefiles.minsize`` in your Mercurial config file\n" -"to the minimum size in megabytes to track as a largefile, or use the\n" -"--lfsize option to the add command (also in megabytes)::" -msgstr "" - -msgid "" -" [largefiles]\n" -" minsize = 2" -msgstr "" - -msgid " $ hg add --lfsize 2" -msgstr "" - -msgid "" -"The ``largefiles.patterns`` config option allows you to specify a list\n" -"of filename patterns (see :hg:`help patterns`) that should always be\n" -"tracked as largefiles::" -msgstr "" - -msgid "" -" [largefiles]\n" -" patterns =\n" -" *.jpg\n" -" re:.*\\.(png|bmp)$\n" -" library.zip\n" -" content/audio/*" -msgstr "" - -msgid "" -"Files that match one of these patterns will be added as largefiles\n" -"regardless of their size." -msgstr "" - -msgid "" -"The ``largefiles.minsize`` and ``largefiles.patterns`` config options\n" -"will be ignored for any repositories not already containing a\n" -"largefile. To add the first largefile to a repository, you must\n" -"explicitly do so with the --large flag passed to the :hg:`add`\n" -"command.\n" -msgstr "" - -msgid "convert a normal repository to a largefiles repository" -msgstr "konvertera ett normalt arkiv till ett largefiles-arkiv" - -msgid "" -" Convert repository SOURCE to a new repository DEST, identical to\n" -" SOURCE except that certain files will be converted as largefiles:\n" -" specifically, any file that matches any PATTERN *or* whose size is\n" -" above the minimum size threshold is converted as a largefile. The\n" -" size used to determine whether or not to track a file as a\n" -" largefile is the size of the first version of the file. The\n" -" minimum size can be specified either with --size or in\n" -" configuration as ``largefiles.size``." -msgstr "" - -msgid "" -" After running this command you will need to make sure that\n" -" largefiles is enabled anywhere you intend to push the new\n" -" repository." -msgstr "" - -msgid "" -" Use --to-normal to convert largefiles back to normal files; after\n" -" this, the DEST repository can be used without largefiles at all." -msgstr "" - -msgid "getting largefiles" -msgstr "hämtar largefiles" - -#, python-format -msgid "getting %s:%s\n" -msgstr "hämtar %s:%s\n" - -#, python-format -msgid "%s: data corruption (expected %s, got %s)\n" -msgstr "%s: datakorruption (förväntade mig %s, fick %s)\n" - -#, python-format -msgid "searching %d changesets for largefiles\n" -msgstr "söker i %d ändringar efter largefiles\n" - -#, python-format -msgid "verified contents of %d revisions of %d largefiles\n" -msgstr "" - -#, python-format -msgid "verified existence of %d revisions of %d largefiles\n" -msgstr "" - -#, python-format -msgid "unsupported URL scheme %r" -msgstr "" - -#, python-format -msgid "%s does not appear to be a largefile store" -msgstr "%s verkar inte vara en largefiles-lagring" - -#, python-format -msgid "%s is not a local Mercurial repo" -msgstr "%s är inte ett lokalt Mercurial-arkiv" - -#, python-format -msgid "initializing destination %s\n" -msgstr "" - -msgid "converting revisions" -msgstr "konverterar revisioner" - -#, python-format -msgid "renamed/copied largefile %s becomes symlink" -msgstr "" - -#, python-format -msgid "largefile %s becomes symlink" -msgstr "" - -#, python-format -msgid "skipping incorrectly formatted tag %s\n" -msgstr "hoppar över felformaterat märke %s\n" - -#, python-format -msgid "skipping incorrectly formatted id %s\n" -msgstr "hoppar över flrformaterad id %s\n" - -#, python-format -msgid "no mapping for id %s\n" -msgstr "" - -msgid "uploading largefiles" -msgstr "" - -#, python-format -msgid "largefile %s missing from store (needs to be uploaded)" -msgstr "" - -#, python-format -msgid "%d additional largefiles cached\n" -msgstr "%d ytterligare largefiles cachade\n" - -#, python-format -msgid "%d largefiles failed to download\n" -msgstr "%d largefiles kunde inte hämtas\n" - -msgid "getting changed largefiles\n" -msgstr "hämtar ändrade largefiles\n" - -#, python-format -msgid "%d largefiles updated, %d removed\n" -msgstr "%d largefiles uppdaterade, %d borttagna\n" - -#, python-format -msgid "largefile %s is not in cache and could not be downloaded" -msgstr "" - -msgid "minimum size (MB) for files to be converted as largefiles" -msgstr "" - -msgid "convert from a largefiles repo to a normal repo" -msgstr "" - -msgid "hg lfconvert SOURCE DEST [FILE ...]" -msgstr "" - -#, python-format -msgid "largefiles: size must be number (not %s)\n" -msgstr "" - -msgid "minimum size for largefiles must be specified" -msgstr "" - -#, python-format -msgid "unknown operating system: %s\n" -msgstr "okänt operativsystem: %s\n" - -#, python-format -msgid "found %s in store\n" -msgstr "" - -#, python-format -msgid "found %s in system cache\n" -msgstr "" - -msgid "can't get file locally" -msgstr "" - -#, python-format -msgid "" -"changeset %s: %s missing\n" -" (looked for hash %s)\n" -msgstr "" - -#, python-format -msgid "" -"changeset %s: %s: contents differ\n" -" (%s:\n" -" expected hash %s,\n" -" but got %s)\n" -msgstr "" - -#, python-format -msgid "%s already a largefile\n" -msgstr "%s är redan en largefile\n" - -#, python-format -msgid "adding %s as a largefile\n" -msgstr "lägger till %s som en largefile\n" - -msgid "no files specified" -msgstr "inga filer angivna" - -#, python-format -msgid "not removing %s: %s (use forget to undo)\n" -msgstr "raderar inte %s: %s (använd forget för att ångra)\n" - -msgid "file still exists" -msgstr "filen existerar fortfarande" - -msgid "file is modified" -msgstr "filen är modifierad" - -msgid "file has been marked for add" -msgstr "filen har markerats för addering" - -#, python-format -msgid "removing %s\n" -msgstr "tar bort %s\n" - -msgid "--normal cannot be used with --large" -msgstr "--normal kan inte användas med --large" - -msgid "uncommitted local changes" -msgstr "oarkiverade lokala ändringar" - -msgid "&Largefile" -msgstr "&Largefile" - -msgid "&Normal file" -msgstr "&Normal fil" - -#, python-format -msgid "" -"%s has been turned into a largefile\n" -"use (l)argefile or keep as (n)ormal file?" -msgstr "" - -#, python-format -msgid "" -"%s has been turned into a normal file\n" -"keep as (l)argefile or use (n)ormal file?" -msgstr "" - -#, python-format -msgid "merging %s and %s to %s\n" -msgstr "" - -#, python-format -msgid "merging %s\n" -msgstr "" - -#, python-format -msgid "" -"largefile %s has a merge conflict\n" -"keep (l)ocal or take (o)ther?" -msgstr "" - -msgid "&Local" -msgstr "" - -msgid "&Other" -msgstr "" - -msgid "no files to copy" -msgstr "inga filer att kopiera" - -msgid "destination largefile already exists" -msgstr "destionation-largefile finns redan" - -msgid "caching new largefiles\n" -msgstr "cachar nya largefiles\n" - -#, python-format -msgid "%d largefiles cached\n" -msgstr "%d largefiles cachade\n" - -#, python-format -msgid "--all-largefiles is incompatible with non-local destination %s" -msgstr "--all-largefiles är inkompatibel med icke-lokal destination %s" - -#, python-format -msgid "unknown archive type '%s'" -msgstr "okänd arkivtyp '%s'" - -msgid "cannot give prefix when archiving to files" -msgstr "" - -#, python-format -msgid "largefile %s not found in repo store or system cache" -msgstr "" - -#, python-format -msgid "not removing %s: file is already untracked\n" -msgstr "" - -msgid "largefiles: No remote repo\n" -msgstr "" - -msgid "largefiles to upload:\n" -msgstr "" - -#, python-format -msgid "largefiles: %d to upload\n" -msgstr "" - -msgid "largefile contents do not match hash" -msgstr "" - -#, python-format -msgid "largefiles: failed to put %s into store: %s" -msgstr "" - -#, python-format -msgid "requested largefile %s not present in cache" -msgstr "" - -msgid "remote: " -msgstr "fjärr: " - -#, python-format -msgid "unexpected putlfile response: %s" -msgstr "oväntat putlfile-svar: %s" - -msgid "putlfile failed:" -msgstr "putlfile misslyckades:" - -msgid "putlfile failed (unexpected response):" -msgstr "putlfile misslyckades (oväntat svar):" - -msgid "unexpected response:" -msgstr "oväntat svar:" - -#, python-format -msgid "remotestore: could not put %s to remote store %s" -msgstr "" - -#, python-format -msgid "remotestore: put %s to remote store %s" -msgstr "" - -#, python-format -msgid "remotestore: could not open file %s: %s" -msgstr "" - -#, python-format -msgid "remotestore: largefile %s is invalid" -msgstr "" - -#, python-format -msgid "remotestore: largefile %s is missing" -msgstr "" - -#, python-format -msgid "changeset %s: %s: contents differ\n" -msgstr "" - -#, python-format -msgid "changeset %s: %s missing\n" -msgstr "ändring %s: %s saknas\n" - -#, python-format -msgid "" -"largefiles: repo method %r appears to have already been wrapped by another " -"extension: largefiles may behave incorrectly\n" -msgstr "" - -#, python-format -msgid "file \"%s\" is a largefile standin" -msgstr "" - -msgid "add as largefile" -msgstr "lägg till som largefile" - -msgid "add as normal file" -msgstr "lägg till som normal fil" - -msgid "" -"add all files above this size (in megabytes) as largefiles (default: 10)" -msgstr "" - -msgid "verify largefiles" -msgstr "" - -msgid "verify all revisions of largefiles not just current" -msgstr "" - -msgid "verify largefile contents not just existence" -msgstr "" - -msgid "display outgoing largefiles" -msgstr "visa utgående largefiles" - -msgid "download all pulled versions of largefiles" -msgstr "" - -msgid "download all versions of all largefiles" -msgstr "" - msgid "manage a stack of patches" msgstr "hantera en uppsättning patchar" @@ -4298,50 +3270,11 @@ msgstr "" "andra fallet." msgid "" -"It may be desirable for mq changesets to be kept in the secret phase (see\n" -":hg:`help phases`), which can be enabled with the following setting::" -msgstr "" -"Det kan vara önskvärt att hålla alla mq-ändringar i secret-fasen (se\n" -":hg:`help phases`), något som kan aktiveras med följande inställning::" - -msgid "" -" [mq]\n" -" secret = True" -msgstr "" -" [mq]\n" -" secret = True" - -msgid "" "You will by default be managing a patch queue named \"patches\". You can\n" -"create other, independent patch queues with the :hg:`qqueue` command." +"create other, independent patch queues with the :hg:`qqueue` command.\n" msgstr "" "Du kommer som standard att handera en patchkö vid namn \"patches\". Du\n" -"kan skapa en ny, oberoende patchkö med kommandot :hg:`qqueue`." - -msgid "" -"If the working directory contains uncommitted files, qpush, qpop and\n" -"qgoto abort immediately. If -f/--force is used, the changes are\n" -"discarded. Setting::" -msgstr "" -"Om arbetskatalogen innehåller oarkiverade filer så kommer qpush, qpop\n" -"och qgoto omedelbart att avslutas. Om -f/--force används, så kommer\n" -"ändringarna att kastas bort. Inställningen::" - -msgid "" -" [mq]\n" -" keepchanges = True" -msgstr "" -" [mq]\n" -" keepchanges = True" - -msgid "" -"make them behave as if --keep-changes were passed, and non-conflicting\n" -"local changes will be tolerated and preserved. If incompatible options\n" -"such as -f/--force or --exact are passed, this setting is ignored.\n" -msgstr "" -"får dom att uppföra sig som om --keep-changes angetts, och konfliktfria\n" -"lokala ändringar tolereras och bevaras. Om inkompatibla flaggor som\n" -"-f/--force eller --exact anges, så ignoreras den här inställningen.\n" +"kan skapa en ny, oberoende patchkö med kommandot :hg:`qqueue`.\n" msgid "print first line of patch header" msgstr "skriv ut första raden i patchheadern" @@ -4359,35 +3292,35 @@ msgid "%s appears more than once in %s" msgstr "%s finns mer än en gång i %s" msgid "guard cannot be an empty string" -msgstr "skyddet kan inte vara en tom sträng" +msgstr "guard kan inte vara en tom sträng" #, python-format msgid "guard %r starts with invalid character: %r" -msgstr "skyddet %r börjar med ett otillåtet tecken: %r" +msgstr "" #, python-format msgid "invalid character in guard %r: %r" -msgstr "otillåtet tecken i skyddet %r: %r" +msgstr "" #, python-format msgid "guard %r too short" -msgstr "skyddet %r är för kort" +msgstr "" #, python-format msgid "guard %r starts with invalid char" -msgstr "skyddet %r börjar med ett otillåtet tecken" +msgstr "" #, python-format msgid "allowing %s - no guards in effect\n" -msgstr "tillåter %s - inga skydd aktiva\n" +msgstr "" #, python-format msgid "allowing %s - no matching negative guards\n" -msgstr "tillåter %s - inga matchande negativa skydd\n" +msgstr "" #, python-format msgid "allowing %s - guarded by %s\n" -msgstr "tillåter %s - skyddad av %s\n" +msgstr "" #, python-format msgid "skipping %s - guarded by %s\n" @@ -4395,72 +3328,62 @@ msgstr "hoppar över %s - skyddad av %s\n" #, python-format msgid "skipping %s - no matching guards\n" -msgstr "hoppar över %s - inga matchande skydd\n" +msgstr "" #, python-format msgid "error removing undo: %s\n" -msgstr "fel vid borttagning av återställare: %s\n" - -#, python-format -msgid "saving current version of %s as %s\n" -msgstr "sparar nuvarande revision av %s som %s\n" +msgstr "" #, python-format msgid "apply failed for patch %s" -msgstr "misslyckades att applicera patchen %s" +msgstr "" #, python-format msgid "patch didn't work out, merging %s\n" -msgstr "patchning gick inte bra, sammanfogar %s\n" +msgstr "" #, python-format msgid "update returned %d" -msgstr "update returnerade %d" +msgstr "" msgid "repo commit failed" -msgstr "arkivering misslyckades" +msgstr "" #, python-format msgid "unable to read %s" -msgstr "kan inte läsa %s" +msgstr "" #, python-format msgid "patch %s does not exist\n" -msgstr "patchen %s finns inte\n" +msgstr "" #, python-format msgid "patch %s is not applied\n" -msgstr "patchen %s är inte applicerad\n" +msgstr "" msgid "patch failed, unable to continue (try -v)\n" -msgstr "patchning misslyckades, kan inte fortsätta (försök med -v)\n" +msgstr "" #, python-format msgid "applying %s\n" -msgstr "applicerar %s\n" +msgstr "" #, python-format msgid "unable to read %s\n" -msgstr "kan inte läsa %s\n" - -msgid "local changes found, refresh first" -msgstr "lokala ändringar hittades, uppdatera först" +msgstr "" #, python-format msgid "patch %s is empty\n" -msgstr "patchen %s är tom\n" - -msgid "qpush exactly duplicates child changeset" -msgstr "qpush duplicerar barnändringen exakt" +msgstr "" msgid "repository commit failed" -msgstr "arkivering misslyckades" +msgstr "" msgid "patch failed, rejects left in working dir\n" -msgstr "patchning misslyckades, avslag lämnades i arbetskatalogen\n" +msgstr "" msgid "fuzz found when applying patch, stopping\n" -msgstr "ludd upptäcktes när patchen applicerades, stannar\n" +msgstr "" #, python-format msgid "revision %s refers to unknown patches: %s\n" @@ -4472,51 +3395,54 @@ msgstr "okända patchar: %s\n" #, python-format msgid "revision %d is not managed" -msgstr "revision %d hanteras inte" +msgstr "" #, python-format msgid "cannot delete revision %d above applied patches" -msgstr "kan inte radera revision %d ovanför applicerade patchar" +msgstr "" #, python-format msgid "patch %s finalized without changeset message\n" -msgstr "patchen %s färdigställdes utan arkiveringsmeddelande\n" +msgstr "" msgid "qdelete requires at least one revision or patch name" -msgstr "qdelete kräver minst en revision eller ett patchnamn" +msgstr "" #, python-format msgid "cannot delete applied patch %s" -msgstr "kan inte radera applicerad patch %s" +msgstr "" #, python-format msgid "patch %s not in series file" -msgstr "patchen %s finns inte i series-filen" +msgstr "" msgid "no patches applied" -msgstr "inga patcher applicerade" +msgstr "" msgid "working directory revision is not qtip" -msgstr "arbetskatalogen är inte qtip" +msgstr "" #, python-format msgid "uncommitted changes in subrepository %s" msgstr "oarkiverade ändringar i underarkivet %s" +msgid "local changes found, refresh first" +msgstr "" + msgid "local changes found" -msgstr "lokala ändringar hittades" +msgstr "" #, python-format msgid "\"%s\" cannot be used as the name of a patch" -msgstr "\"%s\" kan inte användas som patchnamn" +msgstr "" #, python-format msgid "patch name cannot begin with \"%s\"" -msgstr "patchnamn kan inte börja med \"%s\"" +msgstr "" #, python-format msgid "\"%s\" cannot be used in the name of a patch" -msgstr "\"%s\" kan inte användas i patchnamn" +msgstr "" #, python-format msgid "\"%s\" already exists as a directory" @@ -4526,9 +3452,6 @@ msgstr "\"%s\" finns redan som katalog" msgid "patch \"%s\" already exists" msgstr "patchen \"%s\" existerar redan" -msgid "cannot use both --force and --keep-changes" -msgstr "kan inte ange både --force och --keep-changes" - msgid "cannot manage merge changesets" msgstr "kan inte hantera sammanfogningar" @@ -4538,21 +3461,21 @@ msgstr "kan inte skriva patchen \"%s\": %s" #, python-format msgid "error unlinking %s\n" -msgstr "fel vid radering av %s\n" +msgstr "" #, python-format msgid "patch name \"%s\" is ambiguous:\n" -msgstr "patchnamnet \"%s\" är tvetydligt:\n" +msgstr "" #, python-format msgid "patch %s not in series" -msgstr "patchen %s finns inte i serien" +msgstr "" msgid "(working directory not at a head)\n" -msgstr "(arbetskatalogen är inte på ett huvud)\n" +msgstr "" msgid "no patches in series\n" -msgstr "inga patchar i serien\n" +msgstr "" #, python-format msgid "qpush: %s is already at the top\n" @@ -4560,27 +3483,24 @@ msgstr "qpush: %s är redan på toppen\n" #, python-format msgid "cannot push to a previous patch: %s" -msgstr "kan inte pusha till en tidigare patch: %s" +msgstr "" #, python-format msgid "guarded by %s" msgstr "skyddad av %s" msgid "no matching guards" -msgstr "inga matchande skydd" +msgstr "" #, python-format msgid "cannot push '%s' - %s\n" -msgstr "kan inte pusha '%s' - %s\n" +msgstr "" msgid "all patches are currently applied\n" -msgstr "alla patchar är applicerade\n" +msgstr "" msgid "patch series already fully applied\n" -msgstr "patchserien är redan fullständigt applicerad\n" - -msgid "cannot use --exact and --keep-changes together" -msgstr "kan inte använda --exact och --keep-changes tillsammans" +msgstr "" msgid "cannot use --exact and --move together" msgstr "kan inte använda --exact och --move tillsammans" @@ -4596,80 +3516,68 @@ msgid "please specify the patch to move" msgstr "ange patchen som ska flyttas" msgid "cleaning up working directory..." -msgstr "rensar upp arbetskatalogen..." +msgstr "" #, python-format msgid "errors during apply, please fix and refresh %s\n" -msgstr "fel vid applicering, fixa och uppdatera %s\n" +msgstr "" #, python-format msgid "now at: %s\n" -msgstr "är nu på: %s\n" +msgstr "" #, python-format msgid "patch %s is not applied" -msgstr "patchen %s är inte applicerad" +msgstr "" msgid "no patches applied\n" -msgstr "inga patchar applicerade\n" +msgstr "" #, python-format msgid "qpop: %s is already at the top\n" -msgstr "qpop: %s är redan på toppen\n" +msgstr "" msgid "qpop: forcing dirstate update\n" -msgstr "qpop: tvingar en uppdatering av dirstate\n" +msgstr "" #, python-format msgid "trying to pop unknown node %s" -msgstr "försöker att poppa okänd nod %s" +msgstr "" msgid "popping would remove a revision not managed by this patch queue" msgstr "" -"poppning skulle ta bort en revision som inte hanteras av denna patchkö" - -msgid "popping would remove an immutable revision" -msgstr "poppning skulle ta bort en oföränderlig revision" - -msgid "see \"hg help phases\" for details" -msgstr "se \"hg help phases\" för detaljer" msgid "deletions found between repo revs" -msgstr "raderingar hittades mellan arkivrevisioner" +msgstr "" #, python-format msgid "popping %s\n" -msgstr "poppar %s\n" +msgstr "" msgid "patch queue now empty\n" -msgstr "patchkön är nu tom\n" +msgstr "" msgid "cannot refresh a revision with children" -msgstr "kan inte uppdatera en revision med barn" - -msgid "cannot refresh immutable revision" -msgstr "kan inte uppdatera oföränderlig revision" +msgstr "" msgid "" "refresh interrupted while patch was popped! (revert --all, qpush to " "recover)\n" msgstr "" -"uppdatering avbröts medans patch var poppad! (revert --all, qpush för " -"att återställa)\n" msgid "patch queue directory already exists" -msgstr "katalog för patchkö finns redan" +msgstr "" #, python-format msgid "patch %s is not in series file" -msgstr "patchen %s finns inte i series-filen" +msgstr "" -msgid "no saved patch data found\n" -msgstr "ingen sparad patchdata hittades\n" +msgid "No saved patch data found\n" +msgstr "" #, python-format msgid "restoring status: %s\n" -msgstr "återställer status: %s\n" +msgstr "" msgid "save entry has children, leaving it alone\n" msgstr "" @@ -4685,14 +3593,14 @@ msgstr "" msgid "updating queue directory\n" msgstr "uppdaterar kökatalog\n" -msgid "unable to load queue repository\n" -msgstr "kan inte öppna köarkiv\n" +msgid "Unable to load queue repository\n" +msgstr "" msgid "save: no patches applied, exiting\n" msgstr "" msgid "status is already saved\n" -msgstr "status är redan sparad\n" +msgstr "" msgid "hg patches saved state" msgstr "" @@ -4707,9 +3615,6 @@ msgstr "" msgid "option \"-r\" not valid when importing files" msgstr "" -msgid "no files or revisions specified" -msgstr "inga filer eller revisioner angivna" - msgid "option \"-n\" not valid when importing multiple patches" msgstr "" @@ -4730,10 +3635,6 @@ msgid "revision %d has unmanaged children" msgstr "" #, python-format -msgid "revision %d is not mutable" -msgstr "" - -#, python-format msgid "cannot import merge revision %d" msgstr "" @@ -4777,9 +3678,8 @@ msgstr "" msgid "" " The patches must not be applied, and at least one patch is required. " -"Exact\n" -" patch identifiers must be given. With -k/--keep, the patch files are\n" -" preserved in the patch directory." +"With\n" +" -k/--keep, the patch files are preserved in the patch directory." msgstr "" msgid "" @@ -4787,8 +3687,8 @@ msgid "" " use the :hg:`qfinish` command." msgstr "" -msgid "show only the preceding applied patch" -msgstr "visa bara den föregående applicerade patchen" +msgid "show only the last patch" +msgstr "visa bara den sista patchen" msgid "hg qapplied [-1] [-s] [PATCH]" msgstr "hg qapplied [-1] [-s] [PATCH]" @@ -4835,11 +3735,11 @@ msgstr "använd gits utökade diff-format" msgid "qpush after importing" msgstr "" -msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]..." -msgstr "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... [FIL]..." +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." +msgstr "hg qimport [-e] [-n NAMN] [-f] [-g] [-P] [-r REV]... FIL..." -msgid "import a patch or existing changeset" -msgstr "importera en patch eller existerande ändring" +msgid "import a patch" +msgstr "importera en patch" msgid "" " The patch is inserted into the series after the last applied\n" @@ -4928,10 +3828,10 @@ msgid "location of source patch repository" msgstr "" msgid "hg qclone [OPTION]... SOURCE [DEST]" -msgstr "hg qclone [FLAGGA]... KÄLLA [DEST]" +msgstr "" msgid "clone main and patch repository at same time" -msgstr "klona huvud- och patcharkivet på samma gång" +msgstr "" msgid "" " If source is local, destination will have no patches applied. If\n" @@ -4974,7 +3874,7 @@ msgid "updating destination repository\n" msgstr "" msgid "hg qcommit [OPTION]... [FILE]..." -msgstr "hg qcommit [FLAGGA]... [FIL]..." +msgstr "" msgid "commit changes in the queue repository (DEPRECATED)" msgstr "arkivera ändringar i köarkivet (FÖRÅLDRAD)" @@ -4984,52 +3884,55 @@ msgstr "" " Detta är ett föråldrat kommando; använd :hg:`commit --mq` istället." msgid "print patches not in series" -msgstr "visa patchas som inte är i serien" +msgstr "" msgid "hg qseries [-ms]" -msgstr "hg qseries [-ms]" +msgstr "" msgid "print the entire series file" -msgstr "visa hela seriefilen" +msgstr "" msgid "hg qtop [-s]" msgstr "hg qtop [-s]" msgid "print the name of the current patch" -msgstr "visa namnet på den nuvarande patchen" +msgstr "" msgid "hg qnext [-s]" msgstr "hg qnext [-s]" -msgid "print the name of the next pushable patch" -msgstr "visa namnet på den nästkommande patchen" +msgid "print the name of the next patch" +msgstr "" msgid "hg qprev [-s]" msgstr "hg qprev [-s]" -msgid "print the name of the preceding applied patch" -msgstr "skriv ut namnet på föregående applicerade patch" +msgid "print the name of the previous patch" +msgstr "" msgid "import uncommitted changes (DEPRECATED)" msgstr "importera icke arkiverade ändringar (FÖRLEGAD)" msgid "add \"From: <current user>\" to patch" -msgstr "lägg till \"From: <denna användare>\" i patch" +msgstr "" + +msgid "USER" +msgstr "" msgid "add \"From: <USER>\" to patch" -msgstr "lägg till \"From: <ANVÄNDARE>\" i patch" +msgstr "" msgid "add \"Date: <current date>\" to patch" -msgstr "lägg till \"Date: <nuvarande datum>\" i patch" +msgstr "" msgid "add \"Date: <DATE>\" to patch" -msgstr "lägg till \"Date: <DATUM>\" i patch" +msgstr "" msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." msgstr "hg qnew [-e] [-m TEXT] [-l FIL] PATCH [FIL]..." msgid "create a new patch" -msgstr "skapa en ny patch" +msgstr "" msgid "" " qnew creates a new patch on top of the currently-applied patch (if\n" @@ -5039,30 +3942,18 @@ msgid "" " only changes to matching files to the new patch, leaving the rest\n" " as uncommitted modifications." msgstr "" -" qnew skapar en ny patch ovanpå redan applicerade patchar (om några).\n" -" Patchen kommer att initialiseras med oarkiverade ändringar i\n" -" arbetskatalogen. Du kan också använda -I/--include, -X/--exclude,\n" -" och/eller en uppsättning filer efter patchnamnet för att bara lägga\n" -" till ändringar i dessa filer i patchen, och lämna resten som\n" -" oarkiverade ändringar." msgid "" " -u/--user and -d/--date can be used to set the (given) user and\n" " date, respectively. -U/--currentuser and -D/--currentdate set user\n" " to current user and date to current date." msgstr "" -" -u/--user och -d/--date kan användas för att sätta (den angivna)\n" -" användaren respektive datumet. -U/--currentuser och -D/--currentdate\n" -" sätter användare till denna användaren och datumed till nuvarande datum." msgid "" " -e/--edit, -m/--message or -l/--logfile set the patch header as\n" " well as the commit message. If none is specified, the header is\n" " empty and the commit message is '[mq]: PATCH'." msgstr "" -" -e/--edit, -m/--message or -l/--logfile sätter både patchhuvudet och\n" -" arkiveringsmeddelandet. Om inget är angivet, så är huvudet tomt och\n" -" arkiveringsmeddelandet är '[mq]: PATCH'." msgid "" " Use the -g/--git option to keep the patch in the git extended diff\n" @@ -5070,10 +3961,6 @@ msgid "" " is important for preserving permission changes and copy/rename\n" " information." msgstr "" -" Använd flaggan -g/--git gör att lagra patchen i gits utökade\n" -" diff-format. Läs hjälpämnet om diffar för mer inormation om varför\n" -" detta är viktigt för att lagra rättighetsändringar och information om\n" -" kopior/namnbyten." msgid "" " Returns 0 on successful creation of a new patch.\n" @@ -5098,7 +3985,7 @@ msgid "add/update date field in patch with given date" msgstr "" msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." -msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FIL] [-s] [FIL]..." +msgstr "" msgid "update the current patch" msgstr "uppdatera den nuvarande patchen" @@ -5182,8 +4069,8 @@ msgid "qfold requires at least one patch name" msgstr "" #, python-format -msgid "skipping already folded patch %s\n" -msgstr "hoppar över redan hopvikta patchen %s\n" +msgid "Skipping already folded patch %s\n" +msgstr "Hoppar över redan hopvikta patchen %s\n" #, python-format msgid "qfold cannot fold already applied patch %s" @@ -5193,15 +4080,9 @@ msgstr "" msgid "error folding patch %s" msgstr "" -msgid "tolerate non-conflicting local changes" -msgstr "" - msgid "overwrite any local changes" msgstr "" -msgid "do not save backup copies of files" -msgstr "spara inte backup-kopior av filer" - msgid "hg qgoto [OPTION]... PATCH" msgstr "" @@ -5243,7 +4124,7 @@ msgid " To set guards on another patch::" msgstr "" msgid " hg qguard other.patch -- +2.6.17 -stable" -msgstr " hg qguard other.patch -- +2.6.17 -stable" +msgstr "" msgid "cannot mix -l/--list with options or arguments" msgstr "" @@ -5253,7 +4134,7 @@ msgstr "" #, python-format msgid "no patch named %s" -msgstr "ingen patch med namnet %s" +msgstr "" msgid "hg qheader [PATCH]" msgstr "hg qheader [PATCH]" @@ -5271,7 +4152,7 @@ msgid "list patch name in commit text" msgstr "" msgid "apply all patches" -msgstr "applicera alla patchar" +msgstr "" msgid "merge from another queue (DEPRECATED)" msgstr "" @@ -5289,10 +4170,8 @@ msgid "push the next patch onto the stack" msgstr "" msgid "" -" By default, abort if the working directory contains uncommitted\n" -" changes. With --keep-changes, abort only if the uncommitted files\n" -" overlap with patched files. With -f/--force, backup and patch over\n" -" uncommitted changes." +" When -f/--force is applied, all local changes in patched files\n" +" will be lost." msgstr "" msgid "no saved queues found, please use -n\n" @@ -5300,13 +4179,13 @@ msgstr "" #, python-format msgid "merging with queue at: %s\n" -msgstr "sammanfogar med kö vid: %s\n" +msgstr "" msgid "pop all patches" -msgstr "poppa alla patchar" +msgstr "" msgid "queue name to pop (DEPRECATED)" -msgstr "könamn att poppa (FÖRLEGAD)" +msgstr "" msgid "forget any local changes to patched files" msgstr "" @@ -5318,16 +4197,9 @@ msgid "pop the current patch off the stack" msgstr "" msgid "" -" Without argument, pops off the top of the patch stack. If given a\n" -" patch name, keeps popping off patches until the named patch is at\n" -" the top of the stack." -msgstr "" - -msgid "" -" By default, abort if the working directory contains uncommitted\n" -" changes. With --keep-changes, abort only if the uncommitted files\n" -" overlap with patched files. With -f/--force, backup and discard\n" -" changes made to such files." +" By default, pops off the top of the patch stack. If given a patch\n" +" name, keeps popping off patches until the named patch is at the\n" +" top of the stack." msgstr "" #, python-format @@ -5390,11 +4262,6 @@ msgstr "" msgid "copy %s to %s\n" msgstr "" -msgid "" -"strip specified revision (optional, can specify revisions without this " -"option)" -msgstr "" - msgid "force removal of changesets, discard uncommitted changes (no backup)" msgstr "" "tvinga radering av ändringar, kassera oarkiverade ändringar (ingen backup)" @@ -5412,17 +4279,11 @@ msgstr "inga säkerhetskopior" msgid "no backups (DEPRECATED)" msgstr "inga säkerhetskopior (FÖRÅLDRAD)" -msgid "ignored (DEPRECATED)" -msgstr "ignorerad (FÖRÅLDRAD)" - msgid "do not modify working copy during strip" msgstr "modifiera inte arbetskopian vid strippning" -msgid "remove revs only reachable from given bookmark" -msgstr "radera revisioner som bara nås från givet bokmärke" - -msgid "hg strip [-k] [-f] [-n] [-B bookmark] [-r] REV..." -msgstr "hg strip [-k] [-f] [-n] [-B bokmärke] [-r] REV..." +msgid "hg strip [-k] [-f] [-n] REV..." +msgstr "hg strip [-k] [-f] [-n] REV..." msgid "strip changesets and all their descendants from the repository" msgstr "" @@ -5455,20 +4316,6 @@ msgid "" " operation completes." msgstr "" -msgid "" -" Strip is not a history-rewriting operation and can be used on\n" -" changesets in the public phase. But if the stripped changesets have\n" -" been pushed to a remote repository you will likely pull them again." -msgstr "" - -#, python-format -msgid "bookmark '%s' not found" -msgstr "bokmärket '%s' hittades inte" - -#, python-format -msgid "bookmark '%s' deleted\n" -msgstr "bokmärket '%s' raderad\n" - msgid "empty revision set" msgstr "tomt revisionsset" @@ -5594,15 +4441,9 @@ msgstr "" msgid "no revisions specified" msgstr "" -msgid "warning: uncommitted changes in the working directory\n" -msgstr "varning: oarkiverade ändringar i arbetskatalogen\n" - msgid "list all available queues" msgstr "visa alla tillgängliga köer" -msgid "print name of active queue" -msgstr "visa namnet på aktiv kö" - msgid "create new queue" msgstr "skapa ny kö" @@ -5610,7 +4451,7 @@ msgid "rename active queue" msgstr "döp om aktiv kö" msgid "delete reference to queue" -msgstr "radera referens till kö" +msgstr "" msgid "delete queue, and remove patch dir" msgstr "" @@ -5631,9 +4472,7 @@ msgid "" "registered\n" " queues - by default the \"normal\" patches queue is registered. The " "currently\n" -" active queue will be marked with \"(active)\". Specifying --active will " -"print\n" -" only the name of the active queue." +" active queue will be marked with \"(active)\"." msgstr "" msgid "" @@ -5682,12 +4521,15 @@ msgstr "" msgid "cannot commit over an applied mq patch" msgstr "" +msgid "source has mq patches applied" +msgstr "" + #, python-format msgid "mq status file refers to unknown node %s\n" msgstr "" #, python-format -msgid "tag %s overrides mq patch of the same name\n" +msgid "Tag %s overrides mq patch of the same name\n" msgstr "" msgid "cannot import over an applied patch" @@ -5726,196 +4568,94 @@ msgstr "mq tar inga argument" msgid "operate on patch repository" msgstr "arbeta med patcharkiv" -msgid "hooks for sending email push notifications" +msgid "hooks for sending email notifications at commit/push time" msgstr "" msgid "" -"This extension implements hooks to send email notifications when\n" -"changesets are sent from or received by the local repository." +"Subscriptions can be managed through a hgrc file. Default mode is to\n" +"print messages to stdout, for testing and configuring." msgstr "" msgid "" -"First, enable the extension as explained in :hg:`help extensions`, and\n" -"register the hook you want to run. ``incoming`` and ``changegroup`` hooks\n" -"are run when changesets are received, while ``outgoing`` hooks are for\n" -"changesets sent to another repository::" +"To use, configure the notify extension and enable it in hgrc like\n" +"this::" msgstr "" msgid "" -" [hooks]\n" -" # one email for each incoming changeset\n" -" incoming.notify = python:hgext.notify.hook\n" -" # one email for all incoming changesets\n" -" changegroup.notify = python:hgext.notify.hook" +" [extensions]\n" +" notify =" msgstr "" msgid "" -" # one email for all outgoing changesets\n" +" [hooks]\n" +" # one email for each incoming changeset\n" +" incoming.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets incoming at one time\n" +" changegroup.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets outgoing at one time (client side)\n" " outgoing.notify = python:hgext.notify.hook" msgstr "" msgid "" -"This registers the hooks. To enable notification, subscribers must\n" -"be assigned to repositories. The ``[usersubs]`` section maps multiple\n" -"repositories to a given recipient. The ``[reposubs]`` section maps\n" -"multiple recipients to a single repository::" -msgstr "" - -msgid "" -" [usersubs]\n" -" # key is subscriber email, value is a comma-separated list of repo glob\n" -" # patterns\n" -" user@host = pattern" -msgstr "" - -msgid "" -" [reposubs]\n" -" # key is glob pattern, value is a comma-separated list of subscriber\n" -" # emails\n" -" pattern = user@host" -msgstr "" - -msgid "" -"Glob patterns are matched against absolute path to repository\n" -"root." -msgstr "" - -msgid "" -"In order to place them under direct user management, ``[usersubs]`` and\n" -"``[reposubs]`` sections may be placed in a separate ``hgrc`` file and\n" -"incorporated by reference::" -msgstr "" - -msgid "" " [notify]\n" -" config = /path/to/subscriptionsfile" +" # config items go here" msgstr "" -msgid "" -"Notifications will not be sent until the ``notify.test`` value is set\n" -"to ``False``; see below." -msgstr "" - -msgid "" -"Notifications content can be tweaked with the following configuration " -"entries:" +msgid "Required configuration items::" msgstr "" -msgid "" -"notify.test\n" -" If ``True``, print messages to stdout instead of sending them. Default: " -"True." +msgid " config = /path/to/file # file containing subscriptions" msgstr "" -msgid "" -"notify.sources\n" -" Space-separated list of change sources. Notifications are activated only\n" -" when a changeset's source is in this list. Sources may be:" +msgid "Optional configuration items::" msgstr "" msgid "" -" :``serve``: changesets received via http or ssh\n" -" :``pull``: changesets received via ``hg pull``\n" -" :``unbundle``: changesets received via ``hg unbundle``\n" -" :``push``: changesets sent or received via ``hg push``\n" -" :``bundle``: changesets sent via ``hg unbundle``" -msgstr "" - -msgid " Default: serve." -msgstr " Standard: serve" - -msgid "" -"notify.strip\n" -" Number of leading slashes to strip from url paths. By default, " -"notifications\n" -" reference repositories with their absolute path. ``notify.strip`` lets " -"you\n" -" turn them into relative paths. For example, ``notify.strip=3`` will " -"change\n" -" ``/long/path/repository`` into ``repository``. Default: 0." -msgstr "" - -msgid "" -"notify.domain\n" -" Default email domain for sender or recipients with no explicit domain." -msgstr "" - -msgid "" -"notify.style\n" -" Style file to use when formatting emails." -msgstr "" - -msgid "" -"notify.template\n" -" Template to use when formatting emails." -msgstr "" - -msgid "" -"notify.incoming\n" -" Template to use when run as an incoming hook, overriding ``notify." -"template``." -msgstr "" - -msgid "" -"notify.outgoing\n" -" Template to use when run as an outgoing hook, overriding ``notify." -"template``." -msgstr "" - -msgid "" -"notify.changegroup\n" -" Template to use when running as a changegroup hook, overriding\n" -" ``notify.template``." -msgstr "" - -msgid "" -"notify.maxdiff\n" -" Maximum number of diff lines to include in notification email. Set to 0\n" -" to disable the diff, or -1 to include all of it. Default: 300." -msgstr "" - -msgid "" -"notify.maxsubject\n" -" Maximum number of characters in email's subject line. Default: 67." -msgstr "" - -msgid "" -"notify.diffstat\n" -" Set to True to include a diffstat before diff content. Default: True." -msgstr "" - -msgid "" -"notify.merge\n" -" If True, send notifications for merge changesets. Default: True." +" test = True # print messages to stdout for testing\n" +" strip = 3 # number of slashes to strip for url paths\n" +" domain = example.com # domain to use if committer missing domain\n" +" style = ... # style file to use when formatting email\n" +" template = ... # template to use when formatting email\n" +" incoming = ... # template to use when run as incoming hook\n" +" outgoing = ... # template to use when run as outgoing hook\n" +" changegroup = ... # template to use when run as changegroup hook\n" +" maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" +" maxsubject = 67 # truncate subject line longer than this\n" +" diffstat = True # add a diffstat before the diff content\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" +" # (serve == ssh or http, push, pull, bundle)\n" +" merge = False # send notification for merges (default True)\n" +" [email]\n" +" from = user@host.com # email address to send as if none given\n" +" [web]\n" +" baseurl = http://hgserver/... # root of hg web site for browsing commits" msgstr "" msgid "" -"notify.mbox\n" -" If set, append mails to this mbox file instead of sending. Default: None." +"The notify config file has same format as a regular hgrc file. It has\n" +"two sections so you can express subscriptions in whatever way is\n" +"handier for you." msgstr "" msgid "" -"notify.fromauthor\n" -" If set, use the committer of the first changeset in a changegroup for\n" -" the \"From\" field of the notification mail. If not set, take the user\n" -" from the pushing repo. Default: False." +" [usersubs]\n" +" # key is subscriber email, value is \",\"-separated list of glob patterns\n" +" user@host = pattern" msgstr "" msgid "" -"If set, the following entries will also be used to customize the\n" -"notifications:" +" [reposubs]\n" +" # key is glob pattern, value is \",\"-separated list of subscriber emails\n" +" pattern = user@host" msgstr "" -msgid "" -"email.from\n" -" Email ``From`` address to use if none can be found in the generated\n" -" email content." +msgid "Glob patterns are matched against path to repository root." msgstr "" msgid "" -"web.baseurl\n" -" Root repository URL to combine with repository paths when making\n" -" references. See also ``notify.strip``." +"If you like, you can put notify config file in repository that users\n" +"can push changes to, they can manage their own subscriptions.\n" msgstr "" #, python-format @@ -5961,6 +4701,20 @@ msgid "" msgstr "" msgid "" +"If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" +"setting::" +msgstr "" +"Om du får felmeddelanden om \"BROKEN PIPE\", så kan du deaktivera dem\n" +"genom att sätta::" + +msgid "" +" [pager]\n" +" quiet = True" +msgstr "" +" [pager]\n" +" quiet = True" + +msgid "" "You can disable the pager for certain commands by adding them to the\n" "pager.ignore list::" msgstr "" @@ -6089,11 +4843,15 @@ msgid "" msgstr "" "Du kan också endera konfigurera alternativet method i email-sektionen att\n" "vara en sendmail-kompatibel sändare eller fylla i sektionen [smtp] så att\n" -"patchbomb-utökningen automatiskt kan skicka patchbomber från kommandoraden.\n" +"patchbomb-utäkningen automatiskt kan skicka patchbomber från kommandoraden.\n" "Se sektionerna [email] och [smtp] i hgrc(5) för detaljer.\n" -msgid "send patches as inline message text (default)" -msgstr "" +#, python-format +msgid "%s Please enter a valid value" +msgstr "%s Ange ett giltigt värde" + +msgid "Please enter a valid value.\n" +msgstr "Ange ett giltigt värde.\n" msgid "send patches as attachments" msgstr "" @@ -6213,9 +4971,7 @@ msgid "" " By default the patch is included as text in the email body for\n" " easy reviewing. Using the -a/--attach option will instead create\n" " an attachment for the patch. With -i/--inline an inline attachment\n" -" will be created. You can include a patch both as text in the email\n" -" body and as a regular or an inline attachment by combining the\n" -" -a/--attach or -i/--inline with the --body option." +" will be created." msgstr "" msgid "" @@ -6291,6 +5047,10 @@ msgid "" " " msgstr "" +#, python-format +msgid "comparing with %s\n" +msgstr "jämför med %s\n" + msgid "no changes found\n" msgstr "inga ändringar hittades\n" @@ -6312,12 +5072,9 @@ msgid "" msgstr "" #, python-format -msgid "this patch series consists of %d patches." +msgid "This patch series consists of %d patches." msgstr "" -msgid "no recipient addresses provided" -msgstr "inga mottagaradresser angavs" - msgid "" "\n" "Final summary:" @@ -6335,18 +5092,21 @@ msgstr "" msgid "patchbomb canceled" msgstr "" -msgid "displaying " -msgstr "visar " - -msgid "sending " -msgstr "sänder " +msgid "Displaying " +msgstr "Visar " -msgid "sending" -msgstr "sänder" +msgid "Writing " +msgstr "Skriver " msgid "writing" msgstr "skriver" +msgid "Sending " +msgstr "Sänder " + +msgid "sending" +msgstr "sänder" + msgid "show progress bars for some actions" msgstr "" @@ -6363,9 +5123,6 @@ msgstr "" msgid "" " [progress]\n" " delay = 3 # number of seconds (float) before showing the progress bar\n" -" changedelay = 1 # changedelay: minimum delay before showing a new topic.\n" -" # If set to less than 3 * refresh, that value will\n" -" # be used instead.\n" " refresh = 0.1 # time in seconds between refreshes of the progress bar\n" " format = topic bar number estimate # format of the progress bar\n" " width = <none> # if set, the maximum width of the progress information\n" @@ -6484,12 +5241,12 @@ msgid "warning: %s\n" msgstr "" #, python-format -msgid "removing file %s\n" -msgstr "tar bort file %s\n" +msgid "Removing file %s\n" +msgstr "" #, python-format -msgid "removing directory %s\n" -msgstr "tar bort katalogen %s\n" +msgid "Removing directory %s\n" +msgstr "" msgid "command to move sets of revisions to a different ancestor" msgstr "" @@ -6512,9 +5269,6 @@ msgid "" "ancestor of base and dest)" msgstr "" -msgid "rebase these revisions" -msgstr "" - msgid "rebase onto the specified changeset" msgstr "" @@ -6524,9 +5278,6 @@ msgstr "" msgid "use text as collapse commit message" msgstr "använd text som kollapsarkiveringsmeddelande" -msgid "invoke editor on commit messages" -msgstr "starta editor för arkiveringsmeddelande" - msgid "read collapse commit message from file" msgstr "läs kollapsarkiveringsmeddelandet från fil" @@ -6536,8 +5287,8 @@ msgstr "" msgid "keep original branch names" msgstr "" -msgid "(DEPRECATED)" -msgstr "(FÖRLEGAD)" +msgid "force detaching of source from its original branch" +msgstr "" msgid "specify merge tool" msgstr "ange sammanfogningsverktyg" @@ -6627,33 +5378,23 @@ msgstr "" msgid "cannot use collapse with continue or abort" msgstr "" +msgid "cannot use detach with continue or abort" +msgstr "kan inte använda detach med continue eller abort" + msgid "abort and continue do not allow specifying revisions" msgstr "" msgid "tool option will be ignored\n" msgstr "" -msgid "cannot specify both a source and a base" -msgstr "kan inte ange både en källa och en bas" - msgid "cannot specify both a revision and a base" msgstr "" -msgid "cannot specify both a revision and a source" -msgstr "kan inte ange både en revision och en källa" - -msgid "can't remove original changesets with unrebased descendants" -msgstr "" - -msgid "use --keep to keep original changesets" -msgstr "använd --keep för att bevara originaländringarna" +msgid "detach requires a revision to be specified" +msgstr "detach kräver att en revision anges" -#, python-format -msgid "can't rebase immutable changeset %s" -msgstr "" - -msgid "see hg help phases for details" -msgstr "" +msgid "cannot specify a base with detach" +msgstr "kan inte ange en bas med detach" msgid "nothing to rebase\n" msgstr "" @@ -6697,10 +5438,6 @@ msgstr "" msgid "no rebase in progress" msgstr "" -#, python-format -msgid "can't abort rebase due to immutable changesets %s" -msgstr "" - msgid "warning: new changesets detected on target branch, can't abort\n" msgstr "" @@ -6710,18 +5447,11 @@ msgstr "" msgid "cannot rebase onto an applied mq patch" msgstr "" -msgid "no matching revisions" -msgstr "" - -msgid "can't rebase multiple roots" -msgstr "" - msgid "source is ancestor of destination" msgstr "" -#, python-format -msgid "updating bookmark %s\n" -msgstr "uppdaterar bokmärket %s\n" +msgid "source is descendant of destination" +msgstr "" msgid "--tool can only be used with --rebase" msgstr "" @@ -6733,7 +5463,7 @@ msgid "specify merge tool for rebase" msgstr "ange sammanfogningsverktyg för ombasering" msgid "commands to interactively select changes for commit/qrefresh" -msgstr "interaktivt val av ändringar för commit/qrefresh" +msgstr "" msgid "ignore white space when comparing lines" msgstr "ignorera blanktecken när rader jämförs" @@ -6745,100 +5475,65 @@ msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar vars rader är tomma" msgid "this modifies a binary file (all or nothing)\n" -msgstr "detta modifierar en binär fil (allt eller inget)\n" +msgstr "" msgid "this is a binary file\n" -msgstr "det här är en binär fil\n" +msgstr "" #, python-format msgid "%d hunks, %d lines changed\n" -msgstr "%d stycken, %d rader ändrade\n" +msgstr "" -msgid "[Ynesfdaq?]" -msgstr "[Ynesfdaq?]" +msgid "[Ynsfdaq?]" +msgstr "" msgid "&Yes, record this change" -msgstr "(&Y) Ja, lagra den här ändringen" +msgstr "" msgid "&No, skip this change" -msgstr "&Nej, hoppa över den här ändringen" - -msgid "&Edit the change manually" -msgstr "(&E) Redigera ändringen manuellt" +msgstr "" msgid "&Skip remaining changes to this file" -msgstr "(&S) Hoppa över kvarvarande ändringar i den här filen" +msgstr "" msgid "Record remaining changes to this &file" -msgstr "Spara kvarvarande ändringar till denna &fil" +msgstr "" msgid "&Done, skip remaining changes and files" -msgstr "&(D) Klar, hoppa över kvarvarande ändringar och filer" +msgstr "" msgid "Record &all changes to all remaining files" -msgstr "Spara &alla ändringar till alla kvarvarande filer" +msgstr "" msgid "&Quit, recording no changes" -msgstr "(&Q) Avsluta, spara inga ändringar" - -msgid "&?" -msgstr "&?" - -msgid "cannot edit patch for whole file" -msgstr "kan inte redigera patch för hel fil" - -msgid "cannot edit patch for binary file" -msgstr "kan inte redigera patch för binär fil" - -msgid "" -"\n" -"To remove '-' lines, make them ' ' lines (context).\n" -"To remove '+' lines, delete them.\n" -"Lines starting with # will be removed from the patch." msgstr "" -"\n" -"För att radera rader med '-', ersätt med blanka (' ') rader (kontext).\n" -"För att radera rader med '+', radera dom.\n" -"Rader som börjar med # kommer att raderas från patchen." -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"added to the record list. If it does not apply cleanly, a rejects\n" -"file will be generated: you can use that when you try again. If\n" -"all lines of the hunk are removed, then the edit is aborted and\n" -"the hunk is left unchanged.\n" +msgid "&?" msgstr "" -"Om patchen appliceras utan problem, kommer det redigerade stycket att\n" -"sparas. Om problem uppstår, kommer en .rej-fil att genereras: du kan\n" -"använde den när du försöker igen. Om alla rader i stycket raderas, så\n" -"avbryts redigeringen och stycket lämnas oförändrat.\n" - -msgid "edit failed" -msgstr "redigering misslyckades" msgid "user quit" -msgstr "användaren avslutade" +msgstr "" #, python-format msgid "examine changes to %s?" -msgstr "granska ändringar i %s?" +msgstr "" msgid " and " -msgstr " och " +msgstr "" #, python-format msgid "record this change to %r?" -msgstr "spara den här ändringen till %r?" +msgstr "" #, python-format msgid "record change %d/%d to %r?" -msgstr "spara ändring %d/%d till %r?" +msgstr "" msgid "hg record [OPTION]... [FILE]..." msgstr "hg record [FLAGGA]... [FIL]..." msgid "interactively select changes to commit" -msgstr "välj interaktivt ändringar för arkivering" +msgstr "" msgid "" " If a list of files is omitted, all changes reported by :hg:`status`\n" @@ -6853,43 +5548,31 @@ msgid "" " change to use. For each query, the following responses are\n" " possible::" msgstr "" -" Du kommer att frågas om du vill lagra ändrade filer, och i filer med\n" -" flera ändringar kommer du att få frågan för varje ändring. Vid varje\n" -" fråga är följande svar möjliga::" msgid "" " y - record this change\n" -" n - skip this change\n" -" e - edit this change manually" +" n - skip this change" msgstr "" -" y - lagra den här ändringen\n" -" n - hoppa över den här ändringen\n" -" e - redigera ändringen manuellt" msgid "" " s - skip remaining changes to this file\n" " f - record remaining changes to this file" msgstr "" -" s - hoppa över kvarvarande ändringar i den här filen\n" -" f - spara kvarvarande ändringar till denna fil" msgid "" " d - done, skip remaining changes and files\n" " a - record all changes to all remaining files\n" " q - quit, recording no changes" msgstr "" -" d - klar, hoppa över kvarvarande ändringar och filer\n" -" a - spara alla ändringar till alla kvarvarande filer\n" -" q - avsluta, spara inga ändringar" msgid " ? - display help" -msgstr " ? - visa hjälp" +msgstr "" msgid " This command is not available when committing a merge." -msgstr " Det här kommandot är inte tillgängligt vid sammanfogning." +msgstr "" msgid "interactively record a new patch" -msgstr "lägra en ny ändring interaktivt" +msgstr "" msgid "" " See :hg:`help qnew` & :hg:`help record` for more information and\n" @@ -6901,24 +5584,24 @@ msgstr "" " " msgid "'mq' extension not loaded" -msgstr "utökningen 'mq' är inte laddad" +msgstr "" #, python-format msgid "running non-interactively, use %s instead" -msgstr "kör icke-interaktivt, använd %s istället" +msgstr "" msgid "cannot partially commit a merge (use \"hg commit\" instead)" msgstr "" "kan inte delvis arkivera en sammanfogning (använd \"hg commit\" istället)" msgid "no changes to record\n" -msgstr "inga ändringar att lagra\n" +msgstr "" msgid "hg qrecord [OPTION]... PATCH [FILE]..." -msgstr "hg qrecord [FLAGGA]... PATCH [FIL]..." +msgstr "" msgid "interactively select changes to refresh" -msgstr "interaktivt val av ändringar att uppdatera" +msgstr "" msgid "recreates hardlinks between repository clones" msgstr "" @@ -6964,6 +5647,9 @@ msgstr "" msgid "hardlinks are not supported on this system" msgstr "hårda länkar stöds inte av detta system" +msgid "must specify local origin repository" +msgstr "måste ange lokalt utgångsarkiv" + #, python-format msgid "relinking %s to %s\n" msgstr "länkar om %s till %s\n" @@ -7088,17 +5774,6 @@ msgid "" " " msgstr "" -msgid "convert a shared repository to a normal one" -msgstr "konvertera ett delat arkiv till ett normalt" - -msgid "" -" Copy the store data to the repo and remove the sharedpath data.\n" -" " -msgstr "" - -msgid "this is not a shared repo" -msgstr "det här är inte ett delat arkiv" - msgid "do not create a working copy" msgstr "" @@ -7125,10 +5800,6 @@ msgid "skipping merge changeset %s:%s\n" msgstr "" #, python-format -msgid "%s is not a parent of %s" -msgstr "%s är inte en förälder till %s" - -#, python-format msgid "%s merged at %s\n" msgstr "" @@ -7146,6 +5817,10 @@ msgstr "" msgid "can only omit patchfile if merging" msgstr "" +#, python-format +msgid "%s: empty changeset" +msgstr "" + msgid "fix up the merge and run hg transplant --continue" msgstr "" @@ -7192,6 +5867,9 @@ msgstr "inget sådant alternativ\n" msgid "pull patches from REPO" msgstr "" +msgid "BRANCH" +msgstr "GREN" + msgid "pull patches from branch BRANCH" msgstr "" @@ -7204,9 +5882,6 @@ msgstr "" msgid "merge at REV" msgstr "" -msgid "parent to choose when transplanting merge" -msgstr "förälder att välja när sammanfogning transplanteras" - msgid "append transplant info to log message" msgstr "" @@ -7254,7 +5929,7 @@ msgid "" msgstr "" msgid "" -" :hg:`transplant --branch REV --all` will transplant the\n" +" :hg:`transplant --branch REVISION --all` will transplant the\n" " selected branch (up to the named revision) onto your current\n" " working directory." msgstr "" @@ -7267,11 +5942,6 @@ msgid "" msgstr "" msgid "" -" Merge changesets may be transplanted directly by specifying the\n" -" proper parent changeset by calling :hg:`transplant --parent`." -msgstr "" - -msgid "" " If no merges or revisions are provided, :hg:`transplant` will\n" " start an interactive changeset browser." msgstr "" @@ -7435,7 +6105,7 @@ msgid "" msgstr "" #, python-format -msgid "attempt to commit or push text file(s) using %s line endings\n" +msgid "Attempt to commit or push text file(s) using %s line endings\n" msgstr "" #, python-format @@ -7506,12 +6176,15 @@ msgstr "" msgid "archive prefix contains illegal components" msgstr "" -msgid "archiving" -msgstr "arkiverar" +msgid "cannot give prefix when archiving to files" +msgstr "" #, python-format -msgid "malformed line in .hg/bookmarks: %r\n" -msgstr "defekt rad i .hg/bookmarks: %r\n" +msgid "unknown archive type '%s'" +msgstr "" + +msgid "archiving" +msgstr "arkiverar" #, python-format msgid "bookmark '%s' contains illegal character" @@ -7522,12 +6195,12 @@ msgid "branch %s not found" msgstr "grenen %s hittades inte" #, python-format -msgid "divergent bookmark %s stored as %s\n" -msgstr "divergent bokmärke %s lagrat som %s\n" +msgid "updating bookmark %s\n" +msgstr "uppdaterar bokmärket %s\n" #, python-format -msgid "adding remote bookmark %s\n" -msgstr "lägger till fjärrbokmärket %s\n" +msgid "not updating divergent bookmark %s\n" +msgstr "uppdaterar inte divergent bokmärke %s\n" msgid "searching for changed bookmarks\n" msgstr "söker efter ändrade bokmärken\n" @@ -7536,7 +6209,7 @@ msgid "no changed bookmarks found\n" msgstr "inga ändrade bokmärken hittades\n" msgid "unknown parent" -msgstr "okänd förälder" +msgstr "" #, python-format msgid "integrity check failed on %s:%d" @@ -7573,22 +6246,18 @@ msgstr "användarnamnet %s innehåller en radbrytning" msgid "the name '%s' is reserved" msgstr "namnet '%s' är reserverat" -#, python-format -msgid "uncommitted changes in subrepo %s" -msgstr "oarkiverade ändringar i underarkivet %s" - msgid "options --message and --logfile are mutually exclusive" -msgstr "du kan bara ange en av --message och --logfile" +msgstr "" #, python-format msgid "can't read commit message '%s': %s" -msgstr "kan inte läsa arkiveringsmeddelande '%s': %s" +msgstr "" msgid "limit must be a positive integer" -msgstr "limit måste vara ett positivt heltal" +msgstr "" msgid "limit must be positive" -msgstr "limit måste vara positivt" +msgstr "" #, python-format msgid "invalid format spec '%%%s' in output filename" @@ -7623,10 +6292,6 @@ msgid "%s: not overwriting - %s collides with %s\n" msgstr "" #, python-format -msgid "%s: can't copy - same file\n" -msgstr "%s: kan inte kopiera - samma fil\n" - -#, python-format msgid "%s: not overwriting - file exists\n" msgstr "" @@ -7667,6 +6332,9 @@ msgstr "" msgid "destination %s is not a directory" msgstr "" +msgid "no files to copy" +msgstr "" + msgid "(consider using --after)\n" msgstr "" @@ -7690,10 +6358,6 @@ msgid "tag: %s\n" msgstr "märke: %s\n" #, python-format -msgid "phase: %s\n" -msgstr "fas: %s\n" - -#, python-format msgid "parent: %d:%s\n" msgstr "förälder: %d:%s\n" @@ -7742,26 +6406,18 @@ msgid "%s: no key named '%s'" msgstr "" #, python-format -msgid "found revision %s from %s\n" -msgstr "hittade revision %s från %s\n" +msgid "Found revision %s from %s\n" +msgstr "Hittade revision %s från %s\n" msgid "revision matching date not found" msgstr "" #, python-format -msgid "cannot follow file not in parent revision: \"%s\"" -msgstr "kan inte följa fil som inte finns i förälderrevision: \"%s\"" - -#, python-format msgid "cannot follow nonexistent file: \"%s\"" -msgstr "kan inte följa icke-existerande fil: \"%s\"" +msgstr "" msgid "can only follow copies/renames for explicit filenames" -msgstr "kan bara följa kopior/namnbyten för explicita filnamn" - -#, python-format -msgid "-G/--graph option is incompatible with --%s" -msgstr "flaggan -G/--graph är inkompatibel med --%s" +msgstr "" #, python-format msgid "adding %s\n" @@ -7771,22 +6427,6 @@ msgstr "lägger till %s\n" msgid "skipping missing subrepository: %s\n" msgstr "" -#, python-format -msgid "amending changeset %s\n" -msgstr "förändrar ändringen %s\n" - -#, python-format -msgid "copying changeset %s to %s\n" -msgstr "kopierar ändringen %s till %s\n" - -#, python-format -msgid "stripping intermediate changeset %s\n" -msgstr "avlägsnar mellanliggande ändring %s\n" - -#, python-format -msgid "stripping amended changeset %s\n" -msgstr "avlägsnar förändrad ändring %s\n" - msgid "HG: Enter commit message. Lines beginning with 'HG:' are removed." msgstr "" @@ -7826,26 +6466,6 @@ msgstr "HG: inga ändrade filer" msgid "empty commit message" msgstr "tomt arkiveringsmeddelande" -#, python-format -msgid "forgetting %s\n" -msgstr "glömmer %s\n" - -#, python-format -msgid "reverting %s\n" -msgstr "återställer %s\n" - -#, python-format -msgid "undeleting %s\n" -msgstr "ångrar radering av %s\n" - -#, python-format -msgid "file not managed: %s\n" -msgstr "filen hanteras inte: %s\n" - -#, python-format -msgid "no changes needed to %s\n" -msgstr "inga ändringar behövs för %s\n" - msgid "repository root directory or name of overlay bundle file" msgstr "arkivrotkatalog eller namn på påläggsbuntfil" @@ -7946,18 +6566,12 @@ msgstr "visa med mallfil" msgid "display with template" msgstr "visa med mall" -msgid "show patch" -msgstr "visa patch" - msgid "do not show merges" msgstr "visa inte sammanfogningar" msgid "output diffstat-style summary of changes" msgstr "visa sammanfattning av ändringar i diffstat-stil" -msgid "show the revision DAG" -msgstr "visa revisionsdiagram" - msgid "treat all files as text" msgstr "behandla alla filer som text" @@ -8058,25 +6672,22 @@ msgstr "" " vid nästa arkivering." msgid "" -" Use the -s/--similarity option to detect renamed files. This\n" +" Use the -s/--similarity option to detect renamed files. With a\n" +" parameter greater than 0, this compares every removed file with\n" +" every added file and records those similar enough as renames. This\n" " option takes a percentage between 0 (disabled) and 100 (files must\n" -" be identical) as its parameter. With a parameter greater than 0,\n" -" this compares every removed file with every added file and records\n" -" those similar enough as renames. Detecting renamed files this way\n" +" be identical) as its parameter. Detecting renamed files this way\n" " can be expensive. After using this option, :hg:`status -C` can be\n" -" used to check which files were identified as moved or renamed. If\n" -" not specified, -s/--similarity defaults to 100 and only renames of\n" -" identical files are detected." -msgstr "" -" Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Flaggan\n" -" tar ett procentvärde mellan 0 (deaktiverad) och 100 (filer måste vara\n" -" identiska) som parameter. Med en parameter större än 0, kommer varje\n" -" borttagen fil att jämföras med varje tillagd fil och lagrar de som är\n" -" tillräckligt lika som ett namnbyte. Att upptäcka omdöpta filer på det\n" -" här sättet kan ta lång tid. Efter att denna flagga har använts, kan\n" -" :hg:`status -C` användas för att kontrollera vilka filer som\n" -" identifierades som flyttade eller omdöpta. Om den flaggan inte anges,\n" -" upptäcks bara namnbyten för identiska filer." +" used to check which files were identified as moved or renamed." +msgstr "" +" Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n" +" parameter större än 0, kommer varje borttagen fil att jämföras med\n" +" varje tillagd fil och lagrar de som är tillräckligt lika som ett\n" +" namnbyte. Flaggan tar ett procentvärde mellan 0 (deaktiverad) och 100\n" +" (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n" +" på det här sättet kan ta lång tid. Efter att denna flagga har använts,\n" +" kan :hg:`status -C` användas för att kontrollera vilka filer som\n" +" identifierades som flyttade eller omdöpta." msgid "similarity must be a number" msgstr "likhet måste vara ett nummer" @@ -8140,7 +6751,7 @@ msgstr "" " om resultatet antagligen inte kommer att vara användbart." msgid "at least one filename or pattern is required" -msgstr "minst ett filnamn eller mönster krävs" +msgstr "" msgid "at least one of -n/-c is required for -l" msgstr "" @@ -8184,21 +6795,6 @@ msgstr "" " Arkivtypen upptäcks automatiskt baserat på filändelsen (eller tvinga\n" " med hjälp av -t/--type)." -msgid " Examples:" -msgstr " Exempel:" - -msgid " - create a zip file containing the 1.0 release::" -msgstr " - skapa en zip-fil som innehåller 1.0-releasen::" - -msgid " hg archive -r 1.0 project-1.0.zip" -msgstr " hg archive -r 1.0 project-1.0.zip" - -msgid " - create a tarball excluding .hg files::" -msgstr " - skapa en tarboll utan .hg-filer::" - -msgid " hg archive project.tar.gz -X \".hg*\"" -msgstr " hg archive project.tar.gz -X \".hg*\"" - msgid " Valid types are:" msgstr " Giltiga typer är:" @@ -8246,8 +6842,8 @@ msgstr "kan inte arkivera rena filer till stdout" msgid "merge with old dirstate parent after backout" msgstr "sammanfoga med gamla dirstate-föräldern efter återkallning" -msgid "parent to choose when backing out merge (DEPRECATED)" -msgstr "förälder att välja när en sammanfogning återkallas (FÖRLEGAD)" +msgid "parent to choose when backing out merge" +msgstr "förälder att välja när en sammanfogning återkallas" msgid "revision to backout" msgstr "revision att återkalla" @@ -8274,35 +6870,26 @@ msgstr "" " sammanfogade resultatet lämnas oarkiverat." msgid "" -" .. note::\n" -" backout cannot be used to fix either an unwanted or\n" -" incorrect merge." -msgstr "" -" .. note::\n" -" backout kan inte användas för att fixa en oönskad eller felaktig\n" -" sammanfogning." - -msgid "" -" By default, the pending changeset will have one parent,\n" -" maintaining a linear history. With --merge, the pending\n" -" changeset will instead have two parents: the old parent of the\n" -" working directory and a new child of REV that simply undoes REV." +" By default, the pending changeset will have one parent,\n" +" maintaining a linear history. With --merge, the pending changeset\n" +" will instead have two parents: the old parent of the working\n" +" directory and a new child of REV that simply undoes REV." msgstr "" -" Som standard kommer ändringen att ha en förälder, för att bibehålla\n" -" en linjär historik. Med --merge kommer ändringen istället att ha två\n" -" föräldrar: den gamla föräldern från arbetskatalogen och ett nytt\n" -" barn av REV som helt enkelt ogör REV." +" Som standard kommer ändringen att ha en förälder, för att bibehålla en\n" +" linjär historik. Med --merge kommer ändringen istället att ha två\n" +" föräldrar: den gamla föräldern från arbetskatalogen och ett nytt barn\n" +" av REV som helt enkelt ogör REV." msgid "" -" Before version 1.7, the behavior without --merge was equivalent\n" -" to specifying --merge followed by :hg:`update --clean .` to\n" -" cancel the merge and leave the child of REV as a head to be\n" -" merged separately." +" Before version 1.7, the behavior without --merge was equivalent to\n" +" specifying --merge followed by :hg:`update --clean .` to cancel\n" +" the merge and leave the child of REV as a head to be merged\n" +" separately." msgstr "" -" Innan version 1.7, så var beteendet utan --merge ekvivalent med att\n" -" ange --merge följt av :hg:`update --clean .` för att ångra\n" -" sammanfogningen och lämna barnet till REV som ett huvud att\n" -" sammanfogas separat." +" Innan version 1.7, så var beteendet utan --merge ekvivalent med att\n" +" ange --merge följt av :hg:`update --clean .` för att ångra\n" +" sammanfogningen och lämna barnet till REV som ett huvud att\n" +" sammanfogas separat." msgid "please specify just one revision" msgstr "ange bara en revision" @@ -8316,8 +6903,12 @@ msgstr "kan inte återkalla en ändring på en annan gren" msgid "cannot backout a change with no parents" msgstr "kan inte återkalla en ändring utan föräldrar" -msgid "cannot backout a merge changeset" -msgstr "kan inte återkalla en sammanfogning" +msgid "cannot backout a merge changeset without --parent" +msgstr "kan inte återkalla en sammanfogande ändring utan --parent" + +#, python-format +msgid "%s is not a parent of %s" +msgstr "%s är inte en förälder till %s" msgid "cannot use --parent on non-merge changeset" msgstr "kan inte använda --parent på icke-sammanfogande ändring" @@ -8384,124 +6975,16 @@ msgstr "" msgid "" " If you supply a command, it will be used for automatic bisection.\n" -" The environment variable HG_NODE will contain the ID of the\n" -" changeset being tested. The exit status of the command will be\n" -" used to mark revisions as good or bad: status 0 means good, 125\n" -" means to skip the revision, 127 (command not found) will abort the\n" -" bisection, and any other non-zero exit status means the revision\n" -" is bad." +" Its exit status will be used to mark revisions as good or bad:\n" +" status 0 means good, 125 means to skip the revision, 127\n" +" (command not found) will abort the bisection, and any other\n" +" non-zero exit status means the revision is bad." msgstr "" " Om du tillhandahåller ett kommando, kommer det att användas för\n" -" automatisk genomsökning. Miljövariabeln HG_NODE kommer att innehålla\n" -" ID för den ändring som testas. Returkoden från kommandot kommer att\n" -" användas för att markera en revision som bra eller dålig: 0 betyer\n" -" bra, 125 betyder hoppa över revionen, 127 (kommandot hittades inte)\n" -" kommer att avbryta genomsökningen, och alla andra värden betyder att\n" -" revisionen är dålig." - -msgid " Some examples:" -msgstr " Några exempel:" - -msgid "" -" - start a bisection with known bad revision 12, and good revision 34::" -msgstr "" -" - starta en sökning med känd dålig revision 12, och bra revision 34::" - -msgid "" -" hg bisect --bad 34\n" -" hg bisect --good 12" -msgstr "" -" hg bisect --bad 34\n" -" hg bisect --good 12" - -msgid "" -" - advance the current bisection by marking current revision as good " -"or\n" -" bad::" -msgstr "" -" - stega den nuvarande sökningen genom att markera nuvarande revision\n" -" som bra eller dålig::" - -msgid "" -" hg bisect --good\n" -" hg bisect --bad" -msgstr "" -" hg bisect --good\n" -" hg bisect --bad" - -msgid "" -" - mark the current revision, or a known revision, to be skipped (eg. " -"if\n" -" that revision is not usable because of another issue)::" -msgstr "" -" - markera att den nuvarande revisionen, eller en känd revision, ska\n" -" hoppas över (ex. om den revisionen är oanvändbar på grund av annat\n" -" fel)::" - -msgid "" -" hg bisect --skip\n" -" hg bisect --skip 23" -msgstr "" -" hg bisect --skip\n" -" hg bisect --skip 23" - -msgid " - forget the current bisection::" -msgstr " - glöm den aktuella genomsökningen::" - -msgid " hg bisect --reset" -msgstr " hg bisect --reset" - -msgid "" -" - use 'make && make tests' to automatically find the first broken\n" -" revision::" -msgstr "" -" - använd 'make && make tests' för att automatiskt hitta den första\n" -" defekta revisionen::" - -msgid "" -" hg bisect --reset\n" -" hg bisect --bad 34\n" -" hg bisect --good 12\n" -" hg bisect --command 'make && make tests'" -msgstr "" -" hg bisect --reset\n" -" hg bisect --bad 34\n" -" hg bisect --good 12\n" -" hg bisect --command 'make && make tests'" - -msgid "" -" - see all changesets whose states are already known in the current\n" -" bisection::" -msgstr "" -" - visa alla ändringar vars status redan är kända i den nuvarande\n" -" genomsökningen::" - -msgid " hg log -r \"bisect(pruned)\"" -msgstr " hg log -r \"bisect(pruned)\"" - -msgid "" -" - see the changeset currently being bisected (especially useful\n" -" if running with -U/--noupdate)::" -msgstr "" -" - se ändringen som genomsöks (mest användbart med -U/--no-update)::" - -msgid " hg log -r \"bisect(current)\"" -msgstr " hg log -r \"bisect(current)\"" - -msgid " - see all changesets that took part in the current bisection::" -msgstr " - se alla ändringar som var med i den nuvarande genomsökningen::" - -msgid " hg log -r \"bisect(range)\"" -msgstr " hg log -r \"bisect(range)\"" - -msgid " - with the graphlog extension, you can even get a nice graph::" -msgstr " - med graphlog-utökningen så kan du få en söt graf::" - -msgid " hg log --graph -r \"bisect(range)\"" -msgstr " hg log --graph -r \"bisect(range)\"" - -msgid " See :hg:`help revsets` for more about the `bisect()` keyword." -msgstr " Se :hg:`help revsets` för mer om nyckelordet `bisect()`." +" automatisk genomsökning. Dess returkod kommer att användas för att ange\n" +" revisioner som bra eller dåliga: kod 0 betyder bra, 125 betyder att\n" +" revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n" +" genomsökningen, och alla andra värden betyder att revisionen är dålig." msgid "The first good revision is:\n" msgstr "Den första bra revisionen är:\n" @@ -8536,12 +7019,6 @@ msgstr "(användning av 'hg bisect <kmd>' är föråldrat)\n" msgid "incompatible arguments" msgstr "inkompatibla argument" -msgid "current bisect revision is unknown - start a new bisect to fix" -msgstr "" - -msgid "current bisect revision is a merge" -msgstr "" - #, python-format msgid "failed to execute %s" msgstr "misslyckades med att köra %s" @@ -8551,8 +7028,8 @@ msgid "%s killed" msgstr "%s dödad" #, python-format -msgid "changeset %d:%s: %s\n" -msgstr "ändring %d:%s: %s\n" +msgid "Changeset %d:%s: %s\n" +msgstr "Ändring %d:%s: %s\n" #, python-format msgid "Extending search to changeset %d:%s\n" @@ -8574,8 +7051,8 @@ msgstr "ta bort angivet bokmärke" msgid "rename a given bookmark" msgstr "döp om angivet bokmärke" -msgid "mark a bookmark inactive" -msgstr "markera ett bokmärke som inaktivt" +msgid "do not mark a new bookmark active" +msgstr "markera inte ett nytt bokmärke som aktivt" msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]" msgstr "hg bookmarks [-f] [-d] [-i] [-m NAMN] [-r REV] [NAMN]" @@ -8584,16 +7061,15 @@ msgid "track a line of development with movable markers" msgstr "spåra viss utveckling med flyttbara markörer" msgid "" -" Bookmarks are pointers to certain commits that move when committing.\n" -" Bookmarks are local. They can be renamed, copied and deleted. It is\n" -" possible to use :hg:`merge NAME` to merge from a given bookmark, and\n" -" :hg:`update NAME` to update to a given bookmark." +" Bookmarks are pointers to certain commits that move when\n" +" committing. Bookmarks are local. They can be renamed, copied and\n" +" deleted. It is possible to use bookmark names in :hg:`merge` and\n" +" :hg:`update` to merge and update respectively to a given bookmark." msgstr "" " Bokmärken är pekare till utvalda arkiveringar som flyttar vid\n" " arkivering. Bokmärken är lokala. De kan döpas om, kopieras och\n" -" raderas. Det är möjligt att använda bokmärkesnamn i :hg:`merge NAMN`\n" -" för att sammanfoga från ett bokmärke, och :hg:`update NAMN` för att\n" -" uppdatera till ett visst bokmärke." +" raderas. Det är möjligt att använda bokmärkesnamn i :hg:`merge` och\n" +" :hg:`update` för att sammanfoga och uppdatera till ett visst bokmärke." msgid "" " You can use :hg:`bookmark NAME` to set a bookmark on the working\n" @@ -8611,29 +7087,15 @@ msgid "" " push` and :hg:`help pull`). This requires both the local and remote\n" " repositories to support bookmarks. For versions prior to 1.8, this " "means\n" -" the bookmarks extension must be enabled." +" the bookmarks extension must be enabled.\n" +" " msgstr "" " Bokmärken kan tryckas och dras mellan arkiv (se :hg:`help push` och\n" " :hg:`help pull`). Detta kräver att både det lokala och fjärrarkivet\n" " stödjer bokmärken. För versioner innan 1.8, så betyder det att\n" -" bookmarks-utökningen måste vara aktiverad." - -msgid "" -" With -i/--inactive, the new bookmark will not be made the active\n" -" bookmark. If -r/--rev is given, the new bookmark will not be made\n" -" active even if -i/--inactive is not given. If no NAME is given, the\n" -" current active bookmark will be marked inactive.\n" -" " -msgstr "" -" Med -i/--inactive blir det nya bokmärket inte det aktiva bokmärket.\n" -" Om -r/--rev anges så är bokmärket inte aktivt även om -i/--inactive\n" -" inte anges. Om inget NAMN anges, kommer det nuvarande aktiva bokmärket\n" -" att markeras som inaktivt.\n" +" bookmarks-utökningen måste vara aktiverad.\n" " " -msgid "bookmark name required" -msgstr "bokmärkesnamn krävs" - #, python-format msgid "bookmark '%s' does not exist" msgstr "bokmärket '%s' existerar inte" @@ -8645,6 +7107,9 @@ msgstr "bokmärket '%s' existerar redan (använd -f för att tvinga)" msgid "new bookmark name required" msgstr "nytt bokmärkesnamn krävs" +msgid "bookmark name required" +msgstr "bokmärkesnamn krävs" + msgid "bookmark name cannot contain newlines" msgstr "bokmärkesnamn kan inte innehålla radbrytningar" @@ -8670,18 +7135,6 @@ msgid "set or show the current branch name" msgstr "sätt eller visa det aktuella grennamnet" msgid "" -" .. note::\n" -" Branch names are permanent and global. Use :hg:`bookmark` to create " -"a\n" -" light-weight bookmark instead. See :hg:`help glossary` for more\n" -" information about named branches and bookmarks." -msgstr "" -" .. note::\n" -" Grennamn är permanenta och globala. Använd :hg:`bookmark` för att\n" -" skapa ett lättviktsbokmärke istället. Se :hg:`help glossary` för\n" -" mer information om namngivna grenar och bokmärken." - -msgid "" " With no argument, show the current branch name. With one argument,\n" " set the working directory branch name (the branch will not exist\n" " in the repository until the next commit). Standard practice\n" @@ -8716,6 +7169,18 @@ msgstr "" " Använd kommandot :hg:`update` för att byta till en existerande gren.\n" " Använd :hg:`commit --close-branch` för att markera grenen som stängd." +msgid " .. note::" +msgstr " .. notera::" + +msgid "" +" Branch names are permanent. Use :hg:`bookmark` to create a\n" +" light-weight bookmark instead. See :hg:`help glossary` for more\n" +" information about named branches and bookmarks." +msgstr "" +" Grennamnar är permanenta. Använd :hg:`bookmark` för att skapa ett\n" +" lättviktsbokmärke istället. Se :hg:`help glossary` för mer\n" +" information om namngivna grenar och bokmärken." + #, python-format msgid "reset working directory to branch %s\n" msgstr "återställ arbetskatalogen till grenen %s\n" @@ -8725,15 +7190,12 @@ msgstr "ett grennamn med det namnet existerar redan" #. i18n: "it" refers to an existing branch msgid "use 'hg update' to switch to it" -msgstr "använd 'hg update' för att byta till den" +msgstr "" #, python-format msgid "marked working directory as branch %s\n" msgstr "markerade arbetskatalogen som grenen %s\n" -msgid "(branches are permanent and global, did you want a bookmark?)\n" -msgstr "(grenar är permanenta och globala, ville du ha ett bokmärke?)\n" - msgid "show only branches that have unmerged heads" msgstr "visa bara grenar som har icke-sammanfogade huvuden" @@ -8854,12 +7316,12 @@ msgstr "" " Returnerar 0 om kommandot lyckades, 1 om inga ändringar hittades.\n" " " -msgid "unknown bundle type specified with --type" -msgstr "okänd bunttyp angiven med --type" - msgid "--base is incompatible with specifying a destination" msgstr "--base är inkompatibel med specificering av destination" +msgid "unknown bundle type specified with --type" +msgstr "okänd bunttyp angiven med --type" + msgid "print output to file with formatted name" msgstr "skriv utmatning till fil med formatterat namn" @@ -8937,153 +7399,111 @@ msgstr "" " Källans plats kommer att läggas till i det nya arkivets\n" " ``.hg/hgrc``-fil som standardplats att användas för framtida dragningar." -msgid "" -" Only local paths and ``ssh://`` URLs are supported as\n" -" destinations. For ``ssh://`` destinations, no working directory or\n" -" ``.hg/hgrc`` will be created on the remote side." -msgstr "" -" Bara lokala sökvägar och ``ssh://``-URLer stödjs som destinationer. För\n" -" ``ssh://``-destinationer så kommer ingen arbetskatalog eller\n" -" ``.hg/hgrc`` att skapas på fjärrsidan." +msgid " See :hg:`help urls` for valid source format details." +msgstr " Se :hg:`help urls` för detaljer om giltiga källformat." msgid "" -" To pull only a subset of changesets, specify one or more revisions\n" -" identifiers with -r/--rev or branches with -b/--branch. The\n" -" resulting clone will contain only the specified changesets and\n" -" their ancestors. These options (or 'clone src#rev dest') imply\n" -" --pull, even for local source repositories. Note that specifying a\n" -" tag will include the tagged changeset but not the changeset\n" -" containing the tag." +" It is possible to specify an ``ssh://`` URL as the destination, but no\n" +" ``.hg/hgrc`` and working directory will be created on the remote side.\n" +" Please see :hg:`help urls` for important details about ``ssh://`` URLs." msgstr "" -" För att dra bara en delmängd av ändringarna, angå en eller fler\n" -" revisionidentifierare med -r/--rev eller grenar med -b/--branch. Den\n" -" resulterande klonen kommer bara att innehålla de angivna ändringarna\n" -" och deras anfäder. Dessa flaggor (eller 'clone källa#rev dest') har\n" -" implicit --pull, även för lokala arkiv. Notera att angivandet av ett\n" -" märke kommer att hämta ut den märkta ändringen, men inte ändringen som\n" -" innehåller märket." +" Det är möjligt att ange en ``ssh://``-URL som destination, men ingen\n" +" ``.hg/hgrc`` och arbetskatalog skapas på fjärrsidan.\n" +" Se :hg:`help urls` för viktiga detaljer om ``ssh://``-URLer." msgid "" -" To check out a particular version, use -u/--update, or\n" -" -U/--noupdate to create a clone with no working directory." +" A set of changesets (tags, or branch names) to pull may be specified\n" +" by listing each changeset (tag, or branch name) with -r/--rev.\n" +" If -r/--rev is used, the cloned repository will contain only a subset\n" +" of the changesets of the source repository. Only the set of changesets\n" +" defined by all -r/--rev options (including all their ancestors)\n" +" will be pulled into the destination repository.\n" +" No subsequent changesets (including subsequent tags) will be present\n" +" in the destination." msgstr "" -" För att hämta ut en speciell version, använd -u/--update, eller\n" -" -U/--noupdate för att skapa en klon utan en arbetskatalog." +" En grupp ändringar (märken, eller grennamn) att dra kan anges genom\n" +" att lista varje ändring (märke, eller grennamn) med -r/--rev. Om\n" +" -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" +" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" +" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" +" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" +" att finnas i destinationen." msgid "" -" For efficiency, hardlinks are used for cloning whenever the\n" -" source and destination are on the same filesystem (note this\n" -" applies only to the repository data, not to the working\n" -" directory). Some filesystems, such as AFS, implement hardlinking\n" -" incorrectly, but do not report errors. In these cases, use the\n" -" --pull option to avoid hardlinking." +" Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" +" local source repositories." msgstr "" -" Av effektivitestskäl används hårda länkar när källan och\n" -" destinationen är på samma filsystem (notera att detta bara gäller för\n" -" arkivdatat, inte arbetskopian). Vissa filsystem såsom AFS\n" -" implementerar hårda länkar felaktigt, men rapporterar inga fel.\n" -" Använd flaggan --pull för att undvika användning av hårda länkar." +" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" +" --pull, även för lokala arkiv." msgid "" -" In some cases, you can clone repositories and the working\n" -" directory using full hardlinks with ::" +" For efficiency, hardlinks are used for cloning whenever the source\n" +" and destination are on the same filesystem (note this applies only\n" +" to the repository data, not to the working directory). Some\n" +" filesystems, such as AFS, implement hardlinking incorrectly, but\n" +" do not report errors. In these cases, use the --pull option to\n" +" avoid hardlinking." msgstr "" -" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" -" hårdlänkade, med ::" - -msgid " $ cp -al REPO REPOCLONE" -msgstr " $ cp -al ARKIV ARKIVKLON" +" Av effektivitestskäl används hårda länkar när källan och destinationen\n" +" är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" +" inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" +" hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" +" för att undvika användning av hårda länkar." msgid "" -" This is the fastest way to clone, but it is not always safe. The\n" -" operation is not atomic (making sure REPO is not modified during\n" -" the operation is up to you) and you have to make sure your\n" -" editor breaks hardlinks (Emacs and most Linux Kernel tools do\n" -" so). Also, this is not compatible with certain extensions that\n" -" place their metadata under the .hg directory, such as mq." +" In some cases, you can clone repositories and the working directory\n" +" using full hardlinks with ::" msgstr "" -" Detta är det snabbaste sättet att klona, men det är inte alltid\n" -" säkert. Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor\n" -" bryter hårda länkar (Emacs och de flesta Linux-kernelverktyg gör\n" -" det). Det är inte heller kompatibelt med vissa utökningar som\n" -" placerar sin metadata under katalogen .hg, som mq." +" I vissa fall kan du klona både arkiv och arbetskopia, alla\n" +" hårdlänkade, med ::" -msgid "" -" Mercurial will update the working directory to the first applicable\n" -" revision from this list:" -msgstr "" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:" +msgid " $ cp -al REPO REPOCLONE" +msgstr " $ cp -al ARKIV ARKIVKLON" msgid "" -" a) null if -U or the source repository has no changesets\n" -" b) if -u . and the source repository is local, the first parent of\n" -" the source repository's working directory\n" -" c) the changeset specified with -u (if a branch name, this means the\n" -" latest head of that branch)\n" -" d) the changeset specified with -r\n" -" e) the tipmost head specified with -b\n" -" f) the tipmost head specified with the url#branch source syntax\n" -" g) the tipmost head of the default branch\n" -" h) tip" +" This is the fastest way to clone, but it is not always safe. The\n" +" operation is not atomic (making sure REPO is not modified during\n" +" the operation is up to you) and you have to make sure your editor\n" +" breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" +" this is not compatible with certain extensions that place their\n" +" metadata under the .hg directory, such as mq." msgstr "" -" a) null med -U eller källarkivet inte har några ändringar\n" -" b) med -u . och källarkivet, den första föräldern av källarkivets\n" -" arbetskatalog\n" -" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" -" huvudet på den grenen)\n" -" d) ändringen angiven med -r\n" -" e) det högsta huvudet angivet med -b\n" -" f) det högsta huvudet angivent med källsyntaxen url#gren\n" -" g) det högsta huvudet på default-grenen\n" -" h) tip" - -msgid " - clone a remote repository to a new directory named hg/::" -msgstr " - klona ett fjärrarkiv till en ny katalog med namnet hg/::" - -msgid " hg clone http://selenic.com/hg" -msgstr " hg clone http://selenic.com/hg" - -msgid " - create a lightweight local clone::" -msgstr " - skapa en lättviktig lokal klon::" - -msgid " hg clone project/ project-feature/" -msgstr " hg clone project/ project-feature/" +" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" +" Operationen är inte atomisk (att ARKIV inte modifieras under\n" +" operationen är upp till dig) och du måste se till att din editor bryter\n" +" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" +" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" +" under katalogen .hg, som mq." msgid "" -" - clone from an absolute path on an ssh server (note double-slash)::" +" Mercurial will update the working directory to the first applicable\n" +" revision from this list:" msgstr "" -" - klona från en absolut sökväg på en ssh-server (notera dubbel-slash)::" - -msgid " hg clone ssh://user@server//home/projects/alpha/" -msgstr " hg clone ssh://user@server//home/projects/alpha/" +" Mercurial uppdaterar arbetskatalogen till den första passande\n" +" revisionen från den här listan:" msgid "" -" - do a high-speed clone over a LAN while checking out a\n" -" specified version::" +" a) null if -U or the source repository has no changesets\n" +" b) if -u . and the source repository is local, the first parent of\n" +" the source repository's working directory\n" +" c) the changeset specified with -u (if a branch name, this means the\n" +" latest head of that branch)\n" +" d) the changeset specified with -r\n" +" e) the tipmost head specified with -b\n" +" f) the tipmost head specified with the url#branch source syntax\n" +" g) the tipmost head of the default branch\n" +" h) tip" msgstr "" -" - gör en höghastighetsklon över ett LAN samtidigt som en specificerad\n" -" version hämtas ut::" - -msgid " hg clone --uncompressed http://server/repo -u 1.5" -msgstr " hg clone --uncompressed http://server/repo -u 1.5" - -msgid "" -" - create a repository without changesets after a particular revision::" -msgstr " - skapa ett arkiv utan ändringarna efter en viss revision::" - -msgid " hg clone -r 04e544 experimental/ good/" -msgstr " hg clone -r 04e544 experimental/ good/" - -msgid " - clone (and track) a particular named branch::" -msgstr " - klona (och spåra) en viss namngiven gren::" - -msgid " hg clone http://selenic.com/hg#stable" -msgstr " hg clone http://selenic.com/hg#stable" - -msgid " See :hg:`help urls` for details on specifying URLs." -msgstr " Se :hg:`help urls` för detaljer om att ange URLer." +" a) null med -U eller källarkivet inte har några ändringar\n" +" b) med -u . och källarkivet, den första föräldern av källarkivets\n" +" arbetskatalog\n" +" c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" +" huvudet på den grenen)\n" +" d) ändringen angiven med -r\n" +" e) det högsta huvudet angivet med -b\n" +" f) det högsta huvudet angivent med källsyntaxen url#gren\n" +" g) det högsta huvudet på default-grenen\n" +" h) tip" msgid "cannot specify both --noupdate and --updaterev" msgstr "kan inte ange både --noupdate och --updaterev" @@ -9094,9 +7514,6 @@ msgstr "märk nya/saknade filer som tillagda/borttagna innan arkivering" msgid "mark a branch as closed, hiding it from the branch list" msgstr "markera en gren som stängd, och göm den från grenlistan" -msgid "amend the parent of the working dir" -msgstr "förändra arbetskatalogens föräldrer" - msgid "commit the specified files or all outstanding changes" msgstr "arkivera de angivna filerna eller alla ändringar" @@ -9135,26 +7552,6 @@ msgstr "" " meddelande i ``.hg/last-message.txt``." msgid "" -" The --amend flag can be used to amend the parent of the\n" -" working directory with a new commit that contains the changes\n" -" in the parent in addition to those currently reported by :hg:`status`,\n" -" if there are any. The old commit is stored in a backup bundle in\n" -" ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle`\n" -" on how to restore it)." -msgstr "" - -msgid "" -" Message, user and date are taken from the amended commit unless\n" -" specified. When a message isn't specified on the command line,\n" -" the editor will open with the message of the amended commit." -msgstr "" - -msgid "" -" It is not possible to amend public changesets (see :hg:`help phases`)\n" -" or changesets that have children." -msgstr "" - -msgid "" " Returns 0 on success, 1 if nothing changed.\n" " " msgstr "" @@ -9164,28 +7561,13 @@ msgstr "" msgid "can only close branch heads" msgstr "kan bara stänga grenhuvuden" -msgid "cannot amend recursively" -msgstr "kan inte förändra rekursivt" - -msgid "cannot amend public changesets" -msgstr "kan inte förändra publika ändringar" - -msgid "cannot amend merge changesets" -msgstr "kan inte förändra sammanfogningar" - -msgid "cannot amend while merging" -msgstr "kan inte förändra vid sammanfogning" - -msgid "cannot amend changeset with children" -msgstr "kan inte förändra ändringar med barn" - -msgid "nothing changed\n" -msgstr "inget ändrat\n" - #, python-format msgid "nothing changed (%d missing files, see 'hg status')\n" msgstr "inget ändrat (%d saknade filer, se 'hg status')\n" +msgid "nothing changed\n" +msgstr "inget ändrat\n" + msgid "created new head\n" msgstr "skapade ett nytt huvud\n" @@ -9464,7 +7846,7 @@ msgid "no ignore patterns found" msgstr "inget ignoreringsmönster hittades" msgid "revlog format" -msgstr "revlog-format" +msgstr "" msgid "[-f FORMAT] -c|-m|FILE" msgstr "" @@ -9483,54 +7865,53 @@ msgid "test Mercurial installation" msgstr "testa Mercurial-installation" #, python-format -msgid "checking encoding (%s)...\n" -msgstr "kontrollerar teckenkodning (%s)...\n" +msgid "Checking encoding (%s)...\n" +msgstr "" msgid " (check that your locale is properly set)\n" -msgstr " (kontrollera att din locale är korrekt inställd)\n" +msgstr "" #, python-format -msgid "checking installed modules (%s)...\n" -msgstr "kontrollerar installerade moduler (%s)...\n" +msgid "Checking installed modules (%s)...\n" +msgstr "" msgid " One or more extensions could not be found" -msgstr " En eller fler utökningar kunde inte hittas" +msgstr "" msgid " (check that you compiled the extensions)\n" -msgstr " (kontrollera att du kompilerade utökningarna)\n" +msgstr "" -#, python-format -msgid "checking templates (%s)...\n" -msgstr "kontrollerar mallar (%s)...\n" +msgid "Checking templates...\n" +msgstr "" msgid " (templates seem to have been installed incorrectly)\n" -msgstr " (mallar verkar vara inkorrekt installerade)\n" +msgstr "" -msgid "checking commit editor...\n" -msgstr "kontrollerar arkiveringseditor...\n" +msgid "Checking commit editor...\n" +msgstr "" msgid " No commit editor set and can't find vi in PATH\n" -msgstr " Ingen arkiveringseditor satt och kan inte hitta vi i PATH\n" +msgstr "" msgid " (specify a commit editor in your configuration file)\n" -msgstr " (specificera en arkiveringseditor i din konfigurationsfil)\n" +msgstr "" #, python-format msgid " Can't find editor '%s' in PATH\n" -msgstr " Kan inte hitta editorn '%s' i PATH\n" +msgstr "" -msgid "checking username...\n" -msgstr "kontrollerar användarnamn...\n" +msgid "Checking username...\n" +msgstr "" msgid " (specify a username in your configuration file)\n" -msgstr " (ange ett användarnamn i din konfigurationsfil)\n" +msgstr "" -msgid "no problems detected\n" -msgstr "inga problem upptäcktes\n" +msgid "No problems detected\n" +msgstr "" #, python-format msgid "%s problems detected, please check your install!\n" -msgstr "%s problem upptäcktes, kontrollera din installation!\n" +msgstr "" msgid "REPO ID..." msgstr "" @@ -9539,17 +7920,12 @@ msgid "test whether node ids are known to a repo" msgstr "" msgid "" -" Every ID must be a full-length hex node id string. Returns a list of 0s\n" -" and 1s indicating unknown/known.\n" +" Every ID must be a full-length hex node id string. Returns a list of 0s " +"and 1s\n" +" indicating unknown/known.\n" " " msgstr "" -msgid "[OBSOLETED [REPLACEMENT] [REPL... ]" -msgstr "" - -msgid "create arbitrary obsolete marker" -msgstr "" - msgid "REPO NAMESPACE [KEY OLD NEW]" msgstr "" @@ -9565,25 +7941,6 @@ msgid "" " " msgstr "" -msgid "A B" -msgstr "A B" - -#, python-format -msgid "a: %s\n" -msgstr "a: %s\n" - -#, python-format -msgid "b: %s\n" -msgstr "b: %s\n" - -#, python-format -msgid "depth(a): %d depth(b): %d\n" -msgstr "" - -#, python-format -msgid "delta: %d hdist: %d distance: %d relation: %s\n" -msgstr "" - msgid "revision to rebuild to" msgstr "revision att bygga om till" @@ -9622,12 +7979,6 @@ msgstr "" msgid "parse and apply a revision specification" msgstr "" -msgid "" -" Use --verbose to print the parsed tree before and after aliases\n" -" expansion.\n" -" " -msgstr "" - msgid "REV1 [REV2]" msgstr "REV1 [REV2]" @@ -9710,53 +8061,14 @@ msgstr "" " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n" " mer information, läs :hg:`help diffs`." -msgid " - compare a file in the current working directory to its parent::" -msgstr " - jämför en fil i arbetskatalogen med dess förälder::" - -msgid " hg diff foo.c" -msgstr " hg diff foo.c" - -msgid "" -" - compare two historical versions of a directory, with rename info::" -msgstr "" -" - jämför två historiska versioner of en katalog, med namnändringar::" - -msgid " hg diff --git -r 1.0:1.2 lib/" -msgstr " hg diff --git -r 1.0:1.2 lib/" - -msgid " - get change stats relative to the last change on some date::" -msgstr "" -" - hämta ändringsstatus relativ ttill den sista ändringen på ett datum::" - -msgid " hg diff --stat -r \"date('may 2')\"" -msgstr " hg diff --stat -r \"date('may 2')\"" - -msgid " - diff all newly-added files that contain a keyword::" -msgstr " - diffa alla nytillagda filer som innehåller ett nyckelord::" - -msgid " hg diff \"set:added() and grep(GNU)\"" -msgstr " hg diff \"set:added() and grep(GNU)\"" - -msgid " - compare a revision and its parents::" -msgstr " - jämför en revision och dess föräldrar::" - -msgid "" -" hg diff -c 9353 # compare against first parent\n" -" hg diff -r 9353^:9353 # same using revset syntax\n" -" hg diff -r 9353^2:9353 # compare against the second parent" -msgstr "" -" hg diff -c 9353 # jämför mot den första föräldern\n" -" hg diff -r 9353^:9353 # samma med revset-syntax\n" -" hg diff -r 9353^2:9353 # jämför mot den andra föräldern" - msgid "diff against the second parent" msgstr "diffa mot den andra föräldern" msgid "revisions to export" msgstr "revisioner att exportera" -msgid "[OPTION]... [-o OUTFILESPEC] [-r] REV..." -msgstr "[FLAGGA]... [-o UTFILSPEC] [-r] REV..." +msgid "[OPTION]... [-o OUTFILESPEC] REV..." +msgstr "[FLAGGA]... [-o UTFILSPEC] REV..." msgid "dump the header and diffs for one or more changesets" msgstr "dumpa rubrik och diff för en eller fler ändringar" @@ -9797,8 +8109,6 @@ msgid "" " :``%R``: changeset revision number\n" " :``%b``: basename of the exporting repository\n" " :``%h``: short-form changeset hash (12 hexadecimal digits)\n" -" :``%m``: first line of the commit message (only alphanumeric " -"characters)\n" " :``%n``: zero-padded sequence number, starting at 1\n" " :``%r``: zero-padded changeset revision number" msgstr "" @@ -9808,8 +8118,6 @@ msgstr "" " :``%R``: ändringens revisionsnummer\n" " :``%b``: basnamn för det exporterande arkivet\n" " :``%h``: kort ändringshash (12 hexadecimala siffror)\n" -" :``%m``: första raden i arkiveringsmeddelandet (bara alfanumeriska " -"tecken)\n" " :``%n``: nollpaddat sekvensnummer, börjar med 1\n" " :``%r``: nollpaddat ändringsrevisionsnummer" @@ -9836,44 +8144,14 @@ msgstr "" " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n" " föräldern. Det kan vara användbart för att granska en sammanfogning." -msgid "" -" - use export and import to transplant a bugfix to the current\n" -" branch::" -msgstr "" -" - använd export och import för att transplantera en buggfix på den\n" -" nuvarande grenen::" - -msgid " hg export -r 9353 | hg import -" -msgstr " hg export -r 9353 | hg import -" - -msgid "" -" - export all the changesets between two revisions to a file with\n" -" rename information::" -msgstr "" -" - exportera alla ändringar mellan två revisioner till en fil med\n" -" namnändringsinformation::" - -msgid " hg export --git -r 123:150 > changes.txt" -msgstr " hg export --git -r 123:150 > changes.txt" - -msgid "" -" - split outgoing changes into a series of patches with\n" -" descriptive names::" -msgstr "" -" - dela upp utgående ändringar till en serie patchar med beskrivande\n" -" namn::" - -msgid " hg export -r \"outgoing()\" -o \"%n-%m.patch\"" -msgstr " hg export -r \"outgoing()\" -o \"%n-%m.patch\"" - msgid "export requires at least one changeset" -msgstr "export kräver minst en ändring" +msgstr "" msgid "exporting patches:\n" -msgstr "exporterar patchar:\n" +msgstr "" msgid "exporting patch:\n" -msgstr "exporterar patch:\n" +msgstr "" msgid "forget the specified files on the next commit" msgstr "glöm de angivna filerna vid nästa arkivering" @@ -9896,143 +8174,16 @@ msgstr "" msgid " To undo a forget before the next commit, see :hg:`add`." msgstr " För att ångra en forget innan nästa arkivering, se :hg:`add`." -msgid " - forget newly-added binary files::" -msgstr " - glöm bort nytillagda binärfiler::" - -msgid " hg forget \"set:added() and binary()\"" -msgstr " hg forget \"set:added() and binary()\"" - -msgid " - forget files that would be excluded by .hgignore::" -msgstr " - glöm bort filer som skulle exkluderas av .hgignore::" - -msgid " hg forget \"set:hgignore()\"" -msgstr " hg forget \"set:hgignore()\"" - -msgid "revisions to graft" -msgstr "revisioner att ympa" - -msgid "resume interrupted graft" -msgstr "återuppta avbruten ympning" - -msgid "append graft info to log message" -msgstr "lägg till ympningsinfo till loggmeddelande" - -msgid "record the current date as commit date" -msgstr "lagra det nuvarande datumet som arkiveringsdatumet" - -msgid "record the current user as committer" -msgstr "lagra den nuvarande användaren som arkiverare" - -msgid "[OPTION]... [-r] REV..." -msgstr "[FLAGGA]... [-r] REV..." - -msgid "copy changes from other branches onto the current branch" -msgstr "kopiera ändringar från andra grenar till den nuvarande grenen" - -msgid "" -" This command uses Mercurial's merge logic to copy individual\n" -" changes from other branches without merging branches in the\n" -" history graph. This is sometimes known as 'backporting' or\n" -" 'cherry-picking'. By default, graft will copy user, date, and\n" -" description from the source changesets." -msgstr "" - -msgid "" -" Changesets that are ancestors of the current revision, that have\n" -" already been grafted, or that are merges will be skipped." -msgstr "" - -msgid " (grafted from CHANGESETHASH)" -msgstr "" - -msgid "" -" If a graft merge results in conflicts, the graft process is\n" -" interrupted so that the current merge can be manually resolved.\n" -" Once all conflicts are addressed, the graft process can be\n" -" continued with the -c/--continue option." -msgstr "" - -msgid "" -" .. note::\n" -" The -c/--continue option does not reapply earlier options." -msgstr "" - -msgid "" -" - copy a single change to the stable branch and edit its description::" -msgstr "" - -msgid "" -" hg update stable\n" -" hg graft --edit 9393" -msgstr "" -" hg update stable\n" -" hg graft --edit 9393" - -msgid "" -" - graft a range of changesets with one exception, updating dates::" -msgstr "" - -msgid " hg graft -D \"2085::2093 and not 2091\"" -msgstr " hg graft -D \"2085::2093 and not 2091\"" - -msgid " - continue a graft after resolving conflicts::" -msgstr "" - -msgid " hg graft -c" -msgstr " hg graft -c" - -msgid " - show the source of a grafted changeset::" -msgstr "" - -msgid " hg log --debug -r tip" -msgstr " hg log --debug -r tip" - -msgid "" -" Returns 0 on successful completion.\n" -" " -msgstr "" -" Returnerar 0 om kommandot lyckades.\n" -" " - -msgid "can't specify --continue and revisions" -msgstr "kan inte specificera --continue och revisioner" - -msgid "no graft state found, can't continue" -msgstr "" - -#, python-format -msgid "skipping ungraftable merge revision %s\n" -msgstr "" - -#, python-format -msgid "skipping ancestor revision %s\n" -msgstr "" - -#, python-format -msgid "skipping already grafted revision %s\n" -msgstr "" - -#, python-format -msgid "skipping already grafted revision %s (same origin %d)\n" +msgid "no files specified" msgstr "" #, python-format -msgid "skipping already grafted revision %s (was grafted from %d)\n" +msgid "not removing %s: file is already untracked\n" msgstr "" #, python-format -msgid "grafting revision %s\n" -msgstr "ympar revision %s\n" - -msgid "unresolved conflicts, can't continue" -msgstr "olösta konflikter, kan inte fortsätta" - -msgid "use hg resolve and hg graft --continue" -msgstr "använd hg resolve och hg graft --continue" - -#, python-format -msgid "graft for revision %s is empty\n" -msgstr "" +msgid "removing %s\n" +msgstr "tar bort %s\n" msgid "end fields with NUL" msgstr "avsluta fält med NUL" @@ -10040,6 +8191,10 @@ msgstr "avsluta fält med NUL" msgid "print all revisions that match" msgstr "visa alla revisioner som matchar" +msgid "follow changeset history, or file history across copies and renames" +msgstr "" +"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" + msgid "ignore case when matching" msgstr "ignorera versaler/gemener vid matchning" @@ -10110,8 +8265,8 @@ msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)" msgid "show normal and closed branch heads" msgstr "visa normala och stängda grenhuvuden" -msgid "[-ct] [-r STARTREV] [REV]..." -msgstr "[-ct] [-r STARTREV] [REV]..." +msgid "[-ac] [-r STARTREV] [REV]..." +msgstr "[-ac] [-r STARTREV] [REV]..." msgid "show current repository heads or show branch heads" msgstr "visa aktuella arkivhuvuden och visar grenhuvuden" @@ -10132,14 +8287,10 @@ msgstr "" msgid "" " If one or more REVs are given, only branch heads on the branches\n" -" associated with the specified changesets are shown. This means\n" -" that you can use :hg:`heads foo` to see the heads on a branch\n" -" named ``foo``." +" associated with the specified changesets are shown." msgstr "" " Om en eller flera REV anges, kommer bara grenhuvuden på grenar\n" -" som är associerade med de angivna ändringarna att visas. Det betyder\n" -" att du kan använda :hg:`heads foo` för att se huvuden på en gren vid\n" -" namn ``foo``." +" som är associerade med de angivna ändringarna att visas." msgid "" " If -c/--closed is specified, also show branch heads marked closed\n" @@ -10184,9 +8335,6 @@ msgstr "visa bara hjälp för utökningar" msgid "show only help for commands" msgstr "visa bara hjälp för kommandon" -msgid "show topics matching keyword" -msgstr "visa ämnen för nyckelord" - msgid "[-ec] [TOPIC]" msgstr "[-ec] [ÄMNE]" @@ -10201,7 +8349,8 @@ msgid "" " Given a topic, extension, or command name, print help for that\n" " topic." msgstr "" -" Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet." +" Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n" +" " msgid "" " Returns 0 if successful.\n" @@ -10210,6 +8359,32 @@ msgstr "" " Returnerar 0 om kommandot lyckades.\n" " " +msgid "global options:" +msgstr "globala flaggor:" + +msgid "use \"hg help\" for the full list of commands" +msgstr "använd \"hg help\" för den fulla kommandolistan" + +msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" +msgstr "" +"använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" + +#, python-format +msgid "use \"hg help %s\" to show the full help text" +msgstr "använd \"hg help %s\" för att visa utförlig hjälp" + +#, python-format +msgid "use \"hg -v help%s\" to show builtin aliases and global options" +msgstr "" +"använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor" + +#, python-format +msgid "use \"hg -v help %s\" to show global options" +msgstr "använd \"hg -v help %s\" för att visa globala flaggor" + +msgid "list of commands:" +msgstr "kommandolista:" + #, python-format msgid "" "\n" @@ -10238,66 +8413,23 @@ msgid "%s" msgstr "%s" #, python-format -msgid "use \"hg help -e %s\" to show help for the %s extension" -msgstr "använd \"hg help -e %s\" för att visa hjälp för utökningen %s" - -msgid "options:" -msgstr "flaggor:" - -msgid "global options:" -msgstr "globala flaggor:" - -#, python-format msgid "" "\n" -"use \"hg help %s\" to show the full help text\n" +"use \"hg -v help %s\" to show verbose help\n" msgstr "" "\n" -"använd \"hg help %s\" för att visa fullständig hjälptext\n" +"använd \"hg -v help %s\" för att visa utförlig hjälp\n" -#, python-format -msgid "" -"\n" -"use \"hg -v help %s\" to show more info\n" -msgstr "" -"\n" -"använd \"hg -v help %s\" för att visa mer information\n" +msgid "options:\n" +msgstr "flaggor:\n" -msgid "basic commands:" -msgstr "grundläggande kommandon:" - -msgid "list of commands:" -msgstr "kommandolista:" +#, python-format +msgid "use \"hg help -e %s\" to show help for the %s extension" +msgstr "använd \"hg help -e %s\" för att visa hjälp för utökningen %s" msgid "no commands defined\n" msgstr "inga kommandon definierade\n" -msgid "enabled extensions:" -msgstr "aktiverade utökningar:" - -msgid "" -"\n" -"additional help topics:" -msgstr "" -"\n" -"ytterligare hjälpämnen:" - -msgid "use \"hg help\" for the full list of commands" -msgstr "använd \"hg help\" för den fulla kommandolistan" - -msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" -msgstr "" -"använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" - -#, python-format -msgid "use \"hg help %s\" to show the full help text" -msgstr "använd \"hg help %s\" för att visa utförlig hjälp" - -#, python-format -msgid "use \"hg -v help%s\" to show builtin aliases and global options" -msgstr "" -"använd \"hg -v help%s\" för att visa inbyggda alias och globala flaggor" - #, python-format msgid "" "\n" @@ -10321,15 +8453,35 @@ msgstr "" msgid "'%s' is provided by the following extension:" msgstr "'%s' tillhandahålls av följande utökning:" -msgid "Topics" -msgstr "Ämnen" - -msgid "Extension Commands" -msgstr "Utökningar" - msgid "Mercurial Distributed SCM\n" msgstr "Mercurial Distribuerad SCM\n" +msgid "basic commands:" +msgstr "grundläggande kommandon:" + +msgid "enabled extensions:" +msgstr "aktiverade utökningar:" + +msgid "VALUE" +msgstr "VÄRDE" + +msgid "DEPRECATED" +msgstr "FÖRLEGAD" + +msgid "" +"\n" +"[+] marked option can be specified multiple times" +msgstr "" +"\n" +"flaggor markerade med [+] kan anges flera gånger" + +msgid "" +"\n" +"additional help topics:" +msgstr "" +"\n" +"ytterligare hjälpämnen:" + msgid "identify the specified revision" msgstr "identifiera den angivna revisionen" @@ -10379,24 +8531,6 @@ msgstr "" " Specificering av en sökväg till ett arkiv eller Mercurial-bunt\n" " gör att kommandot jobbar mot arkivet/bunten som är angiven." -msgid " - generate a build identifier for the working directory::" -msgstr " - skapa en byggidentifierare för arbetskatalogen::" - -msgid " hg id --id > build-id.dat" -msgstr " hg id --id > build-id.dat" - -msgid " - find the revision corresponding to a tag::" -msgstr " - hitta revisionen för ett märke::" - -msgid " hg id -n -r 1.3" -msgstr " hg id -n -r 1.3" - -msgid " - check the most recent revision of a remote repository::" -msgstr " - kontrollera den senaste revisionen i ett fjärrarkiv::" - -msgid " hg id -r tip http://selenic.com/hg/" -msgstr " hg id -r tip http://selenic.com/hg/" - msgid "can't query remote revision number, branch, or tags" msgstr "kan inte efterfråga revisionsnummer, gren, eller märken" @@ -10475,7 +8609,7 @@ msgstr "" msgid "" " With -s/--similarity, hg will attempt to discover renames and\n" -" copies in the patch in the same way as :hg:`addremove`." +" copies in the patch in the same way as 'addremove'." msgstr "" msgid "" @@ -10484,38 +8618,6 @@ msgid "" " See :hg:`help dates` for a list of formats valid for -d/--date." msgstr "" -msgid " - import a traditional patch from a website and detect renames::" -msgstr "" -" - importera en vanlig patch från en webbsida och upptäck namnbyten::" - -msgid " hg import -s 80 http://example.com/bugfix.patch" -msgstr " hg import -s 80 http://example.com/bugfix.patch" - -msgid " - import a changeset from an hgweb server::" -msgstr " - importera en ändring från en hgweb-server::" - -msgid " hg import http://www.selenic.com/hg/rev/5ca8c111e9aa" -msgstr " hg import http://www.selenic.com/hg/rev/5ca8c111e9aa" - -msgid " - import all the patches in an Unix-style mbox::" -msgstr " - importera alla patchar i en Unix-liknande mbox::" - -msgid " hg import incoming-patches.mbox" -msgstr " hg import incoming-patches.mbox" - -msgid "" -" - attempt to exactly restore an exported changeset (not always\n" -" possible)::" -msgstr "" -" - försök att exakt återställa en exporterad ändring (inte alltid\n" -" möjligt)::" - -msgid " hg import --exact proposed-fix.patch" -msgstr " hg import --exact proposed-fix.patch" - -msgid "need at least one patch to import" -msgstr "behöver minst en patch att importera" - msgid "cannot use --no-commit with --bypass" msgstr "kan inte använda --no-commit med --bypass" @@ -10525,23 +8627,21 @@ msgstr "kan inte använda --similarity med --bypass" msgid "patch is damaged or loses information" msgstr "patchen är skadad eller tappar information" -msgid "applied to working directory" -msgstr "applicerad på arbetskatalog" +msgid "to working directory" +msgstr "till arbetskatalog" msgid "not a Mercurial patch" msgstr "inte en Mercurial-patch" -#. i18n: refers to a short changeset id -#, python-format -msgid "created %s" -msgstr "skapade %s" - msgid "applying patch from stdin\n" msgstr "" #, python-format -msgid "%s: no diffs found" -msgstr "%s: inga diffar hittades" +msgid "applied %s\n" +msgstr "applicerade %s\n" + +msgid "no diffs found" +msgstr "" msgid "run even if remote repository is unrelated" msgstr "kör även om fjärrarkivet är obesläktat" @@ -10671,6 +8771,42 @@ msgstr "" " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n" " innehåller blanktecken som multipla filnamn" +msgid "only follow the first parent of merge changesets" +msgstr "följ bara den första föräldern vid sammanfogningar" + +msgid "show revisions matching date spec" +msgstr "visa revisioner som matchar datumspecen" + +msgid "show copied files" +msgstr "visa kopierade filer" + +msgid "do case-insensitive search for a given text" +msgstr "gör versalokänslig sökning efter en given text" + +msgid "include revisions where files were removed" +msgstr "inkludera revisioner där filer togs bort" + +msgid "show only merges" +msgstr "visa bara sammanfogningar" + +msgid "revisions committed by user" +msgstr "revisioner arkiverade av användare" + +msgid "show only changesets within the given named branch (DEPRECATED)" +msgstr "visa bara ändringar i den namngivna grenen (FÖRLEGAD)" + +msgid "show changesets within the given named branch" +msgstr "visa ändringar i den namngivna grenen" + +msgid "do not display revision or any of its ancestors" +msgstr "visa inte revision eller någon av dess föräldrar" + +msgid "show hidden changesets" +msgstr "visa dolda ändringar" + +msgid "[OPTION]... [FILE]" +msgstr "[FLAGGA]... [FIL]" + msgid "show revision history of entire repository or files" msgstr "visa revisionshistorik för hela arkivet eller filer" @@ -10682,24 +8818,28 @@ msgstr "" " projektet." msgid "" -" If no revision range is specified, the default is ``tip:0`` unless\n" -" --follow is set, in which case the working directory parent is\n" -" used as the starting revision." -msgstr "" -" Om ingen revisionsserie specificeras, används ``tip:0`` som standard om\n" -" inte --follow är satt, då arbetskatalogens förälder används som första\n" -" revision." - -msgid "" " File history is shown without following rename or copy history of\n" " files. Use -f/--follow with a filename to follow history across\n" " renames and copies. --follow without a filename will only show\n" -" ancestors or descendants of the starting revision." +" ancestors or descendants of the starting revision. --follow-first\n" +" only follows the first parent of merge revisions." msgstr "" " Filhistorik visas utan att följa namnbyten eller kopieringshistorik av\n" " filer. Använd -f/--follow med ett filnamn för att följa historiken även\n" " vid namnbyten och kopiering. --follow utan ett filnamn kommer bara att\n" -" visa föräldrar eller ättlingar från startrevisionen." +" visa föräldrar eller ättlingar från startrevisionen. --follow-first\n" +" följer bara den första föräldern i revisoner med sammanfogningar." + +msgid "" +" If no revision range is specified, the default is ``tip:0`` unless\n" +" --follow is set, in which case the working directory parent is\n" +" used as the starting revision. You can specify a revision set for\n" +" log, see :hg:`help revsets` for more information." +msgstr "" +" Om ingen revisionsserie specificeras, används ``tip:0`` som standard om\n" +" inte --follow är satt, då arbetskatalogens förälder används som första\n" +" revision. Du kan ange ett revisionsset för log, se :hg:`help revsets`\n" +" för mer information." msgid "" " By default this command prints revision number and changeset id,\n" @@ -10725,93 +8865,6 @@ msgstr "" " den första förälder. Dessutom kommer bara filer som skiljer sig från\n" " BÅDA föräldrarna att visas i filer:." -msgid "" -" .. note::\n" -" for performance reasons, log FILE may omit duplicate changes\n" -" made on branches and will not show deletions. To see all\n" -" changes including duplicates and deletions, use the --removed\n" -" switch." -msgstr "" -" .. note::\n" -" av prestandaskäl så kan 'log FILE' hoppa över duplicerade ändringar\n" -" gjorda på grenar och kommer inte att visa raderingar. För att se\n" -" alla ändringar inklusive dupliceringar och raderingar, använd\n" -" flaggan --removed." - -msgid " - changesets with full descriptions and file lists::" -msgstr " - ändringar med fulla beskrivningar och fillistor::" - -msgid " hg log -v" -msgstr " hg log -v" - -msgid " - changesets ancestral to the working directory::" -msgstr " - ändringar som är anfädrar arbetskatalogen::" - -msgid " hg log -f" -msgstr " hg log -f" - -msgid " - last 10 commits on the current branch::" -msgstr " - sista 10 arkiveringarna på aktuell gren::" - -msgid " hg log -l 10 -b ." -msgstr " hg log -l 10 -b ." - -msgid "" -" - changesets showing all modifications of a file, including removals::" -msgstr "" -" - alla ändringar och modifikationer för en fil, inklusive raderingar::" - -msgid " hg log --removed file.c" -msgstr " hg log --removed file.c" - -msgid "" -" - all changesets that touch a directory, with diffs, excluding merges::" -msgstr "" -" - alla ändringar som rör en katalog, med diffar, utan sammanfogningar::" - -msgid " hg log -Mp lib/" -msgstr " hg log -Mp lib/" - -msgid " - all revision numbers that match a keyword::" -msgstr " - alla revisionsnummer som matchar ett nyckelord::" - -msgid " hg log -k bug --template \"{rev}\\n\"" -msgstr " hg log -k bug --template \"{rev}\\n\"" - -msgid " - check if a given changeset is included is a tagged release::" -msgstr " - kontrollera om en ändring inkluderas i en märkt release::" - -msgid " hg log -r \"a21ccf and ancestor(1.9)\"" -msgstr " hg log -r \"a21ccf and ancestor(1.9)\"" - -msgid " - find all changesets by some user in a date range::" -msgstr " - hitta alla ändringar av en användare i ett datumintervall::" - -msgid " hg log -k alice -d \"may 2008 to jul 2008\"" -msgstr " hg log -k alice -d \"may 2008 to jul 2008\"" - -msgid " - summary of all changesets after the last tag::" -msgstr " - sammanfattning av alla ändringar efter det senaste märket::" - -msgid "" -" hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\"" -msgstr "" -" hg log -r \"last(tagged())::\" --template \"{desc|firstline}\\n\"" - -msgid "" -" See :hg:`help revisions` and :hg:`help revsets` for more about\n" -" specifying revisions." -msgstr "" -" Se :hg:`help revisions` och :hg:`help revsets` för mer om hur man anger\n" -" revisioner." - -msgid "" -" See :hg:`help templates` for more about pre-packaged styles and\n" -" specifying custom templates." -msgstr "" -" Se :hg:`help templates` för information om mallar och filter.\n" -" " - msgid "revision to display" msgstr "revision att visa" @@ -10923,22 +8976,6 @@ msgstr "" " Returnerar 0 om kommandot lyckades, 1 om det finns olösta filer.\n" " " -msgid "" -"multiple matching bookmarks to merge - please merge with an explicit rev or " -"bookmark" -msgstr "" -"flera överrensstämmande bokmärken att sammanfoga - ange en explicit revision " -"eller ett bokmärke" - -msgid "run 'hg heads' to see all heads" -msgstr "kör 'hg heads' för att se alla huvuden" - -msgid "" -"no matching bookmark to merge - please merge with an explicit rev or bookmark" -msgstr "" -"inga överrensstämmande bokmärken att sammanfoga - ange en explicit revision " -"eller ett bokmärke" - #, python-format msgid "branch '%s' has %d heads - please merge with an explicit rev" msgstr "grenen '%s' har %d huvuden - sammanfoga med en specifik rev" @@ -10946,18 +8983,19 @@ msgstr "grenen '%s' har %d huvuden - sammanfoga med en specifik rev" msgid "run 'hg heads .' to see heads" msgstr "kör 'hg heads .' för att se huvuden" -msgid "heads are bookmarked - please merge with an explicit rev" -msgstr "huvuden är bokmärkta - sammanfoga med en explicit revision" - #, python-format msgid "branch '%s' has one head - please merge with an explicit rev" msgstr "grenen '%s' har ett huvud - sammanfoga med en specifik rev" -msgid "nothing to merge" -msgstr "inget att sammanfoga" +msgid "run 'hg heads' to see all heads" +msgstr "kör 'hg heads' för att se alla huvuden" + +msgid "there is nothing to merge" +msgstr "det finns inget att sammanfoga" -msgid "use 'hg update' instead" -msgstr "använd 'hg update' istället" +#, python-format +msgid "%s - use \"hg update\" instead" +msgstr "%s - använd \"hg update\" istället" msgid "working directory not at a head revision" msgstr "arbetskatalogen är inte vid en huvudrevision" @@ -11072,71 +9110,6 @@ msgstr " Se :hg:`help urls` för mer information." msgid "not found!\n" msgstr "hittades inte!\n" -msgid "set changeset phase to public" -msgstr "sätt ändringsfas till public" - -msgid "set changeset phase to draft" -msgstr "sätt ändringsfas till draft" - -msgid "set changeset phase to secret" -msgstr "sätt ändringsfas till secret" - -msgid "allow to move boundary backward" -msgstr "tillåt att gränser flyttas bakåt" - -msgid "target revision" -msgstr "målrevision" - -msgid "[-p|-d|-s] [-f] [-r] REV..." -msgstr "[-p|-d|-s] [-f] [-r] REV..." - -msgid "set or show the current phase name" -msgstr "sätt eller visa det aktuella fasnamnet" - -msgid " With no argument, show the phase name of specified revisions." -msgstr " Om inga argument ges, så visas fasnamnet för angivna revisioner." - -msgid "" -" With one of -p/--public, -d/--draft or -s/--secret, change the\n" -" phase value of the specified revisions." -msgstr "" -" Med en av -p/--public, -d/--draft eller -s/--secret, så ändras\n" -" fasvärdet för de angivna revisionerna." - -msgid "" -" Unless -f/--force is specified, :hg:`phase` won't move changeset from a\n" -" lower phase to an higher phase. Phases are ordered as follows::" -msgstr "" -" Om inte -f/--force anges, så kommer inte :hg:`phase` att flytta\n" -" ändringar från en lägre fas till en högre fas. Faser är ordnade enligt\n" -" följande::" - -msgid " public < draft < secret" -msgstr " public < draft < secret" - -msgid "" -" Return 0 on success, 1 if no phases were changed or some could not\n" -" be changed.\n" -" " -msgstr "" -" Returnerar 0 om kommandot lyckades, 1 om inga faser ändrades eller om\n" -" några inte kunde förändras.\n" -" " - -msgid "only one phase can be specified" -msgstr "bara en fas kan vara angiven" - -#, python-format -msgid "cannot move %i changesets to a more permissive phase, use --force\n" -msgstr "" - -#, python-format -msgid "phase changed for %i changesets\n" -msgstr "fas ändrad för %i ändringar\n" - -msgid "no phases changed\n" -msgstr "inga faser ändrage\n" - #, python-format msgid "not updating: %s\n" msgstr "uppdaterar inte: %s\n" @@ -11216,6 +9189,13 @@ msgstr "" msgid "remote bookmark %s not found!" msgstr "fjärrbokmärket %s hittades inte!" +msgid "" +"other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" +"det andra arkivet stödjer inte revisionsuppslag, så en revision kan inte " +"anges." + #, python-format msgid "importing bookmark %s\n" msgstr "importerar bokmärket %s\n" @@ -11283,14 +9263,6 @@ msgstr "" " tryckas till det andra arkivet." msgid "" -" If -B/--bookmark is used, the specified bookmarked revision, its\n" -" ancestors, and the bookmark will be pushed to the remote\n" -" repository." -msgstr "" -" Om -B/--bookmarks används, kommer den angivna bokmärkta revisionen,\n" -" alla anfäder och bokmärket att tryckas till det andra arkivet." - -msgid "" " Please see :hg:`help urls` for important details about ``ssh://``\n" " URLs. If DESTINATION is omitted, a default path will be used." msgstr "" @@ -11356,66 +9328,61 @@ msgstr "radera (och ta bort) filer även om tillagda eller modifierade" msgid "remove the specified files on the next commit" msgstr "ta bort de specificerade filerna vid nästa arkivering" -msgid " Schedule the indicated files for removal from the current branch." -msgstr " Markera de indikerade filerna för borttagning från aktuell gren." +msgid " Schedule the indicated files for removal from the repository." +msgstr " Markera de indikerade filerna för borttagning från arkivet." msgid "" -" This command schedules the files to be removed at the next commit.\n" -" To undo a remove before that, see :hg:`revert`. To undo added\n" -" files, see :hg:`forget`." +" This only removes files from the current branch, not from the\n" +" entire project history. -A/--after can be used to remove only\n" +" files that have already been deleted, -f/--force can be used to\n" +" force deletion, and -Af can be used to remove files from the next\n" +" revision without deleting them from the working directory." msgstr "" -" Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n" -" att ångra en remove innan dess, se :hg:`revert`. För att ångra tillagda\n" -" filer, se :hg:`forget`." +" Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n" +" projektets historik. -A/--after kan användas för att bara ta bort filer\n" +" som redan raderats, -f/--force kan användas för att tvinga radering,\n" +" och -Af kan ta bort filer från nästa revision utan att radera dem från\n" +" arbetskopian." msgid "" -" -A/--after can be used to remove only files that have already\n" -" been deleted, -f/--force can be used to force deletion, and -Af\n" -" can be used to remove files from the next revision without\n" -" deleting them from the working directory." +" The following table details the behavior of remove for different\n" +" file states (columns) and option combinations (rows). The file\n" +" states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" +" reported by :hg:`status`). The actions are Warn, Remove (from\n" +" branch) and Delete (from disk)::" msgstr "" -" -A/--after kan användas för att bara ta bort filer som redan\n" -" raderats, -f/--force kan användas för att tvinga radering, och -Af\n" -" kan ta bort filer från nästa revision utan att radera dem från\n" -" arbetskopian." +" Följande tabell visar hur remove uppför sig för olika filstatus\n" +" (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n" +" Modifierad [M] och Saknad [!] (som rapporteras av :hg:`status`).\n" +" Aktionerna är Varna, Radera (från gren) och Ta bort (från disk)::" msgid "" -" The following table details the behavior of remove for different\n" -" file states (columns) and option combinations (rows). The file\n" -" states are Added [A], Clean [C], Modified [M] and Missing [!]\n" -" (as reported by :hg:`status`). The actions are Warn, Remove\n" -" (from branch) and Delete (from disk):" +" A C M !\n" +" none W RD W R\n" +" -f R RD RD R\n" +" -A W W W R\n" +" -Af R R R R" msgstr "" -" Följande tabell visar hur remove uppför sig för olika filstatus\n" -" (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n" -" Modifierad [M] och Saknad [!] (som rapporteras av :hg:`status`).\n" -" Aktionerna är Varna, Radera (från gren) och Ta bort (från disk):" +" A C M !\n" +" ingen V RT V R\n" +" -f R RT RT R\n" +" -A V V V R\n" +" -Af R R R R" msgid "" -" ======= == == == ==\n" -" A C M !\n" -" ======= == == == ==\n" -" none W RD W R\n" -" -f R RD RD R\n" -" -A W W W R\n" -" -Af R R R R\n" -" ======= == == == ==" +" Note that remove never deletes files in Added [A] state from the\n" +" working directory, not even if option --force is specified." msgstr "" -" ======= == == == ==\n" -" A C M !\n" -" ======= == == == ==\n" -" ingen V RT V R\n" -" -f R RT RT R\n" -" -A V V V R\n" -" -Af R R R R\n" -" ======= == == == ==" +" Notera att remove aldrig tar bort filer som är Adderade [A] från\n" +" arbetskatalogen, inte ens om --force är angivet." msgid "" -" Note that remove never deletes files in Added [A] state from the\n" -" working directory, not even if option --force is specified." +" This command schedules the files to be removed at the next commit.\n" +" To undo a remove before that, see :hg:`revert`." msgstr "" -" Notera att remove aldrig tar bort filer som är Adderade [A] från\n" -" arbetskatalogen, inte ens om --force är angivet." +" Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n" +" att ångra en remove innan dess, se :hg:`revert` .\n" +" " msgid "" " Returns 0 on success, 1 if any warnings encountered.\n" @@ -11437,8 +9404,9 @@ msgid "not removing %s: file is modified (use -f to force removal)\n" msgstr "raderar inte %s: filen är ändrad (använd -f för att tvinga)\n" #, python-format -msgid "not removing %s: file has been marked for add (use forget to undo)\n" -msgstr "raderar inte %s: filen har lagts till (använd forget för att ångra)\n" +msgid "" +"not removing %s: file has been marked for add (use -f to force removal)\n" +msgstr "raderar inte %s: filen har lags till (använd -f för att tvinga)\n" msgid "record a rename that has already occurred" msgstr "spara en namnändring som redan har inträffat" @@ -11490,8 +9458,7 @@ msgid "" " setting, or a command-line merge tool like ``diff3``. The resolve\n" " command is used to manage the files involved in a merge, after\n" " :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the\n" -" working directory must have two parents). See :hg:`help\n" -" merge-tools` for information on configuring merge tools." +" working directory must have two parents)." msgstr "" msgid " The resolve command can be used in the following ways:" @@ -11502,10 +9469,9 @@ msgid "" "specified\n" " files, discarding any previous merge attempts. Re-merging is not\n" " performed for files already marked as resolved. Use ``--all/-a``\n" -" to select all unresolved files. ``--tool`` can be used to specify\n" +" to selects all unresolved files. ``--tool`` can be used to specify\n" " the merge tool used for the given files. It overrides the HGMERGE\n" -" environment variable and your configuration files. Previous file\n" -" contents are saved with a ``.orig`` suffix." +" environment variable and your configuration files." msgstr "" msgid "" @@ -11560,24 +9526,24 @@ msgstr "senaste revision matchande datum" msgid "revert to the specified revision" msgstr "återgå till den angivna revisionen" +msgid "do not save backup copies of files" +msgstr "spara inte backup-kopior av filer" + msgid "[OPTION]... [-r REV] [NAME]..." msgstr "[FLAGGA]... [-r REV] [NAMN]..." msgid "restore files to their checkout state" msgstr "återställ filer till deras uthämtningstillstånd" -msgid " .. note::" -msgstr " .. note::" - msgid "" +" .. note::\n" " To check out earlier revisions, you should use :hg:`update REV`.\n" -" To cancel an uncommitted merge (and lose your changes), use\n" -" :hg:`update --clean .`." +" To cancel a merge (and lose your changes), use :hg:`update --clean .`." msgstr "" " .. note::\n" " För att hämta ut tidigare revisioner, använd :hg:`update REV`.\n" -" För att avbryta en oarkiverad sammanfogning (och bli av med alla\n" -" ändringar), använd :hg:`update --clean .`." +" För att avbryta en sammanfogning (och bli av med alla ändringar),\n" +" använd :hg:`update --clean .`." msgid "" " With no revision specified, revert the specified files or directories\n" @@ -11653,8 +9619,29 @@ msgstr "oarkiverade ändringar, använd --all för att kasta alla ändringar" msgid "use --all to revert all files" msgstr "använd --all för att återställa filer" -msgid "ignore safety measures" -msgstr "ignorera säkerhetsåtgärder" +#, python-format +msgid "forgetting %s\n" +msgstr "glömmer %s\n" + +#, python-format +msgid "reverting %s\n" +msgstr "återställer %s\n" + +#, python-format +msgid "undeleting %s\n" +msgstr "ångrar radering av %s\n" + +#, python-format +msgid "saving current version of %s as %s\n" +msgstr "sparar nuvarande revision av %s som %s\n" + +#, python-format +msgid "file not managed: %s\n" +msgstr "filen hanteras inte: %s\n" + +#, python-format +msgid "no changes needed to %s\n" +msgstr "inga ändringar behövs för %s\n" msgid "roll back the last transaction (dangerous)" msgstr "återgång från den senaste transaktionen (farligt)" @@ -11675,39 +9662,26 @@ msgstr "" msgid "" " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" -" repository." +" repository. For example, the following commands are transactional,\n" +" and their effects can be rolled back:" msgstr "" " Transaktioner används för att kapsla in alla kommandon som skapar nya\n" -" ändringar eller sprider existerade ändringar till ett arkiv." +" ändringar eller sprider existerade ändringar till ett arkiv.\n" +" Exempelvis skapar de följande kommandona transaktioner, och deras\n" +" ändringar kan återkallas:" msgid "" -" For example, the following commands are transactional, and their\n" -" effects can be rolled back:" +" - commit\n" +" - import\n" +" - pull\n" +" - push (with this repository as the destination)\n" +" - unbundle" msgstr "" -" Exempelvis skapar de följande kommandona transaktioner, och deras\n" -" ändringar kan återkallas:" - -msgid "" -" - commit\n" -" - import\n" -" - pull\n" -" - push (with this repository as the destination)\n" -" - unbundle" -msgstr "" -" - commit\n" -" - import\n" -" - pull\n" -" - push (med det här arkivet som destination)\n" -" - unbundle" - -msgid "" -" To avoid permanent data loss, rollback will refuse to rollback a\n" -" commit transaction if it isn't checked out. Use --force to\n" -" override this protection." -msgstr "" -" För att undvika permanent dataförlust så vägrar rollback att köras\n" -" på en arkivering om den inte är uthämtad. Använd --force för att gå\n" -" förbi det här skyddet." +" - commit\n" +" - import\n" +" - pull\n" +" - push (med det här arkivet som destination)\n" +" - unbundle" msgid "" " This command is not intended for use on public repositories. Once\n" @@ -11829,6 +9803,9 @@ msgstr "" msgid "cannot use --stdio with --cmdserver" msgstr "kan inte använda --stdio med --cmdserver" +msgid "There is no Mercurial repository here (.hg not found)" +msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" + #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n" @@ -11972,28 +9949,6 @@ msgstr "" " I = ignorerad\n" " = källa för den tidigare filen listad som A (adderad)" -msgid "" -" - show changes in the working directory relative to a\n" -" changeset::" -msgstr "" -" - visa modifikationer i arbetskatalogen relativt till en ändring::" - -msgid " hg status --rev 9353" -msgstr " hg status --rev 9353" - -msgid " - show all changes including copies in an existing changeset::" -msgstr " - visa alla ändringar inklusive kopior i en ändring::" - -msgid " hg status --copies --change 9353" -msgstr " hg status --copies --change 9353" - -msgid " - get a NUL separated list of added files, suitable for xargs::" -msgstr "" -" - visa en NUL-separerad lista med tillagda filer, lämpligt för xargs::" - -msgid " hg status -an0" -msgstr " hg status -an0" - msgid "check for push and pull" msgstr "sök efter inkommande och utgående ändringar" @@ -12028,9 +9983,6 @@ msgstr " (ingen revision uthämtad)" msgid "branch: %s\n" msgstr "gren: %s\n" -msgid "bookmarks:" -msgstr "bokmärken:" - #, python-format msgid "%d modified" msgstr "%d modifierad" @@ -12227,9 +10179,6 @@ msgstr "oarkiverad sammanfogning" msgid "not at a branch head (use -f to force)" msgstr "inte vid ett grenhuvud (använd -f för att tvinga)" -msgid "null revision specified" -msgstr "null-revision angiven" - msgid "list repository tags" msgstr "lista arkivmärken" @@ -12304,71 +10253,63 @@ msgstr "uppdatera arbetskatalogen (eller växla mellan revisioner)" msgid "" " Update the repository's working directory to the specified\n" " changeset. If no changeset is specified, update to the tip of the\n" -" current named branch and move the current bookmark (see :hg:`help\n" -" bookmarks`)." +" current named branch." msgstr "" " Uppdatera arkivets arbetskatalog till den angivna ändringen. Om ingen\n" -" ändring anges, så uppdateras till toppen på den nuvarande namngivna\n" -" grenen och nuvarande bokmärket flyttas (se :hg:`help bookmarks`)." +" ändring anes, så uppdateras till toppen på den nuvarande namngivna\n" +" grenen." msgid "" -" Update sets the working directory's parent revison to the specified\n" -" changeset (see :hg:`help parents`)." -msgstr "" - -msgid "" -" If the changeset is not a descendant or ancestor of the working\n" -" directory's parent, the update is aborted. With the -c/--check\n" -" option, the working directory is checked for uncommitted changes; if\n" -" none are found, the working directory is updated to the specified\n" +" If the changeset is not a descendant of the working directory's\n" +" parent, the update is aborted. With the -c/--check option, the\n" +" working directory is checked for uncommitted changes; if none are\n" +" found, the working directory is updated to the specified\n" " changeset." msgstr "" msgid "" -" The following rules apply when the working directory contains\n" -" uncommitted changes:" +" Update sets the working directory's parent revison to the specified\n" +" changeset (see :hg:`help parents`)." msgstr "" -" Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" -" ändringar:" msgid "" -" 1. If neither -c/--check nor -C/--clean is specified, and if\n" -" the requested changeset is an ancestor or descendant of\n" -" the working directory's parent, the uncommitted changes\n" -" are merged into the requested changeset and the merged\n" -" result is left uncommitted. If the requested changeset is\n" -" not an ancestor or descendant (that is, it is on another\n" -" branch), the update is aborted and the uncommitted changes\n" -" are preserved." +" The following rules apply when the working directory contains\n" +" uncommitted changes:" msgstr "" -" 1. Om varken -c/--check eller -C/--clean specificeras, och om den\n" -" begärda ändringen är en anfader eller ättling till\n" -" arbetskatalogens förälder, kommer oarkiverade ändringar att\n" -" sammanfogas med den begärda ändringen och det sammanfogade\n" -" resultatet lämnas oarkiverat. Om den begärda ändringen inte är en\n" -" anfader eller ättling (dvs är i en annan gren), avbryts\n" -" uppdateringen och de oarkiverade ändringarna bevaras." +" Följande regler gäller när arbetskatalogen innehåller oarkiverade\n" +" ändringar:" msgid "" -" 2. With the -c/--check option, the update is aborted and the\n" -" uncommitted changes are preserved." +" 1. If neither -c/--check nor -C/--clean is specified, and if\n" +" the requested changeset is an ancestor or descendant of\n" +" the working directory's parent, the uncommitted changes\n" +" are merged into the requested changeset and the merged\n" +" result is left uncommitted. If the requested changeset is\n" +" not an ancestor or descendant (that is, it is on another\n" +" branch), the update is aborted and the uncommitted changes\n" +" are preserved." msgstr "" -" 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" -" ändringarna lämnas." +" 1. Om varken -c/--check eller -C/--clean specificeras, och om den\n" +" begärda ändringen är en anfader eller ättling till arbetskatalogens\n" +" förälder, kommer oarkiverade ändringar att sammanfogas med den\n" +" begärda ändringen och det sammanfogade resultatet lämnas oarkiverat.\n" +" Om den begärda ändringen inte är en anfader eller ättling (dvs är i\n" +" en annan gren), avbryts uppdateringen och de oarkiverade ändringarna\n" +" bevaras." msgid "" -" 3. With the -C/--clean option, uncommitted changes are discarded and\n" -" the working directory is updated to the requested changeset." +" 2. With the -c/--check option, the update is aborted and the\n" +" uncommitted changes are preserved." msgstr "" -" 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras\n" -" och arbetskatalogen uppdateras till den begärda ändringen." +" 2. Med flaggan -c/--check avbryts uppdateringen och de oarkiverade\n" +" ändringarna lämnas." msgid "" -" To cancel an uncommitted merge (and lose your changes), use\n" -" :hg:`update --clean .`." +" 3. With the -C/--clean option, uncommitted changes are discarded and\n" +" the working directory is updated to the requested changeset." msgstr "" -" För att avbryta en oarkiverad sammanfogning (och förlora dina\n" -" ändringar), använd :hg:`update --clean .`." +" 3. Med flaggan -C/--clean kommer oarkiverade ändringar att kasseras och\n" +" arbetskatalogen uppdateras till den begärda ändringen." msgid "" " Use null as the changeset to remove the working directory (like\n" @@ -12387,6 +10328,9 @@ msgstr "" msgid "cannot specify both -c/--check and -C/--clean" msgstr "kan inte både ange -c/--check och -C/--clean" +msgid "uncommitted local changes" +msgstr "oarkiverade lokala ändringar" + msgid "verify the integrity of the repository" msgstr "verifiera arkivets integritet" @@ -12414,11 +10358,11 @@ msgid "(see http://mercurial.selenic.com for more information)" msgstr "(se http://mercurial.selenic.com för mer information)" msgid "" -"Copyright (C) 2005-2012 Matt Mackall and others\n" +"Copyright (C) 2005-2011 Matt Mackall and others\n" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" msgstr "" -"Copyright (C) 2005-2012 Matt Mackall och andra\n" +"Copyright (C) 2005-2011 Matt Mackall och andra\n" "Detta är fri mjukvara; se källkoden för kopieringsvillkor. Det ges INGEN\n" "garanti; inte ens för SÄLJBARHET eller ATT PASSA FÖR ETT VISST ÄNDAMÅL.\n" @@ -12432,29 +10376,21 @@ msgstr "okänt kommando %s" #, python-format msgid "cannot include %s (%s)" -msgstr "kan inte inkludera %s (%s)" - -#, python-format -msgid "working directory has unknown parent '%s'!" -msgstr "" - -#, python-format -msgid "unknown revision '%s'" msgstr "" msgid "not found in manifest" -msgstr "hittades inte i manifestet" +msgstr "" #, python-format msgid "no such file in rev %s" -msgstr "ingen sådan fil i rev %s" +msgstr "" msgid "branch name not in UTF-8!" -msgstr "grennamn inte i UTF-8!" +msgstr "" #, python-format msgid "%s does not exist!\n" -msgstr "%s existerar inte!\n" +msgstr "" #, python-format msgid "" @@ -12466,19 +10402,19 @@ msgstr "" #, python-format msgid "%s not added: only files and symlinks supported currently\n" -msgstr "%s inte tillagd: bara filer och symlänkar stödjs\n" +msgstr "" #, python-format msgid "%s already tracked!\n" -msgstr "%s spåras redan!\n" +msgstr "" #, python-format msgid "%s not tracked!\n" -msgstr "%s spåras inte!\n" +msgstr "" #, python-format msgid "%s not removed!\n" -msgstr "%s inte borttagen!\n" +msgstr "" #, python-format msgid "copy failed: %s is not a file or a symbolic link\n" @@ -12549,7 +10485,7 @@ msgstr "använd 'hg push --new-branch' för att skapa nya fjärrgrenar" #, python-format msgid "push creates new remote head %s on branch '%s'!" -msgstr "push skapar nytt fjärrhuvud %s på grenen '%s'!" +msgstr "push skapar nyt fjärrhuvud %s på grenen '%s'!" #, python-format msgid "push creates new remote head %s!" @@ -12561,14 +10497,6 @@ msgstr "du kan dra och sammanfoga eller använda push -f för att tvinga" msgid "did you forget to merge? use push -f to force" msgstr "glömde du att sammanfoga? använd push -f för att tvinga" -#, python-format -msgid "new remote heads on branch '%s'\n" -msgstr "nya fjärrhuvuden på grenen '%s'!\n" - -#, python-format -msgid "new remote head %s\n" -msgstr "nytt fjärrhuvud %s\n" - msgid "note: unsynced remote changes!\n" msgstr "notera: osynkade fjärrändringar!\n" @@ -12607,7 +10535,7 @@ msgstr "" #, python-format msgid "abort: %s: %s\n" -msgstr "avbryter: %s: %s\n" +msgstr "" #, python-format msgid "abort: could not lock %s: %s\n" @@ -12621,26 +10549,23 @@ msgstr "" msgid "hg: %s\n" msgstr "" -msgid "abort: remote error:\n" -msgstr "avbryter: fjärrfel:\n" - #, python-format msgid "abort: %s!\n" -msgstr "avbryter: %s!\n" +msgstr "" #, python-format msgid "abort: %s" -msgstr "avbryter: %s" +msgstr "" msgid " empty string\n" -msgstr " tom sträng\n" +msgstr "" msgid "killed!\n" -msgstr "dödad!\n" +msgstr "" #, python-format msgid "hg: unknown command '%s'\n" -msgstr "hg: okänt kommando '%s'\n" +msgstr "" msgid "(did you forget to compile extensions?)\n" msgstr "" @@ -12656,7 +10581,7 @@ msgid "broken pipe\n" msgstr "" msgid "interrupted!\n" -msgstr "avbruten!\n" +msgstr "" msgid "" "\n" @@ -12666,23 +10591,11 @@ msgstr "" msgid "abort: out of memory\n" msgstr "" -msgid "the extension author." -msgstr "" - -#, python-format -msgid "" -"** Unknown exception encountered with possibly-broken third-party extension " -"%s\n" -"** which supports versions %s of Mercurial.\n" -"** Please disable %s and try your action again.\n" -"** If that fixes the bug please report it to %s\n" -msgstr "" - msgid "** unknown exception encountered, please report by visiting\n" msgstr "" -msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" -msgstr "** http://mercurial.selenic.com/wiki/BugTracker\n" +msgid "** http://mercurial.selenic.com/wiki/BugTracker\n" +msgstr "" #, python-format msgid "** Python %s\n" @@ -12696,9 +10609,6 @@ msgstr "" msgid "** Extensions loaded: %s\n" msgstr "" -msgid "too few arguments for command alias" -msgstr "" - #, python-format msgid "no definition for alias '%s'\n" msgstr "" @@ -12736,12 +10646,12 @@ msgid "option --cwd may not be abbreviated!" msgstr "" msgid "" -"option -R has to be separated from other options (e.g. not -qR) and --" +"Option -R has to be separated from other options (e.g. not -qR) and --" "repository may only be abbreviated as --repo!" msgstr "" #, python-format -msgid "time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" +msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" msgstr "" #, python-format @@ -12764,17 +10674,6 @@ msgid "" "misc/lsprof/" msgstr "" -msgid "statprof not available - install using \"easy_install statprof\"" -msgstr "" - -#, python-format -msgid "invalid sampling frequency '%s' - ignoring\n" -msgstr "" - -#, python-format -msgid "unrecognized profiler '%s' - ignored\n" -msgstr "" - #, python-format msgid "*** failed to import extension %s from %s: %s\n" msgstr "" @@ -12803,62 +10702,28 @@ msgstr "" msgid "tool %s requires a GUI\n" msgstr "" -msgid "" -"``internal:prompt``\n" -"Asks the user which of the local or the other version to keep as\n" -" the merged version." -msgstr "" - #, python-format msgid "" " no tool found to merge %s\n" "keep (l)ocal or take (o)ther?" msgstr "" -msgid "" -"``internal:local``\n" -"Uses the local version of files as the merged version." -msgstr "" - -msgid "" -"``internal:other``\n" -"Uses the other version of files as the merged version." +msgid "&Local" msgstr "" -msgid "" -"``internal:fail``\n" -"Rather than attempting to merge files that were modified on both\n" -" branches, it marks them as unresolved. The resolve command must be\n" -" used to resolve these conflicts." +msgid "&Other" msgstr "" #, python-format -msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" -msgstr "" - -msgid "" -"``internal:merge``\n" -"Uses the internal non-interactive simple merge algorithm for merging\n" -" files. It will fail if there are any conflicts and leave markers in\n" -" the partially merged file." +msgid "merging %s and %s to %s\n" msgstr "" #, python-format -msgid "merging %s incomplete! (edit conflicts, then use 'hg resolve --mark')\n" -msgstr "" - -msgid "" -"``internal:dump``\n" -"Creates three versions of the files to merge, containing the\n" -" contents of local, other and base. These files can then be used to\n" -" perform a merge manually. If the file to be merged is named\n" -" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" -" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" -" same directory as ``a.txt``." +msgid "merging %s\n" msgstr "" #, python-format -msgid "merging %s failed!\n" +msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" msgstr "" #, python-format @@ -12871,6 +10736,10 @@ msgid "" "was merge successful (yn)?" msgstr "" +#, python-format +msgid "merging %s failed!\n" +msgstr "" + msgid "unterminated string" msgstr "" @@ -13057,18 +10926,6 @@ msgstr "" msgid "copied takes no arguments" msgstr "copied tar inga argument" -msgid "" -"``subrepo([pattern])``\n" -" Subrepositories whose paths match the given pattern." -msgstr "" - -#. i18n: "subrepo" is a keyword -msgid "subrepo takes at most one argument" -msgstr "subrepo tar maximalt ett argument" - -msgid "subrepo requires a pattern or no arguments" -msgstr "subrepo kräver ett mönster eller inga argument" - msgid "invalid token" msgstr "" @@ -13083,49 +10940,9 @@ msgstr "" msgid "unknown bisect kind %s" msgstr "" -msgid "invalid bisect state" -msgstr "ogiltigt bisect-tillständ" - -#. i18n: bisect changeset status -msgid "good" -msgstr "bra" - -#. i18n: bisect changeset status -msgid "bad" -msgstr "dålig" - -#. i18n: bisect changeset status -msgid "skipped" -msgstr "hoppade över" - -#. i18n: bisect changeset status -msgid "untested" -msgstr "otestad" - -#. i18n: bisect changeset status -msgid "good (implicit)" -msgstr "bra (implicit)" - -#. i18n: bisect changeset status -msgid "bad (implicit)" -msgstr "dålig (implicit)" - msgid "disabled extensions:" msgstr "deaktiverade utökningar:" -msgid "VALUE" -msgstr "VÄRDE" - -msgid "DEPRECATED" -msgstr "FÖRLEGAD" - -msgid "" -"\n" -"[+] marked option can be specified multiple times\n" -msgstr "" -"\n" -"flaggor markerade med [+] kan anges flera gånger\n" - msgid "Configuration Files" msgstr "Konfigurationsfiler" @@ -13162,8 +10979,8 @@ msgstr "Användning Av Mallar" msgid "URL Paths" msgstr "URL-sökvägar" -msgid "Using Additional Features" -msgstr "Använda Ytterligare Funktioner" +msgid "Using additional features" +msgstr "Använda ytterligare funktioner" msgid "Subrepositories" msgstr "Underarkiv" @@ -13174,11 +10991,8 @@ msgstr "Konfiguration av hgweb" msgid "Glossary" msgstr "Ordlista" -msgid "Syntax for Mercurial Ignore Files" -msgstr "Syntax för Mercurials Ignoreringsfiler" - -msgid "Working with Phases" -msgstr "Arbeta med Faser" +msgid "syntax for Mercurial ignore files" +msgstr "syntax för Mercurials ignoreringsfiler" msgid "" "The Mercurial system uses a set of configuration files to control\n" @@ -13214,10 +11028,10 @@ msgstr "" msgid "" "Files\n" -"=====" +"-----" msgstr "" "Filer\n" -"=====" +"-----" msgid "" "Mercurial reads configuration data from several files, if they exist.\n" @@ -13236,7 +11050,7 @@ msgid "" "ones." msgstr "" -msgid "| (All) ``<repo>/.hg/hgrc``" +msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``" msgstr "" msgid "" @@ -13244,13 +11058,12 @@ msgid "" " particular repository. This file is not version-controlled, and\n" " will not get transferred during a \"clone\" operation. Options in\n" " this file override options in all other configuration files. On\n" -" Plan 9 and Unix, most of this file will be ignored if it doesn't\n" -" belong to a trusted user or to a trusted group. See the documentation\n" -" for the ``[trusted]`` section below for more details." +" Unix, most of this file will be ignored if it doesn't belong to a\n" +" trusted user or to a trusted group. See the documentation for the\n" +" ``[trusted]`` section below for more details." msgstr "" msgid "" -"| (Plan 9) ``$home/lib/hgrc``\n" "| (Unix) ``$HOME/.hgrc``\n" "| (Windows) ``%USERPROFILE%\\.hgrc``\n" "| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n" @@ -13268,8 +11081,6 @@ msgid "" msgstr "" msgid "" -"| (Plan 9) ``/lib/mercurial/hgrc``\n" -"| (Plan 9) ``/lib/mercurial/hgrc.d/*.rc``\n" "| (Unix) ``/etc/mercurial/hgrc``\n" "| (Unix) ``/etc/mercurial/hgrc.d/*.rc``" msgstr "" @@ -13282,8 +11093,6 @@ msgid "" msgstr "" msgid "" -"| (Plan 9) ``<install-root>/lib/mercurial/hgrc``\n" -"| (Plan 9) ``<install-root>/lib/mercurial/hgrc.d/*.rc``\n" "| (Unix) ``<install-root>/etc/mercurial/hgrc``\n" "| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``" msgstr "" @@ -13310,15 +11119,15 @@ msgid "" " keys contain PATH-like strings, every part of which must reference\n" " a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n" " be read. Mercurial checks each of these locations in the specified\n" -" order until one or more configuration files are detected." +" order until one or more configuration files are detected. If the\n" +" pywin32 extensions are not installed, Mercurial will only look for\n" +" site-wide configuration in ``C:\\Mercurial\\Mercurial.ini``." msgstr "" msgid "" "Syntax\n" -"======" +"------" msgstr "" -"Syntax\n" -"======" msgid "" "A configuration file consists of sections, led by a ``[section]`` header\n" @@ -13441,10 +11250,8 @@ msgstr "" msgid "" "Sections\n" -"========" +"--------" msgstr "" -"Sektioner\n" -"=========" msgid "" "This section describes the different sections that may appear in a\n" @@ -13454,10 +11261,8 @@ msgstr "" msgid "" "``alias``\n" -"---------" +"\"\"\"\"\"\"\"\"\"" msgstr "" -"``alias``\n" -"---------" msgid "" "Defines command aliases.\n" @@ -13501,7 +11306,7 @@ msgid "" "run arbitrary commands. As an example, ::" msgstr "" -msgid " echo = !echo $@" +msgid " echo = !echo" msgstr "" msgid "" @@ -13518,72 +11323,18 @@ msgid "" msgstr "" msgid "" -"Positional arguments like ``$1``, ``$2``, etc. in the alias definition\n" -"expand to the command arguments. Unmatched arguments are\n" -"removed. ``$0`` expands to the alias name and ``$@`` expands to all\n" -"arguments separated by a space. These expansions happen before the\n" -"command is passed to the shell." -msgstr "" - -msgid "" -"Shell aliases are executed in an environment where ``$HG`` expands to\n" +"Shell aliases are executed in an environment where ``$HG`` expand to\n" "the path of the Mercurial that was used to execute the alias. This is\n" "useful when you want to call further Mercurial commands in a shell\n" "alias, as was done above for the purge alias. In addition,\n" -"``$HG_ARGS`` expands to the arguments given to Mercurial. In the ``hg\n" +"``$HG_ARGS`` expand to the arguments given to Mercurial. In the ``hg\n" "echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``." msgstr "" msgid "" -".. note:: Some global configuration options such as ``-R`` are\n" -" processed before shell aliases and will thus not be passed to\n" -" aliases." -msgstr "" - -msgid "" -"\n" -"``annotate``\n" -"------------" -msgstr "" -"\n" -"``annotate``\n" -"------------" - -msgid "" -"Settings used when displaying file annotations. All values are\n" -"Booleans and default to False. See ``diff`` section for related\n" -"options for the diff command." -msgstr "" - -msgid "" -"``ignorews``\n" -" Ignore white space when comparing lines." -msgstr "" -"``ignorews``\n" -" Ignorera blanktecken när rader jämförs." - -msgid "" -"``ignorewsamount``\n" -" Ignore changes in the amount of white space." -msgstr "" -"``ignorewsamount``\n" -" Ignorera ändringar av antalet blanktecken." - -msgid "" -"``ignoreblanklines``\n" -" Ignore changes whose lines are all blank." -msgstr "" -"``ignoreblanklines``\n" -" Ignorera ändringar vars rader är tomma." - -msgid "" -"\n" "``auth``\n" -"--------" +"\"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``auth``\n" -"--------" msgid "" "Authentication credentials for HTTP authentication. This section\n" @@ -13635,9 +11386,7 @@ msgid "" " Optional. Username to authenticate with. If not given, and the\n" " remote site requires basic or digest authentication, the user will\n" " be prompted for it. Environment variables are expanded in the\n" -" username letting you do ``foo.username = $USER``. If the URI\n" -" includes a username, only ``[auth]`` entries with a matching\n" -" username or without a username will be considered." +" username letting you do ``foo.username = $USER``." msgstr "" msgid "" @@ -13676,11 +11425,8 @@ msgstr "" msgid "" "\n" "``decode/encode``\n" -"-----------------" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``decode/encode``\n" -"-----------------" msgid "" "Filters for transforming files on checkout/checkin. This would\n" @@ -13747,11 +11493,8 @@ msgstr "" msgid "" "\n" "``defaults``\n" -"------------" +"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``defaults``\n" -"------------" msgid "(defaults are deprecated. Don't use them. Use aliases instead)" msgstr "" @@ -13781,16 +11524,12 @@ msgstr "" msgid "" "\n" "``diff``\n" -"--------" +"\"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``diff``\n" -"--------" msgid "" -"Settings used when displaying diffs. Everything except for ``unified``\n" -"is a Boolean and defaults to False. See ``annotate`` section for\n" -"related options for the annotate command." +"Settings used when displaying diffs. Everything except for ``unified`` is a\n" +"Boolean and defaults to False." msgstr "" msgid "" @@ -13813,6 +11552,27 @@ msgstr "" " Visa vilken funktion varje ändring är i." msgid "" +"``ignorews``\n" +" Ignore white space when comparing lines." +msgstr "" +"``ignorews``\n" +" Ignorera blanktecken när rader jämförs." + +msgid "" +"``ignorewsamount``\n" +" Ignore changes in the amount of white space." +msgstr "" +"``ignorewsamount``\n" +" Ignorera ändringar av antalet blanktecken." + +msgid "" +"``ignoreblanklines``\n" +" Ignore changes whose lines are all blank." +msgstr "" +"``ignoreblanklines``\n" +" Ignorera ändringar vars rader är tomma." + +msgid "" "``unified``\n" " Number of lines of context to show." msgstr "" @@ -13821,10 +11581,8 @@ msgstr "" msgid "" "``email``\n" -"---------" +"\"\"\"\"\"\"\"\"\"" msgstr "" -"``email``\n" -"---------" msgid "Settings for extensions that send email messages." msgstr "" @@ -13899,11 +11657,8 @@ msgstr "" msgid "" "\n" "``extensions``\n" -"--------------" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``extensions``\n" -"--------------" msgid "" "Mercurial has an extension mechanism for adding new features. To\n" @@ -13944,12 +11699,36 @@ msgstr "" msgid "" "\n" -"``format``\n" -"----------" +"``hostfingerprints``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" + +msgid "" +"Fingerprints of the certificates of known HTTPS servers.\n" +"A HTTPS connection to a server with a fingerprint configured here will\n" +"only succeed if the servers certificate matches the fingerprint.\n" +"This is very similar to how ssh known hosts works.\n" +"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n" +"The CA chain and web.cacerts is not used for servers with a fingerprint." +msgstr "" + +msgid "For example::" +msgstr "Exempelvis::" + +msgid "" +" [hostfingerprints]\n" +" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:" +"d6:4b:ee:cc" +msgstr "" + +msgid "This feature is only supported when using Python 2.6 or later." +msgstr "" + +msgid "" "\n" "``format``\n" -"----------" +"\"\"\"\"\"\"\"\"\"\"" +msgstr "" msgid "" "``usestore``\n" @@ -13982,60 +11761,174 @@ msgid "" msgstr "" msgid "" -"``graph``\n" -"---------" +"``merge-patterns``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"``graph``\n" -"---------" msgid "" -"Web graph view configuration. This section let you change graph\n" -"elements display properties by branches, for instance to make the\n" -"``default`` branch stand out." +"This section specifies merge tools to associate with particular file\n" +"patterns. Tools matched here will take precedence over the default\n" +"merge tool. Patterns are globs by default, rooted at the repository\n" +"root." msgstr "" -msgid " <branch>.<argument> = <value>" +msgid "" +" [merge-patterns]\n" +" **.c = kdiff3\n" +" **.jpg = myimgmerge" msgstr "" msgid "" -"where ``<branch>`` is the name of the branch being\n" -"customized. Example::" +"``merge-tools``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" msgid "" -" [graph]\n" -" # 2px width\n" -" default.width = 2\n" -" # red color\n" -" default.color = FF0000" +"This section configures external merge tools to use for file-level\n" +"merges." +msgstr "" + +msgid "Example ``~/.hgrc``::" msgstr "" msgid "" -"``width``\n" -" Set branch edges width in pixels." +" [merge-tools]\n" +" # Override stock tool location\n" +" kdiff3.executable = ~/bin/kdiff3\n" +" # Specify command line\n" +" kdiff3.args = $base $local $other -o $output\n" +" # Give higher priority\n" +" kdiff3.priority = 1" msgstr "" msgid "" -"``color``\n" -" Set branch edges color in hexadecimal RGB notation." +" # Define new tool\n" +" myHtmlTool.args = -m $local $other $base $output\n" +" myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n" +" myHtmlTool.priority = 1" msgstr "" msgid "" -"``hooks``\n" -"---------" +"``priority``\n" +" The priority in which to evaluate this tool.\n" +" Default: 0." +msgstr "" + +msgid "" +"``executable``\n" +" Either just the name of the executable or its pathname. On Windows,\n" +" the path can use environment variables with ${ProgramFiles} syntax.\n" +" Default: the tool name." +msgstr "" + +msgid "" +"``args``\n" +" The arguments to pass to the tool executable. You can refer to the\n" +" files being merged as well as the output file through these\n" +" variables: ``$base``, ``$local``, ``$other``, ``$output``.\n" +" Default: ``$local $base $other``" +msgstr "" + +msgid "" +"``premerge``\n" +" Attempt to run internal non-interactive 3-way merge tool before\n" +" launching external tool. Options are ``true``, ``false``, or ``keep``\n" +" to leave markers in the file if the premerge fails.\n" +" Default: True" +msgstr "" + +msgid "" +"``binary``\n" +" This tool can merge binary files. Defaults to False, unless tool\n" +" was selected by file pattern match." +msgstr "" + +msgid "" +"``symlink``\n" +" This tool can merge symlinks. Defaults to False, even if tool was\n" +" selected by file pattern match." +msgstr "" + +msgid "" +"``check``\n" +" A list of merge success-checking options:" msgstr "" + +msgid "" +" ``changed``\n" +" Ask whether merge was successful when the merged file shows no changes.\n" +" ``conflicts``\n" +" Check whether there are conflicts even though the tool reported " +"success.\n" +" ``prompt``\n" +" Always prompt for merge success, regardless of success reported by tool." +msgstr "" + +msgid "" +"``checkchanged``\n" +" True is equivalent to ``check = changed``.\n" +" Default: False" +msgstr "" + +msgid "" +"``checkconflicts``\n" +" True is equivalent to ``check = conflicts``.\n" +" Default: False" +msgstr "" + +msgid "" +"``fixeol``\n" +" Attempt to fix up EOL changes caused by the merge tool.\n" +" Default: False" +msgstr "" + +msgid "" +"``gui``\n" +" This tool requires a graphical interface to run. Default: False" +msgstr "" + +msgid "" +"``regkey``\n" +" Windows registry key which describes install location of this\n" +" tool. Mercurial will search for this key first under\n" +" ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n" +" Default: None" +msgstr "" + +msgid "" +"``regkeyalt``\n" +" An alternate Windows registry key to try if the first key is not\n" +" found. The alternate key uses the same ``regname`` and ``regappend``\n" +" semantics of the primary key. The most common use for this key\n" +" is to search for 32bit applications on 64bit operating systems.\n" +" Default: None" +msgstr "" + +msgid "" +"``regname``\n" +" Name of value to read from specified registry key. Defaults to the\n" +" unnamed (default) value." +msgstr "" + +msgid "" +"``regappend``\n" +" String to append to the value read from the registry, typically\n" +" the executable name of the tool.\n" +" Default: None" +msgstr "" + +msgid "" +"\n" "``hooks``\n" -"---------" +"\"\"\"\"\"\"\"\"\"" +msgstr "" msgid "" "Commands or Python functions that get automatically executed by\n" "various actions such as starting or finishing a commit. Multiple\n" "hooks can be run for the same action by appending a suffix to the\n" "action. Overriding a site-wide hook can be done by changing its\n" -"value or setting it to an empty string. Hooks can be prioritized\n" -"by adding a prefix of ``priority`` to the hook name on a new line\n" -"and setting the priority. The default priority is 0 if\n" -"not specified." +"value or setting it to an empty string." msgstr "" msgid "Example ``.hg/hgrc``::" @@ -14048,9 +11941,7 @@ msgid "" " # do not use the site-wide hook\n" " incoming =\n" " incoming.email = /my/email/hook\n" -" incoming.autobuild = /my/build/hook\n" -" # force autobuild hook to run before other incoming hooks\n" -" priority.incoming.autobuild = 1" +" incoming.autobuild = /my/build/hook" msgstr "" msgid "" @@ -14261,42 +12152,9 @@ msgstr "" msgid "" "\n" -"``hostfingerprints``\n" -"--------------------" -msgstr "" -"\n" -"``hostfingerprints``\n" -"--------------------" - -msgid "" -"Fingerprints of the certificates of known HTTPS servers.\n" -"A HTTPS connection to a server with a fingerprint configured here will\n" -"only succeed if the servers certificate matches the fingerprint.\n" -"This is very similar to how ssh known hosts works.\n" -"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n" -"The CA chain and web.cacerts is not used for servers with a fingerprint." -msgstr "" - -msgid "For example::" -msgstr "Exempelvis::" - -msgid "" -" [hostfingerprints]\n" -" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:" -"d6:4b:ee:cc" -msgstr "" - -msgid "This feature is only supported when using Python 2.6 or later." -msgstr "" - -msgid "" -"\n" "``http_proxy``\n" -"--------------" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``http_proxy``\n" -"--------------" msgid "" "Used to access web-based Mercurial repositories through a HTTP\n" @@ -14332,174 +12190,54 @@ msgid "" msgstr "" msgid "" -"``merge-patterns``\n" -"------------------" -msgstr "" -"``merge-patterns``\n" -"------------------" - -msgid "" -"This section specifies merge tools to associate with particular file\n" -"patterns. Tools matched here will take precedence over the default\n" -"merge tool. Patterns are globs by default, rooted at the repository\n" -"root." -msgstr "" - -msgid "" -" [merge-patterns]\n" -" **.c = kdiff3\n" -" **.jpg = myimgmerge" -msgstr "" - -msgid "" -"``merge-tools``\n" -"---------------" -msgstr "" -"``merge-tools``\n" -"---------------" - -msgid "" -"This section configures external merge tools to use for file-level\n" -"merges." -msgstr "" - -msgid "Example ``~/.hgrc``::" -msgstr "" - -msgid "" -" [merge-tools]\n" -" # Override stock tool location\n" -" kdiff3.executable = ~/bin/kdiff3\n" -" # Specify command line\n" -" kdiff3.args = $base $local $other -o $output\n" -" # Give higher priority\n" -" kdiff3.priority = 1" -msgstr "" - -msgid "" -" # Define new tool\n" -" myHtmlTool.args = -m $local $other $base $output\n" -" myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n" -" myHtmlTool.priority = 1" -msgstr "" - -msgid "" -"``priority``\n" -" The priority in which to evaluate this tool.\n" -" Default: 0." -msgstr "" - -msgid "" -"``executable``\n" -" Either just the name of the executable or its pathname. On Windows,\n" -" the path can use environment variables with ${ProgramFiles} syntax.\n" -" Default: the tool name." -msgstr "" - -msgid "" -"``args``\n" -" The arguments to pass to the tool executable. You can refer to the\n" -" files being merged as well as the output file through these\n" -" variables: ``$base``, ``$local``, ``$other``, ``$output``.\n" -" Default: ``$local $base $other``" -msgstr "" - -msgid "" -"``premerge``\n" -" Attempt to run internal non-interactive 3-way merge tool before\n" -" launching external tool. Options are ``true``, ``false``, or ``keep``\n" -" to leave markers in the file if the premerge fails.\n" -" Default: True" -msgstr "" - -msgid "" -"``binary``\n" -" This tool can merge binary files. Defaults to False, unless tool\n" -" was selected by file pattern match." -msgstr "" - -msgid "" -"``symlink``\n" -" This tool can merge symlinks. Defaults to False, even if tool was\n" -" selected by file pattern match." -msgstr "" - -msgid "" -"``check``\n" -" A list of merge success-checking options:" -msgstr "" - -msgid "" -" ``changed``\n" -" Ask whether merge was successful when the merged file shows no changes.\n" -" ``conflicts``\n" -" Check whether there are conflicts even though the tool reported " -"success.\n" -" ``prompt``\n" -" Always prompt for merge success, regardless of success reported by tool." -msgstr "" - -msgid "" -"``checkchanged``\n" -" True is equivalent to ``check = changed``.\n" -" Default: False" +"``smtp``\n" +"\"\"\"\"\"\"\"\"" msgstr "" -msgid "" -"``checkconflicts``\n" -" True is equivalent to ``check = conflicts``.\n" -" Default: False" +msgid "Configuration for extensions that need to send email messages." msgstr "" msgid "" -"``fixeol``\n" -" Attempt to fix up EOL changes caused by the merge tool.\n" -" Default: False" +"``host``\n" +" Host name of mail server, e.g. \"mail.example.com\"." msgstr "" msgid "" -"``gui``\n" -" This tool requires a graphical interface to run. Default: False" +"``port``\n" +" Optional. Port to connect to on mail server. Default: 25." msgstr "" msgid "" -"``regkey``\n" -" Windows registry key which describes install location of this\n" -" tool. Mercurial will search for this key first under\n" -" ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n" -" Default: None" +"``tls``\n" +" Optional. Method to enable TLS when connecting to mail server: " +"starttls,\n" +" smtps or none. Default: none." msgstr "" msgid "" -"``regkeyalt``\n" -" An alternate Windows registry key to try if the first key is not\n" -" found. The alternate key uses the same ``regname`` and ``regappend``\n" -" semantics of the primary key. The most common use for this key\n" -" is to search for 32bit applications on 64bit operating systems.\n" -" Default: None" +"``username``\n" +" Optional. User name for authenticating with the SMTP server.\n" +" Default: none." msgstr "" msgid "" -"``regname``\n" -" Name of value to read from specified registry key. Defaults to the\n" -" unnamed (default) value." +"``password``\n" +" Optional. Password for authenticating with the SMTP server. If not\n" +" specified, interactive sessions will prompt the user for a\n" +" password; non-interactive sessions will fail. Default: none." msgstr "" msgid "" -"``regappend``\n" -" String to append to the value read from the registry, typically\n" -" the executable name of the tool.\n" -" Default: None" +"``local_hostname``\n" +" Optional. It's the hostname that the sender can use to identify\n" +" itself to the MTA." msgstr "" msgid "" "\n" "``patch``\n" -"---------" +"\"\"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``patch``\n" -"---------" msgid "" "Settings used when applying patches, for instance through the 'import'\n" @@ -14522,11 +12260,8 @@ msgstr "" msgid "" "\n" "``paths``\n" -"---------" +"\"\"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``paths``\n" -"---------" msgid "" "Assigns symbolic names to repositories. The left side is the\n" @@ -14549,72 +12284,22 @@ msgid "" msgstr "" msgid "" -"``phases``\n" -"----------" -msgstr "" -"``phases``\n" -"----------" - -msgid "" -"Specifies default handling of phases. See :hg:`help phases` for more\n" -"information about working with phases." -msgstr "" - -msgid "" -"``publish``\n" -" Controls draft phase behavior when working as a server. When true,\n" -" pushed changesets are set to public in both client and server and\n" -" pulled or cloned changesets are set to public in the client.\n" -" Default: True" -msgstr "" - -msgid "" -"``new-commit``\n" -" Phase of newly-created commits.\n" -" Default: draft" -msgstr "" - -msgid "" -"``profiling``\n" -"-------------" -msgstr "" +"\n" "``profiling``\n" -"-------------" - -msgid "" -"Specifies profiling type, format, and file output. Two profilers are\n" -"supported: an instrumenting profiler (named ``ls``), and a sampling\n" -"profiler (named ``stat``)." -msgstr "" - -msgid "" -"In this section description, 'profiling data' stands for the raw data\n" -"collected during profiling, while 'profiling report' stands for a\n" -"statistical text report generated from the profiling data. The\n" -"profiling is done using lsprof." +"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" msgid "" -"``type``\n" -" The type of profiler to use.\n" -" Default: ls." -msgstr "" - -msgid "" -" ``ls``\n" -" Use Python's built-in instrumenting profiler. This profiler\n" -" works on all platforms, but each line number it reports is the\n" -" first line of a function. This restriction makes it difficult to\n" -" identify the expensive parts of a non-trivial function.\n" -" ``stat``\n" -" Use a third-party statistical profiler, statprof. This profiler\n" -" currently runs only on Unix systems, and is most useful for\n" -" profiling commands that run for longer than about 0.1 seconds." +"Specifies profiling format and file output. In this section\n" +"description, 'profiling data' stands for the raw data collected\n" +"during profiling, while 'profiling report' stands for a statistical\n" +"text report generated from the profiling data. The profiling is done\n" +"using lsprof." msgstr "" msgid "" "``format``\n" -" Profiling format. Specific to the ``ls`` instrumenting profiler.\n" +" Profiling format.\n" " Default: text." msgstr "" @@ -14630,12 +12315,6 @@ msgid "" msgstr "" msgid "" -"``frequency``\n" -" Sampling frequency. Specific to the ``stat`` sampling profiler.\n" -" Default: 1000." -msgstr "" - -msgid "" "``output``\n" " File path where profiling data or report should be saved. If the\n" " file exists, it is replaced. Default: None, data is printed on\n" @@ -14644,20 +12323,16 @@ msgstr "" msgid "" "``revsetalias``\n" -"---------------" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"``revsetalias``\n" -"---------------" msgid "Alias definitions for revsets. See :hg:`help revsets` for details." msgstr "" msgid "" "``server``\n" -"----------" +"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"``server``\n" -"----------" msgid "Controls generic server settings." msgstr "" @@ -14677,12 +12352,6 @@ msgid "" msgstr "" msgid "" -"``preferuncompressed``\n" -" When set, clients will try to use the uncompressed streaming\n" -" protocol. Default is False." -msgstr "" - -msgid "" "``validate``\n" " Whether to validate the completeness of pushed changesets by\n" " checking that all new file revisions specified in manifests are\n" @@ -14690,74 +12359,21 @@ msgid "" msgstr "" msgid "" -"``smtp``\n" -"--------" -msgstr "" -"``smtp``\n" -"--------" - -msgid "Configuration for extensions that need to send email messages." -msgstr "" - -msgid "" -"``host``\n" -" Host name of mail server, e.g. \"mail.example.com\"." -msgstr "" - -msgid "" -"``port``\n" -" Optional. Port to connect to on mail server. Default: 25." -msgstr "" - -msgid "" -"``tls``\n" -" Optional. Method to enable TLS when connecting to mail server: " -"starttls,\n" -" smtps or none. Default: none." -msgstr "" - -msgid "" -"``username``\n" -" Optional. User name for authenticating with the SMTP server.\n" -" Default: none." -msgstr "" - -msgid "" -"``password``\n" -" Optional. Password for authenticating with the SMTP server. If not\n" -" specified, interactive sessions will prompt the user for a\n" -" password; non-interactive sessions will fail. Default: none." -msgstr "" - -msgid "" -"``local_hostname``\n" -" Optional. It's the hostname that the sender can use to identify\n" -" itself to the MTA." -msgstr "" - -msgid "" -"\n" "``subpaths``\n" -"------------" +"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``subpaths``\n" -"------------" -msgid "" -"Subrepository source URLs can go stale if a remote server changes name\n" -"or becomes temporarily unavailable. This section lets you define\n" -"rewrite rules of the form::" +msgid "Defines subrepositories source locations rewriting rules of the form::" msgstr "" msgid " <pattern> = <replacement>" msgstr "" msgid "" -"where ``pattern`` is a regular expression matching a subrepository\n" -"source URL and ``replacement`` is the replacement string used to\n" -"rewrite it. Groups can be matched in ``pattern`` and referenced in\n" -"``replacements``. For instance::" +"Where ``pattern`` is a regular expression matching the source and\n" +"``replacement`` is the replacement string used to rewrite it. Groups\n" +"can be matched in ``pattern`` and referenced in ``replacements``. For\n" +"instance::" msgstr "" msgid " http://server/(.*)-hg/ = http://hg.server/\\1/" @@ -14766,18 +12382,13 @@ msgstr "" msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``." msgstr "" -msgid "" -"Relative subrepository paths are first made absolute, and the\n" -"rewrite rules are then applied on the full (absolute) path. The rules\n" -"are applied in definition order." +msgid "All patterns are applied in definition order." msgstr "" msgid "" "``trusted``\n" -"-----------" +"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"``trusted``\n" -"-----------" msgid "" "Mercurial will not use the settings in the\n" @@ -14810,11 +12421,8 @@ msgstr "" msgid "" "\n" "``ui``\n" -"------" +"\"\"\"\"\"\"" msgstr "" -"\n" -"``ui``\n" -"------" msgid "User interface controls." msgstr "" @@ -14842,7 +12450,7 @@ msgid "" " Whether to commit modified subrepositories when committing the\n" " parent repository. If False and one subrepository has uncommitted\n" " changes, abort the commit.\n" -" Default is False." +" Default is True." msgstr "" msgid "" @@ -14915,12 +12523,6 @@ msgid "" msgstr "" msgid "" -"``reportoldssl``\n" -" Warn if an SSL certificate is unable to be due to using Python\n" -" 2.5 or earlier. True or False. Default is True." -msgstr "" - -msgid "" "``report_untrusted``\n" " Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" " trusted user or group. True or False. Default is True." @@ -14985,11 +12587,8 @@ msgstr "" msgid "" "\n" "``web``\n" -"-------" +"\"\"\"\"\"\"\"" msgstr "" -"\n" -"``web``\n" -"-------" msgid "" "Web interface configuration. The settings in this section apply to\n" @@ -15070,15 +12669,6 @@ msgid "" msgstr "" msgid "" -"``guessmime``\n" -" Control MIME types for raw download of file content.\n" -" Set to True to let hgweb guess the content type from the file\n" -" extension. This will serve HTML files as ``text/html`` and might\n" -" allow cross-site scripting attacks when serving untrusted\n" -" repositories. Default is False." -msgstr "" - -msgid "" "``allow_read``\n" " If the user has not already been denied repository access due to\n" " the contents of deny_read, this list determines whether to grant\n" @@ -15110,7 +12700,16 @@ msgid "" " authority certificates. Environment variables and ``~user``\n" " constructs are expanded in the filename. If specified on the\n" " client, then it will verify the identity of remote HTTPS servers\n" -" with these certificates." +" with these certificates. The form must be as follows::" +msgstr "" + +msgid "" +" -----BEGIN CERTIFICATE-----\n" +" ... (certificate in base64 PEM encoding) ...\n" +" -----END CERTIFICATE-----\n" +" -----BEGIN CERTIFICATE-----\n" +" ... (certificate in base64 PEM encoding) ...\n" +" -----END CERTIFICATE-----" msgstr "" msgid "" @@ -15122,24 +12721,15 @@ msgid "" msgstr "" msgid "" -" To disable SSL verification temporarily, specify ``--insecure`` from\n" -" command line." -msgstr "" - -msgid "" -" You can use OpenSSL's CA certificate file if your platform has\n" -" one. On most Linux systems this will be\n" -" ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to\n" -" generate this file manually. The form must be as follows::" +" You can use OpenSSL's CA certificate file if your platform has one.\n" +" On most Linux systems this will be ``/etc/ssl/certs/ca-certificates." +"crt``.\n" +" Otherwise you will have to generate this file manually." msgstr "" msgid "" -" -----BEGIN CERTIFICATE-----\n" -" ... (certificate in base64 PEM encoding) ...\n" -" -----END CERTIFICATE-----\n" -" -----BEGIN CERTIFICATE-----\n" -" ... (certificate in base64 PEM encoding) ...\n" -" -----END CERTIFICATE-----" +" To disable SSL verification temporarily, specify ``--insecure`` from\n" +" command line." msgstr "" msgid "" @@ -15148,17 +12738,6 @@ msgid "" msgstr "" msgid "" -"``collapse``\n" -" With ``descend`` enabled, repositories in subdirectories are shown at\n" -" a single level alongside repositories in the current path. With\n" -" ``collapse`` also enabled, repositories residing at a deeper level than\n" -" the current path are grouped behind navigable directory entries that\n" -" lead to the locations of these repositories. In effect, this setting\n" -" collapses each collection of repositories found within a subdirectory\n" -" into a single entry for that subdirectory. Default is False." -msgstr "" - -msgid "" "``contact``\n" " Name or email address of the person in charge of the repository.\n" " Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty." @@ -15217,15 +12796,6 @@ msgid "" msgstr "" msgid "" -"``comparisoncontext``\n" -" Number of lines of context to show in side-by-side file comparison. If\n" -" negative or the value ``full``, whole files are shown. Default is 5.\n" -" This setting can be overridden by a ``context`` request parameter to " -"the\n" -" ``comparison`` command, taking the same values." -msgstr "" - -msgid "" "``hidden``\n" " Whether to hide the repository in the hgwebdir index.\n" " Default is False." @@ -15237,14 +12807,6 @@ msgid "" msgstr "" msgid "" -"``logoimg``\n" -" File name of the logo image that some templates display on each page.\n" -" The file name is relative to ``staticurl``. That is, the full path to\n" -" the logo image is \"staticurl/logoimg\".\n" -" If unset, ``hglogo.png`` will be used." -msgstr "" - -msgid "" "``logourl``\n" " Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n" " will be used." @@ -15730,7 +13292,7 @@ msgstr "" msgid "- Find C files in a non-standard encoding::" msgstr "" -msgid " hg locate \"set:**.c and not encoding('UTF-8')\"" +msgid " hg locate \"set:**.c and not encoding(ascii)\"" msgstr "" msgid "- Revert copies of large binary files::" @@ -15945,7 +13507,7 @@ msgstr "" msgid "" "Close changeset\n" -" See 'Head, closed branch'" +" See 'Changeset, close'." msgstr "" msgid "" @@ -16056,13 +13618,6 @@ msgid "" msgstr "" msgid "" -"Draft\n" -" Changesets in the draft phase have not been shared with publishing\n" -" repositories and may thus be safely changed by history-modifying\n" -" extensions. See :hg:`help phases`." -msgstr "" - -msgid "" "Graph\n" " See DAG and :hg:`help graphlog`." msgstr "" @@ -16093,11 +13648,6 @@ msgid "" msgstr "" msgid "" -" Closed heads can be re-opened by committing new changeset as the\n" -" child of the changeset that marks a head as closed." -msgstr "" - -msgid "" "Head, repository\n" " A topological head which has not been closed." msgstr "" @@ -16198,19 +13748,6 @@ msgid " Example: \"You will need to patch that revision.\"" msgstr "" msgid "" -"Phase\n" -" A per-changeset state tracking how the changeset has been or\n" -" should be shared. See :hg:`help phases`." -msgstr "" - -msgid "" -"Public\n" -" Changesets in the public phase have been shared with publishing\n" -" repositories and are therefore considered immutable. See :hg:`help\n" -" phases`." -msgstr "" - -msgid "" "Pull\n" " An operation in which changesets in a remote repository which are\n" " not in the local repository are brought into the local\n" @@ -16285,12 +13822,6 @@ msgid "" msgstr "" msgid "" -"Secret\n" -" Changesets in the secret phase may not be shared via push, pull,\n" -" or clone. See :hg:`help phases`." -msgstr "" - -msgid "" "Tag\n" " An alternative name given to a changeset. Tags can be used in all\n" " places where Mercurial expects a changeset ID, e.g., with\n" @@ -16342,10 +13873,8 @@ msgstr "" msgid "" "Synopsis\n" -"========" +"--------" msgstr "" -"Synopsis\n" -"========" msgid "" "The Mercurial system uses a file called ``.hgignore`` in the root\n" @@ -16355,10 +13884,10 @@ msgstr "" msgid "" "Description\n" -"===========" +"-----------" msgstr "" "Beskrivning\n" -"===========" +"-----------" msgid "" "The working directory of a Mercurial repository will often contain\n" @@ -16396,13 +13925,6 @@ msgid "" msgstr "" msgid "" -"Files that are already tracked are not affected by .hgignore, even\n" -"if they appear in .hgignore. An untracked file X can be explicitly\n" -"added with :hg:`add X`, even if X would be excluded by a pattern\n" -"in .hgignore." -msgstr "" - -msgid "" "An ignore file is a plain text file consisting of a list of patterns,\n" "with one pattern per line. Empty lines are skipped. The ``#``\n" "character is treated as a comment character, and the ``\\`` character\n" @@ -16443,17 +13965,9 @@ msgid "" msgstr "" msgid "" -".. note::\n" -" Patterns specified in other than ``.hgignore`` are always rooted.\n" -" Please see :hg:`help patterns` for details." -msgstr "" - -msgid "" "Example\n" -"=======" +"-------" msgstr "" -"Exempel\n" -"=======" msgid "Here is an example ignore file. ::" msgstr "" @@ -16477,22 +13991,21 @@ msgstr "" msgid "" "Mercurial's internal web server, hgweb, can serve either a single\n" -"repository, or a tree of repositories. In the second case, repository\n" -"paths and global options can be defined using a dedicated\n" -"configuration file common to :hg:`serve`, ``hgweb.wsgi``,\n" -"``hgweb.cgi`` and ``hgweb.fcgi``." +"repository, or a collection of them. In the latter case, a special\n" +"configuration file can be used to specify the repository paths to use\n" +"and global web configuration options." msgstr "" "Mercurials interna webbserver, hgweb, kan endera dela ut ett arkiv, eller\n" -"en trädstruktur med arkiv. I det andra fallet kan arkivsökvägar och\n" -"globala flaggor definieras med en dedikerad konfigurationsfil som delas\n" -"av :hg:`serve`, ``hgweb.wsgi``, ``hgweb.cgi`` och ``hgweb.fcgi``." +"flera stycken. I det senare fallet, så kan en speciell konfigurationsfil\n" +"användas för att ange arkivsökvägarna att använda och globala alternativ\n" +"för webbkonfiguration" msgid "" -"This file uses the same syntax as other Mercurial configuration files\n" -"but recognizes only the following sections:" +"This file uses the same syntax as other Mercurial configuration files,\n" +"but only the following sections are recognized:" msgstr "" "Denna fil använder samma syntax som Mercurials övriga konfigurationsfiler,\n" -"men använder bara de följande sektionerna:" +"men bara de följande sektionerna används:" msgid "" " - web\n" @@ -16503,82 +14016,83 @@ msgstr "" " - paths\n" " - collections" -msgid "The ``web`` options are thorougly described in :hg:`help config`." -msgstr "Flaggorna för ``web`` finns utförligt beskrivna i :hg:`help config`." - msgid "" -"The ``paths`` section maps URL paths to paths of repositories in the\n" -"filesystem. hgweb will not expose the filesystem directly - only\n" -"Mercurial repositories can be published and only according to the\n" -"configuration." +"The ``web`` section can specify all the settings described in the web\n" +"section of the hgrc(5) documentation. See :hg:`help config` for\n" +"information on where to find the manual page." msgstr "" -"Sektionen ``paths`` matchar URL-sökvägar till arkivsökvägar i filsystemet.\n" -"hgweb kommer inte att exponera filsystemet direkt - bara Mercurial-arkiv\n" -"kan publiceras och bara som konfigurationen medger." +"Sektionen ``web`` kan ange alla inställningar som beskrivs i web-sektionen\n" +"i hgrc(5)-dokumentationen. Se :hg:`help config` för information om var\n" +"manualsidan hittas." msgid "" -"The left hand side is the path in the URL. Note that hgweb reserves\n" -"subpaths like ``rev`` or ``file``, try using different names for\n" -"nested repositories to avoid confusing effects." +"The ``paths`` section provides mappings of physical repository\n" +"paths to virtual ones. For instance::" msgstr "" -"Den vänstra sidan är sökvägen i URL:en. Notera att hgweb reserverar\n" -"undersökvägar som ``rev`` eller ``file``, försök att anvädna andra namn\n" -"för nästlade arkiv för att undvika förbryllande fenomen." - -msgid "" -"The right hand side is the path in the filesystem. If the specified\n" -"path ends with ``*`` or ``**`` the filesystem will be searched\n" -"recursively for repositories below that point.\n" -"With ``*`` it will not recurse into the repositories it finds (except for\n" -"``.hg/patches``).\n" -"With ``**`` it will also search inside repository working directories\n" -"and possibly find subrepositories." -msgstr "" -"Den högra sidan är sökvägen i filsystemet. Om den angivna sökvägen slutar\n" -"med ``*`` eller ``**`` så kommer filsystemet att genomsökas rekursivt\n" -"efter arkiv från den punkten.\n" -"Med ``*`` så kommer sökningen inte att fortsätta in i funna arkiv (med\n" -"undantag för ``.hg/patches``).\n" -"Med ``**`` så kommer sökningen att fortsätta i arkivets arbetskopia och\n" -"möjligen hitta underarkiv." - -msgid "In this example::" -msgstr "I det här exemplet::" +"Sektionen ``paths`` mappar upp fysiska arkiv till virtuella. Exempelvis::" msgid "" " [paths]\n" -" /projects/a = /srv/tmprepos/a\n" -" /projects/b = c:/repos/b\n" -" / = /srv/repos/*\n" -" /user/bob = /home/bob/repos/**" +" projects/a = /foo/bar\n" +" projects/b = /baz/quux\n" +" web/root = /real/root/*\n" +" / = /real/root2/*\n" +" virtual/root2 = /real/root2/**" msgstr "" " [paths]\n" -" /projects/a = /srv/tmprepos/a\n" -" /projects/b = c:/repos/b\n" -" / = /srv/repos/*\n" -" /user/bob = /home/bob/repos/**" +" projekt/a = /foo/bar\n" +" projekt/b = /baz/quux\n" +" web/rot = /riktig/rot/*\n" +" / = /riktig/rot2/*\n" +" virtuell/rot2 = /riktig/rot2/**" msgid "" "- The first two entries make two repositories in different directories\n" " appear under the same directory in the web interface\n" -"- The third entry will publish every Mercurial repository found in\n" -" ``/srv/repos/``, for instance the repository ``/srv/repos/quux/``\n" -" will appear as ``http://server/quux/``\n" -"- The fourth entry will publish both ``http://server/user/bob/quux/``\n" -" and ``http://server/user/bob/quux/testsubrepo/``" +"- The third entry maps every Mercurial repository found in '/real/root'\n" +" into 'web/root'. This format is preferred over the [collections] one,\n" +" since using absolute paths as configuration keys is not supported on " +"every\n" +" platform (especially on Windows).\n" +"- The fourth entry is a special case mapping all repositories in\n" +" '/real/root2' in the root of the virtual directory.\n" +"- The fifth entry recursively finds all repositories under the real\n" +" root, and maps their relative paths under the virtual root." msgstr "" -"- De första två posterna gör att två arkiv i olika kataloger dyker upp\n" -" under samma katalog i webbgränssnittet\n" -"- Den tredje posten publicerar alla Mercurial-arkiv som hittas i\n" -" ``/srv/repos/``, exempelvis kommer arkivet ``/srv/repos/quux/``\n" -" att dyka upp som ``http://server/quux/``\n" -"- Den fjärde posten publicerar både ``http://server/user/bob/quux/``\n" -" och ``http://server/user/bob/quux/testsubrepo/``" +"- De första två posterna gör att två arkiv i olika kataloger visas under\n" +" samma katalog i webbgränssnittet\n" +"- Den tredje posten mappar alla Mercurial-arkiv som hittas i '/riktig/rot'\n" +" i 'web/rot'. Detta format är att föredra över det i [collections],\n" +" eftersom användning av absoluta sökvägar som konfigurationsnycklar inte\n" +" stödjs på alla plattformar (särskilt Windows).\n" +"- Den fjärde posten är ett specialfall som mappar alla arkiv i\n" +" '/riktig/rot2' i roten på den virtuella katalogen.\n" +"- Den femte posten söker rekursivt efter alla arkiv under den riktiga\n" +" roten, och mappar deras relativa sökvägar under den virtuella roten." msgid "" -"The ``collections`` section is deprecated and has been superseeded by\n" -"``paths``.\n" -msgstr "Sektionen ``collections`` är föråldrad och har ersatts av ``paths``.\n" +"The ``collections`` section provides mappings of trees of physical\n" +"repositories paths to virtual ones, though the paths syntax is generally\n" +"preferred. For instance::" +msgstr "" +"Sektionen ``collections`` mappar upp träd av fysiska arkiv till virtuella,\n" +"men användning av paths är generellt sett att föredra. Exempel::" + +msgid "" +" [collections]\n" +" /foo = /foo" +msgstr "" +" [collections]\n" +" /foo = /foo" + +msgid "" +"Here, the left side will be stripped off all repositories found in the\n" +"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n" +"``bar`` and ``quux/baz`` respectively.\n" +msgstr "" +"Här kommer den vänstra sidan att strippas från alla arkiv som hittas i den\n" +"högra sidan. Det innebär att ``/foo/bar`` och ``foo/quux/baz`` kommer att\n" +"visas som ``bar``och ``quux/baz``.\n" msgid "To merge files Mercurial uses merge tools." msgstr "" @@ -16608,10 +14122,8 @@ msgstr "" msgid "" "Available merge tools\n" -"=====================" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" -"Tillgängliga sammanfogningsverktyg\n" -"==================================" msgid "" "External merge tools and their properties are configured in the\n" @@ -16634,7 +14146,44 @@ msgid "" "merge tools are:" msgstr "" -msgid ".. internaltoolsmarker" +msgid "" +"``internal:merge``\n" +" Uses the internal non-interactive simple merge algorithm for merging\n" +" files. It will fail if there are any conflicts and leave markers in\n" +" the partially merged file." +msgstr "" + +msgid "" +"``internal:fail``\n" +" Rather than attempting to merge files that were modified on both\n" +" branches, it marks them as unresolved. The resolve command must be\n" +" used to resolve these conflicts." +msgstr "" + +msgid "" +"``internal:local``\n" +" Uses the local version of files as the merged version." +msgstr "" + +msgid "" +"``internal:other``\n" +" Uses the other version of files as the merged version." +msgstr "" + +msgid "" +"``internal:prompt``\n" +" Asks the user which of the local or the other version to keep as\n" +" the merged version." +msgstr "" + +msgid "" +"``internal:dump``\n" +" Creates three versions of the files to merge, containing the\n" +" contents of local, other and base. These files can then be used to\n" +" perform a merge manually. If the file to be merged is named\n" +" ``a.txt``, these files will accordingly be named ``a.txt.local``,\n" +" ``a.txt.other`` and ``a.txt.base`` and they will be placed in the\n" +" same directory as ``a.txt``." msgstr "" msgid "" @@ -16645,7 +14194,7 @@ msgstr "" msgid "" "Choosing a merge tool\n" -"=====================" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" msgstr "" msgid "Mercurial uses these rules when deciding which merge tool to use:" @@ -16760,12 +14309,6 @@ msgid "Alternate pattern notations must be specified explicitly." msgstr "Alternativa mönsternotationer måste anges explicit." msgid "" -".. note::\n" -" Patterns specified in ``.hgignore`` are not rooted. \n" -" Please see :hg:`help hgignore` for details." -msgstr "" - -msgid "" "To use a plain path name without any pattern matching, start it with\n" "``path:``. These path names must completely match starting at the\n" "current repository root." @@ -16853,149 +14396,6 @@ msgstr "" msgid "See also :hg:`help filesets`.\n" msgstr "" -msgid "" -"What are phases?\n" -"================" -msgstr "" -"Vad är faser?\n" -"=============" - -msgid "" -"Phases are a system for tracking which changesets have been or should\n" -"be shared. This helps prevent common mistakes when modifying history\n" -"(for instance, with the mq or rebase extensions)." -msgstr "" - -msgid "Each changeset in a repository is in one of the following phases:" -msgstr "" - -msgid "" -" - public : changeset is visible on a public server\n" -" - draft : changeset is not yet published\n" -" - secret : changeset should not be pushed, pulled, or cloned" -msgstr "" - -msgid "" -"These phases are ordered (public < draft < secret) and no changeset\n" -"can be in a lower phase than its ancestors. For instance, if a\n" -"changeset is public, all its ancestors are also public. Lastly,\n" -"changeset phases should only be changed towards the public phase." -msgstr "" - -msgid "" -"How are phases managed?\n" -"=======================" -msgstr "" -"Hur hanteras faser?\n" -"===================" - -msgid "" -"For the most part, phases should work transparently. By default, a\n" -"changeset is created in the draft phase and is moved into the public\n" -"phase when it is pushed to another repository." -msgstr "" - -msgid "" -"Once changesets become public, extensions like mq and rebase will\n" -"refuse to operate on them to prevent creating duplicate changesets.\n" -"Phases can also be manually manipulated with the :hg:`phase` command\n" -"if needed. See :hg:`help -v phase` for examples." -msgstr "" - -msgid "" -"Phases and servers\n" -"==================" -msgstr "" -"Faser och servrar\n" -"=================" - -msgid "Normally, all servers are ``publishing`` by default. This means::" -msgstr "" - -msgid "" -" - all draft changesets that are pulled or cloned appear in phase\n" -" public on the client" -msgstr "" - -msgid "" -" - all draft changesets that are pushed appear as public on both\n" -" client and server" -msgstr "" - -msgid " - secret changesets are neither pushed, pulled, or cloned" -msgstr "" - -msgid "" -".. note::\n" -" Pulling a draft changeset from a publishing server does not mark it\n" -" as public on the server side due to the read-only nature of pull." -msgstr "" - -msgid "" -"Sometimes it may be desirable to push and pull changesets in the draft\n" -"phase to share unfinished work. This can be done by setting a\n" -"repository to disable publishing in its configuration file::" -msgstr "" - -msgid "" -" [phases]\n" -" publish = False" -msgstr "" -" [phases]\n" -" publish = False" - -msgid "See :hg:`help config` for more information on config files." -msgstr "Se :hg:`help config` för mer information om konfigurationsfiler." - -msgid "" -".. note::\n" -" Servers running older versions of Mercurial are treated as\n" -" publishing." -msgstr "" - -msgid "" -"Examples\n" -"========" -msgstr "" -"Exempel\n" -"=======" - -msgid " - list changesets in draft or secret phase::" -msgstr " - visa ändringar i draft- eller secret-fasen::" - -msgid " hg log -r \"not public()\"" -msgstr " hg log -r \"not public()\"" - -msgid " - change all secret changesets to draft::" -msgstr " - ändra alla secret-ändringar till draft::" - -msgid " hg phase --draft \"secret()\"" -msgstr " hg phase --draft \"secret()\"" - -msgid "" -" - forcibly move the current changeset and descendants from public to draft::" -msgstr " - tvinga nuvarande ändring och ättlingar från public till draft::" - -msgid " hg phase --force --draft ." -msgstr " hg phase --force --draft ." - -msgid " - show a list of changeset revision and phase::" -msgstr " - visa en lista med ändringsrevision och fas::" - -msgid " hg log --template \"{rev} {phase}\\n\"" -msgstr " hg log --template \"{rev} {phase}\\n\"" - -msgid " - resynchronize draft changesets relative to a remote repository::" -msgstr "" - -msgid " hg phase -fd 'outgoing(URL)' " -msgstr " hg phase -fd 'outgoing(URL)' " - -msgid "" -"See :hg:`help phase` for more information on manually manipulating phases.\n" -msgstr "" -"Se :hg:`help phase` för mer information om att manuellt änddra faser.\n" - msgid "Mercurial supports several ways to specify individual revisions." msgstr "Mercurial stöder flera sätt att ange individuella revisioner." @@ -17027,21 +14427,22 @@ msgstr "" "fullängdsidentifierare." msgid "" -"Any other string is treated as a bookmark, tag, or branch name. A\n" -"bookmark is a movable pointer to a revision. A tag is a permanent name\n" -"associated with a revision. A branch name denotes the tipmost revision\n" -"of that branch. Bookmark, tag, and branch names must not contain the \":\"\n" -"character." +"Any other string is treated as a tag or branch name. A tag name is a\n" +"symbolic name associated with a revision identifier. A branch name\n" +"denotes the tipmost revision of that branch. Tag and branch names must\n" +"not contain the \":\" character." msgstr "" -"Alla andra strängar behandlas som bokmärken, märken eller grennamn. Ett\n" -"bokmärke är en flyttbar pekare till en revision. Ett märkesnamn är ett\n" -"permanent namn associerad med en revisionsidentifierare. Ett grennamn\n" -"anger den högsta revisionen på den grenen. Bokmärken, märken och\n" -"grennamn kan inte innehålla tecknet \":\"." +"Alla andra strängar behandlas som märkes- eller grennamn. Ett märkesnamn är\n" +"ett symboliskt namn associerad med en revisionsidentifierare. Ett grennamn\n" +"anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n" +"innehålla tecknet \":\"." -msgid "The reserved name \"tip\" always identifies the most recent revision." +msgid "" +"The reserved name \"tip\" is a special tag that always identifies the\n" +"most recent revision." msgstr "" -"Det reserverade namnet \"tip\" identifierar alltid den senaste revisionen." +"Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n" +"identifierar den senaste revisionen." msgid "" "The reserved name \"null\" indicates the null revision. This is the\n" @@ -17071,9 +14472,10 @@ msgid "" msgstr "" msgid "" -"Identifiers such as branch names may need quoting with single or\n" -"double quotes if they contain characters like ``-`` or if they match\n" -"one of the predefined predicates." +"Identifiers such as branch names must be quoted with single or double\n" +"quotes if they contain characters outside of\n" +"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" +"predicates." msgstr "" msgid "" @@ -17229,12 +14631,8 @@ msgstr "" msgid "" "Subrepositories let you nest external repositories or projects into a\n" "parent Mercurial repository, and make commands operate on them as a\n" -"group." -msgstr "" - -msgid "" -"Mercurial currently supports Mercurial, Git, and Subversion\n" -"subrepositories." +"group. External Mercurial and Subversion projects are currently\n" +"supported." msgstr "" msgid "Subrepositories are made of three components:" @@ -17242,12 +14640,12 @@ msgstr "" msgid "" "1. Nested repository checkouts. They can appear anywhere in the\n" -" parent working directory." +" parent working directory, and are Mercurial clones or Subversion\n" +" checkouts." msgstr "" msgid "" -"2. Nested repository references. They are defined in ``.hgsub``, which\n" -" should be placed in the root of working directory, and\n" +"2. Nested repository references. They are defined in ``.hgsub`` and\n" " tell where the subrepository checkouts come from. Mercurial\n" " subrepositories are referenced like:" msgstr "" @@ -17255,19 +14653,14 @@ msgstr "" msgid " path/to/nested = https://example.com/nested/repo/path" msgstr "" -msgid " Git and Subversion subrepos are also supported:" -msgstr "" - -msgid "" -" path/to/nested = [git]git://example.com/nested/repo/path\n" -" path/to/nested = [svn]https://example.com/nested/trunk/path" -msgstr "" - msgid "" " where ``path/to/nested`` is the checkout location relatively to the\n" " parent Mercurial root, and ``https://example.com/nested/repo/path``\n" " is the source repository path. The source can also reference a\n" -" filesystem path." +" filesystem path. Subversion repositories are defined with:" +msgstr "" + +msgid " path/to/nested = [svn]https://example.com/nested/trunk/path" msgstr "" msgid "" @@ -17277,8 +14670,7 @@ msgid "" msgstr "" msgid "" -"3. Nested repository states. They are defined in ``.hgsubstate``, which\n" -" is placed in the root of working directory, and\n" +"3. Nested repository states. They are defined in ``.hgsubstate`` and\n" " capture whatever information is required to restore the\n" " subrepositories to the state they were committed in a parent\n" " repository changeset. Mercurial automatically record the nested\n" @@ -17293,7 +14685,7 @@ msgstr "" msgid "" "\n" "Adding a Subrepository\n" -"======================" +"----------------------" msgstr "" msgid "" @@ -17307,7 +14699,7 @@ msgstr "" msgid "" "Synchronizing a Subrepository\n" -"=============================" +"-----------------------------" msgstr "" msgid "" @@ -17326,7 +14718,7 @@ msgstr "" msgid "" "Deleting a Subrepository\n" -"========================" +"------------------------" msgstr "" msgid "" @@ -17336,14 +14728,12 @@ msgstr "" msgid "" "Interaction with Mercurial Commands\n" -"===================================" +"-----------------------------------" msgstr "" msgid "" ":add: add does not recurse in subrepos unless -S/--subrepos is\n" -" specified. However, if you specify the full path of a file in a\n" -" subrepo, it will be added even without -S/--subrepos specified.\n" -" Git and Subversion subrepositories are currently silently\n" +" specified. Subversion subrepositories are currently silently\n" " ignored." msgstr "" @@ -17354,37 +14744,31 @@ msgstr "" msgid "" ":commit: commit creates a consistent snapshot of the state of the\n" -" entire project and its subrepositories. If any subrepositories\n" -" have been modified, Mercurial will abort. Mercurial can be made\n" -" to instead commit all modified subrepositories by specifying\n" -" -S/--subrepos, or setting \"ui.commitsubrepos=True\" in a\n" -" configuration file (see :hg:`help config`). After there are no\n" -" longer any modified subrepositories, it records their state and\n" -" finally commits it in the parent repository." +" entire project and its subrepositories. It does this by first\n" +" attempting to commit all modified subrepositories, then recording\n" +" their state and finally committing it in the parent\n" +" repository. Mercurial can be made to abort if any subrepository\n" +" content is modified by setting \"ui.commitsubrepos=no\" in a\n" +" configuration file (see :hg:`help config`)." msgstr "" msgid "" ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" " specified. Changes are displayed as usual, on the subrepositories\n" -" elements. Git and Subversion subrepositories are currently\n" -" silently ignored." -msgstr "" - -msgid "" -":forget: forget currently only handles exact file matches in subrepos.\n" -" Git and Subversion subrepositories are currently silently ignored." +" elements. Subversion subrepositories are currently silently\n" +" ignored." msgstr "" msgid "" ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n" -" is specified. Git and Subversion subrepositories are currently\n" -" silently ignored." +" is specified. Subversion subrepositories are currently silently\n" +" ignored." msgstr "" msgid "" ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n" -" is specified. Git and Subversion subrepositories are currently\n" -" silently ignored." +" is specified. Subversion subrepositories are currently silently\n" +" ignored." msgstr "" msgid "" @@ -17399,7 +14783,7 @@ msgid "" ":push: Mercurial will automatically push all subrepositories first\n" " when the parent repository is being pushed. This ensures new\n" " subrepository changes are available when referenced by top-level\n" -" repositories. Push is a no-op for Subversion subrepositories." +" repositories." msgstr "" msgid "" @@ -17420,7 +14804,7 @@ msgstr "" msgid "" "Remapping Subrepositories Sources\n" -"=================================" +"---------------------------------" msgstr "" msgid "" @@ -17615,9 +14999,6 @@ msgstr "uppdaterar arbetskatalog\n" msgid "destination directory: %s\n" msgstr "destinationskatalog: %s\n" -msgid "empty destination path is not valid" -msgstr "en tom destinationssökväg är inte giltig" - #, python-format msgid "destination '%s' already exists" msgstr "destinationen '%s' finns redan" @@ -17681,12 +15062,8 @@ msgid "cannot start server at '%s:%d': %s" msgstr "" #, python-format -msgid "(binary file %s, hash: %s)" -msgstr "(binär fil %s, hash: %s)" - -#, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" -msgstr "%d filer ändrade, %d tillägg(+), %d raderingar(-)\n" +msgstr "" #, python-format msgid "calling hook %s: %s\n" @@ -17742,10 +15119,6 @@ msgstr "" msgid "warning: %s hook %s\n" msgstr "" -#, python-format -msgid "loading %s hook failed:\n" -msgstr "" - msgid "kb" msgstr "kb" @@ -17793,6 +15166,9 @@ msgstr "" msgid "'%s' uses newer protocol %s" msgstr "" +msgid "unexpected response:" +msgstr "oväntat svar:" + #, python-format msgid "push failed: %s" msgstr "tryckning misslyckades: %s" @@ -17838,6 +15214,14 @@ msgstr "" msgid "working copy of .hgtags is changed (please commit .hgtags manually)" msgstr "" +#, python-format +msgid "working directory has unknown parent '%s'!" +msgstr "" + +#, python-format +msgid "unknown revision '%s'" +msgstr "" + msgid "abandoned transaction found - run hg recover" msgstr "" @@ -17847,9 +15231,6 @@ msgstr "" msgid "no interrupted transaction available\n" msgstr "" -msgid "no rollback information available\n" -msgstr "" - #, python-format msgid "repository tip rolled back to revision %s (undo %s: %s)\n" msgstr "arkivtopp tillbakadragen till revision %s (ångra %s: %s)\n" @@ -17861,14 +15242,8 @@ msgstr "arkivtopp tillbakadragen till revision %s (ångra %s)\n" msgid "rolling back unknown transaction\n" msgstr "återkallar okänd transaktion\n" -msgid "rollback of last commit while not checked out may lose data" -msgstr "" - -msgid "use -f to force" -msgstr "" - #, python-format -msgid "named branch could not be reset: current branch is still '%s'\n" +msgid "named branch could not be reset, current branch is still: %s\n" msgstr "" #, python-format @@ -17879,6 +15254,9 @@ msgstr "arbetskatalogen är nu baserad på revisionerna %d och %d\n" msgid "working directory now based on revision %d\n" msgstr "arbetskatalogen är nu baserad på revision %d\n" +msgid "no rollback information available\n" +msgstr "" + #, python-format msgid "waiting for lock on %s held by %r\n" msgstr "" @@ -17899,16 +15277,13 @@ msgid "cannot partially commit a merge (do not specify files or patterns)" msgstr "" "kan inte delvis arkivera en sammanfogning (ange inte filer eller mönster" -#, python-format -msgid "commit with new subrepo %s excluded" -msgstr "" - -msgid "use --subrepos for recursive commit" -msgstr "" - msgid "can't commit subrepos without .hgsub" msgstr "kan inte arkivera underarkiv utan .hgsub" +#, python-format +msgid "uncommitted changes in subrepo %s" +msgstr "oarkiverade ändringar i underarkivet %s" + msgid "file not found!" msgstr "filen hittades inte!" @@ -17918,15 +15293,12 @@ msgstr "" msgid "file not tracked!" msgstr "filen spåras inte!" -msgid "cannot commit merge with missing files" -msgstr "kan inte arkivera sammanfogning när filer saknas" - msgid "unresolved merge conflicts (see hg help resolve)" msgstr "olösta sammanfogningskonflikter (se hg help resolve)" #, python-format msgid "committing subrepository %s\n" -msgstr "arkiverar underarkiv %s\n" +msgstr "" #, python-format msgid "note: commit message saved in %s\n" @@ -17946,24 +15318,6 @@ msgstr "" "deldragningar kan inte göras eftersom det andra arkivet inte stödjer " "changegroupsubset." -msgid "destination does not support push" -msgstr "destinationen stödjer inte tryckning" - -#, python-format -msgid "push includes an obsolete changeset: %s!" -msgstr "tryckningen innehåller en förlegad ändring: %s!" - -#, python-format -msgid "push includes an unstable changeset: %s!" -msgstr "tryckningen innehåller en instabil ändring: %s!" - -#, python-format -msgid "updating %s to public failed!\n" -msgstr "uppdatera %s till publik misslyckades!\n" - -msgid "failed to push obsolete markers!\n" -msgstr "kunde inte trycka förlegad-markörerna!\n" - #, python-format msgid "%d changesets found\n" msgstr "%d ändringar hittades\n" @@ -18008,8 +15362,8 @@ msgstr " (%+d huvuden)" msgid "added %d changesets with %d changes to %d files%s\n" msgstr "lade till %d ändringar med %d modifikationer i %d filer%s\n" -msgid "unexpected response from remote server:" -msgstr "oväntat svar från server:" +msgid "Unexpected response from remote server:" +msgstr "" msgid "operation forbidden by server" msgstr "" @@ -18027,9 +15381,6 @@ msgstr "strömmar alla ändringar\n" msgid "%d files to transfer, %s of data\n" msgstr "%d filer att överföra, %s med data\n" -msgid "clone" -msgstr "" - #, python-format msgid "transferred %s in %.1f seconds (%s/sec)\n" msgstr "överförde %s på %.1f sekunder (%s/sek)\n" @@ -18101,11 +15452,9 @@ msgid "diff context lines count must be an integer, not %r" msgstr "" #, python-format -msgid "%s: untracked file differs\n" -msgstr "" - msgid "" -"untracked files in working directory differ from files in requested revision" +"untracked file in working directory differs from file in requested revision: " +"'%s'" msgstr "" #, python-format @@ -18170,18 +15519,14 @@ msgstr "hämtar %s till %s\n" msgid "note: possible conflict - %s was renamed multiple times to:\n" msgstr "notera: möjlig konflikt - %s döptes om flera gånger till:\n" -#, python-format -msgid "note: possible conflict - %s was deleted and renamed to:\n" -msgstr "notera: möjlig konflikt - %s raderades och döptes om till:\n" - msgid "merging with a working directory ancestor has no effect" msgstr "" -msgid "use 'hg update' or check 'hg heads'" -msgstr "använd 'hg update' eller kontrollera 'hg heads'" +msgid "nothing to merge (use 'hg update' or check 'hg heads')" +msgstr "" -msgid "use 'hg status' to list changes" -msgstr "använd 'hg status' för att visa modifikationer" +msgid "outstanding uncommitted changes (use 'hg status' to list changes)" +msgstr "" #, python-format msgid "outstanding uncommitted changes in subrepository '%s'" @@ -18206,7 +15551,7 @@ msgid "Error:" msgstr "Fel:" msgid "Hint:" -msgstr "Tips:" +msgstr "" msgid "Important:" msgstr "Viktigt:" @@ -18221,24 +15566,6 @@ msgid "Warning!" msgstr "Varning!" #, python-format -msgid "parsing obsolete marker: unknown version %r" -msgstr "tolkar förlegad-markering: okänd version %r" - -#, python-format -msgid "" -"parsing obsolete marker: metadata is too short, %d bytes expected, got %d" -msgstr "" -"tolkar förlegad-markering: metadata är för kort, %d bytes förväntades, fick " -"%d" - -#, python-format -msgid "unknown key: %r" -msgstr "okänd nyckel: %r" - -msgid "unexpected old value" -msgstr "oväntat gammalt värde" - -#, python-format msgid "unexpected token: %s" msgstr "" @@ -18298,16 +15625,11 @@ msgstr "" msgid "bad hunk #%d old text line %d" msgstr "" -#, python-format -msgid "could not extract \"%s\" binary data" -msgstr "" - -#, python-format -msgid "could not decode \"%s\" binary patch: %s" +msgid "could not extract binary patch" msgstr "" #, python-format -msgid "\"%s\" length is %d bytes, should be %d" +msgid "binary patch is %d bytes, not %d" msgstr "" #, python-format @@ -18318,10 +15640,6 @@ msgid "undefined source and destination files" msgstr "" #, python-format -msgid "failed to synchronize metadata for \"%s\"" -msgstr "" - -#, python-format msgid "cannot create %s: destination already exists" msgstr "" @@ -18341,25 +15659,6 @@ msgid "patch failed to apply" msgstr "" #, python-format -msgid "cannot %s; remote repository does not support the %r capability" -msgstr "kan inte %s; fjärrarkivet har inte %r-förmågan" - -msgid "cannot change null revision phase" -msgstr "kan inte ändra fas för null-revisionen" - -#, python-format -msgid "ignoring inconsistent public root from remote: %s\n" -msgstr "" - -#, python-format -msgid "ignoring unexpected root from remote: %i %s\n" -msgstr "" - -#, python-format -msgid "phases.new-commit: not a valid phase name ('%s')" -msgstr "" - -#, python-format msgid "exited with status %d" msgstr "" @@ -18375,10 +15674,6 @@ msgid "adding branch\n" msgstr "" #, python-format -msgid "error removing %s: %s\n" -msgstr "fel vid radering av %s: %s\n" - -#, python-format msgid "strip failed, full bundle stored in '%s'\n" msgstr "avlägsning misslyckades, hela bunten lagrad i '%s'\n" @@ -18387,7 +15682,7 @@ msgid "strip failed, partial bundle stored in '%s'\n" msgstr "avlägsning misslyckades, partiell bunt lagrad i '%s'\n" #, python-format -msgid "revlog decompress error: %s" +msgid "cannot %s; remote repository does not support the %r capability" msgstr "" #, python-format @@ -18480,36 +15775,21 @@ msgid "author requires a string" msgstr "author kräver en sträng" msgid "" -"``bisect(string)``\n" -" Changesets marked in the specified bisect status:" +"``bisected(string)``\n" +" Changesets marked in the specified bisect state (good, bad, skip)." msgstr "" -msgid "" -" - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip\n" -" - ``goods``, ``bads`` : csets topologicaly good/bad\n" -" - ``range`` : csets taking part in the bisection\n" -" - ``pruned`` : csets that are goods, bads or skipped\n" -" - ``untested`` : csets whose fate is yet unknown\n" -" - ``ignored`` : csets ignored due to DAG topology\n" -" - ``current`` : the cset currently being bisected" -msgstr "" - -#. i18n: "bisect" is a keyword msgid "bisect requires a string" msgstr "bisect kräver en sträng" +msgid "invalid bisect state" +msgstr "ogiltigt bisect-tillständ" + msgid "" "``bookmark([name])``\n" " The named bookmark or all bookmarks." msgstr "" -msgid "" -" If `name` starts with `re:`, the remainder of the name is treated as\n" -" a regular expression. To match a bookmark that actually starts with `re:" -"`,\n" -" use the prefix `literal:`." -msgstr "" - #. i18n: "bookmark" is a keyword msgid "bookmark takes one or no arguments" msgstr "bookmark tar ett eller inga argument" @@ -18518,10 +15798,6 @@ msgstr "bookmark tar ett eller inga argument" msgid "the argument to bookmark must be a string" msgstr "argumentet till bookmark måste vara en sträng" -#, python-format -msgid "no bookmarks exist that match '%s'" -msgstr "" - msgid "" "``branch(string or set)``\n" " All changesets belonging to the given branch or the branches of the " @@ -18530,13 +15806,6 @@ msgid "" msgstr "" msgid "" -" If `string` starts with `re:`, the remainder of the name is treated as\n" -" a regular expression. To match a branch that actually starts with `re:" -"`,\n" -" use the prefix `literal:`." -msgstr "" - -msgid "" "``children(set)``\n" " Child changesets of changesets in set." msgstr "" @@ -18558,21 +15827,7 @@ msgstr "" #. i18n: "contains" is a keyword msgid "contains requires a pattern" -msgstr "contains kräver ett mönster" - -msgid "" -"``converted([id])``\n" -" Changesets converted from the given identifier in the old repository if\n" -" present, or all converted changesets if no identifier is specified." -msgstr "" - -#. i18n: "converted" is a keyword -msgid "converted takes one or no arguments" -msgstr "converted tar ett eller inga argument" - -#. i18n: "converted" is a keyword -msgid "converted requires a revision" -msgstr "converted kräver en revision" +msgstr "contain kräver ett mönster" msgid "" "``date(interval)``\n" @@ -18598,91 +15853,31 @@ msgid "" msgstr "" msgid "" -"``destination([set])``\n" -" Changesets that were created by a graft, transplant or rebase " -"operation,\n" -" with the given revisions specified as the source. Omitting the optional " -"set\n" -" is the same as passing all()." -msgstr "" - -msgid "" -"``draft()``\n" -" Changeset in draft phase." -msgstr "" - -#. i18n: "draft" is a keyword -msgid "draft takes no arguments" -msgstr "draft tar inga argument" - -msgid "" -"``extinct()``\n" -" obsolete changeset with obsolete descendant only." -msgstr "" - -#. i18n: "extinct" is a keyword -msgid "extinct takes no arguments" -msgstr "extinct tar inga argument" - -msgid "" -"``extra(label, [value])``\n" -" Changesets with the given label in the extra metadata, with the given\n" -" optional value." -msgstr "" - -msgid "" -" If `value` starts with `re:`, the remainder of the value is treated as\n" -" a regular expression. To match a value that actually starts with `re:`,\n" -" use the prefix `literal:`." -msgstr "" - -#. i18n: "extra" is a keyword -msgid "extra takes at least 1 and at most 2 arguments" -msgstr "extra tar minst 1 och som mest 2 argument" - -#. i18n: "extra" is a keyword -msgid "first argument to extra must be a string" -msgstr "första argumentet till extra måste vara en sträng" - -#. i18n: "extra" is a keyword -msgid "second argument to extra must be a string" -msgstr "andra argumentet till extra måste vara en sträng" - -msgid "" "``filelog(pattern)``\n" " Changesets connected to the specified filelog." msgstr "" -msgid "" -" For performance reasons, ``filelog()`` does not show every changeset\n" -" that affects the requested file(s). See :hg:`help log` for details. For\n" -" a slower, more accurate result, use ``file()``." -msgstr "" - -#. i18n: "filelog" is a keyword msgid "filelog requires a pattern" msgstr "filelog kräver ett mönster" msgid "" -"``first(set, [n])``\n" -" An alias for limit()." -msgstr "" - -#, python-format -msgid "%s takes no arguments or a filename" -msgstr "%s tar inga argument eller ett filnamn" - -#, python-format -msgid "%s expected a filename" -msgstr "%s förväntade sig ett filnamn" - -msgid "" "``follow([file])``\n" " An alias for ``::.`` (ancestors of the working copy's first parent).\n" " If a filename is specified, the history of the given file is followed,\n" " including copies." msgstr "" +#. i18n: "follow" is a keyword +msgid "follow takes no arguments or a filename" +msgstr "follow tar inga argument eller ett filnamn" + +msgid "follow expected a filename" +msgstr "follow förväntade sig ett filnamn" + +#. i18n: "follow" is a keyword +msgid "follow takes no arguments" +msgstr "follow tar inga argument" + msgid "" "``all()``\n" " All changesets, the same as ``0:tip``." @@ -18707,37 +15902,11 @@ msgstr "grep kräver en sträng" msgid "invalid match pattern: %s" msgstr "ogiltigt träffmönster: %s" -#. i18n: "_matchfiles" is a keyword -msgid "_matchfiles requires at least one argument" -msgstr "_matchfiles kräver minst ett argument" - -#. i18n: "_matchfiles" is a keyword -msgid "_matchfiles requires string arguments" -msgstr "_matchfiles kräver strängargument" - -#. i18n: "_matchfiles" is a keyword -msgid "_matchfiles expected at most one revision" -msgstr "_matchfiles förväntade sig som mest en revision" - -#. i18n: "_matchfiles" is a keyword -msgid "_matchfiles expected at most one default mode" -msgstr "_matchfiles förvändate sig som mest ett standardläge" - -#. i18n: "_matchfiles" is a keyword -#, python-format -msgid "invalid _matchfiles prefix: %s" -msgstr "ogiltigt _matchfiles-prefix: %s" - msgid "" "``file(pattern)``\n" " Changesets affecting files matched by pattern." msgstr "" -msgid "" -" For a faster but less accurate result, consider using ``filelog()``\n" -" instead." -msgstr "" - #. i18n: "file" is a keyword msgid "file requires a pattern" msgstr "file kräver ett mönster" @@ -18767,13 +15936,13 @@ msgid "keyword requires a string" msgstr "keyword kräver en sträng" msgid "" -"``limit(set, [n])``\n" -" First n members of set, defaulting to 1." +"``limit(set, n)``\n" +" First n members of set." msgstr "" #. i18n: "limit" is a keyword -msgid "limit requires one or two arguments" -msgstr "limit kräver ett eller två argument" +msgid "limit requires two arguments" +msgstr "limit kräver två argument" #. i18n: "limit" is a keyword msgid "limit requires a number" @@ -18784,13 +15953,13 @@ msgid "limit expects a number" msgstr "limit förväntar sig ett nummer" msgid "" -"``last(set, [n])``\n" -" Last n members of set, defaulting to 1." +"``last(set, n)``\n" +" Last n members of set." msgstr "" #. i18n: "last" is a keyword -msgid "last requires one or two arguments" -msgstr "last kräver ett eller två argument" +msgid "last requires two arguments" +msgstr "last kräver två argument" #. i18n: "last" is a keyword msgid "last requires a number" @@ -18842,28 +16011,6 @@ msgid "id requires a string" msgstr "id kräver en sträng" msgid "" -"``obsolete()``\n" -" Mutable changeset with a newer version." -msgstr "" - -#. i18n: "obsolete" is a keyword -msgid "obsolete takes no arguments" -msgstr "obsolete tar inga argument" - -msgid "" -"``origin([set])``\n" -" Changesets that were specified as a source for the grafts, transplants " -"or\n" -" rebases that created the given revisions. Omitting the optional set is " -"the\n" -" same as passing all(). If a changeset created by these operations is " -"itself\n" -" specified as a source for one of these operations, only the source " -"changeset\n" -" for the first operation is selected." -msgstr "" - -msgid "" "``outgoing([path])``\n" " Changesets not found in the specified destination repository, or the\n" " default push location." @@ -18903,40 +16050,6 @@ msgid "" msgstr "" msgid "" -" If any of specified revisions is not present in the local repository,\n" -" the query is normally aborted. But this predicate allows the query\n" -" to continue even in such cases." -msgstr "" - -msgid "" -"``public()``\n" -" Changeset in public phase." -msgstr "" - -#. i18n: "public" is a keyword -msgid "public takes no arguments" -msgstr "public tar inga argument" - -msgid "" -"``remote([id [,path]])``\n" -" Local revision that corresponds to the given identifier in a\n" -" remote repository, if present. Here, the '.' identifier is a\n" -" synonym for the current local branch." -msgstr "" - -#. i18n: "remote" is a keyword -msgid "remote takes one, two or no arguments" -msgstr "remote tar ett, två eller inga argument" - -#. i18n: "remote" is a keyword -msgid "remote requires a string id" -msgstr "remote kräver ett sträng-id" - -#. i18n: "remote" is a keyword -msgid "remote requires a repository path" -msgstr "remote kräver en arkivsökväg" - -msgid "" "``removes(pattern)``\n" " Changesets which remove files matching pattern." msgstr "" @@ -18963,75 +16076,16 @@ msgid "rev expects a number" msgstr "rev förväntar sig ett nummer" msgid "" -"``matching(revision [, field])``\n" -" Changesets in which a given set of fields match the set of fields in " -"the\n" -" selected revision or set." -msgstr "" - -msgid "" -" To match more than one field pass the list of fields to match separated\n" -" by spaces (e.g. ``author description``)." -msgstr "" - -msgid "" -" Valid fields are most regular revision fields and some special fields." -msgstr "" - -msgid "" -" Regular revision fields are ``description``, ``author``, ``branch``,\n" -" ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user``\n" -" and ``diff``.\n" -" Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the\n" -" contents of the revision. Two revisions matching their ``diff`` will\n" -" also match their ``files``." -msgstr "" - -msgid "" -" Special fields are ``summary`` and ``metadata``:\n" -" ``summary`` matches the first line of the description.\n" -" ``metadata`` is equivalent to matching ``description user date``\n" -" (i.e. it matches the main metadata fields)." -msgstr "" - -msgid "" -" ``metadata`` is the default field which is used when no fields are\n" -" specified. You can match more than one field at a time." -msgstr "" - -#. i18n: "matching" is a keyword -msgid "matching takes 1 or 2 arguments" -msgstr "matching tar 1 eller 2 argument" - -#. i18n: "matching" is a keyword -msgid "matching requires a string as its second argument" -msgstr "matching kräver en sträng som sitt andra argument" - -#. i18n: "matching" is a keyword -#, python-format -msgid "unexpected field name passed to matching: %s" -msgstr "oväntat fältnamn skickat till matching: %s" - -msgid "" "``reverse(set)``\n" " Reverse order of set." msgstr "" msgid "" "``roots(set)``\n" -" Changesets in set with no parent changeset in set." +" Changesets with no parent changeset in set." msgstr "" msgid "" -"``secret()``\n" -" Changeset in secret phase." -msgstr "" - -#. i18n: "secret" is a keyword -msgid "secret takes no arguments" -msgstr "secret tar inga argument" - -msgid "" "``sort(set[, [-]key...])``\n" " Sort set by keys. The default sort order is ascending, specify a key\n" " as ``-key`` to sort in descending order." @@ -19052,7 +16106,6 @@ msgstr "" msgid "sort requires one or two arguments" msgstr "sort kräver ett eller två argument" -#. i18n: "sort" is a keyword msgid "sort spec must be a string" msgstr "sort-spec måste vara en sträng" @@ -19060,10 +16113,6 @@ msgstr "sort-spec måste vara en sträng" msgid "unknown sort key %r" msgstr "okänd sorteringsnyckel %r" -#, python-format -msgid "invalid regular expression: %s" -msgstr "ogiltigt reguljärt uttryck: %s" - msgid "" "``tag([name])``\n" " The specified tag by name, or all tagged revisions if no name is given." @@ -19077,31 +16126,11 @@ msgstr "tag tar ett eller inga argument" msgid "the argument to tag must be a string" msgstr "argumentet till tag måste vara en sträng" -#, python-format -msgid "no tags exist that match '%s'" -msgstr "inga märken finns som matchar '%s'" - -msgid "" -"``unstable()``\n" -" Unstable changesets are non-obsolete with obsolete descendants." -msgstr "" - -#. i18n: "unstable" is a keyword -msgid "unstable takes no arguments" -msgstr "unstable tar inga argument" - msgid "" "``user(string)``\n" " User name contains string. The match is case-insensitive." msgstr "" -msgid "" -" If `string` starts with `re:`, the remainder of the string is treated " -"as\n" -" a regular expression. To match a user that actually contains `re:`, use\n" -" the prefix `literal:`." -msgstr "" - msgid "can't negate that" msgstr "kan inte negera det" @@ -19109,10 +16138,6 @@ msgid "not a symbol" msgstr "inte en symbol" #, python-format -msgid "infinite expansion of revset alias \"%s\" detected" -msgstr "" - -#, python-format msgid "invalid number of arguments: %s" msgstr "felaktigt antal argument: %s" @@ -19120,10 +16145,6 @@ msgid "empty query" msgstr "tom fråga" #, python-format -msgid "no changes found (ignored %d secret changesets)\n" -msgstr "inga ändringar hittades (ignorerade %d hemliga ändringar)\n" - -#, python-format msgid "ui.portablefilenames value is invalid ('%s')" msgstr "" @@ -19140,7 +16161,7 @@ msgid "path contains illegal component: %s" msgstr "" #, python-format -msgid "path '%s' is inside nested repo %r" +msgid "path %r is inside nested repo %r" msgstr "" #, python-format @@ -19151,9 +16172,6 @@ msgstr "" msgid "could not symlink to %r: %s" msgstr "" -msgid "empty revision range" -msgstr "tomt revisionsset" - #, python-format msgid "recording removal of %s as rename to %s (%d%% similar)\n" msgstr "" @@ -19173,14 +16191,8 @@ msgstr "okänt arkivformat: kräver att '%s' fungerar (uppgradera Mercurial)" msgid "searching for changes\n" msgstr "söker efter ändringar\n" -msgid "all local heads known remotely\n" -msgstr "" - -msgid "sampling from both directions\n" -msgstr "" - msgid "queries" -msgstr "frågar" +msgstr "frågor" msgid "searching" msgstr "söker" @@ -19220,16 +16232,13 @@ msgstr "" msgid "no suitable response from remote hg" msgstr "" +msgid "remote: " +msgstr "fjärr: " + #, python-format msgid "push refused: %s" msgstr "" -msgid "ssl connection failed" -msgstr "ssl-anslutning misslyckades" - -msgid "Python SSL support not found" -msgstr "Pythons SSL-stöd hittades inte" - msgid "certificate checking requires Python 2.6" msgstr "certifikatkontroll kräver Python 2.6" @@ -19251,37 +16260,12 @@ msgid "could not find web.cacerts: %s" msgstr "kunde inte hitta web.cacerts: %s" #, python-format -msgid "host fingerprint for %s can't be verified (Python too old)" -msgstr "" - -#, python-format -msgid "warning: certificate for %s can't be verified (Python too old)\n" -msgstr "varning: certificatet för %s kan inte verifieras (för gammal Python)\n" - -#, python-format -msgid "%s ssl connection error" -msgstr "" - -#, python-format -msgid "%s certificate error: no certificate received" -msgstr "%s certifikatfel: inget certifikat mottaget" - -#, python-format -msgid "certificate for %s has unexpected fingerprint %s" -msgstr "certifikatet för %s har oväntat fingeravtryck %s" - -msgid "check hostfingerprint configuration" -msgstr "kontrollera hostfingerprint-konfiguration" +msgid "%s certificate error: %s (use --insecure to connect insecurely)" +msgstr "%s-certifikatfel: %s (använd --insecure för att ansluta osäkert)" #, python-format -msgid "%s certificate error: %s" -msgstr "%s certifikatfel: %s" - -#, python-format -msgid "configure hostfingerprint %s or use --insecure to connect insecurely" -msgstr "" -"konfigurera hostfingerprint %s eller använd --insecure för att ansluta " -"osäkert" +msgid "invalid certificate for %s with fingerprint %s" +msgstr "ogiltigt certifikat för %s med fingeravtrycket %s" #, python-format msgid "" @@ -19292,6 +16276,14 @@ msgstr "" "inställningen för hostfingerprints eller web.cacerts)\n" #, python-format +msgid "host fingerprint for %s can't be verified (Python too old)" +msgstr "" + +#, python-format +msgid "warning: certificate for %s can't be verified (Python too old)\n" +msgstr "varning: certificatet för %s kan inte verifieras (för gammal Python)\n" + +#, python-format msgid "'%s' does not appear to be an hg repository" msgstr "'%s' verkar inte vara ett hg-arkiv" @@ -19313,17 +16305,13 @@ msgstr "" msgid "subrepo spec file %s not found" msgstr "" -#, python-format -msgid "invalid subrepository revision specifier in .hgsubstate line %d" +msgid "missing ] in subrepo source" msgstr "" #, python-format msgid "bad subrepository pattern in %s: %s" msgstr "" -msgid "missing ] in subrepo source" -msgstr "" - #, python-format msgid "" " subrepository sources for %s differ\n" @@ -19389,36 +16377,16 @@ msgstr "drar underarkivet %s från %s\n" msgid "pushing subrepo %s to %s\n" msgstr "trycker underarkivet %s till %s\n" -#, python-format -msgid "reverting subrepo %s\n" -msgstr "återställer underarkivet %s\n" - -#, python-format -msgid "'svn' executable not found for subrepo '%s'" -msgstr "" - msgid "cannot retrieve svn tool version" msgstr "kan inte hämta version på svn-verktyg" msgid "cannot commit svn externals" msgstr "" -msgid "cannot commit missing svn entries" -msgstr "" - -msgid "failed to commit svn changes" -msgstr "kunde inte arkivera svn-ändringar" - #, python-format msgid "not removing repo %s because it has changes.\n" msgstr "raderar inte arkivet %s eftersom den har ändringar.\n" -msgid "cannot retrieve git version" -msgstr "kan inte hämta git-version" - -msgid "git subrepo requires at least 1.6.0 or later" -msgstr "git-underarkiv kräver minst 1.6.0 eller senare" - #, python-format msgid "revision %s does not exist in subrepo %s\n" msgstr "revisionen %s existerar inte i underarkivet %s\n" @@ -19445,14 +16413,14 @@ msgstr "trycker grenen %s från underarkivet %s\n" #, python-format msgid "" "no branch checked out in subrepo %s\n" -"cannot push revision %s\n" +"cannot push revision %s" msgstr "" "ingen gren uthämtar i underarkivet %s\n" -"kan inte trycka revison %s\n" +"kan inte trycka revison %s" #, python-format msgid "%s, line %s: %s\n" -msgstr "%s, rad %s: %s\n" +msgstr "" msgid "cannot parse entry" msgstr "" @@ -19544,26 +16512,7 @@ msgid "" " XML entities." msgstr "" -msgid "" -":person: Any text. Returns the name before an email address,\n" -" interpreting it as per RFC 5322." -msgstr "" - -msgid "" -" >>> person('foo@bar')\n" -" 'foo'\n" -" >>> person('Foo Bar <foo@bar>')\n" -" 'Foo Bar'\n" -" >>> person('\"Foo Bar\" <foo@bar>')\n" -" 'Foo Bar'\n" -" >>> person('\"Foo \"buz\" Bar\" <foo@bar>')\n" -" 'Foo \"buz\" Bar'\n" -" >>> # The following are invalid, but do exist in real-life\n" -" ...\n" -" >>> person('Foo \"buz\" Bar <foo@bar>')\n" -" 'Foo \"buz\" Bar'\n" -" >>> person('\"Foo Bar <foo@bar>')\n" -" 'Foo Bar'" +msgid ":person: Any text. Returns the text before an email address." msgstr "" msgid "" @@ -19581,13 +16530,6 @@ msgid "" " i.e. a 12 hexadecimal digit string." msgstr "" -msgid "" -":shortbisect: Any text. Treats `text` as a bisection status, and\n" -" returns a single-character representing the status (G: good, B: bad,\n" -" S: skipped, U: untested, I: ignored). Returns single space if `text`\n" -" is not a valid bisection status." -msgstr "" - msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." msgstr "" @@ -19614,20 +16556,12 @@ msgid "" " \"foo bar\" becomes \"foo%20bar\"." msgstr "" -msgid "" -":user: Any text. Returns a short representation of a user name or email\n" -" address." -msgstr "" - -msgid ":emailuser: Any text. Returns the user portion of an email address." +msgid ":user: Any text. Returns the user portion of an email address." msgstr "" msgid ":author: String. The unmodified author of the changeset." msgstr "" -msgid ":bisect: String. The changeset bisection status." -msgstr "" - msgid "" ":branch: String. The name of the branch on which the changeset was\n" " committed." @@ -19695,25 +16629,12 @@ msgid "" " digit string." msgstr "" -msgid ":phase: String. The changeset phase name." -msgstr "" - -msgid ":phaseidx: Integer. The changeset phase index." -msgstr "" - msgid ":rev: Integer. The repository-local changeset revision number." msgstr "" msgid ":tags: List of strings. Any tags associated with the changeset." msgstr "" -msgid "" -":parents: List of strings. The parents of the changeset in \"rev:node\"\n" -" format. If the changeset has only one \"natural\" parent (the " -"predecessor\n" -" revision) nothing is shown." -msgstr "" - #, python-format msgid "unknown method '%s'" msgstr "okänd metod '%s'" @@ -19767,12 +16688,12 @@ msgid "already have changeset " msgstr "har redan ändringen " #, python-format -msgid "not trusting file %s from untrusted user %s, group %s\n" -msgstr "litar inte på filen %s från opålitlig användare %s, grupp %s\n" +msgid "Not trusting file %s from untrusted user %s, group %s\n" +msgstr "Litar inte på filen %s från opålitlig användare %s, grupp %s\n" #, python-format -msgid "ignored: %s\n" -msgstr "ignorerad: %s\n" +msgid "Ignored: %s\n" +msgstr "" #, python-format msgid "(deprecated '%%' in path %s=%s from %s)\n" @@ -19790,8 +16711,8 @@ msgid "enter a commit username:" msgstr "" #, python-format -msgid "no username found, using '%s' instead\n" -msgstr "inget användarnamn hittades, använder '%s' istället\n" +msgid "No username found, using '%s' instead\n" +msgstr "Inget användarnamn hittades, använder '%s' istället\n" msgid "no username supplied (see \"hg help config\")" msgstr "inget användarnamn angivet (se \"hg help config\")" @@ -19807,7 +16728,10 @@ msgid "unrecognized response\n" msgstr "" msgid "password: " -msgstr "lösenord: " +msgstr "" + +msgid "edit failed" +msgstr "" msgid "http authorization required" msgstr "http-autenticiering krävs" |