Mercurial > hg
changeset 11477:9374e3c214f9 stable
Merge with stable
| author | Wagner Bruna <wbruna@yahoo.com> |
|---|---|
| date | Sat, 26 Jun 2010 21:29:39 -0300 |
| parents | 597586bd93e1 (diff) b9a46acdfe1f (current diff) |
| children | 13d02d6677f2 |
| files | |
| diffstat | 2 files changed, 3132 insertions(+), 1564 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/pt_BR.po Sat Jun 26 12:26:03 2010 -0500 +++ b/i18n/pt_BR.po Sat Jun 26 21:29:39 2010 -0300 @@ -204,15 +204,16 @@ msgid "" " # Use this if you want to check access restrictions at commit time\n" -" pretxncommit.acl = python:hgext.acl.hook\n" -" \n" +" pretxncommit.acl = python:hgext.acl.hook" +msgstr "" +" # Use este gancho para verificar restrições de acesso durante um commit\n" +" pretxncommit.acl = python:hgext.acl.hook" + +msgid "" " # Use this if you want to check access restrictions for pull, push,\n" " # bundle and serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook" msgstr "" -" # Use este gancho para verificar restrições de acesso durante um commit\n" -" pretxncommit.acl = python:hgext.acl.hook\n" -" \n" " # Use este gancho para verificar restrições de acesso para pull, push,\n" " # bundle e serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook" @@ -235,50 +236,53 @@ " # Padrão: serve\n" " sources = serve" -msgid "" -" [acl.deny.branches] \n" -" \n" -" # Everyone is denied to the frozen branch: \n" -" frozen-branch = * \n" -" \n" -" # A bad user is denied on all branches: \n" -" * = bad-user \n" -" \n" -" [acl.allow.branches] \n" -" \n" -" # A few users are allowed on branch-a: \n" -" branch-a = user-1, user-2, user-3 \n" -" \n" -" # Only one user is allowed on branch-b: \n" -" branch-b = user-1 \n" -" \n" -" # The super user is allowed on any branch: \n" -" * = super-user \n" -" \n" -" # Everyone is allowed on branch-for-tests: \n" -" branch-for-tests = * " -msgstr "" -" [acl.deny.branches] \n" -" \n" -" # Todos são recusados no ramo \"frozen\": \n" -" frozen-branch = * \n" -" \n" -" # usuário-mau é recusado em todos os ramos: \n" -" * = bad-user \n" -" \n" -" [acl.allow.branches] \n" -" \n" -" # Alguns usuários são permitidos no ramo-a: \n" -" ramo-a = usuário-1, usuário-2, usuário-3 \n" -" \n" -" # Apenas um usuário é permitido no ramo-b: \n" -" ramo-b = usuário-1 \n" -" \n" -" # super-usuário é permitido em qualquer ramo: \n" -" * = super-usuário \n" -" \n" -" # Todos são permitidos em ramo-de-testes: \n" -" ramo-de-testes = * " +msgid " [acl.deny.branches]" +msgstr " [acl.deny.branches]" + +msgid "" +" # Everyone is denied to the frozen branch:\n" +" frozen-branch = *" +msgstr "" +" # Todos são recusados no ramo \"frozen\":\n" +" frozen-branch = * " + +msgid "" +" # A bad user is denied on all branches:\n" +" * = bad-user" +msgstr "" +" # O usuário-mau é recusado em todos os ramos:\n" +" * = usuário-mau" + +msgid " [acl.allow.branches]" +msgstr " [acl.allow.branches]" + +msgid "" +" # A few users are allowed on branch-a:\n" +" branch-a = user-1, user-2, user-3" +msgstr "" +" # Alguns usuários são permitidos no ramo-a:\n" +" ramo-a = usuário-1, usuário-2, usuário-3" + +msgid "" +" # Only one user is allowed on branch-b:\n" +" branch-b = user-1" +msgstr "" +" # Apenas um usuário é permitido no ramo-b:\n" +" ramo-b = usuário-1" + +msgid "" +" # The super user is allowed on any branch:\n" +" * = super-user" +msgstr "" +" # super-usuário é permitido em qualquer ramo:\n" +" * = super-usuário" + +msgid "" +" # Everyone is allowed on branch-for-tests:\n" +" branch-for-tests = *" +msgstr "" +" # Todos são permitidos em ramo-de-testes:\n" +" ramo-de-testes = *" msgid "" " [acl.deny]\n" @@ -510,12 +514,25 @@ msgid "updating bookmark %s failed!\n" msgstr "a atualização do marcador %s falhou!\n" +msgid "searching for changes\n" +msgstr "procurando por mudanças\n" + +msgid "no changes found\n" +msgstr "nenhuma alteração encontrada\n" + +#, python-format +msgid "comparing with %s\n" +msgstr "comparando com %s\n" + msgid "bookmark to import" msgstr "marcador a ser importado" msgid "bookmark to export" msgstr "marcador a ser exportado" +msgid "compare bookmark" +msgstr "compara marcador" + msgid "force" msgstr "forçar" @@ -2771,13 +2788,6 @@ " trabalho.\n" " " -#, python-format -msgid "comparing with %s\n" -msgstr "comparando com %s\n" - -msgid "no changes found\n" -msgstr "nenhuma alteração encontrada\n" - msgid "show the revision DAG" msgstr "mostra o grafo de revisões" @@ -10324,7 +10334,6 @@ msgid "annotate with branch names" msgstr "comenta com nomes de ramos" -#, fuzzy msgid "use dots for runs" msgstr "usar pontos para representar sequências" @@ -10853,9 +10862,6 @@ msgid "unsupported file type (type is %s)" msgstr "tipo de arquivo não suportado (o tipo é %s)" -msgid "searching for changes\n" -msgstr "procurando por mudanças\n" - msgid "queries" msgstr "consultas" @@ -11170,7 +11176,7 @@ msgstr "Configuração do hgweb" msgid "Glossary" -msgstr "Gossário" +msgstr "Glossário" msgid "" "Mercurial reads configuration data from several files, if they exist.\n" @@ -11222,6 +11228,34 @@ "- ``<install-root>/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 "" +"Se houver um arquivo de configuração de repositório que não tenha como\n" +"dono o usuário ativo, o Mercurial avisará que o arquivo é ignorado::" + +msgid " not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" +msgstr " não confiando em arquivo <repo>/.hg/hgrc de usuário não confiável USUÁRIO, grupo GRUPO" + +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 "" +"Este aviso pode ser silenciado (o arquivo ainda seria ignorado) ou\n" +"você pode especificar que confia no conteúdo desse arquivo. Use uma\n" +"das definições seguintes, a sintaxe é explicada em seguida:" + +msgid "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = USER``\n" +"- ``trusted.groups = GROUP``" +msgstr "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = USER``\n" +"- ``trusted.groups = GROUP``" + +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::" @@ -11669,6 +11703,12 @@ " changeset is an ancestor, and a parent of an ancestor is an\n" " ancestor. See also: 'Descendant'." msgstr "" +"Ancestor\n" +" Ancestral. Qualquer revisão que possa ser alcançada por uma cadeia\n" +" contínua de revisões pais a partir de uma revisão dada. Mais\n" +" precisamente, os ancestrais de uma revisão podem ser definidos por\n" +" duas propriedades: um pai de uma revisão é um ancestral, e um pai\n" +" de um ancestral é um ancestral. Veja também: 'Descendant'." msgid "" "Branch\n" @@ -11678,6 +11718,13 @@ " a named branch. If a topological branch is not named, it becomes\n" " an anonymous branch. See 'Branch, anonymous' and 'Branch, named'." msgstr "" +"Branch\n" +" (Nome) Ramo. Uma revisão filha que foi criada a partir de um pai que\n" +" não seja uma cabeça. Estes ão conhecidos como ramos topológicos; veja\n" +" 'Branch, topological'. Se um ramo topológico tiver um nome, ele pode\n" +" ser chamado de ramo nomeado. Se um ramo topológico não tiver um nome,\n" +" ele pode ser chamado de ramo anônimo. Veja 'Branch, anonymous' e\n" +" 'Branch, named'." msgid "" " Branches may be created when changes are pulled from or pushed to\n" @@ -11688,17 +11735,30 @@ " explicitly with a named branch, but it can also be done locally,\n" " using bookmarks or clones and anonymous branches." msgstr "" +" Ramos podem ser criados quando mudanças forem trazidas de ou enviadas\n" +" para um repositório remoto, já que novas cabeças podem ser criadas por\n" +" estas operações. Note que o termo ramo pode também ser usado\n" +" informalmente para descrever um processo de desenvolvimento no qual\n" +" parte do trabalho é feita independentemente de outras partes. Isto\n" +" pode ser feito com ramos anônimos, distinguindo-os através de\n" +" diferentes clones ou marcadores (veja :hg:`help bookmarks`), ou\n" +" explicitamente usando ramos nomeados." msgid " Example: \"The experimental branch\"." msgstr "" +" Exemplos: \"o ramo experimental\"; \"enviei a correção para o\n" +" ramo de produção\"." msgid "" " (Verb) The action of creating a child changeset which results in\n" " its parent having more than one child." msgstr "" +" (Verbo) Ramificar. A ação de criar uma revisão filha que resulta\n" +" em seu pai ter mais de uma revisão filha, muitas vezes designada\n" +" como \"criar um ramo\" ou \"fazer um ramo\"." msgid " Example: \"I'm going to branch at X\"." -msgstr "" +msgstr " Exemplos: \"vou ramificar em X\"; \"vou criar um ramo em X\"." msgid "" "Branch, anonymous\n" @@ -11706,22 +11766,35 @@ " a head and the name of the branch is not changed, a new anonymous\n" " branch is created." msgstr "" +"Branch, anonymous\n" +" Ramo anônimo. Um ramo anônimo é criado sempre que uma nova revisão\n" +" filha for criada a partir de um pai que não seja uma cabeça (veja\n" +" 'Head, branch') sem mudar o nome do ramo (veja 'Branch, named')." msgid "" "Branch, closed\n" " A named branch whose branch heads have all been closed." msgstr "" +"Branch, closed\n" +" Ramo fechado. Um ramo nomeado (veja 'Branch, named') onde todas as\n" +" cabeças de ramo (veja 'Branch, heads') tenham sido fechadas." msgid "" "Branch, default\n" " The branch assigned to a changeset when no name has previously been\n" " assigned." msgstr "" +"Branch, default\n" +" Ramo default, às vezes chamado de ramo padrão. 'default' é o nome\n" +" de ramo (veja 'Branch, named') atribuído a uma revisão se nenhum nome\n" +" for explicitamente atribuído." msgid "" "Branch head\n" " See 'Head, branch'." msgstr "" +"Branch head\n" +" Veja 'Head, branch'." msgid "" "Branch, named\n" @@ -11732,6 +11805,13 @@ " :hg:`commit --close-branch` for more information on managing\n" " branches." msgstr "" +"Branch, named\n" +" Ramo nomeado. É uma coleção de revisões que possuem o mesmo nome de\n" +" ramo. Por padrão, as revisões filhas de uma revisão em um ramo\n" +" nomeado pertencem ao mesmo ramo nomeado; uma revisão filha pode\n" +" receber um outro nome de ramo durante sua criação. Veja\n" +" :hg:`help branch`, :hg:`help branches` e :hg:`commit --close-branch`\n" +" para explicações mais detalhadas sobre gerenciamento de ramos." msgid "" " Named branches can be thought of as a kind of namespace, dividing\n" @@ -11742,11 +11822,21 @@ " further changesets are added to that previous branch, then the new\n" " named branch will be a branch in name only." msgstr "" +" Ramos nomeados podem ser vistos como um tipo de espaço de nomes,\n" +" dividindo a coleção de revisões que compõe um repositório em\n" +" subconjuntos disjuntos. Um ramo nomeado não é necessariamente\n" +" um ramo topológico. Se um novo ramo nomeado for criado a partir\n" +" da cabeça de um outro ramo nomeado, ou do ramo default, mas nenhuma\n" +" outra revisão for adicionada no ramo de origem, tal ramo de origem\n" +" não será mais um ramo topológico, embora não deixe de ser um ramo\n" +" nomeado." msgid "" "Branch tip\n" " See 'Tip, branch'." msgstr "" +"Branch tip\n" +" Veja 'Tip, branch'." msgid "" "Branch, topological\n" @@ -11756,6 +11846,13 @@ " branch is not named, it becomes an anonymous branch of the\n" " current, possibly default, branch." msgstr "" +"Branch, topological\n" +" Ramo topológico. Cada vez que uma nova revisão filha for criada a\n" +" partir de um pai que não seja uma cabeça (veja 'Head, topological'),\n" +" um novo ramo topológico é criado. Se um ramo topológico tiver um\n" +" nome de ramo, será um ramo nomeado. Se um ramo topológico não for\n" +" nomeado, ele se torna um ramo anônimo do ramo atual (possivelmente\n" +" o ramo 'default', veja 'Branch, default')." msgid "" "Changelog\n" @@ -11763,11 +11860,19 @@ " to the repository. This includes details such as changeset id,\n" " author, commit message, date, and list of changed files." msgstr "" +"Changelog\n" +" Um registro das revisões na ordem em que elas foram adicionadas\n" +" ao repositório. Isso inclui detalhes como id de revisão, autor,\n" +" mensagem de consolidação, data e lista de arquivos modificados." msgid "" "Changeset\n" " A snapshot of the state of the repository used to record a change." msgstr "" +"Changeset\n" +" Revisão. Uma cópia do estado do repositório usado para gravar uma\n" +" mudança. Dependendo do contexto, pode se referir também à mudança\n" +" imediata que levou a esse estado." msgid "" "Changeset, child\n" @@ -11775,6 +11880,10 @@ " a child of P. There is no limit to the number of children that a\n" " changeset may have." msgstr "" +"Changeset, child\n" +" Revisão filha. O inverso de revisão pai: se P é um pai de F, então F\n" +" é uma filha de P. Não há limite no número de revisões filhas que uma\n" +" revisão possa ter." msgid "" "Changeset id\n" @@ -11782,12 +11891,21 @@ " represented as either a \"long\" 40-byte hexadecimal string, or a\n" " \"short\" 12-byte hexadecimal string." msgstr "" +"Changeset id\n" +" Id de revisão. Um hash SHA-1 que identifica unicamente uma revisão.\n" +" Pode ser representado tanto como uma cadeia \"longa\" de caracteres\n" +" hexadecimais de 40 bytes, ou uma cadeia \"curta\" de 12 caracteres\n" +" correspondente aos 12 primeiros caracteres da cadeia longa (veja\n" +" :hg:`help revisions`)." msgid "" "Changeset, merge\n" " A changeset with two parents. This occurs when a merge is\n" " committed." msgstr "" +"Changeset, merge\n" +" Revisão de mesclagem. Uma revisão com dois pais. Tais revisões são\n" +" criadas ao consolidar uma mesclagem (veja 'Merge')." msgid "" "Changeset, parent\n" @@ -11796,6 +11914,11 @@ " immediately precedes C in the DAG. Changesets have at most two\n" " parents." msgstr "" +"Changeset, parent\n" +" Revisão pai. Uma revisão na qual uma revisão filha se baseia.\n" +" Especificamente, uma revisão pai de uma revisão F é uma revisão\n" +" cujo nó imediatamente precede F no DAG (veja 'DAG'). Revisões\n" +" têm no máximo duas revisões pais." msgid "" "Checkout\n" @@ -11803,60 +11926,86 @@ " revision. This use should probably be avoided where possible, as\n" " changeset is much more appropriate than checkout in this context." msgstr "" +"Checkout\n" +" (Nome) Um diretório de trabalho atualizado para uma revisão\n" +" específica, comumente usado em outros sistemas de controle de\n" +" versão. Este uso é desencorajado, uma vez que revisão ou\n" +" 'changeset' são bem mais apropriados que 'checkout' nesse\n" +" contexto." msgid " Example: \"I'm using checkout X.\"" -msgstr "" +msgstr " Exemplo: \"Estou usando o checkout X.\"" msgid "" " (Verb) Updating the working directory to a specific changeset. See\n" " :hg:`help update`." msgstr "" +" (Verbo) Atualizar o diretório de trabalho para uma revisão específica.\n" +" É um apelido para o comando 'update'; veja :hg:`help update`." msgid " Example: \"I'm going to check out changeset X.\"" -msgstr "" +msgstr " Exemplo: \"Estou atualizando para a revisão X.\"" msgid "" "Child changeset\n" " See 'Changeset, child'." msgstr "" +"Child changeset\n" +" Veja 'Changeset, child'." msgid "" "Close changeset\n" " See 'Changeset, close'." msgstr "" +"Close changeset\n" +" Veja 'Changeset, close'." msgid "" "Closed branch\n" " See 'Branch, closed'." msgstr "" +"Closed branch\n" +" Veja 'Branch, closed'." msgid "" "Clone\n" " (Noun) An entire or partial copy of a repository. The partial\n" " clone must be in the form of a revision and its ancestors." msgstr "" +"Clone\n" +" (Nome) Uma cópia total ou parcial de um repositório." msgid " Example: \"Is your clone up to date?\"." -msgstr "" +msgstr " Exemplo: \"Seu clone está atualizado?\"." msgid " (Verb) The process of creating a clone, using :hg:`clone`." msgstr "" +" (Verbo) Clonar. O processo de criar um clone, usando o comando\n" +" de mesmo nome: :hg:`clone`." msgid " Example: \"I'm going to clone the repository\"." -msgstr "" +msgstr " Exemplo: \"Vou clonar o repositório\"." msgid "" "Closed branch head\n" " See 'Head, closed branch'." msgstr "" +"Closed branch head\n" +" Veja 'Head, closed branch'." msgid "" "Commit\n" " (Noun) A synonym for changeset." msgstr "" +"Commit\n" +" (Nome) Consolidação. Pode se referir ao ato de consolidar uma nova\n" +" revisão, o comando que faz essa consolidação (veja :hg:`help commit`)\n" +" ou simplesmente a uma revisão." msgid " Example: \"Is the bug fixed in your recent commit?\"" msgstr "" +" Exemplos: \"O bug foi corrigido por seu último commit?\";\n" +" \"A consolidação das mudanças foi finalizada com sucesso.\"" msgid "" " (Verb) The act of recording changes to a repository. When files\n" @@ -11864,14 +12013,21 @@ " differences between the committed files and their parent\n" " changeset, creating a new changeset in the repository." msgstr "" +" (Verbo) Consolidar. O ato de gravar mudanças em um repositório.\n" +" Quando arquivos são consolidados em um diretório de trabalho, o\n" +" Mercurial localiza todas as mudanças entre os arquivos consolidados\n" +" e a revisão pai (veja 'Parent, working directory'), criando uma\n" +" nova revisão no repositório." msgid " Example: \"You should commit those changes now.\"" -msgstr "" +msgstr " Exemplo: \"Você deve consolidar aquelas mudanças agora.\"" msgid "" "Cset\n" " A common abbreviation of the term changeset." msgstr "" +"Cset\n" +" Uma abreviação comum para o termo changeset (revisão)." msgid "" "DAG\n" @@ -11883,11 +12039,23 @@ " (graphlog). In mercurial, the DAG is limited by the requirement\n" " for children to have at most two parents." msgstr "" +"DAG\n" +" O repositório de revisões de um sistema de controle de versão\n" +" distribuído (DVCS) pode ser descrito como um grafo acíclico\n" +" dirigido (Directed Acyclic Graph, ou DAG), consistindo de nós\n" +" correspondendo a revisões e arestas indicando relações entre\n" +" revisões pais e filhas. Esse grafo pode ser visualizado com\n" +" ferramentas como :hg:`glog` (veja :hg:`help graphlog`). No\n" +" Mercurial, o número de arestas incidentes em um nó qualquer\n" +" do DAG é limitado a dois, por ser esse o limite do número\n" +" de pais que uma revisão pode ter." msgid "" "Default branch\n" " See 'Branch, default'." msgstr "" +"Default branch\n" +" Veja 'Branch, default'." msgid "" "Descendant\n" @@ -11897,6 +12065,13 @@ " changeset is a descendant, and the child of a descendant is a\n" " descendant. See also: 'Ancestor'." msgstr "" +"Descendant\n" +" Descendente. Qualquer revisão que possa ser alcançada por uma\n" +" cadeia de revisões filhas, a partir de uma revisão dada. Mais\n" +" precisamente, os descendentes de uma revisão podem ser definidos\n" +" por duas propriedades: as revisões filhas de uma revisão são\n" +" suas descendentes, e as revisões filhas de uma descendente são\n" +" descendentes. Veja também: 'Ancestor'." msgid "" "Diff\n" @@ -11908,17 +12083,31 @@ " attributes, none of which can be represented/handled by classic\n" " \"diff\" and \"patch\"." msgstr "" +"Diff\n" +" (Nome) A diferença de conteúdos e atributos de arquivos entre\n" +" duas revisões ou entre uma revisão e o diretório de trabalho atual.\n" +" Tal diferença é tipicamente representada em um formato de texto\n" +" padronizado conhecido como \"diff\" ou \"patch\" (veja 'Patch' e\n" +" :hg:`help diff`).\n" +" O formato \"git diff\" é usado para representar cópias, renomeações\n" +" ou mudanças de atributos de arquivo, que não podem ser representadas\n" +" no formato \"diff\" clássico. Diff também é o nome de um popular\n" +" programa Unix que gera essas representações." msgid " Example: \"Did you see my correction in the diff?\"" -msgstr "" +msgstr " Exemplo: \"Você viu minha correção no diff?\"" msgid "" " (Verb) Diffing two changesets is the action of creating a diff or\n" " patch." msgstr "" +" (Verbo) A ação de criar uma representação diff a partir de duas\n" +" revisões." msgid " Example: \"If you diff with changeset X, you will see what I mean.\"" msgstr "" +" Em português, diff não aparece como verbo: costuma-se usar\n" +" \"criar um diff\" ou \"gerar um diff\" em seu lugar." msgid "" "Directory, working\n" @@ -11930,11 +12119,22 @@ " to the files introduced manually or by a merge. The repository\n" " metadata exists in the .hg directory inside the working directory." msgstr "" +"Directory, working\n" +" Diretório de trabalho. Representa o estado dos arquivos rastreados\n" +" pelo Mercurial que será gravado na próxima consolidação. O diretório\n" +" de trabalho inicialmente corresponde a uma cópia dos dados de uma\n" +" revisão existente conhecida como pai do diretório de trabalho (veja\n" +" 'Parent, working directory'). Esse estado pode ser modificado por uma\n" +" mesclagem ou por mudanças manuais nos arquivos. Os metadados do\n" +" repositório são armazenados no diretório .hg dentro do diretório de\n" +" trabalho." msgid "" "Graph\n" " See DAG and :hg:`help graphlog`." msgstr "" +"Graph\n" +" Grafo; veja 'DAG' e :hg:`help graphlog`." msgid "" "Head\n" @@ -11942,16 +12142,24 @@ " repository head, depending on the context. See 'Head, branch' and\n" " 'Head, repository' for specific definitions." msgstr "" +"Head\n" +" Cabeça. O termo pode ser usado tanto para denotar uma cabeça de\n" +" ramo como uma cabeça do repositório, dependendo do contexto. Veja\n" +" 'Head, branch' e 'Head, repository' para definições específicas." msgid "" " Heads are where development generally takes place and are the\n" " usual targets for update and merge operations." msgstr "" +" Cabeças são onde o desenvolvimento geralmente acontece e são os\n" +" alvos costumeiros para operações update e merge." msgid "" "Head, branch\n" " A changeset with no descendants on the same named branch." msgstr "" +"Head, branch\n" +" Cabeça de ramo. Uma revisão sem descendentes no mesmo ramo nomeado." msgid "" "Head, closed branch\n" @@ -11960,16 +12168,27 @@ " closed when all its heads are closed and consequently is not\n" " listed by :hg:`branches`." msgstr "" +"Head, closed branch\n" +" Cabeça de um ramo fechado. Uma revisão que marca uma linha de\n" +" desenvolvimento que não interessa mais. A cabeça fechada não\n" +" aparece mais na lista de :hg:`heads`. Um ramo é considerado\n" +" fechado quando todas as suas cabeças estiverem fechadas, e\n" +" consequentemente não será listado por :hg:`branches`." msgid "" "Head, repository\n" " A topological head which has not been closed." msgstr "" +"Head, repository\n" +" Cabeça do repositório. Uma cabeça topológica que não foi fechada." msgid "" "Head, topological\n" " A changeset with no children in the repository." msgstr "" +"Head, topological\n" +" Cabeça topológica. Uma revisão que não tem revisões filhas neste\n" +" repositório." msgid "" "History, immutable\n" @@ -11979,6 +12198,16 @@ " so in public repositories can result in old changesets being\n" " reintroduced to the repository." msgstr "" +"History, immutable\n" +" Histórico imutável. Uma vez consolidada, uma revisão não pode ser\n" +" alterada. Extensões que se propõe a alterar o histórico (veja\n" +" 'History, rewriting') na verdade criam novas revisões substituindo\n" +" as revisões existentes.\n" +" Este tipo de operação faz mais sentido em repositórios privados:\n" +" se alguém tiver copiado alguma revisão original antes da edição,\n" +" essa revisão irá reaparecer no repositório na próxima vez que\n" +" esse desenvolvedor enviar suas revisões (a remoção de revisões\n" +" não é propagada pelo Mercurial)." msgid "" "History, rewriting\n" @@ -11986,22 +12215,35 @@ " to Mercurial can be used to alter the repository, usually in such\n" " a way as to preserve changeset contents." msgstr "" +"History, rewriting\n" +" Edição, ou reescrita de histórico. As revisões de um repositório são\n" +" imutáveis; no entanto, extensões do Mercurial podem ser usadas para\n" +" alterar o repositório, através da criação de novas revisões baseadas\n" +" nas revisões existentes (preservando ou modificando conteúdos,\n" +" metadados ou posições no grafo de revisões) e remoção das revisões\n" +" originais." msgid "" "Immutable history\n" " See 'History, immutable'." msgstr "" +"Immutable history\n" +" Veja 'History, immutable'." msgid "" "Merge changeset\n" " See 'Changeset, merge'." msgstr "" +"Merge changeset\n" +" Veja 'Changeset, merge'." msgid "" "Manifest\n" " Each changeset has a manifest, which is the list of files that are\n" " tracked by the changeset." msgstr "" +"Manifest\n" +" Manifesto. É a lista de arquivos rastreados por uma determinada revisão." msgid "" "Merge\n" @@ -12011,11 +12253,21 @@ " conflicts are resolved (and marked), this merge may be committed\n" " as a merge changeset, bringing two branches together in the DAG." msgstr "" +"Merge\n" +" Mesclagem. Operação usada para conciliar ramos de trabalho divergentes.\n" +" Quando você atualiza para uma revisão e faz uma mesclagem com outra\n" +" revisão, você traz o histórico da última para seu diretório de\n" +" trabalho. Uma vez que eventuais conflitos sejam resolvidos e marcados\n" +" (como descrito em :hg:`help resolve`), esta mesclagem pode ser\n" +" consolidada como uma revisão de mesclagem. O termo também é\n" +" usado para designar tais revisões." msgid "" "Named branch\n" " See 'Branch, named'." msgstr "" +"Named branch\n" +" Veja 'Branch, named'." msgid "" "Null changeset\n" @@ -12025,16 +12277,28 @@ " merging unrelated changesets. Can be specified by the alias 'null'\n" " or by the changeset ID '000000000000'." msgstr "" +"Null changeset\n" +" Revisão nula. A revisão vazia. É o pai do diretório de trabalho em\n" +" repositórios recém-criados, ou repositórios sem uma cópia local\n" +" obtida. É portanto o pai de revisões raízes (veja 'Root') e\n" +" o ancestral efetivo ao mesclar revisões não relacionadas. Pode ser\n" +" especificado usando o nome reservado \"null\" ou pelo id de revisão\n" +" '000000000000' (note que isto .não é o mesmo que o número de revisão\n" +" 0; veja 'Revision number')." msgid "" "Parent\n" " See 'Changeset, parent'." msgstr "" +"Parent\n" +" Veja 'Changeset, parent'." msgid "" "Parent changeset\n" " See 'Changeset, parent'." msgstr "" +"Parent changeset\n" +" Veja 'Changeset, parent'." msgid "" "Parent, working directory\n" @@ -12044,22 +12308,42 @@ " :hg:`update`. Other commands to see the working directory parent\n" " are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"." msgstr "" +"Parent, working directory\n" +" Pai do diretório de trabalho. É a revisão associada à cópia de trabalho\n" +" presente no momento: a próxima revisão consolidada será uma filha do\n" +" pai do diretório de trabalho (ou pais, no caso de uma mesclagem).\n" +" Podem ser exibidos com os comandos :hg:`parents`, :hg:`summary` ou\n" +" :hg:`id`, e mudados através de :hg:`update`. Pode ser especificado\n" +" usando o nome reservado \".\"." msgid "" "Patch\n" " (Noun) The product of a diff operation." msgstr "" +"Patch\n" +" (Nome) O produto de uma operação de diff (veja 'Diff').\n" +" Patch também é o nome de um programa Unix capaz de restaurar o\n" +" conteúdo de um arquivo de destino a partir do arquivo original\n" +" e da representação diff de suas diferenças com o destino.\n" +" Por serem capazes de aplicar tais diferenças mesmo em arquivos\n" +" ligeiramente diferentes dos originais, patches são muito usados\n" +" como forma legível de difundir e aplicar mudanças; veja\n" +" :hg:`help export` e :hg:`help import`." msgid " Example: \"I've sent you my patch.\"" -msgstr "" +msgstr " Exemplo: \"Eu enviei o meu patch.\"" msgid "" " (Verb) The process of using a patch file to transform one\n" " changeset into another." msgstr "" +" (Verbo) O processo de usar um arquivo de patch para transformar uma\n" +" revisão em outra." msgid " Example: \"You will need to patch that revision.\"" msgstr "" +" Em português, patch não aparece como verbo: costuma-se usar a expressão\n" +" \"aplicar um patch\" em seu lugar." msgid "" "Pull\n" @@ -12069,6 +12353,12 @@ " only updates the repository, it does not update the files in the\n" " working directory. See :hg:`help pull`." msgstr "" +"Pull\n" +" Recebimento de revisões remotas. Uma operação na qual revisões de um\n" +" repositório remoto que não estejam no repositório local são trazidas\n" +" para o repositório local. Note que esta operação tipicamente afeta\n" +" apenas o repositório, sem atualizar os arquivos da área de trabalho;\n" +" veja :hg:`help pull`." msgid "" "Push\n" @@ -12078,6 +12368,13 @@ " locally to the remote repository. Uncommitted changes are not\n" " sent. See :hg:`help push`." msgstr "" +"Push\n" +" Envio de revisões. Uma operação na qual revisões de um repositório\n" +" local que não estão em um repositório remoto são enviadas para esse\n" +" repositório remoto.\n" +" Note que essa operação apenas adiciona ao repositório remoto revisões\n" +" já consolidadas localmente; mudanças não consolidadas da cópia de\n" +" trabalho não são enviadas. Veja :hg:`help push`." msgid "" "Repository\n" @@ -12088,11 +12385,20 @@ " recreated by \"updating\" a working directory to a specific\n" " changeset." msgstr "" +"Repository\n" +" Repositório. Os metadados descrevendo todos os estados registrados\n" +" de uma coleção de arquivos. Cada estado registrado é representado por\n" +" uma revisão. Um repositório é tipicamente encontrado no subdiretório\n" +" ``.hg`` de um diretório de trabalho. Qualquer estado registrado pode\n" +" ser recriado através de uma atualização (veja 'Update') de um\n" +" diretório de trabalho para uma revisão específica." msgid "" "Repository head\n" " See 'Head, repository'." msgstr "" +"Repository head\n" +" Veja 'Head, repository'." msgid "" "Revision\n" @@ -12100,6 +12406,11 @@ " can be updated to by using :hg:`update`. See also 'Revision\n" " number'; See also 'Changeset'." msgstr "" +"Revision\n" +" Revisão. O estado de um repositório em algum ponto no tempo;\n" +" 'Changeset' é um termo alternativo praticamente equivalente.\n" +" Revisões mais antigas podem ser obtidas usando :hg:`update`.\n" +" Veja também 'Revision number'." msgid "" "Revision number\n" @@ -12110,6 +12421,13 @@ " identify changesets uniquely between different clones, see\n" " 'Changeset id'." msgstr "" +"Revision number\n" +" Número de revisão. Este inteiro identifica unicamente uma revisão\n" +" dentro de um repositório específico. Ele representa a ordem na qual as\n" +" revisões foram adicionadas a um repositório, começando pela revisão\n" +" número 0. Note que o número de revisão pode ser diferente em cada\n" +" clone de um repositório. Para identificar unicamente revisões entre\n" +" diferentes clones, veja 'Changeset id' e :hg:`help revisions`." msgid "" "Revlog\n" @@ -12118,23 +12436,36 @@ " of each successive revision. It includes data and an index\n" " pointing to the data." msgstr "" +"Revlog\n" +" O mecanismo de armazenamento de dados usado pelo Mercurial. É uma\n" +" forma de codificação por deltas, com revisões completas ocasionais\n" +" seguidas pelas diferenças com relação a cada revisão anterior. Inclui\n" +" dados e um índice referenciando esses dados." msgid "" "Rewriting history\n" " See 'History, rewriting'." msgstr "" +"Rewriting history\n" +" Veja 'History, rewriting'." msgid "" "Root\n" " A changeset that has only the null changeset as its parent. Most\n" " repositories have only a single root changeset." msgstr "" +"Root\n" +" Raiz. Uma revisão que possui como pai apenas a revisão nula.\n" +" A maior parte dos repositórios possui apenas uma revisão raiz." msgid "" "Tip\n" " The changeset with the highest revision number. It is the changeset\n" " most recently added in a repository." msgstr "" +"Tip\n" +" Ponta. A revisão com o maior número de revisão. É a revisão que foi\n" +" adicionada por último a um repositório." msgid "" "Tip, branch\n" @@ -12144,33 +12475,48 @@ " numbers may be different in different repository clones, the\n" " branch tip may be different in different cloned repositories." msgstr "" +"Tip, branch\n" +" A ponta de um ramo. É a cabeça de um determinado ramo com o maior\n" +" número de revisão. Quando um nome de ramo é usado como identificador\n" +" de revisão, ele se refer à ponta do ramo.\n" +" Veja também 'Branch, head'. Note que a ponta do ramo pode ser diferente\n" +" em diferentes clones de um repositório, já que os números de revisão\n" +" podem não ser os mesmos." msgid "" "Update\n" " (Noun) Another synonym of changeset." msgstr "" +"Update\n" +" (Nome) Atualização. Outro sinônimo para revisão." msgid " Example: \"I've pushed an update\"." -msgstr "" +msgstr " Exemplo: \"Eu enviei uma atualização\"." msgid "" " (Verb) This term is usually used to describe updating the state of\n" " the working directory to that of a specific changeset. See\n" " :hg:`help update`." msgstr "" +" (Verb) Atualizar. Esse termo é tipicamente usado para descrever a\n" +" mudança do estado do diretório de trabalho para uma revisão específica qualquer. Veja :hg:`help update`." msgid " Example: \"You should update\"." -msgstr "" +msgstr " Exemplo: \"Você deveria atualizar\"." msgid "" "Working directory\n" " See 'Directory, working'." msgstr "" +"Working directory\n" +" Veja 'Directory, working'." msgid "" "Working directory parent\n" " See 'Parent, working directory'.\n" msgstr "" +"Working directory parent\n" +" Veja 'Parent, working directory'.\n" msgid "" "Mercurial's internal web server, hgweb, can serve either a single\n" @@ -12495,17 +12841,18 @@ msgid "" "Identifiers such as branch names must be quoted with single or double\n" -"quotes if they contain characters outside of ``[a-zA-Z0-9]`` or if\n" -"they match one of the predefined predicates. Special characters can be\n" -"used in the identifiers by quoting them, e.g., ``\\n`` is interpreted\n" -"as a newline." +"quotes if they contain characters outside of\n" +"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" +"predicates. Special characters can be used in quoted identifiers by\n" +"escaping them, e.g., ``\\n`` is interpreted as a newline." msgstr "" "Identificadores (como nomes de ramo ou etiquetas) que contenham\n" -"caracteres fora de ``[a-zA-Z0-9]`` ou forem iguais a algum dos\n" -"predicados predefinidos devem ser passados entre aspas simples\n" -"ou duplas. Caracteres especiais podem ser usados em identificadores\n" -"usando escapes; por exemplo, ``\\n`` é interpretado como uma quebra\n" -"de linha." +"caracteres fora de ``[._a-zA-Z0-9\\x80-\\xff]`` ou que forem\n" +"iguais a algum dos predicados predefinidos devem ser passados\n" +"entre aspas simples ou duplas.\n" +"Dentro de identificadores protegidos por aspas, caracteres\n" +"especiais podem ser especificados usando escapes; por exemplo,\n" +"``\\n`` é interpretado como uma quebra de linha." msgid "There is a single prefix operator:" msgstr "Há um único operador prefixo:" @@ -13826,8 +14173,8 @@ msgid "branch %s not found" msgstr "ramo %s não encontrado" -msgid "can't merge with ancestor" -msgstr "não é possível mesclar com ancestral" +msgid "merging with a working directory ancestor has no effect" +msgstr "mesclar com um ancestral do diretório de trabalho não tem nenhum efeito" msgid "nothing to merge (use 'hg update' or check 'hg heads')" msgstr "nada para mesclar (use 'hg update' ou verifique 'hg heads')"
--- a/i18n/sv.po Sat Jun 26 12:26:03 2010 -0500 +++ b/i18n/sv.po Sat Jun 26 21:29:39 2010 -0300 @@ -1,20 +1,20 @@ # Swedish translation for Mercurial # Svensk översättning för Mercurial # Copyright (C) 2009-2010 Matt Mackall and others -# +# # Translation dictionary: -# +# # changeset ändring # commit arkivera # merge sammanfoga # tag märke -# +# msgid "" msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2010-04-19 18:58+0200\n" -"PO-Revision-Date: 2010-04-19 19:49+0200\n" +"POT-Creation-Date: 2010-06-23 09:05+0200\n" +"PO-Revision-Date: 2010-06-23 09:10+0200\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -42,8 +42,9 @@ msgstr "" msgid "" -"This hook makes it possible to allow or deny write access to portions\n" -"of a repository when receiving incoming changesets." +"This hook makes it possible to allow or deny write access to given\n" +"branches and paths of a repository when receiving incoming changesets\n" +"via pretxnchangegroup and pretxncommit." msgstr "" msgid "" @@ -54,58 +55,218 @@ msgid "" "The acl hook is best used along with a restricted shell like hgsh,\n" -"preventing authenticating users from doing anything other than\n" -"pushing or pulling. The hook is not safe to use if users have\n" -"interactive shell access, as they can then disable the hook.\n" -"Nor is it safe if remote users share an account, because then there\n" -"is no way to distinguish them." -msgstr "" - -msgid "To use this hook, configure the acl extension in your hgrc like this::" -msgstr "" - -msgid "" -" [extensions]\n" -" acl =" -msgstr "" - -msgid "" -" [hooks]\n" +"preventing authenticating users from doing anything other than pushing\n" +"or pulling. The hook is not safe to use if users have interactive\n" +"shell access, as they can then disable the hook. Nor is it safe if\n" +"remote users share an account, because then there is no way to\n" +"distinguish them." +msgstr "" + +msgid "The order in which access checks are performed is:" +msgstr "" + +msgid "" +"1) Deny list for branches (section ``acl.deny.branches``)\n" +"2) Allow list for branches (section ``acl.allow.branches``)\n" +"3) Deny list for paths (section ``acl.deny``)\n" +"4) Allow list for paths (section ``acl.allow``)" +msgstr "" + +msgid "The allow and deny sections take key-value pairs." +msgstr "" + +msgid "" +"Branch-based Access Control\n" +"---------------------------" +msgstr "" + +msgid "" +"Use the ``acl.deny.branches`` and ``acl.allow.branches`` sections to\n" +"have branch-based access control. Keys in these sections can be\n" +"either:" +msgstr "" + +msgid "" +"- a branch name, or\n" +"- an asterisk, to match any branch;" +msgstr "" + +msgid "The corresponding values can be either:" +msgstr "" + +msgid "" +"- a comma-separated list containing users and groups, or\n" +"- an asterisk, to match anyone;" +msgstr "" + +msgid "" +"Path-based Access Control\n" +"-------------------------" +msgstr "" + +msgid "" +"Use the ``acl.deny`` and ``acl.allow`` sections to have path-based\n" +"access control. Keys in these sections accept a subtree pattern (with\n" +"a glob syntax by default). The corresponding values follow the same\n" +"syntax as the other sections above." +msgstr "" + +msgid "" +"Groups\n" +"------" +msgstr "" + +msgid "" +"Group names must be prefixed with an ``@`` symbol. Specifying a group\n" +"name has the same effect as specifying all the users in that group." +msgstr "" + +msgid "" +"You can define group members in the ``acl.groups`` section.\n" +"If a group name is not defined there, and Mercurial is running under\n" +"a Unix-like system, the list of users will be taken from the OS.\n" +"Otherwise, an exception will be raised." +msgstr "" + +msgid "" +"Example Configuration\n" +"---------------------" +msgstr "" + +msgid "::" +msgstr "::" + +msgid " [hooks]" +msgstr "" + +msgid "" +" # Use this if you want to check access restrictions at commit time\n" +" pretxncommit.acl = python:hgext.acl.hook" +msgstr "" + +msgid "" +" # Use this if you want to check access restrictions for pull, push,\n" +" # bundle and serve.\n" " pretxnchangegroup.acl = python:hgext.acl.hook" msgstr "" msgid "" " [acl]\n" -" # Check whether the source of incoming changes is in this list\n" -" # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" +" # Allow or deny access for incoming changes only if their source is\n" +" # listed here, let them pass otherwise. Source is \"serve\" for all\n" +" # remote access (http or ssh), \"push\", \"pull\" or \"bundle\" when the\n" +" # related commands are run locally.\n" +" # Default: serve\n" " sources = serve" msgstr "" -msgid "" -"The allow and deny sections take a subtree pattern as key (with a glob\n" -"syntax by default), and a comma separated list of users as the\n" -"corresponding value. The deny list is checked before the allow list\n" -"is. ::" +msgid " [acl.deny.branches]" +msgstr "" + +msgid "" +" # Everyone is denied to the frozen branch:\n" +" frozen-branch = *" +msgstr "" + +msgid "" +" # A bad user is denied on all branches:\n" +" * = bad-user" +msgstr "" + +msgid " [acl.allow.branches]" +msgstr "" + +msgid "" +" # A few users are allowed on branch-a:\n" +" branch-a = user-1, user-2, user-3" +msgstr "" + +msgid "" +" # Only one user is allowed on branch-b:\n" +" branch-b = user-1" +msgstr "" + +msgid "" +" # The super user is allowed on any branch:\n" +" * = super-user" +msgstr "" + +msgid "" +" # Everyone is allowed on branch-for-tests:\n" +" branch-for-tests = *" +msgstr "" + +msgid "" +" [acl.deny]\n" +" # This list is checked first. If a match is found, acl.allow is not\n" +" # checked. All users are granted access if acl.deny is not present.\n" +" # Format for both lists: glob pattern = user, ..., @group, ..." +msgstr "" + +msgid "" +" # To match everyone, use an asterisk for the user:\n" +" # my/glob/pattern = *" +msgstr "" + +msgid "" +" # user6 will not have write access to any file:\n" +" ** = user6" +msgstr "" + +msgid "" +" # Group \"hg-denied\" will not have write access to any file:\n" +" ** = @hg-denied" +msgstr "" + +msgid "" +" # Nobody will be able to change \"DONT-TOUCH-THIS.txt\", despite\n" +" # everyone being able to change all other files. See below.\n" +" src/main/resources/DONT-TOUCH-THIS.txt = *" msgstr "" msgid "" " [acl.allow]\n" -" # If acl.allow is not present, all users are allowed by default.\n" -" # An empty acl.allow section means no users allowed.\n" -" docs/** = doc_writer\n" -" .hgtags = release_engineer" -msgstr "" - -msgid "" -" [acl.deny]\n" -" # If acl.deny is not present, no users are refused by default.\n" -" # An empty acl.deny section means all users allowed.\n" -" glob pattern = user4, user5\n" -" ** = user6\n" -msgstr "" - -#, python-format -msgid "config error - hook type \"%s\" cannot stop incoming changesets" +" # if acl.allow is not present, all users are allowed by default\n" +" # empty acl.allow = no users allowed" +msgstr "" + +msgid "" +" # User \"doc_writer\" has write access to any file under the \"docs\"\n" +" # folder:\n" +" docs/** = doc_writer" +msgstr "" + +msgid "" +" # User \"jack\" and group \"designers\" have write access to any file\n" +" # under the \"images\" folder:\n" +" images/** = jack, @designers" +msgstr "" + +msgid "" +" # Everyone (except for \"user6\" - see acl.deny above) will have write\n" +" # access to any file under the \"resources\" folder (except for 1\n" +" # file. See acl.deny):\n" +" src/main/resources/** = *" +msgstr "" + +msgid " .hgtags = release_engineer" +msgstr "" + +#, python-format +msgid "group '%s' is undefined" +msgstr "" + +#, python-format +msgid "" +"config error - hook type \"%s\" cannot stop incoming changesets nor commits" +msgstr "" + +#, python-format +msgid "acl: user \"%s\" denied on branch \"%s\" (changeset \"%s\")" +msgstr "" + +#, python-format +msgid "acl: user \"%s\" not allowed on branch \"%s\" (changeset \"%s\")" msgstr "" #, python-format @@ -123,8 +284,8 @@ msgstr "" msgid "" -"It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update)." +"It is possible to use bookmark names in every revision lookup (e.g.\n" +":hg:`merge`, :hg:`update`)." msgstr "" msgid "" @@ -148,12 +309,12 @@ msgid "" " Bookmarks are pointers to certain commits that move when\n" " committing. Bookmarks are local. They can be renamed, copied and\n" -" deleted. It is possible to use bookmark names in 'hg merge' and\n" -" 'hg update' to merge and update respectively to a given bookmark." -msgstr "" - -msgid "" -" You can use 'hg bookmark NAME' to set a bookmark on the working\n" +" deleted. It is possible to use bookmark names in :hg:`merge` and\n" +" :hg:`update` to merge and update respectively to a given bookmark." +msgstr "" + +msgid "" +" You can use :hg:`bookmark NAME` to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" " the bookmark is assigned to that revision.\n" @@ -181,15 +342,72 @@ msgid "no bookmarks set\n" msgstr "inga bokmärken satta\n" +#, python-format +msgid "updating bookmark %s\n" +msgstr "uppdaterar bokmärket %s\n" + +#, python-format +msgid "not updating divergent bookmark %s\n" +msgstr "" + +#, python-format +msgid "failed to update bookmark %s!\n" +msgstr "misslyckades att uppdatera bokmärket %s!\n" + +#, python-format +msgid "remote bookmark %s not found!" +msgstr "" + +#, python-format +msgid "importing bookmark %s\n" +msgstr "importerar bokmärket %s\n" + +#, python-format +msgid "exporting bookmark %s\n" +msgstr "exporterar bokmärket %s\n" + +#, python-format +msgid "deleting remote bookmark %s\n" +msgstr "raderar fjärrbokmärket %s\n" + +#, python-format +msgid "updating bookmark %s failed!\n" +msgstr "uppdatering av bokmärket %s misslyckades!\n" + +msgid "searching for changes\n" +msgstr "söker efter ändringar\n" + +msgid "no changes found\n" +msgstr "inga ändringar hittades\n" + +#, python-format +msgid "comparing with %s\n" +msgstr "jämför med %s\n" + +msgid "bookmark to import" +msgstr "bokmärke att importera" + +msgid "bookmark to export" +msgstr "bokmärke att exportera" + +msgid "compare bookmark" +msgstr "jämför bokmärke" + msgid "force" msgstr "tvinga" +msgid "REV" +msgstr "REV" + msgid "revision" msgstr "revision" msgid "delete a given bookmark" msgstr "" +msgid "NAME" +msgstr "NAMN" + msgid "rename a given bookmark" msgstr "" @@ -541,7 +759,7 @@ " by providing a file using the following format::" msgstr "" -msgid " <alias email> <actual email>" +msgid " <alias email> = <actual email>" msgstr "" msgid "" @@ -553,12 +771,21 @@ msgid "count rate for the specified revision or range" msgstr "" +msgid "DATE" +msgstr "DATUM" + msgid "count rate for revisions matching date spec" msgstr "" +msgid "TEMPLATE" +msgstr "MALL" + msgid "template to group changesets" msgstr "" +msgid "FORMAT" +msgstr "FORMAT" + msgid "strftime-compatible format for grouping by date" msgstr "" @@ -571,6 +798,9 @@ msgid "display added/removed lines separately" msgstr "visa tillagda/raderade rader separat" +msgid "FILE" +msgstr "FIL" + msgid "file with email aliases" msgstr "" @@ -581,7 +811,8 @@ msgstr "färglägg utmatning från vissa kommandon" msgid "" -"This extension modifies the status and resolve commands to add color to their\n" +"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" @@ -700,6 +931,9 @@ msgid "when to colorize (always, auto, or never)" msgstr "när färgläggning ska ske (always, auto eller never)" +msgid "TYPE" +msgstr "TYP" + msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" @@ -1078,7 +1312,16 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "" -msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n" +#, python-format +msgid "%s does not look like a Bazaar repository" +msgstr "%s verkar inte vara ett Bazaar-arkiv" + +msgid "Bazaar modules could not be loaded" +msgstr "Bazaar-moduler kunde inte laddas" + +msgid "" +"warning: lightweight checkouts may cause conversion failures, try with a " +"regular branch instead.\n" msgstr "" msgid "bzr source type could not be determined\n" @@ -1126,11 +1369,20 @@ #, python-format msgid "convert: %s\n" -msgstr "" +msgstr "convert: %s\n" #, python-format msgid "%s: unknown repository type" -msgstr "" +msgstr "%s: okänd arkivtyp" + +msgid "retrieving file" +msgstr "hämtar fil" + +msgid "revisions" +msgstr "revisioner" + +msgid "scanning" +msgstr "skannar" #, python-format msgid "unknown sort mode: %s" @@ -1164,17 +1416,20 @@ msgstr "" msgid "scanning source...\n" -msgstr "" +msgstr "skannar källa...\n" msgid "sorting...\n" -msgstr "" +msgstr "sorterar...\n" msgid "converting...\n" -msgstr "" +msgstr "konverterar...\n" #, python-format msgid "source: %s\n" -msgstr "" +msgstr "källa: %s\n" + +msgid "converting" +msgstr "konverterar" #, python-format msgid "assuming destination %s\n" @@ -1187,6 +1442,10 @@ msgstr "" #, python-format +msgid "%s does not look like a CVS checkout" +msgstr "%s verkar inte vara en CVS-uthämtning" + +#, python-format msgid "revision %s is not a patchset number" msgstr "" @@ -1198,7 +1457,8 @@ msgstr "" #, python-format -msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgid "" +"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" msgstr "" #, python-format @@ -1219,6 +1479,9 @@ msgid "collecting CVS rlog\n" msgstr "" +msgid "not a CVS sandbox" +msgstr "inte en CVS-sandlåda" + #, python-format msgid "reading cvs log cache %s\n" msgstr "" @@ -1247,6 +1510,9 @@ msgid "revision must be followed by date line" msgstr "" +msgid "log cache overlaps with new log entries, re-run without cache." +msgstr "loggcache överlappar med nya loggningar, kör igen utan cache." + #, python-format msgid "writing cvs log cache %s\n" msgstr "" @@ -1272,6 +1538,10 @@ msgstr "" #, python-format +msgid "%s does not look like a darcs repository" +msgstr "%s verkar inte vara ett darcs-arkiv" + +#, python-format msgid "darcs version 2.1 or newer needed (found %r)" msgstr "" @@ -1296,18 +1566,38 @@ msgstr "" #, python-format -msgid "%s does not look like a GNU Arch repo" -msgstr "" +msgid "%s does not look like a Git repository" +msgstr "%s verkar inte vara ett Git-arkiv" + +msgid "cannot retrieve git heads" +msgstr "kan inte hämta git-huvuden" + +#, python-format +msgid "cannot read %r object at %s" +msgstr "kan inte läsa %r-objekt som %s" + +#, python-format +msgid "cannot read changes in %s" +msgstr "kan inte läsa ändringar i %s" + +#, python-format +msgid "cannot read tags from %s" +msgstr "kan inte läsa märken från %s" + +#, python-format +msgid "%s does not look like a GNU Arch repository" +msgstr "%s verkar inte vara ett GNU Arch-arkiv" msgid "cannot find a GNU Arch tool" -msgstr "" +msgstr "kan inte hitta ett GNU Arch-verktyg" #, python-format msgid "analyzing tree version %s...\n" -msgstr "" - -#, python-format -msgid "tree analysis stopped because it points to an unregistered archive %s...\n" +msgstr "analyserar trädversion %s...\n" + +#, python-format +msgid "" +"tree analysis stopped because it points to an unregistered archive %s...\n" msgstr "" #, python-format @@ -1315,14 +1605,18 @@ msgstr "" #, python-format -msgid "%s is not a local Mercurial repo" -msgstr "" +msgid "%s is not a local Mercurial repository" +msgstr "%s är inte ett lokalt Mercurial-arkiv" #, python-format msgid "initializing destination %s repository\n" msgstr "" #, python-format +msgid "could not create hg repository %s as sink" +msgstr "kunde inte skapa hg-arkiv %s för lagring" + +#, python-format msgid "pulling from %s into %s\n" msgstr "" @@ -1341,13 +1635,17 @@ msgstr "" #, python-format -msgid "%s does not look like a monotone repo" -msgstr "" +msgid "%s does not look like a monotone repository" +msgstr "%s verkar inte vara ett monotone-arkiv" #, python-format msgid "copying file in renamed directory from '%s' to '%s'" msgstr "" +#, python-format +msgid "%s does not look like a P4 repository" +msgstr "%s verkar inte vara ett P4-arkiv" + msgid "reading p4 views\n" msgstr "" @@ -1357,8 +1655,14 @@ msgid "Mercurial failed to run itself, check hg executable is in PATH" msgstr "" -msgid "svn: cannot probe remote repository, assume it could be a subversion repository. Use --source-type if you know better.\n" -msgstr "" +msgid "" +"svn: cannot probe remote repository, assume it could be a subversion " +"repository. Use --source-type if you know better.\n" +msgstr "" + +#, python-format +msgid "%s does not look like a Subversion repository" +msgstr "%s verkar inte vara ett Subversion-arkiv" msgid "Subversion python bindings could not be loaded" msgstr "" @@ -1406,13 +1710,12 @@ msgstr "" #, python-format -msgid "no tags found at revision %d\n" -msgstr "" - -#, python-format msgid "%s not found up to revision %d" msgstr "" +msgid "scanning paths" +msgstr "skannar sökvägar" + #, python-format msgid "found parent of branch %s at %d: %s\n" msgstr "" @@ -1426,12 +1729,12 @@ msgstr "" #, python-format -msgid "initializing svn repo %r\n" -msgstr "" - -#, python-format -msgid "initializing svn wc %r\n" -msgstr "" +msgid "initializing svn repository %r\n" +msgstr "initialiserar svn-arkivet %r\n" + +#, python-format +msgid "initializing svn working copy %r\n" +msgstr "initialiserar svn-arbetskopia %r\n" msgid "unexpected svn output:\n" msgstr "" @@ -1442,6 +1745,116 @@ msgid "XXX TAGS NOT IMPLEMENTED YET\n" msgstr "" +msgid "automatically manage newlines in repository files" +msgstr "" + +msgid "" +"This extension allows you to manage the type of line endings (CRLF or\n" +"LF) that are used in the repository and in the local working\n" +"directory. That way you can get CRLF line endings on Windows and LF on\n" +"Unix/Mac, thereby letting everybody use their OS native line endings." +msgstr "" + +msgid "" +"The extension reads its configuration from a versioned ``.hgeol``\n" +"configuration file every time you run an ``hg`` command. The\n" +"``.hgeol`` file use the same syntax as all other Mercurial\n" +"configuration files. It uses two sections, ``[patterns]`` and\n" +"``[repository]``." +msgstr "" + +msgid "" +"The ``[patterns]`` section specifies the line endings used in the\n" +"working directory. The format is specified by a file pattern. The\n" +"first match is used, so put more specific patterns first. The\n" +"available line endings are ``LF``, ``CRLF``, and ``BIN``." +msgstr "" + +msgid "" +"Files with the declared format of ``CRLF`` or ``LF`` are always\n" +"checked out in that format and files declared to be binary (``BIN``)\n" +"are left unchanged. Additionally, ``native`` is an alias for the\n" +"platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" +"and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" +"endings) is Mercurial's default behaviour; it is only needed if you\n" +"need to override a later, more general pattern." +msgstr "" + +msgid "" +"The optional ``[repository]`` section specifies the line endings to\n" +"use for files stored in the repository. It has a single setting,\n" +"``native``, which determines the storage line endings for files\n" +"declared as ``native`` in the ``[patterns]`` section. It can be set to\n" +"``LF`` or ``CRLF``. The default is ``LF``. For example, this means\n" +"that on Windows, files configured as ``native`` (``CRLF`` by default)\n" +"will be converted to ``LF`` when stored in the repository. Files\n" +"declared as ``LF``, ``CRLF``, or ``BIN`` in the ``[patterns]`` section\n" +"are always stored as-is in the repository." +msgstr "" + +msgid "Example versioned ``.hgeol`` file::" +msgstr "" + +msgid "" +" [patterns]\n" +" **.py = native\n" +" **.vcproj = CRLF\n" +" **.txt = native\n" +" Makefile = LF\n" +" **.jpg = BIN" +msgstr "" + +msgid "" +" [repository]\n" +" native = LF" +msgstr "" + +msgid "" +"The extension uses an optional ``[eol]`` section in your hgrc file\n" +"(not the ``.hgeol`` file) for settings that control the overall\n" +"behavior. There are two settings:" +msgstr "" + +msgid "" +"- ``eol.native`` (default ``os.linesep``) can be set to ``LF`` or\n" +" ``CRLF`` override the default interpretation of ``native`` for\n" +" checkout. This can be used with :hg:`archive` on Unix, say, to\n" +" generate an archive where files have line endings for Windows." +msgstr "" + +msgid "" +"- ``eol.only-consistent`` (default True) can be set to False to make\n" +" the extension convert files with inconsistent EOLs. Inconsistent\n" +" means that there is both ``CRLF`` and ``LF`` present in the file.\n" +" Such files are normally not touched under the assumption that they\n" +" have mixed EOLs on purpose." +msgstr "" + +msgid "" +"See :hg:`help patterns` for more information about the glob patterns\n" +"used.\n" +msgstr "" +"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 "" + +#, python-format +msgid "inconsistent newline style in %s\n" +msgstr "" + msgid "command to allow external programs to compare revisions" msgstr "" @@ -1455,7 +1868,7 @@ msgid "" "The extdiff extension also allows to configure new diff commands, so\n" -"you do not need to type \"hg extdiff -p kdiff3\" always. ::" +"you do not need to type :hg:`extdiff -p kdiff3` always. ::" msgstr "" msgid "" @@ -1485,11 +1898,36 @@ " vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" msgstr "" -msgid "" -"You can use -I/-X and list of file or directory names like normal \"hg\n" -"diff\" command. The extdiff extension makes snapshots of only needed\n" -"files, so running the external diff program will actually be pretty\n" -"fast (at least faster than having to compare the entire tree).\n" +msgid "Tool arguments can include variables that are expanded at runtime::" +msgstr "" + +msgid "" +" $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" +" $parent is an alias for $parent1." +msgstr "" + +msgid "" +"The extdiff extension will look in your [diff-tools] and [merge-tools]\n" +"sections for diff tool arguments, when none are specified in [extdiff]." +msgstr "" + +msgid "" +" [extdiff]\n" +" kdiff3 =" +msgstr "" + +msgid "" +" [diff-tools]\n" +" kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child" +msgstr "" + +msgid "" +"You can use -I/-X and list of file or directory names like normal\n" +":hg:`diff` command. The extdiff extension makes snapshots of only\n" +"needed files, so running the external diff program will actually be\n" +"pretty fast (at least faster than having to compare the entire tree).\n" msgstr "" #, python-format @@ -1530,9 +1968,15 @@ " to its parent." msgstr "" +msgid "CMD" +msgstr "" + msgid "comparison program to run" msgstr "" +msgid "OPT" +msgstr "" + msgid "pass option to comparison program" msgstr "" @@ -1582,11 +2026,14 @@ msgstr "" msgid "" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" +" See :hg:`help dates` for a list of formats valid for -d/--date.\n" " " msgstr "" - -msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" +" Se :hg:`help dates` för en lista med giltiga format för -d/--date.\n" +" " + +msgid "" +"working dir not at branch tip (use \"hg update\" to check out branch tip)" msgstr "" msgid "outstanding uncommitted merge" @@ -1598,18 +2045,23 @@ msgid "working directory is missing some files" msgstr "" -msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgid "" +"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" msgstr "" #, python-format msgid "pulling from %s\n" msgstr "drar från %s\n" -msgid "Other repository doesn't support revision lookup, so a rev cannot be specified." -msgstr "" - -#, python-format -msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" +msgid "" +"Other repository doesn't support revision lookup, so a rev cannot be " +"specified." +msgstr "" + +#, python-format +msgid "" +"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" +"\" to merge them)\n" msgstr "" #, python-format @@ -1689,7 +2141,9 @@ msgid "Error while signing" msgstr "" -msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" +msgid "" +"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" +"force)" msgstr "" msgid "unknown signature version" @@ -1704,9 +2158,15 @@ 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 "" @@ -1753,16 +2213,12 @@ " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n" " " -#, python-format -msgid "comparing with %s\n" -msgstr "jämför med %s\n" - -msgid "no changes found\n" -msgstr "inga ändringar hittades\n" - msgid "show the revision DAG" msgstr "visa revisionsdiagram" +msgid "NUM" +msgstr "" + msgid "limit number of changes displayed" msgstr "begränsa antalet visade ändringar" @@ -1848,7 +2304,7 @@ msgstr "" msgid "" -"The hg view command will launch the hgk Tcl script. For this command\n" +"The :hg:`view` command will launch the hgk Tcl script. For this command\n" "to work, hgk must be in your search path. Alternately, you can specify\n" "the path to hgk in your .hgrc file::" msgstr "" @@ -2117,7 +2573,9 @@ msgid "cannot start: socket is already bound" msgstr "" -msgid "cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/inotify.sock already exists" +msgid "" +"cannot start: tried linking .hg/inotify.sock to a temporary socket but .hg/" +"inotify.sock already exists" msgstr "" #, python-format @@ -2149,7 +2607,8 @@ msgid "" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" +"i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" @@ -2176,8 +2635,8 @@ msgstr "" msgid "" -"Configuration is done in the [keyword] and [keywordmaps] sections of\n" -"hgrc files." +"Configuration is done in the [keyword], [keywordset] and [keywordmaps]\n" +"sections of hgrc files." msgstr "" msgid "Example::" @@ -2191,43 +2650,46 @@ msgstr "" msgid "" +" [keywordset]\n" +" # prefer svn- over cvs-like default keywordmaps\n" +" svn = True" +msgstr "" + +msgid "" "NOTE: the more specific you are in your filename patterns the less you\n" "lose speed in huge repositories." msgstr "" msgid "" "For [keywordmaps] template mapping and expansion demonstration and\n" -"control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" +"control run :hg:`kwdemo`. See :hg:`help templates` for a list of\n" "available templates and filters." msgstr "" -msgid "" -"An additional date template filter {date|utcdate} is provided. It\n" -"returns a date like \"2006/09/18 15:13:13\"." -msgstr "" - -msgid "" -"The default template mappings (view with \"hg kwdemo -d\") can be\n" -"replaced with customized keywords and templates. Again, run \"hg\n" -"kwdemo\" to control the results of your config changes." -msgstr "" - -msgid "" -"Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" +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 "" +"The default template mappings (view with :hg:`kwdemo -d`) can be\n" +"replaced with customized keywords and templates. Again, run\n" +":hg:`kwdemo` to control the results of your config changes." +msgstr "" + +msgid "" +"Before changing/disabling active keywords, run :hg:`kwshrink` to avoid\n" "the risk of inadvertently storing expanded keywords in the change\n" "history." msgstr "" msgid "" "To force expansion after enabling it, or a configuration change, run\n" -"\"hg kwexpand\"." -msgstr "" - -msgid "" -"Also, when committing with the record extension or using mq's qrecord,\n" -"be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" -"the files in question to update keyword expansions after all changes\n" -"have been checked in." +":hg:`kwexpand`." msgstr "" msgid "" @@ -2267,9 +2729,11 @@ msgstr "" msgid "" -" See \"hg help templates\" for information on templates and filters.\n" +" See :hg:`help templates` for information on templates and filters.\n" " " msgstr "" +" Se :hg:`help templates` för information om mallar och filter.\n" +" " #, python-format msgid "creating temporary repository at %s\n" @@ -2339,7 +2803,7 @@ msgstr "" msgid "" -" See \"hg help keyword\" on how to construct patterns both for\n" +" See :hg:`help keyword` on how to construct patterns both for\n" " inclusion and exclusion of files." msgstr "" @@ -2361,7 +2825,7 @@ msgid "" " Run before changing/disabling active keywords or if you experience\n" -" problems with \"hg import\" or \"hg merge\"." +" problems with :hg:`import` or :hg:`merge`." msgstr "" msgid "" @@ -2410,7 +2874,7 @@ "directory. Applied patches are both patch files and changesets." msgstr "" -msgid "Common tasks (use \"hg help command\" for more details)::" +msgid "Common tasks (use :hg:`help command` for more details)::" msgstr "" msgid "" @@ -2444,7 +2908,12 @@ "If set to 'keep', mq will obey the [diff] section configuration while\n" "preserving existing git patches upon qrefresh. If set to 'yes' or\n" "'no', mq will override the [diff] section and always generate git or\n" -"regular patches, possibly losing data in the second case.\n" +"regular patches, possibly losing data in the second case." +msgstr "" + +msgid "" +"You will by default be managing a patch queue named \"patches\". You can\n" +"create other, independent patch queues with the :hg:`qqueue` command.\n" msgstr "" #, python-format @@ -2635,6 +3104,10 @@ msgid "patch series already fully applied\n" msgstr "" +#, python-format +msgid "patch '%s' not found" +msgstr "patchen '%s' hittades inte" + msgid "cleaning up working directory..." msgstr "" @@ -2680,7 +3153,9 @@ msgid "cannot refresh a revision with children" msgstr "" -msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" +msgid "" +"refresh interrupted while patch was popped! (revert --all, qpush to " +"recover)\n" msgstr "" msgid "patch queue directory already exists" @@ -2778,13 +3253,14 @@ msgstr "" msgid "" -" The patches must not be applied, and at least one patch is required. With\n" +" The patches must not be applied, and at least one patch is required. " +"With\n" " -k/--keep, the patch files are preserved in the patch directory." msgstr "" msgid "" " To stop managing a patch and move it into permanent history,\n" -" use the qfinish command." +" use the :hg:`qfinish` command." msgstr "" msgid "print the patches already applied" @@ -2852,7 +3328,7 @@ msgid "" " This command is deprecated. Without -c, it's implied by other relevant\n" -" commands. With -c, use hg init --mq instead." +" commands. With -c, use :hg:`init --mq` instead." msgstr "" msgid "clone main and patch repository at same time" @@ -2873,7 +3349,7 @@ msgid "" " The patch directory must be a nested Mercurial repository, as\n" -" would be created by init --mq.\n" +" would be created by :hg:`init --mq`.\n" " " msgstr "" @@ -2895,8 +3371,9 @@ msgid "commit changes in the queue repository (DEPRECATED)" msgstr "arkivera ändringar i köarkivet (FÖRÅLDRAD)" -msgid " This command is deprecated; use hg commit --mq instead." -msgstr " Detta är ett föråldrat kommando; använd hg commit --mq istället." +msgid " This command is deprecated; use :hg:`commit --mq` instead." +msgstr "" +" Detta är ett föråldrat kommando; använd :hg:`commit --mq` istället." msgid "print the entire series file" msgstr "" @@ -2978,9 +3455,9 @@ msgstr "" msgid "" -" Use 'hg diff' if you only want to see the changes made since the\n" -" last qrefresh, or 'hg export qtip' if you want to see changes made\n" -" by the current patch without including changes made since the\n" +" Use :hg:`diff` if you only want to see the changes made since the\n" +" last qrefresh, or :hg:`export qtip` if you want to see changes\n" +" made by the current patch without including changes made since the\n" " qrefresh.\n" " " msgstr "" @@ -3029,8 +3506,9 @@ msgid "" " Guards control whether a patch can be pushed. A patch with no\n" " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" -" pushed only if the qselect command has activated it. A patch with\n" -" a negative guard (\"-foo\") is never pushed if the qselect command\n" +" pushed only if the :hg:`qselect` command has activated it. A patch with\n" +" a negative guard (\"-foo\") is never pushed if the :hg:`qselect` " +"command\n" " has activated it." msgstr "" @@ -3132,13 +3610,36 @@ msgid "copy %s to %s\n" msgstr "" -msgid "strip a revision and all its descendants from the repository" -msgstr "" - -msgid "" -" If one of the working directory's parent revisions is stripped, the\n" -" working directory will be updated to the parent of the stripped\n" -" revision.\n" +msgid "strip a changeset and all its descendants from the repository" +msgstr "" + +msgid "" +" The strip command removes all changesets whose local revision\n" +" number is greater than or equal to REV, and then restores any\n" +" changesets that are not descendants of REV. If the working\n" +" directory has uncommitted changes, the operation is aborted unless\n" +" the --force flag is supplied." +msgstr "" + +msgid "" +" If a parent of the working directory is stripped, then the working\n" +" directory will automatically be updated to the most recent\n" +" available ancestor of the stripped parent after the operation\n" +" completes." +msgstr "" + +msgid "" +" Any stripped changesets are stored in ``.hg/strip-backup`` as a\n" +" bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can\n" +" be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`,\n" +" where BUNDLE is the bundle file created by the strip. Note that\n" +" the local revision numbers will in general be different after the\n" +" restore." +msgstr "" + +msgid "" +" Use the --nobackup option to discard the backup bundle once the\n" +" operation completes.\n" " " msgstr "" @@ -3146,7 +3647,7 @@ msgstr "" msgid "" -" Use the qguard command to set or print guards on patch, then use\n" +" Use the :hg:`qguard` command to set or print guards on patch, then use\n" " qselect to tell mq which guards to use. A patch will be pushed if\n" " it has no guards or any positive guards match the currently\n" " selected guard, but will not be pushed if any negative guards\n" @@ -3244,6 +3745,58 @@ msgid "no revisions specified" msgstr "" +msgid "manage multiple patch queues" +msgstr "" + +msgid "" +" Supports switching between different patch queues, as well as creating\n" +" new patch queues and deleting existing ones." +msgstr "" + +msgid "" +" Omitting a queue name or specifying -l/--list will show you the " +"registered\n" +" queues - by default the \"normal\" patches queue is registered. The " +"currently\n" +" active queue will be marked with \"(active)\"." +msgstr "" + +msgid "" +" To create a new queue, use -c/--create. The queue is automatically made\n" +" active, except in the case where there are applied patches from the\n" +" currently active queue in the repository. Then the queue will only be\n" +" created and switching will fail." +msgstr "" + +msgid "" +" To delete an existing queue, use --delete. You cannot delete the " +"currently\n" +" active queue.\n" +" " +msgstr "" + +msgid "patches applied - cannot set new queue active" +msgstr "" + +msgid " (active)\n" +msgstr " (aktiv)\n" + +msgid "invalid queue name, may not contain the characters \":\\/.\"" +msgstr "" + +#, python-format +msgid "queue \"%s\" already exists" +msgstr "kön \"%s\" finns redan" + +msgid "cannot delete queue that does not exist" +msgstr "" + +msgid "cannot delete currently active queue" +msgstr "" + +msgid "use --create to create a new queue" +msgstr "" + msgid "cannot commit over an applied mq patch" msgstr "" @@ -3267,6 +3820,20 @@ msgid "There is no Mercurial repository here (.hg not found)" msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" +msgid "no queue repository" +msgstr "inget köarkiv" + +#, python-format +msgid "%d applied" +msgstr "%d applicerade" + +#, python-format +msgid "%d unapplied" +msgstr "%d oapplicerade" + +msgid "mq: (empty queue)\n" +msgstr "mq: (tom kö)\n" + msgid "operate on patch repository" msgstr "arbeta med patcharkiv" @@ -3288,6 +3855,9 @@ 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 "" @@ -3369,23 +3939,26 @@ msgid "add \"From: <current user>\" to patch" msgstr "" -msgid "add \"From: <given user>\" to patch" +msgid "USER" +msgstr "" + +msgid "add \"From: <USER>\" to patch" msgstr "" msgid "add \"Date: <current date>\" to patch" msgstr "" -msgid "add \"Date: <given date>\" to patch" -msgstr "" - -msgid "hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH [FILE]..." -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 "" +msgstr "hg qnext [-s]" msgid "hg qprev [-s]" -msgstr "" +msgstr "hg qprev [-s]" msgid "pop all patches" msgstr "" @@ -3414,8 +3987,11 @@ msgid "merge queue name (DEPRECATED)" msgstr "" -msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [PATCH | INDEX]" -msgstr "" +msgid "reorder patch series and apply only the patch" +msgstr "omordna patchserien och applicera bara patchen" + +msgid "hg qpush [-f] [-l] [-a] [-m] [-n NAME] [--move] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [-m] [-n NAMN] [--move] [PATCH | INDEX]" msgid "refresh only files already in the patch and specified files" msgstr "" @@ -3483,17 +4059,25 @@ msgid "hg qseries [-ms]" msgstr "" -msgid "force removal with local changes" -msgstr "" - -msgid "bundle unrelated changesets" -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 "" -msgid "hg strip [-f] [-b] [-n] REV" -msgstr "" +msgid "hg strip [-f] [-n] REV" +msgstr "hg strip [-f] [-n] REV" msgid "hg qtop [-s]" msgstr "" @@ -3510,6 +4094,18 @@ msgid "hg qfinish [-a] [REV]..." msgstr "" +msgid "list all available queues" +msgstr "visa alla tillgängliga köer" + +msgid "create new queue" +msgstr "skapa ny kö" + +msgid "delete reference to queue" +msgstr "" + +msgid "[OPTION] [QUEUE]" +msgstr "[FLAGGA] [KÖ]" + msgid "hooks for sending email notifications at commit/push time" msgstr "" @@ -3561,7 +4157,8 @@ " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" " maxsubject = 67 # truncate subject line longer than this\n" " diffstat = True # add a diffstat before the diff content\n" -" sources = serve # notify if source of incoming changes in this list\n" +" sources = serve # notify if source of incoming changes in this " +"list\n" " # (serve == ssh or http, push, pull, bundle)\n" " merge = False # send notification for merges (default True)\n" " [email]\n" @@ -3576,9 +4173,6 @@ "handier for you." msgstr "" -msgid "::" -msgstr "" - msgid "" " [usersubs]\n" " # key is subscriber email, value is \",\"-separated list of glob patterns\n" @@ -3678,8 +4272,8 @@ msgstr "" msgid "" -"To ignore global commands like \"hg version\" or \"hg help\", you have to\n" -"specify them in the global .hgrc\n" +"To ignore global commands like :hg:`version` or :hg:`help`, you have\n" +"to specify them in the global .hgrc\n" msgstr "" msgid "interpret suffixes to refer to ancestor revisions" @@ -3725,7 +4319,7 @@ msgid "" "- The changeset description.\n" "- [Optional] The result of running diffstat on the patch.\n" -"- The patch itself, as generated by \"hg export\"." +"- The patch itself, as generated by :hg:`export`." msgstr "" msgid "" @@ -3750,7 +4344,8 @@ " from = My Name <my@email>\n" " to = recipient1, recipient2, ...\n" " cc = cc1, cc2, ...\n" -" bcc = bcc1, bcc2, ..." +" bcc = bcc1, bcc2, ...\n" +" reply-to = address1, address2, ..." msgstr "" msgid "" @@ -3759,13 +4354,13 @@ msgstr "" msgid "" -"Then you can use the \"hg email\" command to mail a series of changesets\n" -"as a patchbomb." +"Then you can use the :hg:`email` command to mail a series of\n" +"changesets as a patchbomb." msgstr "" msgid "" "To avoid sending patches prematurely, it is a good idea to first run\n" -"the \"email\" command with the \"-n\" option (test only). You will be\n" +"the :hg:`email` command with the \"-n\" option (test only). You will be\n" "prompted for an email recipient address, a subject and an introductory\n" "message describing the patches of your patchbomb. Then when all is\n" "done, patchbomb messages are displayed. If the PAGER environment\n" @@ -3821,9 +4416,9 @@ msgstr "" msgid "" -" By default, diffs are sent in the format generated by hg export,\n" -" one per message. The series starts with a \"[PATCH 0 of N]\"\n" -" introduction, which describes the series as a whole." +" By default, diffs are sent in the format generated by\n" +" :hg:`export`, one per message. The series starts with a \"[PATCH 0\n" +" of N]\" introduction, which describes the series as a whole." msgstr "" msgid "" @@ -3833,7 +4428,7 @@ " description. Next, (optionally) if the diffstat program is\n" " installed and -d/--diffstat is used, the result of running\n" " diffstat on the patch. Finally, the patch itself, as generated by\n" -" \"hg export\"." +" :hg:`export`." msgstr "" msgid "" @@ -3872,7 +4467,8 @@ msgid "" " hg email -b # send bundle of all patches not in default\n" " hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " +"default\n" " hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" msgstr "" @@ -3945,6 +4541,9 @@ 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 "" @@ -4032,7 +4631,7 @@ msgstr "" msgid "" -" - Unknown files: files marked with \"?\" by \"hg status\"\n" +" - Unknown files: files marked with \"?\" by :hg:`status`\n" " - Empty directories: in fact Mercurial ignores directories unless\n" " they contain files under source control management" msgstr "" @@ -4043,7 +4642,7 @@ msgid "" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")" +" - New files added to the repository (with :hg:`add`)" msgstr "" msgid "" @@ -4109,11 +4708,18 @@ msgid "" " Rebase uses repeated merging to graft changesets from one part of\n" " history (the source) onto another (the destination). This can be\n" -" useful for linearizing local changes relative to a master\n" +" useful for linearizing *local* changes relative to a master\n" " development tree." msgstr "" msgid "" +" You should not rebase changesets that have already been shared\n" +" with others. Doing so will force everybody else to perform the\n" +" same rebase or they will end up with duplicated changesets after\n" +" pulling in your rebased changesets." +msgstr "" + +msgid "" " 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" @@ -4153,7 +4759,11 @@ msgid "" " If a rebase is interrupted to manually resolve a merge, it can be\n" -" continued with --continue/-c or aborted with --abort/-a.\n" +" continued with --continue/-c or aborted with --abort/-a." +msgstr "" + +msgid "" +" Returns 0 on success, 1 if nothing to rebase.\n" " " msgstr "" @@ -4214,7 +4824,7 @@ msgid "no rebase in progress" msgstr "" -msgid "warning: new changesets detected on target branch, not stripping\n" +msgid "warning: new changesets detected on target branch, can't abort\n" msgstr "" msgid "rebase aborted\n" @@ -4235,7 +4845,9 @@ 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)" +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" @@ -4304,9 +4916,6 @@ msgid "&?" msgstr "" -msgid "y - record this change" -msgstr "" - msgid "user quit" msgstr "" @@ -4329,12 +4938,14 @@ msgstr "" msgid "" -" If a list of files is omitted, all changes reported by \"hg status\"\n" +" If a list of files is omitted, all changes reported by :hg:`status`\n" " will be candidates for recording." msgstr "" - -msgid " See 'hg help dates' for a list of formats valid for -d/--date." -msgstr "" +" Om filer inte anges, kommer alla ändringar som :hg:`status`\n" +" rapporterar att arkiveras." + +msgid " See :hg:`help dates` for a list of formats valid for -d/--date." +msgstr " Se :hg:`help dates` för en lista med giltiga format för -d/--date." msgid "" " You will be prompted for whether to record changes to each\n" @@ -4362,12 +4973,18 @@ msgid " ? - display help" msgstr "" +msgid " This command is not available when committing a merge." +msgstr "" + msgid "'mq' extension not loaded" msgstr "" msgid "running non-interactively, use commit instead" msgstr "" +msgid "cannot partially commit a merge (use hg commit instead)" +msgstr "" + msgid "no changes to record\n" msgstr "" @@ -4429,6 +5046,16 @@ msgstr "" #, python-format +msgid "tip has %d files, estimated total number of files: %s\n" +msgstr "" + +msgid "collecting" +msgstr "samlar in" + +msgid "files" +msgstr "filer" + +#, python-format msgid "collected %d candidate storage files\n" msgstr "" @@ -4439,13 +5066,16 @@ msgid "not linkable: %s\n" msgstr "inte länkbar: %s\n" +msgid " files" +msgstr " filer" + +msgid "pruning" +msgstr "putsar" + #, python-format msgid "pruned down to %d probably relinkable files\n" msgstr "" -msgid " files" -msgstr "" - msgid "relinking" msgstr "länkar om" @@ -4649,7 +5279,7 @@ msgstr "" msgid "" -" hg transplant --branch REVISION --all will rebase the selected\n" +" :hg:`transplant --branch REVISION --all` will rebase the selected\n" " branch (up to the named revision) onto your current working\n" " directory." msgstr "" @@ -4662,14 +5292,14 @@ msgstr "" msgid "" -" If no merges or revisions are provided, hg transplant will start\n" -" an interactive changeset browser." +" If no merges or revisions are provided, :hg:`transplant` will\n" +" start an interactive changeset browser." msgstr "" msgid "" " If a changeset application fails, you can fix the merge by hand\n" -" and then resume where you left off by calling hg transplant\n" -" --continue/-c.\n" +" and then resume where you left off by calling :hg:`transplant\n" +" --continue/-c`.\n" " " msgstr "" @@ -4694,8 +5324,11 @@ msgid "outstanding local changes" msgstr "" -msgid "pull patches from REPOSITORY" -msgstr "" +msgid "pull patches from REPO" +msgstr "" + +msgid "BRANCH" +msgstr "GREN" msgid "pull patches from branch BRANCH" msgstr "" @@ -4715,10 +5348,10 @@ msgid "continue last transplant session after repair" msgstr "" -msgid "filter changesets through FILTER" -msgstr "" - -msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgid "filter changesets through command" +msgstr "" + +msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." msgstr "" msgid "allow the use of MBCS paths with problematic encodings" @@ -4781,6 +5414,18 @@ msgid "perform automatic newline conversion" msgstr "" +msgid "" +" Deprecation: The win32text extension requires each user to configure\n" +" the extension again and again for each clone since the configuration\n" +" is not copied when cloning." +msgstr "" + +msgid "" +" We have therefore made the ``eol`` as an alternative. The ``eol``\n" +" uses a version controlled file for its configuration and each clone\n" +" will therefore use the right settings from the start." +msgstr "" + msgid "To perform automatic newline conversion, use::" msgstr "" @@ -4798,7 +5443,8 @@ " # or ** = macdecode:" msgstr "" -msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" +msgid "" +"If not doing conversion, to make sure you do not commit CRLF/CR by accident::" msgstr "" msgid "" @@ -4880,7 +5526,8 @@ " $ hg serve" msgstr "" -msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::" +msgid "" +"You can discover zeroconf enabled repositories by running \"hg paths\"::" msgstr "" msgid "" @@ -4958,9 +5605,6 @@ msgid "invalid format spec '%%%s' in output filename" msgstr "" -msgid "searching" -msgstr "söker" - #, python-format msgid "adding %s\n" msgstr "" @@ -4990,6 +5634,14 @@ msgstr "" #, python-format +msgid "%s: not recording move - %s does not exist\n" +msgstr "%s: sparar inte flytt - %s existerar inte\n" + +#, python-format +msgid "%s: not recording copy - %s does not exist\n" +msgstr "%s: sparar inte flytt - %s existerar inte\n" + +#, python-format msgid "%s: deleted in working copy\n" msgstr "" @@ -5154,10 +5806,10 @@ msgid "" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg forget." +" undo an add before that, see :hg:`forget`." msgstr "" " Filerna kommer att läggas till i arkivet vid nästa arkivering. För att\n" -" ångra en addering innan dess, se hg forget." +" ångra en addering innan dess, se :hg:`forget`." msgid " If no names are given, add all files to the repository." msgstr " Om inga namn anges, läggs alla filer till i arkivet." @@ -5167,11 +5819,10 @@ msgid "" " An example showing how new (unknown) files are added\n" -" automatically by ``hg add``::" -msgstr "" -" An example showing how new (unknown) files are added\n" +" automatically by :hg:`add`::" +msgstr "" " Ett exempel som visar hur nya (okända) filer läggs\n" -" till automatiskt av ``hg add``::" +" till automatiskt av :hg:`add`::" msgid "" " $ ls\n" @@ -5200,7 +5851,8 @@ msgid "" " Add all new files and remove all missing files from the\n" " repository." -msgstr " Lägg till alla nya filer och radera alla saknade filer från arkivet." +msgstr "" +" Lägg till alla nya filer och radera alla saknade filer från arkivet." msgid "" " New files are ignored if they match any of the patterns in\n" @@ -5217,15 +5869,20 @@ " every added file and records those similar enough as renames. This\n" " option takes a percentage between 0 (disabled) and 100 (files must\n" " be identical) as its parameter. Detecting renamed files this way\n" -" can be expensive.\n" -" " +" can be expensive." msgstr "" " Använd flaggan -s/--similarity för att upptäcka omdöpta filer. Med en\n" " parameter större än 0, kommer varje borttagen fil att jämföras med\n" " varje tillagd fil och lagrar de som är tillräckligt lika som ett\n" " namnbyte. Flaggan tar ett procentvärde mellan 0 (deaktiverad) och 100\n" " (filer måste vara identiska) som parameter. Att upptäcka omdöpta filer\n" -" på det här sättet kan ta lång tid.\n" +" på det här sättet kan ta lång tid." + +msgid "" +" Returns 0 if all files are successfully added.\n" +" " +msgstr "" +" Returnerar 0 om alla filer kunde läggas till.\n" " " msgid "similarity must be a number" @@ -5253,12 +5910,17 @@ " Without the -a/--text option, annotate will avoid processing files\n" " it detects as binary. With -a, annotate will annotate the file\n" " anyway, although the results will probably be neither useful\n" -" nor desirable.\n" -" " +" nor desirable." msgstr "" " Utan flaggan -a/--text, kommer annotate att undvika behandling av filer\n" " som upptäcks vara binära. Med -a, kommer filen att annoteras ändå, även\n" -" om resultatet antagligen inte kommer att vara användbart.\n" +" om resultatet antagligen inte kommer att vara användbart." + +msgid "" +" Returns 0 on success.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades.\n" " " msgid "at least one filename or pattern is required" @@ -5269,7 +5931,7 @@ #, python-format msgid "%s: binary file\n" -msgstr "" +msgstr "%s: binär fil\n" msgid "create an unversioned archive of a repository revision" msgstr "skapa ett icke versionshanterat arkiv från en arkivrevision" @@ -5308,22 +5970,20 @@ msgid "" " The exact name of the destination archive or directory is given\n" -" using a format string; see 'hg help export' for details." +" using a format string; see :hg:`help export` for details." msgstr "" " Det exakta namnet på destinationsarkivet eller -katalogen anges med en\n" -" formatsträng; se 'hg help export' för detaljer." +" formatsträng; se :hg:`help export` för detaljer." msgid "" " Each member added to an archive file has a directory prefix\n" " prepended. Use -p/--prefix to specify a format string for the\n" " prefix. The default is the basename of the archive, with suffixes\n" -" removed.\n" -" " +" 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.\n" -" " +" standard används basnamnet för arkivet, med suffix borttagna." msgid "no working directory: please specify a revision" msgstr "ingen arbetskatalog: specificera en revision" @@ -5434,15 +6094,13 @@ " Its exit status will be used to mark revisions as good or bad:\n" " status 0 means good, 125 means to skip the revision, 127\n" " (command not found) will abort the bisection, and any other\n" -" non-zero exit status means the revision is bad.\n" -" " +" non-zero exit status means the revision is bad." msgstr "" " Om du tillhandahåller ett kommando, kommer det att användas för\n" " automatisk genomsökning. Dess returkod kommer att användas för att ange\n" " revisioner som bra eller dåliga: kod 0 betyder bra, 125 betyder att\n" " revisionen hoppas över, 127 (kommandot hittades inte) avbryter\n" -" genomsökningen, och alla andra värden betyder att revisionen är dålig.\n" -" " +" genomsökningen, och alla andra värden betyder att revisionen är dålig." msgid "The first good revision is:\n" msgstr "Den första bra revisionen är:\n" @@ -5451,10 +6109,12 @@ msgstr "Den första dåliga revisionen är:\n" msgid "Due to skipped revisions, the first good revision could be any of:\n" -msgstr "Tack vare skippade revisioner, är den första bra revisionen någon av:\n" +msgstr "" +"Tack vare skippade revisioner, är den första bra revisionen någon av:\n" msgid "Due to skipped revisions, the first bad revision could be any of:\n" -msgstr "Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n" +msgstr "" +"Tack vare skippade revisioner, kan den första dåliga revisionen någon av:\n" msgid "cannot bisect (no known good revisions)" msgstr "kan inte genomsöka (inga kända bra revisioner)" @@ -5517,20 +6177,20 @@ " grenbyte." msgid "" -" Use the command 'hg update' to switch to an existing branch. Use\n" -" 'hg commit --close-branch' to mark this branch as closed.\n" -" " -msgstr "" -" Använd kommandot 'hg update' för att byta till en existerande gren.\n" -" Använd 'hg commit --close-branch' för att markera grenen som stängd.\n" -" " +" Use the command :hg:`update` to switch to an existing branch. Use\n" +" :hg:`commit --close-branch` to mark this branch as closed." +msgstr "" +" Använd kommandot :hg:`update` för att byta till en existerande gren.\n" +" Använd :hg:`commit --close-branch` för att markera grenen som stängd." #, 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 (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" @@ -5542,11 +6202,11 @@ msgid "" " List the repository's named branches, indicating which ones are\n" " inactive. If -c/--closed is specified, also list branches which have\n" -" been marked closed (see hg commit --close-branch)." +" been marked closed (see :hg:`commit --close-branch`)." msgstr "" " Visa alla namngivna grenar i arkivet, och indikera vilka som är\n" " inaktiva. Om -c/--closed anges, visas också grenar som har markerats\n" -" som stängda (se hg commit --close-branch)." +" som stängda (se :hg:`commit --close-branch`)." msgid "" " If -a/--active is specified, only show active branches. A branch\n" @@ -5555,11 +6215,15 @@ " Om -a/--acive anges, visas bara aktiva grenar. En gren anses aktiv om\n" " den innehåller arkivhuvuden." -msgid "" -" Use the command 'hg update' to switch to an existing branch.\n" +msgid " Use the command :hg:`update` to switch to an existing branch." +msgstr "" +" Använd kommandot :hg:`update` för att byta till en existerande gren." + +msgid "" +" Returns 0.\n" " " msgstr "" -" Använd kommandot 'hg update' för att byta till en existerande gren.\n" +" Returnerar 0.\n" " " msgid " (closed)" @@ -5610,11 +6274,16 @@ msgid "" " Applying bundles preserves all changeset contents including\n" -" permissions, copy/rename information, and revision history.\n" +" permissions, copy/rename information, and revision history." +msgstr "" +" Applicering av buntar bevarar allt ändringsinnehåll inklusive\n" +" tillstånd, information om kopior/namnbyte, och revisionshistorik." + +msgid "" +" Returns 0 on success, 1 if no changes found.\n" " " msgstr "" -" Applicering av buntar bevarar all ändringsinnehåll inklusive\n" -" tillstånd, information om kopior/namnbyte, och revisionshistorik.\n" +" Returnerar 0 om kommandot lyckades, 1 om inga ändringar hittades.\n" " " msgid "--base is incompatible with specifying a destination" @@ -5647,394 +6316,44 @@ msgid "" " :``%s``: basename of file being printed\n" " :``%d``: dirname of file being printed, or '.' if in repository root\n" -" :``%p``: root-relative path name of file being printed\n" -" " +" :``%p``: root-relative path name of file being printed" msgstr "" " :``%s``: basnamn på den visade filen\n" " :``%d``: katalognamn på den visade filen, eller '.' om i arkivroten\n" -" :``%p``: rotrelativ sökvägsnamn för den visade filen\n" -" " - -#, fuzzy +" :``%p``: rotrelativ sökvägsnamn för den visade filen" + msgid "make a copy of an existing repository" -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +msgstr "gör en kopia av ett existerande arkiv" + msgid " Create a copy of an existing repository in a new directory." -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +msgstr " Skapa en kopia av ett existerande arkiv i en ny katalog." + msgid "" " If no destination directory name is specified, it defaults to the\n" " basename of the source." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" " Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +" källan att användas." + msgid "" " The location of the source is added to the new repository's\n" " .hg/hgrc file, as the default to be used for future pulls." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" " Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy -msgid " See 'hg help urls' for valid source format details." -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +" som standardplats att användas för framtida dragningar." + +msgid " See :hg:`help urls` for valid source format details." +msgstr " Se :hg:`help urls` för detaljer om giltiga källformat." + msgid "" " It is possible to specify an ``ssh://`` URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see 'hg help urls' for important details about ``ssh://`` URLs." -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\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" -" Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +" Se :hg:`help urls` för viktiga detaljer om ``ssh://``-URLer." + msgid "" " 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" @@ -6045,130 +6364,21 @@ " No subsequent changesets (including subsequent tags) will be present\n" " in the destination." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" " 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" " delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" " -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" " Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +" att finnas i destinationen." + msgid "" " Using -r/--rev (or 'clone src#rev dest') implies --pull, even for\n" " local source repositories." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" " Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +" --pull, även för lokala arkiv." + msgid "" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" @@ -6177,192 +6387,22 @@ " do not report errors. In these cases, use the --pull option to\n" " avoid hardlinking." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +" för att undvika användning av hårda länkar." + msgid "" " In some cases, you can clone repositories and the working directory\n" " using full hardlinks with ::" msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +" hårdlänkade, med ::" + msgid " $ cp -al REPO REPOCLONE" -msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +msgstr " $ cp -al ARKIV ARKIVKLON" + msgid "" " This is the fastest way to clone, but it is not always safe. The\n" " operation is not atomic (making sure REPO is not modified during\n" @@ -6371,130 +6411,20 @@ " this is not compatible with certain extensions that place their\n" " metadata under the .hg directory, such as mq." msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" " Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" " Operationen är inte atomisk (att ARKIV inte modifieras under\n" " operationen är upp till dig) och du måste se till att din editor bryter\n" " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +" under katalogen .hg, som mq." + msgid "" " Mercurial will update the working directory to the first applicable\n" " revision from this list:" msgstr "" -"gör en kopia av ett existerande arkiv\n" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\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" -" " - -#, fuzzy +" revisionen från den här listan:" + msgid "" " a) null if -U or the source repository has no changesets\n" " b) if -u . and the source repository is local, the first parent of\n" @@ -6505,56 +6435,8 @@ " 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" -"\n" -" Skapa en kopia av ett existerande arkiv i en ny katalog.\n" -"\n" -" Om ingen namn på destinationskatalogen anges, kommer basnamnet för\n" -" källan att användas.\n" -"\n" -" Källans plats kommer att läggas till i det nya arkivets .hg/hgrc-fil\n" -" som standardplats att användas för framtida dragningar.\n" -"\n" -" Se 'hg help urls' för detaljer om giltiga källformat.\n" -"\n" -" 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" -" 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" -" delmängd av ändringarna i källarkivet. Bara ändringarna definierade med\n" -" -r/--rev (och alla föräldrar) kommer att dras in i destinationsarkivet.\n" -" Inga efterföljande ändringar (inklusive efterföljande märken) kommer\n" -" att finnas i destinationen.\n" -"\n" -" Användande av -r/--rev (eller 'clone källa#rev dest') aktiverar också\n" -" --pull, även för lokala arkiv.\n" -"\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 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 arbetskopia, alla\n" -" hårdlänkade, med ::\n" -"\n" -" $ cp -al ARKIV ARKIVKLON\n" -"\n" -" Detta är det snabbaste sättet att klona, men det är inte alltid säkert.\n" -" Operationen är inte atomisk (att ARKIV inte modifieras under\n" -" operationen är upp till dig) och du måste se till att din editor bryter\n" -" hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" -" inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" -" under katalogen .hg, som mq.\n" -"\n" -" Mercurial uppdaterar arbetskatalogen till den första passande\n" -" revisionen från den här listan:\n" -"\n" +" h) tip" +msgstr "" " a) null med -U eller källarkivet inte har några ändringar\n" " b) med -u . och källarkivet, den första föräldern av källarkivets\n" " arbetskatalog\n" @@ -6564,8 +6446,7 @@ " 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" -" " +" h) tip" msgid "cannot specify both --noupdate and --updaterev" msgstr "kan inte ange både --noupdate och --updaterev" @@ -6575,18 +6456,18 @@ msgid "" " Commit changes to the given files into the repository. Unlike a\n" -" centralized RCS, this operation is a local operation. See hg push\n" -" for a way to actively distribute your changes." +" centralized RCS, this operation is a local operation. See\n" +" :hg:`push` for a way to actively distribute your changes." msgstr "" " Arkiverar ändringar för de angivna filerna i arkivet. Till skillnad\n" -" från ett centralicerat RCS, är detta en lokal operation. Se hg push\n" +" från ett centralicerat RCS, är detta en lokal operation. Se :hg:`push`\n" " för ett sätt att aktivt distribuera dina ändringar." msgid "" -" If a list of files is omitted, all changes reported by \"hg status\"\n" +" If a list of files is omitted, all changes reported by :hg:`status`\n" " will be committed." msgstr "" -" Om filer inte anges, kommer alla ändringar som \"hg status\"\n" +" Om filer inte anges, kommer alla ändringar som :hg:`status`\n" " rapporterar att arkiveras." msgid "" @@ -6603,6 +6484,16 @@ " Om inget arkiveringsmeddelande anges, kommer den konfigurerade editorn\n" " att startas och fråga om meddelandet." +msgid "" +" Returns 0 on success, 1 if nothing changed.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om ingenting ändrades.\n" +" " + +msgid "can only close branch heads" +msgstr "kan bara stänga grenhuvuden" + msgid "nothing changed\n" msgstr "inget ändrat\n" @@ -6610,6 +6501,10 @@ msgstr "skapade ett nytt huvud\n" #, python-format +msgid "reopening closed branch head %d\n" +msgstr "återöppnar det stängda grenhuvudet %d\n" + +#, python-format msgid "committed changeset %d:%s\n" msgstr "arkiverade ändringen %d:%s\n" @@ -6636,11 +6531,16 @@ msgid "" " This command takes effect with the next commit. To undo a copy\n" -" before that, see hg revert.\n" +" before that, see :hg:`revert`." +msgstr "" +" Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" +" namnbyte innan det, se :hg:`revert`." + +msgid "" +" Returns 0 on success, 1 if errors are encountered.\n" " " msgstr "" -" Kommandot slår igenom vid nästa arkivering. För att ångra en\n" -" kopiering innan dess, se hg revert.\n" +" Returnerar 0 om kommandot lyckades, 1 om fel uppstod.\n" " " msgid "find the ancestor revision of two revisions in a given index" @@ -6649,9 +6549,73 @@ 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" +msgstr "" + +msgid " Elements:" +msgstr "" + +msgid "" +" - \"+n\" is a linear run of n nodes based on the current default " +"parent\n" +" - \".\" is a single node based on the current default parent\n" +" - \"$\" resets the default parent to null (implied at the start);\n" +" otherwise the default parent is always the last node created\n" +" - \"<p\" sets the default parent to the backref p\n" +" - \"*p\" is a fork at parent p, which is a backref\n" +" - \"*p1/p2\" is a merge of parents p1 and p2, which are backrefs\n" +" - \"/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 "" + +msgid " Whitespace between the above elements is ignored." +msgstr "" + +msgid " A backref is either" +msgstr "" + +msgid "" +" - a number n, which references the node curr-n, where curr is the " +"current\n" +" node, or\n" +" - the name of a local tag you placed earlier using \":tag\", or\n" +" - empty to denote the default parent." +msgstr "" + +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 "" + +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" @@ -6699,23 +6663,39 @@ msgid "" " With --debug, the source (filename and line number) is printed\n" -" for each config item.\n" -" " +" for each config item." msgstr "" " Med --debug, visas källan (filnamn och radnummer) för varje\n" -" alternativ.\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.\n" -" " +" be used with care." msgstr "" msgid "show the contents of the current dirstate" @@ -6725,6 +6705,22 @@ msgid "copy: %s -> %s\n" msgstr "" +msgid "format the changelog or an index DAG as a concise textual description" +msgstr "" + +msgid "" +" If you pass a revlog index, the revlog's DAG is emitted. If you list\n" +" revision numbers, they get labelled in the output as rN." +msgstr "" + +msgid "" +" Otherwise, the changelog DAG of the current repo is emitted.\n" +" " +msgstr "" + +msgid "need repo for changelog dag" +msgstr "" + msgid "dump the contents of a data file revision" msgstr "" @@ -6742,7 +6738,7 @@ msgstr "" msgid "test Mercurial installation" -msgstr "" +msgstr "testa Mercurial-installation" #, python-format msgid "Checking encoding (%s)...\n" @@ -6778,10 +6774,14 @@ msgid " patch test failed!\n" msgstr "" -msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" -msgstr "" - -msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" +msgid "" +" (Current patch tool may be incompatible with patch, or misconfigured. " +"Please check your .hgrc file)\n" +msgstr "" + +msgid "" +" Internal patcher failure, please report this error to http://mercurial." +"selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -6860,12 +6860,10 @@ msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. For more information, read 'hg help diffs'.\n" -" " +" format. For more information, read :hg:`help diffs`." msgstr "" " Använd flaggan -g/--git för att skapa diffs i gits utökade format. För\n" -" mer information, läs 'hg help diffs'.\n" -" " +" mer information, läs :hg:`help diffs`." msgid "dump the header and diffs for one or more changesets" msgstr "dumpa rubrik och diff för en eller fler ändringar" @@ -6928,19 +6926,17 @@ msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" -" format. See 'hg help diffs' for more information." +" format. See :hg:`help diffs` for more information." msgstr "" " Använd flaggan -g/--git för att generera diffar i gits utökade format.\n" -" Se 'hg help diffs' för mer information." +" Se :hg:`help diffs` för mer information." msgid "" " With the --switch-parent option, the diff will be against the\n" -" second parent. It can be useful to review a merge.\n" -" " +" second parent. It can be useful to review a merge." msgstr "" " Med flaggan --switch-parent, kommer diffen att vara mot den andra\n" -" föräldern. Det kan vara användbart för att granska en sammanfogning.\n" -" " +" föräldern. Det kan vara användbart för att granska en sammanfogning." msgid "export requires at least one changeset" msgstr "" @@ -6969,12 +6965,8 @@ " Detta tar bara bort filer från den nuvarande grenen, inte från hela\n" " projekthistoriken, och det raderar dem inte från arbetskatalogen." -msgid "" -" To undo a forget before the next commit, see hg add.\n" -" " -msgstr "" -" För att ångra en forget innan nästa arkivering, se hg add.\n" -" " +msgid " To undo a forget before the next commit, see :hg:`add`." +msgstr " För att ångra en forget innan nästa arkivering, se :hg:`add`." msgid "no files specified" msgstr "" @@ -7004,14 +6996,19 @@ " file in which it finds a match. To get it to print every revision\n" " that contains a change in match status (\"-\" for a match that\n" " becomes a non-match, or \"+\" for a non-match that becomes a match),\n" -" use the --all flag.\n" -" " +" use the --all flag." msgstr "" " Som standard visar grep bara utmatningen från den första revisionen\n" " av en matchande fil. För att visa varje revision som innehåller en\n" " ändring i träffstatus (\"-\" för en träff som blir en icke-träff,\n" " eller \"+\" för en icke-träff som blir en träff), använd flaggan\n" -" --all.\n" +" --all." + +msgid "" +" Returns 0 if a match is found, 1 otherwise.\n" +" " +msgstr "" +" Returnerar 0 om en träff hittas, 1 annars.\n" " " #, python-format @@ -7044,10 +7041,10 @@ msgid "" " If -c/--closed is specified, also show branch heads marked closed\n" -" (see hg commit --close-branch)." +" (see :hg:`commit --close-branch`)." msgstr "" " Om -c/--closed anges, visas också grenvhuvuden som markerats som\n" -" stängda (se hg commit --close-branch)." +" stängda (se :hg:`commit --close-branch`)." msgid "" " If STARTREV is specified, only those heads that are descendants of\n" @@ -7057,12 +7054,18 @@ " anfader." msgid "" -" If -t/--topo is specified, named branch mechanics will be ignored and only\n" -" changesets without children will be shown.\n" -" " +" If -t/--topo is specified, named branch mechanics will be ignored and " +"only\n" +" changesets without children will be shown." msgstr "" " Om -t/--topo anges, ignoreras all logik för namngivna grenar och bara\n" -" ändringar utan barn kommer att visas.\n" +" ändringar utan barn kommer att visas." + +msgid "" +" Returns 0 if matching heads are found, 1 if not.\n" +" " +msgstr "" +" Returnerar 0 om matchande huvuden hittas, 1 annars.\n" " " #, python-format @@ -7076,7 +7079,8 @@ 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" -msgid " With no arguments, print a list of commands with short help messages." +msgid "" +" With no arguments, print a list of commands with short help messages." msgstr " Utan argument visas en kommandolista med korta hjälpmeddelanden." msgid "" @@ -7086,6 +7090,13 @@ " Med ett ämne, utökning eller kommandonamn, visas hjälp för det ämnet.\n" " " +msgid "" +" Returns 0 if successful.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades.\n" +" " + msgid "global options:" msgstr "globala flaggor:" @@ -7093,7 +7104,8 @@ msgstr "använd \"hg help\" för den fulla kommandolistan" msgid "use \"hg help\" for the full list of commands or \"hg -v\" for details" -msgstr "använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" +msgstr "" +"använd \"hg help\" för en full kommandolista eller \"hg -v\" för detaljer" #, python-format msgid "use \"hg -v help%s\" to show aliases and global options" @@ -7147,7 +7159,8 @@ msgstr "%s-utökning - %s" msgid "use \"hg help extensions\" for information on enabling extensions\n" -msgstr "använd \"hg help extensions\" för information om aktivering av utökningar\n" +msgstr "" +"använd \"hg help extensions\" för information om aktivering av utökningar\n" #, python-format msgid "'%s' is provided by the following extension:" @@ -7162,11 +7175,21 @@ msgid "enabled extensions:" msgstr "aktiverade utökningar:" +msgid "VALUE" +msgstr "VÄRDE" + msgid "DEPRECATED" msgstr "FÖRLEGAD" msgid "" "\n" +"[+] marked option can be specified multiple times" +msgstr "" +"\n" +"flaggor markerade med [+] kan anges flera gånger" + +msgid "" +"\n" "additional help topics:" msgstr "" "\n" @@ -7193,14 +7216,12 @@ " 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.\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.\n" -" " +" här revisionen och ett grennamn för grenar som inte är default." msgid "import an ordered set of patches" msgstr "" @@ -7225,7 +7246,7 @@ msgstr "" msgid "" -" If the imported patch was generated by hg export, user and\n" +" If the imported patch was generated by :hg:`export`, user and\n" " description from patch override values from message headers and\n" " body. Values given on command line with -m/--message and -u/--user\n" " override these." @@ -7247,8 +7268,7 @@ msgid "" " To read a patch from standard input, use \"-\" as the patch name. If\n" " a URL is specified, the patch will be downloaded from it.\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" See :hg:`help dates` for a list of formats valid for -d/--date." msgstr "" msgid "to working directory" @@ -7289,11 +7309,14 @@ " För fjärrarkiv, använd --bundle för att slippa ladda ner\n" " ändringarna två gånger om incoming följs av pull." -msgid "" -" See pull for valid source format details.\n" +msgid " See pull for valid source format details." +msgstr "" + +msgid "" +" Returns 0 if there are incoming changes, 1 otherwise.\n" " " msgstr "" -" Se pull för detaljer om giltiga källformat.\n" +" Returnerar 0 om det finns inkommande ändringar, 1 annars.\n" " " msgid "create a new repository in the given directory" @@ -7311,12 +7334,10 @@ msgid "" " It is possible to specify an ``ssh://`` URL as the destination.\n" -" See 'hg help urls' for more information.\n" -" " +" See :hg:`help urls` for more information." msgstr "" " Det är möjligt att specificera en URL med ``ssh://`` som destination.\n" -" Se 'hg help urls' för mer information.\n" -" " +" Se :hg:`help urls` för mer informatio" msgid "locate files matching specific patterns" msgstr "hitta filer som matchar givna mönster" @@ -7348,14 +7369,12 @@ " If you want to feed the output of this command into the \"xargs\"\n" " command, use the -0 option to both this command and \"xargs\". This\n" " will avoid the problem of \"xargs\" treating single filenames that\n" -" contain whitespace as multiple filenames.\n" -" " +" contain whitespace as multiple filenames." msgstr "" " Om du vill skicka utmatningen från detta kommando till kommandot\n" -" \"xargs\", använd flaggan -O till både detta kommando och \"xargs\".\n" +" \"xargs\", använd flaggan -0 till både detta kommando och \"xargs\".\n" " Detta undviker problemet med att \"xargs\" behandlar filnamn som\n" -" innehåller blanktecken som multipla filnamn.\n" -" " +" innehåller blanktecken som multipla filnamn" msgid "show revision history of entire repository or files" msgstr "visa revisionshistorik för hela arkivet eller filer" @@ -7383,11 +7402,13 @@ msgid "" " If no revision range is specified, the default is tip:0 unless\n" " --follow is set, in which case the working directory parent is\n" -" used as the starting revision." +" used as the starting revision. You can specify a revision set for\n" +" log, see :hg:`help revsets` for more information." msgstr "" " Om ingen revisionsserie specificeras, används tip:0 som standard om\n" " inte --follow är satt, då arbetskatalogens förälder används som första\n" -" revision." +" revision. Du kan ange ett revisionsset för log, se :hg:`help revsets`\n" +" för mer information." msgid "" " By default this command prints revision number and changeset id,\n" @@ -7404,14 +7425,12 @@ " NOTE: log -p/--patch may generate unexpected diff output for merge\n" " changesets, as it will only compare the merge changeset against\n" " its first parent. Also, only files different from BOTH parents\n" -" will appear in files:.\n" -" " +" will appear in files:." msgstr "" " NOTERA: log -p/--patch kan generera oväntad diff-utmatning för\n" " sammanfogningar, eftersom det bara kommer att jämföra ändringen mot den\n" " första förälder. Dessutom kommer bara filer som skiljer sig från BÅDA\n" -" föräldrarna att visas i filer:.\n" -" " +" föräldrarna att visas i filer:." msgid "output the current or given revision of the project manifest" msgstr "visa den nuvarande eller angivna revisionen av projektmanifestet" @@ -7427,12 +7446,10 @@ msgid "" " With -v, print file permissions, symlink and executable bits.\n" -" With --debug, print file revision hashes.\n" -" " +" With --debug, print file revision hashes." msgstr "" " Med -v visas filtillstånd, symlänkar och exekverbarhetsbitar.\n" -" Med --debug visas filrevisionhashar.\n" -" " +" Med --debug visas filrevisionhashar." msgid "merge working directory with another revision" msgstr "sammanfoga arbetskatalogen med en annan revision" @@ -7459,28 +7476,35 @@ " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" -" explicit revision with which to merge with must be provided.\n" -" " +" explicit revision with which to merge with must be provided." msgstr "" " Om ingen revision anges, arbetskatalogens förälder är en huvudrevision,\n" " och den nuvarande grenen innehåller exakt ett annat huvud, sammanfogas\n" " det andra huvudet som standard. Om inte, måste en explicit revision\n" -" anges.\n" +" anges." + +msgid "" +" Returns 0 on success, 1 if there are unresolved files.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om det finns olösta filer.\n" " " #, python-format -msgid "abort: branch '%s' has %d heads - please merge with an explicit rev\n" -msgstr "avbryter: grenen '%s' har %d huvuden - sammanfoga med en specifik rev\n" - -msgid "(run 'hg heads .' to see heads)\n" -msgstr "(kör 'hg heads .' för att se huvuden)\n" - -#, python-format -msgid "abort: branch '%s' has one head - please merge with an explicit rev\n" -msgstr "avbryter: grenen '%s' har ett huvud - sammanfoga med en specifik rev\n" - -msgid "(run 'hg heads' to see all heads)\n" -msgstr "(kör 'hg heads' för att se alla huvuden)\n" +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 "there is nothing to merge" msgstr "det finns inget att sammanfoga" @@ -7489,8 +7513,12 @@ 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 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 "show changesets not found in the destination" msgstr "visa ändringar som inte hittas i destinationen" @@ -7504,11 +7532,14 @@ " eller den vanliga push-platsen. Detta är de ändringar som skulle\n" " tryckas om push genomfördes." -msgid "" -" See pull for details of valid destination formats.\n" +msgid " See pull for details of valid destination formats." +msgstr " Se pull för information om giltiga destinationsformat." + +msgid "" +" Returns 0 if there are outgoing changes, 1 otherwise.\n" " " msgstr "" -" Se pull för information om giltiga destinationsformat.\n" +" Returnerar 0 om det finns utgående ändringar, 1 annars.\n" " " msgid "show the parents of the working directory or revision" @@ -7519,14 +7550,12 @@ " given via -r/--rev, the parent of that revision will be printed.\n" " If a file argument is given, the revision in which the file was\n" " last changed (before the working directory revision or the\n" -" argument to --rev if given) is printed.\n" -" " +" argument to --rev if given) is printed." msgstr "" " Visa revisioner för arbetskatalogens föräldrar. Om en revision anges\n" " via -r/--rev, kommer den revisionens föräldrar att visas. Om en fil\n" " anges, kommer revisionen då den filen sist ändrades (innan\n" -" arbetskatalogens revision eller innan --rev om angiven) att visas.\n" -" " +" arbetskatalogens revision eller innan --rev om angiven) att visas." msgid "can only specify an explicit filename" msgstr "kan bara specificera ett explicit filnamn" @@ -7546,27 +7575,31 @@ " definitionen för alla tillgängliga namn." msgid "" -" Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" -" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too." -msgstr "" -" Sökvägar definieras i sektionen [paths] i /etc/mercurial/hgrc och\n" -" $HOME/.hgrc. Om det körs i ett arkiv, så används .hg/hgrc också." - -msgid "" -" The names 'default' and 'default-push' have a special meaning.\n" -" They are the locations used when pulling and pushing respectively\n" -" unless a location is specified. When cloning a repository, the\n" -" clone source is written as 'default' in .hg/hgrc." -msgstr "" -" Namnen 'default' och 'default-push' har en särskild innebörd. De är\n" -" platserna som används vid push eller pull om ingen plats anges. När\n" -" ett arkiv klonas, skrivs klonkällan som 'default' i .hg/hgrc." - -msgid "" -" See 'hg help urls' for more information.\n" +" Path names are defined in the [paths] section of\n" +" ``/etc/mercurial/hgrc`` and ``$HOME/.hgrc``. If run inside a\n" +" repository, ``.hg/hgrc`` is used, too." +msgstr "" +" Sökvägar definieras i sektionen [paths] i ``/etc/mercurial/hgrc`` och\n" +" ``$HOME/.hgrc``. Om det körs i ett arkiv, så används ``.hg/hgrc`` också." + +msgid "" +" The path names ``default`` and ``default-push`` have a special\n" +" meaning. When performing a push or pull operation, they are used\n" +" as fallbacks if no location is specified on the command-line.\n" +" When ``default-push`` is set, it will be used for push and\n" +" ``default`` will be used for pull; otherwise ``default`` is used\n" +" as the fallback for both. When cloning a repository, the clone\n" +" source is written as ``default`` in ``.hg/hgrc``. Note that\n" +" ``default`` and ``default-push`` apply to all inbound (e.g.\n" +" :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and\n" +" :hg:`bundle`) operations." +msgstr "" + +msgid "" +" See :hg:`help urls` for more information.\n" " " msgstr "" -" Se 'hg help urls' för mer information.\n" +" Se :hg:`help urls` för mer information.\n" " " msgid "not found!\n" @@ -7576,7 +7609,8 @@ msgstr "uppdaterar inte, eftersom nya huvuden läggs till\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" +msgstr "" +"(kör 'hg heads' för att se nya huvuden, 'hg merge' för att sammanfoga)\n" msgid "(run 'hg update' to get a working copy)\n" msgstr "(kör 'hg update' för att få en arbetskopia)\n" @@ -7599,64 +7633,83 @@ " arbetskatalogen." msgid "" -" Use hg incoming if you want to see what would have been added by a\n" -" pull at the time you issued this command. If you then decide to\n" -" added those changes to the repository, you should use pull -r X\n" -" where X is the last changeset listed by hg incoming." -msgstr "" -" Använd hg incoming om du vill se vad som skulle ha lagts till av en\n" +" Use :hg:`incoming` if you want to see what would have been added\n" +" by a pull at the time you issued this command. If you then decide\n" +" to add those changes to the repository, you should use :hg:`pull\n" +" -r X` where ``X`` is the last changeset listed by :hg:`incoming`." +msgstr "" +" Använd :hg:`incoming` om du vill se vad som skulle ha lagts till av en\n" " dragning vid det tillfället du kör kommandot. Om du bestämmer dig för\n" -" att lägga till de ändringarna i arkivet, använd pull -r X där X -r den\n" -" sista ändringen listad av hg incoming." +" att lägga till de ändringarna i arkivet, använd :hg:`pull -r X` där\n" +" ``X`` är den sista ändringen visad av :hg:`incoming`." msgid "" " If SOURCE is omitted, the 'default' path will be used.\n" -" See 'hg help urls' for more information.\n" -" " +" See :hg:`help urls` for more information." msgstr "" " Om KÄLLA inte är angivet, används 'default'-sökvägen.\n" -" Se 'hg help urls' för mer information.\n" +" Se :hg:`help urls` för mer information." + +msgid "" +" Returns 0 on success, 1 if an update had unresolved files.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n" +" filer.\n" " " msgid "push changes to the specified destination" msgstr "tryck ändringar till den specificerade destinationen" -msgid " Push changes from the local repository to the specified destination." -msgstr " Trycker ändringar från det lokala arkivet till angiven destination." - -msgid "" -" This is the symmetrical operation for pull. It moves changes from\n" -" the current repository to a different one. If the destination is\n" -" local this is identical to a pull in that directory from the\n" -" current one." -msgstr "" -" Detta är en symmetriska operationen för pull. Den flyttar ändringar\n" -" från det nuvarande arkivet till ett annat. Om destinationen är lokal så\n" -" är detta identiskt med en dragning i den katalogen från den nuvarande." - -msgid "" -" By default, push will refuse to run if it detects the result would\n" -" increase the number of remote heads. This generally indicates the\n" -" user forgot to pull and merge before pushing." -msgstr "" -" Som standard vägrar push att utföra något om det upptäcks att antalet\n" -" huvuden i destinationen ökar. Det brukar generellt sett indikera att\n" -" användaren glömt att dra och sammanfoga innan tryckning." - -msgid "" -" If -r/--rev is used, the named revision and all its ancestors will\n" -" be pushed to the remote repository." +msgid "" +" Push changesets from the local repository to the specified\n" +" destination." +msgstr "" +" Trycker ändringar från det lokala arkivet till angiven destination." + +msgid "" +" This operation is symmetrical to pull: it is identical to a pull\n" +" in the destination repository from the current one." +msgstr "" + +msgid "" +" By default, push will not allow creation of new heads at the\n" +" destination, since multiple heads would make it unclear which head\n" +" to use. In this situation, it is recommended to pull and merge\n" +" before pushing." +msgstr "" + +msgid "" +" Use --new-branch if you want to allow push to create a new named\n" +" branch that is not present at the destination. This allows you to\n" +" only create a new branch without forcing other changes." +msgstr "" + +msgid "" +" Use -f/--force to override the default behavior and push all\n" +" changesets on all branches." +msgstr "" + +msgid "" +" If -r/--rev is used, the specified revision and all its ancestors\n" +" will be pushed to the remote repository." msgstr "" " Om -r/--rev används, kommer den angivna revisionen och alla anfäder att\n" " tryckas till det andra arkivet." msgid "" -" Please see 'hg help urls' for important details about ``ssh://``\n" -" URLs. If DESTINATION is omitted, a default path will be used.\n" +" Please see :hg:`help urls` for important details about ``ssh://``\n" +" URLs. If DESTINATION is omitted, a default path will be used." +msgstr "" +" Se :hg:`help urls` för viktiga detaljer om URL:er med ``ssh://``. Om\n" +" DESTINATION inte är angivet, används standardsökvägen." + +msgid "" +" Returns 0 if push was successful, 1 if nothing to push.\n" " " msgstr "" -" Se 'hg help urls' för viktiga detaljer om URL:er med ``ssh://``. Om\n" -" DESTINATION inte är angivet, används standardsökvägen." +" Returnerar 0 om tryckning lyckates, 1 om inget fanns att trycka.\n" +" " #, python-format msgid "pushing to %s\n" @@ -7671,13 +7724,17 @@ msgid "" " This command tries to fix the repository status after an\n" " interrupted operation. It should only be necessary when Mercurial\n" -" suggests it.\n" -" " +" suggests it." msgstr "" " Kommandot försöker att fixa arkivstatusen efter en avbruten operation.\n" " Det bör bara användas när Mercurial föreslår det.\n" " " +msgid "" +" Returns 0 if successful, 1 if nothing to recover or verify fails.\n" +" " +msgstr "" + msgid "remove the specified files on the next commit" msgstr "ta bort de specificerade filerna vid nästa arkivering" @@ -7693,21 +7750,21 @@ msgstr "" " Detta tar bara bort filerna från den nuvarande grenen, inte från hela\n" " projektets historik. -A/--after kan användas för att bara ta bort filer\n" -" som redan raderats, -f/--force kan användas för att tvinga radering, och\n" -" -Af kan ta bort filer från nästa revision utan att radera dem från\n" +" som redan raderats, -f/--force kan användas för att tvinga radering,\n" +" och -Af kan ta bort filer från nästa revision utan att radera dem från\n" " arbetskopian." msgid "" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" -" reported by hg status). The actions are Warn, Remove (from branch)\n" -" and Delete (from disk)::" +" reported by :hg:`status`). The actions are Warn, Remove (from\n" +" branch) and Delete (from disk)::" msgstr "" " Följande tabell visar hur remove uppför sig för olika filstatus\n" " (kolumner) och flaggor (rader). Filstatus är Adderade [A], Ren [C],\n" -" Modifierad [M] och Saknad [!] (som rapporteras av hg status). Aktionerna\n" -" är Varna, Radera (från gren) och Ta bort (från disk)::" +" Modifierad [M] och Saknad [!] (som rapporteras av :hg:`status`).\n" +" Aktionerna är Varna, Radera (från gren) och Ta bort (från disk)::" msgid "" " A C M !\n" @@ -7724,11 +7781,17 @@ msgid "" " This command schedules the files to be removed at the next commit.\n" -" To undo a remove before that, see hg revert.\n" -" " +" To undo a remove before that, see :hg:`revert`." msgstr "" " Kommandot markerar att filerna ska tas bort vid nästa arkivering. För\n" -" att ångra en remove innan dess, se hg revert.\n" +" att ångra en remove innan dess, se :hg:`revert` .\n" +" " + +msgid "" +" Returns 0 on success, 1 if any warnings encountered.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om varningar påträffades.\n" " " #, python-format @@ -7762,11 +7825,10 @@ msgid "" " This command takes effect at the next commit. To undo a rename\n" -" before that, see hg revert.\n" -" " +" before that, see :hg:`revert`." msgstr "" " Det här kommandot får effekt vid nästa arkivering. För att ångra ett\n" -" namnbyte innan det, se hg revert.\n" +" namnbyte innan det, se :hg:`revert`.\n" " " msgid "various operations to help finish a merge" @@ -7816,12 +7878,17 @@ msgid "" " Note that Mercurial will not let you commit files with unresolved merge\n" " conflicts. You must use ``hg resolve -m ...`` before you can commit\n" -" after a conflicting merge.\n" -" " +" after a conflicting merge." msgstr "" " Notera att Mercurial inte låter dig arkivera filer med olösta\n" " konflikter från sammanfogningar. Du måste använda ``hg resolve -m ...``\n" -" innan du kan arkivera efter en sammanfogning med konflikter.\n" +" innan du kan arkivera efter en sammanfogning med konflikter" + +msgid "" +" Returns 0 on success, 1 if any files fail a resolve attempt.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckates, 1 om någon fil inte kunde lösas.\n" " " msgid "too many options specified" @@ -7831,7 +7898,9 @@ msgstr "kan inte specificera --all och mönster" msgid "no files or directories specified; use --all to remerge all files" -msgstr "inga filer eller kataloger specificerade; använd --all för att återsammanfoga alla filer" +msgstr "" +"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" @@ -7860,12 +7929,12 @@ 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." +" 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" +" 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 "" @@ -7896,18 +7965,18 @@ msgid "" " Modified files are saved with a .orig suffix before reverting.\n" -" To disable these backups, use --no-backup.\n" -" " +" To disable these backups, use --no-backup." msgstr "" " Modifierade filer sparas med suffixet .orig innan återställning.\n" -" För att deaktivera dessa säkerhetskopior, använd --no-backup.\n" -" " +" För att deaktivera dessa säkerhetskopior, använd --no-backup." msgid "you can't specify a revision and a date" msgstr "du kan inte specificera en revision och ett datum" 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" +msgstr "" +"inga filer eller kataloger angivna; använd --all för att återställa hela " +"arkivet" #, python-format msgid "forgetting %s\n" @@ -7979,32 +8048,54 @@ " back locally is ineffective (someone else may already have pulled\n" " the changes). Furthermore, a race is possible with readers of the\n" " repository; for example an in-progress pull from the repository\n" -" may fail if a rollback is performed.\n" -" " +" may fail if a rollback is performed." msgstr "" " Detta kommando är inte tänkt att användas i offentliga arkiv. När\n" " ändringar är tillgängliga att dras av andra användare, så är en\n" " lokal återgång ineffektivt (någon annan kan redan ha dragit\n" " ändringarna). Dessutom finns möjligheten till timingproblem; som\n" " ett exempel kan en pågående dragning misslyckas om en återgång\n" -" utförs.\n" +" utförs." + +msgid "" +" Returns 0 on success, 1 if no rollback data is available.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om ingen återgångsdata finns.\n" " " msgid "print the root (top) of the current working directory" msgstr "visa roten för den aktuella arbetskatalogen" -msgid "" -" Print the root directory of the current repository.\n" -" " -msgstr "" -" Visa rotkatalogen för det aktuella arkivet.\n" -" " +msgid " Print the root directory of the current repository." +msgstr " Visa rotkatalogen för det aktuella arkivet." msgid "start stand-alone webserver" msgstr "starta fristående webbserver" -msgid " Start a local HTTP repository browser and pull server." -msgstr " Startar en lokal HTTP-arkivbläddrare och pull-server." +msgid "" +" Start a local HTTP repository browser and pull server. You can use\n" +" this for ad-hoc sharing and browing of repositories. It is\n" +" recommended to use a real web server to serve a repository for\n" +" longer periods of time." +msgstr "" +" Starta en lokal HTTP-arkivserver för webbläsare och pull-operationer.\n" +" Du kan använda detta för improviserad delning och skummande av arkiv.\n" +" Det är rekommenderat att använda en riktig webbserver för att dela ett\n" +" arkiv under längre tidsperioder." + +msgid "" +" Please note that the server does not implement access control.\n" +" This means that, by default, anybody can read from the server and\n" +" nobody can write to it by default. Set the ``web.allow_push``\n" +" option to ``*`` to allow everybody to push to the server. You\n" +" should use a real web server if you need to authenticate users." +msgstr "" +" Notera att servern inte har någon åtkomstkontroll. Det betyder att vem\n" +" som helst kan läsa från servern och ingen kan skriva till den som\n" +" standard. Sätt flaggan ``web.allow_push`` till ``*`` för att tillåta\n" +" alla att trycka till servern. Om du behöver autenticiera användare,\n" +" borde du använda en riktig webbserver." msgid "" " By default, the server logs accesses to stdout and errors to\n" @@ -8018,12 +8109,10 @@ msgid "" " To have the server choose a free port number to listen on, specify\n" " a port number of 0; in this case, the server will print the port\n" -" number it uses.\n" -" " +" number it uses." msgstr "" " 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.\n" -" " +" som portnummer; då visar servern det portnummer som används." #, python-format msgid "listening at http://%s%s/%s (bound to %s:%d)\n" @@ -8086,8 +8175,7 @@ " ! = missing (deleted by non-hg command, but still tracked)\n" " ? = not tracked\n" " I = ignored\n" -" = origin of the previous file listed as A (added)\n" -" " +" = origin of the previous file listed as A (added)" msgstr "" " M = modifierad\n" " A = adderad\n" @@ -8096,8 +8184,7 @@ " ! = saknad (borttagen av icke-hg-kommando, men fortfarande spårad)\n" " ? = inte spårad\n" " I = ignorerad\n" -" = källa för den tidigare filen listad som A (adderad)\n" -" " +" = källa för den tidigare filen listad som A (adderad)" msgid "summarize working directory state" msgstr "sammanfatta arbetskatalogens tillstånd" @@ -8111,12 +8198,10 @@ msgid "" " With the --remote option, this will check the default paths for\n" -" incoming and outgoing changes. This can be time-consuming.\n" -" " +" incoming and outgoing changes. This can be time-consuming." msgstr "" " Med flaggan --remote kommer också standardsökvägarna att sökas igenom\n" -" för att hitta inkommande och utgående ändringar. Detta kan ta lång tid.\n" -" " +" för att hitta inkommande och utgående ändringar. Detta kan ta lång tid." #, python-format msgid "parent: %d:%s " @@ -8145,6 +8230,14 @@ msgstr "%d borttagen" #, python-format +msgid "%d renamed" +msgstr "%d omdöpta" + +#, python-format +msgid "%d copied" +msgstr "%d kopierade" + +#, python-format msgid "%d deleted" msgstr "%d raderad" @@ -8160,12 +8253,19 @@ msgid "%d unresolved" msgstr "%d olöst" +#, python-format +msgid "%d subrepos" +msgstr "" + msgid " (merge)" msgstr " (sammanfogning)" msgid " (new branch)" msgstr " (ny gren)" +msgid " (head closed)" +msgstr " (huvudet stängt)" + msgid " (clean)" msgstr " (ren)" @@ -8236,6 +8336,11 @@ " samma sätt som andra projektfiler och kan ändras för hand vid behov.\n" " Filen '.hg/localtags' används för lokala märken (ej delad i arkiv)." +msgid "" +" Since tag names have priority over branch names during revision\n" +" lookup, using an existing branch name as a tag name is discouraged." +msgstr "" + msgid "tag names must be unique" msgstr "märkesnamn måste vara unika" @@ -8263,12 +8368,10 @@ msgid "" " This lists both regular and local tags. When the -v/--verbose\n" -" switch is used, a third column \"local\" is printed for local tags.\n" -" " +" switch is used, a third column \"local\" is printed for local tags." msgstr "" " 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.\n" -" " +" används, visas en tredje kolumn med namnet \"local\" för lokala märken." msgid "show the tip revision" msgstr "visa topprevisionen" @@ -8285,25 +8388,29 @@ " If you have just made a commit, that commit will be the tip. If\n" " you have just pulled changes from another repository, the tip of\n" " that repository becomes the current tip. The \"tip\" tag is special\n" -" and cannot be renamed or assigned to a different changeset.\n" -" " +" and cannot be renamed or assigned to a different changeset." msgstr "" " Om du precis har gjort en arkivering, kommer den att vara toppen. Om\n" " du har dragit ändringar från ett annat arkiv, så blir toppen för det\n" " arkivet den aktuella toppen. Märket \"tip\" är speciellt och kan inte\n" -" döpas om eller tilldelas en annan ändring.\n" -" " +" döpas om eller tilldelas en annan ändring." msgid "apply one or more changegroup files" msgstr "applicera en eller flera filer med ändringar" msgid "" " Apply one or more compressed changegroup files generated by the\n" -" bundle command.\n" -" " +" bundle command." msgstr "" " Applicera en eller flera komprimerade filer med ändringar genererade\n" -" av bundle-kommandot.\n" +" av bundle-kommandot." + +msgid "" +" Returns 0 on success, 1 if an update has unresolved files.\n" +" " +msgstr "" +" Returnerar 0 om kommandot lyckades, 1 om en uppdatering har olösta\n" +" filer.\n" " " msgid "update working directory (or switch revisions)" @@ -8363,16 +8470,18 @@ " arbetskatalogen uppdateras till den begärda ändringen." msgid "" -" Use null as the changeset to remove the working directory (like 'hg\n" -" clone -U')." -msgstr "" -" Använd null som ändring för att radera arbetskatalogen (som 'hg clone\n" -" -U')." - -msgid " If you want to update just one file to an older changeset, use 'hg revert'." -msgstr "" -" Om du vill uppdatera bara en fil till en äldre ändring, använd 'hg\n" -" revert'." +" Use null as the changeset to remove the working directory (like\n" +" :hg:`clone -U`)." +msgstr "" +" Använd null som ändring för att radera arbetskatalogen (som :hg:`clone\n" +" -U`)." + +msgid "" +" If you want to update just one file to an older changeset, use :hg:" +"`revert`." +msgstr "" +" Om du vill uppdatera bara en fil till en äldre ändring, använd :hg:" +"`revert`." msgid "cannot specify both -c/--check and -C/--clean" msgstr "" @@ -8390,13 +8499,11 @@ " This will perform an extensive check of the repository's\n" " integrity, validating the hashes and checksums of each entry in\n" " the changelog, manifest, and tracked files, as well as the\n" -" integrity of their crosslinks and indices.\n" -" " +" integrity of their crosslinks and indices." msgstr "" " Detta genomför en omfattande kontroll av arkivets integritet, validerar\n" " hash- och checksummor för varje notering i ändringsloggen, manifestet,\n" -" och spårade filer, såväl som integriteten av korslänkar och indexar.\n" -" " +" och spårade filer, såväl som integriteten av korslänkar och indexar." msgid "output version and copyright information" msgstr "visa version och copyright-information" @@ -8419,6 +8526,9 @@ 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" @@ -8434,6 +8544,9 @@ 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" @@ -8443,6 +8556,12 @@ 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" @@ -8450,7 +8569,7 @@ msgstr "visa alltid bakåtspårning vid undantag" msgid "time how long the command takes" -msgstr "ta tid på hud lång tid kommandot körs" +msgstr "ta tid på hur lång tid kommandot körs" msgid "print command execution profile" msgstr "visa kommandoexekveringens profil" @@ -8470,17 +8589,20 @@ msgid "specify hg command to run on the remote side" msgstr "specificera hg-kommando att köra på andra sidan" +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 "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" @@ -8488,6 +8610,9 @@ 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" @@ -8497,6 +8622,9 @@ 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" @@ -8521,8 +8649,8 @@ msgid "number of lines of context to show" msgstr "antal sammanhangsrader att visa" -msgid "output diffstat-style summary of changes" -msgstr "visa sammanfattning av ändringar i diffstat-stil" +msgid "SIMILARITY" +msgstr "" msgid "guess renamed files by similarity (0<=s<=100)" msgstr "gissa omdöpta filer efter likhet (0<=s<=100)" @@ -8563,6 +8691,9 @@ 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" @@ -8692,6 +8823,21 @@ 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]" @@ -8701,6 +8847,21 @@ 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" @@ -8713,8 +8874,8 @@ msgid "[PATH]" msgstr "[SÖKVÄG]" -msgid "FILE" -msgstr "FIL" +msgid "REPO NAMESPACE [KEY OLD NEW]" +msgstr "" msgid "revision to rebuild to" msgstr "revision att bygga om till" @@ -8759,7 +8920,8 @@ 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" +msgstr "" +"följ ändringshistorik, eller filhistorik över kopieringar och namnbyten" msgid "ignore case when matching" msgstr "ignorera versaler/gemener vid matchning" @@ -8770,8 +8932,8 @@ msgid "print matching line numbers" msgstr "visa matchande radnummer" -msgid "search in given revision range" -msgstr "sök i ett givet revisionsområde" +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]..." @@ -8788,8 +8950,8 @@ 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 "[-ac] [-r REV] [REV]..." +msgstr "[-ac] [-r REV] [REV]..." msgid "[TOPIC]" msgstr "[ÄMNE]" @@ -8812,8 +8974,13 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "[-nibt] [-r REV] [KÄLLA]" -msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" -msgstr "" +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" @@ -8875,8 +9042,8 @@ msgid "show copied files" msgstr "visa kopierade filer" -msgid "do case-insensitive search for a keyword" -msgstr "gör versalokänslig sökning efter nyckelord" +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" @@ -8887,8 +9054,11 @@ msgid "revisions committed by user" msgstr "revisioner arkiverade av användare" -msgid "show only changesets within the given named branch" -msgstr "visa bara ändringar i den namngivda grenen" +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" @@ -8944,6 +9114,9 @@ msgid "force push" msgstr "tvinga tryckning" +msgid "allow pushing a new branch" +msgstr "" + msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" msgstr "[-f] [-r REV]... [-e KMD] [--remotecmd KMD] [DEST]" @@ -8995,9 +9168,15 @@ 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)" @@ -9007,9 +9186,12 @@ msgid "name to show in web pages (default: working directory)" msgstr "namn att visa i webbsidor (standard: arbetskatalogen)" -msgid "name of the webdir config file (serve more than one repository)" +msgid "name of the hgweb config file (serve more than one repository)" msgstr "namn på webdir-konfigurationsfil (dela ut mer än ett arkiv)" +msgid "name of the hgweb config file (DEPRECATED)" +msgstr "namn på webdir-konfigurationsfil (FÖRLEGAD)" + msgid "for remote clients" msgstr "för fjärrklienter" @@ -9079,6 +9261,9 @@ 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..." @@ -9086,7 +9271,7 @@ msgstr "[-p] [-g]" msgid "update to new branch head if changesets were unbundled" -msgstr "uppdatera till nytt grenhuvud om ändringrs packades upp" +msgstr "uppdatera till nytt grenhuvud om ändringar packades upp" msgid "[-u] FILE..." msgstr "[-u] FIL..." @@ -9101,11 +9286,7 @@ msgstr "[-c] [-C] [-d DATUM] [[-r] REV]" #, python-format -msgid "config error at %s:%d: cannot include %s (%s)" -msgstr "" - -#, python-format -msgid "config error at %s:%d: '%s'" +msgid "cannot include %s (%s)" msgstr "" msgid "not found in manifest" @@ -9114,6 +9295,50 @@ msgid "branch name not in UTF-8!" msgstr "" +#, python-format +msgid "%s does not exist!\n" +msgstr "" + +#, 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: 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" +msgstr "" + +#, python-format +msgid "%s already tracked!\n" +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 "" + +#, python-format +msgid "%s not removed!\n" +msgstr "" + +#, python-format +msgid "copy failed: %s is not a file or a symbolic link\n" +msgstr "" + +#, python-format +msgid "invalid event type in dag: %s" +msgstr "" + msgid "working directory state appears damaged!" msgstr "" @@ -9130,6 +9355,10 @@ msgstr "" #, python-format +msgid "setting %r to other parent only allowed in merges" +msgstr "" + +#, python-format msgid "not in dirstate: %s\n" msgstr "" @@ -9155,12 +9384,54 @@ msgid "unsupported file type (type is %s)" msgstr "" +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 "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 "avbryter: push skapar nya fjärrhuvuden!\n" + +msgid "(you should pull and merge or use push -f to force)\n" +msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n" + +msgid "(did you forget to merge? use push -f to force)\n" +msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" + +#, python-format +msgid "abort: push creates new remote branches: %s!\n" +msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" + +msgid "(use 'hg push --new-branch' to create new remote branches)\n" +msgstr "(använd 'hg push --new-branch' för att skapa nya fjärrgrenar)\n" + +msgid "note: unsynced remote changes!\n" +msgstr "notera: osynkade fjärrändringar!\n" + #, python-format msgid "abort: %s\n" msgstr "avbryter: %s\n" #, python-format -msgid "hg: %s\n" +msgid "hg: parse error at %s: %s\n" +msgstr "" + +#, python-format +msgid "hg: parse error: %s\n" msgstr "" #, python-format @@ -9190,6 +9461,10 @@ msgstr "" #, python-format +msgid "hg: %s\n" +msgstr "" + +#, python-format msgid "abort: %s!\n" msgstr "" @@ -9207,10 +9482,6 @@ msgid "hg: unknown command '%s'\n" msgstr "" -#, python-format -msgid "abort: could not import module %s!\n" -msgstr "" - msgid "(did you forget to compile extensions?)\n" msgstr "" @@ -9245,6 +9516,10 @@ msgstr "" #, python-format +msgid "** Python %s\n" +msgstr "" + +#, python-format msgid "** Mercurial Distributed SCM (version %s)\n" msgstr "" @@ -9278,7 +9553,9 @@ msgid "Option --cwd may not be abbreviated!" msgstr "" -msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!" +msgid "" +"Option -R has to be separated from other options (e.g. not -qR) and --" +"repository may only be abbreviated as --repo!" msgstr "" #, python-format @@ -9296,7 +9573,9 @@ msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "" -msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" +msgid "" +"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" +"misc/lsprof/" msgstr "" #, python-format @@ -9344,9 +9623,11 @@ msgstr "" #, python-format -msgid "" -" output file %s appears unchanged\n" -"was merge successful (yn)?" +msgid "%s.premerge not valid ('%s' is neither boolean nor %s)" +msgstr "" + +#, python-format +msgid "was merge of '%s' successful (yn)?" msgstr "" msgid "&No" @@ -9356,6 +9637,12 @@ msgstr "" #, python-format +msgid "" +" output file %s appears unchanged\n" +"was merge successful (yn)?" +msgstr "" + +#, python-format msgid "merging %s failed!\n" msgstr "" @@ -9388,6 +9675,9 @@ msgid "Specifying Multiple Revisions" msgstr "Ange Flera Revisioner" +msgid "Specifying Revision Sets" +msgstr "Ange Revisionsset" + msgid "Diff Formats" msgstr "Diff-format" @@ -9400,6 +9690,12 @@ msgid "Using additional features" msgstr "Använda ytterligare funktioner" +msgid "Configuring hgweb" +msgstr "" + +msgid "Glossary" +msgstr "" + msgid "" "Mercurial reads configuration data from several files, if they exist.\n" "Below we list the most specific file first." @@ -9413,21 +9709,27 @@ msgid "" "- ``<repo>\\.hg\\hgrc``\n" "- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\Mercurial.ini``\n" +"- ``%USERPROFILE%\\mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\Mercurial.ini``\n" -"- ``C:\\Mercurial\\Mercurial.ini``\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" -"- ``<install-dir>\\Mercurial.ini``" +"- ``%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" +"- ``%USERPROFILE%\\mercurial.ini``\n" "- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\Mercurial.ini``\n" -"- ``C:\\Mercurial\\Mercurial.ini``\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``\n" -"- ``<installationskatalog>\\Mercurial.ini``" +"- ``%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:" @@ -9448,6 +9750,27 @@ "- ``<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 "" + +msgid "" +" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" +msgstr "" + +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 "" + +msgid "" +"- ``ui.report_untrusted = False``\n" +"- ``trusted.users = USER``\n" +"- ``trusted.groups = GROUP``" +msgstr "" + +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::" @@ -9466,7 +9789,7 @@ " verbose = True" msgid "" -"This above entries will be referred to as ``ui.username`` and\n" +"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:" msgstr "" @@ -9581,7 +9904,7 @@ msgid "" "This means that when generating diffs from a Mercurial repository\n" -"(e.g. with \"hg export\"), you should be careful about things like file\n" +"(e.g. with :hg:`export`), you should be careful about things like file\n" "copies and renames or other things mentioned above, because when\n" "applying a standard diff to a different repository, this extra\n" "information is lost. Mercurial's internal operations (like push and\n" @@ -9763,6 +10086,586 @@ 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" +" of a changeset can be defined by two properties: a parent of a\n" +" changeset is an ancestor, and a parent of an ancestor is an\n" +" ancestor. See also: 'Descendant'." +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" +" 'Branch, topological'.If a topological branch is named, it becomes\n" +" a named branch. If a topological branch is not named, it becomes\n" +" an anonymous branch. See 'Branch, anonymous' and 'Branch, named'." +msgstr "" + +msgid "" +" Branches may be created when changes are pulled from or pushed to\n" +" a remote repository, since new heads may be created by these\n" +" operations. Note that the term branch can also be used informally\n" +" to describe a development process in which certain development is\n" +" done independently of other development.This is sometimes done\n" +" explicitly with a named branch, but it can also be done locally,\n" +" using bookmarks or clones and anonymous branches." +msgstr "" + +msgid " Example: \"The experimental branch\"." +msgstr "" + +msgid "" +" (Verb) The action of creating a child changeset which results in\n" +" its parent having more than one child." +msgstr "" + +msgid " Example: \"I'm going to branch at X\"." +msgstr "" + +msgid "" +"Branch, anonymous\n" +" Every time a new child changeset is created from a parent that is not\n" +" a head and the name of the branch is not changed, a new anonymous\n" +" branch is created." +msgstr "" + +msgid "" +"Branch, closed\n" +" A named branch whose branch heads have all been closed." +msgstr "" + +msgid "" +"Branch, default\n" +" The branch assigned to a changeset when no name has previously been\n" +" assigned." +msgstr "" + +msgid "" +"Branch head\n" +" See 'Head, branch'." +msgstr "" + +msgid "" +"Branch, named\n" +" A collection of changesets which have the same branch name. By\n" +" default, children of a changeset in a named branch belong to the\n" +" same named branch. A child can be explicitly assigned to a\n" +" different branch. See :hg:`help branch`, :hg:`help branches` and\n" +" :hg:`commit --close-branch` for more information on managing\n" +" branches." +msgstr "" + +msgid "" +" Named branches can be thought of as a kind of namespace, dividing\n" +" the collection of changesets that comprise the repository into a\n" +" collection of disjoint subsets. A named branch is not necessarily\n" +" a topological branch. If a new named branch is created from the\n" +" head of another named branch, or the default branch, but no\n" +" further changesets are added to that previous branch, then the new\n" +" named branch will be a branch in name only." +msgstr "" + +msgid "" +"Branch tip\n" +" See 'Tip, branch'." +msgstr "" + +msgid "" +"Branch, topological\n" +" Every time a new child changeset is created from a parent that is\n" +" not a head, a new topological branch is created. If a topological\n" +" branch is named, it becomes a named branch. If a topological\n" +" branch is not named, it becomes an anonymous branch of the\n" +" current, possibly default, branch." +msgstr "" + +msgid "" +"Changelog\n" +" A record of the changesets in the order in which they were added\n" +" to the repository. This includes details such as changeset id,\n" +" author, commit message, date, and list of changed files." +msgstr "" + +msgid "" +"Changeset\n" +" A snapshot of the state of the repository used to record a change." +msgstr "" + +msgid "" +"Changeset, child\n" +" The converse of parent changeset: if P is a parent of C, then C is\n" +" a child of P. There is no limit to the number of children that a\n" +" changeset may have." +msgstr "" + +msgid "" +"Changeset id\n" +" A SHA-1 hash that uniquely identifies a changeset. It may be\n" +" represented as either a \"long\" 40-byte hexadecimal string, or a\n" +" \"short\" 12-byte hexadecimal string." +msgstr "" + +msgid "" +"Changeset, merge\n" +" A changeset with two parents. This occurs when a merge is\n" +" committed." +msgstr "" + +msgid "" +"Changeset, parent\n" +" A revision upon which a child changeset is based. Specifically, a\n" +" parent changeset of a changeset C is a changeset whose node\n" +" immediately precedes C in the DAG. Changesets have at most two\n" +" parents." +msgstr "" + +msgid "" +"Checkout\n" +" (Noun) The working directory being updated to a specific\n" +" revision. This use should probably be avoided where possible, as\n" +" changeset is much more appropriate than checkout in this context." +msgstr "" + +msgid " Example: \"I'm using checkout X.\"" +msgstr "" + +msgid "" +" (Verb) Updating the working directory to a specific changeset. See\n" +" :hg:`help update`." +msgstr "" + +msgid " Example: \"I'm going to check out changeset X.\"" +msgstr "" + +msgid "" +"Child changeset\n" +" See 'Changeset, child'." +msgstr "" + +msgid "" +"Close changeset\n" +" See 'Changeset, close'." +msgstr "" + +msgid "" +"Closed branch\n" +" See 'Branch, closed'." +msgstr "" + +msgid "" +"Clone\n" +" (Noun) An entire or partial copy of a repository. The partial\n" +" clone must be in the form of a revision and its ancestors." +msgstr "" + +msgid " Example: \"Is your clone up to date?\"." +msgstr "" + +msgid " (Verb) The process of creating a clone, using :hg:`clone`." +msgstr "" + +msgid " Example: \"I'm going to clone the repository\"." +msgstr "" + +msgid "" +"Closed branch head\n" +" See 'Head, closed branch'." +msgstr "" + +msgid "" +"Commit\n" +" (Noun) A synonym for changeset." +msgstr "" + +msgid " Example: \"Is the bug fixed in your recent commit?\"" +msgstr "" + +msgid "" +" (Verb) The act of recording changes to a repository. When files\n" +" are committed in a working directory, Mercurial finds the\n" +" differences between the committed files and their parent\n" +" changeset, creating a new changeset in the repository." +msgstr "" + +msgid " Example: \"You should commit those changes now.\"" +msgstr "" + +msgid "" +"Cset\n" +" A common abbreviation of the term changeset." +msgstr "" + +msgid "" +"DAG\n" +" The repository of changesets of a distributed version control\n" +" system (DVCS) can be described as a directed acyclic graph (DAG),\n" +" consisting of nodes and edges, where nodes correspond to\n" +" changesets and edges imply a parent -> child relation. This graph\n" +" can be visualized by graphical tools such as :hg:`glog`\n" +" (graphlog). In mercurial, the DAG is limited by the requirement\n" +" for children to have at most two parents." +msgstr "" + +msgid "" +"Default branch\n" +" See 'Branch, default'." +msgstr "" + +msgid "" +"Descendant\n" +" Any changeset that can be reached by a chain of child changesets\n" +" from a given changeset. More precisely, the descendants of a\n" +" changeset can be defined by two properties: the child of a\n" +" changeset is a descendant, and the child of a descendant is a\n" +" descendant. See also: 'Ancestor'." +msgstr "" + +msgid "" +"Diff\n" +" (Noun) The difference between the contents and attributes of files\n" +" in two changesets or a changeset and the current working\n" +" directory. The difference is usually represented in a standard\n" +" form called a \"diff\" or \"patch\". The \"git diff\" format is used\n" +" when the changes include copies, renames, or changes to file\n" +" attributes, none of which can be represented/handled by classic\n" +" \"diff\" and \"patch\"." +msgstr "" + +msgid " Example: \"Did you see my correction in the diff?\"" +msgstr "" + +msgid "" +" (Verb) Diffing two changesets is the action of creating a diff or\n" +" patch." +msgstr "" + +msgid "" +" Example: \"If you diff with changeset X, you will see what I mean.\"" +msgstr "" + +msgid "" +"Directory, working\n" +" The working directory represents the state of the files tracked by\n" +" Mercurial, that will be recorded in the next commit. The working\n" +" directory initially corresponds to the snapshot at an existing\n" +" changeset, known as the parent of the working directory. See\n" +" 'Parents, working directory'. The state may be modified by changes\n" +" to the files introduced manually or by a merge. The repository\n" +" metadata exists in the .hg directory inside the working directory." +msgstr "" + +msgid "" +"Graph\n" +" See DAG and :hg:`help graphlog`." +msgstr "" + +msgid "" +"Head\n" +" The term 'head' may be used to refer to both a branch head or a\n" +" repository head, depending on the context. See 'Head, branch' and\n" +" 'Head, repository' for specific definitions." +msgstr "" + +msgid "" +" Heads are where development generally takes place and are the\n" +" usual targets for update and merge operations." +msgstr "" + +msgid "" +"Head, branch\n" +" A changeset with no descendants on the same named branch." +msgstr "" + +msgid "" +"Head, closed branch\n" +" A changeset that marks a head as no longer interesting. The closed\n" +" head is no longer listed by :hg:`heads`. A branch is considered\n" +" closed when all its heads are closed and consequently is not\n" +" listed by :hg:`branches`." +msgstr "" + +msgid "" +"Head, repository\n" +" A topological head which has not been closed." +msgstr "" + +msgid "" +"Head, topological\n" +" A changeset with no children in the repository." +msgstr "" + +msgid "" +"History, immutable\n" +" Once committed, changesets cannot be altered. Extensions which\n" +" appear to change history actually create new changesets that\n" +" replace existing ones, and then destroy the old changesets. Doing\n" +" so in public repositories can result in old changesets being\n" +" reintroduced to the repository." +msgstr "" + +msgid "" +"History, rewriting\n" +" The changesets in a repository are immutable. However, extensions\n" +" to Mercurial can be used to alter the repository, usually in such\n" +" a way as to preserve changeset contents." +msgstr "" + +msgid "" +"Immutable history\n" +" See 'History, immutable'." +msgstr "" + +msgid "" +"Merge changeset\n" +" See 'Changeset, merge'." +msgstr "" + +msgid "" +"Manifest\n" +" Each changeset has a manifest, which is the list of files that are\n" +" tracked by the changeset." +msgstr "" + +msgid "" +"Merge\n" +" Used to bring together divergent branches of work. When you update\n" +" to a changeset and then merge another changeset, you bring the\n" +" history of the latter changeset into your working directory. Once\n" +" conflicts are resolved (and marked), this merge may be committed\n" +" as a merge changeset, bringing two branches together in the DAG." +msgstr "" + +msgid "" +"Named branch\n" +" See 'Branch, named'." +msgstr "" + +msgid "" +"Null changeset\n" +" The empty changeset. It is the parent state of newly-initialized\n" +" repositories and repositories with no checked out revision. It is\n" +" thus the parent of root changesets and the effective ancestor when\n" +" merging unrelated changesets. Can be specified by the alias 'null'\n" +" or by the changeset ID '000000000000'." +msgstr "" + +msgid "" +"Parent\n" +" See 'Changeset, parent'." +msgstr "" + +msgid "" +"Parent changeset\n" +" See 'Changeset, parent'." +msgstr "" + +msgid "" +"Parent, working directory\n" +" The working directory parent reflects a virtual revision which is\n" +" the child of the changeset (or two changesets with an uncommitted\n" +" merge) shown by :hg:`parents`. This is changed with\n" +" :hg:`update`. Other commands to see the working directory parent\n" +" are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"." +msgstr "" + +msgid "" +"Patch\n" +" (Noun) The product of a diff operation." +msgstr "" + +msgid " Example: \"I've sent you my patch.\"" +msgstr "" + +msgid "" +" (Verb) The process of using a patch file to transform one\n" +" changeset into another." +msgstr "" + +msgid " Example: \"You will need to patch that revision.\"" +msgstr "" + +msgid "" +"Pull\n" +" An operation in which changesets in a remote repository which are\n" +" not in the local repository are brought into the local\n" +" repository. Note that this operation without special arguments\n" +" only updates the repository, it does not update the files in the\n" +" working directory. See :hg:`help pull`." +msgstr "" + +msgid "" +"Push\n" +" An operation in which changesets in a local repository which are\n" +" not in a remote repository are sent to the remote repository. Note\n" +" that this operation only adds changesets which have been committed\n" +" locally to the remote repository. Uncommitted changes are not\n" +" sent. See :hg:`help push`." +msgstr "" + +msgid "" +"Repository\n" +" The metadata describing all recorded states of a collection of\n" +" files. Each recorded state is represented by a changeset. A\n" +" repository is usually (but not always) found in the ``.hg``\n" +" subdirectory of a working directory. Any recorded state can be\n" +" recreated by \"updating\" a working directory to a specific\n" +" changeset." +msgstr "" + +msgid "" +"Repository head\n" +" See 'Head, repository'." +msgstr "" + +msgid "" +"Revision\n" +" A state of the repository at some point in time. Earlier revisions\n" +" can be updated to by using :hg:`update`. See also 'Revision\n" +" number'; See also 'Changeset'." +msgstr "" + +msgid "" +"Revision number\n" +" This integer uniquely identifies a changeset in a specific\n" +" repository. It represents the order in which changesets were added\n" +" to a repository, starting with revision number 0. Note that the\n" +" revision number may be different in each clone of a repository. To\n" +" identify changesets uniquely between different clones, see\n" +" 'Changeset id'." +msgstr "" + +msgid "" +"Revlog\n" +" History storage mechanism used by Mercurial. It is a form of delta\n" +" encoding, with occasional full revision of data followed by delta\n" +" of each successive revision. It includes data and an index\n" +" pointing to the data." +msgstr "" + +msgid "" +"Rewriting history\n" +" See 'History, rewriting'." +msgstr "" + +msgid "" +"Root\n" +" A changeset that has only the null changeset as its parent. Most\n" +" repositories have only a single root changeset." +msgstr "" + +msgid "" +"Tip\n" +" The changeset with the highest revision number. It is the changeset\n" +" most recently added in a repository." +msgstr "" + +msgid "" +"Tip, branch\n" +" The head of a given branch with the highest revision number. When\n" +" a branch name is used as a revision identifier, it refers to the\n" +" branch tip. See also 'Branch, head'. Note that because revision\n" +" numbers may be different in different repository clones, the\n" +" branch tip may be different in different cloned repositories." +msgstr "" + +msgid "" +"Update\n" +" (Noun) Another synonym of changeset." +msgstr "" + +msgid " Example: \"I've pushed an update\"." +msgstr "" + +msgid "" +" (Verb) This term is usually used to describe updating the state of\n" +" the working directory to that of a specific changeset. See\n" +" :hg:`help update`." +msgstr "" + +msgid " Example: \"You should update\"." +msgstr "" + +msgid "" +"Working directory\n" +" See 'Directory, working'." +msgstr "" + +msgid "" +"Working directory parent\n" +" See 'Parent, working directory'.\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" +"and global web configuration options." +msgstr "" + +msgid "" +"This file uses the same syntax as hgrc configuration files, but only\n" +"the following sections are recognized:" +msgstr "" + +msgid "" +" - web\n" +" - paths\n" +" - collections" +msgstr "" + +msgid "" +"The ``web`` section can specify all the settings described in the web\n" +"section of the hgrc documentation." +msgstr "" + +msgid "" +"The ``paths`` section provides mappings of physical repository\n" +"paths to virtual ones. For instance::" +msgstr "" + +msgid "" +" [paths]\n" +" projects/a = /foo/bar\n" +" projects/b = /baz/quux\n" +" web/root = /real/root/*\n" +" / = /real/root2/*\n" +" virtual/root2 = /real/root2/**" +msgstr "" + +msgid "" +"- The first two entries make two repositories in different directories\n" +" appear under the same directory in the web interface\n" +"- The third entry maps every Mercurial repository found in '/real/root'\n" +" into 'web/root'. This format is preferred over the [collections] one,\n" +" since using absolute paths as configuration keys is not supported on " +"every\n" +" platform (especially on Windows).\n" +"- The fourth entry is a special case mapping all repositories in\n" +" '/real/root2' in the root of the virtual directory.\n" +"- The fifth entry recursively finds all repositories under the real\n" +" root, and maps their relative paths under the virtual root." +msgstr "" + +msgid "" +"The ``collections`` section provides mappings of trees of physical\n" +"repositories paths to virtual ones, though the paths syntax is generally\n" +"preferred. For instance::" +msgstr "" + +msgid "" +" [collections]\n" +" /foo = /foo" +msgstr "" + +msgid "" +"Here, the left side will be stripped off all repositories found in the\n" +"right side. Thus ``/foo/bar`` and ``foo/quux/baz`` will be listed as\n" +"``bar`` and ``quux/baz`` respectively.\n" +msgstr "" + +msgid "" "When Mercurial accepts more than one revision, they may be specified\n" "individually, or provided as a topologically continuous range,\n" "separated by the \":\" character." @@ -9866,8 +10769,10 @@ msgid "Regexp examples::" msgstr "Regexp-exempel::" -msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" -msgstr " re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n" +msgid "" +" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" +msgstr "" +" re:.*\\.c$ alla namn som slutar med \".c\", var som helst i arkivet\n" msgid "Mercurial supports several ways to specify individual revisions." msgstr "Mercurial stöder flera sött att ange individuella revisioner." @@ -9935,6 +10840,266 @@ "sammanfogning pågår, så är \".\" den första förälderns revision.\n" msgid "" +"Mercurial supports a functional language for selecting a set of\n" +"revisions." +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" +"operators. Parenthesis can be used for grouping." +msgstr "" + +msgid "" +"Identifiers such as branch names must be quoted with single or double\n" +"quotes if they contain characters outside of\n" +"``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" +"predicates. Special characters can be used in quoted identifiers by\n" +"escaping them, e.g., ``\\n`` is interpreted as a newline." +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" +" ancestors of y, including x and y themselves. If the first endpoint\n" +" is left out, this is equivalent to ``ancestors(y)``, if the second\n" +" is left out it is equivalent to ``descendents(x)``." +msgstr "" + +msgid " An alternative syntax is ``x..y``." +msgstr "" + +msgid "" +"``x:y``\n" +" All changesets with revision numbers between x and y, both\n" +" inclusive. Either endpoint can be left out, they default to 0 and\n" +" tip." +msgstr "" + +msgid "" +"``x and y``\n" +" The intersection of changesets in x and y. Short form is ``x & y``." +msgstr "" + +msgid "" +"``x or y``\n" +" The union of changesets in x and y. There are two alternative short\n" +" forms: ``x | y`` and ``x + y``." +msgstr "" + +msgid "" +"``x - y``\n" +" Changesets in x but not in y." +msgstr "" + +msgid "The following predicates are supported:" +msgstr "" + +msgid "" +"``adds(pattern)``\n" +" Changesets that add a file matching pattern." +msgstr "" + +msgid "" +"``all()``\n" +" All changesets, the same as ``0:tip``." +msgstr "" + +msgid "" +"``ancestor(single, single)``\n" +" Greatest common ancestor of the two changesets." +msgstr "" + +msgid "" +"``ancestors(set)``\n" +" Changesets that are ancestors of a changeset in set." +msgstr "" + +msgid "" +"``author(string)``\n" +" Alias for ``user(string)``." +msgstr "" + +msgid "" +"``branch(set)``\n" +" The branch names are found for changesets in set, and the result is\n" +" all changesets belonging to one those branches." +msgstr "" + +msgid "" +"``children(set)``\n" +" Child changesets of changesets in set." +msgstr "" + +msgid "" +"``closed()``\n" +" Changeset is closed." +msgstr "" + +msgid "" +"``contains(pattern)``\n" +" Revision contains pattern." +msgstr "" + +msgid "" +"``date(interval)``\n" +" Changesets within the interval, see :hg:`help dates`." +msgstr "" + +msgid "" +"``descendants(set)``\n" +" Changesets which are decendants of changesets in set." +msgstr "" + +msgid "" +"``file(pattern)``\n" +" Changesets which manually affected files matching pattern." +msgstr "" + +msgid "" +"``follow()``\n" +" An alias for ``::.`` (ancestors of the working copy's first parent)." +msgstr "" + +msgid "" +"``grep(regex)``\n" +" Like ``keyword(string)`` but accepts a regex." +msgstr "" + +msgid "" +"``head()``\n" +" Changeset is a head." +msgstr "" + +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." +msgstr "" + +msgid "" +"``limit(set, n)``\n" +" First n members of set." +msgstr "" + +msgid "" +"``max(set)``\n" +" Changeset with highest revision number in set." +msgstr "" + +msgid "" +"``merge()``\n" +" Changeset is a merge changeset." +msgstr "" + +msgid "" +"``modifies(pattern)``\n" +" Changesets which modify files matching pattern." +msgstr "" + +msgid "" +"``outgoing([path])``\n" +" Changesets missing in path." +msgstr "" + +msgid "" +"``p1(set)``\n" +" First parent of changesets in set." +msgstr "" + +msgid "" +"``p2(set)``\n" +" Second parent of changesets in set." +msgstr "" + +msgid "" +"``parents(set)``\n" +" The set of all parents for all changesets in set." +msgstr "" + +msgid "" +"``removes(pattern)``\n" +" Changesets which remove files matching pattern." +msgstr "" + +msgid "" +"``reverse(set)``\n" +" Reverse order of set." +msgstr "" + +msgid "" +"``roots(set)``\n" +" Changesets with no parent changeset in set." +msgstr "" + +msgid "" +"``sort(set[, [-]key...])``\n" +" Sort set by keys. The default sort order is ascending, specify a key\n" +" as ``-key`` to sort in descending order." +msgstr "" + +msgid " The keys can be:" +msgstr "" + +msgid "" +" - ``rev`` for the revision number,\n" +" - ``branch`` for the branch name,\n" +" - ``desc`` for the commit message (description),\n" +" - ``user`` for user name (``author`` can be used as an alias),\n" +" - ``date`` for the commit date" +msgstr "" + +msgid "" +"``tagged()``\n" +" Changeset is tagged." +msgstr "" + +msgid "" +"``user(string)``\n" +" User name is string." +msgstr "" + +msgid "Command line equivalents for :hg:`log`::" +msgstr "" + +msgid "" +" -f -> ::.\n" +" -d x -> date(x)\n" +" -k x -> keyword(x)\n" +" -m -> merge()\n" +" -u x -> user(x)\n" +" -b x -> branch(x)\n" +" -P x -> !::x\n" +" -l x -> limit(expr, x)" +msgstr "" + +msgid "Some sample queries::" +msgstr "" + +msgid "" +" hg log -r 'branch(default)'\n" +" hg log -r 'branch(default) and 1.5:: and not merge()'\n" +" hg log -r '1.3::1.5 and keyword(bug) and file(\"hgext/*\")'\n" +" hg log -r 'sort(date(\"May 2008\"), user)'\n" +" hg log -r '(keyword(bug) or keyword(issue)) and not ancestors(tagged())'\n" +msgstr "" + +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" @@ -9947,8 +11112,9 @@ msgstr "" msgid "" -"Three styles are packaged with Mercurial: default (the style used\n" -"when no explicit preference is passed), compact and changelog.\n" +"Four styles are packaged with Mercurial: default (the style used\n" +"when no explicit preference is passed), compact, changelog,\n" +"and xml.\n" "Usage::" msgstr "" @@ -10183,14 +11349,14 @@ msgid "" "Paths in the local filesystem can either point to Mercurial\n" -"repositories or to bundle files (as created by 'hg bundle' or 'hg\n" -"incoming --bundle')." +"repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" +"incoming --bundle`)." msgstr "" msgid "" "An optional identifier after # indicates a particular branch, tag, or\n" -"changeset to use from the remote repository. See also 'hg help\n" -"revisions'." +"changeset to use from the remote repository. See also :hg:`help\n" +"revisions`." msgstr "" msgid "" @@ -10243,7 +11409,7 @@ msgid "" "You can then use the alias for any command that uses a URL (for\n" -"example 'hg pull alias1' will be treated as 'hg pull URL1')." +"example :hg:`pull alias1` will be treated as :hg:`pull URL1`)." msgstr "" msgid "" @@ -10265,9 +11431,16 @@ " prefer it over 'default' if both are defined.\n" msgstr "" +msgid "remote branch lookup not supported" +msgstr "" + msgid "dirstate branch not accessible" msgstr "dirstate-grenen inte åtkomlig" +#, python-format +msgid "unknown branch '%s'" +msgstr "okänd gren '%s'" + msgid "can only share local repositories" msgstr "kan bara dela lokala arkiv" @@ -10289,8 +11462,12 @@ msgid "destination '%s' is not empty" msgstr "destinationen '%s är inte tom" -msgid "src repository does not support revision lookup and so doesn't support clone by revision" -msgstr "källarkivet stödjer inte revisionsuppslag, och stödjer därför inte kloning av angivna revisioner" +msgid "" +"src repository does not support revision lookup and so doesn't support clone " +"by revision" +msgstr "" +"källarkivet stödjer inte revisionsuppslag, och stödjer därför inte kloning " +"av angivna revisioner" msgid "clone from remote to remote not supported" msgstr "kloning från fjärr till fjärr stödjs inte" @@ -10300,13 +11477,18 @@ msgstr "uppdaterar till grenen %s\n" #, python-format -msgid "%d files updated, %d files merged, %d files removed, %d files unresolved\n" -msgstr "%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer olösta\n" +msgid "" +"%d files updated, %d files merged, %d files removed, %d files unresolved\n" +msgstr "" +"%d filer uppdaterade, %d filer sammanfogade, %d filer raderade, %d filer " +"olösta\n" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "" -msgid "use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon\n" +msgid "" +"use 'hg resolve' to retry unresolved file merges or 'hg update -C' to " +"abandon\n" msgstr "" msgid "(branch merge, don't forget to commit)\n" @@ -10473,6 +11655,10 @@ msgid "%r cannot be used in a tag name" msgstr "" +#, python-format +msgid "warning: tag %s conflicts with existing branch name\n" +msgstr "" + msgid "working copy of .hgtags is changed (please commit .hgtags manually)" msgstr "" @@ -10550,89 +11736,15 @@ msgid "trouble committing %s!\n" msgstr "" -#, python-format -msgid "%s does not exist!\n" -msgstr "" - -#, 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: 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" -msgstr "" - -#, python-format -msgid "%s already tracked!\n" -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 "" - -#, python-format -msgid "%s not removed!\n" -msgstr "" - -#, python-format -msgid "copy failed: %s is not a file or a symbolic link\n" -msgstr "" - -msgid "searching for changes\n" -msgstr "söker efter ändringar\n" - -msgid "queries" -msgstr "frågor" - -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" - msgid "requesting all changes\n" 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 "avbryter: push skapar nya fjärrhuvuden!\n" - -msgid "(you should pull and merge or use push -f to force)\n" -msgstr "(du kan dra och sammanfoga eller använda push -f för att tvinga)\n" - -msgid "(did you forget to merge? use push -f to force)\n" -msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" - -#, python-format -msgid "abort: push creates new remote branches: %s!\n" -msgstr "avbryter: push skapar nya fjärrgrenar: %s!\n" - -msgid "(use 'hg push -f' to force)\n" -msgstr "använd 'hg push -f' för att tvinga)\n" - -msgid "note: unsynced remote changes!\n" -msgstr "notera: osynkade fjärrä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 "%d changesets found\n" @@ -10675,9 +11787,6 @@ msgid "received file revlog group is empty" msgstr "mottagen revlog-grupp för filer är tom" -msgid "files" -msgstr "filer" - #, python-format msgid "missing file data for %s:%s - run hg verify" msgstr "fildata för %s:%s saknas - kör hg verify" @@ -10762,7 +11871,9 @@ msgstr "" #, python-format -msgid "untracked file in working directory differs from file in requested revision: '%s'" +msgid "" +"untracked file in working directory differs from file in requested revision: " +"'%s'" msgstr "" #, python-format @@ -10828,7 +11939,7 @@ msgid "branch %s not found" msgstr "" -msgid "can't merge with ancestor" +msgid "merging with a working directory ancestor has no effect" msgstr "" msgid "nothing to merge (use 'hg update' or check 'hg heads')" @@ -10837,7 +11948,9 @@ msgid "outstanding uncommitted changes (use 'hg status' to list changes)" msgstr "" -msgid "crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)" +msgid "" +"crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard " +"changes)" msgstr "" msgid "crosses branches (use 'hg merge' or use 'hg update -c')" @@ -10899,7 +12012,7 @@ msgstr "" #, python-format -msgid "unable to strip away %d dirs from %s" +msgid "unable to strip away %d of %d dirs from %s" msgstr "" msgid "undefined source and destination files" @@ -10943,7 +12056,7 @@ msgstr "" #, python-format -msgid "saving bundle to %s\n" +msgid "saved backup bundle to %s\n" msgstr "" msgid "adding branch\n" @@ -10999,6 +12112,114 @@ msgid "consistency error adding group" msgstr "" +msgid "unterminated string" +msgstr "" + +msgid "syntax error" +msgstr "" + +msgid "missing argument" +msgstr "" + +msgid "can't negate that" +msgstr "" + +#, python-format +msgid "can't use %s here" +msgstr "" + +msgid "can't use a list in this context" +msgstr "" + +#, python-format +msgid "not a function: %s" +msgstr "" + +msgid "limit wants two arguments" +msgstr "" + +msgid "limit wants a number" +msgstr "" + +msgid "limit expects a number" +msgstr "" + +msgid "ancestor wants two arguments" +msgstr "" + +msgid "ancestor arguments must be single revisions" +msgstr "" + +msgid "follow takes no arguments" +msgstr "" + +msgid "date wants a string" +msgstr "" + +msgid "keyword wants a string" +msgstr "" + +msgid "grep wants a string" +msgstr "" + +msgid "author wants a string" +msgstr "" + +msgid "file wants a pattern" +msgstr "" + +msgid "contains wants a pattern" +msgstr "" + +msgid "modifies wants a pattern" +msgstr "" + +msgid "adds wants a pattern" +msgstr "" + +msgid "removes wants a pattern" +msgstr "" + +msgid "merge takes no arguments" +msgstr "" + +msgid "closed takes no arguments" +msgstr "" + +msgid "head takes no arguments" +msgstr "" + +msgid "sort wants one or two arguments" +msgstr "" + +msgid "sort spec must be a string" +msgstr "" + +#, python-format +msgid "unknown sort key %r" +msgstr "" + +msgid "all takes no arguments" +msgstr "" + +msgid "outgoing wants a repository path" +msgstr "" + +msgid "tagged takes no arguments" +msgstr "" + +msgid "not a symbol" +msgstr "inte en symbol" + +msgid "empty query" +msgstr "" + +msgid "searching for exact renames" +msgstr "" + +msgid "searching for similar files" +msgstr "söker efter liknande filer" + #, python-format msgid "%s looks like a binary file." msgstr "" @@ -11081,8 +12302,8 @@ msgstr "drar subarkivet %s från %s\n" #, python-format -msgid "pushing subrepo %s\n" -msgstr "" +msgid "pushing subrepo %s to %s\n" +msgstr "trycker subarkivet %s från %s\n" msgid "cannot commit svn externals" msgstr ""