--- a/i18n/sv.po Mon Jun 20 19:24:50 2011 -0300
+++ b/i18n/sv.po Thu Jun 23 22:35:44 2011 +0200
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: Mercurial\n"
"Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2011-02-26 09:27+0100\n"
-"PO-Revision-Date: 2011-02-26 16:39+0100\n"
+"POT-Creation-Date: 2011-06-23 22:17+0200\n"
+"PO-Revision-Date: 2011-06-23 22:33+0200\n"
"Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n"
"Language-Team: Swedish\n"
"Language: Swedish\n"
@@ -40,7 +40,7 @@
"Mercurial. Help for other extensions is available in the help system."
msgstr ""
"Den här sektioner innehåller hjälp för utökningar som levereras med "
-"Mercurial. Hjälp för andra utälningar är tillgängliga i hjälpsystemet."
+"Mercurial. Hjälp för andra utökningar är tillgängliga i hjälpsystemet."
msgid "Options:"
msgstr "Flaggor:"
@@ -297,140 +297,231 @@
msgid ""
"This hook extension adds comments on bugs in Bugzilla when changesets\n"
-"that refer to bugs by Bugzilla ID are seen. The hook does not change\n"
-"bug status."
-msgstr ""
-
-msgid ""
-"The hook updates the Bugzilla database directly. Only Bugzilla\n"
-"installations using MySQL are supported."
-msgstr ""
-
-msgid ""
-"The hook relies on a Bugzilla script to send bug change notification\n"
-"emails. That script changes between Bugzilla versions; the\n"
-"'processmail' script used prior to 2.18 is replaced in 2.18 and\n"
-"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n"
-"be run by Mercurial as the user pushing the change; you will need to\n"
-"ensure the Bugzilla install file permissions are set appropriately."
-msgstr ""
-
-msgid ""
-"The extension is configured through three different configuration\n"
-"sections. These keys are recognized in the [bugzilla] section:"
-msgstr ""
-
-msgid ""
-"host\n"
-" Hostname of the MySQL server holding the Bugzilla database."
-msgstr ""
-
-msgid ""
-"db\n"
-" Name of the Bugzilla database in MySQL. Default 'bugs'."
-msgstr ""
-
-msgid ""
-"user\n"
-" Username to use to access MySQL server. Default 'bugs'."
-msgstr ""
-
-msgid ""
-"password\n"
+"that refer to bugs by Bugzilla ID are seen. The comment is formatted using\n"
+"the Mercurial template mechanism."
+msgstr ""
+
+msgid "The hook does not change bug status."
+msgstr ""
+
+msgid "Three basic modes of access to Bugzilla are provided:"
+msgstr ""
+
+msgid ""
+"1. Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later."
+msgstr ""
+
+msgid ""
+"2. Check data via the Bugzilla XMLRPC interface and submit bug change\n"
+" via email to Bugzilla email interface. Requires Bugzilla 3.4 or later."
+msgstr ""
+
+msgid ""
+"3. Writing directly to the Bugzilla database. Only Bugzilla installations\n"
+" using MySQL are supported. Requires Python MySQLdb."
+msgstr ""
+
+msgid ""
+"Writing directly to the database is susceptible to schema changes, and\n"
+"relies on a Bugzilla contrib script to send out bug change\n"
+"notification emails. This script runs as the user running Mercurial,\n"
+"must be run on the host with the Bugzilla install, and requires\n"
+"permission to read Bugzilla configuration details and the necessary\n"
+"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."
+msgstr ""
+
+msgid ""
+"Access via XMLRPC needs a Bugzilla username and password to be specified\n"
+"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."
+msgstr ""
+
+msgid ""
+"Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n"
+"email to the Bugzilla email interface to submit comments to bugs.\n"
+"The From: address in the email is set to the email address of the Mercurial\n"
+"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."
+msgstr ""
+
+msgid "Configuration items common to all access modes:"
+msgstr ""
+
+msgid ""
+"bugzilla.version\n"
+" This access type to use. Values recognised are:"
+msgstr ""
+
+msgid ""
+" :``xmlrpc``: Bugzilla XMLRPC interface.\n"
+" :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces.\n"
+" :``3.0``: MySQL access, Bugzilla 3.0 and later.\n"
+" :``2.18``: MySQL access, Bugzilla 2.18 and up to but not\n"
+" including 3.0.\n"
+" :``2.16``: MySQL access, Bugzilla 2.16 and up to but not\n"
+" including 2.18."
+msgstr ""
+
+msgid ""
+"bugzilla.regexp\n"
+" 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 ""
+"bugzilla.style\n"
+" The style file to use when formatting comments."
+msgstr ""
+
+msgid ""
+"bugzilla.template\n"
+" Template to use when formatting comments. Overrides style if\n"
+" specified. In addition to the usual Mercurial keywords, the\n"
+" extension specifies:"
+msgstr ""
+
+msgid ""
+" :``{bug}``: The Bugzilla bug ID.\n"
+" :``{root}``: The full pathname of the Mercurial repository.\n"
+" :``{webroot}``: Stripped pathname of the Mercurial repository.\n"
+" :``{hgweb}``: Base URL for browsing Mercurial repositories."
+msgstr ""
+
+msgid ""
+" Default ``changeset {node|short} in repo {root} refers to bug\n"
+" {bug}.\\ndetails:\\n\\t{desc|tabindent}``"
+msgstr ""
+
+msgid ""
+"bugzilla.strip\n"
+" The number of path separator characters to strip from the front of\n"
+" the Mercurial repository path (``{root}`` in templates) to produce\n"
+" ``{webroot}``. For example, a repository with ``{root}``\n"
+" ``/var/local/my-project`` with a strip of 2 gives a value for\n"
+" ``{webroot}`` of ``my-project``. Default 0."
+msgstr ""
+
+msgid ""
+"web.baseurl\n"
+" Base URL for browsing Mercurial repositories. Referenced from\n"
+" templates as ``{hgweb}``."
+msgstr ""
+
+msgid "Configuration items common to XMLRPC+email and MySQL access modes:"
+msgstr ""
+
+msgid ""
+"bugzilla.usermap\n"
+" Path of file containing Mercurial committer email to Bugzilla user email\n"
+" mappings. If specified, the file should contain one mapping per\n"
+" line::"
+msgstr ""
+
+msgid " committer = Bugzilla user"
+msgstr ""
+
+msgid " See also the ``[usermap]`` section."
+msgstr ""
+
+msgid ""
+"The ``[usermap]`` section is used to specify mappings of Mercurial\n"
+"committer email to Bugzilla user email. See also ``bugzilla.usermap``.\n"
+"Contains entries of the form ``committer = Bugzilla user``."
+msgstr ""
+
+msgid "XMLRPC access mode configuration:"
+msgstr ""
+
+msgid ""
+"bugzilla.bzurl\n"
+" The base URL for the Bugzilla installation.\n"
+" Default ``http://localhost/bugzilla``."
+msgstr ""
+
+msgid ""
+"bugzilla.user\n"
+" The username to use to log into Bugzilla via XMLRPC. Default\n"
+" ``bugs``."
+msgstr ""
+
+msgid ""
+"bugzilla.password\n"
+" The password for Bugzilla login."
+msgstr ""
+
+msgid ""
+"XMLRPC+email access mode uses the XMLRPC access mode configuration items,\n"
+"and also:"
+msgstr ""
+
+msgid ""
+"bugzilla.bzemail\n"
+" The Bugzilla email address."
+msgstr ""
+
+msgid ""
+"In addition, the Mercurial email settings must be configured. See the\n"
+"documentation in hgrc(5), sections ``[email]`` and ``[smtp]``."
+msgstr ""
+
+msgid "MySQL access mode configuration:"
+msgstr ""
+
+msgid ""
+"bugzilla.host\n"
+" Hostname of the MySQL server holding the Bugzilla database.\n"
+" Default ``localhost``."
+msgstr ""
+
+msgid ""
+"bugzilla.db\n"
+" Name of the Bugzilla database in MySQL. Default ``bugs``."
+msgstr ""
+
+msgid ""
+"bugzilla.user\n"
+" Username to use to access MySQL server. Default ``bugs``."
+msgstr ""
+
+msgid ""
+"bugzilla.password\n"
" Password to use to access MySQL server."
msgstr ""
msgid ""
-"timeout\n"
+"bugzilla.timeout\n"
" Database connection timeout (seconds). Default 5."
msgstr ""
msgid ""
-"version\n"
-" Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n"
-" '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n"
-" to 2.18."
-msgstr ""
-
-msgid ""
-"bzuser\n"
+"bugzilla.bzuser\n"
" Fallback Bugzilla user name to record comments with, if changeset\n"
" committer cannot be found as a Bugzilla user."
msgstr ""
msgid ""
-"bzdir\n"
+"bugzilla.bzdir\n"
" Bugzilla install directory. Used by default notify. Default\n"
-" '/var/www/html/bugzilla'."
-msgstr ""
-
-msgid ""
-"notify\n"
+" ``/var/www/html/bugzilla``."
+msgstr ""
+
+msgid ""
+"bugzilla.notify\n"
" The command to run to get Bugzilla to send bug change notification\n"
-" emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n"
-" and 'user' (committer bugzilla email). Default depends on version;\n"
-" from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n"
-" %(id)s %(user)s\"."
-msgstr ""
-
-msgid ""
-"regexp\n"
-" 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', 'Bug\n"
-" 1234 and 5678' and variations thereof. Matching is case insensitive."
-msgstr ""
-
-msgid ""
-"style\n"
-" The style file to use when formatting comments."
-msgstr ""
-
-msgid ""
-"template\n"
-" Template to use when formatting comments. Overrides style if\n"
-" specified. In addition to the usual Mercurial keywords, the\n"
-" extension specifies::"
-msgstr ""
-
-msgid ""
-" {bug} The Bugzilla bug ID.\n"
-" {root} The full pathname of the Mercurial repository.\n"
-" {webroot} Stripped pathname of the Mercurial repository.\n"
-" {hgweb} Base URL for browsing Mercurial repositories."
-msgstr ""
-
-msgid ""
-" Default 'changeset {node|short} in repo {root} refers '\n"
-" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'"
-msgstr ""
-
-msgid ""
-"strip\n"
-" The number of slashes to strip from the front of {root} to produce\n"
-" {webroot}. Default 0."
-msgstr ""
-
-msgid ""
-"usermap\n"
-" Path of file containing Mercurial committer ID to Bugzilla user ID\n"
-" mappings. If specified, the file should contain one mapping per\n"
-" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section."
-msgstr ""
-
-msgid ""
-"The [usermap] section is used to specify mappings of Mercurial\n"
-"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n"
-"\"committer\"=\"Bugzilla user\""
-msgstr ""
-
-msgid "Finally, the [web] section supports one entry:"
-msgstr ""
-
-msgid ""
-"baseurl\n"
-" Base URL for browsing Mercurial repositories. Reference from\n"
-" templates as {hgweb}."
+" emails. Substitutes from a map with 3 keys, ``bzdir``, ``id`` (bug\n"
+" id) and ``user`` (committer bugzilla email). Default depends on\n"
+" version; from 2.18 it is \"cd %(bzdir)s && perl -T\n"
+" contrib/sendbugmail.pl %(id)s %(user)s\"."
msgstr ""
msgid "Activating the extension::"
@@ -447,13 +538,69 @@
" incoming.bugzilla = python:hgext.bugzilla.hook"
msgstr ""
-msgid "Example configuration:"
-msgstr ""
-
-msgid ""
-"This example configuration is for a collection of Mercurial\n"
-"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n"
-"installation in /opt/bugzilla-3.2. ::"
+msgid "Example configurations:"
+msgstr "Exempelkonfigurationer:"
+
+msgid ""
+"XMLRPC example configuration. This uses the Bugzilla at\n"
+"``http://my-project.org/bugzilla``, logging in as user\n"
+"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n"
+"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. ::"
+msgstr ""
+
+msgid ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+msgstr ""
+
+msgid ""
+" [web]\n"
+" baseurl=http://my-project.org/hg"
+msgstr ""
+
+msgid ""
+"XMLRPC+email example configuration. This uses the Bugzilla at\n"
+"``http://my-project.org/bugzilla``, logging in as user\n"
+"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n"
+"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. Bug comments\n"
+"are sent to the Bugzilla email address\n"
+"``bugzilla@my-project.org``. ::"
+msgstr ""
+
+msgid ""
+" [bugzilla]\n"
+" bzurl=http://my-project.org/bugzilla\n"
+" user=bugmail@my-project.org\n"
+" password=plugh\n"
+" version=xmlrpc\n"
+" bzemail=bugzilla@my-project.org\n"
+" template=Changeset {node|short} in {root|basename}.\n"
+" {hgweb}/{webroot}/rev/{node|short}\\n\n"
+" {desc}\\n\n"
+" strip=5"
+msgstr ""
+
+msgid ""
+" [usermap]\n"
+" user@emaildomain.com=user.name@bugzilladomain.com"
+msgstr ""
+
+msgid ""
+"MySQL example configuration. This has a local Bugzilla 3.2 installation\n"
+"in ``/opt/bugzilla-3.2``. The MySQL database is on ``localhost``,\n"
+"the Bugzilla database name is ``bugs`` and MySQL is\n"
+"accessed with MySQL username ``bugs`` password ``XYZZY``. It is used\n"
+"with a collection of Mercurial repositories in ``/var/local/hg/repos/``,\n"
+"with a web interface at ``http://my-project.org/hg``. ::"
msgstr ""
msgid ""
@@ -469,28 +616,22 @@
" strip=5"
msgstr ""
-msgid ""
-" [web]\n"
-" baseurl=http://dev.domain.com/hg"
-msgstr ""
-
-msgid ""
-" [usermap]\n"
-" user@emaildomain.com=user.name@bugzilladomain.com"
-msgstr ""
-
-msgid "Commits add a comment to the Bugzilla bug record of the form::"
+msgid "All the above add a comment to the Bugzilla bug record of the form::"
msgstr ""
msgid ""
" Changeset 3b16791d6642 in repository-name.\n"
-" http://dev.domain.com/hg/repository-name/rev/3b16791d6642"
+" http://my-project.org/hg/repository-name/rev/3b16791d6642"
msgstr ""
msgid " Changeset commit comment. Bug 1234.\n"
msgstr ""
#, python-format
+msgid "python mysql support not available: %s"
+msgstr ""
+
+#, python-format
msgid "connecting to %s:%s as %s, password %s\n"
msgstr ""
@@ -539,9 +680,16 @@
msgid "cannot find bugzilla user id for %s or %s"
msgstr ""
+msgid "configuration 'bzemail' missing"
+msgstr "'bzemail' inte konfigurerad"
+
+#, python-format
+msgid "default bugzilla user %s email not found"
+msgstr ""
+
#, python-format
msgid "bugzilla version %s not supported"
-msgstr ""
+msgstr "bugzilla version %s stöds inte"
msgid ""
"changeset {node|short} in repo {root} refers to bug {bug}.\n"
@@ -550,16 +698,12 @@
msgstr ""
#, python-format
-msgid "python mysql support not available: %s"
-msgstr ""
-
-#, python-format
msgid "hook type %s does not pass a changeset id"
msgstr ""
#, python-format
-msgid "database error: %s"
-msgstr ""
+msgid "Bugzilla error: %s"
+msgstr "Bugzilla-fel: %s"
msgid "command to display child changesets"
msgstr ""
@@ -696,12 +840,11 @@
msgstr "färglägg utmatning från vissa kommandon"
msgid ""
-"This extension modifies the status and resolve commands to add color to "
-"their\n"
-"output to reflect file status, the qseries command to add color to reflect\n"
-"patch status (applied, unapplied, missing), and to diff-related\n"
-"commands to highlight additions, removals, diff headers, and trailing\n"
-"whitespace."
+"This extension modifies the status and resolve commands to add color\n"
+"to their output to reflect file status, the qseries command to add\n"
+"color to reflect patch status (applied, unapplied, missing), and to\n"
+"diff-related commands to highlight additions, removals, diff headers,\n"
+"and trailing whitespace."
msgstr ""
"Denna utökning modifierar kommandona status och resolve för att färglägga\n"
"deras utmaning för att spegla filstatus, qseries-kommandon för att\n"
@@ -711,17 +854,19 @@
msgid ""
"Other effects in addition to color, like bold and underlined text, are\n"
-"also available. Effects are rendered with the ECMA-48 SGR control\n"
-"function (aka ANSI escape codes). This module also provides the\n"
-"render_text function, which can be used to add effects to any text."
+"also available. By default, the terminfo database is used to find the\n"
+"terminal codes used to change color and effect. If terminfo is not\n"
+"available, then effects are rendered with the ECMA-48 SGR control\n"
+"function (aka ANSI escape codes)."
msgstr ""
"Andra effekter förutom färg, såsom fet och understryken text, är också\n"
-"tillgänglig. Effekter renderas med kontrollfunktionerna ECMA-48 SGR\n"
-"(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n"
-"render_text, som kan användas för att lägga till effekter på valfri text."
+"tillgänglig. Som standard används terminfo-databasen för att hitta\n"
+"terminalkoderna för att ändra färg och effekt. Om terminfo inte är\n"
+"tillgänglig, så renderas effekterna med kontrollfunktionerna ECMA-48 SGR\n"
+"(ANSI-escape-koder)."
msgid "Default effects may be overridden from your configuration file::"
-msgstr "Standardeffekter kan ersättas från din konfiturationsfil::"
+msgstr "Standardeffekter kan modifieras från din konfigurationsfil::"
msgid ""
" [color]\n"
@@ -801,11 +946,58 @@
" branches.inactive = none"
msgid ""
-"The color extension will try to detect whether to use ANSI codes or\n"
-"Win32 console APIs, unless it is made explicit::"
-msgstr ""
-"Utökningen color försöker att upptäcka om ANSI-koder eller APIer för\n"
-"konsolen i Win32 om det inte anges explicit::"
+"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"
+"'underline'. How each is rendered depends on the terminal emulator.\n"
+"Some may not be available for a given terminal type, and will be\n"
+"silently ignored."
+msgstr ""
+"De tillgängliga effekterna i terminfo-läge är 'blink', 'bold', 'dim',\n"
+"'inverse', 'invisible', 'italic', 'standout', och 'underline'; i\n"
+"ECMA-48-läge, så är 'bold', 'inverse', 'italic', och 'underline'\n"
+"tillgängliga. Hur varje effekt renderas beror på terminalemulatorn. Vissa\n"
+"kan vara otillgängliga för en viss terminaltyp, och kommer att ignoreras i\n"
+"det tysta."
+
+msgid ""
+"Because there are only eight standard colors, this module allows you\n"
+"to define color names for other color slots which might be available\n"
+"for your terminal type, assuming terminfo mode. For instance::"
+msgstr ""
+"Eftersom det bara finns åtta standardfärger, tillåter denna modul dig att\n"
+"definiera färgnamn för andra färgnummer som är tillgängliga för din\n"
+"terminaltyp. Exempelvis::"
+
+msgid ""
+" color.brightblue = 12\n"
+" color.pink = 207\n"
+" color.orange = 202"
+msgstr ""
+" color.brightblue = 12\n"
+" color.pink = 207\n"
+" color.orange = 202"
+
+msgid ""
+"to set 'brightblue' to color slot 12 (useful for 16 color terminals\n"
+"that have brighter colors defined in the upper eight) and, 'pink' and\n"
+"'orange' to colors in 256-color xterm's default color cube. These\n"
+"defined colors may then be used as any of the pre-defined eight,\n"
+"including appending '_background' to set the background to that color."
+msgstr ""
+"för att sätta 'brightblue' till färgnummer 12 (användbart för terminaler\n"
+"med 16 färger som har ljusare färger definierade bland de övre åtta), samt\n"
+"'pink' och 'orange' till färger i 256-färgs terminalfärger. Dessa\n"
+"definierade färger kan sedan användas som vilken som helst av de\n"
+"fördefinierade åtta, inklusive att lägga till '_background' för att sätta\n"
+"bakgrunden till den färgen."
+
+msgid ""
+"The color extension will try to detect whether to use terminfo, ANSI\n"
+"codes or Win32 console APIs, unless it is made explicit; e.g.::"
+msgstr ""
+"Utökningen color försöker att upptäcka om terminfo, ANSI-koder eller\n"
+"APIer för konsolen i Win32 om det inte anges explicit::"
msgid ""
" [color]\n"
@@ -814,16 +1006,24 @@
" [color]\n"
" mode = ansi"
-msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color."
-msgstr "Ett värde skilt från 'ansi', 'win32', eller 'auto' stänger av färg."
+msgid ""
+"Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n"
+"disable color."
+msgstr ""
+"Ett värde skilt från 'ansi', 'win32', 'terminfo' eller 'auto' stänger av\n"
+"färg."
+
+msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n"
+msgstr "ingen terminfo-post för setab/setaf: återgår till ECMA-48-färger\n"
+
+#, python-format
+msgid "warning: failed to set color mode to %s\n"
+msgstr "varning: kunde inte sätta färgläge till %s\n"
#, python-format
msgid "ignoring unknown color/effect %r (configured in color.%s)\n"
msgstr "ignorerar okänd färg/effekt %r (konfigurerad i color.%s)\n"
-msgid "win32console not found, please install pywin32\n"
-msgstr "win32console hittades inte, installera pywin32\n"
-
#. i18n: 'always', 'auto', and 'never' are keywords and should
#. not be translated
msgid "when to colorize (boolean, always, auto, or never)"
@@ -1131,7 +1331,7 @@
msgid ""
" :convert.svn.branches: specify the directory containing branches.\n"
-" The defaults is ``branches``."
+" The default is ``branches``."
msgstr ""
msgid ""
@@ -1140,8 +1340,8 @@
msgstr ""
msgid ""
-" :convert.svn.trunk: specify the name of the trunk branch The\n"
-" defauls is ``trunk``."
+" :convert.svn.trunk: specify the name of the trunk branch. The\n"
+" default is ``trunk``."
msgstr ""
msgid ""
@@ -1292,6 +1492,15 @@
msgid "hg debugcvsps [OPTION]... [PATH]..."
msgstr ""
+msgid ":svnrev: String. Converted subversion revision number."
+msgstr ""
+
+msgid ":svnpath: String. Converted subversion revision project path."
+msgstr ""
+
+msgid ":svnuuid: String. Converted subversion revision repository identifier."
+msgstr ""
+
#, python-format
msgid "%s does not look like a Bazaar repository"
msgstr "%s verkar inte vara ett Bazaar-arkiv"
@@ -1352,10 +1561,6 @@
msgstr "convert: %s\n"
#, python-format
-msgid "%s\n"
-msgstr "%s\n"
-
-#, python-format
msgid "%s: unknown repository type"
msgstr "%s: okänd arkivtyp"
@@ -1617,13 +1822,16 @@
#, python-format
msgid "pulling from %s into %s\n"
-msgstr ""
+msgstr "drar från %s till %s\n"
msgid "filtering out empty revision\n"
-msgstr ""
+msgstr "filtrerar bort tom revision\n"
msgid "updating tags\n"
-msgstr ""
+msgstr "uppdaterar märken\n"
+
+msgid "updating bookmarks\n"
+msgstr "uppdaterar bokmärken\n"
#, python-format
msgid "%s is not a valid start revision"
@@ -1631,16 +1839,51 @@
#, python-format
msgid "ignoring: %s\n"
-msgstr ""
+msgstr "ignorerar: %s\n"
#, python-format
msgid "%s does not look like a monotone repository"
msgstr "%s verkar inte vara ett monotone-arkiv"
+msgid "bad mtn packet - no end of commandnbr"
+msgstr ""
+
+#, python-format
+msgid "bad mtn packet - bad stream type %s"
+msgstr ""
+
+msgid "bad mtn packet - no divider before size"
+msgstr ""
+
+msgid "bad mtn packet - no end of packet size"
+msgstr ""
+
+#, python-format
+msgid "bad mtn packet - bad packet size %s"
+msgstr ""
+
+#, python-format
+msgid "bad mtn packet - unable to read full packet read %s of %s"
+msgstr ""
+
+#, python-format
+msgid "mtn command '%s' returned %s"
+msgstr "mtn-kommandot '%s' returnerade %s"
+
#, python-format
msgid "copying file in renamed directory from '%s' to '%s'"
msgstr ""
+msgid "unable to determine mtn automate interface version"
+msgstr ""
+
+#, python-format
+msgid "mtn automate stdio header unexpected: %s"
+msgstr ""
+
+msgid "failed to reach end of mtn automate stdio headers"
+msgstr ""
+
#, python-format
msgid "%s does not look like a P4 repository"
msgstr "%s verkar inte vara ett P4-arkiv"
@@ -1846,9 +2089,13 @@
msgid ""
"The ``win32text.forbid*`` hooks provided by the win32text extension\n"
-"have been unified into a single hook named ``eol.hook``. The hook will\n"
-"lookup the expected line endings from the ``.hgeol`` file, which means\n"
-"you must migrate to a ``.hgeol`` file first before using the hook."
+"have been unified into a single hook named ``eol.checkheadshook``. The\n"
+"hook will lookup the expected line endings from the ``.hgeol`` file,\n"
+"which means you must migrate to a ``.hgeol`` file first before using\n"
+"the hook. ``eol.checkheadshook`` only checks heads, intermediate\n"
+"invalid revisions will be pushed. To forbid them completely, use the\n"
+"``eol.checkallhook`` hook. These hooks are best used as\n"
+"``pretxnchangegroup`` hooks."
msgstr ""
msgid ""
@@ -1858,23 +2105,26 @@
"Se :hg:`help patterns` för mer information om de använda glob-mönstren.\n"
#, python-format
-msgid "%s should not have CRLF line endings"
-msgstr ""
-
-#, python-format
-msgid "%s should not have LF line endings"
-msgstr ""
-
-msgid "the eol extension is incompatible with the win32text extension"
-msgstr "eol-utökningen är inkompativel med win32text-utökningen"
-
-#, python-format
msgid "ignoring unknown EOL style '%s' from %s\n"
-msgstr ""
+msgstr "ignorerar okänd EOL-stil '%s' från %s\n"
+
+#, python-format
+msgid "warning: ignoring .hgeol file due to parse error at %s: %s\n"
+msgstr "varning: ignorerar .hgeol-fil, parsningsfel vid %s: %s\n"
+
+#, python-format
+msgid " %s in %s should not have %s line endings"
+msgstr " %s i %s borde inte ha %s-radslut"
+
+msgid "end-of-line check failed:\n"
+msgstr "radslutskontroll misslyckades:\n"
+
+msgid "the eol extension is incompatible with the win32text extension\n"
+msgstr "eol-utökningen är inkompatibel med win32text-utökningen\n"
#, python-format
msgid "inconsistent newline style in %s\n"
-msgstr ""
+msgstr "inkonsekvent radslutsstil i %s\n"
msgid "command to allow external programs to compare revisions"
msgstr ""
@@ -1888,7 +2138,7 @@
msgstr ""
msgid ""
-"The extdiff extension also allows to configure new diff commands, so\n"
+"The extdiff extension also allows you to configure new diff commands, so\n"
"you do not need to type :hg:`extdiff -p kdiff3` always. ::"
msgstr ""
@@ -1926,6 +2176,7 @@
" $parent1, $plabel1 - filename, descriptive label of first parent\n"
" $child, $clabel - filename, descriptive label of child revision\n"
" $parent2, $plabel2 - filename, descriptive label of second parent\n"
+" $root - repository root\n"
" $parent is an alias for $parent1."
msgstr ""
@@ -2148,6 +2399,9 @@
msgid "%s Note: This key has expired (signed by: \"%s\")\n"
msgstr "%s Notera: Den här nyckenl har gått ut (signerad av: \"%s\")\n"
+msgid "hg sigs"
+msgstr "hg sigs"
+
msgid "list signed changesets"
msgstr "visa signerade ändringar"
@@ -2155,6 +2409,9 @@
msgid "%s:%d node does not exist\n"
msgstr "%s:%d noden existerar inte\n"
+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"
@@ -2162,6 +2419,30 @@
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"
+
+msgid "sign even if the sigfile is modified"
+msgstr "signera även om signaturfilen är modifierad"
+
+msgid "do not commit the sigfile after signing"
+msgstr "arkivera inte signaturfilen efter signering"
+
+msgid "ID"
+msgstr "ID"
+
+msgid "the key id to sign with"
+msgstr "nyckel-ID att signera med"
+
+msgid "TEXT"
+msgstr "TEXT"
+
+msgid "commit message"
+msgstr "arkiveringsmeddelande"
+
+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"
@@ -2180,52 +2461,24 @@
" "
msgid "uncommitted merge - please provide a specific revision"
-msgstr ""
+msgstr "oarkiverad sammanfogning - ange en specifik revision"
#, python-format
msgid "Signing %d:%s\n"
msgstr "Signerar %d:%s\n"
msgid "error while signing"
-msgstr ""
+msgstr "fel vid signering"
msgid ""
"working copy of .hgsigs is changed (please commit .hgsigs manually or use --"
"force)"
msgstr ""
+"arbetskopian av .hgsigs är ändrad (arkivera .hgsigs manuellt eller använd\n"
+"--force)"
msgid "unknown signature version"
-msgstr ""
-
-msgid "make the signature local"
-msgstr ""
-
-msgid "sign even if the sigfile is modified"
-msgstr ""
-
-msgid "do not commit the sigfile after signing"
-msgstr ""
-
-msgid "ID"
-msgstr ""
-
-msgid "the key id to sign with"
-msgstr ""
-
-msgid "TEXT"
-msgstr "TEXT"
-
-msgid "commit message"
-msgstr ""
-
-msgid "hg sign [OPTION]... [REVISION]..."
-msgstr ""
-
-msgid "hg sigcheck REVISION"
-msgstr ""
-
-msgid "hg sigs"
-msgstr ""
+msgstr "okänd signaturversion"
msgid "command to view revision graphs from a shell"
msgstr "kommando för att se revisionsgrafer i ett skal"
@@ -2240,8 +2493,26 @@
"revisionsgrafen.\n"
#, python-format
-msgid "--graph option is incompatible with --%s"
-msgstr "flaggan --graph är inkompatibel med --%s"
+msgid "-G/--graph option is incompatible with --%s"
+msgstr "flaggan -G/--graph är inkompatibel med --%s"
+
+msgid "-G/--graph option is incompatible with --follow with file argument"
+msgstr "flaggan -G/--graph är inkompatibel med --follow med filargument"
+
+msgid "NUM"
+msgstr "NUM"
+
+msgid "limit number of changes displayed"
+msgstr "begränsa antalet visade ändringar"
+
+msgid "show patch"
+msgstr "visa patch"
+
+msgid "show the specified revision or range"
+msgstr "visa den specifika revisionen eller serien"
+
+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"
@@ -2264,21 +2535,6 @@
msgid "show the revision DAG"
msgstr "visa revisionsdiagram"
-msgid "NUM"
-msgstr ""
-
-msgid "limit number of changes displayed"
-msgstr "begränsa antalet visade ändringar"
-
-msgid "show patch"
-msgstr "visa patch"
-
-msgid "show the specified revision or range"
-msgstr "visa den specifika revisionen eller serien"
-
-msgid "hg glog [OPTION]... [FILE]"
-msgstr "hg glog [FLAGGA]... [FIL]"
-
msgid "hooks for integrating with the CIA.vc notification service"
msgstr ""
@@ -2298,7 +2554,7 @@
" # Append a diffstat to the log message (optional)\n"
" #diffstat = False\n"
" # Template to use for log messages (optional)\n"
-" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n"
+" #template = {desc}\\n{baseurl}{webroot}/rev/{node}-- {diffstat}\n"
" # Style to use (optional)\n"
" #style = foo\n"
" # The URL of the CIA notification service (optional)\n"
@@ -2307,7 +2563,9 @@
" # Make sure to set email.from if you do this.\n"
" #url = http://cia.vc/\n"
" # print message instead of sending it (optional)\n"
-" #test = False"
+" #test = False\n"
+" # number of slashes to strip for url paths\n"
+" #strip = 0"
msgstr ""
msgid ""
@@ -2720,13 +2978,13 @@
"available templates and filters."
msgstr ""
-msgid "Three additional date template filters are provided::"
-msgstr ""
-
-msgid ""
-" utcdate \"2006/09/18 15:13:13\"\n"
-" svnutcdate \"2006-09-18 15:13:13Z\"\n"
-" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
+msgid "Three additional date template filters are provided:"
+msgstr ""
+
+msgid ""
+":``utcdate``: \"2006/09/18 15:13:13\"\n"
+":``svnutcdate``: \"2006-09-18 15:13:13Z\"\n"
+":``svnisodate``: \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\""
msgstr ""
msgid ""
@@ -2765,6 +3023,15 @@
msgid "no [keyword] patterns configured"
msgstr ""
+msgid "show default keyword template maps"
+msgstr ""
+
+msgid "read maps from rcfile"
+msgstr ""
+
+msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
+msgstr ""
+
msgid "print [keywordmaps] configuration and an expansion example"
msgstr ""
@@ -2838,6 +3105,9 @@
"\tkeywords expanded\n"
msgstr ""
+msgid "hg kwexpand [OPTION]... [FILE]..."
+msgstr ""
+
msgid "expand keywords in the working directory"
msgstr ""
@@ -2849,6 +3119,18 @@
" "
msgstr ""
+msgid "show keyword status flags of all files"
+msgstr ""
+
+msgid "show files excluded from expansion"
+msgstr ""
+
+msgid "only show unknown (not tracked) files"
+msgstr "visa bara okända (ospårade) filer"
+
+msgid "hg kwfiles [OPTION]... [FILE]..."
+msgstr ""
+
msgid "show files configured for keyword expansion"
msgstr ""
@@ -2881,6 +3163,9 @@
" "
msgstr ""
+msgid "hg kwshrink [OPTION]... [FILE]..."
+msgstr ""
+
msgid "revert expanded keywords in the working directory"
msgstr ""
@@ -2892,33 +3177,6 @@
" "
msgstr ""
-msgid "show default keyword template maps"
-msgstr ""
-
-msgid "read maps from rcfile"
-msgstr ""
-
-msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..."
-msgstr ""
-
-msgid "hg kwexpand [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "show keyword status flags of all files"
-msgstr ""
-
-msgid "show files excluded from expansion"
-msgstr ""
-
-msgid "only show unknown (not tracked) files"
-msgstr "visa bara okända (ospårade) filer"
-
-msgid "hg kwfiles [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "hg kwshrink [OPTION]... [FILE]..."
-msgstr ""
-
msgid "manage a stack of patches"
msgstr "hantera en uppsättning patchar"
@@ -2999,6 +3257,13 @@
"Du kommer som standard att handera en patchkö vid namn \"patches\". Du\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"
+
+#, python-format
+msgid "malformated mq status line: %s\n"
+msgstr "defekt mq-statusrad: %s\n"
+
#, python-format
msgid "mq.git option can be auto/keep/yes/no got %s"
msgstr "mq.git kan vara auto/keep/yes/no men läste %s"
@@ -3035,12 +3300,12 @@
msgstr ""
#, python-format
-msgid "allowing %s - guarded by %r\n"
-msgstr ""
-
-#, python-format
-msgid "skipping %s - guarded by %r\n"
-msgstr ""
+msgid "allowing %s - guarded by %s\n"
+msgstr ""
+
+#, python-format
+msgid "skipping %s - guarded by %s\n"
+msgstr "hoppar över %s - skyddad av %s\n"
#, python-format
msgid "skipping %s - no matching guards\n"
@@ -3102,6 +3367,14 @@
msgstr ""
#, python-format
+msgid "revision %s refers to unknown patches: %s\n"
+msgstr "revision %s refererar till okända patchar: %s\n"
+
+#, python-format
+msgid "unknown patches: %s\n"
+msgstr "okända patchar: %s\n"
+
+#, python-format
msgid "revision %d is not managed"
msgstr ""
@@ -3145,6 +3418,14 @@
msgstr ""
#, python-format
+msgid "patch name cannot begin with \"%s\""
+msgstr ""
+
+#, python-format
+msgid "\"%s\" cannot be used in the name of a patch"
+msgstr ""
+
+#, python-format
msgid "\"%s\" already exists as a directory"
msgstr "\"%s\" finns redan som katalog"
@@ -3186,8 +3467,8 @@
msgstr ""
#, python-format
-msgid "guarded by %r"
-msgstr ""
+msgid "guarded by %s"
+msgstr "skyddad av %s"
msgid "no matching guards"
msgstr ""
@@ -3364,6 +3645,15 @@
msgid "adding %s to series file\n"
msgstr "lägger till %s till seriefilen\n"
+msgid "keep patch file"
+msgstr ""
+
+msgid "stop managing a revision (DEPRECATED)"
+msgstr ""
+
+msgid "hg qdelete [-k] [PATCH]..."
+msgstr "hg qdelete [-k] [PATCH]..."
+
msgid "remove patches from queue"
msgstr ""
@@ -3378,6 +3668,12 @@
" use the :hg:`qfinish` command."
msgstr ""
+msgid "show only the last patch"
+msgstr "visa bara den sista patchen"
+
+msgid "hg qapplied [-1] [-s] [PATCH]"
+msgstr "hg qapplied [-1] [-s] [PATCH]"
+
msgid "print the patches already applied"
msgstr "skriv ut redan applicerade patchar"
@@ -3387,12 +3683,42 @@
msgid "only one patch applied\n"
msgstr "bara en patch applicerad\n"
+msgid "show only the first patch"
+msgstr "visa bara den första patchen"
+
+msgid "hg qunapplied [-1] [-s] [PATCH]"
+msgstr "hg qunapplied [-1] [-s] [PATCH]"
+
msgid "print the patches not yet applied"
msgstr "skriv ut oapplicerade patchar"
msgid "all patches applied\n"
msgstr "alla patchar applicerade\n"
+msgid "import file in patch directory"
+msgstr ""
+
+msgid "NAME"
+msgstr "NAMN"
+
+msgid "name of patch file"
+msgstr ""
+
+msgid "overwrite existing files"
+msgstr ""
+
+msgid "place existing revisions under mq control"
+msgstr ""
+
+msgid "use git extended diff format"
+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 "import a patch"
msgstr "importera en patch"
@@ -3423,7 +3749,7 @@
" With -g/--git, patches imported with --rev will use the git diff\n"
" format. See the diffs help topic for information on why this is\n"
" important for preserving rename/copy information and permission\n"
-" changes."
+" changes. Use :hg:`qfinish` to remove changesets from mq control."
msgstr ""
msgid ""
@@ -3445,6 +3771,12 @@
" Returnerar 0 om importeringen lyckades.\n"
" "
+msgid "create queue repository"
+msgstr "skapa köarkiv"
+
+msgid "hg qinit [-c]"
+msgstr "hg qinit [-c]"
+
msgid "init a new queue repository (DEPRECATED)"
msgstr ""
@@ -3461,6 +3793,24 @@
" commands. With -c, use :hg:`init --mq` instead."
msgstr ""
+msgid "use pull protocol to copy metadata"
+msgstr "använd pull-protokollet för att kopiera metadata"
+
+msgid "do not update the new working directories"
+msgstr "uppdatera inte de nya arbetskatalogerna"
+
+msgid "use uncompressed transfer (fast over LAN)"
+msgstr "använd okomprimerad överföring (snabbt över LAN)"
+
+msgid "REPO"
+msgstr "ARKIV"
+
+msgid "location of source patch repository"
+msgstr ""
+
+msgid "hg qclone [OPTION]... SOURCE [DEST]"
+msgstr ""
+
msgid "clone main and patch repository at same time"
msgstr ""
@@ -3504,6 +3854,9 @@
msgid "updating destination repository\n"
msgstr ""
+msgid "hg qcommit [OPTION]... [FILE]..."
+msgstr ""
+
msgid "commit changes in the queue repository (DEPRECATED)"
msgstr "arkivera ändringar i köarkivet (FÖRÅLDRAD)"
@@ -3511,18 +3864,54 @@
msgstr ""
" Detta är ett föråldrat kommando; använd :hg:`commit --mq` istället."
+msgid "print patches not in series"
+msgstr ""
+
+msgid "hg qseries [-ms]"
+msgstr ""
+
msgid "print the entire series file"
msgstr ""
+msgid "hg qtop [-s]"
+msgstr "hg qtop [-s]"
+
msgid "print the name of the current patch"
msgstr ""
+msgid "hg qnext [-s]"
+msgstr "hg qnext [-s]"
+
msgid "print the name of the next patch"
msgstr ""
+msgid "hg qprev [-s]"
+msgstr "hg qprev [-s]"
+
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 ""
+
+msgid "USER"
+msgstr ""
+
+msgid "add \"From: <USER>\" to patch"
+msgstr ""
+
+msgid "add \"Date: <current date>\" to patch"
+msgstr ""
+
+msgid "add \"Date: <DATE>\" to 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 ""
@@ -3561,6 +3950,24 @@
" Returnerar 0 om en patch skapades.\n"
" "
+msgid "refresh only files already in the patch and specified files"
+msgstr ""
+
+msgid "add/update author field in patch with current user"
+msgstr ""
+
+msgid "add/update author field in patch with given user"
+msgstr ""
+
+msgid "add/update date field in patch with current date"
+msgstr ""
+
+msgid "add/update date field in patch with given date"
+msgstr ""
+
+msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
+msgstr ""
+
msgid "update the current patch"
msgstr "uppdatera den nuvarande patchen"
@@ -3593,6 +4000,9 @@
msgid "option \"-e\" incompatible with \"-m\" or \"-l\""
msgstr ""
+msgid "hg qdiff [OPTION]... [FILE]..."
+msgstr ""
+
msgid "diff of the current patch and subsequent modifications"
msgstr ""
@@ -3610,6 +4020,15 @@
" qrefresh."
msgstr ""
+msgid "edit patch header"
+msgstr ""
+
+msgid "keep folded patch files"
+msgstr ""
+
+msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
+msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FIL] PATCH..."
+
msgid "fold the named patches into the current patch"
msgstr ""
@@ -3642,9 +4061,24 @@
msgid "error folding patch %s"
msgstr ""
+msgid "overwrite any local changes"
+msgstr ""
+
+msgid "hg qgoto [OPTION]... PATCH"
+msgstr ""
+
msgid "push or pop patches until named patch is at top of stack"
msgstr ""
+msgid "list all patches and guards"
+msgstr ""
+
+msgid "drop all guards"
+msgstr ""
+
+msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
+msgstr ""
+
msgid "set or print guards for a patch"
msgstr ""
@@ -3683,9 +4117,36 @@
msgid "no patch named %s"
msgstr ""
+msgid "hg qheader [PATCH]"
+msgstr "hg qheader [PATCH]"
+
msgid "print the header of the topmost or specified patch"
msgstr ""
+msgid "apply on top of local changes"
+msgstr ""
+
+msgid "apply the target patch to its recorded parent"
+msgstr "applicera patchen på dess angivna förälder"
+
+msgid "list patch name in commit text"
+msgstr ""
+
+msgid "apply all patches"
+msgstr ""
+
+msgid "merge from another queue (DEPRECATED)"
+msgstr ""
+
+msgid "merge queue name (DEPRECATED)"
+msgstr ""
+
+msgid "reorder patch series and apply only the patch"
+msgstr "omordna patchserien och applicera bara patchen"
+
+msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
+
msgid "push the next patch onto the stack"
msgstr ""
@@ -3694,13 +4155,6 @@
" will be lost."
msgstr ""
-msgid ""
-" Return 0 on succces.\n"
-" "
-msgstr ""
-" Returnerar 0 om kommandot lyckades.\n"
-" "
-
msgid "no saved queues found, please use -n\n"
msgstr ""
@@ -3708,6 +4162,18 @@
msgid "merging with queue at: %s\n"
msgstr ""
+msgid "pop all patches"
+msgstr ""
+
+msgid "queue name to pop (DEPRECATED)"
+msgstr ""
+
+msgid "forget any local changes to patched files"
+msgstr ""
+
+msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
+msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
+
msgid "pop the current patch off the stack"
msgstr ""
@@ -3721,6 +4187,9 @@
msgid "using patch queue: %s\n"
msgstr ""
+msgid "hg qrename PATCH1 [PATCH2]"
+msgstr ""
+
msgid "rename a patch"
msgstr ""
@@ -3729,12 +4198,13 @@
" With two arguments, renames PATCH1 to PATCH2."
msgstr ""
-#, python-format
-msgid "%s already exists"
-msgstr ""
-
-#, python-format
-msgid "A patch named %s already exists in the series file"
+msgid "delete save entry"
+msgstr ""
+
+msgid "update queue working directory"
+msgstr ""
+
+msgid "hg qrestore [-d] [-u] REV"
msgstr ""
msgid "restore the queue state saved by a revision (DEPRECATED)"
@@ -3743,6 +4213,21 @@
msgid " This command is deprecated, use :hg:`rebase` instead."
msgstr " Detta är ett förlegat kommando; använd :hg:`rebase` istället."
+msgid "copy patch directory"
+msgstr ""
+
+msgid "copy directory name"
+msgstr ""
+
+msgid "clear queue status file"
+msgstr ""
+
+msgid "force copy"
+msgstr ""
+
+msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
+msgstr ""
+
msgid "save current queue state (DEPRECATED)"
msgstr ""
@@ -3758,13 +4243,37 @@
msgid "copy %s to %s\n"
msgstr ""
+msgid "force removal of changesets, discard uncommitted changes (no backup)"
+msgstr ""
+"tvinga radering av ändringar, kassera oarkiverade ändringar (ingen backup)"
+
+msgid ""
+"bundle only changesets with local revision number greater than REV which are "
+"not descendants of REV (DEPRECATED)"
+msgstr ""
+"bunta bara ändringar med lokala revisionsnummer större än REV som inte är "
+"ättling till REV (FÖRLEGAD)"
+
+msgid "no backups"
+msgstr "inga säkerhetskopior"
+
+msgid "no backups (DEPRECATED)"
+msgstr "inga säkerhetskopior (FÖRÅLDRAD)"
+
+msgid "do not modify working copy during strip"
+msgstr "modifiera inte arbetskopian vid strippning"
+
+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 ""
msgid ""
" The strip command removes the specified changesets and all their\n"
-" descendants. If the working directory has uncommitted changes,\n"
-" the operation is aborted unless the --force flag is supplied."
+" descendants. If the working directory has uncommitted changes, the\n"
+" operation is aborted unless the --force flag is supplied, in which\n"
+" case changes will be discarded."
msgstr ""
msgid ""
@@ -3791,6 +4300,21 @@
msgid "empty revision set"
msgstr "tomt revisionsset"
+msgid "disable all guards"
+msgstr ""
+
+msgid "list all guards in series file"
+msgstr ""
+
+msgid "pop to before first guarded applied patch"
+msgstr ""
+
+msgid "pop, then reapply patches"
+msgstr ""
+
+msgid "hg qselect [OPTION]... [GUARD]..."
+msgstr ""
+
msgid "set or print guarded patches to push"
msgstr ""
@@ -3803,8 +4327,8 @@
msgstr ""
msgid ""
-" qguard foo.patch -stable (negative guard)\n"
-" qguard bar.patch +stable (positive guard)\n"
+" qguard foo.patch -- -stable (negative guard)\n"
+" qguard bar.patch +stable (positive guard)\n"
" qselect stable"
msgstr ""
@@ -3867,6 +4391,12 @@
msgid "reapplying unguarded patches\n"
msgstr ""
+msgid "finish all applied changesets"
+msgstr ""
+
+msgid "hg qfinish [-a] [REV]..."
+msgstr "hg qfinish [-a] [REV]..."
+
msgid "move applied patches into repository history"
msgstr ""
@@ -3892,6 +4422,24 @@
msgid "no revisions specified"
msgstr ""
+msgid "list all available queues"
+msgstr "visa alla tillgängliga köer"
+
+msgid "create new queue"
+msgstr "skapa ny kö"
+
+msgid "rename active queue"
+msgstr "döp om aktiv kö"
+
+msgid "delete reference to queue"
+msgstr ""
+
+msgid "delete queue, and remove patch dir"
+msgstr ""
+
+msgid "[OPTION] [QUEUE]"
+msgstr "[FLAGGA] [KÖ]"
+
msgid "manage multiple patch queues"
msgstr ""
@@ -3988,296 +4536,19 @@
msgid "mq: (empty queue)\n"
msgstr "mq: (tom kö)\n"
+msgid ""
+"``mq()``\n"
+" Changesets managed by MQ."
+msgstr ""
+"``mq()``\n"
+" Ändringar hanterade av MQ."
+
+msgid "mq takes no arguments"
+msgstr "mq tar inga argument"
+
msgid "operate on patch repository"
msgstr "arbeta med patcharkiv"
-msgid "print first line of patch header"
-msgstr "skriv ut första raden i patchheadern"
-
-msgid "show only the last patch"
-msgstr "visa bara den sista patchen"
-
-msgid "hg qapplied [-1] [-s] [PATCH]"
-msgstr "hg qapplied [-1] [-s] [PATCH]"
-
-msgid "use pull protocol to copy metadata"
-msgstr "använd pull-protokollet för att kopiera metadata"
-
-msgid "do not update the new working directories"
-msgstr "uppdatera inte de nya arbetskatalogerna"
-
-msgid "use uncompressed transfer (fast over LAN)"
-msgstr "använd okomprimerad överföring (snabbt över LAN)"
-
-msgid "REPO"
-msgstr "ARKIV"
-
-msgid "location of source patch repository"
-msgstr ""
-
-msgid "hg qclone [OPTION]... SOURCE [DEST]"
-msgstr ""
-
-msgid "hg qcommit [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "hg qdiff [OPTION]... [FILE]..."
-msgstr ""
-
-msgid "keep patch file"
-msgstr ""
-
-msgid "stop managing a revision (DEPRECATED)"
-msgstr ""
-
-msgid "hg qdelete [-k] [PATCH]..."
-msgstr "hg qdelete [-k] [PATCH]..."
-
-msgid "edit patch header"
-msgstr ""
-
-msgid "keep folded patch files"
-msgstr ""
-
-msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..."
-msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FIL] PATCH..."
-
-msgid "overwrite any local changes"
-msgstr ""
-
-msgid "hg qgoto [OPTION]... PATCH"
-msgstr ""
-
-msgid "list all patches and guards"
-msgstr ""
-
-msgid "drop all guards"
-msgstr ""
-
-msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]"
-msgstr ""
-
-msgid "hg qheader [PATCH]"
-msgstr "hg qheader [PATCH]"
-
-msgid "import file in patch directory"
-msgstr ""
-
-msgid "NAME"
-msgstr "NAMN"
-
-msgid "name of patch file"
-msgstr ""
-
-msgid "overwrite existing files"
-msgstr ""
-
-msgid "place existing revisions under mq control"
-msgstr ""
-
-msgid "use git extended diff format"
-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 "create queue repository"
-msgstr ""
-
-msgid "hg qinit [-c]"
-msgstr "hg qinit [-c]"
-
-msgid "import uncommitted changes (DEPRECATED)"
-msgstr "importera icke arkiverade ändringar (FÖRLEGAD)"
-
-msgid "add \"From: <current user>\" to patch"
-msgstr ""
-
-msgid "USER"
-msgstr ""
-
-msgid "add \"From: <USER>\" to patch"
-msgstr ""
-
-msgid "add \"Date: <current date>\" to patch"
-msgstr ""
-
-msgid "add \"Date: <DATE>\" to patch"
-msgstr ""
-
-msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..."
-msgstr "hg qnew [-e] [-m TEXT] [-l FIL] PATCH [FIL]..."
-
-msgid "hg qnext [-s]"
-msgstr "hg qnext [-s]"
-
-msgid "hg qprev [-s]"
-msgstr "hg qprev [-s]"
-
-msgid "pop all patches"
-msgstr ""
-
-msgid "queue name to pop (DEPRECATED)"
-msgstr ""
-
-msgid "forget any local changes to patched files"
-msgstr ""
-
-msgid "hg qpop [-a] [-f] [PATCH | INDEX]"
-msgstr "hg qpop [-a] [-f] [PATCH | INDEX]"
-
-msgid "apply on top of local changes"
-msgstr ""
-
-msgid "apply the target patch to its recorded parent"
-msgstr "applicera patchen på dess angivna förälder"
-
-msgid "list patch name in commit text"
-msgstr ""
-
-msgid "apply all patches"
-msgstr ""
-
-msgid "merge from another queue (DEPRECATED)"
-msgstr ""
-
-msgid "merge queue name (DEPRECATED)"
-msgstr ""
-
-msgid "reorder patch series and apply only the patch"
-msgstr "omordna patchserien och applicera bara patchen"
-
-msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
-msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]"
-
-msgid "refresh only files already in the patch and specified files"
-msgstr ""
-
-msgid "add/update author field in patch with current user"
-msgstr ""
-
-msgid "add/update author field in patch with given user"
-msgstr ""
-
-msgid "add/update date field in patch with current date"
-msgstr ""
-
-msgid "add/update date field in patch with given date"
-msgstr ""
-
-msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..."
-msgstr ""
-
-msgid "hg qrename PATCH1 [PATCH2]"
-msgstr ""
-
-msgid "delete save entry"
-msgstr ""
-
-msgid "update queue working directory"
-msgstr ""
-
-msgid "hg qrestore [-d] [-u] REV"
-msgstr ""
-
-msgid "copy patch directory"
-msgstr ""
-
-msgid "copy directory name"
-msgstr ""
-
-msgid "clear queue status file"
-msgstr ""
-
-msgid "force copy"
-msgstr ""
-
-msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]"
-msgstr ""
-
-msgid "disable all guards"
-msgstr ""
-
-msgid "list all guards in series file"
-msgstr ""
-
-msgid "pop to before first guarded applied patch"
-msgstr ""
-
-msgid "pop, then reapply patches"
-msgstr ""
-
-msgid "hg qselect [OPTION]... [GUARD]..."
-msgstr ""
-
-msgid "print patches not in series"
-msgstr ""
-
-msgid "hg qseries [-ms]"
-msgstr ""
-
-msgid ""
-"force removal of changesets even if the working directory has uncommitted "
-"changes"
-msgstr ""
-"tvinga borttagning av ändringar även om arbetskatalogen har oarkiverade "
-"ändringar"
-
-msgid ""
-"bundle only changesets with local revision number greater than REV which are "
-"not descendants of REV (DEPRECATED)"
-msgstr ""
-"bunta bara ändringar med lokala revisionsnummer större än REV som inte är "
-"ättling till REV (FÖRLEGAD)"
-
-msgid "no backups"
-msgstr "inga säkerhetskopior"
-
-msgid "no backups (DEPRECATED)"
-msgstr "inga säkerhetskopior (FÖRÅLDRAD)"
-
-msgid "do not modify working copy during strip"
-msgstr "modifiera inte arbetskopian vid strippning"
-
-msgid "hg strip [-k] [-f] [-n] REV..."
-msgstr "hg strip [-k] [-f] [-n] REV..."
-
-msgid "hg qtop [-s]"
-msgstr "hg qtop [-s]"
-
-msgid "show only the first patch"
-msgstr "visa bara den första patchen"
-
-msgid "hg qunapplied [-1] [-s] [PATCH]"
-msgstr "hg qunapplied [-1] [-s] [PATCH]"
-
-msgid "finish all applied changesets"
-msgstr ""
-
-msgid "hg qfinish [-a] [REV]..."
-msgstr "hg qfinish [-a] [REV]..."
-
-msgid "list all available queues"
-msgstr "visa alla tillgängliga köer"
-
-msgid "create new queue"
-msgstr "skapa ny kö"
-
-msgid "rename active queue"
-msgstr "döp om aktiv kö"
-
-msgid "delete reference to queue"
-msgstr ""
-
-msgid "delete queue, and remove patch dir"
-msgstr ""
-
-msgid "[OPTION] [QUEUE]"
-msgstr "[FLAGGA] [KÖ]"
-
msgid "hooks for sending email notifications at commit/push time"
msgstr ""
@@ -4301,7 +4572,9 @@
" # 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"
+" 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 ""
@@ -4325,7 +4598,8 @@
" 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"
-" changegroup = ... # template when run as changegroup 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"
@@ -4468,32 +4742,6 @@
msgid "when to paginate (boolean, always, auto, or never)"
msgstr "när paginering ska ske (boolean, always, auto eller never)"
-msgid "interpret suffixes to refer to ancestor revisions"
-msgstr ""
-
-msgid ""
-"This extension allows you to use git-style suffixes to refer to the\n"
-"ancestors of a specific revision."
-msgstr ""
-
-msgid "For example, if you can refer to a revision as \"foo\", then::"
-msgstr ""
-
-msgid ""
-" foo^N = Nth parent of foo\n"
-" foo^0 = foo\n"
-" foo^1 = first parent of foo\n"
-" foo^2 = second parent of foo\n"
-" foo^ = foo^1"
-msgstr ""
-
-msgid ""
-" foo~N = Nth first grandparent of foo\n"
-" foo~0 = foo\n"
-" foo~1 = foo^1 = foo^ = first parent of foo\n"
-" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n"
-msgstr ""
-
msgid "command to send changesets as (a series of) patch emails"
msgstr "kommando för att sända ändringar som (en uppsättning) mail"
@@ -4532,11 +4780,11 @@
"trådade mail- och news-läsare, och i mailarkiv."
msgid ""
-"To configure other defaults, add a section like this to your hgrc\n"
-"file::"
+"To configure other defaults, add a section like this to your\n"
+"configuration file::"
msgstr ""
"För att konfigurera andra inställningar, lägg till en sådan här sektion\n"
-"till din hgrc-fil::"
+"till din konfigurationsfil::"
msgid ""
" [email]\n"
@@ -4586,6 +4834,81 @@
msgid "Please enter a valid value.\n"
msgstr "Ange ett giltigt värde.\n"
+msgid "send patches as attachments"
+msgstr ""
+
+msgid "send patches as inline attachments"
+msgstr ""
+
+msgid "email addresses of blind carbon copy recipients"
+msgstr ""
+
+msgid "email addresses of copy recipients"
+msgstr ""
+
+msgid "ask for confirmation before sending"
+msgstr "bekräfta innan sändning"
+
+msgid "add diffstat output to messages"
+msgstr ""
+
+msgid "use the given date as the sending date"
+msgstr ""
+
+msgid "use the given file as the series description"
+msgstr ""
+
+msgid "email address of sender"
+msgstr ""
+
+msgid "print messages that would be sent"
+msgstr ""
+
+msgid "write messages to mbox file instead of sending them"
+msgstr ""
+
+msgid "email addresses replies should be sent to"
+msgstr "emailadresser som svar ska skickas till"
+
+msgid "subject of first message (intro or single patch)"
+msgstr ""
+
+msgid "message identifier to reply to"
+msgstr ""
+
+msgid "flags to add in subject prefixes"
+msgstr ""
+
+msgid "email addresses of recipients"
+msgstr ""
+
+msgid "omit hg patch header"
+msgstr ""
+
+msgid "send changes not found in the target repository"
+msgstr ""
+
+msgid "send changes not in target as a binary bundle"
+msgstr ""
+
+msgid "name of the bundle attachment file"
+msgstr ""
+
+msgid "a revision to send"
+msgstr ""
+
+msgid "run even when remote repository is unrelated (with -b/--bundle)"
+msgstr ""
+
+msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
+msgstr ""
+
+msgid "send an introduction email for a single patch"
+msgstr ""
+
+msgid "hg email [OPTION]... [DEST]..."
+msgstr "hg email [FLAGGA]... [DEST]..."
+
msgid "send changesets by email"
msgstr "sänd ändringar via email"
@@ -4765,81 +5088,6 @@
msgid "sending"
msgstr "sänder"
-msgid "send patches as attachments"
-msgstr ""
-
-msgid "send patches as inline attachments"
-msgstr ""
-
-msgid "email addresses of blind carbon copy recipients"
-msgstr ""
-
-msgid "email addresses of copy recipients"
-msgstr ""
-
-msgid "ask for confirmation before sending"
-msgstr "bekräfta innan sändning"
-
-msgid "add diffstat output to messages"
-msgstr ""
-
-msgid "use the given date as the sending date"
-msgstr ""
-
-msgid "use the given file as the series description"
-msgstr ""
-
-msgid "email address of sender"
-msgstr ""
-
-msgid "print messages that would be sent"
-msgstr ""
-
-msgid "write messages to mbox file instead of sending them"
-msgstr ""
-
-msgid "email addresses replies should be sent to"
-msgstr "emailadresser som svar ska skickas till"
-
-msgid "subject of first message (intro or single patch)"
-msgstr ""
-
-msgid "message identifier to reply to"
-msgstr ""
-
-msgid "flags to add in subject prefixes"
-msgstr ""
-
-msgid "email addresses of recipients"
-msgstr ""
-
-msgid "omit hg patch header"
-msgstr ""
-
-msgid "send changes not found in the target repository"
-msgstr ""
-
-msgid "send changes not in target as a binary bundle"
-msgstr ""
-
-msgid "name of the bundle attachment file"
-msgstr ""
-
-msgid "a revision to send"
-msgstr ""
-
-msgid "run even when remote repository is unrelated (with -b/--bundle)"
-msgstr ""
-
-msgid "a base changeset to specify instead of a destination (with -b/--bundle)"
-msgstr ""
-
-msgid "send an introduction email for a single patch"
-msgstr ""
-
-msgid "hg email [OPTION]... [DEST]..."
-msgstr "hg email [FLAGGA]... [DEST]..."
-
msgid "show progress bars for some actions"
msgstr ""
@@ -4868,9 +5116,9 @@
msgid ""
"Valid entries for the format field are topic, bar, number, unit,\n"
-"estimate, and item. item defaults to the last 20 characters of the\n"
-"item, but this can be changed by adding either ``-<num>`` which would\n"
-"take the last num characters, or ``+<num>`` for the first num\n"
+"estimate, speed, and item. item defaults to the last 20 characters of\n"
+"the item, but this can be changed by adding either ``-<num>`` which\n"
+"would take the last num characters, or ``+<num>`` for the first num\n"
"characters.\n"
msgstr ""
@@ -4904,9 +5152,28 @@
msgid "%dy%02dw"
msgstr "%då%02dv"
+#, python-format
+msgid "%d %s/sec"
+msgstr "%d %s/sek"
+
msgid "command to delete untracked files from the working directory"
msgstr ""
+msgid "abort if an error occurs"
+msgstr ""
+
+msgid "purge ignored files too"
+msgstr ""
+
+msgid "print filenames instead of deleting them"
+msgstr ""
+
+msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
+msgstr ""
+
+msgid "hg purge [OPTION]... [DIR]..."
+msgstr ""
+
msgid "removes files not tracked by Mercurial"
msgstr ""
@@ -4962,21 +5229,6 @@
msgid "Removing directory %s\n"
msgstr ""
-msgid "abort if an error occurs"
-msgstr ""
-
-msgid "purge ignored files too"
-msgstr ""
-
-msgid "print filenames instead of deleting them"
-msgstr ""
-
-msgid "end filenames with NUL, for use with xargs (implies -p/--print)"
-msgstr ""
-
-msgid "hg purge [OPTION]... [DIR]..."
-msgstr ""
-
msgid "command to move sets of revisions to a different ancestor"
msgstr ""
@@ -4990,6 +5242,49 @@
"http://mercurial.selenic.com/wiki/RebaseExtension\n"
msgstr ""
+msgid "rebase from the specified changeset"
+msgstr ""
+
+msgid ""
+"rebase from the base of the specified changeset (up to greatest common "
+"ancestor of base and dest)"
+msgstr ""
+
+msgid "rebase onto the specified changeset"
+msgstr ""
+
+msgid "collapse the rebased changesets"
+msgstr ""
+
+msgid "use text as collapse commit message"
+msgstr "använd text som kollapsarkiveringsmeddelande"
+
+msgid "read collapse commit message from file"
+msgstr "läs kollapsarkiveringsmeddelandet från fil"
+
+msgid "keep original changesets"
+msgstr ""
+
+msgid "keep original branch names"
+msgstr ""
+
+msgid "force detaching of source from its original branch"
+msgstr ""
+
+msgid "specify merge tool"
+msgstr "ange sammanfogningsverktyg"
+
+msgid "continue an interrupted rebase"
+msgstr ""
+
+msgid "abort an interrupted rebase"
+msgstr ""
+
+msgid ""
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
+msgstr ""
+
msgid "move changeset (and descendants) to a different branch"
msgstr ""
@@ -5055,6 +5350,9 @@
" "
msgstr ""
+msgid "message can only be specified with collapse"
+msgstr ""
+
msgid "cannot use both abort and continue"
msgstr ""
@@ -5067,6 +5365,9 @@
msgid "abort and continue do not allow specifying revisions"
msgstr ""
+msgid "tool option will be ignored\n"
+msgstr ""
+
msgid "cannot specify both a revision and a base"
msgstr ""
@@ -5079,9 +5380,6 @@
msgid "nothing to rebase\n"
msgstr ""
-msgid "cannot use both keepbranches and extrafn"
-msgstr ""
-
msgid "rebasing"
msgstr ""
@@ -5133,46 +5431,27 @@
msgid "source is descendant of destination"
msgstr ""
+msgid "--tool can only be used with --rebase"
+msgstr ""
+
msgid "rebase working directory to branch head"
msgstr ""
-msgid "rebase from the specified changeset"
-msgstr ""
-
-msgid ""
-"rebase from the base of the specified changeset (up to greatest common "
-"ancestor of base and dest)"
-msgstr ""
-
-msgid "rebase onto the specified changeset"
-msgstr ""
-
-msgid "collapse the rebased changesets"
-msgstr ""
-
-msgid "keep original changesets"
-msgstr ""
-
-msgid "keep original branch names"
-msgstr ""
-
-msgid "force detaching of source from its original branch"
-msgstr ""
-
-msgid "continue an interrupted rebase"
-msgstr ""
-
-msgid "abort an interrupted rebase"
-msgstr ""
-
-msgid ""
-"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
-"hg rebase {-a|-c}"
-msgstr ""
+msgid "specify merge tool for rebase"
+msgstr "ange sammanfogningsverktyg för ombasering"
msgid "commands to interactively select changes for commit/qrefresh"
msgstr ""
+msgid "ignore white space when comparing lines"
+msgstr "ignorera blanktecken när rader jämförs"
+
+msgid "ignore changes in the amount of white space"
+msgstr "ignorera ändringar av antalet blanktecken"
+
+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 ""
@@ -5228,6 +5507,9 @@
msgid "record change %d/%d to %r?"
msgstr ""
+msgid "hg record [OPTION]... [FILE]..."
+msgstr "hg record [FLAGGA]... [FIL]..."
+
msgid "interactively select changes to commit"
msgstr ""
@@ -5267,10 +5549,23 @@
msgid " This command is not available when committing a merge."
msgstr ""
+msgid "interactively record a new patch"
+msgstr ""
+
+msgid ""
+" See :hg:`help qnew` & :hg:`help record` for more information and\n"
+" usage.\n"
+" "
+msgstr ""
+" Se :hg:`help qnew` & :hg:`help record` för mer information och\n"
+" användning.\n"
+" "
+
msgid "'mq' extension not loaded"
msgstr ""
-msgid "running non-interactively, use commit instead"
+#, python-format
+msgid "running non-interactively, use %s instead"
msgstr ""
msgid "cannot partially commit a merge (use \"hg commit\" instead)"
@@ -5280,12 +5575,12 @@
msgid "no changes to record\n"
msgstr ""
-msgid "hg record [OPTION]... [FILE]..."
-msgstr ""
-
msgid "hg qrecord [OPTION]... PATCH [FILE]..."
msgstr ""
+msgid "interactively select changes to refresh"
+msgstr ""
+
msgid "recreates hardlinks between repository clones"
msgstr ""
@@ -5330,9 +5625,15 @@
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 ""
+msgstr "länkar om %s till %s\n"
+
+msgid "there is nothing to relink\n"
+msgstr "det finns inget att länka om\n"
#, python-format
msgid "tip has %d files, estimated total number of files: %s\n"
@@ -5351,10 +5652,6 @@
msgid "source and destination are on different devices"
msgstr ""
-#, python-format
-msgid "not linkable: %s\n"
-msgstr "inte länkbar: %s\n"
-
msgid "pruning"
msgstr "putsar"
@@ -5366,7 +5663,7 @@
msgstr "länkar om"
#, python-format
-msgid "relinked %d files (%d bytes reclaimed)\n"
+msgid "relinked %d files (%s reclaimed)\n"
msgstr ""
msgid "[ORIGIN]"
@@ -5426,6 +5723,10 @@
"same name.\n"
msgstr ""
+#, python-format
+msgid "custom scheme %s:// conflicts with drive letter %s:\\\n"
+msgstr ""
+
msgid "share a common history between several working directories"
msgstr ""
@@ -5515,6 +5816,9 @@
msgid "commit failed"
msgstr ""
+msgid "filter corrupted changeset (no user or date)"
+msgstr ""
+
msgid ""
"y: transplant this changeset\n"
"n: skip this changeset\n"
@@ -5538,13 +5842,50 @@
msgid "no such option\n"
msgstr "inget sådant alternativ\n"
+msgid "pull patches from REPO"
+msgstr ""
+
+msgid "BRANCH"
+msgstr "GREN"
+
+msgid "pull patches from branch BRANCH"
+msgstr ""
+
+msgid "pull all changesets up to BRANCH"
+msgstr ""
+
+msgid "skip over REV"
+msgstr ""
+
+msgid "merge at REV"
+msgstr ""
+
+msgid "append transplant info to log message"
+msgstr ""
+
+msgid "continue last transplant session after repair"
+msgstr ""
+
+msgid "filter changesets through command"
+msgstr ""
+
+msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+msgstr ""
+
msgid "transplant changesets from another branch"
msgstr ""
msgid ""
" Selected changesets will be applied on top of the current working\n"
-" directory with the log of the original changeset. If --log is\n"
-" specified, log messages will have a comment appended of the form::"
+" directory with the log of the original changeset. The changesets\n"
+" are copied and will thus appear twice in the history. Use the\n"
+" rebase extension instead if you want to move a whole branch of\n"
+" unpublished changesets."
+msgstr ""
+
+msgid ""
+" If --log is specified, log messages will have a comment appended\n"
+" of the form::"
msgstr ""
msgid " (transplanted from CHANGESETHASH)"
@@ -5566,9 +5907,9 @@
msgstr ""
msgid ""
-" :hg:`transplant --branch REVISION --all` will rebase the selected\n"
-" branch (up to the named revision) onto your current working\n"
-" directory."
+" :hg:`transplant --branch REVISION --all` will transplant the\n"
+" selected branch (up to the named revision) onto your current\n"
+" working directory."
msgstr ""
msgid ""
@@ -5612,38 +5953,13 @@
msgstr ""
msgid ""
-"``transplanted(set)``\n"
-" Transplanted changesets in set."
-msgstr ""
-
-msgid "pull patches from REPO"
-msgstr ""
-
-msgid "BRANCH"
-msgstr "GREN"
-
-msgid "pull patches from branch BRANCH"
-msgstr ""
-
-msgid "pull all changesets up to BRANCH"
-msgstr ""
-
-msgid "skip over REV"
-msgstr ""
-
-msgid "merge at REV"
-msgstr ""
-
-msgid "append transplant info to log message"
-msgstr ""
-
-msgid "continue last transplant session after repair"
-msgstr ""
-
-msgid "filter changesets through command"
-msgstr ""
-
-msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..."
+"``transplanted([set])``\n"
+" Transplanted changesets in set, or all transplanted changesets."
+msgstr ""
+
+msgid ""
+":transplanted: String. The node identifier of the transplanted\n"
+" changeset if any."
msgstr ""
msgid "allow the use of MBCS paths with problematic encodings"
@@ -5852,15 +6168,24 @@
msgid "bookmark '%s' contains illegal character"
msgstr "bokmärket '%s' innehåller ogiltiga tecken"
+#, python-format
+msgid "branch %s not found"
+msgstr "grenen %s hittades inte"
+
+#, python-format
+msgid "updating bookmark %s\n"
+msgstr "uppdaterar bokmärket %s\n"
+
+#, python-format
+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"
msgid "no changed bookmarks found\n"
msgstr "inga ändrade bokmärken hittades\n"
-msgid "invalid changegroup"
-msgstr ""
-
msgid "unknown parent"
msgstr ""
@@ -5916,22 +6241,21 @@
msgid "invalid format spec '%%%s' in output filename"
msgstr ""
-#, python-format
-msgid "adding %s\n"
-msgstr "lägger till %s\n"
-
-#, python-format
-msgid "removing %s\n"
-msgstr "tar bort %s\n"
-
-#, python-format
-msgid "recording removal of %s as rename to %s (%d%% similar)\n"
-msgstr ""
-
-#, python-format
-msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
-msgstr ""
-"%s har inte arkiverats än, så ingen kopieringsinformation lagras för %s.\n"
+msgid "cannot specify --changelog and --manifest at the same time"
+msgstr "kan inte ange --changelog och --manifest samtidigt"
+
+msgid "cannot specify filename with --changelog or --manifest"
+msgstr ""
+
+msgid "cannot specify --changelog or --manifest without a repository"
+msgstr ""
+
+msgid "invalid arguments"
+msgstr ""
+
+#, python-format
+msgid "revlog '%s' not found"
+msgstr "revlog '%s' hittades inte"
#, python-format
msgid "%s: not copying - file is not managed\n"
@@ -6074,6 +6398,10 @@
msgstr ""
#, python-format
+msgid "adding %s\n"
+msgstr "lägger till %s\n"
+
+#, python-format
msgid "skipping missing subrepository: %s\n"
msgstr ""
@@ -6116,8 +6444,141 @@
msgid "empty commit message"
msgstr ""
+msgid "repository root directory or name of overlay bundle file"
+msgstr "arkivrotkatalog eller namn på påläggsbuntfil"
+
+msgid "DIR"
+msgstr ""
+
+msgid "change working directory"
+msgstr "ändra arbetskatalog"
+
+msgid "do not prompt, assume 'yes' for any required answers"
+msgstr "fråga inte, anta att svaret är 'ja' på alla frågor"
+
+msgid "suppress output"
+msgstr "förhindra utmatning"
+
+msgid "enable additional output"
+msgstr "aktivera ytterligare utmatning"
+
+msgid "set/override config option (use 'section.name=value')"
+msgstr "sätt/upphäv konfigurationsflagga (använd 'sektion.namn=värde')"
+
+msgid "CONFIG"
+msgstr ""
+
+msgid "enable debugging output"
+msgstr "aktivera debugutmatning"
+
+msgid "start debugger"
+msgstr "starta debugger"
+
+msgid "set the charset encoding"
+msgstr "sätt teckenkodning"
+
+msgid "ENCODE"
+msgstr ""
+
+msgid "MODE"
+msgstr ""
+
+msgid "set the charset encoding mode"
+msgstr "sätt teckenkodningsläge"
+
+msgid "always print a traceback on exception"
+msgstr "visa alltid bakåtspårning vid undantag"
+
+msgid "time how long the command takes"
+msgstr "ta tid på hur lång tid kommandot körs"
+
+msgid "print command execution profile"
+msgstr "visa kommandoexekveringens profil"
+
+msgid "output version information and exit"
+msgstr "skriv versionsinformation och avsluta"
+
+msgid "display help and exit"
+msgstr "visa hjälp och avsluta"
+
+msgid "do not perform actions, just print output"
+msgstr "utför inget, bara visa"
+
+msgid "specify ssh command to use"
+msgstr "specificera ssh-kommando att använda"
+
+msgid "specify hg command to run on the remote side"
+msgstr "specificera hg-kommando att köra på andra sidan"
+
+msgid "do not verify server certificate (ignoring web.cacerts config)"
+msgstr ""
+"verifiera inte servercertifikatet (ignorerar web.cacerts-konfiguration)"
+
+msgid "PATTERN"
+msgstr "MÖNSTER"
+
+msgid "include names matching the given patterns"
+msgstr "inkludera namn som matchar de givna mönstren"
+
+msgid "exclude names matching the given patterns"
+msgstr "exkludera namn som matchar de givna mönstren"
+
+msgid "use text as commit message"
+msgstr "använd text som arkiveringsmeddelande"
+
+msgid "read commit message from file"
+msgstr "läs arkiveringsmeddelandet från fil"
+
+msgid "record the specified date as commit date"
+msgstr "lagra det angivna datumet som arkiveringsdatumet"
+
+msgid "record the specified user as committer"
+msgstr "lagra den angivna användaren som arkiverare"
+
+msgid "STYLE"
+msgstr "STIL"
+
+msgid "display using template map file"
+msgstr "visa med mallfil"
+
+msgid "display with template"
+msgstr "visa med mall"
+
+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 "treat all files as text"
+msgstr "behandla alla filer som text"
+
+msgid "omit dates from diff headers"
+msgstr "exkludera datum från diff-rubriker"
+
+msgid "show which function each change is in"
+msgstr "visa vilken funktion varje ändring är i"
+
+msgid "produce a diff that undoes the changes"
+msgstr "skapa en diff som ångrar ändringarna"
+
+msgid "number of lines of context to show"
+msgstr "antal sammanhangsrader att visa"
+
+msgid "SIMILARITY"
+msgstr "LIKHET"
+
+msgid "guess renamed files by similarity (0<=s<=100)"
+msgstr "gissa omdöpta filer efter likhet (0<=s<=100)"
+
+msgid "recurse into subrepositories"
+msgstr "gå in i underarkiv"
+
+msgid "[OPTION]... [FILE]..."
+msgstr "[FLAGGA]... [FIL]..."
+
msgid "add the specified files on the next commit"
-msgstr "lägg till de specificerade filerna i nästa arkivering"
+msgstr "lägg till de angivna filerna i nästa arkivering"
msgid ""
" Schedule files to be version controlled and added to the\n"
@@ -6212,6 +6673,36 @@
msgid "similarity must be between 0 and 100"
msgstr "likhet måste vara mellan 0 och 100"
+msgid "annotate the specified revision"
+msgstr "annotera den angivna revisionen"
+
+msgid "follow copies/renames and list the filename (DEPRECATED)"
+msgstr "följ kopieringar/namnbyten och visa filnamnet (FÖRLEGAD)"
+
+msgid "don't follow copies and renames"
+msgstr "följ inte kopieringar och namnbyten"
+
+msgid "list the author (long with -v)"
+msgstr "visa skapare (lång med -v)"
+
+msgid "list the filename"
+msgstr "visa filnamnet"
+
+msgid "list the date (short with -q)"
+msgstr "visa datum (kort med -q)"
+
+msgid "list the revision number (default)"
+msgstr "visa revisionsnummer (standard)"
+
+msgid "list the changeset"
+msgstr "visa ändring"
+
+msgid "show line number at the first appearance"
+msgstr "visa radnummer för första förekomsten"
+
+msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
+msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..."
+
msgid "show changeset information by line for each file"
msgstr "visa ändringsinformation för varje rad i filer"
@@ -6247,6 +6738,24 @@
msgid "%s: binary file\n"
msgstr "%s: binär fil\n"
+msgid "do not pass files through decoders"
+msgstr "passera inte filer genom dekoders"
+
+msgid "directory prefix for files in archive"
+msgstr "katalogprefix för filer i arkiv"
+
+msgid "PREFIX"
+msgstr "PREFIX"
+
+msgid "revision to distribute"
+msgstr "revision att distribuera"
+
+msgid "type of distribution to create"
+msgstr "distributionstyp att skapa"
+
+msgid "[OPTION]... DEST"
+msgstr "[FLAGGA]... DEST"
+
msgid "create an unversioned archive of a repository revision"
msgstr "skapa ett icke versionshanterat arkiv från en arkivrevision"
@@ -6255,7 +6764,7 @@
" directory; use -r/--rev to specify a different revision."
msgstr ""
" Som standard används revisonen för arbetskatalogens förälder; använd\n"
-" -r/--rev för att specificera en annan revision."
+" -r/--rev för att angivna en annan revision."
msgid ""
" The archive type is automatically detected based on file\n"
@@ -6296,11 +6805,11 @@
" removed."
msgstr ""
" Varje fil som läggs till en arkivfil har ett katalogprefix. Använd\n"
-" -p/--prefix för att specificera en formatsträn för prefixet. Som\n"
-" standard används basnamnet för arkivet, med suffix borttagna."
+" -p/--prefix för att ange en formatsträng för prefixet. Som standard\n"
+" används basnamnet för arkivet, med suffix borttagna."
msgid "no working directory: please specify a revision"
-msgstr "ingen arbetskatalog: specificera en revision"
+msgstr "ingen arbetskatalog: ange en revision"
msgid "repository root cannot be destination"
msgstr "arkivroten kan inte vara destinationen"
@@ -6308,6 +6817,18 @@
msgid "cannot archive plain files to stdout"
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"
+msgstr "förälder att välja när en sammanfogning återkallas"
+
+msgid "revision to backout"
+msgstr "revision att återkalla"
+
+msgid "[OPTION]... [-r] REV"
+msgstr "[FLAGGA]... [-r] REV"
+
msgid "reverse effect of earlier changeset"
msgstr "omvänd effekten från en tidigare ändring"
@@ -6344,15 +6865,15 @@
" separately."
msgstr ""
" Innan version 1.7, så var beteendet utan --merge ekvivalent med att\n"
-" specificera --merge följt av :hg:`update --clean .` för att ångra\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 "specificera bara en revision"
+msgstr "ange bara en revision"
msgid "please specify a revision to backout"
-msgstr "specificera en revision att återkalla"
+msgstr "ange en revision att återkalla"
msgid "cannot backout change on a different branch"
msgstr "kan inte återkalla en ändring på en annan gren"
@@ -6378,6 +6899,30 @@
msgid "merging with changeset %s\n"
msgstr "sammanfogar med ändring %s\n"
+msgid "reset bisect state"
+msgstr "återställ bisect-tillständ"
+
+msgid "mark changeset good"
+msgstr "markera ändringen som bra"
+
+msgid "mark changeset bad"
+msgstr "markera ändringen som dålig"
+
+msgid "skip testing changeset"
+msgstr "hoppa över test av ändring"
+
+msgid "extend the bisect range"
+msgstr "utöka bisect-område"
+
+msgid "use command to check changeset state"
+msgstr "använd kommando för att kontrollera ändringsstatus"
+
+msgid "do not update to target"
+msgstr "uppdatera inte till målet"
+
+msgid "[-gbsr] [-U] [-c CMD] [REV]"
+msgstr "[-gbsr] [-U] [-c KMD] [REV]"
+
msgid "subdivision search of changesets"
msgstr "genomsökning av ändringar med halveringsmetoden"
@@ -6428,7 +6973,8 @@
#, python-format
msgid ""
"Not all ancestors of this changeset have been checked.\n"
-"To check the other ancestors, start from the common ancestor, %s.\n"
+"Use bisect --extend to continue the bisection from\n"
+"the common ancestor, %s.\n"
msgstr ""
msgid "Due to skipped revisions, the first good revision could be any of:\n"
@@ -6464,9 +7010,31 @@
msgstr "Ändring %d:%s: %s\n"
#, python-format
+msgid "Extending search to changeset %d:%s\n"
+msgstr "Utökar sökningen till ändringen %d:%s\n"
+
+msgid "nothing to extend"
+msgstr "inget att utöka"
+
+#, python-format
msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n"
msgstr "Testar ändring %d:%s (%d ändringar kvar, ~%d test)\n"
+msgid "force"
+msgstr "tvinga"
+
+msgid "delete a given bookmark"
+msgstr "ta bort angivet bokmärke"
+
+msgid "rename a given bookmark"
+msgstr "döp om angivet bokmärke"
+
+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]"
+
msgid "track a line of development with movable markers"
msgstr "spåra viss utveckling med flyttbara markörer"
@@ -6506,11 +7074,13 @@
" bookmarks-utökningen måste vara aktiverad.\n"
" "
-msgid "a bookmark of this name does not exist"
-msgstr "ett bokmärke med det namnet existerar inte"
-
-msgid "a bookmark of the same name already exists"
-msgstr "ett bokmärke med det namnet existerar redan"
+#, python-format
+msgid "bookmark '%s' does not exist"
+msgstr "bokmärket '%s' existerar inte"
+
+#, python-format
+msgid "bookmark '%s' already exists (use -f to force)"
+msgstr "bokmärket '%s' existerar redan (använd -f för att tvinga)"
msgid "new bookmark name required"
msgstr "nytt bokmärkesnamn krävs"
@@ -6530,6 +7100,15 @@
msgid "no bookmarks set\n"
msgstr "inget bokmärke satt\n"
+msgid "set branch name even if it shadows an existing branch"
+msgstr "sätt grennamnet även om det döljer en existerande gren"
+
+msgid "reset branch name to parent branch name"
+msgstr "återställ grennamn till förälderns grennamn"
+
+msgid "[-fC] [NAME]"
+msgstr "[-fC] [NAMN]"
+
msgid "set or show the current branch name"
msgstr "sätt eller visa det aktuella grennamnet"
@@ -6549,9 +7128,8 @@
" Unless -f/--force is specified, branch will not let you set a\n"
" branch name that already exists, even if it's inactive."
msgstr ""
-" Om inte -f/--force är specificerad, kommer branch inte att tillåta\n"
-" dig att sätta ett grennamn som redan existerar, även om den är\n"
-" inaktiv."
+" Om inte -f/--force är angiven, kommer branch inte att tillåta dig att\n"
+" sätta ett grennamn som redan existerar, även om den är inaktiv."
msgid ""
" Use -C/--clean to reset the working directory branch to that of\n"
@@ -6569,19 +7147,42 @@
" 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"
-msgid ""
-"a branch of the same name already exists (use 'hg update' to switch to it)"
-msgstr ""
-"en gren med samma namn finns redan (kör 'hg update' för att byta till den)"
+msgid "a branch of the same name already exists"
+msgstr "ett grennamn med det namnet existerar redan"
+
+#. i18n: "it" refers to an existing branch
+msgid "use 'hg update' to switch to it"
+msgstr ""
#, python-format
msgid "marked working directory as branch %s\n"
msgstr "markerade arbetskatalogen som grenen %s\n"
+msgid "show only branches that have unmerged heads"
+msgstr "visa bara grenar som har icke-sammanfogade huvuden"
+
+msgid "show normal and closed branches"
+msgstr "visa normala och stängda grenar"
+
+msgid "[-ac]"
+msgstr "[-ac]"
+
msgid "list repository named branches"
msgstr "visa namngivna grenar i arkivet"
@@ -6618,6 +7219,27 @@
msgid " (inactive)"
msgstr " (inaktiv)"
+msgid "run even when the destination is unrelated"
+msgstr "kör även när destinationen är obesläktad"
+
+msgid "a changeset intended to be added to the destination"
+msgstr "en ändring avsedd att läggas till destinationen"
+
+msgid "a specific branch you would like to bundle"
+msgstr "en specifik gren du vill bunta"
+
+msgid "a base changeset assumed to be available at the destination"
+msgstr "en basändring som antas är tillgängliga i destinationen"
+
+msgid "bundle all changesets in the repository"
+msgstr "bunta alla ändringar i arkivet"
+
+msgid "bundle compression type to use"
+msgstr "typ av buntkompression att använda"
+
+msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
+msgstr "[-f] [-t TYP] [-a] [-r REV]... [--base REV]... FIL [DEST]"
+
msgid "create a changegroup file"
msgstr "skapa en ändringsgruppsfil"
@@ -6676,7 +7298,19 @@
msgstr "--base är inkompatibel med specificering av destination"
msgid "unknown bundle type specified with --type"
-msgstr "okänd bunttyp specificerad med --type"
+msgstr "okänd bunttyp angiven med --type"
+
+msgid "print output to file with formatted name"
+msgstr "skriv utmatning till fil med formatterat namn"
+
+msgid "print the given revision"
+msgstr "visa den angivna revisionen"
+
+msgid "apply any matching decode filter"
+msgstr "applicera valfritt överrensstämmande avkodningsfilter"
+
+msgid "[OPTION]... FILE..."
+msgstr "[FLAGGA]... FIL..."
msgid "output the current or given revision of files"
msgstr "visa den aktuella eller angivna revisionen för filer"
@@ -6708,6 +7342,21 @@
" :``%d``: katalognamn på den visade filen, eller '.' om i arkivroten\n"
" :``%p``: rotrelativ sökvägsnamn för den visade filen"
+msgid "the clone will include an empty working copy (only a repository)"
+msgstr "klonen kommer att inkludera en tom arbetskopia (bara ett arkiv)"
+
+msgid "revision, tag or branch to check out"
+msgstr "revision, märke eller gren att hämta ut"
+
+msgid "include the specified changeset"
+msgstr "inkludera den angivna ändringen"
+
+msgid "clone only the specified branch"
+msgstr "klona bara den angivna grenen"
+
+msgid "[OPTION]... SOURCE [DEST]"
+msgstr "[FLAGGA]... KÄLLA [DEST]"
+
msgid "make a copy of an existing repository"
msgstr "gör en kopia av ett existerande arkiv"
@@ -6736,8 +7385,8 @@
" ``.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 ""
-" Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
-" ingen ``.hg/hgrc`` och arbetskatalog skapas på fjärrsidan.\n"
+" 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 ""
@@ -6750,9 +7399,9 @@
" No subsequent changesets (including subsequent tags) will be present\n"
" in the destination."
msgstr ""
-" En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n"
-" genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n"
-" Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n"
+" 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"
@@ -6837,6 +7486,12 @@
msgid "cannot specify both --noupdate and --updaterev"
msgstr "kan inte ange både --noupdate och --updaterev"
+msgid "mark new/missing files as added/removed before committing"
+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 "commit the specified files or all outstanding changes"
msgstr "arkivera de angivna filerna eller alla ändringar"
@@ -6884,6 +7539,10 @@
msgid "can only close branch heads"
msgstr "kan bara stänga grenhuvuden"
+#, 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"
@@ -6898,6 +7557,15 @@
msgid "committed changeset %d:%s\n"
msgstr "arkiverade ändringen %d:%s\n"
+msgid "record a copy that has already occurred"
+msgstr "lagra en kopiering som redan har inträffat"
+
+msgid "forcibly copy over an existing managed file"
+msgstr "tvinga kopiering över en eixsterande hanterad fil"
+
+msgid "[OPTION]... [SOURCE]... DEST"
+msgstr "[FLAGGA]... [KÄLLA]... DEST"
+
msgid "mark files as copied for the next commit"
msgstr "markera filer som kopierade vid nästa arkivering"
@@ -6933,13 +7601,33 @@
" Returnerar 0 om kommandot lyckades, 1 om fel uppstod.\n"
" "
+msgid "[INDEX] REV1 REV2"
+msgstr "[INDEX] REV1 REV2"
+
msgid "find the ancestor revision of two revisions in a given index"
msgstr "hitta föregående revision av två revisioner i ett givet index"
msgid "either two or three arguments required"
msgstr "endera två eller tre argument krävs"
-msgid "builds a repo with a given dag from scratch in the current empty repo"
+msgid "add single file mergeable changes"
+msgstr ""
+
+msgid "add single file all revs overwrite"
+msgstr ""
+
+msgid "add new file at each rev"
+msgstr ""
+
+msgid "[OPTION]... [TEXT]"
+msgstr "[FLAGGA]... [TEXT]"
+
+msgid "builds a repo with a given DAG from scratch in the current empty repo"
+msgstr ""
+
+msgid ""
+" The description of the DAG is read from stdin if not given on the\n"
+" command line."
msgstr ""
msgid " Elements:"
@@ -6957,8 +7645,6 @@
" - \"/p2\" is a merge of the preceding node and p2\n"
" - \":tag\" defines a local tag for the preceding node\n"
" - \"@branch\" sets the named branch for subsequent nodes\n"
-" - \"!command\" runs the command using your shell\n"
-" - \"!!my command\\n\" is like \"!\", but to the end of the line\n"
" - \"#...\\n\" is a comment up to the end of the line"
msgstr ""
@@ -6978,36 +7664,25 @@
msgid ""
" All string valued-elements are either strictly alphanumeric, or must\n"
-" be enclosed in double quotes (\"...\"), with \"\\\" as escape character."
-msgstr ""
-
-msgid ""
-" Note that the --overwritten-file and --appended-file options imply the\n"
-" use of \"HGMERGE=internal:local\" during DAG buildup.\n"
-" "
-msgstr ""
-
-msgid "need at least one of -m, -a, -o, -n"
-msgstr ""
+" be enclosed in double quotes (\"...\"), with \"\\\" as escape "
+"character.\n"
+" "
+msgstr ""
+
+msgid "reading DAG from stdin\n"
+msgstr "läser DAG från stdin\n"
msgid "repository is not empty"
msgstr "arkivet är inte tomt"
-#, python-format
-msgid "%s command %s"
-msgstr ""
-
-msgid "list all available commands and options"
-msgstr "visa alla tillgängliga kommandon och alternativ"
-
-msgid "returns the completion list associated with the given command"
-msgstr "returnerar kompletteringslistan associerad med det givna kommandot"
-
-msgid "show information detected about current filesystem"
-msgstr "visa information om det aktuella filsystemet"
-
-msgid "rebuild the dirstate as it would look like for the given revision"
-msgstr "bygg om katalogstatusen som den skulle se ut för den givna revisionen"
+msgid "building"
+msgstr "bygger"
+
+msgid "show all details"
+msgstr "visa alla detaljer"
+
+msgid "lists the contents of a bundle"
+msgstr "visa innehållet i en bunt"
msgid "validate the correctness of the current dirstate"
msgstr "validera korrektheten för den nuvarande katalogstatusen"
@@ -7031,69 +7706,35 @@
msgid ".hg/dirstate inconsistent with current parent's manifest"
msgstr ".hg/dirstate överrensstämmer inte med nuvarande förälders manifest"
-msgid "show combined config settings from all hgrc files"
-msgstr "visa kombinerade konfigurationsalternativ från alla hgrc-filer"
-
-msgid " With no arguments, print names and values of all config items."
-msgstr " Utan argument, skrivs namn och värden för alla alternativ."
-
-msgid ""
-" With one argument of the form section.name, print just the value\n"
-" of that config item."
-msgstr ""
-" Med ett argument i formen sektion.namn, visas bara värdet för det\n"
-" konfigurationsalternativet."
-
-msgid ""
-" With multiple arguments, print names and values of all config\n"
-" items with matching section names."
-msgstr ""
-" Med flera argument, visas namn och värden för alla alternativ med\n"
-" överrensstämmande sektionsnamn."
-
-msgid ""
-" With --debug, the source (filename and line number) is printed\n"
-" for each config item."
-msgstr ""
-" Med --debug, visas källan (filnamn och radnummer) för varje\n"
-" alternativ."
-
-#, python-format
-msgid "read config from: %s\n"
-msgstr "läs konfiguration från: %s\n"
-
-msgid "only one config item permitted"
-msgstr "bara ett konfigurationsalternativ tillåts"
-
-msgid "access the pushkey key/value protocol"
-msgstr ""
-
-msgid " With two args, list the keys in the given namespace."
-msgstr ""
-
-msgid ""
-" With five args, set a key to new if it currently is set to old.\n"
-" Reports success or failure.\n"
-" "
-msgstr ""
-
-msgid "parse and apply a revision specification"
-msgstr ""
-
-msgid "manually set the parents of the current working directory"
-msgstr ""
-
-msgid ""
-" This is useful for writing repository conversion tools, but should\n"
-" be used with care."
-msgstr ""
-
-msgid "show the contents of the current dirstate"
-msgstr ""
-
-#, python-format
-msgid "copy: %s -> %s\n"
-msgstr ""
+msgid "[COMMAND]"
+msgstr "[KOMMANDO]"
+
+msgid "list all available commands and options"
+msgstr "visa alla tillgängliga kommandon och alternativ"
+
+msgid "show the command options"
+msgstr "visa kommandoflaggor"
+
+msgid "[-o] CMD"
+msgstr "[-o] KMD"
+
+msgid "returns the completion list associated with the given command"
+msgstr "returnerar kompletteringslistan associerad med det givna kommandot"
+
+msgid "use tags as labels"
+msgstr ""
+
+msgid "annotate with branch names"
+msgstr ""
+
+msgid "use dots for runs"
+msgstr ""
+
+msgid "separate elements by spaces"
+msgstr ""
+
+msgid "[OPTION]... [FILE [REV]...]"
+msgstr "[FLAGGA]... [FIL] [REV]...]"
msgid "format the changelog or an index DAG as a concise textual description"
msgstr ""
@@ -7111,6 +7752,15 @@
msgid "need repo for changelog dag"
msgstr ""
+msgid "open changelog"
+msgstr "öppna ändringslogg"
+
+msgid "open manifest"
+msgstr "öppna manifest"
+
+msgid "-c|-m|FILE REV"
+msgstr "-c|-m|FIL REV"
+
msgid "dump the contents of a data file revision"
msgstr ""
@@ -7118,15 +7768,67 @@
msgid "invalid revision identifier %s"
msgstr ""
+msgid "try extended date formats"
+msgstr "pröva utökade datumformat"
+
+msgid "[-e] DATE [RANGE]"
+msgstr "[-e] DATUM [SPANN]"
+
msgid "parse and display a date"
msgstr ""
+msgid "use old-style discovery"
+msgstr ""
+
+msgid "use old-style discovery with non-heads included"
+msgstr ""
+
+msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]"
+msgstr ""
+
+msgid "runs the changeset discovery protocol in isolation"
+msgstr ""
+
+msgid "parse and apply a fileset specification"
+msgstr ""
+
+msgid "[PATH]"
+msgstr "[SÖKVÄG]"
+
+msgid "show information detected about current filesystem"
+msgstr "visa information om det aktuella filsystemet"
+
+msgid "id of head node"
+msgstr ""
+
+msgid "id of common node"
+msgstr ""
+
+msgid "REPO FILE [-H|-C ID]..."
+msgstr ""
+
+msgid "retrieves a bundle from a repo"
+msgstr ""
+
+msgid ""
+" Every ID must be a full-length hex node id string. Saves the bundle to "
+"the\n"
+" given file.\n"
+" "
+msgstr ""
+
msgid "display the combined ignore pattern"
msgstr "visa det sammansatta ignoreringsmönstret"
msgid "no ignore patterns found"
msgstr "inget ignoreringsmönster hittades"
+msgid "revlog format"
+msgstr ""
+
+msgid "[-f FORMAT] -c|-m|FILE"
+msgstr ""
+
msgid "dump the contents of an index file"
msgstr ""
@@ -7163,28 +7865,6 @@
msgid " (templates seem to have been installed incorrectly)\n"
msgstr ""
-msgid "Checking patch...\n"
-msgstr ""
-
-msgid " patch call failed:\n"
-msgstr ""
-
-msgid " unexpected patch output!\n"
-msgstr ""
-
-msgid " patch test failed!\n"
-msgstr ""
-
-msgid ""
-" (Current patch tool may be incompatible with patch, or misconfigured. "
-"Please check your configuration file)\n"
-msgstr ""
-
-msgid ""
-" Internal patcher failure, please report this error to http://mercurial."
-"selenic.com/wiki/BugTracker\n"
-msgstr ""
-
msgid "Checking commit editor...\n"
msgstr ""
@@ -7211,6 +7891,49 @@
msgid "%s problems detected, please check your install!\n"
msgstr ""
+msgid "REPO ID..."
+msgstr ""
+
+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 "
+"and 1s\n"
+" indicating unknown/known.\n"
+" "
+msgstr ""
+
+msgid "REPO NAMESPACE [KEY OLD NEW]"
+msgstr ""
+
+msgid "access the pushkey key/value protocol"
+msgstr ""
+
+msgid " With two args, list the keys in the given namespace."
+msgstr ""
+
+msgid ""
+" With five args, set a key to new if it currently is set to old.\n"
+" Reports success or failure.\n"
+" "
+msgstr ""
+
+msgid "revision to rebuild to"
+msgstr "revision att bygga om till"
+
+msgid "[-r REV] [REV]"
+msgstr "[-r REV] [REV]"
+
+msgid "rebuild the dirstate as it would look like for the given revision"
+msgstr "bygg om katalogstatusen som den skulle se ut för den givna revisionen"
+
+msgid "revision to debug"
+msgstr "revision att debugga"
+
+msgid "[-r REV] FILE"
+msgstr "[-r REV] FIL"
+
msgid "dump rename information"
msgstr ""
@@ -7222,14 +7945,62 @@
msgid "%s not renamed\n"
msgstr ""
+msgid "dump index data"
+msgstr ""
+
+msgid "-c|-m|FILE"
+msgstr ""
+
+msgid "show data and statistics about a revlog"
+msgstr ""
+
+msgid "parse and apply a revision specification"
+msgstr ""
+
+msgid "REV1 [REV2]"
+msgstr "REV1 [REV2]"
+
+msgid "manually set the parents of the current working directory"
+msgstr ""
+
+msgid ""
+" This is useful for writing repository conversion tools, but should\n"
+" be used with care."
+msgstr ""
+
+msgid "do not display the saved mtime"
+msgstr "visa inte sparad mtime"
+
+msgid "sort by saved mtime"
+msgstr "sortera efter sparad mtime"
+
+msgid "[OPTION]..."
+msgstr "[FLAGGA]..."
+
+msgid "show the contents of the current dirstate"
+msgstr ""
+
+#, python-format
+msgid "copy: %s -> %s\n"
+msgstr "kopia: %s -> %s\n"
+
+msgid "revision to check"
+msgstr "revision att kontrollera"
+
msgid "show how files match on given patterns"
msgstr ""
+msgid "REPO [OPTIONS]... [ONE [TWO]]"
+msgstr "ARKIV [FLAGGA]... [ETT [TVÅ]]"
+
+msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
+msgstr "[FLAGGA]... ([-c REV] | [-r REV1 [-r REV2]]) [FIL]..."
+
msgid "diff repository (or selected files)"
msgstr "visa skillnader i arkivet (eller på valda filer)"
msgid " Show differences between revisions for the specified files."
-msgstr " Visa skillnader mellan revisioner för specificerade filer."
+msgstr " Visa skillnader mellan revisioner för angivna filer."
msgid " Differences between files are shown using the unified diff format."
msgstr " Skillnaderna mellan filerna visas i unified diff-format."
@@ -7268,6 +8039,15 @@
" 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 "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] 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"
@@ -7352,14 +8132,14 @@
msgstr ""
msgid "forget the specified files on the next commit"
-msgstr "glöm de specificerade filerna vid nästa arkivering"
+msgstr "glöm de angivna filerna vid nästa arkivering"
msgid ""
" Mark the specified files so they will no longer be tracked\n"
" after the next commit."
msgstr ""
-" Märk de specificerade filerna så att de inte längre kommer att spåras\n"
-" efter nästa arkivering."
+" Märk de angivna filerna så att de inte längre kommer att spåras efter\n"
+" nästa arkivering."
msgid ""
" This only removes files from the current branch, not from the\n"
@@ -7379,6 +8159,35 @@
msgid "not removing %s: file is already untracked\n"
msgstr ""
+#, python-format
+msgid "removing %s\n"
+msgstr "tar bort %s\n"
+
+msgid "end fields with NUL"
+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"
+
+msgid "print only filenames and revisions that match"
+msgstr "visa bara filnamn och revisioner som matchar"
+
+msgid "print matching line numbers"
+msgstr "visa matchande radnummer"
+
+msgid "only search files changed within revision range"
+msgstr "sök filer enbart inom ett givet revisionsområde"
+
+msgid "[OPTION]... PATTERN [FILE]..."
+msgstr "[FLAGGA]... MÖNSTER [FIL]..."
+
msgid "search for a pattern in specified files and revisions"
msgstr "sök efter ett mänster i specificerade filer och revisioner"
@@ -7419,6 +8228,24 @@
msgid "grep: invalid match pattern: %s\n"
msgstr "grep: ogiltigt träffmönster: %s\n"
+msgid "STARTREV"
+msgstr "STARTREV"
+
+msgid "show only heads which are descendants of STARTREV"
+msgstr "visa bara huvuden som är ättlingar till STARTREV"
+
+msgid "show topological heads only"
+msgstr "visa bara topologiska huvuden"
+
+msgid "show active branchheads only (DEPRECATED)"
+msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)"
+
+msgid "show normal and closed branch heads"
+msgstr "visa normala och stängda grenhuvuden"
+
+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"
@@ -7480,6 +8307,15 @@
msgid " (started at %s)"
msgstr " (började som %s)"
+msgid "show only help for extensions"
+msgstr "visa bara hjälp för utökningar"
+
+msgid "show only help for commands"
+msgstr "visa bara hjälp för kommandon"
+
+msgid "[-ec] [TOPIC]"
+msgstr "[-ec] [ÄMNE]"
+
msgid "show help for a given topic or a help overview"
msgstr "visa hjälp för ett givet ämne eller en hjälpöversikt"
@@ -7512,6 +8348,10 @@
"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"
@@ -7561,9 +8401,21 @@
msgid "options:\n"
msgstr "flaggor:\n"
+#, 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"
+#, python-format
+msgid ""
+"\n"
+"use \"hg help -c %s\" to see help for the %s command\n"
+msgstr ""
+"\n"
+"använd \"hg help -c %s\" för att visa hjälp för kommandot %s\n"
+
msgid "no help text available"
msgstr "ingen hjälptext tillgänglig"
@@ -7608,11 +8460,43 @@
"\n"
"ytterligare hjälpämnen:"
+msgid "identify the specified revision"
+msgstr "identifiera den angivna revisionen"
+
+msgid "show local revision number"
+msgstr "visa lokala revisionsnummer"
+
+msgid "show global revision id"
+msgstr "visa globala revisions-id"
+
+msgid "show branch"
+msgstr "visa grenar"
+
+msgid "show tags"
+msgstr "visa märken"
+
+msgid "show bookmarks"
+msgstr "visa bokmärken"
+
+msgid "[-nibtB] [-r REV] [SOURCE]"
+msgstr "[-nibtB] [-r REV] [KÄLLA]"
+
msgid "identify the working copy or specified revision"
msgstr "identifiera arbetskopian eller angivna revisioner"
msgid ""
-" With no revision, print a summary of the current state of the\n"
+" Print a summary identifying the repository state at REV using one or\n"
+" two parent hash identifiers, followed by a \"+\" if the working\n"
+" directory has uncommitted changes, the branch name (if not default),\n"
+" a list of tags, and a list of bookmarks."
+msgstr ""
+" Visa en sammanfattning som identifierar arkivstatusen vid REV med en\n"
+" eller två föräldrars hash-identifierare, följt av ett \"+\" om det\n"
+" finns oarkiverade ändringar i arbetskatalogen, grennamnet (om inte\n"
+" default), en märkeslista, och en bokmärkeslista."
+
+msgid ""
+" When REV is not given, print a summary of the current state of the\n"
" repository."
msgstr ""
" Utan någon revision, visas en sammanfattning av den aktuella\n"
@@ -7625,19 +8509,37 @@
" 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 ""
-" This summary identifies the repository state using one or two\n"
-" parent hash identifiers, followed by a \"+\" if there are\n"
-" uncommitted changes in the working directory, a list of tags for\n"
-" this revision and a branch name for non-default branches."
-msgstr ""
-" Sammanfattningen identifierar arkivstatusen med en eller två\n"
-" föräldrars hash-identifierare, följt av ett \"+\" om det finns\n"
-" oarkiverade ändringar i arbetskatalogen, en lista av märken för den\n"
-" här revisionen och ett grennamn för grenar som inte är default."
-
-msgid "can't query remote revision number, branch, tags, or bookmarks"
-msgstr "kan inte efterfråga revisionsnummer, gren, märken eller bokmärken"
+msgid "can't query remote revision number, branch, or tags"
+msgstr "kan inte efterfråga revisionsnummer, gren, eller märken"
+
+msgid ""
+"directory strip option for patch. This has the same meaning as the "
+"corresponding patch option"
+msgstr ""
+
+msgid "PATH"
+msgstr "SÖKVÄG"
+
+msgid "base path (DEPRECATED)"
+msgstr "grundsökväg (FÖRÅLDRAD)"
+
+msgid "skip check for outstanding uncommitted changes"
+msgstr "hoppa över kontroll av oarkiverade ändringar"
+
+msgid "don't commit, just update the working directory"
+msgstr "arkivera inte, bara uppdatera arbetskatalogen"
+
+msgid "apply patch without touching the working directory"
+msgstr "applicera patch utan att röra arbetskatalogen"
+
+msgid "apply patch to the nodes from which it was generated"
+msgstr ""
+
+msgid "use any branch information in patch (implied by --exact)"
+msgstr ""
+
+msgid "[OPTION]... PATCH..."
+msgstr "[FLAGGA]... PATCH..."
msgid "import an ordered set of patches"
msgstr ""
@@ -7677,6 +8579,13 @@
msgstr ""
msgid ""
+" Use --bypass to apply and commit patches directly to the\n"
+" repository, not touching the working directory. Without --exact,\n"
+" patches will be applied on top of the working directory parent\n"
+" revision."
+msgstr ""
+
+msgid ""
" With -s/--similarity, hg will attempt to discover renames and\n"
" copies in the patch in the same way as 'addremove'."
msgstr ""
@@ -7687,15 +8596,21 @@
" See :hg:`help dates` for a list of formats valid for -d/--date."
msgstr ""
+msgid "cannot use --no-commit with --bypass"
+msgstr "kan inte använda --no-commit med --bypass"
+
+msgid "cannot use --similarity with --bypass"
+msgstr "kan inte använda --similarity med --bypass"
+
+msgid "patch is damaged or loses information"
+msgstr "patchen är skadad eller tappar information"
+
msgid "to working directory"
msgstr "till arbetskatalog"
msgid "not a Mercurial patch"
msgstr "inte en Mercurial-patch"
-msgid "patch is damaged or loses information"
-msgstr "patchen är skadad eller tappar information"
-
msgid "applying patch from stdin\n"
msgstr ""
@@ -7706,6 +8621,27 @@
msgid "no diffs found"
msgstr ""
+msgid "run even if remote repository is unrelated"
+msgstr "kör även om fjärrarkivet är obesläktat"
+
+msgid "show newest record first"
+msgstr "visa nyaste saken först"
+
+msgid "file to store the bundles into"
+msgstr "fil att lagra buntarna i"
+
+msgid "a remote changeset intended to be added"
+msgstr "en fjärrändring som avses att läggas till"
+
+msgid "compare bookmarks"
+msgstr "jämför bokmärken"
+
+msgid "a specific branch you would like to pull"
+msgstr "en specifik gren som du vill dra"
+
+msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
+msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAMN] [KÄLLA]"
+
msgid "show new changesets found in source"
msgstr "visa nya ändringar som hittas i källan"
@@ -7741,6 +8677,9 @@
msgid "remote doesn't support bookmarks\n"
msgstr "fjärrserver stödjer inte bokmärken\n"
+msgid "[-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-e KMD] [--remotecmd KMD] [DEST]"
+
msgid "create a new repository in the given directory"
msgstr "skapa ett nytt arkiv i den angivna katalogen"
@@ -7761,6 +8700,18 @@
" Det är möjligt att specificera en URL med ``ssh://`` som destination.\n"
" Se :hg:`help urls` för mer informatio"
+msgid "search the repository as it is in REV"
+msgstr "sök igenom arkivet som det är vid REV"
+
+msgid "end filenames with NUL, for use with xargs"
+msgstr "filnamn slutar med NUL, för användning med xargs"
+
+msgid "print complete paths from the filesystem root"
+msgstr "visa kompletta sökvägar från filsystemsroten"
+
+msgid "[OPTION]... [PATTERN]..."
+msgstr "[FLAGGA]... [MÖNSTER]..."
+
msgid "locate files matching specific patterns"
msgstr "hitta filer som matchar givna mönster"
@@ -7798,6 +8749,42 @@
" 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"
@@ -7856,6 +8843,15 @@
" 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 "revision to display"
+msgstr "revision att visa"
+
+msgid "list files from all revisions"
+msgstr "visa filer från alla revisioner"
+
+msgid "[-r REV]"
+msgstr "[-r REV]"
+
msgid "output the current or given revision of the project manifest"
msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet"
@@ -7875,6 +8871,28 @@
" Med -v visas filtillstånd, symlänkar och exekverbarhetsbitar.\n"
" Med --debug visas filrevisionhashar."
+msgid ""
+" If option --all is specified, the list of all files from all revisions\n"
+" is printed. This includes deleted and renamed files."
+msgstr ""
+" Om flaggan --all är angiven, visas en lista med alla filer från alla\n"
+" revisioner. Detta inlkuderar borttagna och omdöpta filer."
+
+msgid "can't specify a revision with --all"
+msgstr "du kan inte ange en revision med --all"
+
+msgid "force a merge with outstanding changes"
+msgstr "tvinga en sammanfogning med utestående ändringar"
+
+msgid "revision to merge"
+msgstr "revision att sammanfoga"
+
+msgid "review revisions to merge (no merge is performed)"
+msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)"
+
+msgid "[-P] [-f] [[-r] REV]"
+msgstr "[-P] [-f] [[-r] REV]"
+
msgid "merge working directory with another revision"
msgstr "sammanfoga arbetskatalogen med en annan revision"
@@ -7899,11 +8917,12 @@
msgid ""
" ``--tool`` can be used to specify the merge tool used for file\n"
" merges. It overrides the HGMERGE environment variable and your\n"
-" configuration files."
+" configuration files. See :hg:`help merge-tools` for options."
msgstr ""
" ``--tool`` kan användas för att ange sammanfogningsverktyg att\n"
" använda för filsammanfogningar. Det har högre prioritet än\n"
-" miljövariabeln HGMERGE och dina konfigurationsfiler."
+" miljövariabeln HGMERGE och dina konfigurationsfiler. Se\n"
+" :hg:`help merge-tools` för flaggor."
msgid ""
" If no revision is specified, the working directory's parent is a\n"
@@ -7936,20 +8955,18 @@
" "
#, python-format
-msgid ""
-"branch '%s' has %d heads - please merge with an explicit rev\n"
-"(run 'hg heads .' to see heads)"
-msgstr ""
-"grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n"
-"(kör 'hg heads .' för att se huvuden)"
-
-#, python-format
-msgid ""
-"branch '%s' has one head - please merge with an explicit rev\n"
-"(run 'hg heads' to see all heads)"
-msgstr ""
-"grenen '%s' har ett huvud - sammanfoga med en specifik rev\n"
-"(kör 'hg heads .' för att se alla huvuden)"
+msgid "branch '%s' has %d heads - please merge with an explicit rev"
+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"
+
+#, 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 "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"
@@ -7958,12 +8975,20 @@
msgid "%s - use \"hg update\" instead"
msgstr "%s - använd \"hg update\" istället"
-msgid ""
-"working dir not at a head rev - use \"hg update\" or merge with an explicit "
-"rev"
-msgstr ""
-"arbetskatalogen är inte vid huvudrevisionen - använd \"hg update\" eller "
-"sammanfoga med en speficik rev"
+msgid "working directory not at a head revision"
+msgstr "arbetskatalogen är inte vid en huvudrevision"
+
+msgid "use 'hg update' or merge with an explicit revision"
+msgstr "använd 'hg update' eller sammanfoga med en speficik rev"
+
+msgid "a changeset intended to be included in the destination"
+msgstr "en ändring avsedd att inkluderas i destinationen"
+
+msgid "a specific branch you would like to push"
+msgstr "en specifik gren som du vill trycka"
+
+msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
+msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
msgid "show changesets not found in the destination"
msgstr "visa ändringar som inte hittas i destinationen"
@@ -7987,6 +9012,12 @@
" Returnerar 0 om det finns utgående ändringar, 1 annars.\n"
" "
+msgid "show parents of the specified revision"
+msgstr "visa föräldrar för den angivna revisionen"
+
+msgid "[-r REV] [FILE]"
+msgstr "[-r REV] [FIL]"
+
msgid "show the parents of the working directory or revision"
msgstr "visa föräldrar till arbetskatalogen eller revision"
@@ -8009,6 +9040,9 @@
msgid "'%s' not found in manifest!"
msgstr "'%s' hittades inte i manifestet!"
+msgid "[NAME]"
+msgstr "[NAMN]"
+
msgid "show aliases for remote repositories"
msgstr "visa aliases för fjärrarkiv"
@@ -8020,6 +9054,13 @@
" definitionen för alla tillgängliga namn."
msgid ""
+" Option -q/--quiet suppresses all output when searching for NAME\n"
+" and shows only the path names when listing all definitions."
+msgstr ""
+" Flaggan -q/--quiet stänger av all utmatning vid sökning efter NAMN\n"
+" och visar bara sökvägarna när alla definitioner listas."
+
+msgid ""
" Path names are defined in the [paths] section of your\n"
" configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n"
" repository, ``.hg/hgrc`` is used, too."
@@ -8047,16 +9088,38 @@
msgid "not found!\n"
msgstr "hittades inte!\n"
-msgid "not updating, since new heads added\n"
-msgstr "uppdaterar inte, eftersom nya huvuden läggs till\n"
+#, python-format
+msgid "not updating: %s\n"
+msgstr "uppdaterar inte: %s\n"
msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n"
msgstr ""
"(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n"
+msgid "(run 'hg heads .' to see heads, 'hg merge' to merge)\n"
+msgstr "(kör 'hg heads' för att se huvuden, 'hg merge' för att sammanfoga)\n"
+
+msgid "(run 'hg heads' to see heads)\n"
+msgstr "(kör 'hg heads' för att se huvuden)\n"
+
msgid "(run 'hg update' to get a working copy)\n"
msgstr "(kör 'hg update' för att få en arbetskopia)\n"
+msgid "update to new branch head if changesets were pulled"
+msgstr "uppdatera till nytt grenhuvud om ändringar drogs"
+
+msgid "run even when remote repository is unrelated"
+msgstr "kör även när fjärrarkivet är orelaterat"
+
+msgid "BOOKMARK"
+msgstr "BOKMÄRKE"
+
+msgid "bookmark to pull"
+msgstr "bokmärke att dra"
+
+msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
+msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]"
+
msgid "pull changes from the specified source"
msgstr "dra ändringar från den specificerade källan"
@@ -8115,6 +9178,18 @@
msgid "importing bookmark %s\n"
msgstr "importerar bokmärket %s\n"
+msgid "force push"
+msgstr "tvinga tryckning"
+
+msgid "bookmark to push"
+msgstr "bokmärke att trycka"
+
+msgid "allow pushing a new branch"
+msgstr "tillåt att trycka en ny gren"
+
+msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
+msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]"
+
msgid "push changes to the specified destination"
msgstr "tryck ändringar till den specificerade destinationen"
@@ -8222,6 +9297,12 @@
" verifiering misslyckades.\n"
" "
+msgid "record delete for missing files"
+msgstr "markera saknade filer för radering"
+
+msgid "remove (and delete) file even if added or modified"
+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"
@@ -8267,6 +9348,13 @@
" -Af R R R R"
msgid ""
+" Note that remove never deletes files in Added [A] state from the\n"
+" working directory, not even if option --force is specified."
+msgstr ""
+" Notera att remove aldrig tar bort filer som är Adderade [A] från\n"
+" arbetskatalogen, inte ens om --force är angivet."
+
+msgid ""
" This command schedules the files to be removed at the next commit.\n"
" To undo a remove before that, see :hg:`revert`."
msgstr ""
@@ -8298,6 +9386,12 @@
"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"
+
+msgid "[OPTION]... SOURCE... DEST"
+msgstr "[FLAGGA]... KÄLLA... DEST"
+
msgid "rename files; equivalent of copy + remove"
msgstr "döp om filer; likvärdig med kopiering + radering"
@@ -8318,6 +9412,21 @@
" namnbyte innan det, se :hg:`revert`.\n"
" "
+msgid "select all unresolved files"
+msgstr "välj alla olösta filer"
+
+msgid "list state of files needing merge"
+msgstr "visa status för filer som behöver sammanfogas"
+
+msgid "mark files as resolved"
+msgstr "markera filer som lösta"
+
+msgid "mark files as unresolved"
+msgstr "markera filer som olösta"
+
+msgid "hide status prefix"
+msgstr "göm statusprefix"
+
msgid "redo merges or set/view the merge status of files"
msgstr ""
@@ -8386,75 +9495,58 @@
"inga filer eller kataloger specificerade; använd --all för att "
"återsammanfoga alla filer"
-msgid "restore individual files or directories to an earlier state"
-msgstr "återställ filer eller kataloger till ett tidigare tillstånd"
+msgid "revert all changes when no arguments given"
+msgstr "återställ alla ändringar när inga argument ges"
+
+msgid "tipmost revision matching date"
+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::\n"
-" This command is most likely not what you are looking for.\n"
-" Revert will partially overwrite content in the working\n"
-" directory without changing the working directory parents. Use\n"
-" :hg:`update -r rev` to check out earlier revisions, or\n"
-" :hg:`update --clean .` to undo a merge which has added another\n"
-" parent."
+" To check out earlier revisions, you should use :hg:`update REV`.\n"
+" To cancel a merge (and lose your changes), use :hg:`update --clean .`."
msgstr ""
" .. note::\n"
-" Det här kommandot är troligtvis inte det du letar efter. Revert\n"
-" kommer att delvis skriva över innehåll i arbetskatalogen utan att\n"
-" ändra arbetskatalogens föräldrar. Använd :hg:`update -r rev` för att\n"
-" hämta ut tidigare revisioner, eller :hg:`update --clean .` för att\n"
-" ångra en sammanfogning som har lagt till fler föräldrar."
-
-msgid ""
-" With no revision specified, revert the named files or directories\n"
-" to the contents they had in the parent of the working directory.\n"
-" This restores the contents of the affected files to an unmodified\n"
-" state and unschedules adds, removes, copies, and renames. If the\n"
-" working directory has two parents, you must explicitly specify a\n"
-" revision."
+" För att hämta ut tidigare revisioner, använd :hg:`update REV`.\n"
+" 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"
+" to the state they had in the first parent of the working directory.\n"
+" This restores the contents of files to an unmodified\n"
+" state and unschedules adds, removes, copies, and renames."
msgstr ""
" Om ingen revision anges, så återställs de givna filerna eller\n"
-" katalogerna till innehållet de hade i arbetskatalogens förälder. Det\n"
+" katalogerna till läget de hade i arbetskatalogens första förälder. Det\n"
" sätter filer i ett omodifierad läge och avbeställer adderingar,\n"
-" raderingar, kopior och namnbyten. Om arbetskatalogen har två\n"
-" föräldrar, så måste du ange en revision."
-
-msgid ""
-" Using the -r/--rev option, revert the given files or directories\n"
-" to their contents as of a specific revision. This can be helpful\n"
-" to \"roll back\" some or all of an earlier change. See :hg:`help\n"
-" dates` for a list of formats valid for -d/--date."
-msgstr ""
-" Med flaggan -r/--rev, återställs de givna filerna eller katalogerna\n"
-" till innehållet i den specifika revisionen. Detta kan användas för\n"
-" att ångra delar av eller hela tidigare ändringar. Se :hg:`help dates`\n"
-" för en lista med giltiga format för -d/--date."
-
-msgid ""
-" Revert modifies the working directory. It does not commit any\n"
-" changes, or change the parent of the working directory. If you\n"
-" revert to a revision other than the parent of the working\n"
-" directory, the reverted files will thus appear modified\n"
-" afterwards."
-msgstr ""
-" Revert modifierar arbetskatalogen. Det arkiverar inga ändringar, och\n"
-" ändrar inte arbetskatalogens förälder. Om du återgår till en revision\n"
-" som inte är arbetskatalogens förälder, kommer den återställda filen\n"
-" att visas som modifierad."
-
-msgid ""
-" If a file has been deleted, it is restored. If the executable mode\n"
-" of a file was changed, it is reset."
-msgstr ""
-" Om en fil har raderas, så återställs den. Om läget för exekverbarhet\n"
-" har ändrats för en fil, så återställs det."
-
-msgid ""
-" If names are given, all files matching the names are reverted.\n"
-" If no arguments are given, no files are reverted."
-msgstr ""
-" Om namn anges, så återställs alla filer med överrensstämmande namn.\n"
-" Om inga argument ges, återställs inga filer."
+" raderingar, kopior och namnbyten."
+
+msgid ""
+" Using the -r/--rev or -d/--date options, revert the given files or\n"
+" directories to their states as of a specific revision. Because\n"
+" revert does not change the working directory parents, this will\n"
+" cause these files to appear modified. This can be helpful to \"back\n"
+" out\" some or all of an earlier change. See :hg:`backout` for a\n"
+" related method."
+msgstr ""
+" Med flaggan -r/--rev eller -d/--date, återställs de givna filerna eller\n"
+" katalogerna till läget i den specifika revisionen. Eftersom revert\n"
+" inte ändrar arbetskatalogens föräldrar, kommer dessa filer att visas\n"
+" som modifierade. Detta kan användas för att ångra delar av eller hela\n"
+" tidigare ändringar. Se :hg:`backout` för en relaterad metod."
msgid ""
" Modified files are saved with a .orig suffix before reverting.\n"
@@ -8466,13 +9558,11 @@
msgid "you can't specify a revision and a date"
msgstr "du kan inte specificera en revision och ett datum"
-msgid "uncommitted merge - use \"hg update\", see \"hg help revert\""
-msgstr "oarkiverad sammanfogning - använd \"hg update\", se \"hg help revert\""
-
-msgid "no files or directories specified; use --all to revert the whole repo"
-msgstr ""
-"inga filer eller kataloger angivna; använd --all för att återställa hela "
-"arkivet"
+msgid "no files or directories specified"
+msgstr "inga filer eller kataloger angivna"
+
+msgid "use --all to revert all files"
+msgstr "använd --all för att återställa alla filer"
#, python-format
msgid "forgetting %s\n"
@@ -8566,6 +9656,51 @@
msgid " Print the root directory of the current repository."
msgstr " Visa rotkatalogen för det aktuella arkivet."
+msgid "name of access log file to write to"
+msgstr "namn på åtkomstlogg att skriva till"
+
+msgid "name of error log file to write to"
+msgstr "namn på fellogg att skriva till"
+
+msgid "PORT"
+msgstr "PORT"
+
+msgid "port to listen on (default: 8000)"
+msgstr "port att lyssna på (standard: 8000)"
+
+msgid "address to listen on (default: all interfaces)"
+msgstr "adress att lyssna på (standard alla gränssnitt)"
+
+msgid "ADDR"
+msgstr "ADDR"
+
+msgid "prefix path to serve from (default: server root)"
+msgstr "sökvägsprefix att dela ut från (standard: serverrot)"
+
+msgid "name to show in web pages (default: working directory)"
+msgstr "namn att visa i webbsidor (standard: arbetskatalogen)"
+
+msgid "name of the hgweb config file (see \"hg help hgweb\")"
+msgstr "namn på webdir-konfigurationsfil (se \"hg help hgweb\")"
+
+msgid "name of the hgweb config file (DEPRECATED)"
+msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)"
+
+msgid "for remote clients"
+msgstr "för fjärrklienter"
+
+msgid "web templates to use"
+msgstr "webbmallar att använda"
+
+msgid "template style to use"
+msgstr "mallstil att använda"
+
+msgid "use IPv6 in addition to IPv4"
+msgstr "använd IPv6 förutom IPv4"
+
+msgid "SSL certificate file"
+msgstr "SSL-certifikatsfil"
+
msgid "start stand-alone webserver"
msgstr "starta fristående webbserver"
@@ -8610,6 +9745,9 @@
" För att låta servern välja ett ledigt portnummer att lyssna på, ange 0\n"
" som portnummer; då visar servern det portnummer som används."
+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)"
@@ -8617,6 +9755,75 @@
msgid "listening at http://%s%s/%s (bound to %s:%d)\n"
msgstr "lyssnar på http://%s%s/%s (bunden till %s:%d)\n"
+msgid "show untrusted configuration options"
+msgstr "visa opålitliga konfigurationsalternativ"
+
+msgid "[-u] [NAME]..."
+msgstr "[-u] [NAMN]..."
+
+msgid "show combined config settings from all hgrc files"
+msgstr "visa kombinerade konfigurationsalternativ från alla hgrc-filer"
+
+msgid " With no arguments, print names and values of all config items."
+msgstr " Utan argument, skrivs namn och värden för alla alternativ."
+
+msgid ""
+" With one argument of the form section.name, print just the value\n"
+" of that config item."
+msgstr ""
+" Med ett argument i formen sektion.namn, visas bara värdet för det\n"
+" konfigurationsalternativet."
+
+msgid ""
+" With multiple arguments, print names and values of all config\n"
+" items with matching section names."
+msgstr ""
+" Med flera argument, visas namn och värden för alla alternativ med\n"
+" överrensstämmande sektionsnamn."
+
+msgid ""
+" With --debug, the source (filename and line number) is printed\n"
+" for each config item."
+msgstr ""
+" Med --debug, visas källan (filnamn och radnummer) för varje\n"
+" alternativ."
+
+msgid "only one config item permitted"
+msgstr "bara ett konfigurationsalternativ tillåts"
+
+msgid "show status of all files"
+msgstr "visa status för alla filer"
+
+msgid "show only modified files"
+msgstr "visa bara modifierade filer"
+
+msgid "show only added files"
+msgstr "visa bara adderade filer"
+
+msgid "show only removed files"
+msgstr "visa bara raderade filer"
+
+msgid "show only deleted (but tracked) files"
+msgstr "visa bara borttagna (men spårade) filer"
+
+msgid "show only files without changes"
+msgstr "visa bara filer utan ändringar"
+
+msgid "show only unknown (not tracked) files"
+msgstr "visa bara okända (ospårade) filer"
+
+msgid "show only ignored files"
+msgstr "visa bara ignorerade filer"
+
+msgid "show source of copied files"
+msgstr "visa källan för kopierade filer"
+
+msgid "show difference from revision"
+msgstr "visa differens från revision"
+
+msgid "list the changed files of a revision"
+msgstr "visa de ändrade filerna från en revision"
+
msgid "show changed files in the working directory"
msgstr "visa ändrade filer i arbetskatalogen"
@@ -8687,6 +9894,9 @@
" I = ignorerad\n"
" = källa för den tidigare filen listad som A (adderad)"
+msgid "check for push and pull"
+msgstr "sök efter inkommande och utgående ändringar"
+
msgid "summarize working directory state"
msgstr "sammanfatta arbetskatalogens tillstånd"
@@ -8810,6 +10020,24 @@
msgid "remote: (synced)\n"
msgstr "fjärran: (synkad)\n"
+msgid "force tag"
+msgstr "tvinga märkning"
+
+msgid "make the tag local"
+msgstr "gör märket lokalt"
+
+msgid "revision to tag"
+msgstr "revision att märka"
+
+msgid "remove a tag"
+msgstr "ta bort ett märke"
+
+msgid "use <text> as commit message"
+msgstr "använd <text> som arkiveringsmeddelande"
+
+msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
+msgstr "[-f] [-l] [-m TEXT] [-d DATUM] [-u ANVÄNDARE] [-r REV] NAMN..."
+
msgid "add one or more tags for the current or given revision"
msgstr "lägg till en eller fler märken för en revision"
@@ -8906,6 +10134,9 @@
" Listar både vanliga och lokala märken. När flaggan -v/--verbose\n"
" används, visas en tredje kolumn med namnet \"local\" för lokala märken."
+msgid "[-p] [-g]"
+msgstr "[-p] [-g]"
+
msgid "show the tip revision"
msgstr "visa topprevisionen"
@@ -8928,6 +10159,12 @@
" arkivet den aktuella toppen. Märket \"tip\" är speciellt och kan inte\n"
" döpas om eller tilldelas en annan ändring."
+msgid "update to new branch head if changesets were unbundled"
+msgstr "uppdatera till nytt grenhuvud om ändringar packades upp"
+
+msgid "[-u] FILE..."
+msgstr "[-u] FIL..."
+
msgid "apply one or more changegroup files"
msgstr "applicera en eller flera filer med ändringar"
@@ -8946,6 +10183,15 @@
" filer.\n"
" "
+msgid "discard uncommitted changes (no backup)"
+msgstr "kassera oarkiverade ändringar (ingen backup)"
+
+msgid "update across branches if no uncommitted changes"
+msgstr "uppdatera över grenar om inga oarkiverade ändringar"
+
+msgid "[-c] [-C] [-d DATE] [[-r] REV]"
+msgstr "[-c] [-C] [-d DATUM] [[-r] REV]"
+
msgid "update working directory (or switch revisions)"
msgstr "uppdatera arbetskatalogen (eller växla mellan revisioner)"
@@ -9060,810 +10306,13 @@
"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"
-msgid "repository root directory or name of overlay bundle file"
-msgstr "arkivrotkatalog eller namn på påläggsbuntfil"
-
-msgid "DIR"
-msgstr ""
-
-msgid "change working directory"
-msgstr "ändra arbetskatalog"
-
-msgid "do not prompt, assume 'yes' for any required answers"
-msgstr "fråga inte, anta att svaret är 'ja' på alla frågor"
-
-msgid "suppress output"
-msgstr "förhindra utmatning"
-
-msgid "enable additional output"
-msgstr "aktivera ytterligare utmatning"
-
-msgid "set/override config option (use 'section.name=value')"
-msgstr "sätt/upphäv konfigurationsflagga (använd 'sektion.namn=värde')"
-
-msgid "CONFIG"
-msgstr ""
-
-msgid "enable debugging output"
-msgstr "aktivera debugutmatning"
-
-msgid "start debugger"
-msgstr "starta debugger"
-
-msgid "set the charset encoding"
-msgstr "sätt teckenkodning"
-
-msgid "ENCODE"
-msgstr ""
-
-msgid "MODE"
-msgstr ""
-
-msgid "set the charset encoding mode"
-msgstr "sätt teckenkodningsläge"
-
-msgid "always print a traceback on exception"
-msgstr "visa alltid bakåtspårning vid undantag"
-
-msgid "time how long the command takes"
-msgstr "ta tid på hur lång tid kommandot körs"
-
-msgid "print command execution profile"
-msgstr "visa kommandoexekveringens profil"
-
-msgid "output version information and exit"
-msgstr "skriv versionsinformation och avsluta"
-
-msgid "display help and exit"
-msgstr "visa hjälp och avsluta"
-
-msgid "do not perform actions, just print output"
-msgstr "utför inget, bara visa"
-
-msgid "specify ssh command to use"
-msgstr "specificera ssh-kommando att använda"
-
-msgid "specify hg command to run on the remote side"
-msgstr "specificera hg-kommando att köra på andra sidan"
-
-msgid "do not verify server certificate (ignoring web.cacerts config)"
-msgstr ""
-"verifiera inte servercertifikatet (ignorerar web.cacerts-konfiguration)"
-
-msgid "PATTERN"
-msgstr "MÖNSTER"
-
-msgid "include names matching the given patterns"
-msgstr "inkludera namn som matchar de givna mönstren"
-
-msgid "exclude names matching the given patterns"
-msgstr "exkludera namn som matchar de givna mönstren"
-
-msgid "use text as commit message"
-msgstr "använd text som arkiveringsmeddelande"
-
-msgid "read commit message from file"
-msgstr "läs arkiveringsmeddelandet från fil"
-
-msgid "record datecode as commit date"
-msgstr "lagra datumkod som arkiveringsdatum"
-
-msgid "record the specified user as committer"
-msgstr "lagra den specificerade användaren som arkiverare"
-
-msgid "STYLE"
-msgstr "STIL"
-
-msgid "display using template map file"
-msgstr "visa med mallfil"
-
-msgid "display with template"
-msgstr "visa med mall"
-
-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 "treat all files as text"
-msgstr "behandla alla filer som text"
-
-msgid "omit dates from diff headers"
-msgstr "exkludera datum från diff-rubriker"
-
-msgid "show which function each change is in"
-msgstr "visa vilken funktion varje ändring är i"
-
-msgid "produce a diff that undoes the changes"
-msgstr "skapa en diff som ångrar ändringarna"
-
-msgid "ignore white space when comparing lines"
-msgstr "ignorera blanktecken när rader jämförs"
-
-msgid "ignore changes in the amount of white space"
-msgstr "ignorera ändringar av antalet blanktecken"
-
-msgid "ignore changes whose lines are all blank"
-msgstr "ignorera ändringar vars rader är tomma"
-
-msgid "number of lines of context to show"
-msgstr "antal sammanhangsrader att visa"
-
-msgid "SIMILARITY"
-msgstr ""
-
-msgid "guess renamed files by similarity (0<=s<=100)"
-msgstr "gissa omdöpta filer efter likhet (0<=s<=100)"
-
-msgid "recurse into subrepositories"
-msgstr "gå in i underarkiv"
-
-msgid "[OPTION]... [FILE]..."
-msgstr "[FLAGGA]... [FIL]..."
-
-msgid "annotate the specified revision"
-msgstr "annotera den specificerade revisionen"
-
-msgid "follow copies/renames and list the filename (DEPRECATED)"
-msgstr "följ kopieringar/namnbyten och visa filnamnet (FÖRLEGAD)"
-
-msgid "don't follow copies and renames"
-msgstr "följ inte kopieringar och namnbyten"
-
-msgid "list the author (long with -v)"
-msgstr "visa skapare (lång med -v)"
-
-msgid "list the filename"
-msgstr "visa filnamnet"
-
-msgid "list the date (short with -q)"
-msgstr "visa datum (kort med -q)"
-
-msgid "list the revision number (default)"
-msgstr "visa revisionsnummer (standard)"
-
-msgid "list the changeset"
-msgstr "visa ändring"
-
-msgid "show line number at the first appearance"
-msgstr "visa radnummer för första förekomsten"
-
-msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..."
-msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FIL..."
-
-msgid "do not pass files through decoders"
-msgstr "passera inte filer genom dekoders"
-
-msgid "PREFIX"
-msgstr "PREFIX"
-
-msgid "directory prefix for files in archive"
-msgstr "katalogprefix för filer i arkiv"
-
-msgid "revision to distribute"
-msgstr "revision att distribuera"
-
-msgid "type of distribution to create"
-msgstr "distributionstyp att skapa"
-
-msgid "[OPTION]... DEST"
-msgstr "[FLAGGA]... DEST"
-
-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"
-msgstr "förälder att välja när en sammanfogning återkallas"
-
-msgid "specify merge tool"
-msgstr "ange sammanfogningsverktyg"
-
-msgid "revision to backout"
-msgstr "revision att återkalla"
-
-msgid "[OPTION]... [-r] REV"
-msgstr "[FLAGGA]... [-r] REV"
-
-msgid "reset bisect state"
-msgstr "återställ bisect-tillständ"
-
-msgid "mark changeset good"
-msgstr "markera ändringen som bra"
-
-msgid "mark changeset bad"
-msgstr "markera ändringen som dålig"
-
-msgid "skip testing changeset"
-msgstr "hoppa över test av ändring"
-
-msgid "use command to check changeset state"
-msgstr "använd kommando för att kontrollera ändringsstatus"
-
-msgid "do not update to target"
-msgstr "uppdatera inte till målet"
-
-msgid "[-gbsr] [-U] [-c CMD] [REV]"
-msgstr "[-gbsr] [-U] [-c KMD] [REV]"
-
-msgid "force"
-msgstr "tvinga"
-
-msgid "delete a given bookmark"
-msgstr "ta bort angivet bokmärke"
-
-msgid "rename a given bookmark"
-msgstr "döp om angivet bokmärke"
-
-msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
-msgstr "hg bookmarks [-f] [-d] [-m NAMN] [-r REV] [NAMN]"
-
-msgid "set branch name even if it shadows an existing branch"
-msgstr "sätt grennamnet även om det döljer en existerande gren"
-
-msgid "reset branch name to parent branch name"
-msgstr "återställ grennamn till förälderns grennamn"
-
-msgid "[-fC] [NAME]"
-msgstr "[-fC] [NAMN]"
-
-msgid "show only branches that have unmerged heads"
-msgstr "visa bara grenar som har icke-sammanfogade huvuden"
-
-msgid "show normal and closed branches"
-msgstr "visa normala och stängda grenar"
-
-msgid "[-ac]"
-msgstr "[-ac]"
-
-msgid "run even when the destination is unrelated"
-msgstr "kör även när destinationen är obesläktad"
-
-msgid "a changeset intended to be added to the destination"
-msgstr "en ändring avsedd att läggas till destinationen"
-
-msgid "a specific branch you would like to bundle"
-msgstr "en specifik gren du vill bunta"
-
-msgid "a base changeset assumed to be available at the destination"
-msgstr "en basändring som antas är tillgängliga i destinationen"
-
-msgid "bundle all changesets in the repository"
-msgstr "bunta alla ändringar i arkivet"
-
-msgid "bundle compression type to use"
-msgstr "typ av buntkompression att använda"
-
-msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]"
-msgstr "[-f] [-t TYP] [-a] [-r REV]... [--base REV]... FIL [DEST]"
-
-msgid "print output to file with formatted name"
-msgstr "skriv utmatning till fil med formatterat namn"
-
-msgid "print the given revision"
-msgstr "visa den angivna revisionen"
-
-msgid "apply any matching decode filter"
-msgstr "applicera valfritt överrensstämmande avkodningsfilter"
-
-msgid "[OPTION]... FILE..."
-msgstr "[FLAGGA]... FIL..."
-
-msgid "the clone will include an empty working copy (only a repository)"
-msgstr "klonen kommer add inkludera en tom arbetskopia (bara ett arkiv)"
-
-msgid "revision, tag or branch to check out"
-msgstr "revision, märke eller gren att hämta ut"
-
-msgid "include the specified changeset"
-msgstr "inkludera den angivna ändringen"
-
-msgid "clone only the specified branch"
-msgstr "klona bara den angivna grenen"
-
-msgid "[OPTION]... SOURCE [DEST]"
-msgstr "[FLAGGA]... KÄLLA [DEST]"
-
-msgid "mark new/missing files as added/removed before committing"
-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 "record a copy that has already occurred"
-msgstr "lagra en kopiering som redan har inträffat"
-
-msgid "forcibly copy over an existing managed file"
-msgstr "tvinga kopiering över en eixsterande hanterad fil"
-
-msgid "[OPTION]... [SOURCE]... DEST"
-msgstr "[FLAGGA]... [KÄLLA]... DEST"
-
-msgid "[INDEX] REV1 REV2"
-msgstr "[INDEX] REV1 REV2"
-
-msgid "add single file mergeable changes"
-msgstr ""
-
-msgid "add single file all revs append to"
-msgstr ""
-
-msgid "add single file all revs overwrite"
-msgstr ""
-
-msgid "add new file at each rev"
-msgstr ""
-
-msgid "[OPTION]... TEXT"
-msgstr "[FLAGGA]... TEXT"
-
-msgid "[COMMAND]"
-msgstr "[KOMMANDO]"
-
-msgid "show the command options"
-msgstr "visa kommandoflaggor"
-
-msgid "[-o] CMD"
-msgstr "[-o] KMD"
-
-msgid "use tags as labels"
-msgstr ""
-
-msgid "annotate with branch names"
-msgstr ""
-
-msgid "use dots for runs"
-msgstr ""
-
-msgid "separate elements by spaces"
-msgstr ""
-
-msgid "[OPTION]... [FILE [REV]...]"
-msgstr "[FLAGGA]... [FIL] [REV]...]"
-
-msgid "try extended date formats"
-msgstr "pröva utökade datumformat"
-
-msgid "[-e] DATE [RANGE]"
-msgstr "[-e] DATUM [SPANN]"
-
-msgid "FILE REV"
-msgstr "FIL REV"
-
-msgid "[PATH]"
-msgstr "[SÖKVÄG]"
-
-msgid "revlog format"
-msgstr ""
-
-msgid "REPO NAMESPACE [KEY OLD NEW]"
-msgstr ""
-
-msgid "revision to rebuild to"
-msgstr "revision att bygga om till"
-
-msgid "[-r REV] [REV]"
-msgstr "[-r REV] [REV]"
-
-msgid "revision to debug"
-msgstr "revision att debugga"
-
-msgid "[-r REV] FILE"
-msgstr "[-r REV] FIL"
-
-msgid "REV1 [REV2]"
-msgstr "REV1 [REV2]"
-
-msgid "do not display the saved mtime"
-msgstr "visa inte sparad mtime"
-
-msgid "[OPTION]..."
-msgstr "[FLAGGA]..."
-
-msgid "revision to check"
-msgstr "revision att kontrollera"
-
-msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..."
-msgstr "[FLAGGA]... ([-c REV] | [-r REV1 [-r REV2]]) [FIL]..."
-
-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] REV..."
-msgstr "[FLAGGA]... [-o UTFILSPEC] REV..."
-
-msgid "end fields with NUL"
-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"
-
-msgid "print only filenames and revisions that match"
-msgstr "visa bara filnamn och revisioner som matchar"
-
-msgid "print matching line numbers"
-msgstr "visa matchande radnummer"
-
-msgid "only search files changed within revision range"
-msgstr "sök filer enbart inom ett givet revisionsområde"
-
-msgid "[OPTION]... PATTERN [FILE]..."
-msgstr "[FLAGGA]... MÖNSTER [FIL]..."
-
-msgid "show only heads which are descendants of STARTREV"
-msgstr "visa bara huvuden som är ättlingar till STARTREV"
-
-msgid "STARTREV"
-msgstr "STARTREV"
-
-msgid "show topological heads only"
-msgstr "visa bara topologiska huvuden"
-
-msgid "show active branchheads only (DEPRECATED)"
-msgstr "visa bara aktiva grenhuvuden (FÖRLEGAD)"
-
-msgid "show normal and closed branch heads"
-msgstr "visa normala och stängda grenhuvuden"
-
-msgid "[-ac] [-r STARTREV] [REV]..."
-msgstr "[-ac] [-r STARTREV] [REV]..."
-
-msgid "[TOPIC]"
-msgstr "[ÄMNE]"
-
-msgid "identify the specified revision"
-msgstr "identifiera den angivna revisionen"
-
-msgid "show local revision number"
-msgstr "visa lokala revisionsnummer"
-
-msgid "show global revision id"
-msgstr "visa globala revisions-id"
-
-msgid "show branch"
-msgstr "visa grenar"
-
-msgid "show tags"
-msgstr "visa märken"
-
-msgid "show bookmarks"
-msgstr "visa bokmärken"
-
-msgid "[-nibtB] [-r REV] [SOURCE]"
-msgstr "[-nibtB] [-r REV] [KÄLLA]"
-
-msgid ""
-"directory strip option for patch. This has the same meaning as the "
-"corresponding patch option"
-msgstr ""
-
-msgid "PATH"
-msgstr "SÖKVÄG"
-
-msgid "base path"
-msgstr "grundsökväg"
-
-msgid "skip check for outstanding uncommitted changes"
-msgstr "hoppa över kontroll av oarkiverade ändringar"
-
-msgid "don't commit, just update the working directory"
-msgstr "arkivera inte, uppdatera bara arbetskatalogen"
-
-msgid "apply patch to the nodes from which it was generated"
-msgstr "applicera patch till noderna som den genererades från"
-
-msgid "use any branch information in patch (implied by --exact)"
-msgstr "använd greninformation i patchen (implicit med --exact)"
-
-msgid "[OPTION]... PATCH..."
-msgstr "[FLAGGA]... PATCH..."
-
-msgid "run even if remote repository is unrelated"
-msgstr "kör även om fjärrarkivet är obesläktat"
-
-msgid "show newest record first"
-msgstr "visa nyaste saken först"
-
-msgid "file to store the bundles into"
-msgstr "fil att lagra buntarna i"
-
-msgid "a remote changeset intended to be added"
-msgstr "en fjärrändring som avses att läggas till"
-
-msgid "compare bookmarks"
-msgstr "jämför bokmärken"
-
-msgid "a specific branch you would like to pull"
-msgstr "en specifik gren som du vill dra"
-
-msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]"
-msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAMN] [KÄLLA]"
-
-msgid "[-e CMD] [--remotecmd CMD] [DEST]"
-msgstr "[-e KMD] [--remotecmd KMD] [DEST]"
-
-msgid "search the repository as it is in REV"
-msgstr "sök igenom arkivet som det är vid REV"
-
-msgid "end filenames with NUL, for use with xargs"
-msgstr "filnamn slutar med NUL, för användning med xargs"
-
-msgid "print complete paths from the filesystem root"
-msgstr "visa kompletta sökvägar från filsystemsroten"
-
-msgid "[OPTION]... [PATTERN]..."
-msgstr "[FLAGGA]... [MÖNSTER]..."
-
-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 "[OPTION]... [FILE]"
-msgstr "[FLAGGA]... [FIL]"
-
-msgid "revision to display"
-msgstr "revision att visa"
-
-msgid "[-r REV]"
-msgstr "[-r REV]"
-
-msgid "force a merge with outstanding changes"
-msgstr "tvinga en sammanfogning med utestående ändringar"
-
-msgid "revision to merge"
-msgstr "revision att sammanfoga"
-
-msgid "review revisions to merge (no merge is performed)"
-msgstr "granska revisioner att sammanfoga (ingen sammanfogning utförs)"
-
-msgid "[-P] [-f] [[-r] REV]"
-msgstr "[-P] [-f] [[-r] REV]"
-
-msgid "a changeset intended to be included in the destination"
-msgstr "en ändring avsedd att inkluderas i destinationen"
-
-msgid "a specific branch you would like to push"
-msgstr "en specifik gren som du vill trycka"
-
-msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
-msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]"
-
-msgid "show parents of the specified revision"
-msgstr "visa föräldrar för den angivna revisionen"
-
-msgid "[-r REV] [FILE]"
-msgstr "[-r REV] [FIL]"
-
-msgid "[NAME]"
-msgstr "[NAMN]"
-
-msgid "update to new branch head if changesets were pulled"
-msgstr "uppdatera till nytt grenhuvud om ändringar drogs"
-
-msgid "run even when remote repository is unrelated"
-msgstr "kör även när fjärrarkivet är orelaterat"
-
-msgid "BOOKMARK"
-msgstr "BOKMÄRKE"
-
-msgid "bookmark to pull"
-msgstr "bokmärke att dra"
-
-msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
-msgstr "[-u] [-f] [-r REV]... [-e KMD] [--remotecmd KMD] [KÄLLA]"
-
-msgid "force push"
-msgstr "tvinga tryckning"
-
-msgid "bookmark to push"
-msgstr "bokmärke att trycka"
-
-msgid "allow pushing a new branch"
-msgstr "tillåt att trycka en ny gren"
-
-msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]"
-msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]"
-
-msgid "record delete for missing files"
-msgstr "markera saknade filer för radering"
-
-msgid "remove (and delete) file even if added or modified"
-msgstr "radera (och ta bort) filer även om tillagda eller modifierade"
-
-msgid "record a rename that has already occurred"
-msgstr "spara en namnändring som redan har inträffat"
-
-msgid "[OPTION]... SOURCE... DEST"
-msgstr "[FLAGGA]... KÄLLA... DEST"
-
-msgid "select all unresolved files"
-msgstr "välj alla olösta filer"
-
-msgid "list state of files needing merge"
-msgstr "visa status för filer som behöver sammanfogas"
-
-msgid "mark files as resolved"
-msgstr "markera filer som lösta"
-
-msgid "mark files as unresolved"
-msgstr "markera filer som olösta"
-
-msgid "hide status prefix"
-msgstr "göm statusprefix"
-
-msgid "revert all changes when no arguments given"
-msgstr "återställ alla ändringar när inga argument ges"
-
-msgid "tipmost revision matching date"
-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 "name of access log file to write to"
-msgstr "namn på åtkomstlogg att skriva till"
-
-msgid "name of error log file to write to"
-msgstr "namn på fellogg att skriva till"
-
-msgid "PORT"
-msgstr "PORT"
-
-msgid "port to listen on (default: 8000)"
-msgstr "port att lyssna på (standard: 8000)"
-
-msgid "ADDR"
-msgstr ""
-
-msgid "address to listen on (default: all interfaces)"
-msgstr "adress att lyssna på (standard alla gränssnitt)"
-
-msgid "prefix path to serve from (default: server root)"
-msgstr "sökvägsprefix att dela ut från (standard: serverrot)"
-
-msgid "name to show in web pages (default: working directory)"
-msgstr "namn att visa i webbsidor (standard: arbetskatalogen)"
-
-msgid "name of the hgweb config file (see \"hg help hgweb\")"
-msgstr "namn på webdir-konfigurationsfil (se \"hg help hgweb\")"
-
-msgid "name of the hgweb config file (DEPRECATED)"
-msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)"
-
-msgid "for remote clients"
-msgstr "för fjärrklienter"
-
-msgid "web templates to use"
-msgstr "webbmallar att använda"
-
-msgid "template style to use"
-msgstr "mallstil att använda"
-
-msgid "use IPv6 in addition to IPv4"
-msgstr "använd IPv6 förutom IPv4"
-
-msgid "SSL certificate file"
-msgstr "SSL-certifikatsfil"
-
-msgid "show untrusted configuration options"
-msgstr "visa opålitliga konfigurationsalternativ"
-
-msgid "[-u] [NAME]..."
-msgstr "[-u] [NAMN]..."
-
-msgid "check for push and pull"
-msgstr "sök efter inkommande och utgående ändringar"
-
-msgid "show status of all files"
-msgstr "visa status för alla filer"
-
-msgid "show only modified files"
-msgstr "visa bara modifierade filer"
-
-msgid "show only added files"
-msgstr "visa bara adderade filer"
-
-msgid "show only removed files"
-msgstr "visa bara raderade filer"
-
-msgid "show only deleted (but tracked) files"
-msgstr "visa bara borttagna (men spårade) filer"
-
-msgid "show only files without changes"
-msgstr "visa bara filer utan ändringar"
-
-msgid "show only unknown (not tracked) files"
-msgstr "visa bara okända (ospårade) filer"
-
-msgid "show only ignored files"
-msgstr "visa bara ignorerade filer"
-
-msgid "show source of copied files"
-msgstr "visa källan för kopierade filer"
-
-msgid "show difference from revision"
-msgstr "visa differens från revision"
-
-msgid "list the changed files of a revision"
-msgstr "visa de ändrade filerna från en revision"
-
-msgid "force tag"
-msgstr "tvinga märkning"
-
-msgid "make the tag local"
-msgstr "gör märket lokalt"
-
-msgid "revision to tag"
-msgstr "revision att märka"
-
-msgid "remove a tag"
-msgstr "ta bort ett märke"
-
-msgid "use <text> as commit message"
-msgstr "använd <text> som arkiveringsmeddelande"
-
-msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..."
-msgstr "[-f] [-l] [-m TEXT] [-d DATUM] [-u ANVÄNDARE] [-r REV] NAMN..."
-
-msgid "[-p] [-g]"
-msgstr "[-p] [-g]"
-
-msgid "update to new branch head if changesets were unbundled"
-msgstr "uppdatera till nytt grenhuvud om ändringar packades upp"
-
-msgid "[-u] FILE..."
-msgstr "[-u] FIL..."
-
-msgid "discard uncommitted changes (no backup)"
-msgstr "kassera oarkiverade ändringar (ingen backup)"
-
-msgid "update across branches if no uncommitted changes"
-msgstr ""
-
-msgid "[-c] [-C] [-d DATE] [[-r] REV]"
-msgstr "[-c] [-C] [-d DATUM] [[-r] REV]"
+#, python-format
+msgid "unknown mode %s"
+msgstr "okänt läge '%s'"
+
+#, python-format
+msgid "unknown command %s"
+msgstr "okänt kommando %s"
#, python-format
msgid "cannot include %s (%s)"
@@ -9900,14 +10349,6 @@
msgstr ""
#, python-format
-msgid "%s not added!\n"
-msgstr ""
-
-#, python-format
-msgid "%s still exists!\n"
-msgstr ""
-
-#, python-format
msgid "%s not tracked!\n"
msgstr ""
@@ -9935,14 +10376,13 @@
msgid "invalid event type in dag: %s"
msgstr ""
+msgid "nullid"
+msgstr ""
+
msgid "working directory state appears damaged!"
msgstr ""
#, python-format
-msgid "'\\n' and '\\r' disallowed in filenames: %r"
-msgstr ""
-
-#, python-format
msgid "directory %r already in dirstate"
msgstr ""
@@ -9954,10 +10394,6 @@
msgid "setting %r to other parent only allowed in merges"
msgstr ""
-#, python-format
-msgid "not in dirstate: %s\n"
-msgstr ""
-
msgid "unknown"
msgstr ""
@@ -9980,24 +10416,6 @@
msgid "unsupported file type (type is %s)"
msgstr ""
-msgid "searching for changes\n"
-msgstr "söker efter ändringar\n"
-
-msgid "queries"
-msgstr "frågor"
-
-msgid "searching"
-msgstr ""
-
-msgid "already have changeset "
-msgstr "har redan ändringen "
-
-msgid "warning: repository is unrelated\n"
-msgstr "varning: arkivet är obesälktat\n"
-
-msgid "repository is unrelated"
-msgstr "arkivet är obesläktat"
-
#, python-format
msgid "push creates new remote branches: %s!"
msgstr "push skapar nya fjärrhuvuden: %s!"
@@ -10006,11 +10424,12 @@
msgstr "använd 'hg push --new-branch' för att skapa nya fjärrgrenar"
#, python-format
-msgid "push creates new remote heads on branch '%s'!"
-msgstr "push skapar nya fjärrhuvuden på grenen '%s'!"
-
-msgid "push creates new remote heads!"
-msgstr "push skapar nya fjärrhuvuden!"
+msgid "push creates new remote head %s on branch '%s'!"
+msgstr "push skapar nyt fjärrhuvud %s på grenen '%s'!"
+
+#, python-format
+msgid "push creates new remote head %s!"
+msgstr "push skapar nya fjärrhuvudet %s!"
msgid "you should pull and merge or use push -f to force"
msgstr "du kan dra och sammanfoga eller använda push -f för att tvinga"
@@ -10136,11 +10555,6 @@
#, python-format
msgid ""
-"No argument found for substitution of %i variable in alias '%s' definition."
-msgstr ""
-
-#, python-format
-msgid ""
"error in definition for alias '%s': %s may only be given on the command "
"line\n"
msgstr ""
@@ -10184,12 +10598,13 @@
msgid "repository '%s' is not local"
msgstr ""
+#, python-format
+msgid "no repository found in %r (.hg not found)"
+msgstr "inget arkiv hittades i %r (.hg hittades inte)"
+
msgid "warning: --repository ignored\n"
msgstr "varning: --repository ignorerades\n"
-msgid "invalid arguments"
-msgstr ""
-
#, python-format
msgid "unrecognized profiling format '%s' - Ignored\n"
msgstr ""
@@ -10265,6 +10680,173 @@
msgid "merging %s failed!\n"
msgstr ""
+msgid "unterminated string"
+msgstr ""
+
+msgid "syntax error"
+msgstr ""
+
+msgid "missing argument"
+msgstr ""
+
+msgid "can't use a list in this context"
+msgstr "kan inte använda en lista i detta sammanhang"
+
+msgid ""
+"``modified()``\n"
+" File that is modified according to status."
+msgstr ""
+
+msgid "modified takes no arguments"
+msgstr "modified tar inga argument"
+
+msgid ""
+"``added()``\n"
+" File that is added according to status."
+msgstr ""
+
+msgid "added takes no arguments"
+msgstr "added tar inga argument"
+
+msgid ""
+"``removed()``\n"
+" File that is removed according to status."
+msgstr ""
+
+msgid "removed takes no arguments"
+msgstr "removed tar inga argument"
+
+msgid ""
+"``deleted()``\n"
+" File that is deleted according to status."
+msgstr ""
+
+msgid "deleted takes no arguments"
+msgstr "deleted tar inga argument"
+
+msgid ""
+"``unknown()``\n"
+" File that is unknown according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+
+msgid "unknown takes no arguments"
+msgstr "unknown tar inga argument"
+
+msgid ""
+"``ignored()``\n"
+" File that is ignored according to status. These files will only be\n"
+" considered if this predicate is used."
+msgstr ""
+
+msgid "ignored takes no arguments"
+msgstr "ignored tar inga argument"
+
+msgid ""
+"``clean()``\n"
+" File that is clean according to status."
+msgstr ""
+
+msgid "clean takes no arguments"
+msgstr "clean tar inga argument"
+
+#, python-format
+msgid "not a function: %s"
+msgstr "inte en funktion: %s"
+
+msgid ""
+"``binary()``\n"
+" File that appears to be binary (contails NUL bytes)."
+msgstr ""
+
+msgid "binary takes no arguments"
+msgstr "binary tar inga argument"
+
+msgid ""
+"``exec()``\n"
+" File that is marked as executable."
+msgstr ""
+
+msgid "exec takes no arguments"
+msgstr "exec tar inga argument"
+
+msgid ""
+"``symlink()``\n"
+" File that is marked as a symlink."
+msgstr ""
+
+msgid "symlink takes no arguments"
+msgstr "symlink tar inga argument"
+
+msgid ""
+"``resolved()``\n"
+" File that is marked resolved according to the resolve state."
+msgstr ""
+
+msgid "resolved takes no arguments"
+msgstr "resolved tar inga argument"
+
+msgid ""
+"``unresolved()``\n"
+" File that is marked unresolved according to the resolve state."
+msgstr ""
+
+msgid "unresolved takes no arguments"
+msgstr "unresolved tar inga argument"
+
+msgid ""
+"``hgignore()``\n"
+" File that matches the active .hgignore pattern."
+msgstr ""
+
+msgid "hgignore takes no arguments"
+msgstr "hgignore tar inga argument"
+
+msgid ""
+"``grep(regex)``\n"
+" File contains the given regular expression."
+msgstr ""
+
+msgid "grep requires a pattern"
+msgstr "grep kräver ett mönster"
+
+msgid "couldn't parse size"
+msgstr ""
+
+msgid ""
+"``size(expression)``\n"
+" File size matches the given expression. Examples:"
+msgstr ""
+
+msgid ""
+" - 1k (files from 1024 to 2047 bytes)\n"
+" - < 20k (files less than 20480 bytes)\n"
+" - >= .5MB (files at least 524288 bytes)\n"
+" - 4k - 1MB (files from 4096 bytes to 1048576 bytes)"
+msgstr ""
+
+msgid ""
+"``encoding(name)``\n"
+" File can be successfully decoded with the given character\n"
+" encoding. May not be useful for encodings other than ASCII and\n"
+" UTF-8."
+msgstr ""
+
+msgid "encoding requires an encoding name"
+msgstr ""
+
+#, python-format
+msgid "unknown encoding '%s'"
+msgstr ""
+
+msgid ""
+"``copied()``\n"
+" File that is recorded as being copied."
+msgstr ""
+
+msgid "invalid token"
+msgstr ""
+
msgid "starting revisions are not directly related"
msgstr ""
@@ -10300,6 +10882,9 @@
msgid "Specifying Revision Sets"
msgstr "Ange Revisionsset"
+msgid "Specifying File Sets"
+msgstr "Ange Filset"
+
msgid "Diff Formats"
msgstr "Diff-format"
@@ -10324,98 +10909,23 @@
msgid "Glossary"
msgstr "Ordlista"
-msgid ""
-"Mercurial reads configuration data from several files, if they exist.\n"
-"Below we list the most specific file first."
-msgstr ""
-"Mercurial läser konfigurationsdata från flera filer, om de existerar.\n"
-"Nedan listar vi den mest specifika filen först."
-
-msgid "On Windows, these configuration files are read:"
-msgstr "Under Windows läses dessa konfigurationsfiler:"
-
-msgid ""
-"- ``<repo>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial."
-"ini found)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial."
-"ini found)\n"
-"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n"
-"- ``<hg.exe-dir>\\mercurial.ini``"
-msgstr ""
-"- ``<arkiv>\\.hg\\hgrc``\n"
-"- ``%USERPROFILE%\\.hgrc``\n"
-"- ``%USERPROFILE%\\mercurial.ini``\n"
-"- ``%HOME%\\.hgrc``\n"
-"- ``%HOME%\\mercurial.ini``\n"
-"- ``C:\\mercurial\\mercurial.ini`` (om inte registernyckel eller hgrc.d\\ "
-"eller mercurial.ini hittas)\n"
-"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (om inte hgrc.d\\ eller "
-"mercurial.ini hittas)\n"
-"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (om inte mercurial.ini hittas)\n"
-"- ``<hg.exe-dir>\\mercurial.ini``"
-
-msgid "On Unix, these files are read:"
-msgstr "Under Unix läses dessa filer:"
-
-msgid ""
-"- ``<repo>/.hg/hgrc``\n"
-"- ``$HOME/.hgrc``\n"
-"- ``/etc/mercurial/hgrc``\n"
-"- ``/etc/mercurial/hgrc.d/*.rc``\n"
-"- ``<install-root>/etc/mercurial/hgrc``\n"
-"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
-msgstr ""
-"- ``<arkiv>/.hg/hgrc``\n"
-"- ``$HOME/.hgrc``\n"
-"- ``/etc/mercurial/hgrc``\n"
-"- ``/etc/mercurial/hgrc.d/*.rc``\n"
-"- ``<installationsrot>/etc/mercurial/hgrc``\n"
-"- ``<installationsrot>/etc/mercurial/hgrc.d/*.rc``"
-
-msgid ""
-"If there is a per-repository configuration file which is not owned by\n"
-"the active user, Mercurial will warn you that the file is skipped::"
-msgstr ""
-"Om det finns en arkivkonfigurationsfil som inte ägs av den aktiva\n"
-"användaren, kommer Mercurial att varna dig att filen ignoreras::"
-
-msgid ""
-" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP"
-msgstr ""
-" Litar inte på filen <arkiv>/.hg/hgrc från opålitlig användare ANVÄNDARE,\n"
-" grupp GRUPP"
-
-msgid ""
-"If this bothers you, the warning can be silenced (the file would still\n"
-"be ignored) or trust can be established. Use one of the following\n"
-"settings, the syntax is explained below:"
-msgstr ""
-"Om det stör dig, så kan varningen tystas (filen kommer fortfarande att\n"
-"ignoreras) eller du kan tala om att vederbörande är tillförlitlig. Använd\n"
-"en av de följande inställningarna. Den första raden tystar varningarna, de\n"
-"två andra visar att du litar på användaren:"
-
-msgid ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = USER``\n"
-"- ``trusted.groups = GROUP``"
-msgstr ""
-"- ``ui.report_untrusted = False``\n"
-"- ``trusted.users = ANVÄNDARE``\n"
-"- ``trusted.groups = GRUPP``"
-
-msgid ""
-"The configuration files for Mercurial use a simple ini-file format. A\n"
-"configuration file consists of sections, led by a ``[section]`` header\n"
-"and followed by ``name = value`` entries::"
+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"
+"aspects of its behavior."
+msgstr ""
+"Mercurial använder ett antal konfigurationsfiler för att kontrollera hur\n"
+"vissa delar ska fungera."
+
+msgid ""
+"The configuration files use a simple ini-file format. A configuration\n"
+"file consists of sections, led by a ``[section]`` header and followed\n"
+"by ``name = value`` entries::"
msgstr ""
"Konfigurationsfilerna för Mercurial använder ett enkelt ini-filformat. En\n"
-"file består av sektioner, som inleds av en rubrik (ex ``[sektion]``) och\n"
+"konfigurationsfil består av sektioner, som inleds av en ``[sektion]`` och\n"
"följs av rader med ``namn = värde``::"
msgid ""
@@ -10429,19 +10939,1858 @@
msgid ""
"The above entries will be referred to as ``ui.username`` and\n"
-"``ui.verbose``, respectively. Please see the hgrc man page for a full\n"
-"description of the possible configuration values:"
+"``ui.verbose``, respectively. See the Syntax section below."
msgstr ""
"Raderna ovanför refereras till som ``ui.username`` och\n"
-"``ui.verbose``. Läs man-sidan för hgrc för en full beskrivning av alla\n"
-"möjliga konfigurationsvärden:"
-
-msgid ""
-"- on Unix-like systems: ``man hgrc``\n"
-"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
-msgstr ""
-"- under Unix-liknande system: ``man hgrc``\n"
-"- online: http://www.selenic.com/mercurial/hgrc.5.html\n"
+"``ui.verbose``, respektive. Läs Syntax-sektionen nedanför:"
+
+msgid ""
+"Files\n"
+"-----"
+msgstr ""
+"Filer\n"
+"-----"
+
+msgid ""
+"Mercurial reads configuration data from several files, if they exist.\n"
+"These files do not exist by default and you will have to create the\n"
+"appropriate configuration files yourself: global configuration like\n"
+"the username setting is typically put into\n"
+"``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n"
+"configuration is put into the per-repository ``<repo>/.hg/hgrc`` file."
+msgstr ""
+
+msgid ""
+"The names of these files depend on the system on which Mercurial is\n"
+"installed. ``*.rc`` files from a single directory are read in\n"
+"alphabetical order, later ones overriding earlier ones. Where multiple\n"
+"paths are given below, settings from earlier paths override later\n"
+"ones."
+msgstr ""
+
+msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``"
+msgstr ""
+
+msgid ""
+" Per-repository configuration options that only apply in a\n"
+" 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"
+" 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 ""
+"| (Unix) ``$HOME/.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\.hgrc``\n"
+"| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n"
+"| (Windows) ``%HOME%\\.hgrc``\n"
+"| (Windows) ``%HOME%\\Mercurial.ini``"
+msgstr ""
+
+msgid ""
+" Per-user configuration file(s), for the user running Mercurial. On\n"
+" Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these\n"
+" files apply to all Mercurial commands executed by this user in any\n"
+" directory. Options in these files override per-system and per-"
+"installation\n"
+" options."
+msgstr ""
+
+msgid ""
+"| (Unix) ``/etc/mercurial/hgrc``\n"
+"| (Unix) ``/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+" Per-system configuration files, for the system on which Mercurial\n"
+" is running. Options in these files apply to all Mercurial commands\n"
+" executed by any user in any directory. Options in these files\n"
+" override per-installation options."
+msgstr ""
+
+msgid ""
+"| (Unix) ``<install-root>/etc/mercurial/hgrc``\n"
+"| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``"
+msgstr ""
+
+msgid ""
+" Per-installation configuration files, searched for in the\n"
+" directory where Mercurial is installed. ``<install-root>`` is the\n"
+" parent directory of the **hg** executable (or symlink) being run. For\n"
+" example, if installed in ``/shared/tools/bin/hg``, Mercurial will look\n"
+" in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply\n"
+" to all Mercurial commands executed by any user in any directory."
+msgstr ""
+
+msgid ""
+"| (Windows) ``<install-dir>\\Mercurial.ini`` **or**\n"
+"| (Windows) ``<install-dir>\\hgrc.d\\*.rc`` **or**\n"
+"| (Windows) ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``"
+msgstr ""
+
+msgid ""
+" Per-installation/system configuration files, for the system on\n"
+" which Mercurial is running. Options in these files apply to all\n"
+" Mercurial commands executed by any user in any directory. Registry\n"
+" 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. 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 ""
+
+msgid ""
+"A configuration file consists of sections, led by a ``[section]`` header\n"
+"and followed by ``name = value`` entries (sometimes called\n"
+"``configuration keys``)::"
+msgstr ""
+
+msgid ""
+" [spam]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+
+msgid ""
+"Each line contains one entry. If the lines that follow are indented,\n"
+"they are treated as continuations of that entry. Leading whitespace is\n"
+"removed from values. Empty lines are skipped. Lines beginning with\n"
+"``#`` or ``;`` are ignored and may be used to provide comments."
+msgstr ""
+
+msgid ""
+"Configuration keys can be set multiple times, in which case Mercurial\n"
+"will use the value that was configured last. As an example::"
+msgstr ""
+
+msgid ""
+" [spam]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+
+msgid "This would set the configuration key named ``eggs`` to ``small``."
+msgstr ""
+
+msgid ""
+"It is also possible to define a section multiple times. A section can\n"
+"be redefined on the same and/or on different configuration files. For\n"
+"example::"
+msgstr ""
+
+msgid ""
+" [foo]\n"
+" eggs=large\n"
+" ham=serrano\n"
+" eggs=small"
+msgstr ""
+
+msgid ""
+" [bar]\n"
+" eggs=ham\n"
+" green=\n"
+" eggs"
+msgstr ""
+
+msgid ""
+" [foo]\n"
+" ham=prosciutto\n"
+" eggs=medium\n"
+" bread=toasted"
+msgstr ""
+
+msgid ""
+"This would set the ``eggs``, ``ham``, and ``bread`` configuration keys\n"
+"of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,\n"
+"respectively. As you can see there only thing that matters is the last\n"
+"value that was set for each of the configuration keys."
+msgstr ""
+
+msgid ""
+"If a configuration key is set multiple times in different\n"
+"configuration files the final value will depend on the order in which\n"
+"the different configuration files are read, with settings from earlier\n"
+"paths overriding later ones as described on the ``Files`` section\n"
+"above."
+msgstr ""
+
+msgid ""
+"A line of the form ``%include file`` will include ``file`` into the\n"
+"current configuration file. The inclusion is recursive, which means\n"
+"that included files can include other files. Filenames are relative to\n"
+"the configuration file in which the ``%include`` directive is found.\n"
+"Environment variables and ``~user`` constructs are expanded in\n"
+"``file``. This lets you do something like::"
+msgstr ""
+
+msgid " %include ~/.hgrc.d/$HOST.rc"
+msgstr ""
+
+msgid "to include a different configuration file on each computer you use."
+msgstr ""
+
+msgid ""
+"A line with ``%unset name`` will remove ``name`` from the current\n"
+"section, if it has been set previously."
+msgstr ""
+
+msgid ""
+"The values are either free-form text strings, lists of text strings,\n"
+"or Boolean values. Boolean values can be set to true using any of \"1\",\n"
+"\"yes\", \"true\", or \"on\" and to false using \"0\", \"no\", \"false\", or "
+"\"off\"\n"
+"(all case insensitive)."
+msgstr ""
+
+msgid ""
+"List values are separated by whitespace or comma, except when values are\n"
+"placed in double quotation marks::"
+msgstr ""
+
+msgid " allow_read = \"John Doe, PhD\", brian, betty"
+msgstr ""
+
+msgid ""
+"Quotation marks can be escaped by prefixing them with a backslash. Only\n"
+"quotation marks at the beginning of a word is counted as a quotation\n"
+"(e.g., ``foo\"bar baz`` is the list of ``foo\"bar`` and ``baz``)."
+msgstr ""
+
+msgid ""
+"Sections\n"
+"--------"
+msgstr ""
+
+msgid ""
+"This section describes the different sections that may appear in a\n"
+"Mercurial configuration file, the purpose of each section, its possible\n"
+"keys, and their possible values."
+msgstr ""
+
+msgid ""
+"``alias``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Defines command aliases.\n"
+"Aliases allow you to define your own commands in terms of other\n"
+"commands (or aliases), optionally including arguments. Positional\n"
+"arguments in the form of ``$1``, ``$2``, etc in the alias definition\n"
+"are expanded by Mercurial before execution. Positional arguments not\n"
+"already used by ``$N`` in the definition are put at the end of the\n"
+"command to be executed."
+msgstr ""
+
+msgid "Alias definitions consist of lines of the form::"
+msgstr ""
+
+msgid " <alias> = <command> [<argument>]..."
+msgstr ""
+
+msgid "For example, this definition::"
+msgstr ""
+
+msgid " latest = log --limit 5"
+msgstr ""
+
+msgid ""
+"creates a new command ``latest`` that shows only the five most recent\n"
+"changesets. You can define subsequent aliases using earlier ones::"
+msgstr ""
+
+msgid " stable5 = latest -b stable"
+msgstr ""
+
+msgid ""
+".. note:: It is possible to create aliases with the same names as\n"
+" existing commands, which will then override the original\n"
+" definitions. This is almost always a bad idea!"
+msgstr ""
+
+msgid ""
+"An alias can start with an exclamation point (``!``) to make it a\n"
+"shell alias. A shell alias is executed with the shell and will let you\n"
+"run arbitrary commands. As an example, ::"
+msgstr ""
+
+msgid " echo = !echo"
+msgstr ""
+
+msgid ""
+"will let you do ``hg echo foo`` to have ``foo`` printed in your\n"
+"terminal. A better example might be::"
+msgstr ""
+
+msgid " purge = !$HG status --no-status --unknown -0 | xargs -0 rm"
+msgstr ""
+
+msgid ""
+"which will make ``hg purge`` delete all unknown files in the\n"
+"repository in the same manner as the purge extension."
+msgstr ""
+
+msgid ""
+"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`` expand to the arguments given to Mercurial. In the ``hg\n"
+"echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``."
+msgstr ""
+
+msgid ""
+"``auth``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Authentication credentials for HTTP authentication. This section\n"
+"allows you to store usernames and passwords for use when logging\n"
+"*into* HTTP servers. See the ``[web]`` configuration section if\n"
+"you want to configure *who* can login to your HTTP server."
+msgstr ""
+
+msgid "Each line has the following format::"
+msgstr ""
+
+msgid " <name>.<argument> = <value>"
+msgstr ""
+
+msgid ""
+"where ``<name>`` is used to group arguments into authentication\n"
+"entries. Example::"
+msgstr ""
+
+msgid ""
+" foo.prefix = hg.intevation.org/mercurial\n"
+" foo.username = foo\n"
+" foo.password = bar\n"
+" foo.schemes = http https"
+msgstr ""
+
+msgid ""
+" bar.prefix = secure.example.org\n"
+" bar.key = path/to/file.key\n"
+" bar.cert = path/to/file.cert\n"
+" bar.schemes = https"
+msgstr ""
+
+msgid "Supported arguments:"
+msgstr ""
+
+msgid ""
+"``prefix``\n"
+" Either ``*`` or a URI prefix with or without the scheme part.\n"
+" The authentication entry with the longest matching prefix is used\n"
+" (where ``*`` matches everything and counts as a match of length\n"
+" 1). If the prefix doesn't include a scheme, the match is performed\n"
+" against the URI with its scheme stripped as well, and the schemes\n"
+" argument, q.v., is then subsequently consulted."
+msgstr ""
+
+msgid ""
+"``username``\n"
+" 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``."
+msgstr ""
+
+msgid ""
+"``password``\n"
+" Optional. Password to authenticate with. If not given, and the\n"
+" remote site requires basic or digest authentication, the user\n"
+" will be prompted for it."
+msgstr ""
+
+msgid ""
+"``key``\n"
+" Optional. PEM encoded client certificate key file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+
+msgid ""
+"``cert``\n"
+" Optional. PEM encoded client certificate chain file. Environment\n"
+" variables are expanded in the filename."
+msgstr ""
+
+msgid ""
+"``schemes``\n"
+" Optional. Space separated list of URI schemes to use this\n"
+" authentication entry with. Only used if the prefix doesn't include\n"
+" a scheme. Supported schemes are http and https. They will match\n"
+" static-http and static-https respectively, as well.\n"
+" Default: https."
+msgstr ""
+
+msgid ""
+"If no suitable authentication entry is found, the user is prompted\n"
+"for credentials as usual if required by the remote."
+msgstr ""
+
+msgid ""
+"\n"
+"``decode/encode``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Filters for transforming files on checkout/checkin. This would\n"
+"typically be used for newline processing or other\n"
+"localization/canonicalization of files."
+msgstr ""
+
+msgid ""
+"Filters consist of a filter pattern followed by a filter command.\n"
+"Filter patterns are globs by default, rooted at the repository root.\n"
+"For example, to match any file ending in ``.txt`` in the root\n"
+"directory only, use the pattern ``*.txt``. To match any file ending\n"
+"in ``.c`` anywhere in the repository, use the pattern ``**.c``.\n"
+"For each file only the first matching filter applies."
+msgstr ""
+
+msgid ""
+"The filter command can start with a specifier, either ``pipe:`` or\n"
+"``tempfile:``. If no specifier is given, ``pipe:`` is used by default."
+msgstr ""
+
+msgid ""
+"A ``pipe:`` command must accept data on stdin and return the transformed\n"
+"data on stdout."
+msgstr ""
+
+msgid "Pipe example::"
+msgstr "Pipe-exempel::"
+
+msgid ""
+" [encode]\n"
+" # uncompress gzip files on checkin to improve delta compression\n"
+" # note: not necessarily a good idea, just an example\n"
+" *.gz = pipe: gunzip"
+msgstr ""
+
+msgid ""
+" [decode]\n"
+" # recompress gzip files when writing them to the working dir (we\n"
+" # can safely omit \"pipe:\", because it's the default)\n"
+" *.gz = gzip"
+msgstr ""
+
+msgid ""
+"A ``tempfile:`` command is a template. The string ``INFILE`` is replaced\n"
+"with the name of a temporary file that contains the data to be\n"
+"filtered by the command. The string ``OUTFILE`` is replaced with the name\n"
+"of an empty temporary file, where the filtered data must be written by\n"
+"the command."
+msgstr ""
+
+msgid ""
+".. note:: The tempfile mechanism is recommended for Windows systems,\n"
+" where the standard shell I/O redirection operators often have\n"
+" strange effects and may corrupt the contents of your files."
+msgstr ""
+
+msgid ""
+"This filter mechanism is used internally by the ``eol`` extension to\n"
+"translate line ending characters between Windows (CRLF) and Unix (LF)\n"
+"format. We suggest you use the ``eol`` extension for convenience."
+msgstr ""
+
+msgid ""
+"\n"
+"``defaults``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "(defaults are deprecated. Don't use them. Use aliases instead)"
+msgstr ""
+
+msgid ""
+"Use the ``[defaults]`` section to define command defaults, i.e. the\n"
+"default options/arguments to pass to the specified commands."
+msgstr ""
+
+msgid ""
+"The following example makes :hg:`log` run in verbose mode, and\n"
+":hg:`status` show only the modified files, by default::"
+msgstr ""
+
+msgid ""
+" [defaults]\n"
+" log = -v\n"
+" status = -m"
+msgstr ""
+
+msgid ""
+"The actual commands, instead of their aliases, must be used when\n"
+"defining command defaults. The command defaults will also be applied\n"
+"to the aliases of the commands defined."
+msgstr ""
+
+msgid ""
+"\n"
+"``diff``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Settings used when displaying diffs. Everything except for ``unified`` is a\n"
+"Boolean and defaults to False."
+msgstr ""
+
+msgid ""
+"``git``\n"
+" Use git extended diff format."
+msgstr ""
+"``git``\n"
+" Använd gits utökade diff-format."
+
+msgid ""
+"``nodates``\n"
+" Don't include dates in diff headers."
+msgstr ""
+
+msgid ""
+"``showfunc``\n"
+" Show which function each change is in."
+msgstr ""
+"``showfunc``\n"
+" 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 ""
+"``unified``\n"
+"Antal sammanhangsrader att visa."
+
+msgid ""
+"``email``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Settings for extensions that send email messages."
+msgstr ""
+
+msgid ""
+"``from``\n"
+" Optional. Email address to use in \"From\" header and SMTP envelope\n"
+" of outgoing messages."
+msgstr ""
+
+msgid ""
+"``to``\n"
+" Optional. Comma-separated list of recipients' email addresses."
+msgstr ""
+
+msgid ""
+"``cc``\n"
+" Optional. Comma-separated list of carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+
+msgid ""
+"``bcc``\n"
+" Optional. Comma-separated list of blind carbon copy recipients'\n"
+" email addresses."
+msgstr ""
+
+msgid ""
+"``method``\n"
+" Optional. Method to use to send email messages. If value is ``smtp``\n"
+" (default), use SMTP (see the ``[smtp]`` section for configuration).\n"
+" Otherwise, use as name of program to run that acts like sendmail\n"
+" (takes ``-f`` option for sender, list of recipients on command line,\n"
+" message on stdin). Normally, setting this to ``sendmail`` or\n"
+" ``/usr/sbin/sendmail`` is enough to use sendmail to send messages."
+msgstr ""
+
+msgid ""
+"``charsets``\n"
+" Optional. Comma-separated list of character sets considered\n"
+" convenient for recipients. Addresses, headers, and parts not\n"
+" containing patches of outgoing messages will be encoded in the\n"
+" first character set to which conversion from local encoding\n"
+" (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct\n"
+" conversion fails, the text in question is sent as is. Defaults to\n"
+" empty (explicit) list."
+msgstr ""
+
+msgid " Order of outgoing email character sets:"
+msgstr ""
+
+msgid ""
+" 1. ``us-ascii``: always first, regardless of settings\n"
+" 2. ``email.charsets``: in order given by user\n"
+" 3. ``ui.fallbackencoding``: if not in email.charsets\n"
+" 4. ``$HGENCODING``: if not in email.charsets\n"
+" 5. ``utf-8``: always last, regardless of settings"
+msgstr ""
+
+msgid "Email example::"
+msgstr "Email-exempel::"
+
+msgid ""
+" [email]\n"
+" from = Joseph User <joe.user@example.com>\n"
+" method = /usr/sbin/sendmail\n"
+" # charsets for western Europeans\n"
+" # us-ascii, utf-8 omitted, as they are tried first and last\n"
+" charsets = iso-8859-1, iso-8859-15, windows-1252"
+msgstr ""
+
+msgid ""
+"\n"
+"``extensions``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Mercurial has an extension mechanism for adding new features. To\n"
+"enable an extension, create an entry for it in this section."
+msgstr ""
+
+msgid ""
+"If you know that the extension is already in Python's search path,\n"
+"you can give the name of the module, followed by ``=``, with nothing\n"
+"after the ``=``."
+msgstr ""
+
+msgid ""
+"Otherwise, give a name that you choose, followed by ``=``, followed by\n"
+"the path to the ``.py`` file (including the file name extension) that\n"
+"defines the extension."
+msgstr ""
+
+msgid ""
+"To explicitly disable an extension that is enabled in an hgrc of\n"
+"broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``\n"
+"or ``foo = !`` when path is not supplied."
+msgstr ""
+"För att explicit deaktivera en utökning som aktiverats i en\n"
+"konfigurationsfil med större omfång, börja dess sökväg med ``!``, som i\n"
+"``foo = !/ext/path`` eller ``foo = !`` när sökvägen inte anges."
+
+msgid "Example for ``~/.hgrc``::"
+msgstr "Exempel för ``~/.hgrc``::"
+
+msgid ""
+" [extensions]\n"
+" # (the mq extension will get loaded from Mercurial's path)\n"
+" mq =\n"
+" # (this extension will get loaded from the file specified)\n"
+" myfeature = ~/.hgext/myfeature.py"
+msgstr ""
+
+msgid ""
+"\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"
+" Enable or disable the \"store\" repository format which improves\n"
+" compatibility with systems that fold case or otherwise mangle\n"
+" filenames. Enabled by default. Disabling this option will allow\n"
+" you to store longer filenames in some situations at the expense of\n"
+" compatibility and ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 0.9.4."
+msgstr ""
+
+msgid ""
+"``usefncache``\n"
+" Enable or disable the \"fncache\" repository format which enhances\n"
+" the \"store\" repository format (which has to be enabled to use\n"
+" fncache) to allow longer filenames and avoids using Windows\n"
+" reserved names, e.g. \"nul\". Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.1."
+msgstr ""
+
+msgid ""
+"``dotencode``\n"
+" Enable or disable the \"dotencode\" repository format which enhances\n"
+" the \"fncache\" repository format (which has to be enabled to use\n"
+" dotencode) to avoid issues with filenames starting with ._ on\n"
+" Mac OS X and spaces on Windows. Enabled by default. Disabling this\n"
+" option ensures that the on-disk format of newly created\n"
+" repositories will be compatible with Mercurial before version 1.7."
+msgstr ""
+
+msgid ""
+"``merge-patterns``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+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 ""
+
+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"
+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."
+msgstr ""
+
+msgid "Example ``.hg/hgrc``::"
+msgstr ""
+
+msgid ""
+" [hooks]\n"
+" # update working directory after adding changesets\n"
+" changegroup.update = hg update\n"
+" # do not use the site-wide hook\n"
+" incoming =\n"
+" incoming.email = /my/email/hook\n"
+" incoming.autobuild = /my/build/hook"
+msgstr ""
+
+msgid ""
+"Most hooks are run with environment variables set that give useful\n"
+"additional information. For each hook below, the environment\n"
+"variables it is passed are listed with names of the form ``$HG_foo``."
+msgstr ""
+
+msgid ""
+"``changegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle.\n"
+" ID of the first new changeset is in ``$HG_NODE``. URL from which\n"
+" changes came is in ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``commit``\n"
+" Run after a changeset has been created in the local repository. ID\n"
+" of the newly created changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``incoming``\n"
+" Run after a changeset has been pulled, pushed, or unbundled into\n"
+" the local repository. The ID of the newly arrived changeset is in\n"
+" ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``outgoing``\n"
+" Run after sending changes from local repository to another. ID of\n"
+" first changeset sent is in ``$HG_NODE``. Source of operation is in\n"
+" ``$HG_SOURCE``; see \"preoutgoing\" hook for description."
+msgstr ""
+
+msgid ""
+"``post-<command>``\n"
+" Run after successful invocations of the associated command. The\n"
+" contents of the command line are passed as ``$HG_ARGS`` and the result\n"
+" code in ``$HG_RESULT``. Parsed command line arguments are passed as \n"
+" ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of\n"
+" the python data internally passed to <command>. ``$HG_OPTS`` is a \n"
+" dictionary of options (with unspecified options set to their defaults).\n"
+" ``$HG_PATS`` is a list of arguments. Hook failure is ignored."
+msgstr ""
+
+msgid ""
+"``pre-<command>``\n"
+" Run before executing the associated command. The contents of the\n"
+" command line are passed as ``$HG_ARGS``. Parsed command line arguments\n"
+" are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string\n"
+" representations of the data internally passed to <command>. ``$HG_OPTS``\n"
+" is a dictionary of options (with unspecified options set to their\n"
+" defaults). ``$HG_PATS`` is a list of arguments. If the hook returns \n"
+" failure, the command doesn't execute and Mercurial returns the failure\n"
+" code."
+msgstr ""
+
+msgid ""
+"``prechangegroup``\n"
+" Run before a changegroup is added via push, pull or unbundle. Exit\n"
+" status 0 allows the changegroup to proceed. Non-zero status will\n"
+" cause the push, pull or unbundle to fail. URL from which changes\n"
+" will come is in ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``precommit``\n"
+" Run before starting a local commit. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the commit to fail.\n"
+" Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``prelistkeys``\n"
+" Run before listing pushkeys (like bookmarks) in the\n"
+" repository. Non-zero status will cause failure. The key namespace is\n"
+" in ``$HG_NAMESPACE``."
+msgstr ""
+
+msgid ""
+"``preoutgoing``\n"
+" Run before collecting changes to send from the local repository to\n"
+" another. Non-zero status will cause failure. This lets you prevent\n"
+" pull over HTTP or SSH. Also prevents against local pull, push\n"
+" (outbound) or bundle commands, but not effective, since you can\n"
+" just copy files instead then. Source of operation is in\n"
+" ``$HG_SOURCE``. If \"serve\", operation is happening on behalf of remote\n"
+" SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", operation\n"
+" is happening on behalf of repository on same system."
+msgstr ""
+
+msgid ""
+"``prepushkey``\n"
+" Run before a pushkey (like a bookmark) is added to the\n"
+" repository. Non-zero status will cause the key to be rejected. The\n"
+" key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n"
+" the old value (if any) is in ``$HG_OLD``, and the new value is in\n"
+" ``$HG_NEW``."
+msgstr ""
+
+msgid ""
+"``pretag``\n"
+" Run before creating a tag. Exit status 0 allows the tag to be\n"
+" created. Non-zero status will cause the tag to fail. ID of\n"
+" changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag "
+"is\n"
+" local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``."
+msgstr ""
+
+msgid ""
+"``pretxnchangegroup``\n"
+" Run after a changegroup has been added via push, pull or unbundle,\n"
+" but before the transaction has been committed. Changegroup is\n"
+" visible to hook program. This lets you validate incoming changes\n"
+" before accepting them. Passed the ID of the first new changeset in\n"
+" ``$HG_NODE``. Exit status 0 allows the transaction to commit. Non-zero\n"
+" status will cause the transaction to be rolled back and the push,\n"
+" pull or unbundle will fail. URL that was source of changes is in\n"
+" ``$HG_URL``."
+msgstr ""
+
+msgid ""
+"``pretxncommit``\n"
+" Run after a changeset has been created but the transaction not yet\n"
+" committed. Changeset is visible to hook program. This lets you\n"
+" validate commit message and changes. Exit status 0 allows the\n"
+" commit to proceed. Non-zero status will cause the transaction to\n"
+" be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset\n"
+" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``preupdate``\n"
+" Run before updating the working directory. Exit status 0 allows\n"
+" the update to proceed. Non-zero status will prevent the update.\n"
+" Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID\n"
+" of second new parent is in ``$HG_PARENT2``."
+msgstr ""
+
+msgid ""
+"``listkeys``\n"
+" Run after listing pushkeys (like bookmarks) in the repository. The\n"
+" key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a\n"
+" dictionary containing the keys and values."
+msgstr ""
+
+msgid ""
+"``pushkey``\n"
+" Run after a pushkey (like a bookmark) is added to the\n"
+" repository. The key namespace is in ``$HG_NAMESPACE``, the key is in\n"
+" ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new\n"
+" value is in ``$HG_NEW``."
+msgstr ""
+
+msgid ""
+"``tag``\n"
+" Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.\n"
+" Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in\n"
+" repository if ``$HG_LOCAL=0``."
+msgstr ""
+
+msgid ""
+"``update``\n"
+" Run after updating the working directory. Changeset ID of first\n"
+" new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is\n"
+" in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the\n"
+" update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``."
+msgstr ""
+
+msgid ""
+".. note:: It is generally better to use standard hooks rather than the\n"
+" generic pre- and post- command hooks as they are guaranteed to be\n"
+" called in the appropriate contexts for influencing transactions.\n"
+" Also, hooks like \"commit\" will be called in all contexts that\n"
+" generate a commit (e.g. tag) and not just the commit command."
+msgstr ""
+
+msgid ""
+".. note:: Environment variables with empty values may not be passed to\n"
+" hooks on platforms such as Windows. As an example, ``$HG_PARENT2``\n"
+" will have an empty value under Unix-like platforms for non-merge\n"
+" changesets, while it will not be available at all under Windows."
+msgstr ""
+
+msgid "The syntax for Python hooks is as follows::"
+msgstr ""
+
+msgid ""
+" hookname = python:modulename.submodule.callable\n"
+" hookname = python:/path/to/python/module.py:callable"
+msgstr ""
+
+msgid ""
+"Python hooks are run within the Mercurial process. Each hook is\n"
+"called with at least three keyword arguments: a ui object (keyword\n"
+"``ui``), a repository object (keyword ``repo``), and a ``hooktype``\n"
+"keyword that tells what kind of hook is used. Arguments listed as\n"
+"environment variables above are passed as keyword arguments, with no\n"
+"``HG_`` prefix, and names in lower case."
+msgstr ""
+
+msgid ""
+"If a Python hook returns a \"true\" value or raises an exception, this\n"
+"is treated as a failure."
+msgstr ""
+
+msgid ""
+"\n"
+"``http_proxy``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Used to access web-based Mercurial repositories through a HTTP\n"
+"proxy."
+msgstr ""
+
+msgid ""
+"``host``\n"
+" Host name and (optional) port of the proxy server, for example\n"
+" \"myproxy:8000\"."
+msgstr ""
+
+msgid ""
+"``no``\n"
+" Optional. Comma-separated list of host names that should bypass\n"
+" the proxy."
+msgstr ""
+
+msgid ""
+"``passwd``\n"
+" Optional. Password to authenticate with at the proxy server."
+msgstr ""
+
+msgid ""
+"``user``\n"
+" Optional. User name to authenticate with at the proxy server."
+msgstr ""
+
+msgid ""
+"``always``\n"
+" Optional. Always use the proxy, even for localhost and any entries\n"
+" in ``http_proxy.no``. True or False. Default: False."
+msgstr ""
+
+msgid ""
+"``smtp``\n"
+"\"\"\"\"\"\"\"\""
+msgstr ""
+
+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"
+"``patch``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Settings used when applying patches, for instance through the 'import'\n"
+"command or with Mercurial Queues extension."
+msgstr ""
+
+msgid ""
+"``eol``\n"
+" When set to 'strict' patch content and patched files end of lines\n"
+" are preserved. When set to ``lf`` or ``crlf``, both files end of\n"
+" lines are ignored when patching and the result line endings are\n"
+" normalized to either LF (Unix) or CRLF (Windows). When set to\n"
+" ``auto``, end of lines are again ignored while patching but line\n"
+" endings in patched files are normalized to their original setting\n"
+" on a per-file basis. If target file does not exist or has no end\n"
+" of line, patch line endings are preserved.\n"
+" Default: strict."
+msgstr ""
+
+msgid ""
+"\n"
+"``paths``\n"
+"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Assigns symbolic names to repositories. The left side is the\n"
+"symbolic name, and the right gives the directory or URL that is the\n"
+"location of the repository. Default paths can be declared by setting\n"
+"the following entries."
+msgstr ""
+
+msgid ""
+"``default``\n"
+" Directory or URL to use when pulling if no source is specified.\n"
+" Default is set to repository from which the current repository was\n"
+" cloned."
+msgstr ""
+
+msgid ""
+"``default-push``\n"
+" Optional. Directory or URL to use when pushing if no destination\n"
+" is specified."
+msgstr ""
+
+msgid ""
+"\n"
+"``profiling``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"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.\n"
+" Default: text."
+msgstr ""
+
+msgid ""
+" ``text``\n"
+" Generate a profiling report. When saving to a file, it should be\n"
+" noted that only the report is saved, and the profiling data is\n"
+" not kept.\n"
+" ``kcachegrind``\n"
+" Format profiling data for kcachegrind use: when saving to a\n"
+" file, the generated file can directly be loaded into\n"
+" kcachegrind."
+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"
+" stderr"
+msgstr ""
+
+msgid ""
+"``revsetalias``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Alias definitions for revsets. See :hg:`help revsets` for details."
+msgstr ""
+
+msgid ""
+"``server``\n"
+"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Controls generic server settings."
+msgstr ""
+
+msgid ""
+"``uncompressed``\n"
+" Whether to allow clients to clone a repository using the\n"
+" uncompressed streaming protocol. This transfers about 40% more\n"
+" data than a regular clone, but uses less memory and CPU on both\n"
+" server and client. Over a LAN (100 Mbps or better) or a very fast\n"
+" WAN, an uncompressed streaming clone is a lot faster (~10x) than a\n"
+" regular clone. Over most WAN connections (anything slower than\n"
+" about 6 Mbps), uncompressed streaming is slower, because of the\n"
+" extra data transfer overhead. This mode will also temporarily hold\n"
+" the write lock while determining what data to transfer.\n"
+" Default is True."
+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"
+" present. Default is False."
+msgstr ""
+
+msgid ""
+"``subpaths``\n"
+"\"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid "Defines subrepositories source locations rewriting rules of the form::"
+msgstr ""
+
+msgid " <pattern> = <replacement>"
+msgstr ""
+
+msgid ""
+"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/"
+msgstr ""
+
+msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``."
+msgstr ""
+
+msgid "All patterns are applied in definition order."
+msgstr ""
+
+msgid ""
+"``trusted``\n"
+"\"\"\"\"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Mercurial will not use the settings in the\n"
+"``.hg/hgrc`` file from a repository if it doesn't belong to a trusted\n"
+"user or to a trusted group, as various hgrc features allow arbitrary\n"
+"commands to be run. This issue is often encountered when configuring\n"
+"hooks or extensions for shared repositories or servers. However,\n"
+"the web interface will use some safe settings from the ``[web]``\n"
+"section."
+msgstr ""
+
+msgid ""
+"This section specifies what users and groups are trusted. The\n"
+"current user is always trusted. To trust everybody, list a user or a\n"
+"group with name ``*``. These settings must be placed in an\n"
+"*already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the\n"
+"user or service running Mercurial."
+msgstr ""
+
+msgid ""
+"``users``\n"
+" Comma-separated list of trusted users."
+msgstr ""
+
+msgid ""
+"``groups``\n"
+" Comma-separated list of trusted groups."
+msgstr ""
+
+msgid ""
+"\n"
+"``ui``\n"
+"\"\"\"\"\"\""
+msgstr ""
+
+msgid "User interface controls."
+msgstr ""
+
+msgid ""
+"``archivemeta``\n"
+" Whether to include the .hg_archival.txt file containing meta data\n"
+" (hashes for the repository base and for tip) in archives created\n"
+" by the :hg:`archive` command or downloaded via hgweb.\n"
+" Default is True."
+msgstr ""
+
+msgid ""
+"``askusername``\n"
+" Whether to prompt for a username when committing. If True, and\n"
+" neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user "
+"will\n"
+" be prompted to enter a username. If no username is entered, the\n"
+" default ``USER@HOST`` is used instead.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``commitsubrepos``\n"
+" 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 True."
+msgstr ""
+
+msgid ""
+"``debug``\n"
+" Print debugging information. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"``editor``\n"
+" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``."
+msgstr ""
+
+msgid ""
+"``fallbackencoding``\n"
+" Encoding to try if it's not possible to decode the changelog using\n"
+" UTF-8. Default is ISO-8859-1."
+msgstr ""
+
+msgid ""
+"``ignore``\n"
+" A file to read per-user ignore patterns from. This file should be\n"
+" in the same format as a repository-wide .hgignore file. This\n"
+" option supports hook syntax, so if you want to specify multiple\n"
+" ignore files, you can do so by setting something like\n"
+" ``ignore.other = ~/.hgignore2``. For details of the ignore file\n"
+" format, see the ``hgignore(5)`` man page."
+msgstr ""
+
+msgid ""
+"``interactive``\n"
+" Allow to prompt the user. True or False. Default is True."
+msgstr ""
+
+msgid ""
+"``logtemplate``\n"
+" Template string for commands that print changesets."
+msgstr ""
+
+msgid ""
+"``merge``\n"
+" The conflict resolution program to use during a manual merge.\n"
+" For more information on merge tools see :hg:`help merge-tools`.\n"
+" For configuring merge tools see the ``[merge-tools]`` section."
+msgstr ""
+
+msgid ""
+"``portablefilenames``\n"
+" Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n"
+" Default is ``warn``.\n"
+" If set to ``warn`` (or ``true``), a warning message is printed on POSIX\n"
+" platforms, if a file with a non-portable filename is added (e.g. a file\n"
+" with a name that can't be created on Windows because it contains "
+"reserved\n"
+" parts like ``AUX``, reserved characters like ``:``, or would cause a "
+"case\n"
+" collision with an existing file).\n"
+" If set to ``ignore`` (or ``false``), no warning is printed.\n"
+" If set to ``abort``, the command is aborted.\n"
+" On Windows, this configuration option is ignored and the command aborted."
+msgstr ""
+
+msgid ""
+"``quiet``\n"
+" Reduce the amount of output printed. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"``remotecmd``\n"
+" remote command to use for clone/push/pull operations. Default is ``hg``."
+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."
+msgstr ""
+
+msgid ""
+"``slash``\n"
+" Display paths using a slash (``/``) as the path separator. This\n"
+" only makes a difference on systems where the default path\n"
+" separator is not the slash character (e.g. Windows uses the\n"
+" backslash character (``\\``)).\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``ssh``\n"
+" command to use for SSH connections. Default is ``ssh``."
+msgstr ""
+
+msgid ""
+"``strict``\n"
+" Require exact command names, instead of allowing unambiguous\n"
+" abbreviations. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"``style``\n"
+" Name of style to use for command output."
+msgstr ""
+
+msgid ""
+"``timeout``\n"
+" The timeout used when a lock is held (in seconds), a negative value\n"
+" means no timeout. Default is 600."
+msgstr ""
+
+msgid ""
+"``traceback``\n"
+" Mercurial always prints a traceback when an unknown exception\n"
+" occurs. Setting this to True will make Mercurial print a traceback\n"
+" on all exceptions, even those recognized by Mercurial (such as\n"
+" IOError or MemoryError). Default is False."
+msgstr ""
+
+msgid ""
+"``username``\n"
+" The committer of a changeset created when running \"commit\".\n"
+" Typically a person's name and email address, e.g. ``Fred Widget\n"
+" <fred@example.com>``. Default is ``$EMAIL`` or ``username@hostname``. "
+"If\n"
+" the username in hgrc is empty, it has to be specified manually or\n"
+" in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set\n"
+" ``username =`` in the system hgrc). Environment variables in the\n"
+" username are expanded."
+msgstr ""
+
+msgid ""
+"``verbose``\n"
+" Increase the amount of output printed. True or False. Default is False."
+msgstr ""
+
+msgid ""
+"\n"
+"``web``\n"
+"\"\"\"\"\"\"\""
+msgstr ""
+
+msgid ""
+"Web interface configuration. The settings in this section apply to\n"
+"both the builtin webserver (started by :hg:`serve`) and the script you\n"
+"run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI\n"
+"and WSGI)."
+msgstr ""
+
+msgid ""
+"The Mercurial webserver does no authentication (it does not prompt for\n"
+"usernames and passwords to validate *who* users are), but it does do\n"
+"authorization (it grants or denies access for *authenticated users*\n"
+"based on settings in this section). You must either configure your\n"
+"webserver to do authentication for you, or disable the authorization\n"
+"checks."
+msgstr ""
+
+msgid ""
+"For a quick setup in a trusted environment, e.g., a private LAN, where\n"
+"you want it to accept pushes from anybody, you can use the following\n"
+"command line::"
+msgstr ""
+
+msgid " $ hg --config web.allow_push=* --config web.push_ssl=False serve"
+msgstr ""
+
+msgid ""
+"Note that this will allow anybody to push anything to the server and\n"
+"that this should not be used for public servers."
+msgstr ""
+
+msgid "The full set of options is:"
+msgstr "Fullständig inställningslista:"
+
+msgid ""
+"``accesslog``\n"
+" Where to output the access log. Default is stdout."
+msgstr ""
+
+msgid ""
+"``address``\n"
+" Interface address to bind to. Default is all."
+msgstr ""
+
+msgid ""
+"``allow_archive``\n"
+" List of archive format (bz2, gz, zip) allowed for downloading.\n"
+" Default is empty."
+msgstr ""
+
+msgid ""
+"``allowbz2``\n"
+" (DEPRECATED) Whether to allow .tar.bz2 downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``allowgz``\n"
+" (DEPRECATED) Whether to allow .tar.gz downloading of repository\n"
+" revisions.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``allowpull``\n"
+" Whether to allow pulling from the repository. Default is True."
+msgstr ""
+
+msgid ""
+"``allow_push``\n"
+" Whether to allow pushing to the repository. If empty or not set,\n"
+" push is not allowed. If the special value ``*``, any remote user can\n"
+" push, including unauthenticated users. Otherwise, the remote user\n"
+" must have been authenticated, and the authenticated user name must\n"
+" be present in this list. The contents of the allow_push list are\n"
+" examined after the deny_push list."
+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"
+" repository access to the user. If this list is not empty, and the\n"
+" user is unauthenticated or not present in the list, then access is\n"
+" denied for the user. If the list is empty or not set, then access\n"
+" is permitted to all users by default. Setting allow_read to the\n"
+" special value ``*`` is equivalent to it not being set (i.e. access\n"
+" is permitted to all users). The contents of the allow_read list are\n"
+" examined after the deny_read list."
+msgstr ""
+
+msgid ""
+"``allowzip``\n"
+" (DEPRECATED) Whether to allow .zip downloading of repository\n"
+" revisions. Default is False. This feature creates temporary files."
+msgstr ""
+
+msgid ""
+"``baseurl``\n"
+" Base URL to use when publishing URLs in other locations, so\n"
+" third-party tools like email notification hooks can construct\n"
+" URLs. Example: ``http://hgserver/repos/``."
+msgstr ""
+
+msgid ""
+"``cacerts``\n"
+" Path to file containing a list of PEM encoded certificate\n"
+" 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. 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 ""
+" This feature is only supported when using Python 2.6 or later. If you "
+"wish\n"
+" to use it with earlier versions of Python, install the backported\n"
+" version of the ssl library that is available from\n"
+" ``http://pypi.python.org``."
+msgstr ""
+
+msgid ""
+" 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 ""
+" To disable SSL verification temporarily, specify ``--insecure`` from\n"
+" command line."
+msgstr ""
+
+msgid ""
+"``cache``\n"
+" Whether to support caching in hgweb. Defaults to True."
+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."
+msgstr ""
+
+msgid ""
+"``deny_push``\n"
+" Whether to deny pushing to the repository. If empty or not set,\n"
+" push is not denied. If the special value ``*``, all remote users are\n"
+" denied push. Otherwise, unauthenticated users are all denied, and\n"
+" any authenticated user name present in this list is also denied. The\n"
+" contents of the deny_push list are examined before the allow_push list."
+msgstr ""
+
+msgid ""
+"``deny_read``\n"
+" Whether to deny reading/viewing of the repository. If this list is\n"
+" not empty, unauthenticated users are all denied, and any\n"
+" authenticated user name present in this list is also denied access to\n"
+" the repository. If set to the special value ``*``, all remote users\n"
+" are denied access (rarely needed ;). If deny_read is empty or not set,\n"
+" the determination of repository access depends on the presence and\n"
+" content of the allow_read list (see description). If both\n"
+" deny_read and allow_read are empty or not set, then access is\n"
+" permitted to all users by default. If the repository is being\n"
+" served via hgwebdir, denied users will not be able to see it in\n"
+" the list of repositories. The contents of the deny_read list have\n"
+" priority over (are examined before) the contents of the allow_read\n"
+" list."
+msgstr ""
+
+msgid ""
+"``descend``\n"
+" hgwebdir indexes will not descend into subdirectories. Only "
+"repositories\n"
+" directly in the current path will be shown (other repositories are "
+"still\n"
+" available from the index corresponding to their containing path)."
+msgstr ""
+
+msgid ""
+"``description``\n"
+" Textual description of the repository's purpose or contents.\n"
+" Default is \"unknown\"."
+msgstr ""
+
+msgid ""
+"``encoding``\n"
+" Character encoding name. Default is the current locale charset.\n"
+" Example: \"UTF-8\""
+msgstr ""
+
+msgid ""
+"``errorlog``\n"
+" Where to output the error log. Default is stderr."
+msgstr ""
+
+msgid ""
+"``hidden``\n"
+" Whether to hide the repository in the hgwebdir index.\n"
+" Default is False."
+msgstr ""
+
+msgid ""
+"``ipv6``\n"
+" Whether to use IPv6. Default is False."
+msgstr ""
+
+msgid ""
+"``logourl``\n"
+" Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n"
+" will be used."
+msgstr ""
+
+msgid ""
+"``name``\n"
+" Repository name to use in the web interface. Default is current\n"
+" working directory."
+msgstr ""
+
+msgid ""
+"``maxchanges``\n"
+" Maximum number of changes to list on the changelog. Default is 10."
+msgstr ""
+
+msgid ""
+"``maxfiles``\n"
+" Maximum number of files to list per changeset. Default is 10."
+msgstr ""
+
+msgid ""
+"``port``\n"
+" Port to listen on. Default is 8000."
+msgstr ""
+"``port``\n"
+"Port att lyssna på. Standard är 8000."
+
+msgid ""
+"``prefix``\n"
+" Prefix path to serve from. Default is '' (server root)."
+msgstr ""
+"``prefix``\n"
+"Sökvägsprefix att dela ut från. Standard är '' (serverrot)."
+
+msgid ""
+"``push_ssl``\n"
+" Whether to require that inbound pushes be transported over SSL to\n"
+" prevent password sniffing. Default is True."
+msgstr ""
+
+msgid ""
+"``staticurl``\n"
+" Base URL to use for static files. If unset, static files (e.g. the\n"
+" hgicon.png favicon) will be served by the CGI script itself. Use\n"
+" this setting to serve them directly with the HTTP server.\n"
+" Example: ``http://hgserver/static/``."
+msgstr ""
+
+msgid ""
+"``stripes``\n"
+" How many lines a \"zebra stripe\" should span in multiline output.\n"
+" Default is 1; set to 0 to disable."
+msgstr ""
+
+msgid ""
+"``style``\n"
+" Which template map style to use."
+msgstr ""
+"``style``\n"
+" Mallstil att använda."
+
+msgid ""
+"``templates``\n"
+" Where to find the HTML templates. Default is install path.\n"
+msgstr ""
msgid "Some commands allow the user to specify a date, e.g.:"
msgstr "Vissa kommandon tillåter att användare anger ett datum, bland dom:"
@@ -10492,29 +12841,29 @@
msgstr "- ``1165432709 0`` (Wed Dec 6 13:18:29 2006 UTC)"
msgid ""
-"This is the internal representation format for dates. unixtime is the\n"
-"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n"
-"the offset of the local timezone, in seconds west of UTC (negative if\n"
-"the timezone is east of UTC)."
-msgstr ""
-"Detta är det interna representationsformatet för datum. unixtime är antalet\n"
-"sekunder sedan epoken(1970-01-01 00:00 UTC). offset är offseten till den\n"
-"lokala tidszonen, i sekunder väst om UTC (negativ om tidszonen är öst om\n"
-"UTC)."
+"This is the internal representation format for dates. The first number\n"
+"is the number of seconds since the epoch (1970-01-01 00:00 UTC). The\n"
+"second is the offset of the local timezone, in seconds west of UTC\n"
+"(negative if the timezone is east of UTC)."
+msgstr ""
+"Detta är det interna representationsformatet för datum. Det första numret\n"
+"är antalet sekunder sedan epoken(1970-01-01 00:00 UTC). Det andra är\n"
+"offseten för den lokala tidszonen, i sekunder väst om UTC (negativ om\n"
+"tidszonen är öst om UTC)."
msgid "The log command also accepts date ranges:"
msgstr "Kommandot log accepterar också datumintervall:"
msgid ""
-"- ``<{datetime}`` - at or before a given date/time\n"
-"- ``>{datetime}`` - on or after a given date/time\n"
-"- ``{datetime} to {datetime}`` - a date range, inclusive\n"
-"- ``-{days}`` - within a given number of days of today\n"
-msgstr ""
-"- ``<{datumtid}`` - på eller innan datum/tid\n"
-"- ``>{datumtid}`` - på eller efter datum/tid\n"
-"- ``{datumtid} to {datumtid}`` - ett datumintervall, inklusivt\n"
-"- ``-{dagar}`` - inom ett givet antal dagar från idag\n"
+"- ``<DATE`` - at or before a given date/time\n"
+"- ``>DATE`` - on or after a given date/time\n"
+"- ``DATE to DATE`` - a date range, inclusive\n"
+"- ``-DAYS`` - within a given number of days of today\n"
+msgstr ""
+"- ``<DATUM`` - på eller innan datum/tid\n"
+"- ``>DATUM`` - på eller efter datum/tid\n"
+"- ``DATUM to DATUM`` - ett datumintervall, inklusivt\n"
+"- ``-DAGAR`` - inom ett givet antal dagar från idag\n"
msgid ""
"Mercurial's default format for showing changes between two versions of\n"
@@ -10648,6 +12997,18 @@
msgstr ""
msgid ""
+"HGPLAINEXCEPT\n"
+" This is a comma-separated list of features to preserve when\n"
+" HGPLAIN is enabled. Currently the only value supported is \"i18n\",\n"
+" which preserves internationalization in plain mode."
+msgstr ""
+
+msgid ""
+" Setting HGPLAINEXCEPT to anything (even an empty string) will\n"
+" enable plain mode."
+msgstr ""
+
+msgid ""
"HGUSER\n"
" This is the string used as the author of a commit. If not set,\n"
" available values will be considered in this order:"
@@ -10766,6 +13127,108 @@
" baz = !\n"
msgid ""
+"Mercurial supports a functional language for selecting a set of\n"
+"files. "
+msgstr "Mercurial stöder ett funktionellt språk för att välja en\n"
+"uppsättning filer. "
+
+msgid ""
+"Like other file patterns, this pattern type is indicated by a prefix,\n"
+"'set:'. The language supports a number of predicates which are joined\n"
+"by infix operators. Parenthesis can be used for grouping."
+msgstr ""
+
+msgid ""
+"Identifiers such as filenames or patterns must be quoted with single\n"
+"or double quotes if they contain characters outside of\n"
+"``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n"
+"predefined predicates. This generally applies to file patterns other\n"
+"than globs and arguments for predicates."
+msgstr ""
+
+msgid ""
+"Special characters can be used in quoted identifiers by escaping them,\n"
+"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
+"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
+msgstr ""
+
+msgid "There is a single prefix operator:"
+msgstr ""
+
+msgid ""
+"``not x``\n"
+" Files not in x. Short form is ``! x``."
+msgstr ""
+
+msgid "These are the supported infix operators:"
+msgstr ""
+
+msgid ""
+"``x and y``\n"
+" The intersection of files in x and y. Short form is ``x & y``."
+msgstr ""
+
+msgid ""
+"``x or y``\n"
+" The union of files in x and y. There are two alternative short\n"
+" forms: ``x | y`` and ``x + y``."
+msgstr ""
+
+msgid ""
+"``x - y``\n"
+" Files in x but not in y."
+msgstr ""
+
+msgid "The following predicates are supported:"
+msgstr ""
+
+msgid ".. predicatesmarker"
+msgstr ""
+
+msgid "Some sample queries:"
+msgstr ""
+
+msgid ""
+"- Show status of files that appear to be binary in the working directory::"
+msgstr ""
+
+msgid " hg status -A \"set:binary()\""
+msgstr ""
+
+msgid "- Forget files that are in .hgignore but are already tracked::"
+msgstr ""
+
+msgid " hg forget \"set:hgignore() and not ignored()\""
+msgstr ""
+
+msgid "- Find text files that contain a string::"
+msgstr ""
+
+msgid " hg locate \"set:grep(magic) and not binary()\""
+msgstr ""
+
+msgid "- Find C files in a non-standard encoding::"
+msgstr ""
+
+msgid " hg locate \"set:**.c and not encoding(ascii)\""
+msgstr ""
+
+msgid "- Revert copies of large binary files::"
+msgstr ""
+
+msgid " hg revert \"set:copied() and binary() and size('>1M')\""
+msgstr ""
+
+msgid "- Remove files listed in files.lst that contain the letter a or b::"
+msgstr ""
+
+msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\""
+msgstr ""
+
+msgid "See also :hg:`help patterns`.\n"
+msgstr ""
+
+msgid ""
"Ancestor\n"
" Any changeset that can be reached by an unbroken chain of parent\n"
" changesets from a given changeset. More precisely, the ancestors\n"
@@ -10775,6 +13238,27 @@
msgstr ""
msgid ""
+"Bookmark\n"
+" Bookmarks are pointers to certain commits that move when\n"
+" committing. They are similar to tags in that it is possible to use\n"
+" bookmark names in all places where Mercurial expects a changeset\n"
+" ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n"
+" when you make a commit."
+msgstr ""
+" Bokmärken är pekare till utvalda arkiveringar som flyttar vid\n"
+" arkivering. De liknar märken på det sättet att du kan använda\n"
+" bokmärkesnamn på alla platser där Mercurial förväntar sig ett\n"
+" ändrings-ID, exexempelvis med :hg:`update`. Till skillnad från märken,\n"
+" så förflyttas bokmärken när du arkiverar."
+
+msgid ""
+" Bookmarks can be renamed, copied and deleted. Bookmarks are local,\n"
+" unless they are explicitly pushed or pulled between repositories.\n"
+" Pushing and pulling bookmarks allow you to collaborate with others\n"
+" on a branch without creating a named branch."
+msgstr ""
+
+msgid ""
"Branch\n"
" (Noun) A child changeset that has been created from a parent that\n"
" is not a head. These are known as topological branches, see\n"
@@ -11256,6 +13740,14 @@
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"
+" :hg:`update`. The creation of a tag is stored in the history and\n"
+" will thus automatically be shared with other using push and pull."
+msgstr ""
+
+msgid ""
"Tip\n"
" The changeset with the highest revision number. It is the changeset\n"
" most recently added in a repository."
@@ -11298,6 +13790,124 @@
msgstr ""
msgid ""
+"Synopsis\n"
+"--------"
+msgstr ""
+
+msgid ""
+"The Mercurial system uses a file called ``.hgignore`` in the root\n"
+"directory of a repository to control its behavior when it searches\n"
+"for files that it is not currently tracking."
+msgstr ""
+
+msgid ""
+"Description\n"
+"-----------"
+msgstr ""
+"Beskrivning\n"
+"-----------"
+
+msgid ""
+"The working directory of a Mercurial repository will often contain\n"
+"files that should not be tracked by Mercurial. These include backup\n"
+"files created by editors and build products created by compilers.\n"
+"These files can be ignored by listing them in a ``.hgignore`` file in\n"
+"the root of the working directory. The ``.hgignore`` file must be\n"
+"created manually. It is typically put under version control, so that\n"
+"the settings will propagate to other repositories with push and pull."
+msgstr ""
+
+msgid ""
+"An untracked file is ignored if its path relative to the repository\n"
+"root directory, or any prefix path of that path, is matched against\n"
+"any pattern in ``.hgignore``."
+msgstr ""
+
+msgid ""
+"For example, say we have an untracked file, ``file.c``, at\n"
+"``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``\n"
+"if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``."
+msgstr ""
+
+msgid ""
+"In addition, a Mercurial configuration file can reference a set of\n"
+"per-user or global ignore files. See the ``ignore`` configuration\n"
+"key on the ``[ui]`` section of :hg:`help config` for details of how to\n"
+"configure these files."
+msgstr ""
+
+msgid ""
+"To control Mercurial's handling of files that it manages, many\n"
+"commands support the ``-I`` and ``-X`` options; see\n"
+":hg:`help <command>` and :hg:`help patterns` for details."
+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"
+"is treated as an escape character."
+msgstr ""
+
+msgid ""
+"Mercurial supports several pattern syntaxes. The default syntax used\n"
+"is Python/Perl-style regular expressions."
+msgstr ""
+
+msgid "To change the syntax used, use a line of the following form::"
+msgstr ""
+
+msgid " syntax: NAME"
+msgstr ""
+
+msgid "where ``NAME`` is one of the following:"
+msgstr ""
+
+msgid ""
+"``regexp``\n"
+" Regular expression, Python/Perl syntax.\n"
+"``glob``\n"
+" Shell-style glob."
+msgstr ""
+
+msgid ""
+"The chosen syntax stays in effect when parsing all patterns that\n"
+"follow, until another syntax is selected."
+msgstr ""
+
+msgid ""
+"Neither glob nor regexp patterns are rooted. A glob-syntax pattern of\n"
+"the form ``*.c`` will match a file ending in ``.c`` in any directory,\n"
+"and a regexp pattern of the form ``\\.c$`` will do the same. To root a\n"
+"regexp pattern, start it with ``^``."
+msgstr ""
+
+msgid ""
+"Example\n"
+"-------"
+msgstr ""
+
+msgid "Here is an example ignore file. ::"
+msgstr ""
+
+msgid ""
+" # use glob syntax.\n"
+" syntax: glob"
+msgstr ""
+
+msgid ""
+" *.elc\n"
+" *.pyc\n"
+" *~"
+msgstr ""
+
+msgid ""
+" # switch to regexp syntax.\n"
+" syntax: regexp\n"
+" ^\\.pc/\n"
+msgstr ""
+
+msgid ""
"Mercurial's internal web server, hgweb, can serve either a single\n"
"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"
@@ -11309,11 +13919,11 @@
"för webbkonfiguration"
msgid ""
-"This file uses the same syntax as hgrc configuration files, but only\n"
-"the following sections are recognized:"
-msgstr ""
-"Denna fil använder samma syntax som hgrc-konfigurationsfiler, men bara de\n"
-"följande sektionerna används:"
+"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 bara de följande sektionerna används:"
msgid ""
" - web\n"
@@ -11326,10 +13936,12 @@
msgid ""
"The ``web`` section can specify all the settings described in the web\n"
-"section of the hgrc documentation."
+"section of the hgrc(5) documentation. See :hg:`help config` for\n"
+"information on where to find the manual page."
msgstr ""
"Sektionen ``web`` kan ange alla inställningar som beskrivs i web-sektionen\n"
-"i hgrc-dokumentationen."
+"i hgrc(5)-dokumentationen. Se :hg:`help config` för information om var\n"
+"manualsidan hittas."
msgid ""
"The ``paths`` section provides mappings of physical repository\n"
@@ -11696,7 +14308,10 @@
msgid ""
" listfile:list.txt read list from list.txt with one file pattern per line\n"
-" listfile0:list.txt read list from list.txt with null byte delimiters\n"
+" listfile0:list.txt read list from list.txt with null byte delimiters"
+msgstr ""
+
+msgid "See also :hg:`help filesets`.\n"
msgstr ""
msgid "Mercurial supports several ways to specify individual revisions."
@@ -11767,7 +14382,7 @@
msgid ""
"Mercurial supports a functional language for selecting a set of\n"
"revisions."
-msgstr "Mercurial stöder flera sött att ange individuella revisioner."
+msgstr "Mercurial stöder flera sätt att ange individuella revisioner."
msgid ""
"The language supports a number of predicates which are joined by infix\n"
@@ -11782,22 +14397,10 @@
msgstr ""
msgid ""
-"Special characters can be used in quoted identifiers by escaping them,\n"
-"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n"
-"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``."
-msgstr ""
-
-msgid "There is a single prefix operator:"
-msgstr ""
-
-msgid ""
"``not x``\n"
" Changesets not in x. Short form is ``! x``."
msgstr ""
-msgid "These are the supported infix operators:"
-msgstr ""
-
msgid ""
"``x::y``\n"
" A DAG range, meaning all changesets that are descendants of x and\n"
@@ -11832,10 +14435,59 @@
" Changesets in x but not in y."
msgstr ""
-msgid "The following predicates are supported:"
-msgstr ""
-
-msgid ".. predicatesmarker"
+msgid ""
+"``x^n``\n"
+" The nth parent of x, n == 0, 1, or 2.\n"
+" For n == 0, x; for n == 1, the first parent of each changeset in x;\n"
+" for n == 2, the second parent of changeset in x."
+msgstr ""
+
+msgid ""
+"``x~n``\n"
+" The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``."
+msgstr ""
+
+msgid "There is a single postfix operator:"
+msgstr ""
+
+msgid ""
+"``x^``\n"
+" Equivalent to ``x^1``, the first parent of each changeset in x."
+msgstr ""
+
+msgid ""
+"\n"
+"The following predicates are supported:"
+msgstr ""
+
+msgid ""
+"New predicates (known as \"aliases\") can be defined, using any combination "
+"of\n"
+"existing predicates or other aliases. An alias definition looks like::"
+msgstr ""
+
+msgid " <alias> = <definition>"
+msgstr ""
+
+msgid ""
+"in the ``revsetalias`` section of a Mercurial configuration file. Arguments\n"
+"of the form `$1`, `$2`, etc. are substituted from the alias into the\n"
+"definition."
+msgstr ""
+
+msgid "For example,"
+msgstr "Exempelvis,"
+
+msgid ""
+" [revsetalias]\n"
+" h = heads()\n"
+" d($1) = sort($1, date)\n"
+" rs($1, $2) = reverse(sort($1, $2))"
+msgstr ""
+
+msgid ""
+"defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is\n"
+"exactly equivalent to ``reverse(sort(0:tip, author))``."
msgstr ""
msgid "Command line equivalents for :hg:`log`::"
@@ -11852,9 +14504,6 @@
" -l x -> limit(expr, x)"
msgstr ""
-msgid "Some sample queries:"
-msgstr ""
-
msgid "- Changesets on the default branch::"
msgstr "- Ändringar på default-grenen::"
@@ -11881,7 +14530,7 @@
msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\""
msgstr ""
-msgid "- Changesets in committed May 2008, sorted by user::"
+msgid "- Changesets committed in May 2008, sorted by user::"
msgstr ""
msgid " hg log -r \"sort(date('May 2008'), user)\""
@@ -12122,73 +14771,7 @@
"keywords are usually available for templating a log-like command:"
msgstr ""
-msgid ":author: String. The unmodified author of the changeset."
-msgstr ""
-
-msgid ""
-":branches: List of strings. The name of the branch on which the\n"
-" changeset was committed. Will be empty if the branch name was\n"
-" default."
-msgstr ""
-
-msgid ":children: List of strings. The children of the changeset."
-msgstr ""
-
-msgid ":date: Date information. The date when the changeset was committed."
-msgstr ""
-
-msgid ":desc: String. The text of the changeset description."
-msgstr ""
-
-msgid ""
-":diffstat: String. Statistics of changes with the following format:\n"
-" \"modified files: +added/-removed lines\""
-msgstr ""
-
-msgid ""
-":files: List of strings. All files modified, added, or removed by this\n"
-" changeset."
-msgstr ""
-
-msgid ":file_adds: List of strings. Files added by this changeset."
-msgstr ""
-
-msgid ""
-":file_copies: List of strings. Files copied in this changeset with\n"
-" their sources."
-msgstr ""
-
-msgid ""
-":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
-" only if the --copied switch is set."
-msgstr ""
-
-msgid ":file_mods: List of strings. Files modified by this changeset."
-msgstr ""
-
-msgid ":file_dels: List of strings. Files removed by this changeset."
-msgstr ""
-
-msgid ""
-":node: String. The changeset identification hash, as a 40 hexadecimal\n"
-" digit string."
-msgstr ""
-
-msgid ":parents: List of strings. The parents of the changeset."
-msgstr ""
-
-msgid ":rev: Integer. The repository-local changeset revision number."
-msgstr ""
-
-msgid ":tags: List of strings. Any tags associated with the changeset."
-msgstr ""
-
-msgid ""
-":latesttag: String. Most recent global tag in the ancestors of this\n"
-" changeset."
-msgstr ""
-
-msgid ":latesttagdistance: Integer. Longest path to the latest tag."
+msgid ".. keywordsmarker"
msgstr ""
msgid ""
@@ -12208,131 +14791,7 @@
msgid "List of filters:"
msgstr ""
-msgid ""
-":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
-" every line except the last."
-msgstr ""
-
-msgid ""
-":age: Date. Returns a human-readable date/time difference between the\n"
-" given date/time and the current date/time."
-msgstr ""
-
-msgid ""
-":basename: Any text. Treats the text as a path, and returns the last\n"
-" component of the path after splitting by the path separator\n"
-" (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n"
-" \"baz\" and \"foo/bar//\" becomes \"bar\"."
-msgstr ""
-
-msgid ""
-":stripdir: Treat the text as path and strip a directory level, if\n"
-" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"."
-msgstr ""
-
-msgid ""
-":date: Date. Returns a date in a Unix date format, including the\n"
-" timezone: \"Mon Sep 04 15:13:13 2006 0700\"."
-msgstr ""
-
-msgid ""
-":domain: Any text. Finds the first string that looks like an email\n"
-" address, and extracts just the domain component. Example: ``User\n"
-" <user@example.com>`` becomes ``example.com``."
-msgstr ""
-
-msgid ""
-":email: Any text. Extracts the first string that looks like an email\n"
-" address. Example: ``User <user@example.com>`` becomes\n"
-" ``user@example.com``."
-msgstr ""
-
-msgid ""
-":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
-" and \">\" with XML entities."
-msgstr ""
-
-msgid ""
-":hex: Any text. Convert a binary Mercurial node identifier into\n"
-" its long hexadecimal representation."
-msgstr ""
-
-msgid ":fill68: Any text. Wraps the text to fit in 68 columns."
-msgstr ""
-
-msgid ":fill76: Any text. Wraps the text to fit in 76 columns."
-msgstr ""
-
-msgid ":firstline: Any text. Returns the first line of text."
-msgstr ""
-
-msgid ":nonempty: Any text. Returns '(none)' if the string is empty."
-msgstr ""
-
-msgid ""
-":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
-" 25200\" (Unix timestamp, timezone offset)."
-msgstr ""
-
-msgid ""
-":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
-" +0200\"."
-msgstr ""
-
-msgid ""
-":isodatesec: Date. Returns the date in ISO 8601 format, including\n"
-" seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n"
-" filter."
-msgstr ""
-
-msgid ":localdate: Date. Converts a date to local date."
-msgstr ""
-
-msgid ""
-":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
-" XML entities."
-msgstr ""
-
-msgid ":person: Any text. Returns the text before an email address."
-msgstr ""
-
-msgid ""
-":rfc822date: Date. Returns a date using the same format used in email\n"
-" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"."
-msgstr ""
-
-msgid ""
-":rfc3339date: Date. Returns a date using the Internet date format\n"
-" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"."
-msgstr ""
-
-msgid ""
-":short: Changeset hash. Returns the short form of a changeset hash,\n"
-" i.e. a 12 hexadecimal digit string."
-msgstr ""
-
-msgid ":shortdate: Date. Returns a date like \"2006-09-18\"."
-msgstr ""
-
-msgid ""
-":stringify: Any type. Turns the value into text by converting values into\n"
-" text and concatenating them."
-msgstr ""
-
-msgid ":strip: Any text. Strips all leading and trailing whitespace."
-msgstr ""
-
-msgid ""
-":tabindent: Any text. Returns the text, with every line except the\n"
-" first starting with a tab character."
-msgstr ""
-
-msgid ""
-":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
-" \"foo bar\" becomes \"foo%20bar\"."
-msgstr ""
-
-msgid ":user: Any text. Returns the user portion of an email address.\n"
+msgid ".. filtersmarker\n"
msgstr ""
msgid "Valid URLs are of the form::"
@@ -12521,6 +14980,10 @@
msgstr ""
#, python-format
+msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
+msgstr ""
+
+#, python-format
msgid "calling hook %s: %s\n"
msgstr ""
@@ -12574,6 +15037,13 @@
msgid "warning: %s hook %s\n"
msgstr ""
+msgid "kb"
+msgstr "kb"
+
+#, python-format
+msgid "ignoring invalid [auth] key '%s'\n"
+msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n"
+
msgid "connection ended unexpectedly"
msgstr ""
@@ -12614,6 +15084,9 @@
msgid "'%s' uses newer protocol %s"
msgstr ""
+msgid "unexpected response:"
+msgstr "oväntat svar:"
+
#, python-format
msgid "push failed: %s"
msgstr "tryckning misslyckades: %s"
@@ -12641,10 +15114,6 @@
msgstr ""
#, python-format
-msgid "requirement '%s' not supported"
-msgstr ""
-
-#, python-format
msgid ".hg/sharedpath points to nonexistent directory %s"
msgstr ""
@@ -12692,7 +15161,7 @@
msgstr "återkallar okänd transaktion\n"
#, python-format
-msgid "Named branch could not be reset, current branch still is: %s\n"
+msgid "named branch could not be reset, current branch is still: %s\n"
msgstr ""
#, python-format
@@ -12742,8 +15211,8 @@
msgid "file not tracked!"
msgstr "filen spåras inte!"
-msgid "unresolved merge conflicts (see hg resolve)"
-msgstr ""
+msgid "unresolved merge conflicts (see hg help resolve)"
+msgstr "olösta sammanfogningskonflikter (se hg help resolve)"
#, python-format
msgid "committing subrepository %s\n"
@@ -12768,14 +15237,6 @@
"changegroupsubset."
#, python-format
-msgid "updating bookmark %s\n"
-msgstr "uppdaterar bokmärket %s\n"
-
-#, python-format
-msgid "not updating divergent bookmark %s\n"
-msgstr "uppdaterar inte divergent bokmärke %s\n"
-
-#, python-format
msgid "%d changesets found\n"
msgstr "%d ändringar hittades\n"
@@ -12886,6 +15347,10 @@
msgstr "ogiltig lokal adress: %s"
#, python-format
+msgid "'\\n' and '\\r' disallowed in filenames: %r"
+msgstr ""
+
+#, python-format
msgid "failed to remove %s from manifest"
msgstr ""
@@ -12972,10 +15437,6 @@
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 "branch %s not found"
-msgstr "grenen %s hittades inte"
-
msgid "merging with a working directory ancestor has no effect"
msgstr ""
@@ -12992,7 +15453,7 @@
msgid "crosses branches (merge branches or use --clean to discard changes)"
msgstr ""
-msgid "crosses branches (merge branches or use --check to force update)"
+msgid "crosses branches (merge branches or update --check to force update)"
msgstr ""
msgid "Attention:"
@@ -13023,12 +15484,24 @@
msgstr "Varning!"
#, python-format
-msgid "cannot create %s: destination already exists"
-msgstr ""
-
-#, python-format
-msgid "cannot create %s: unable to create destination directory"
-msgstr ""
+msgid "unexpected token: %s"
+msgstr ""
+
+#, python-format
+msgid "not a prefix: %s"
+msgstr "inte ett prefix: %s"
+
+#, python-format
+msgid "not an infix: %s"
+msgstr "inte en infix: %s"
+
+#, python-format
+msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
+msgstr ""
+
+#, python-format
+msgid "cannot patch %s: file is not tracked"
+msgstr "kan inte patcha %s: filen är inte hanterad"
#, python-format
msgid "unable to find '%s' for patching\n"
@@ -13039,14 +15512,14 @@
msgstr ""
#, python-format
-msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n"
-msgstr ""
-
-#, python-format
msgid "bad hunk #%d %s (%d %d %d %d)"
msgstr ""
#, python-format
+msgid "cannot create %s: destination already exists\n"
+msgstr "kan inte skapa %s: destinationen finns redan\n"
+
+#, python-format
msgid "file %s already exists\n"
msgstr ""
@@ -13085,7 +15558,7 @@
msgstr ""
#, python-format
-msgid "malformed patch %s %s"
+msgid "cannot create %s: destination already exists"
msgstr ""
#, python-format
@@ -13104,10 +15577,6 @@
msgstr ""
#, python-format
-msgid " %d files changed, %d insertions(+), %d deletions(-)\n"
-msgstr ""
-
-#, python-format
msgid "exited with status %d"
msgstr ""
@@ -13177,84 +15646,209 @@
msgid "consistency error in delta"
msgstr ""
-msgid "unknown base"
-msgstr ""
-
-msgid "unterminated string"
-msgstr ""
-
-msgid "syntax error"
-msgstr ""
-
-msgid "missing argument"
-msgstr ""
+msgid "unknown delta base"
+msgstr "okänd deltabas"
#, python-format
msgid "can't use %s here"
msgstr "kan inte använda %s här"
-msgid "can't use a list in this context"
-msgstr "kan inte använda en lista i detta sammanhang"
-
-#, python-format
-msgid "not a function: %s"
-msgstr "inte en funktion: %s"
-
-msgid ""
-"``id(string)``\n"
-" Revision non-ambiguously specified by the given hex string prefix."
-msgstr ""
-
-#. i18n: "id" is a keyword
-msgid "id requires one argument"
-msgstr "id kräver ett argument"
-
-#. i18n: "id" is a keyword
-msgid "id requires a string"
-msgstr "id kräver en sträng"
-
-msgid ""
-"``rev(number)``\n"
-" Revision with the given numeric identifier."
-msgstr ""
-
-#. i18n: "rev" is a keyword
-msgid "rev requires one argument"
-msgstr "rev kräver ett argument"
-
-#. i18n: "rev" is a keyword
-msgid "rev requires a number"
-msgstr "rev kräver ett nummer"
-
-#. i18n: "rev" is a keyword
-msgid "rev expects a number"
-msgstr "rev förväntar sig ett nummer"
-
-msgid ""
-"``p1([set])``\n"
-" First parent of changesets in set, or the working directory."
-msgstr ""
-
-msgid ""
-"``p2([set])``\n"
-" Second parent of changesets in set, or the working directory."
-msgstr ""
-
-msgid ""
-"``parents([set])``\n"
-" The set of all parents for all changesets in set, or the working "
-"directory."
-msgstr ""
-
-msgid ""
-"``max(set)``\n"
-" Changeset with highest revision number in set."
-msgstr ""
-
-msgid ""
-"``min(set)``\n"
-" Changeset with lowest revision number in set."
-msgstr ""
+msgid ""
+"``adds(pattern)``\n"
+" Changesets that add a file matching pattern."
+msgstr ""
+
+#. i18n: "adds" is a keyword
+msgid "adds requires a pattern"
+msgstr "adds kräver ett mönster"
+
+msgid ""
+"``ancestor(single, single)``\n"
+" Greatest common ancestor of the two changesets."
+msgstr ""
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor requires two arguments"
+msgstr "ancestor kräver två argument"
+
+#. i18n: "ancestor" is a keyword
+msgid "ancestor arguments must be single revisions"
+msgstr "argument till ancestor måste vara revisioner"
+
+msgid ""
+"``ancestors(set)``\n"
+" Changesets that are ancestors of a changeset in set."
+msgstr ""
+
+msgid "~ expects a number"
+msgstr "~ förväntar sig ett nummer"
+
+msgid ""
+"``author(string)``\n"
+" Alias for ``user(string)``."
+msgstr ""
+
+#. i18n: "author" is a keyword
+msgid "author requires a string"
+msgstr "author kräver en sträng"
+
+msgid ""
+"``bisected(string)``\n"
+" Changesets marked in the specified bisect state (good, bad, skip)."
+msgstr ""
+
+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 ""
+
+#. i18n: "bookmark" is a keyword
+msgid "bookmark takes one or no arguments"
+msgstr "bookmark tar ett eller inga argument"
+
+#. i18n: "bookmark" is a keyword
+msgid "the argument to bookmark must be a string"
+msgstr "argumentet till bookmark måste vara en sträng"
+
+msgid ""
+"``branch(string or set)``\n"
+" All changesets belonging to the given branch or the branches of the "
+"given\n"
+" changesets."
+msgstr ""
+
+msgid ""
+"``children(set)``\n"
+" Child changesets of changesets in set."
+msgstr ""
+
+msgid ""
+"``closed()``\n"
+" Changeset is closed."
+msgstr ""
+
+#. i18n: "closed" is a keyword
+msgid "closed takes no arguments"
+msgstr "closed tar inga argument"
+
+msgid ""
+"``contains(pattern)``\n"
+" Revision contains a file matching pattern. See :hg:`help patterns`\n"
+" for information about file patterns."
+msgstr ""
+
+#. i18n: "contains" is a keyword
+msgid "contains requires a pattern"
+msgstr "contain kräver ett mönster"
+
+msgid ""
+"``date(interval)``\n"
+" Changesets within the interval, see :hg:`help dates`."
+msgstr ""
+
+#. i18n: "date" is a keyword
+msgid "date requires a string"
+msgstr "date kräver en sträng"
+
+msgid ""
+"``desc(string)``\n"
+" Search commit message for string. The match is case-insensitive."
+msgstr ""
+
+#. i18n: "desc" is a keyword
+msgid "desc requires a string"
+msgstr "desc kräver en sträng"
+
+msgid ""
+"``descendants(set)``\n"
+" Changesets which are descendants of changesets in set."
+msgstr ""
+
+msgid ""
+"``filelog(pattern)``\n"
+" Changesets connected to the specified filelog."
+msgstr ""
+
+msgid "filelog requires a pattern"
+msgstr "filelog kräver ett mönster"
+
+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"
+
+#. 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``."
+msgstr ""
+
+#. i18n: "all" is a keyword
+msgid "all takes no arguments"
+msgstr "all tar inga argument"
+
+msgid ""
+"``grep(regex)``\n"
+" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
+" to ensure special escape characters are handled correctly. Unlike\n"
+" ``keyword(string)``, the match is case-sensitive."
+msgstr ""
+
+#. i18n: "grep" is a keyword
+msgid "grep requires a string"
+msgstr "grep kräver en sträng"
+
+#, python-format
+msgid "invalid match pattern: %s"
+msgstr "ogiltigt träffmönster: %s"
+
+msgid ""
+"``file(pattern)``\n"
+" Changesets affecting files matched by pattern."
+msgstr ""
+
+#. i18n: "file" is a keyword
+msgid "file requires a pattern"
+msgstr "file kräver ett mönster"
+
+msgid ""
+"``head()``\n"
+" Changeset is a named branch head."
+msgstr ""
+
+#. i18n: "head" is a keyword
+msgid "head takes no arguments"
+msgstr "head tar inga argument"
+
+msgid ""
+"``heads(set)``\n"
+" Members of set with no children in set."
+msgstr ""
+
+msgid ""
+"``keyword(string)``\n"
+" Search commit message, user name, and names of changed files for\n"
+" string. The match is case-insensitive."
+msgstr ""
+
+#. i18n: "keyword" is a keyword
+msgid "keyword requires a string"
+msgstr "keyword kräver en sträng"
msgid ""
"``limit(set, n)``\n"
@@ -13274,111 +15868,40 @@
msgstr "limit förväntar sig ett nummer"
msgid ""
-"``children(set)``\n"
-" Child changesets of changesets in set."
-msgstr ""
-
-msgid ""
-"``branch(set)``\n"
-" All changesets belonging to the branches of changesets in set."
-msgstr ""
-
-msgid ""
-"``ancestor(single, single)``\n"
-" Greatest common ancestor of the two changesets."
-msgstr ""
-
-#. i18n: "ancestor" is a keyword
-msgid "ancestor requires two arguments"
-msgstr "ancestor kräver två argument"
-
-#. i18n: "ancestor" is a keyword
-msgid "ancestor arguments must be single revisions"
-msgstr "argument till ancestor måste vara singelrevisioner"
-
-msgid ""
-"``ancestors(set)``\n"
-" Changesets that are ancestors of a changeset in set."
-msgstr ""
-
-msgid ""
-"``descendants(set)``\n"
-" Changesets which are descendants of changesets in set."
-msgstr ""
-
-msgid ""
-"``follow()``\n"
-" An alias for ``::.`` (ancestors of the working copy's first parent)."
-msgstr ""
-
-#. i18n: "follow" is a keyword
-msgid "follow takes no arguments"
-msgstr "follow tar inga argument"
-
-msgid ""
-"``date(interval)``\n"
-" Changesets within the interval, see :hg:`help dates`."
-msgstr ""
-
-#. i18n: "date" is a keyword
-msgid "date requires a string"
-msgstr "date kräver en sträng"
-
-msgid ""
-"``keyword(string)``\n"
-" Search commit message, user name, and names of changed files for\n"
-" string."
-msgstr ""
-
-#. i18n: "keyword" is a keyword
-msgid "keyword requires a string"
-msgstr "keyword kräver en sträng"
-
-msgid ""
-"``grep(regex)``\n"
-" Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n"
-" to ensure special escape characters are handled correctly."
-msgstr ""
-
-#. i18n: "grep" is a keyword
-msgid "grep requires a string"
-msgstr "grep kräver en sträng"
-
-#, python-format
-msgid "invalid match pattern: %s"
-msgstr "ogiltigt träffmönster: %s"
-
-msgid ""
-"``author(string)``\n"
-" Alias for ``user(string)``."
-msgstr ""
-
-#. i18n: "author" is a keyword
-msgid "author requires a string"
-msgstr "author kräver en sträng"
-
-msgid ""
-"``user(string)``\n"
-" User name is string."
-msgstr ""
-
-msgid ""
-"``file(pattern)``\n"
-" Changesets affecting files matched by pattern."
-msgstr ""
-
-#. i18n: "file" is a keyword
-msgid "file requires a pattern"
-msgstr "file kräver ett mönster"
-
-msgid ""
-"``contains(pattern)``\n"
-" Revision contains pattern."
-msgstr ""
-
-#. i18n: "contains" is a keyword
-msgid "contains requires a pattern"
-msgstr "contains kräver ett mönster"
+"``last(set, n)``\n"
+" Last n members of set."
+msgstr ""
+
+#. i18n: "last" is a keyword
+msgid "last requires two arguments"
+msgstr "last kräver två argument"
+
+#. i18n: "last" is a keyword
+msgid "last requires a number"
+msgstr "last kräver ett nummer"
+
+#. i18n: "last" is a keyword
+msgid "last expects a number"
+msgstr "last förväntar sig ett nummer"
+
+msgid ""
+"``max(set)``\n"
+" Changeset with highest revision number in set."
+msgstr ""
+
+msgid ""
+"``merge()``\n"
+" Changeset is a merge changeset."
+msgstr ""
+
+#. i18n: "merge" is a keyword
+msgid "merge takes no arguments"
+msgstr "merge tar inga argument"
+
+msgid ""
+"``min(set)``\n"
+" Changeset with lowest revision number in set."
+msgstr ""
msgid ""
"``modifies(pattern)``\n"
@@ -13390,13 +15913,52 @@
msgstr "modifies kräver ett mönster"
msgid ""
-"``adds(pattern)``\n"
-" Changesets that add a file matching pattern."
-msgstr ""
-
-#. i18n: "adds" is a keyword
-msgid "adds requires a pattern"
-msgstr "adds kräver ett mönster"
+"``id(string)``\n"
+" Revision non-ambiguously specified by the given hex string prefix."
+msgstr ""
+
+#. i18n: "id" is a keyword
+msgid "id requires one argument"
+msgstr "id kräver ett argument"
+
+#. i18n: "id" is a keyword
+msgid "id requires a string"
+msgstr "id kräver en sträng"
+
+msgid ""
+"``outgoing([path])``\n"
+" Changesets not found in the specified destination repository, or the\n"
+" default push location."
+msgstr ""
+
+#. i18n: "outgoing" is a keyword
+msgid "outgoing requires a repository path"
+msgstr ""
+
+msgid ""
+"``p1([set])``\n"
+" First parent of changesets in set, or the working directory."
+msgstr ""
+
+msgid ""
+"``p2([set])``\n"
+" Second parent of changesets in set, or the working directory."
+msgstr ""
+
+msgid ""
+"``parents([set])``\n"
+" The set of all parents for all changesets in set, or the working "
+"directory."
+msgstr ""
+
+msgid "^ expects a number 0, 1, or 2"
+msgstr "^ förväntar sig ett nummer 0, 1, eller 2"
+
+msgid ""
+"``present(set)``\n"
+" An empty set, if any revision in set isn't found; otherwise,\n"
+" all revisions in set."
+msgstr ""
msgid ""
"``removes(pattern)``\n"
@@ -13405,34 +15967,24 @@
#. i18n: "removes" is a keyword
msgid "removes requires a pattern"
-msgstr "removes kräver ett mänster"
-
-msgid ""
-"``merge()``\n"
-" Changeset is a merge changeset."
-msgstr ""
-
-#. i18n: "merge" is a keyword
-msgid "merge takes no arguments"
-msgstr "merge tar inga argument"
-
-msgid ""
-"``closed()``\n"
-" Changeset is closed."
-msgstr ""
-
-#. i18n: "closed" is a keyword
-msgid "closed takes no arguments"
-msgstr "closed tar inga argument"
-
-msgid ""
-"``head()``\n"
-" Changeset is a named branch head."
-msgstr ""
-
-#. i18n: "head" is a keyword
-msgid "head takes no arguments"
-msgstr "head tar inga argument"
+msgstr "removes kräver ett mönster"
+
+msgid ""
+"``rev(number)``\n"
+" Revision with the given numeric identifier."
+msgstr ""
+
+#. i18n: "rev" is a keyword
+msgid "rev requires one argument"
+msgstr "rev kräver ett argument"
+
+#. i18n: "rev" is a keyword
+msgid "rev requires a number"
+msgstr "rev kräver ett nummer"
+
+#. i18n: "rev" is a keyword
+msgid "rev expects a number"
+msgstr "rev förväntar sig ett nummer"
msgid ""
"``reverse(set)``\n"
@@ -13440,9 +15992,8 @@
msgstr ""
msgid ""
-"``present(set)``\n"
-" An empty set, if any revision in set isn't found; otherwise,\n"
-" all revisions in set."
+"``roots(set)``\n"
+" Changesets with no parent changeset in set."
msgstr ""
msgid ""
@@ -13474,36 +16025,7 @@
msgstr "okänd sorteringsnyckel %r"
msgid ""
-"``all()``\n"
-" All changesets, the same as ``0:tip``."
-msgstr ""
-
-#. i18n: "all" is a keyword
-msgid "all takes no arguments"
-msgstr "all tar inga argument"
-
-msgid ""
-"``heads(set)``\n"
-" Members of set with no children in set."
-msgstr ""
-
-msgid ""
-"``roots(set)``\n"
-" Changesets with no parent changeset in set."
-msgstr ""
-
-msgid ""
-"``outgoing([path])``\n"
-" Changesets not found in the specified destination repository, or the\n"
-" default push location."
-msgstr ""
-
-#. i18n: "outgoing" is a keyword
-msgid "outgoing requires a repository path"
-msgstr "outgoing kräver en arkivsökväg"
-
-msgid ""
-"``tag(name)``\n"
+"``tag([name])``\n"
" The specified tag by name, or all tagged revisions if no name is given."
msgstr ""
@@ -13516,19 +16038,9 @@
msgstr "argumentet till tag måste vara en sträng"
msgid ""
-"``bookmark([name])``\n"
-" The named bookmark or all bookmarks."
-msgstr ""
-"``bookmark([namn])``\n"
-" Det angivna bokmärket eller alla bokmärken."
-
-#. i18n: "bookmark" is a keyword
-msgid "bookmark takes one or no arguments"
-msgstr "bookmark tar ett eller inga argument"
-
-#. i18n: "bookmark" is a keyword
-msgid "the argument to bookmark must be a string"
-msgstr "argumentet till bookmark måste vara en sträng"
+"``user(string)``\n"
+" User name contains string. The match is case-insensitive."
+msgstr ""
msgid "can't negate that"
msgstr "kan inte negera det"
@@ -13536,9 +16048,71 @@
msgid "not a symbol"
msgstr "inte en symbol"
+msgid "invalid amount of arguments"
+msgstr "felaktigt antal argument"
+
msgid "empty query"
msgstr "tom fråga"
+#, python-format
+msgid "ui.portablefilenames value is invalid ('%s')"
+msgstr ""
+
+#, python-format
+msgid "possible case-folding collision for %s"
+msgstr ""
+
+#, python-format
+msgid "path ends in directory separator: %s"
+msgstr "sökvägen slutar med en katalogseparator: %s"
+
+#, python-format
+msgid "path contains illegal component: %s"
+msgstr ""
+
+#, python-format
+msgid "path %r is inside nested repo %r"
+msgstr ""
+
+#, python-format
+msgid "path %r traverses symbolic link %r"
+msgstr ""
+
+#, python-format
+msgid "could not symlink to %r: %s"
+msgstr ""
+
+#, python-format
+msgid "recording removal of %s as rename to %s (%d%% similar)\n"
+msgstr ""
+
+#, python-format
+msgid "%s has not been committed yet, so no copy data will be stored for %s.\n"
+msgstr ""
+"%s har inte arkiverats än, så ingen kopieringsinformation lagras för %s.\n"
+
+msgid ".hg/requires file is corrupt"
+msgstr "filen .hg/requires är korrupt"
+
+#, python-format
+msgid "unknown repository format: requires feature '%s' (upgrade Mercurial)"
+msgstr ""
+
+msgid "searching for changes\n"
+msgstr "söker efter ändringar\n"
+
+msgid "queries"
+msgstr "frågor"
+
+msgid "searching"
+msgstr "söker"
+
+msgid "repository is unrelated"
+msgstr "arkivet är obesläktat"
+
+msgid "warning: repository is unrelated\n"
+msgstr "varning: arkivet är obesälktat\n"
+
msgid "searching for exact renames"
msgstr "söker efter exakta namnbyten"
@@ -13571,13 +16145,54 @@
msgid "remote: "
msgstr "fjärr: "
-msgid "unexpected response:"
-msgstr "oväntat svar:"
-
#, python-format
msgid "push refused: %s"
msgstr ""
+msgid "certificate checking requires Python 2.6"
+msgstr "certifikatkontroll kräver Python 2.6"
+
+msgid "no certificate received"
+msgstr "inget certifikat mottaget"
+
+#, python-format
+msgid "certificate is for %s"
+msgstr "certifikat är för %s"
+
+msgid "IDN in certificate not supported"
+msgstr "IDN i certifikat stöds inte"
+
+msgid "no commonName or subjectAltName found in certificate"
+msgstr "inget commonName eller subjectAltName hittades i certifikat"
+
+#, python-format
+msgid "could not find web.cacerts: %s"
+msgstr "kunde inte hitta web.cacerts: %s"
+
+#, python-format
+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 "invalid certificate for %s with fingerprint %s"
+msgstr "ogiltigt certifikat för %s med fingeravtrycket %s"
+
+#, python-format
+msgid ""
+"warning: %s certificate with fingerprint %s not verified (check "
+"hostfingerprints or web.cacerts config setting)\n"
+msgstr ""
+"varning: %s-certificatet med fingeravtrycket %s overifierad (kontrollera "
+"hostfingerprints inställningen 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 ""
@@ -13661,6 +16276,10 @@
msgstr ""
#, python-format
+msgid "cloning subrepo %s from %s\n"
+msgstr "klonar underarkivet %s från %s\n"
+
+#, python-format
msgid "pulling subrepo %s from %s\n"
msgstr "drar underarkivet %s från %s\n"
@@ -13668,6 +16287,9 @@
msgid "pushing subrepo %s to %s\n"
msgstr "trycker underarkivet %s till %s\n"
+msgid "cannot retrieve svn tool version"
+msgstr "kan inte hämta version på svn-verktyg"
+
msgid "cannot commit svn externals"
msgstr ""
@@ -13676,14 +16298,6 @@
msgstr "raderar inte arkivet %s eftersom den har ändringar.\n"
#, python-format
-msgid "cloning subrepo %s\n"
-msgstr "klonar underarkivet %s\n"
-
-#, python-format
-msgid "pulling subrepo %s\n"
-msgstr "drar underarkivet %s\n"
-
-#, python-format
msgid "revision %s does not exist in subrepo %s\n"
msgstr "revisionen %s existerar inte i underarkivet %s\n"
@@ -13695,6 +16309,10 @@
msgstr "hämta ut en git-gren om du tänker göra ändringer\n"
#, python-format
+msgid "subrepo %s is missing"
+msgstr "underarkivet %s saknas"
+
+#, python-format
msgid "unrelated git branch checked out in subrepo %s\n"
msgstr "obesläktar git-gren hämtar i underarkivet %s\n"
@@ -13773,6 +16391,9 @@
msgid "rollback failed - please run hg recover\n"
msgstr ""
+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"
@@ -13786,19 +16407,19 @@
msgstr "(föråldrad '%%' i sökvägen %s=%s från %s)\n"
#, python-format
-msgid "ignoring untrusted configuration option %s.%s = %s\n"
-msgstr ""
-
-#, python-format
-msgid "%s.%s not a boolean ('%s')"
-msgstr ""
+msgid "%s.%s is not a boolean ('%s')"
+msgstr "%s.%s är inte booleskt ('%s')"
+
+#, python-format
+msgid "%s.%s is not an integer ('%s')"
+msgstr "%s.%s är inte ett heltal ('%s')"
msgid "enter a commit username:"
msgstr ""
#, python-format
msgid "No username found, using '%s' instead\n"
-msgstr ""
+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\")"
@@ -13819,10 +16440,6 @@
msgid "edit failed"
msgstr ""
-#, python-format
-msgid "ignoring invalid [auth] key '%s'\n"
-msgstr "ignorerar ogiltig [auth]-nyckel '%s'\n"
-
msgid "http authorization required"
msgstr "http-autenticiering krävs"
@@ -13844,74 +16461,20 @@
msgid "http auth: user %s, password %s\n"
msgstr "http-auth: användare %s, lösenord %s\n"
-msgid "kb"
-msgstr "kb"
-
-msgid "certificate checking requires Python 2.6"
-msgstr "certifikatkontroll kräver Python 2.6"
-
-msgid "no certificate received"
-msgstr "inget certifikat mottaget"
-
-#, python-format
-msgid "certificate is for %s"
-msgstr "certifikat är för %s"
-
-msgid "IDN in certificate not supported"
-msgstr "IDN i certifikat stöds inte"
-
-msgid "no commonName or subjectAltName found in certificate"
-msgstr "inget commonName eller subjectAltName hittades i certifikat"
-
-#, python-format
-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 "invalid certificate for %s with fingerprint %s"
-msgstr "ogiltigt certifikat för %s med fingeravtrycket %s"
-
-#, python-format
-msgid ""
-"warning: %s certificate with fingerprint %s not verified (check "
-"hostfingerprints or web.cacerts config setting)\n"
-msgstr ""
-"varning: %s-certificatet med fingeravtrycket %s overifierad (kontrollera "
-"hostfingerprints inställningen web.cacerts)\n"
-
-#, python-format
-msgid "no certificate for %s with configured hostfingerprint"
-msgstr "inget certifikat för %s med konfigurerat fingeravtryck"
-
-#, python-format
-msgid ""
-"warning: %s certificate not verified (check web.cacerts config setting)\n"
-msgstr ""
-"varning: %s-certificatet overifierad (kontrollera inställningen web."
-"cacerts)\n"
-
#, python-format
msgid "command '%s' failed: %s"
msgstr "kommandot '%s' misslyckades: %s"
#, python-format
-msgid "path ends in directory separator: %s"
-msgstr "sökvägen slutar med en katalogseparator: %s"
-
-#, python-format
-msgid "path contains illegal component: %s"
-msgstr ""
-
-#, python-format
-msgid "path %r is inside repo %r"
-msgstr ""
-
-#, python-format
-msgid "path %r traverses symbolic link %r"
-msgstr ""
-
-#, python-format
-msgid "could not symlink to %r: %s"
+msgid "filename contains '%s', which is reserved on Windows"
+msgstr ""
+
+#, python-format
+msgid "filename contains %r, which is invalid on Windows"
+msgstr ""
+
+#, python-format
+msgid "filename ends with '%s', which is not allowed on Windows"
msgstr ""
msgid "check your clock"
@@ -13937,11 +16500,24 @@
msgid "impossible time zone offset: %d"
msgstr "omöjlig tidzonsoffset: %d"
+msgid "dates cannot consist entirely of whitespace"
+msgstr "datum kan inte bara bestå av blanktecken"
+
+msgid "invalid day spec, use '<DATE'"
+msgstr ""
+
+msgid "invalid day spec, use '>DATE'"
+msgstr ""
+
#, python-format
msgid "invalid day spec: %s"
msgstr ""
#, python-format
+msgid "%s must be nonnegative (see 'hg help dates')"
+msgstr ""
+
+#, python-format
msgid "%.0f GB"
msgstr "%.0f GB"
@@ -13985,6 +16561,9 @@
msgid "no port number associated with service '%s'"
msgstr ""
+msgid "file:// URLs can only refer to localhost"
+msgstr ""
+
msgid "cannot verify bundle or remote repos"
msgstr ""