merge with i18n stable

i18n/pt_BR.po

@@ -3567,6 +3567,15 b' msgstr ""'
 "\n"
 "    Este comando é obsoleto; use hg --mq commit em seu lugar."
 
+msgid ""
+"commit changes in the queue repository (DEPRECATED)\n"
+"\n"
+"    This command is deprecated; use hg commit --mq instead."
+msgstr ""
+"consolida mudanças no repositório da fila de patches (OBSOLETO)\n"
+"\n"
+"    Este comando é obsoleto; use hg commit --mq em seu lugar."
+
 msgid "print the entire series file"
 msgstr "imprime todo o arquivo series"
 
@@ -10937,6 +10946,315 b' msgstr ""'
 "    endereço de e-mail.\n"
 
 msgid ""
+"Mercurial allows you to customize output of commands through\n"
+"templates. You can either pass in a template from the command\n"
+"line, via the --template option, or select an existing\n"
+"template-style (--style).\n"
+"\n"
+"You can customize output for any \"log-like\" command: log,\n"
+"outgoing, incoming, tip, parents, heads and glog.\n"
+"\n"
+"Three styles are packaged with Mercurial: default (the style used\n"
+"when no explicit preference is passed), compact and changelog.\n"
+"Usage::\n"
+"\n"
+"    $ hg log -r1 --style changelog\n"
+"\n"
+"A template is a piece of text, with markup to invoke variable\n"
+"expansion::\n"
+"\n"
+"    $ hg log -r1 --template \"{node}\\n\"\n"
+"    b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
+"\n"
+"Strings in curly braces are called keywords. The availability of\n"
+"keywords depends on the exact context of the templater. These\n"
+"keywords are usually available for templating a log-like command:\n"
+"\n"
+":author: String. The unmodified author of the changeset.\n"
+"\n"
+":branches: String. The name of the branch on which the changeset was\n"
+"    committed. Will be empty if the branch name was default.\n"
+"\n"
+":date: Date information. The date when the changeset was committed.\n"
+"\n"
+":desc: String. The text of the changeset description.\n"
+"\n"
+":diffstat: String. Statistics of changes with the following format:\n"
+"    \"modified files: +added/-removed lines\"\n"
+"\n"
+":files: List of strings. All files modified, added, or removed by this\n"
+"    changeset.\n"
+"\n"
+":file_adds: List of strings. Files added by this changeset.\n"
+"\n"
+":file_copies: List of strings. Files copied in this changeset with\n"
+"    their sources.\n"
+"\n"
+":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n"
+"    only if the --copied switch is set.\n"
+"\n"
+":file_mods: List of strings. Files modified by this changeset.\n"
+"\n"
+":file_dels: List of strings. Files removed by this changeset.\n"
+"\n"
+":node: String. The changeset identification hash, as a 40-character\n"
+"    hexadecimal string.\n"
+"\n"
+":parents: List of strings. The parents of the changeset.\n"
+"\n"
+":rev: Integer. The repository-local changeset revision number.\n"
+"\n"
+":tags: List of strings. Any tags associated with the changeset.\n"
+"\n"
+":latesttag: String. Most recent global tag in the ancestors of this\n"
+"    changeset.\n"
+"\n"
+":latesttagdistance: Integer. Longest path to the latest tag.\n"
+"\n"
+"The \"date\" keyword does not produce human-readable output. If you\n"
+"want to use a date in your output, you can use a filter to process\n"
+"it. Filters are functions which return a string based on the input\n"
+"variable. Be sure to use the stringify filter first when you're\n"
+"applying a string-input filter to a list-like input variable.\n"
+"You can also use a chain of filters to get the desired output::\n"
+"\n"
+"   $ hg tip --template \"{date|isodate}\\n\"\n"
+"   2008-08-21 18:22 +0000\n"
+"\n"
+"List of filters:\n"
+"\n"
+":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n"
+"    every line except the last.\n"
+"\n"
+":age: Date. Returns a human-readable date/time difference between the\n"
+"    given date/time and the current date/time.\n"
+"\n"
+":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\".\n"
+"\n"
+":stripdir: Treat the text as path and strip a directory level, if\n"
+"    possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n"
+"\n"
+":date: Date. Returns a date in a Unix date format, including the\n"
+"    timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
+"\n"
+":domain: Any text. Finds the first string that looks like an email\n"
+"    address, and extracts just the domain component. Example: ``User\n"
+"    <[e-mail]>`` becomes ``example.com``.\n"
+"\n"
+":email: Any text. Extracts the first string that looks like an email\n"
+"    address. Example: ``User <[e-mail]>`` becomes\n"
+"    ``[e-mail]``.\n"
+"\n"
+":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n"
+"    and \">\" with XML entities.\n"
+"\n"
+":fill68: Any text. Wraps the text to fit in 68 columns.\n"
+"\n"
+":fill76: Any text. Wraps the text to fit in 76 columns.\n"
+"\n"
+":firstline: Any text. Returns the first line of text.\n"
+"\n"
+":nonempty: Any text. Returns '(none)' if the string is empty.\n"
+"\n"
+":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n"
+"    25200\" (Unix timestamp, timezone offset).\n"
+"\n"
+":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n"
+"    +0200\".\n"
+"\n"
+":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.\n"
+"\n"
+":localdate: Date. Converts a date to local date.\n"
+"\n"
+":obfuscate: Any text. Returns the input text rendered as a sequence of\n"
+"    XML entities.\n"
+"\n"
+":person: Any text. Returns the text before an email address.\n"
+"\n"
+":rfc822date: Date. Returns a date using the same format used in email\n"
+"    headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+"\n"
+":rfc3339date: Date. Returns a date using the Internet date format\n"
+"    specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n"
+"\n"
+":short: Changeset hash. Returns the short form of a changeset hash,\n"
+"    i.e. a 12-byte hexadecimal string.\n"
+"\n"
+":shortdate: Date. Returns a date like \"2006-09-18\".\n"
+"\n"
+":strip: Any text. Strips all leading and trailing whitespace.\n"
+"\n"
+":tabindent: Any text. Returns the text, with every line except the\n"
+"     first starting with a tab character.\n"
+"\n"
+":urlescape: Any text. Escapes all \"special\" characters. For example,\n"
+"    \"foo bar\" becomes \"foo%20bar\".\n"
+"\n"
+":user: Any text. Returns the user portion of an email address.\n"
+msgstr ""
+"O Mercurial permite que você personalize a saída de comandos\n"
+"usando modelos. Você pode tanto passar um modelo pela linha de\n"
+"comando, usando a opção --template, como selecionar um\n"
+"modelo-estilo existente (--style).\n"
+"\n"
+"Você pode personalizar a saída de qualquer comando semelhante\n"
+"ao log: log, outgoing, incoming, tip, parents, heads e glog.\n"
+"\n"
+"Três estilos são incluídos na distribuição do Mercurial: default\n"
+"(o estilo usado quando nenhuma preferência for passada), compact\n"
+"e changelog. Uso::\n"
+"\n"
+"    $ hg log -r1 --style changelog\n"
+"\n"
+"Um modelo é um texto com marcações que invocam expansão de\n"
+"variáveis::\n"
+"\n"
+"    $ hg log -r1 --template \"{node}\\n\"\n"
+"    b56ce7b07c52de7d5fd79fb89701ea538af65746\n"
+"\n"
+"Strings entre chaves são chamadas palavras chave. A\n"
+"disponibilidade de palavras chave depende do contexto exato do\n"
+"modelador. Estas palavras chave estão comumente disponíveis para\n"
+"modelar comandos semelhantes ao log:\n"
+"\n"
+":author: String. O autor da revisão, sem modificações.\n"
+"\n"
+":branches: String. O nome do ramo no qual a revisão foi\n"
+"    consolidada. Será vazio se o nome do ramo for default.\n"
+"\n"
+":date: Informação de data. A data de consolidação da revisão.\n"
+"\n"
+":desc: String. O texto da descrição da revisão.\n"
+"\n"
+":diffstat: String. Estatísticas de mudanças no seguinte\n"
+"    formato: \"modified files: +added/-removed lines\"\n"
+"\n"
+":files: Lista de strings. Todos os arquivos modificados,\n"
+"    adicionados ou removidos por esta revisão.\n"
+"\n"
+":file_adds: Lista de strings. Arquivos adicionados por esta revisão.\n"
+"\n"
+":file_mods: Lista de strings. Arquivos modificados por esta revisão.\n"
+"\n"
+":file_dels: Lista de strings. Arquivos removidos por esta revisão.\n"
+"\n"
+":node: String. O hash de identificação da revisão, como uma string\n"
+"    hexadecimal de 40 caracteres.\n"
+"\n"
+":parents: Lista de strings. Os pais da revisão.\n"
+"\n"
+":rev: Inteiro. O número de ordem da revisão no repositório local.\n"
+"\n"
+":tags: Lista de strings. Quaisquer etiquetas associadas à revisão.\n"
+"\n"
+":latesttag: String. A etiqueta global mais recente nos ancestrais desta\n"
+"    revisão.\n"
+"\n"
+":latesttagdistance: Inteiro. O caminho mais longo para a latesttag.\n"
+"\n"
+"A palavra chave \"date\" não produz saída legível para humanos.\n"
+"Se você quiser usar uma data em sua saída, você pode usar um\n"
+"filtro para processá-la. Filtros são funções que devolvem uma\n"
+"string baseada na variável de entrada. Certifique-se de usar\n"
+"primeiro o filtro stringify quando você estiver aplicando um\n"
+"filtro de entrada de strings para uma variável de entrada que\n"
+"contenha uma lista. Você também pode encadear\n"
+"filtros para obter a saída desejada::\n"
+"\n"
+"   $ hg tip --template \"{date|isodate}\\n\"\n"
+"   2008-08-21 18:22 +0000\n"
+"\n"
+"Lista de filtros:\n"
+"\n"
+":addbreaks: Qualquer texto. Adiciona uma tag XHTML \"<br />\"\n"
+"    antes do fim de cada linha, exceto a última.\n"
+"\n"
+":age:         Data. Devolve uma diferença de data/tempo legível entre\n"
+"    a data/hora dada e a data/hora atual.\n"
+"\n"
+":basename: Qualquer texto. Trata o texto como um caminho, e\n"
+"    devolve o último componente do caminho após quebrá-lo\n"
+"    usando o separador de caminhos (ignorando separadores à\n"
+"    direita). Por exemple, \"foo/bar/baz\" se torna \"baz\"\n"
+"    e \"foo/bar//\" se torna \"bar\".\n"
+"\n"
+":date: Data. Devolve uma data em um formato de data Unix,\n"
+"    incluindo a diferença de fuso horário:\n"
+"    \"Mon Sep 04 15:13:13 2006 0700\".\n"
+"\n"
+":stripdir: Trata o texto como um caminho e remove um nível\n"
+"    de diretório, se possível. Por exemplo, \"foo\" e\n"
+"    \"foo/bar\" se tornam \"foo\".\n"
+"\n"
+":domain: Qualquer texto. Encontra a primeira string que se\n"
+"    pareça com um endereço de e-mail, e extrai apenas a parte\n"
+"    do domínio. Por exemplo:\n"
+"    ``User <[e-mail]>`` se torna ``example.com``.\n"
+"\n"
+":email: Qualquer texto. Extrai a primeira string que se pareça\n"
+"    com um endereço de e-mail. Por exemplo:\n"
+"    ``User <[e-mail]>`` se torna ``[e-mail]``.\n"
+"\n"
+":escape: Qualquer texto. Substitui os caracteres especiais\n"
+"    XML/XHTML \"&\", \"<\" e \">\" por entidades XML.\n"
+"\n"
+":fill68: Qualquer texto. Quebra o texto para caber em 68\n"
+"    colunas.\n"
+"\n"
+":fill76: Qualquer texto. Quebra o texto para caber em 76\n"
+"    colunas.\n"
+"\n"
+":firstline: Qualquer texto. Devolve a primeira linha do texto.\n"
+"\n"
+":nonempty: Qualquer texto. Devolve (none) se o texto for vazio.\n"
+"\n"
+":hgdate: Data. Devolve a data como um par de números:\n"
+"    \"1157407993 25200\" (timestamp Unix, defasagem de fuso)\n"
+"\n"
+":isodate: Data. Devolve a data em formato ISO 8601:\n"
+"    \"2009-08-18 13:00 +0200\".\n"
+"\n"
+":localdate: Data. Converte para data local.\n"
+"\n"
+":obfuscate: Qualquer texto. Devolve o texto de entrada\n"
+"    renderizado como uma seqüência de entidades XML.\n"
+"\n"
+":person: Qualquer texto. Devolve o texto antes de um endereço\n"
+"    de e-mail.\n"
+"\n"
+":rfc822date: Data. Devolve uma data usando o mesmo formato utilizado\n"
+"    em cabeçalhos de e-mail:\n"
+"    \"Tue, 18 Aug 2009 13:00:13 +0200\".\n"
+"\n"
+":rfc3339date: Data. Devolve uma data usando o formato de data da\n"
+"    Internet especificado na RFC 3339:\n"
+"    \"2009-08-18T13:00:13+02:00\".\n"
+"\n"
+":short: Hash da revisão. Devolve a forma curta do hash de\n"
+"    uma revisão, ou seja, uma string hexadecimal de 12 bytes.\n"
+"\n"
+":shortdate: Data. Devolve uma data como \"2006-09-18\".\n"
+"\n"
+":strip: Qualquer texto. Remove todos os espaços em branco no\n"
+"    início e no final do texto.\n"
+"\n"
+":tabindent: Qualquer texto. Devolve o texto todo, com a adição\n"
+"    de um caractere de tabulação ao início de cada linha,\n"
+"    exceto da primeira.\n"
+"\n"
+":urlescape: Qualquer texto. Codifica todos os caracteres\n"
+"    \"especiais\". Por exemplo, \"foo bar\" se torna\n"
+"    \"foo%20bar\".\n"
+"\n"
+":user: Qualquer texto. Devolve a parte do usuário de um\n"
+"    endereço de e-mail.\n"
+
+msgid ""
 "Valid URLs are of the form::\n"
 "\n"
 "  local/filesystem/path[#revision]\n"
@@ -11373,6 +11691,14 b' msgstr ""'
 "(use 'hg revert %s' para reverter a adição do arquivo)\n"
 
 #, python-format
+msgid ""
+"%s: up to %d MB of RAM may be required to manage this file\n"
+"(use 'hg revert %s' to cancel the pending addition)\n"
+msgstr ""
+"%s: até %d MB de RAM podem ser necessários para gerenciar este arquivo\n"
+"(use 'hg revert %s' se você quiser cancelar a adição pendente)\n"
+
+#, python-format
 msgid "%s not added: only files and symlinks supported currently\n"
 msgstr "%s não adicionado: apenas arquivos e links simbólicos suportados no momento\n"
 

i18n/sv.po

@@ -13,8 +13,8 b' msgid ""'
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2010-03-04 07:02+0100\n"
-"PO-Revision-Date: 2010-03-04 07:33+0100\n"
+"POT-Creation-Date: 2010-03-22 19:23+0100\n"
+"PO-Revision-Date: 2010-03-23 21:58+0100\n"
 "Last-Translator: Jens Bäckman <[e-mail]>\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
@@ -530,6 +530,51 b' msgid ""'
 "\n"
 "  bookmarks.current = green\n"
 msgstr ""
+"färglägg utmatning från vissa kommandon\n"
+"\n"
+"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"
+"färglägga patchstatus (applicerad, oapplicerad, saknad), och till\n"
+"diff-relaterade kommandon för att framhäva additioner, borttagningar,\n"
+"diffhuvuden, och eftersläpande blanktecken.\n"
+"\n"
+"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.\n"
+"\n"
+"Standardeffekter kan ersättas från .hgrc-filen::\n"
+"\n"
+"  [color]\n"
+"  status.modified = blue bold underline red_background\n"
+"  status.added = green bold\n"
+"  status.removed = red bold blue_background\n"
+"  status.deleted = cyan bold underline\n"
+"  status.unknown = magenta bold underline\n"
+"  status.ignored = black bold\n"
+"\n"
+"  # 'none' stänger av alla effekter\n"
+"  status.clean = none\n"
+"  status.copied = none\n"
+"\n"
+"  qseries.applied = blue bold underline\n"
+"  qseries.unapplied = black bold\n"
+"  qseries.missing = red bold\n"
+"\n"
+"  diff.diffline = bold\n"
+"  diff.extended = cyan bold\n"
+"  diff.file_a = red bold\n"
+"  diff.file_b = green bold\n"
+"  diff.hunk = magenta\n"
+"  diff.deleted = red\n"
+"  diff.inserted = green\n"
+"  diff.changed = white\n"
+"  diff.trailingwhitespace = bold red_background\n"
+"\n"
+"  resolve.unresolved = red bold\n"
+"  resolve.resolved = green bold\n"
+"\n"
+"  bookmarks.current = green\n"
 
 msgid "when to colorize (always, auto, or never)"
 msgstr "när färgläggning ska ske (always, auto eller never)"
@@ -1354,7 +1399,7 b' msgstr ""'
 
 #, python-format
 msgid "pulling from %s\n"
-msgstr ""
+msgstr "drar från %s\n"
 
 msgid ""
 "Other repository doesn't support revision lookup, so a rev cannot be "
@@ -1485,10 +1530,15 b' msgid ""'
 "commands. When this options is given, an ASCII representation of the\n"
 "revision graph is also shown.\n"
 msgstr ""
+"kommando för att se revisionsgrafer i ett skal\n"
+"\n"
+"Denna utökning lägger till flaggan --graph till kommandona incoming,\n"
+"outgoing och log. När flaggan anges, visas också en ASCII-version av\n"
+"revisionsgrafen.\n"
 
 #, python-format
 msgid "--graph option is incompatible with --%s"
-msgstr ""
+msgstr "flaggan --graph är inkompatibel med --%s"
 
 msgid ""
 "show revision history alongside an ASCII revision graph\n"
@@ -1500,6 +1550,13 b' msgid ""'
 "    directory.\n"
 "    "
 msgstr ""
+"visa revisionshistorik vid sidan av en ASCII-revisionsgraf\n"
+"\n"
+"    Visa en revisionshistorik bredvid en revisionsgraf ritad med\n"
+"    ASCII-tecken.\n"
+"\n"
+"    Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n"
+"    "
 
 #, python-format
 msgid "comparing with %s\n"
@@ -1521,7 +1578,7 b' msgid "show the specified revision or ra'
 msgstr "visa den specifika revisionen eller serien"
 
 msgid "hg glog [OPTION]... [FILE]"
-msgstr ""
+msgstr "hg glog [FLAGGA]... [FIL]"
 
 msgid ""
 "hooks for integrating with the CIA.vc notification service\n"
@@ -2093,7 +2150,6 b' msgid ""'
 "\n"
 "Common tasks (use \"hg help command\" for more details)::\n"
 "\n"
-"  prepare repository to work with patches   qinit\n"
 "  create new patch                          qnew\n"
 "  import existing patch                     qimport\n"
 "\n"
@@ -2508,7 +2564,7 b' msgid ""'
 "    qcommit to commit changes to this queue repository.\n"
 "\n"
 "    This command is deprecated. Without -c, it's implied by other relevant\n"
-"    commands. With -c, use hg init -Q instead."
+"    commands. With -c, use hg init --mq instead."
 msgstr ""
 
 msgid ""
@@ -2524,12 +2580,12 b' msgid ""'
 "    default. Use -p <url> to change.\n"
 "\n"
 "    The patch directory must be a nested Mercurial repository, as\n"
-"    would be created by qinit -c.\n"
-"    "
-msgstr ""
-
-msgid "versioned patch repository not found (see qinit -c)"
-msgstr ""
+"    would be created by init --mq.\n"
+"    "
+msgstr ""
+
+msgid "versioned patch repository not found (see init --mq)"
+msgstr "versionshanterat patcharkiv hittades inte (se init --mq)"
 
 msgid "cloning main repository\n"
 msgstr ""
@@ -2546,8 +2602,11 b' msgstr ""'
 msgid ""
 "commit changes in the queue repository (DEPRECATED)\n"
 "\n"
-"    This command is deprecated; use hg -Q commit instead."
-msgstr ""
+"    This command is deprecated; use hg --mq commit instead."
+msgstr ""
+"arkivera ändringar i köarkivet (FÖRÅLDRAD)\n"
+"\n"
+"    Detta är ett föråldrat kommando; använd hg --mq commit istället."
 
 msgid "print the entire series file"
 msgstr ""
@@ -2870,6 +2929,12 b' msgstr ""'
 msgid "cannot import over an applied patch"
 msgstr ""
 
+msgid "only a local queue repository may be initialized"
+msgstr "bara ett lokalt köarkiv kan initialiseras"
+
+msgid "There is no Mercurial repository here (.hg not found)"
+msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)"
+
 msgid "operate on patch repository"
 msgstr "arbeta med patcharkiv"
 
@@ -3518,6 +3583,7 b' msgid ""'
 "  width = <none> # if set, the maximum width of the progress information\n"
 "                 # (that is, min(width, term width) will be used)\n"
 "  clear-complete = True # clear the progress bar after it's done\n"
+"  disable = False # if true, don't show a progress bar\n"
 "\n"
 "Valid entries for the format field are topic, bar, number, unit, and\n"
 "item. item defaults to the last 20 characters of the item, but this\n"
@@ -3601,8 +3667,39 b' msgid ""'
 "move changeset (and descendants) to a different branch\n"
 "\n"
 "    Rebase uses repeated merging to graft changesets from one part of\n"
-"    history onto another. This can be useful for linearizing local\n"
-"    changes relative to a master development tree.\n"
+"    history (the source) onto another (the destination). This can be\n"
+"    useful for linearizing local changes relative to a master\n"
+"    development tree.\n"
+"\n"
+"    If you don't specify a destination changeset (``-d/--dest``),\n"
+"    rebase uses the tipmost head of the current named branch as the\n"
+"    destination. (The destination changeset is not modified by\n"
+"    rebasing, but new changesets are added as its descendants.)\n"
+"\n"
+"    You can specify which changesets to rebase in two ways: as a\n"
+"    \"source\" changeset or as a \"base\" changeset. Both are shorthand\n"
+"    for a topologically related set of changesets (the \"source\n"
+"    branch\"). If you specify source (``-s/--source``), rebase will\n"
+"    rebase that changeset and all of its descendants onto dest. If you\n"
+"    specify base (``-b/--base``), rebase will select ancestors of base\n"
+"    back to but not including the common ancestor with dest. Thus,\n"
+"    ``-b`` is less precise but more convenient than ``-s``: you can\n"
+"    specify any changeset in the source branch, and rebase will select\n"
+"    the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n"
+"    uses the parent of the working directory as the base.\n"
+"\n"
+"    By default, rebase recreates the changesets in the source branch\n"
+"    as descendants of dest and then destroys the originals. Use\n"
+"    ``--keep`` to preserve the original source changesets. Some\n"
+"    changesets in the source branch (e.g. merges from the destination\n"
+"    branch) may be dropped if they no longer contribute any change.\n"
+"\n"
+"    One result of the rules for selecting the destination changeset\n"
+"    and source branch is that, unlike ``merge``, rebase will do\n"
+"    nothing if you are at the latest (tipmost) head of a named branch\n"
+"    with two heads. You need to explicitly specify source and/or\n"
+"    destination (or ``update`` to the other head, if it's the head of\n"
+"    the intended source branch).\n"
 "\n"
 "    If a rebase is interrupted to manually resolve a merge, it can be\n"
 "    continued with --continue/-c or aborted with --abort/-a.\n"
@@ -3684,13 +3781,15 b' msgstr ""'
 msgid "rebase working directory to branch head"
 msgstr ""
 
-msgid "rebase from a given revision"
-msgstr ""
-
-msgid "rebase from the base of a given revision"
-msgstr ""
-
-msgid "rebase onto a given revision"
+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"
@@ -3712,8 +3811,8 b' msgid "abort an interrupted rebase"'
 msgstr ""
 
 msgid ""
-"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--detach] [--keep] [--"
-"keepbranches] | [-c] | [-a]"
+"hg rebase [-s REV | -b REV] [-d REV] [options]\n"
+"hg rebase {-a|-c}"
 msgstr ""
 
 msgid "commands to interactively select changes for commit/qrefresh"
@@ -3876,8 +3975,8 b' msgstr ""'
 msgid " files"
 msgstr ""
 
-msgid "relink"
-msgstr ""
+msgid "relinking"
+msgstr "länkar om"
 
 #, python-format
 msgid "relinked %d files (%d bytes reclaimed)\n"
@@ -4884,8 +4983,10 b' msgstr ""'
 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 --force to override)"
-msgstr "en gren med samma namn existerar redan (använd --force för att tvinga)"
+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)"
 
 #, python-format
 msgid "marked working directory as branch %s\n"
@@ -5022,20 +5123,6 b' msgid ""'
 "    .hg/hgrc and working directory will be created on the remote side.\n"
 "    Please see 'hg help urls' for important details about ``ssh://`` URLs.\n"
 "\n"
-"    If the -U/--noupdate option is specified, the new clone will contain\n"
-"    only a repository (.hg) and no working copy (the working copy parent\n"
-"    will be the null changeset). Otherwise, clone will initially check\n"
-"    out (in order of precedence):\n"
-"\n"
-"    a) the changeset, tag or branch specified with -u/--updaterev\n"
-"    b) the changeset, tag or branch given with the first -r/--rev\n"
-"    c) the branch given with the first -b/--branch\n"
-"    d) the branch given with the url#branch source syntax\n"
-"    e) the head of the default branch\n"
-"\n"
-"    Use 'hg clone -u . src dst' to checkout the source repository's\n"
-"    parent changeset (applicable for local source repositories only).\n"
-"\n"
 "    A set of changesets (tags, or branch names) to pull may be specified\n"
 "    by listing each changeset (tag, or branch name) with -r/--rev.\n"
 "    If -r/--rev is used, the cloned repository will contain only a subset\n"
@@ -5050,12 +5137,12 b' msgid ""'
 "\n"
 "    For efficiency, hardlinks are used for cloning whenever the source\n"
 "    and destination are on the same filesystem (note this applies only\n"
-"    to the repository data, not to the checked out files). Some\n"
+"    to the repository data, not to the working directory). Some\n"
 "    filesystems, such as AFS, implement hardlinking incorrectly, but\n"
 "    do not report errors. In these cases, use the --pull option to\n"
 "    avoid hardlinking.\n"
 "\n"
-"    In some cases, you can clone repositories and checked out files\n"
+"    In some cases, you can clone repositories and the working directory\n"
 "    using full hardlinks with ::\n"
 "\n"
 "      $ cp -al REPO REPOCLONE\n"
@@ -5066,6 +5153,20 b' msgid ""'
 "    breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n"
 "    this is not compatible with certain extensions that place their\n"
 "    metadata under the .hg directory, such as mq.\n"
+"\n"
+"    Mercurial will update the working directory to the first applicable\n"
+"    revision from this list:\n"
+"\n"
+"    a) null if -U or the source repository has no changesets\n"
+"    b) if -u . and the source repository is local, the first parent of\n"
+"       the source repository's working directory\n"
+"    c) the changeset specified with -u (if a branch name, this means the\n"
+"       latest head of that branch)\n"
+"    d) the changeset specified with -r\n"
+"    e) the tipmost head specified with -b\n"
+"    f) the tipmost head specified with the url#branch source syntax\n"
+"    g) the tipmost head of the default branch\n"
+"    h) tip\n"
 "    "
 msgstr ""
 "gör en kopia av ett existerande arkiv\n"
@@ -5083,21 +5184,6 b' msgstr ""'
 "    Det är möjligt att specificera en ``ssh://``-URL som destination, men\n"
 "    ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n"
 "    Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n"
-"\n"
-"    Om alternativet -U/--noupdate är angivet, kommer den nya klonen bara\n"
-"    att innehålla ett arkiv (.hg) och ingen arbetskopia (arbetskopians\n"
-"    förälder kommer att vara null-ändringen). Annars kommer klonen initialt\n"
-"    att hämta ut (i prioritetsordning):\n"
-"\n"
-"    a) ändringen, taggen eller grenen specificerad med -u/--updaterev\n"
-"    b) ändringen, taggen eller grenen given med den första -r/--rev\n"
-"    c) grenen angiven med den första -b/--branch\n"
-"    d) grenen angiven med källsyntaxen url#gren\n"
-"    e) huvudet på grenen 'default'\n"
-"\n"
-"    Använd 'hg clone -u . källa dst' för att hämta ut källkodsarkivets\n"
-"    föräldraänrding (gäller bara för lokala arkiv).\n"
-"\n"
 "    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"
@@ -5111,11 +5197,11 b' msgstr ""'
 "\n"
 "    Av effektivitestskäl används hårda länkar när källan och destinationen\n"
 "    är på samma filsystem (notera att detta bara gäller för arkivdatat,\n"
-"    inte de uthämtade filerna). Vissa filsystem såsom AFS implementerar\n"
+"    inte arbetskopian). Vissa filsystem såsom AFS implementerar\n"
 "    hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n"
 "    för att undvika användning av hårda länkar.\n"
 "\n"
-"    I vissa fall kan du klona både arkiv och uthämtade filer, alla\n"
+"    I vissa fall kan du klona både arkiv och arbetskopia, alla\n"
 "    hårdlänkade, med ::\n"
 "\n"
 "      $ cp -al ARKIV ARKIVKLON\n"
@@ -5126,6 +5212,20 b' msgstr ""'
 "    hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n"
 "    inte heller kompatibelt med vissa utökningar som placerar sin metadata\n"
 "    under katalogen .hg, som mq.\n"
+"\n"
+"    Mercurial uppdaterar arbetskatalogen till den första passande\n"
+"    revisionen från den här listan:\n"
+"\n"
+"    a) null med -U eller källarkivet inte har några ändringar\n"
+"    b) med -u . och källarkivet, den första föräldern av källarkivets\n"
+"       arbetskatalog\n"
+"    c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n"
+"       huvudet på den grenen)\n"
+"    d) ändringen angiven med -r\n"
+"    e) det högsta huvudet angivet med -b\n"
+"    f) det högsta huvudet angivent med källsyntaxen url#gren\n"
+"    g) det högsta huvudet på default-grenen\n"
+"    h) tip\n"
 "    "
 
 msgid "cannot specify both --noupdate and --updaterev"
@@ -5210,9 +5310,6 b' msgstr ""'
 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 "There is no Mercurial repository here (.hg not found)"
-msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)"
-
 msgid "either two or three arguments required"
 msgstr "endera två eller tre argument krävs"
 
@@ -7964,7 +8061,7 b' msgid "unknown bisect kind %s"'
 msgstr ""
 
 msgid "disabled extensions:"
-msgstr ""
+msgstr "deaktiverade utökningar:"
 
 msgid "Configuration Files"
 msgstr "Konfigurationsfiler"
@@ -7973,28 +8070,28 b' msgid "Date Formats"'
 msgstr "Datumformat"
 
 msgid "File Name Patterns"
-msgstr ""
+msgstr "Filnamnsmönster"
 
 msgid "Environment Variables"
-msgstr ""
+msgstr "Miljövariabler"
 
 msgid "Specifying Single Revisions"
-msgstr ""
+msgstr "Ange En Revision"
 
 msgid "Specifying Multiple Revisions"
-msgstr ""
+msgstr "Ange Flera Revisioner"
 
 msgid "Diff Formats"
-msgstr ""
+msgstr "Diff-format"
 
 msgid "Template Usage"
-msgstr ""
+msgstr "Användning Av Mallar"
 
 msgid "URL Paths"
-msgstr ""
+msgstr "URL-sökvägar"
 
 msgid "Using additional features"
-msgstr ""
+msgstr "Använda ytterligare funktioner"
 
 msgid ""
 "Mercurial reads configuration data from several files, if they exist.\n"
@@ -8396,6 +8493,34 b' msgid ""'
 "uncommitted merge is in progress, \".\" is the revision of the first\n"
 "parent.\n"
 msgstr ""
+"Mercurial stöder flera sött att ange individuella revisioner.\n"
+"\n"
+"Ett heltal behandlas som ett revisionsnummer. Negativa heltal behandlas som\n"
+"sekventiell offset från toppen, där -1 är tippen, -2 revisionen innan\n"
+"toppen, och så vidare.\n"
+"\n"
+"En 40-siffrig hexadecimal sträng behandlas som en unik\n"
+"revisionsidentifierare.\n"
+"\n"
+"En hexadecimal sträng med mindre än 40 tecken behandlas som en unik\n"
+"revisionsidentifierare och refereras till som en kort identifierare. En\n"
+"kort identifierare är bara giltig om det är prefixet för exakt en\n"
+"fullängdsidentifierare.\n"
+"\n"
+"Alla andra strängar behandlas som märkes- eller grennamn. Ett märkesnamn är\n"
+"ett symboliskt namn associerad med en revisionsidentifierare. Ett grennamn\n"
+"anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n"
+"innehålla tecknet \":\".\n"
+"\n"
+"Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n"
+"identifierar den senaste revisionen.\n"
+"\n"
+"Det reserverade namnet \"null\" indikerar null-revisionen. Detta är\n"
+"revisionen i ett tomt arkiv, och är förälder till revision 0.\n"
+"\n"
+"Det reserverade namnet \".\" indikerar arbetskatalogens förälder. Om ingen\n"
+"arbetskatalog är uthämtad, är den ekvivalent med null. Om en oarkiverad\n"
+"sammanfogning pågår, så är \".\" den första förälderns revision.\n"
 
 msgid ""
 "Mercurial allows you to customize output of commands through\n"
@@ -8905,9 +9030,11 b' msgstr ""'
 
 #, python-format
 msgid ""
-"%s: files over 10MB may cause memory and performance problems\n"
-"(use 'hg revert %s' to unadd the file)\n"
-msgstr ""
+"%s: up to %d MB of RAM may be required to manage this file\n"
+"(use 'hg revert %s' to cancel the pending addition)\n"
+msgstr ""
+"%s: upp till %d MB RAM kan behövas för att hantera denna fil\n"
+"(använd 'hg revert %s' för att ångra den väntande additionen)\n"
 
 #, python-format
 msgid "%s not added: only files and symlinks supported currently\n"
@@ -8947,31 +9074,33 b' msgid "searching"'
 msgstr "söker"
 
 msgid "already have changeset "
-msgstr ""
+msgstr "har redan ändringen "
 
 msgid "warning: repository is unrelated\n"
-msgstr ""
+msgstr "varning: arkivet är obesälktat\n"
 
 msgid "repository is unrelated"
-msgstr ""
+msgstr "arkivet är obesläktat"
 
 msgid "requesting all changes\n"
-msgstr ""
+msgstr "efterfrågar alla ändringar\n"
 
 msgid ""
 "Partial pull cannot be done because other repository doesn't support "
 "changegroupsubset."
 msgstr ""
+"Deldragningar kan inte göras eftersom det andra arkivet inte stödjer "
+"changegroupsubset."
 
 #, python-format
 msgid "abort: push creates new remote heads on branch '%s'!\n"
 msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n"
 
 msgid "abort: push creates new remote heads!\n"
-msgstr ""
+msgstr "avbryter: push skapar nya fjärrhuvuden!\n"
 
 msgid "(did you forget to merge? use push -f to force)\n"
-msgstr ""
+msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n"
 
 msgid "(you should pull and merge or use push -f to force)\n"
 msgstr ""
@@ -8991,21 +9120,21 b' msgstr "notera: osynkade fj\xc3\xa4rr\xc3\xa4ndringar!\\n"'
 msgid "%d changesets found\n"
 msgstr "%d ändringar hittades\n"
 
-msgid "bundle changes"
-msgstr "bunta ändringar"
+msgid "bundling changes"
+msgstr "buntar ändringar"
 
 msgid "chunks"
 msgstr "stycken"
 
-msgid "bundle manifests"
-msgstr "bunta manifest"
+msgid "bundling manifests"
+msgstr "buntar manifest"
 
 #, python-format
 msgid "empty or missing revlog for %s"
 msgstr "tom eller saknad revlog för %s"
 
-msgid "bundle files"
-msgstr "bunta filer"
+msgid "bundling files"
+msgstr "buntar filer"
 
 msgid "adding changesets\n"
 msgstr "lägger till ändringar\n"
@@ -9056,55 +9185,55 b' msgid "the server sent an unknown error '
 msgstr ""
 
 msgid "streaming all changes\n"
-msgstr ""
+msgstr "strömmar alla ändringar\n"
 
 #, python-format
 msgid "%d files to transfer, %s of data\n"
-msgstr ""
+msgstr "%d filer att överföra, %s med data\n"
 
 #, python-format
 msgid "transferred %s in %.1f seconds (%s/sec)\n"
-msgstr ""
+msgstr "överförde %s på %.1f sekunder (%s/sek)\n"
 
 msgid "no [smtp]host in hgrc - cannot send mail"
-msgstr ""
+msgstr "ingen [smtp]server i hgrc - kan inte sända mail"
 
 #, python-format
 msgid "sending mail: smtp host %s, port %s\n"
-msgstr ""
+msgstr "sänder mail: smtp-server %s, port %s\n"
 
 msgid "can't use TLS: Python SSL support not installed"
-msgstr ""
+msgstr "kan inte använda TLS: Pythons SSL-stöd är inte installerat"
 
 msgid "(using tls)\n"
-msgstr ""
+msgstr "(använder tls)\n"
 
 #, python-format
 msgid "(authenticating to mail server as %s)\n"
-msgstr ""
+msgstr "(autenticerar mot mailserver som %s)\n"
 
 #, python-format
 msgid "sending mail: %s\n"
-msgstr ""
+msgstr "sänder mail: %s\n"
 
 msgid "smtp specified as email transport, but no smtp host configured"
-msgstr ""
+msgstr "smtp angiven som emailtransport, men ingen smtp-server konfigurerad"
 
 #, python-format
 msgid "%r specified as email transport, but not in PATH"
-msgstr ""
+msgstr "%r angiven som emailtransport, men inte i PATH"
 
 #, python-format
 msgid "ignoring invalid sendcharset: %s\n"
-msgstr ""
+msgstr "ignorerar ogiltig sendcharset: %s\n"
 
 #, python-format
 msgid "invalid email address: %s"
-msgstr ""
+msgstr "ogiltig emailadress: %s"
 
 #, python-format
 msgid "invalid local address: %s"
-msgstr ""
+msgstr "ogiltig lokal adress: %s"
 
 #, python-format
 msgid "failed to remove %s from manifest"
@@ -9528,25 +9657,25 b' msgid "edit failed"'
 msgstr ""
 
 msgid "http authorization required"
-msgstr ""
+msgstr "http-autenticiering krävs"
 
 msgid "http authorization required\n"
-msgstr ""
+msgstr "http-autenticiering krävs\n"
 
 #, python-format
 msgid "realm: %s\n"
-msgstr ""
+msgstr "realm: %s\n"
 
 #, python-format
 msgid "user: %s\n"
-msgstr ""
+msgstr "användare: %s\n""
 
 msgid "user:"
-msgstr ""
+msgstr "användare:""
 
 #, python-format
 msgid "http auth: user %s, password %s\n"
-msgstr ""
+msgstr "http-auth: användare %s, lösenord %s\n"
 
 #, python-format
 msgid "ignoring invalid [auth] key '%s'\n"
@@ -9701,8 +9830,8 b' msgstr "arkivet anv\xc3\xa4nder revlog-format %d\\n"'
 msgid "checking changesets\n"
 msgstr "kontrollerar ändringar\n"
 
-msgid "changelog"
-msgstr "ändringslogg"
+msgid "checking"
+msgstr "kontrollerar"
 
 #, python-format
 msgid "unpacking changeset %s"
@@ -9725,8 +9854,8 b' msgstr ""'
 msgid "crosschecking files in changesets and manifests\n"
 msgstr "korskontrollerar filer i ändringar och manifest\n"
 
-msgid "crosscheck"
-msgstr "korskontroll"
+msgid "crosschecking"
+msgstr "korskontrollerar"
 
 #, python-format
 msgid "changeset refers to unknown manifest %s"