Show More
@@ -3567,6 +3567,15 b' msgstr ""' | |||||
3567 | "\n" |
|
3567 | "\n" | |
3568 | " Este comando é obsoleto; use hg --mq commit em seu lugar." |
|
3568 | " Este comando é obsoleto; use hg --mq commit em seu lugar." | |
3569 |
|
3569 | |||
|
3570 | msgid "" | |||
|
3571 | "commit changes in the queue repository (DEPRECATED)\n" | |||
|
3572 | "\n" | |||
|
3573 | " This command is deprecated; use hg commit --mq instead." | |||
|
3574 | msgstr "" | |||
|
3575 | "consolida mudanças no repositório da fila de patches (OBSOLETO)\n" | |||
|
3576 | "\n" | |||
|
3577 | " Este comando é obsoleto; use hg commit --mq em seu lugar." | |||
|
3578 | ||||
3570 | msgid "print the entire series file" |
|
3579 | msgid "print the entire series file" | |
3571 | msgstr "imprime todo o arquivo series" |
|
3580 | msgstr "imprime todo o arquivo series" | |
3572 |
|
3581 | |||
@@ -10937,6 +10946,315 b' msgstr ""' | |||||
10937 | " endereço de e-mail.\n" |
|
10946 | " endereço de e-mail.\n" | |
10938 |
|
10947 | |||
10939 | msgid "" |
|
10948 | msgid "" | |
|
10949 | "Mercurial allows you to customize output of commands through\n" | |||
|
10950 | "templates. You can either pass in a template from the command\n" | |||
|
10951 | "line, via the --template option, or select an existing\n" | |||
|
10952 | "template-style (--style).\n" | |||
|
10953 | "\n" | |||
|
10954 | "You can customize output for any \"log-like\" command: log,\n" | |||
|
10955 | "outgoing, incoming, tip, parents, heads and glog.\n" | |||
|
10956 | "\n" | |||
|
10957 | "Three styles are packaged with Mercurial: default (the style used\n" | |||
|
10958 | "when no explicit preference is passed), compact and changelog.\n" | |||
|
10959 | "Usage::\n" | |||
|
10960 | "\n" | |||
|
10961 | " $ hg log -r1 --style changelog\n" | |||
|
10962 | "\n" | |||
|
10963 | "A template is a piece of text, with markup to invoke variable\n" | |||
|
10964 | "expansion::\n" | |||
|
10965 | "\n" | |||
|
10966 | " $ hg log -r1 --template \"{node}\\n\"\n" | |||
|
10967 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" | |||
|
10968 | "\n" | |||
|
10969 | "Strings in curly braces are called keywords. The availability of\n" | |||
|
10970 | "keywords depends on the exact context of the templater. These\n" | |||
|
10971 | "keywords are usually available for templating a log-like command:\n" | |||
|
10972 | "\n" | |||
|
10973 | ":author: String. The unmodified author of the changeset.\n" | |||
|
10974 | "\n" | |||
|
10975 | ":branches: String. The name of the branch on which the changeset was\n" | |||
|
10976 | " committed. Will be empty if the branch name was default.\n" | |||
|
10977 | "\n" | |||
|
10978 | ":date: Date information. The date when the changeset was committed.\n" | |||
|
10979 | "\n" | |||
|
10980 | ":desc: String. The text of the changeset description.\n" | |||
|
10981 | "\n" | |||
|
10982 | ":diffstat: String. Statistics of changes with the following format:\n" | |||
|
10983 | " \"modified files: +added/-removed lines\"\n" | |||
|
10984 | "\n" | |||
|
10985 | ":files: List of strings. All files modified, added, or removed by this\n" | |||
|
10986 | " changeset.\n" | |||
|
10987 | "\n" | |||
|
10988 | ":file_adds: List of strings. Files added by this changeset.\n" | |||
|
10989 | "\n" | |||
|
10990 | ":file_copies: List of strings. Files copied in this changeset with\n" | |||
|
10991 | " their sources.\n" | |||
|
10992 | "\n" | |||
|
10993 | ":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n" | |||
|
10994 | " only if the --copied switch is set.\n" | |||
|
10995 | "\n" | |||
|
10996 | ":file_mods: List of strings. Files modified by this changeset.\n" | |||
|
10997 | "\n" | |||
|
10998 | ":file_dels: List of strings. Files removed by this changeset.\n" | |||
|
10999 | "\n" | |||
|
11000 | ":node: String. The changeset identification hash, as a 40-character\n" | |||
|
11001 | " hexadecimal string.\n" | |||
|
11002 | "\n" | |||
|
11003 | ":parents: List of strings. The parents of the changeset.\n" | |||
|
11004 | "\n" | |||
|
11005 | ":rev: Integer. The repository-local changeset revision number.\n" | |||
|
11006 | "\n" | |||
|
11007 | ":tags: List of strings. Any tags associated with the changeset.\n" | |||
|
11008 | "\n" | |||
|
11009 | ":latesttag: String. Most recent global tag in the ancestors of this\n" | |||
|
11010 | " changeset.\n" | |||
|
11011 | "\n" | |||
|
11012 | ":latesttagdistance: Integer. Longest path to the latest tag.\n" | |||
|
11013 | "\n" | |||
|
11014 | "The \"date\" keyword does not produce human-readable output. If you\n" | |||
|
11015 | "want to use a date in your output, you can use a filter to process\n" | |||
|
11016 | "it. Filters are functions which return a string based on the input\n" | |||
|
11017 | "variable. Be sure to use the stringify filter first when you're\n" | |||
|
11018 | "applying a string-input filter to a list-like input variable.\n" | |||
|
11019 | "You can also use a chain of filters to get the desired output::\n" | |||
|
11020 | "\n" | |||
|
11021 | " $ hg tip --template \"{date|isodate}\\n\"\n" | |||
|
11022 | " 2008-08-21 18:22 +0000\n" | |||
|
11023 | "\n" | |||
|
11024 | "List of filters:\n" | |||
|
11025 | "\n" | |||
|
11026 | ":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" | |||
|
11027 | " every line except the last.\n" | |||
|
11028 | "\n" | |||
|
11029 | ":age: Date. Returns a human-readable date/time difference between the\n" | |||
|
11030 | " given date/time and the current date/time.\n" | |||
|
11031 | "\n" | |||
|
11032 | ":basename: Any text. Treats the text as a path, and returns the last\n" | |||
|
11033 | " component of the path after splitting by the path separator\n" | |||
|
11034 | " (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n" | |||
|
11035 | " \"baz\" and \"foo/bar//\" becomes \"bar\".\n" | |||
|
11036 | "\n" | |||
|
11037 | ":stripdir: Treat the text as path and strip a directory level, if\n" | |||
|
11038 | " possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\".\n" | |||
|
11039 | "\n" | |||
|
11040 | ":date: Date. Returns a date in a Unix date format, including the\n" | |||
|
11041 | " timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n" | |||
|
11042 | "\n" | |||
|
11043 | ":domain: Any text. Finds the first string that looks like an email\n" | |||
|
11044 | " address, and extracts just the domain component. Example: ``User\n" | |||
|
11045 | " <user@example.com>`` becomes ``example.com``.\n" | |||
|
11046 | "\n" | |||
|
11047 | ":email: Any text. Extracts the first string that looks like an email\n" | |||
|
11048 | " address. Example: ``User <user@example.com>`` becomes\n" | |||
|
11049 | " ``user@example.com``.\n" | |||
|
11050 | "\n" | |||
|
11051 | ":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n" | |||
|
11052 | " and \">\" with XML entities.\n" | |||
|
11053 | "\n" | |||
|
11054 | ":fill68: Any text. Wraps the text to fit in 68 columns.\n" | |||
|
11055 | "\n" | |||
|
11056 | ":fill76: Any text. Wraps the text to fit in 76 columns.\n" | |||
|
11057 | "\n" | |||
|
11058 | ":firstline: Any text. Returns the first line of text.\n" | |||
|
11059 | "\n" | |||
|
11060 | ":nonempty: Any text. Returns '(none)' if the string is empty.\n" | |||
|
11061 | "\n" | |||
|
11062 | ":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n" | |||
|
11063 | " 25200\" (Unix timestamp, timezone offset).\n" | |||
|
11064 | "\n" | |||
|
11065 | ":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n" | |||
|
11066 | " +0200\".\n" | |||
|
11067 | "\n" | |||
|
11068 | ":isodatesec: Date. Returns the date in ISO 8601 format, including\n" | |||
|
11069 | " seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n" | |||
|
11070 | " filter.\n" | |||
|
11071 | "\n" | |||
|
11072 | ":localdate: Date. Converts a date to local date.\n" | |||
|
11073 | "\n" | |||
|
11074 | ":obfuscate: Any text. Returns the input text rendered as a sequence of\n" | |||
|
11075 | " XML entities.\n" | |||
|
11076 | "\n" | |||
|
11077 | ":person: Any text. Returns the text before an email address.\n" | |||
|
11078 | "\n" | |||
|
11079 | ":rfc822date: Date. Returns a date using the same format used in email\n" | |||
|
11080 | " headers: \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" | |||
|
11081 | "\n" | |||
|
11082 | ":rfc3339date: Date. Returns a date using the Internet date format\n" | |||
|
11083 | " specified in RFC 3339: \"2009-08-18T13:00:13+02:00\".\n" | |||
|
11084 | "\n" | |||
|
11085 | ":short: Changeset hash. Returns the short form of a changeset hash,\n" | |||
|
11086 | " i.e. a 12-byte hexadecimal string.\n" | |||
|
11087 | "\n" | |||
|
11088 | ":shortdate: Date. Returns a date like \"2006-09-18\".\n" | |||
|
11089 | "\n" | |||
|
11090 | ":strip: Any text. Strips all leading and trailing whitespace.\n" | |||
|
11091 | "\n" | |||
|
11092 | ":tabindent: Any text. Returns the text, with every line except the\n" | |||
|
11093 | " first starting with a tab character.\n" | |||
|
11094 | "\n" | |||
|
11095 | ":urlescape: Any text. Escapes all \"special\" characters. For example,\n" | |||
|
11096 | " \"foo bar\" becomes \"foo%20bar\".\n" | |||
|
11097 | "\n" | |||
|
11098 | ":user: Any text. Returns the user portion of an email address.\n" | |||
|
11099 | msgstr "" | |||
|
11100 | "O Mercurial permite que você personalize a saída de comandos\n" | |||
|
11101 | "usando modelos. Você pode tanto passar um modelo pela linha de\n" | |||
|
11102 | "comando, usando a opção --template, como selecionar um\n" | |||
|
11103 | "modelo-estilo existente (--style).\n" | |||
|
11104 | "\n" | |||
|
11105 | "Você pode personalizar a saída de qualquer comando semelhante\n" | |||
|
11106 | "ao log: log, outgoing, incoming, tip, parents, heads e glog.\n" | |||
|
11107 | "\n" | |||
|
11108 | "Três estilos são incluídos na distribuição do Mercurial: default\n" | |||
|
11109 | "(o estilo usado quando nenhuma preferência for passada), compact\n" | |||
|
11110 | "e changelog. Uso::\n" | |||
|
11111 | "\n" | |||
|
11112 | " $ hg log -r1 --style changelog\n" | |||
|
11113 | "\n" | |||
|
11114 | "Um modelo é um texto com marcações que invocam expansão de\n" | |||
|
11115 | "variáveis::\n" | |||
|
11116 | "\n" | |||
|
11117 | " $ hg log -r1 --template \"{node}\\n\"\n" | |||
|
11118 | " b56ce7b07c52de7d5fd79fb89701ea538af65746\n" | |||
|
11119 | "\n" | |||
|
11120 | "Strings entre chaves são chamadas palavras chave. A\n" | |||
|
11121 | "disponibilidade de palavras chave depende do contexto exato do\n" | |||
|
11122 | "modelador. Estas palavras chave estão comumente disponíveis para\n" | |||
|
11123 | "modelar comandos semelhantes ao log:\n" | |||
|
11124 | "\n" | |||
|
11125 | ":author: String. O autor da revisão, sem modificações.\n" | |||
|
11126 | "\n" | |||
|
11127 | ":branches: String. O nome do ramo no qual a revisão foi\n" | |||
|
11128 | " consolidada. Será vazio se o nome do ramo for default.\n" | |||
|
11129 | "\n" | |||
|
11130 | ":date: Informação de data. A data de consolidação da revisão.\n" | |||
|
11131 | "\n" | |||
|
11132 | ":desc: String. O texto da descrição da revisão.\n" | |||
|
11133 | "\n" | |||
|
11134 | ":diffstat: String. Estatísticas de mudanças no seguinte\n" | |||
|
11135 | " formato: \"modified files: +added/-removed lines\"\n" | |||
|
11136 | "\n" | |||
|
11137 | ":files: Lista de strings. Todos os arquivos modificados,\n" | |||
|
11138 | " adicionados ou removidos por esta revisão.\n" | |||
|
11139 | "\n" | |||
|
11140 | ":file_adds: Lista de strings. Arquivos adicionados por esta revisão.\n" | |||
|
11141 | "\n" | |||
|
11142 | ":file_mods: Lista de strings. Arquivos modificados por esta revisão.\n" | |||
|
11143 | "\n" | |||
|
11144 | ":file_dels: Lista de strings. Arquivos removidos por esta revisão.\n" | |||
|
11145 | "\n" | |||
|
11146 | ":node: String. O hash de identificação da revisão, como uma string\n" | |||
|
11147 | " hexadecimal de 40 caracteres.\n" | |||
|
11148 | "\n" | |||
|
11149 | ":parents: Lista de strings. Os pais da revisão.\n" | |||
|
11150 | "\n" | |||
|
11151 | ":rev: Inteiro. O número de ordem da revisão no repositório local.\n" | |||
|
11152 | "\n" | |||
|
11153 | ":tags: Lista de strings. Quaisquer etiquetas associadas à revisão.\n" | |||
|
11154 | "\n" | |||
|
11155 | ":latesttag: String. A etiqueta global mais recente nos ancestrais desta\n" | |||
|
11156 | " revisão.\n" | |||
|
11157 | "\n" | |||
|
11158 | ":latesttagdistance: Inteiro. O caminho mais longo para a latesttag.\n" | |||
|
11159 | "\n" | |||
|
11160 | "A palavra chave \"date\" não produz saída legível para humanos.\n" | |||
|
11161 | "Se você quiser usar uma data em sua saída, você pode usar um\n" | |||
|
11162 | "filtro para processá-la. Filtros são funções que devolvem uma\n" | |||
|
11163 | "string baseada na variável de entrada. Certifique-se de usar\n" | |||
|
11164 | "primeiro o filtro stringify quando você estiver aplicando um\n" | |||
|
11165 | "filtro de entrada de strings para uma variável de entrada que\n" | |||
|
11166 | "contenha uma lista. Você também pode encadear\n" | |||
|
11167 | "filtros para obter a saída desejada::\n" | |||
|
11168 | "\n" | |||
|
11169 | " $ hg tip --template \"{date|isodate}\\n\"\n" | |||
|
11170 | " 2008-08-21 18:22 +0000\n" | |||
|
11171 | "\n" | |||
|
11172 | "Lista de filtros:\n" | |||
|
11173 | "\n" | |||
|
11174 | ":addbreaks: Qualquer texto. Adiciona uma tag XHTML \"<br />\"\n" | |||
|
11175 | " antes do fim de cada linha, exceto a última.\n" | |||
|
11176 | "\n" | |||
|
11177 | ":age: Data. Devolve uma diferença de data/tempo legível entre\n" | |||
|
11178 | " a data/hora dada e a data/hora atual.\n" | |||
|
11179 | "\n" | |||
|
11180 | ":basename: Qualquer texto. Trata o texto como um caminho, e\n" | |||
|
11181 | " devolve o último componente do caminho após quebrá-lo\n" | |||
|
11182 | " usando o separador de caminhos (ignorando separadores à\n" | |||
|
11183 | " direita). Por exemple, \"foo/bar/baz\" se torna \"baz\"\n" | |||
|
11184 | " e \"foo/bar//\" se torna \"bar\".\n" | |||
|
11185 | "\n" | |||
|
11186 | ":date: Data. Devolve uma data em um formato de data Unix,\n" | |||
|
11187 | " incluindo a diferença de fuso horário:\n" | |||
|
11188 | " \"Mon Sep 04 15:13:13 2006 0700\".\n" | |||
|
11189 | "\n" | |||
|
11190 | ":stripdir: Trata o texto como um caminho e remove um nível\n" | |||
|
11191 | " de diretório, se possível. Por exemplo, \"foo\" e\n" | |||
|
11192 | " \"foo/bar\" se tornam \"foo\".\n" | |||
|
11193 | "\n" | |||
|
11194 | ":domain: Qualquer texto. Encontra a primeira string que se\n" | |||
|
11195 | " pareça com um endereço de e-mail, e extrai apenas a parte\n" | |||
|
11196 | " do domínio. Por exemplo:\n" | |||
|
11197 | " ``User <user@example.com>`` se torna ``example.com``.\n" | |||
|
11198 | "\n" | |||
|
11199 | ":email: Qualquer texto. Extrai a primeira string que se pareça\n" | |||
|
11200 | " com um endereço de e-mail. Por exemplo:\n" | |||
|
11201 | " ``User <user@example.com>`` se torna ``user@example.com``.\n" | |||
|
11202 | "\n" | |||
|
11203 | ":escape: Qualquer texto. Substitui os caracteres especiais\n" | |||
|
11204 | " XML/XHTML \"&\", \"<\" e \">\" por entidades XML.\n" | |||
|
11205 | "\n" | |||
|
11206 | ":fill68: Qualquer texto. Quebra o texto para caber em 68\n" | |||
|
11207 | " colunas.\n" | |||
|
11208 | "\n" | |||
|
11209 | ":fill76: Qualquer texto. Quebra o texto para caber em 76\n" | |||
|
11210 | " colunas.\n" | |||
|
11211 | "\n" | |||
|
11212 | ":firstline: Qualquer texto. Devolve a primeira linha do texto.\n" | |||
|
11213 | "\n" | |||
|
11214 | ":nonempty: Qualquer texto. Devolve (none) se o texto for vazio.\n" | |||
|
11215 | "\n" | |||
|
11216 | ":hgdate: Data. Devolve a data como um par de números:\n" | |||
|
11217 | " \"1157407993 25200\" (timestamp Unix, defasagem de fuso)\n" | |||
|
11218 | "\n" | |||
|
11219 | ":isodate: Data. Devolve a data em formato ISO 8601:\n" | |||
|
11220 | " \"2009-08-18 13:00 +0200\".\n" | |||
|
11221 | "\n" | |||
|
11222 | ":localdate: Data. Converte para data local.\n" | |||
|
11223 | "\n" | |||
|
11224 | ":obfuscate: Qualquer texto. Devolve o texto de entrada\n" | |||
|
11225 | " renderizado como uma seqüência de entidades XML.\n" | |||
|
11226 | "\n" | |||
|
11227 | ":person: Qualquer texto. Devolve o texto antes de um endereço\n" | |||
|
11228 | " de e-mail.\n" | |||
|
11229 | "\n" | |||
|
11230 | ":rfc822date: Data. Devolve uma data usando o mesmo formato utilizado\n" | |||
|
11231 | " em cabeçalhos de e-mail:\n" | |||
|
11232 | " \"Tue, 18 Aug 2009 13:00:13 +0200\".\n" | |||
|
11233 | "\n" | |||
|
11234 | ":rfc3339date: Data. Devolve uma data usando o formato de data da\n" | |||
|
11235 | " Internet especificado na RFC 3339:\n" | |||
|
11236 | " \"2009-08-18T13:00:13+02:00\".\n" | |||
|
11237 | "\n" | |||
|
11238 | ":short: Hash da revisão. Devolve a forma curta do hash de\n" | |||
|
11239 | " uma revisão, ou seja, uma string hexadecimal de 12 bytes.\n" | |||
|
11240 | "\n" | |||
|
11241 | ":shortdate: Data. Devolve uma data como \"2006-09-18\".\n" | |||
|
11242 | "\n" | |||
|
11243 | ":strip: Qualquer texto. Remove todos os espaços em branco no\n" | |||
|
11244 | " início e no final do texto.\n" | |||
|
11245 | "\n" | |||
|
11246 | ":tabindent: Qualquer texto. Devolve o texto todo, com a adição\n" | |||
|
11247 | " de um caractere de tabulação ao início de cada linha,\n" | |||
|
11248 | " exceto da primeira.\n" | |||
|
11249 | "\n" | |||
|
11250 | ":urlescape: Qualquer texto. Codifica todos os caracteres\n" | |||
|
11251 | " \"especiais\". Por exemplo, \"foo bar\" se torna\n" | |||
|
11252 | " \"foo%20bar\".\n" | |||
|
11253 | "\n" | |||
|
11254 | ":user: Qualquer texto. Devolve a parte do usuário de um\n" | |||
|
11255 | " endereço de e-mail.\n" | |||
|
11256 | ||||
|
11257 | msgid "" | |||
10940 | "Valid URLs are of the form::\n" |
|
11258 | "Valid URLs are of the form::\n" | |
10941 | "\n" |
|
11259 | "\n" | |
10942 | " local/filesystem/path[#revision]\n" |
|
11260 | " local/filesystem/path[#revision]\n" | |
@@ -11373,6 +11691,14 b' msgstr ""' | |||||
11373 | "(use 'hg revert %s' para reverter a adição do arquivo)\n" |
|
11691 | "(use 'hg revert %s' para reverter a adição do arquivo)\n" | |
11374 |
|
11692 | |||
11375 | #, python-format |
|
11693 | #, python-format | |
|
11694 | msgid "" | |||
|
11695 | "%s: up to %d MB of RAM may be required to manage this file\n" | |||
|
11696 | "(use 'hg revert %s' to cancel the pending addition)\n" | |||
|
11697 | msgstr "" | |||
|
11698 | "%s: até %d MB de RAM podem ser necessários para gerenciar este arquivo\n" | |||
|
11699 | "(use 'hg revert %s' se você quiser cancelar a adição pendente)\n" | |||
|
11700 | ||||
|
11701 | #, python-format | |||
11376 | msgid "%s not added: only files and symlinks supported currently\n" |
|
11702 | msgid "%s not added: only files and symlinks supported currently\n" | |
11377 | msgstr "%s não adicionado: apenas arquivos e links simbólicos suportados no momento\n" |
|
11703 | msgstr "%s não adicionado: apenas arquivos e links simbólicos suportados no momento\n" | |
11378 |
|
11704 |
@@ -13,8 +13,8 b' msgid ""' | |||||
13 | msgstr "" |
|
13 | msgstr "" | |
14 | "Project-Id-Version: Mercurial\n" |
|
14 | "Project-Id-Version: Mercurial\n" | |
15 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
15 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" | |
16 |
"POT-Creation-Date: 2010-03- |
|
16 | "POT-Creation-Date: 2010-03-22 19:23+0100\n" | |
17 |
"PO-Revision-Date: 2010-03- |
|
17 | "PO-Revision-Date: 2010-03-23 21:58+0100\n" | |
18 | "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" |
|
18 | "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" | |
19 | "Language-Team: Swedish\n" |
|
19 | "Language-Team: Swedish\n" | |
20 | "MIME-Version: 1.0\n" |
|
20 | "MIME-Version: 1.0\n" | |
@@ -530,6 +530,51 b' msgid ""' | |||||
530 | "\n" |
|
530 | "\n" | |
531 | " bookmarks.current = green\n" |
|
531 | " bookmarks.current = green\n" | |
532 | msgstr "" |
|
532 | msgstr "" | |
|
533 | "färglägg utmatning från vissa kommandon\n" | |||
|
534 | "\n" | |||
|
535 | "Denna utökning modifierar kommandona status och resolve för att färglägga\n" | |||
|
536 | "deras utmaning för att spegla filstatus, qseries-kommandon för att\n" | |||
|
537 | "färglägga patchstatus (applicerad, oapplicerad, saknad), och till\n" | |||
|
538 | "diff-relaterade kommandon för att framhäva additioner, borttagningar,\n" | |||
|
539 | "diffhuvuden, och eftersläpande blanktecken.\n" | |||
|
540 | "\n" | |||
|
541 | "Andra effekter förutom färg, såsom fet och understryken text, är också\n" | |||
|
542 | "tillgänglig. Effekter renderas med kontrollfunktionerna ECMA-48 SGR\n" | |||
|
543 | "(aka ANSI escape-koder). Denna modul tillhandahåller också funktionen\n" | |||
|
544 | "render_text, som kan användas för att lägga till effekter på valfri text.\n" | |||
|
545 | "\n" | |||
|
546 | "Standardeffekter kan ersättas från .hgrc-filen::\n" | |||
|
547 | "\n" | |||
|
548 | " [color]\n" | |||
|
549 | " status.modified = blue bold underline red_background\n" | |||
|
550 | " status.added = green bold\n" | |||
|
551 | " status.removed = red bold blue_background\n" | |||
|
552 | " status.deleted = cyan bold underline\n" | |||
|
553 | " status.unknown = magenta bold underline\n" | |||
|
554 | " status.ignored = black bold\n" | |||
|
555 | "\n" | |||
|
556 | " # 'none' stänger av alla effekter\n" | |||
|
557 | " status.clean = none\n" | |||
|
558 | " status.copied = none\n" | |||
|
559 | "\n" | |||
|
560 | " qseries.applied = blue bold underline\n" | |||
|
561 | " qseries.unapplied = black bold\n" | |||
|
562 | " qseries.missing = red bold\n" | |||
|
563 | "\n" | |||
|
564 | " diff.diffline = bold\n" | |||
|
565 | " diff.extended = cyan bold\n" | |||
|
566 | " diff.file_a = red bold\n" | |||
|
567 | " diff.file_b = green bold\n" | |||
|
568 | " diff.hunk = magenta\n" | |||
|
569 | " diff.deleted = red\n" | |||
|
570 | " diff.inserted = green\n" | |||
|
571 | " diff.changed = white\n" | |||
|
572 | " diff.trailingwhitespace = bold red_background\n" | |||
|
573 | "\n" | |||
|
574 | " resolve.unresolved = red bold\n" | |||
|
575 | " resolve.resolved = green bold\n" | |||
|
576 | "\n" | |||
|
577 | " bookmarks.current = green\n" | |||
533 |
|
578 | |||
534 | msgid "when to colorize (always, auto, or never)" |
|
579 | msgid "when to colorize (always, auto, or never)" | |
535 | msgstr "när färgläggning ska ske (always, auto eller never)" |
|
580 | msgstr "när färgläggning ska ske (always, auto eller never)" | |
@@ -1354,7 +1399,7 b' msgstr ""' | |||||
1354 |
|
1399 | |||
1355 | #, python-format |
|
1400 | #, python-format | |
1356 | msgid "pulling from %s\n" |
|
1401 | msgid "pulling from %s\n" | |
1357 | msgstr "" |
|
1402 | msgstr "drar från %s\n" | |
1358 |
|
1403 | |||
1359 | msgid "" |
|
1404 | msgid "" | |
1360 | "Other repository doesn't support revision lookup, so a rev cannot be " |
|
1405 | "Other repository doesn't support revision lookup, so a rev cannot be " | |
@@ -1485,10 +1530,15 b' msgid ""' | |||||
1485 | "commands. When this options is given, an ASCII representation of the\n" |
|
1530 | "commands. When this options is given, an ASCII representation of the\n" | |
1486 | "revision graph is also shown.\n" |
|
1531 | "revision graph is also shown.\n" | |
1487 | msgstr "" |
|
1532 | msgstr "" | |
|
1533 | "kommando för att se revisionsgrafer i ett skal\n" | |||
|
1534 | "\n" | |||
|
1535 | "Denna utökning lägger till flaggan --graph till kommandona incoming,\n" | |||
|
1536 | "outgoing och log. När flaggan anges, visas också en ASCII-version av\n" | |||
|
1537 | "revisionsgrafen.\n" | |||
1488 |
|
1538 | |||
1489 | #, python-format |
|
1539 | #, python-format | |
1490 | msgid "--graph option is incompatible with --%s" |
|
1540 | msgid "--graph option is incompatible with --%s" | |
1491 | msgstr "" |
|
1541 | msgstr "flaggan --graph är inkompatibel med --%s" | |
1492 |
|
1542 | |||
1493 | msgid "" |
|
1543 | msgid "" | |
1494 | "show revision history alongside an ASCII revision graph\n" |
|
1544 | "show revision history alongside an ASCII revision graph\n" | |
@@ -1500,6 +1550,13 b' msgid ""' | |||||
1500 | " directory.\n" |
|
1550 | " directory.\n" | |
1501 | " " |
|
1551 | " " | |
1502 | msgstr "" |
|
1552 | msgstr "" | |
|
1553 | "visa revisionshistorik vid sidan av en ASCII-revisionsgraf\n" | |||
|
1554 | "\n" | |||
|
1555 | " Visa en revisionshistorik bredvid en revisionsgraf ritad med\n" | |||
|
1556 | " ASCII-tecken.\n" | |||
|
1557 | "\n" | |||
|
1558 | " Noder visade som ett @-tecken är föräldrar till arbetskatalogen.\n" | |||
|
1559 | " " | |||
1503 |
|
1560 | |||
1504 | #, python-format |
|
1561 | #, python-format | |
1505 | msgid "comparing with %s\n" |
|
1562 | msgid "comparing with %s\n" | |
@@ -1521,7 +1578,7 b' msgid "show the specified revision or ra' | |||||
1521 | msgstr "visa den specifika revisionen eller serien" |
|
1578 | msgstr "visa den specifika revisionen eller serien" | |
1522 |
|
1579 | |||
1523 | msgid "hg glog [OPTION]... [FILE]" |
|
1580 | msgid "hg glog [OPTION]... [FILE]" | |
1524 | msgstr "" |
|
1581 | msgstr "hg glog [FLAGGA]... [FIL]" | |
1525 |
|
1582 | |||
1526 | msgid "" |
|
1583 | msgid "" | |
1527 | "hooks for integrating with the CIA.vc notification service\n" |
|
1584 | "hooks for integrating with the CIA.vc notification service\n" | |
@@ -2093,7 +2150,6 b' msgid ""' | |||||
2093 | "\n" |
|
2150 | "\n" | |
2094 | "Common tasks (use \"hg help command\" for more details)::\n" |
|
2151 | "Common tasks (use \"hg help command\" for more details)::\n" | |
2095 | "\n" |
|
2152 | "\n" | |
2096 | " prepare repository to work with patches qinit\n" |
|
|||
2097 | " create new patch qnew\n" |
|
2153 | " create new patch qnew\n" | |
2098 | " import existing patch qimport\n" |
|
2154 | " import existing patch qimport\n" | |
2099 | "\n" |
|
2155 | "\n" | |
@@ -2508,7 +2564,7 b' msgid ""' | |||||
2508 | " qcommit to commit changes to this queue repository.\n" |
|
2564 | " qcommit to commit changes to this queue repository.\n" | |
2509 | "\n" |
|
2565 | "\n" | |
2510 | " This command is deprecated. Without -c, it's implied by other relevant\n" |
|
2566 | " This command is deprecated. Without -c, it's implied by other relevant\n" | |
2511 |
" commands. With -c, use hg init - |
|
2567 | " commands. With -c, use hg init --mq instead." | |
2512 | msgstr "" |
|
2568 | msgstr "" | |
2513 |
|
2569 | |||
2514 | msgid "" |
|
2570 | msgid "" | |
@@ -2524,12 +2580,12 b' msgid ""' | |||||
2524 | " default. Use -p <url> to change.\n" |
|
2580 | " default. Use -p <url> to change.\n" | |
2525 | "\n" |
|
2581 | "\n" | |
2526 | " The patch directory must be a nested Mercurial repository, as\n" |
|
2582 | " The patch directory must be a nested Mercurial repository, as\n" | |
2527 |
" would be created by |
|
2583 | " would be created by init --mq.\n" | |
2528 | " " |
|
2584 | " " | |
2529 | msgstr "" |
|
2585 | msgstr "" | |
2530 |
|
2586 | |||
2531 |
msgid "versioned patch repository not found (see |
|
2587 | msgid "versioned patch repository not found (see init --mq)" | |
2532 | msgstr "" |
|
2588 | msgstr "versionshanterat patcharkiv hittades inte (se init --mq)" | |
2533 |
|
2589 | |||
2534 | msgid "cloning main repository\n" |
|
2590 | msgid "cloning main repository\n" | |
2535 | msgstr "" |
|
2591 | msgstr "" | |
@@ -2546,8 +2602,11 b' msgstr ""' | |||||
2546 | msgid "" |
|
2602 | msgid "" | |
2547 | "commit changes in the queue repository (DEPRECATED)\n" |
|
2603 | "commit changes in the queue repository (DEPRECATED)\n" | |
2548 | "\n" |
|
2604 | "\n" | |
2549 |
" This command is deprecated; use hg - |
|
2605 | " This command is deprecated; use hg --mq commit instead." | |
2550 | msgstr "" |
|
2606 | msgstr "" | |
|
2607 | "arkivera ändringar i köarkivet (FÖRÅLDRAD)\n" | |||
|
2608 | "\n" | |||
|
2609 | " Detta är ett föråldrat kommando; använd hg --mq commit istället." | |||
2551 |
|
2610 | |||
2552 | msgid "print the entire series file" |
|
2611 | msgid "print the entire series file" | |
2553 | msgstr "" |
|
2612 | msgstr "" | |
@@ -2870,6 +2929,12 b' msgstr ""' | |||||
2870 | msgid "cannot import over an applied patch" |
|
2929 | msgid "cannot import over an applied patch" | |
2871 | msgstr "" |
|
2930 | msgstr "" | |
2872 |
|
2931 | |||
|
2932 | msgid "only a local queue repository may be initialized" | |||
|
2933 | msgstr "bara ett lokalt köarkiv kan initialiseras" | |||
|
2934 | ||||
|
2935 | msgid "There is no Mercurial repository here (.hg not found)" | |||
|
2936 | msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" | |||
|
2937 | ||||
2873 | msgid "operate on patch repository" |
|
2938 | msgid "operate on patch repository" | |
2874 | msgstr "arbeta med patcharkiv" |
|
2939 | msgstr "arbeta med patcharkiv" | |
2875 |
|
2940 | |||
@@ -3518,6 +3583,7 b' msgid ""' | |||||
3518 | " width = <none> # if set, the maximum width of the progress information\n" |
|
3583 | " width = <none> # if set, the maximum width of the progress information\n" | |
3519 | " # (that is, min(width, term width) will be used)\n" |
|
3584 | " # (that is, min(width, term width) will be used)\n" | |
3520 | " clear-complete = True # clear the progress bar after it's done\n" |
|
3585 | " clear-complete = True # clear the progress bar after it's done\n" | |
|
3586 | " disable = False # if true, don't show a progress bar\n" | |||
3521 | "\n" |
|
3587 | "\n" | |
3522 | "Valid entries for the format field are topic, bar, number, unit, and\n" |
|
3588 | "Valid entries for the format field are topic, bar, number, unit, and\n" | |
3523 | "item. item defaults to the last 20 characters of the item, but this\n" |
|
3589 | "item. item defaults to the last 20 characters of the item, but this\n" | |
@@ -3601,8 +3667,39 b' msgid ""' | |||||
3601 | "move changeset (and descendants) to a different branch\n" |
|
3667 | "move changeset (and descendants) to a different branch\n" | |
3602 | "\n" |
|
3668 | "\n" | |
3603 | " Rebase uses repeated merging to graft changesets from one part of\n" |
|
3669 | " Rebase uses repeated merging to graft changesets from one part of\n" | |
3604 | " history onto another. This can be useful for linearizing local\n" |
|
3670 | " history (the source) onto another (the destination). This can be\n" | |
3605 |
" changes relative to a master |
|
3671 | " useful for linearizing local changes relative to a master\n" | |
|
3672 | " development tree.\n" | |||
|
3673 | "\n" | |||
|
3674 | " If you don't specify a destination changeset (``-d/--dest``),\n" | |||
|
3675 | " rebase uses the tipmost head of the current named branch as the\n" | |||
|
3676 | " destination. (The destination changeset is not modified by\n" | |||
|
3677 | " rebasing, but new changesets are added as its descendants.)\n" | |||
|
3678 | "\n" | |||
|
3679 | " You can specify which changesets to rebase in two ways: as a\n" | |||
|
3680 | " \"source\" changeset or as a \"base\" changeset. Both are shorthand\n" | |||
|
3681 | " for a topologically related set of changesets (the \"source\n" | |||
|
3682 | " branch\"). If you specify source (``-s/--source``), rebase will\n" | |||
|
3683 | " rebase that changeset and all of its descendants onto dest. If you\n" | |||
|
3684 | " specify base (``-b/--base``), rebase will select ancestors of base\n" | |||
|
3685 | " back to but not including the common ancestor with dest. Thus,\n" | |||
|
3686 | " ``-b`` is less precise but more convenient than ``-s``: you can\n" | |||
|
3687 | " specify any changeset in the source branch, and rebase will select\n" | |||
|
3688 | " the whole branch. If you specify neither ``-s`` nor ``-b``, rebase\n" | |||
|
3689 | " uses the parent of the working directory as the base.\n" | |||
|
3690 | "\n" | |||
|
3691 | " By default, rebase recreates the changesets in the source branch\n" | |||
|
3692 | " as descendants of dest and then destroys the originals. Use\n" | |||
|
3693 | " ``--keep`` to preserve the original source changesets. Some\n" | |||
|
3694 | " changesets in the source branch (e.g. merges from the destination\n" | |||
|
3695 | " branch) may be dropped if they no longer contribute any change.\n" | |||
|
3696 | "\n" | |||
|
3697 | " One result of the rules for selecting the destination changeset\n" | |||
|
3698 | " and source branch is that, unlike ``merge``, rebase will do\n" | |||
|
3699 | " nothing if you are at the latest (tipmost) head of a named branch\n" | |||
|
3700 | " with two heads. You need to explicitly specify source and/or\n" | |||
|
3701 | " destination (or ``update`` to the other head, if it's the head of\n" | |||
|
3702 | " the intended source branch).\n" | |||
3606 | "\n" |
|
3703 | "\n" | |
3607 | " If a rebase is interrupted to manually resolve a merge, it can be\n" |
|
3704 | " If a rebase is interrupted to manually resolve a merge, it can be\n" | |
3608 | " continued with --continue/-c or aborted with --abort/-a.\n" |
|
3705 | " continued with --continue/-c or aborted with --abort/-a.\n" | |
@@ -3684,13 +3781,15 b' msgstr ""' | |||||
3684 | msgid "rebase working directory to branch head" |
|
3781 | msgid "rebase working directory to branch head" | |
3685 | msgstr "" |
|
3782 | msgstr "" | |
3686 |
|
3783 | |||
3687 |
msgid "rebase from |
|
3784 | msgid "rebase from the specified changeset" | |
3688 | msgstr "" |
|
3785 | msgstr "" | |
3689 |
|
3786 | |||
3690 | msgid "rebase from the base of a given revision" |
|
3787 | msgid "" | |
3691 | msgstr "" |
|
3788 | "rebase from the base of the specified changeset (up to greatest common " | |
3692 |
|
3789 | "ancestor of base and dest)" | ||
3693 | msgid "rebase onto a given revision" |
|
3790 | msgstr "" | |
|
3791 | ||||
|
3792 | msgid "rebase onto the specified changeset" | |||
3694 | msgstr "" |
|
3793 | msgstr "" | |
3695 |
|
3794 | |||
3696 | msgid "collapse the rebased changesets" |
|
3795 | msgid "collapse the rebased changesets" | |
@@ -3712,8 +3811,8 b' msgid "abort an interrupted rebase"' | |||||
3712 | msgstr "" |
|
3811 | msgstr "" | |
3713 |
|
3812 | |||
3714 | msgid "" |
|
3813 | msgid "" | |
3715 |
"hg rebase [-s REV | -b REV] [-d REV] [ |
|
3814 | "hg rebase [-s REV | -b REV] [-d REV] [options]\n" | |
3716 | "keepbranches] | [-c] | [-a]" |
|
3815 | "hg rebase {-a|-c}" | |
3717 | msgstr "" |
|
3816 | msgstr "" | |
3718 |
|
3817 | |||
3719 | msgid "commands to interactively select changes for commit/qrefresh" |
|
3818 | msgid "commands to interactively select changes for commit/qrefresh" | |
@@ -3876,8 +3975,8 b' msgstr ""' | |||||
3876 | msgid " files" |
|
3975 | msgid " files" | |
3877 | msgstr "" |
|
3976 | msgstr "" | |
3878 |
|
3977 | |||
3879 | msgid "relink" |
|
3978 | msgid "relinking" | |
3880 | msgstr "" |
|
3979 | msgstr "länkar om" | |
3881 |
|
3980 | |||
3882 | #, python-format |
|
3981 | #, python-format | |
3883 | msgid "relinked %d files (%d bytes reclaimed)\n" |
|
3982 | msgid "relinked %d files (%d bytes reclaimed)\n" | |
@@ -4884,8 +4983,10 b' msgstr ""' | |||||
4884 | msgid "reset working directory to branch %s\n" |
|
4983 | msgid "reset working directory to branch %s\n" | |
4885 | msgstr "återställ arbetskatalogen till grenen %s\n" |
|
4984 | msgstr "återställ arbetskatalogen till grenen %s\n" | |
4886 |
|
4985 | |||
4887 | msgid "a branch of the same name already exists (use --force to override)" |
|
4986 | msgid "" | |
4888 | msgstr "en gren med samma namn existerar redan (använd --force för att tvinga)" |
|
4987 | "a branch of the same name already exists (use 'hg update' to switch to it)" | |
|
4988 | msgstr "" | |||
|
4989 | "en gren med samma namn finns redan (kör 'hg update' för att byta till den)" | |||
4889 |
|
4990 | |||
4890 | #, python-format |
|
4991 | #, python-format | |
4891 | msgid "marked working directory as branch %s\n" |
|
4992 | msgid "marked working directory as branch %s\n" | |
@@ -5022,20 +5123,6 b' msgid ""' | |||||
5022 | " .hg/hgrc and working directory will be created on the remote side.\n" |
|
5123 | " .hg/hgrc and working directory will be created on the remote side.\n" | |
5023 | " Please see 'hg help urls' for important details about ``ssh://`` URLs.\n" |
|
5124 | " Please see 'hg help urls' for important details about ``ssh://`` URLs.\n" | |
5024 | "\n" |
|
5125 | "\n" | |
5025 | " If the -U/--noupdate option is specified, the new clone will contain\n" |
|
|||
5026 | " only a repository (.hg) and no working copy (the working copy parent\n" |
|
|||
5027 | " will be the null changeset). Otherwise, clone will initially check\n" |
|
|||
5028 | " out (in order of precedence):\n" |
|
|||
5029 | "\n" |
|
|||
5030 | " a) the changeset, tag or branch specified with -u/--updaterev\n" |
|
|||
5031 | " b) the changeset, tag or branch given with the first -r/--rev\n" |
|
|||
5032 | " c) the branch given with the first -b/--branch\n" |
|
|||
5033 | " d) the branch given with the url#branch source syntax\n" |
|
|||
5034 | " e) the head of the default branch\n" |
|
|||
5035 | "\n" |
|
|||
5036 | " Use 'hg clone -u . src dst' to checkout the source repository's\n" |
|
|||
5037 | " parent changeset (applicable for local source repositories only).\n" |
|
|||
5038 | "\n" |
|
|||
5039 | " A set of changesets (tags, or branch names) to pull may be specified\n" |
|
5126 | " A set of changesets (tags, or branch names) to pull may be specified\n" | |
5040 | " by listing each changeset (tag, or branch name) with -r/--rev.\n" |
|
5127 | " by listing each changeset (tag, or branch name) with -r/--rev.\n" | |
5041 | " If -r/--rev is used, the cloned repository will contain only a subset\n" |
|
5128 | " If -r/--rev is used, the cloned repository will contain only a subset\n" | |
@@ -5050,12 +5137,12 b' msgid ""' | |||||
5050 | "\n" |
|
5137 | "\n" | |
5051 | " For efficiency, hardlinks are used for cloning whenever the source\n" |
|
5138 | " For efficiency, hardlinks are used for cloning whenever the source\n" | |
5052 | " and destination are on the same filesystem (note this applies only\n" |
|
5139 | " and destination are on the same filesystem (note this applies only\n" | |
5053 |
" to the repository data, not to the |
|
5140 | " to the repository data, not to the working directory). Some\n" | |
5054 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" |
|
5141 | " filesystems, such as AFS, implement hardlinking incorrectly, but\n" | |
5055 | " do not report errors. In these cases, use the --pull option to\n" |
|
5142 | " do not report errors. In these cases, use the --pull option to\n" | |
5056 | " avoid hardlinking.\n" |
|
5143 | " avoid hardlinking.\n" | |
5057 | "\n" |
|
5144 | "\n" | |
5058 |
" In some cases, you can clone repositories and |
|
5145 | " In some cases, you can clone repositories and the working directory\n" | |
5059 | " using full hardlinks with ::\n" |
|
5146 | " using full hardlinks with ::\n" | |
5060 | "\n" |
|
5147 | "\n" | |
5061 | " $ cp -al REPO REPOCLONE\n" |
|
5148 | " $ cp -al REPO REPOCLONE\n" | |
@@ -5066,6 +5153,20 b' msgid ""' | |||||
5066 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" |
|
5153 | " breaks hardlinks (Emacs and most Linux Kernel tools do so). Also,\n" | |
5067 | " this is not compatible with certain extensions that place their\n" |
|
5154 | " this is not compatible with certain extensions that place their\n" | |
5068 | " metadata under the .hg directory, such as mq.\n" |
|
5155 | " metadata under the .hg directory, such as mq.\n" | |
|
5156 | "\n" | |||
|
5157 | " Mercurial will update the working directory to the first applicable\n" | |||
|
5158 | " revision from this list:\n" | |||
|
5159 | "\n" | |||
|
5160 | " a) null if -U or the source repository has no changesets\n" | |||
|
5161 | " b) if -u . and the source repository is local, the first parent of\n" | |||
|
5162 | " the source repository's working directory\n" | |||
|
5163 | " c) the changeset specified with -u (if a branch name, this means the\n" | |||
|
5164 | " latest head of that branch)\n" | |||
|
5165 | " d) the changeset specified with -r\n" | |||
|
5166 | " e) the tipmost head specified with -b\n" | |||
|
5167 | " f) the tipmost head specified with the url#branch source syntax\n" | |||
|
5168 | " g) the tipmost head of the default branch\n" | |||
|
5169 | " h) tip\n" | |||
5069 | " " |
|
5170 | " " | |
5070 | msgstr "" |
|
5171 | msgstr "" | |
5071 | "gör en kopia av ett existerande arkiv\n" |
|
5172 | "gör en kopia av ett existerande arkiv\n" | |
@@ -5083,21 +5184,6 b' msgstr ""' | |||||
5083 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" |
|
5184 | " Det är möjligt att specificera en ``ssh://``-URL som destination, men\n" | |
5084 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" |
|
5185 | " ingen .hg/hgrc och arbetskatalog skapas på fjärrsidan.\n" | |
5085 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" |
|
5186 | " Se 'hg help urls' för viktiga detaljer om ``ssh://``-URLer.\n" | |
5086 | "\n" |
|
|||
5087 | " Om alternativet -U/--noupdate är angivet, kommer den nya klonen bara\n" |
|
|||
5088 | " att innehålla ett arkiv (.hg) och ingen arbetskopia (arbetskopians\n" |
|
|||
5089 | " förälder kommer att vara null-ändringen). Annars kommer klonen initialt\n" |
|
|||
5090 | " att hämta ut (i prioritetsordning):\n" |
|
|||
5091 | "\n" |
|
|||
5092 | " a) ändringen, taggen eller grenen specificerad med -u/--updaterev\n" |
|
|||
5093 | " b) ändringen, taggen eller grenen given med den första -r/--rev\n" |
|
|||
5094 | " c) grenen angiven med den första -b/--branch\n" |
|
|||
5095 | " d) grenen angiven med källsyntaxen url#gren\n" |
|
|||
5096 | " e) huvudet på grenen 'default'\n" |
|
|||
5097 | "\n" |
|
|||
5098 | " Använd 'hg clone -u . källa dst' för att hämta ut källkodsarkivets\n" |
|
|||
5099 | " föräldraänrding (gäller bara för lokala arkiv).\n" |
|
|||
5100 | "\n" |
|
|||
5101 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" |
|
5187 | " En grupp ändringar (märken, eller grennamn) att dra kan specificeras\n" | |
5102 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" |
|
5188 | " genom att lista varje ändring (märke, eller grennamn) med -r/--rev.\n" | |
5103 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" |
|
5189 | " Om -r/--rev används, kommer det klonade arkivet bara att innehålla en\n" | |
@@ -5111,11 +5197,11 b' msgstr ""' | |||||
5111 | "\n" |
|
5197 | "\n" | |
5112 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" |
|
5198 | " Av effektivitestskäl används hårda länkar när källan och destinationen\n" | |
5113 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" |
|
5199 | " är på samma filsystem (notera att detta bara gäller för arkivdatat,\n" | |
5114 |
" inte |
|
5200 | " inte arbetskopian). Vissa filsystem såsom AFS implementerar\n" | |
5115 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" |
|
5201 | " hårda länkar felaktigt, men rapporterar inga fel. Använd flaggan --pull\n" | |
5116 | " för att undvika användning av hårda länkar.\n" |
|
5202 | " för att undvika användning av hårda länkar.\n" | |
5117 | "\n" |
|
5203 | "\n" | |
5118 |
" I vissa fall kan du klona både arkiv och |
|
5204 | " I vissa fall kan du klona både arkiv och arbetskopia, alla\n" | |
5119 | " hårdlänkade, med ::\n" |
|
5205 | " hårdlänkade, med ::\n" | |
5120 | "\n" |
|
5206 | "\n" | |
5121 | " $ cp -al ARKIV ARKIVKLON\n" |
|
5207 | " $ cp -al ARKIV ARKIVKLON\n" | |
@@ -5126,6 +5212,20 b' msgstr ""' | |||||
5126 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" |
|
5212 | " hårda länkar (Emacs och de flesta Linux-kernelverktyg gör det). Det är\n" | |
5127 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" |
|
5213 | " inte heller kompatibelt med vissa utökningar som placerar sin metadata\n" | |
5128 | " under katalogen .hg, som mq.\n" |
|
5214 | " under katalogen .hg, som mq.\n" | |
|
5215 | "\n" | |||
|
5216 | " Mercurial uppdaterar arbetskatalogen till den första passande\n" | |||
|
5217 | " revisionen från den här listan:\n" | |||
|
5218 | "\n" | |||
|
5219 | " a) null med -U eller källarkivet inte har några ändringar\n" | |||
|
5220 | " b) med -u . och källarkivet, den första föräldern av källarkivets\n" | |||
|
5221 | " arbetskatalog\n" | |||
|
5222 | " c) ändringen antigen med -u (om ett grennamn, innebär det senaste\n" | |||
|
5223 | " huvudet på den grenen)\n" | |||
|
5224 | " d) ändringen angiven med -r\n" | |||
|
5225 | " e) det högsta huvudet angivet med -b\n" | |||
|
5226 | " f) det högsta huvudet angivent med källsyntaxen url#gren\n" | |||
|
5227 | " g) det högsta huvudet på default-grenen\n" | |||
|
5228 | " h) tip\n" | |||
5129 | " " |
|
5229 | " " | |
5130 |
|
5230 | |||
5131 | msgid "cannot specify both --noupdate and --updaterev" |
|
5231 | msgid "cannot specify both --noupdate and --updaterev" | |
@@ -5210,9 +5310,6 b' msgstr ""' | |||||
5210 | msgid "find the ancestor revision of two revisions in a given index" |
|
5310 | msgid "find the ancestor revision of two revisions in a given index" | |
5211 | msgstr "hitta föregående revision av två revisioner i ett givet index" |
|
5311 | msgstr "hitta föregående revision av två revisioner i ett givet index" | |
5212 |
|
5312 | |||
5213 | msgid "There is no Mercurial repository here (.hg not found)" |
|
|||
5214 | msgstr "Det finns inget Mercurial-arkiv här (.hg hittades inte)" |
|
|||
5215 |
|
||||
5216 | msgid "either two or three arguments required" |
|
5313 | msgid "either two or three arguments required" | |
5217 | msgstr "endera två eller tre argument krävs" |
|
5314 | msgstr "endera två eller tre argument krävs" | |
5218 |
|
5315 | |||
@@ -7964,7 +8061,7 b' msgid "unknown bisect kind %s"' | |||||
7964 | msgstr "" |
|
8061 | msgstr "" | |
7965 |
|
8062 | |||
7966 | msgid "disabled extensions:" |
|
8063 | msgid "disabled extensions:" | |
7967 | msgstr "" |
|
8064 | msgstr "deaktiverade utökningar:" | |
7968 |
|
8065 | |||
7969 | msgid "Configuration Files" |
|
8066 | msgid "Configuration Files" | |
7970 | msgstr "Konfigurationsfiler" |
|
8067 | msgstr "Konfigurationsfiler" | |
@@ -7973,28 +8070,28 b' msgid "Date Formats"' | |||||
7973 | msgstr "Datumformat" |
|
8070 | msgstr "Datumformat" | |
7974 |
|
8071 | |||
7975 | msgid "File Name Patterns" |
|
8072 | msgid "File Name Patterns" | |
7976 | msgstr "" |
|
8073 | msgstr "Filnamnsmönster" | |
7977 |
|
8074 | |||
7978 | msgid "Environment Variables" |
|
8075 | msgid "Environment Variables" | |
7979 | msgstr "" |
|
8076 | msgstr "Miljövariabler" | |
7980 |
|
8077 | |||
7981 | msgid "Specifying Single Revisions" |
|
8078 | msgid "Specifying Single Revisions" | |
7982 | msgstr "" |
|
8079 | msgstr "Ange En Revision" | |
7983 |
|
8080 | |||
7984 | msgid "Specifying Multiple Revisions" |
|
8081 | msgid "Specifying Multiple Revisions" | |
7985 | msgstr "" |
|
8082 | msgstr "Ange Flera Revisioner" | |
7986 |
|
8083 | |||
7987 | msgid "Diff Formats" |
|
8084 | msgid "Diff Formats" | |
7988 | msgstr "" |
|
8085 | msgstr "Diff-format" | |
7989 |
|
8086 | |||
7990 | msgid "Template Usage" |
|
8087 | msgid "Template Usage" | |
7991 | msgstr "" |
|
8088 | msgstr "Användning Av Mallar" | |
7992 |
|
8089 | |||
7993 | msgid "URL Paths" |
|
8090 | msgid "URL Paths" | |
7994 | msgstr "" |
|
8091 | msgstr "URL-sökvägar" | |
7995 |
|
8092 | |||
7996 | msgid "Using additional features" |
|
8093 | msgid "Using additional features" | |
7997 | msgstr "" |
|
8094 | msgstr "Använda ytterligare funktioner" | |
7998 |
|
8095 | |||
7999 | msgid "" |
|
8096 | msgid "" | |
8000 | "Mercurial reads configuration data from several files, if they exist.\n" |
|
8097 | "Mercurial reads configuration data from several files, if they exist.\n" | |
@@ -8396,6 +8493,34 b' msgid ""' | |||||
8396 | "uncommitted merge is in progress, \".\" is the revision of the first\n" |
|
8493 | "uncommitted merge is in progress, \".\" is the revision of the first\n" | |
8397 | "parent.\n" |
|
8494 | "parent.\n" | |
8398 | msgstr "" |
|
8495 | msgstr "" | |
|
8496 | "Mercurial stöder flera sött att ange individuella revisioner.\n" | |||
|
8497 | "\n" | |||
|
8498 | "Ett heltal behandlas som ett revisionsnummer. Negativa heltal behandlas som\n" | |||
|
8499 | "sekventiell offset från toppen, där -1 är tippen, -2 revisionen innan\n" | |||
|
8500 | "toppen, och så vidare.\n" | |||
|
8501 | "\n" | |||
|
8502 | "En 40-siffrig hexadecimal sträng behandlas som en unik\n" | |||
|
8503 | "revisionsidentifierare.\n" | |||
|
8504 | "\n" | |||
|
8505 | "En hexadecimal sträng med mindre än 40 tecken behandlas som en unik\n" | |||
|
8506 | "revisionsidentifierare och refereras till som en kort identifierare. En\n" | |||
|
8507 | "kort identifierare är bara giltig om det är prefixet för exakt en\n" | |||
|
8508 | "fullängdsidentifierare.\n" | |||
|
8509 | "\n" | |||
|
8510 | "Alla andra strängar behandlas som märkes- eller grennamn. Ett märkesnamn är\n" | |||
|
8511 | "ett symboliskt namn associerad med en revisionsidentifierare. Ett grennamn\n" | |||
|
8512 | "anger den högsta revisionen på den grenen. Märkes- och grennamn kan inte\n" | |||
|
8513 | "innehålla tecknet \":\".\n" | |||
|
8514 | "\n" | |||
|
8515 | "Det reserverade namnet \"tip\" är ett speciellt märke som alltid\n" | |||
|
8516 | "identifierar den senaste revisionen.\n" | |||
|
8517 | "\n" | |||
|
8518 | "Det reserverade namnet \"null\" indikerar null-revisionen. Detta är\n" | |||
|
8519 | "revisionen i ett tomt arkiv, och är förälder till revision 0.\n" | |||
|
8520 | "\n" | |||
|
8521 | "Det reserverade namnet \".\" indikerar arbetskatalogens förälder. Om ingen\n" | |||
|
8522 | "arbetskatalog är uthämtad, är den ekvivalent med null. Om en oarkiverad\n" | |||
|
8523 | "sammanfogning pågår, så är \".\" den första förälderns revision.\n" | |||
8399 |
|
8524 | |||
8400 | msgid "" |
|
8525 | msgid "" | |
8401 | "Mercurial allows you to customize output of commands through\n" |
|
8526 | "Mercurial allows you to customize output of commands through\n" | |
@@ -8905,9 +9030,11 b' msgstr ""' | |||||
8905 |
|
9030 | |||
8906 | #, python-format |
|
9031 | #, python-format | |
8907 | msgid "" |
|
9032 | msgid "" | |
8908 | "%s: files over 10MB may cause memory and performance problems\n" |
|
9033 | "%s: up to %d MB of RAM may be required to manage this file\n" | |
8909 |
"(use 'hg revert %s' to |
|
9034 | "(use 'hg revert %s' to cancel the pending addition)\n" | |
8910 | msgstr "" |
|
9035 | msgstr "" | |
|
9036 | "%s: upp till %d MB RAM kan behövas för att hantera denna fil\n" | |||
|
9037 | "(använd 'hg revert %s' för att ångra den väntande additionen)\n" | |||
8911 |
|
9038 | |||
8912 | #, python-format |
|
9039 | #, python-format | |
8913 | msgid "%s not added: only files and symlinks supported currently\n" |
|
9040 | msgid "%s not added: only files and symlinks supported currently\n" | |
@@ -8947,31 +9074,33 b' msgid "searching"' | |||||
8947 | msgstr "söker" |
|
9074 | msgstr "söker" | |
8948 |
|
9075 | |||
8949 | msgid "already have changeset " |
|
9076 | msgid "already have changeset " | |
8950 | msgstr "" |
|
9077 | msgstr "har redan ändringen " | |
8951 |
|
9078 | |||
8952 | msgid "warning: repository is unrelated\n" |
|
9079 | msgid "warning: repository is unrelated\n" | |
8953 | msgstr "" |
|
9080 | msgstr "varning: arkivet är obesälktat\n" | |
8954 |
|
9081 | |||
8955 | msgid "repository is unrelated" |
|
9082 | msgid "repository is unrelated" | |
8956 | msgstr "" |
|
9083 | msgstr "arkivet är obesläktat" | |
8957 |
|
9084 | |||
8958 | msgid "requesting all changes\n" |
|
9085 | msgid "requesting all changes\n" | |
8959 | msgstr "" |
|
9086 | msgstr "efterfrågar alla ändringar\n" | |
8960 |
|
9087 | |||
8961 | msgid "" |
|
9088 | msgid "" | |
8962 | "Partial pull cannot be done because other repository doesn't support " |
|
9089 | "Partial pull cannot be done because other repository doesn't support " | |
8963 | "changegroupsubset." |
|
9090 | "changegroupsubset." | |
8964 | msgstr "" |
|
9091 | msgstr "" | |
|
9092 | "Deldragningar kan inte göras eftersom det andra arkivet inte stödjer " | |||
|
9093 | "changegroupsubset." | |||
8965 |
|
9094 | |||
8966 | #, python-format |
|
9095 | #, python-format | |
8967 | msgid "abort: push creates new remote heads on branch '%s'!\n" |
|
9096 | msgid "abort: push creates new remote heads on branch '%s'!\n" | |
8968 | msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n" |
|
9097 | msgstr "avbryter: push skapar nya fjärrhuvuden på grenen '%s'!\n" | |
8969 |
|
9098 | |||
8970 | msgid "abort: push creates new remote heads!\n" |
|
9099 | msgid "abort: push creates new remote heads!\n" | |
8971 | msgstr "" |
|
9100 | msgstr "avbryter: push skapar nya fjärrhuvuden!\n" | |
8972 |
|
9101 | |||
8973 | msgid "(did you forget to merge? use push -f to force)\n" |
|
9102 | msgid "(did you forget to merge? use push -f to force)\n" | |
8974 | msgstr "" |
|
9103 | msgstr "(glömde du att sammanfoga? använd push -f för att tvinga)\n" | |
8975 |
|
9104 | |||
8976 | msgid "(you should pull and merge or use push -f to force)\n" |
|
9105 | msgid "(you should pull and merge or use push -f to force)\n" | |
8977 | msgstr "" |
|
9106 | msgstr "" | |
@@ -8991,21 +9120,21 b' msgstr "notera: osynkade fj\xc3\xa4rr\xc3\xa4ndringar!\\n"' | |||||
8991 | msgid "%d changesets found\n" |
|
9120 | msgid "%d changesets found\n" | |
8992 | msgstr "%d ändringar hittades\n" |
|
9121 | msgstr "%d ändringar hittades\n" | |
8993 |
|
9122 | |||
8994 |
msgid "bundl |
|
9123 | msgid "bundling changes" | |
8995 | msgstr "bunta ändringar" |
|
9124 | msgstr "buntar ändringar" | |
8996 |
|
9125 | |||
8997 | msgid "chunks" |
|
9126 | msgid "chunks" | |
8998 | msgstr "stycken" |
|
9127 | msgstr "stycken" | |
8999 |
|
9128 | |||
9000 |
msgid "bundl |
|
9129 | msgid "bundling manifests" | |
9001 | msgstr "bunta manifest" |
|
9130 | msgstr "buntar manifest" | |
9002 |
|
9131 | |||
9003 | #, python-format |
|
9132 | #, python-format | |
9004 | msgid "empty or missing revlog for %s" |
|
9133 | msgid "empty or missing revlog for %s" | |
9005 | msgstr "tom eller saknad revlog för %s" |
|
9134 | msgstr "tom eller saknad revlog för %s" | |
9006 |
|
9135 | |||
9007 |
msgid "bundl |
|
9136 | msgid "bundling files" | |
9008 | msgstr "bunta filer" |
|
9137 | msgstr "buntar filer" | |
9009 |
|
9138 | |||
9010 | msgid "adding changesets\n" |
|
9139 | msgid "adding changesets\n" | |
9011 | msgstr "lägger till ändringar\n" |
|
9140 | msgstr "lägger till ändringar\n" | |
@@ -9056,55 +9185,55 b' msgid "the server sent an unknown error ' | |||||
9056 | msgstr "" |
|
9185 | msgstr "" | |
9057 |
|
9186 | |||
9058 | msgid "streaming all changes\n" |
|
9187 | msgid "streaming all changes\n" | |
9059 | msgstr "" |
|
9188 | msgstr "strömmar alla ändringar\n" | |
9060 |
|
9189 | |||
9061 | #, python-format |
|
9190 | #, python-format | |
9062 | msgid "%d files to transfer, %s of data\n" |
|
9191 | msgid "%d files to transfer, %s of data\n" | |
9063 | msgstr "" |
|
9192 | msgstr "%d filer att överföra, %s med data\n" | |
9064 |
|
9193 | |||
9065 | #, python-format |
|
9194 | #, python-format | |
9066 | msgid "transferred %s in %.1f seconds (%s/sec)\n" |
|
9195 | msgid "transferred %s in %.1f seconds (%s/sec)\n" | |
9067 | msgstr "" |
|
9196 | msgstr "överförde %s på %.1f sekunder (%s/sek)\n" | |
9068 |
|
9197 | |||
9069 | msgid "no [smtp]host in hgrc - cannot send mail" |
|
9198 | msgid "no [smtp]host in hgrc - cannot send mail" | |
9070 | msgstr "" |
|
9199 | msgstr "ingen [smtp]server i hgrc - kan inte sända mail" | |
9071 |
|
9200 | |||
9072 | #, python-format |
|
9201 | #, python-format | |
9073 | msgid "sending mail: smtp host %s, port %s\n" |
|
9202 | msgid "sending mail: smtp host %s, port %s\n" | |
9074 | msgstr "" |
|
9203 | msgstr "sänder mail: smtp-server %s, port %s\n" | |
9075 |
|
9204 | |||
9076 | msgid "can't use TLS: Python SSL support not installed" |
|
9205 | msgid "can't use TLS: Python SSL support not installed" | |
9077 | msgstr "" |
|
9206 | msgstr "kan inte använda TLS: Pythons SSL-stöd är inte installerat" | |
9078 |
|
9207 | |||
9079 | msgid "(using tls)\n" |
|
9208 | msgid "(using tls)\n" | |
9080 | msgstr "" |
|
9209 | msgstr "(använder tls)\n" | |
9081 |
|
9210 | |||
9082 | #, python-format |
|
9211 | #, python-format | |
9083 | msgid "(authenticating to mail server as %s)\n" |
|
9212 | msgid "(authenticating to mail server as %s)\n" | |
9084 | msgstr "" |
|
9213 | msgstr "(autenticerar mot mailserver som %s)\n" | |
9085 |
|
9214 | |||
9086 | #, python-format |
|
9215 | #, python-format | |
9087 | msgid "sending mail: %s\n" |
|
9216 | msgid "sending mail: %s\n" | |
9088 | msgstr "" |
|
9217 | msgstr "sänder mail: %s\n" | |
9089 |
|
9218 | |||
9090 | msgid "smtp specified as email transport, but no smtp host configured" |
|
9219 | msgid "smtp specified as email transport, but no smtp host configured" | |
9091 | msgstr "" |
|
9220 | msgstr "smtp angiven som emailtransport, men ingen smtp-server konfigurerad" | |
9092 |
|
9221 | |||
9093 | #, python-format |
|
9222 | #, python-format | |
9094 | msgid "%r specified as email transport, but not in PATH" |
|
9223 | msgid "%r specified as email transport, but not in PATH" | |
9095 | msgstr "" |
|
9224 | msgstr "%r angiven som emailtransport, men inte i PATH" | |
9096 |
|
9225 | |||
9097 | #, python-format |
|
9226 | #, python-format | |
9098 | msgid "ignoring invalid sendcharset: %s\n" |
|
9227 | msgid "ignoring invalid sendcharset: %s\n" | |
9099 | msgstr "" |
|
9228 | msgstr "ignorerar ogiltig sendcharset: %s\n" | |
9100 |
|
9229 | |||
9101 | #, python-format |
|
9230 | #, python-format | |
9102 | msgid "invalid email address: %s" |
|
9231 | msgid "invalid email address: %s" | |
9103 | msgstr "" |
|
9232 | msgstr "ogiltig emailadress: %s" | |
9104 |
|
9233 | |||
9105 | #, python-format |
|
9234 | #, python-format | |
9106 | msgid "invalid local address: %s" |
|
9235 | msgid "invalid local address: %s" | |
9107 | msgstr "" |
|
9236 | msgstr "ogiltig lokal adress: %s" | |
9108 |
|
9237 | |||
9109 | #, python-format |
|
9238 | #, python-format | |
9110 | msgid "failed to remove %s from manifest" |
|
9239 | msgid "failed to remove %s from manifest" | |
@@ -9528,25 +9657,25 b' msgid "edit failed"' | |||||
9528 | msgstr "" |
|
9657 | msgstr "" | |
9529 |
|
9658 | |||
9530 | msgid "http authorization required" |
|
9659 | msgid "http authorization required" | |
9531 | msgstr "" |
|
9660 | msgstr "http-autenticiering krävs" | |
9532 |
|
9661 | |||
9533 | msgid "http authorization required\n" |
|
9662 | msgid "http authorization required\n" | |
9534 | msgstr "" |
|
9663 | msgstr "http-autenticiering krävs\n" | |
9535 |
|
9664 | |||
9536 | #, python-format |
|
9665 | #, python-format | |
9537 | msgid "realm: %s\n" |
|
9666 | msgid "realm: %s\n" | |
9538 | msgstr "" |
|
9667 | msgstr "realm: %s\n" | |
9539 |
|
9668 | |||
9540 | #, python-format |
|
9669 | #, python-format | |
9541 | msgid "user: %s\n" |
|
9670 | msgid "user: %s\n" | |
9542 | msgstr "" |
|
9671 | msgstr "användare: %s\n"" | |
9543 |
|
9672 | |||
9544 | msgid "user:" |
|
9673 | msgid "user:" | |
9545 | msgstr "" |
|
9674 | msgstr "användare:"" | |
9546 |
|
9675 | |||
9547 | #, python-format |
|
9676 | #, python-format | |
9548 | msgid "http auth: user %s, password %s\n" |
|
9677 | msgid "http auth: user %s, password %s\n" | |
9549 | msgstr "" |
|
9678 | msgstr "http-auth: användare %s, lösenord %s\n" | |
9550 |
|
9679 | |||
9551 | #, python-format |
|
9680 | #, python-format | |
9552 | msgid "ignoring invalid [auth] key '%s'\n" |
|
9681 | msgid "ignoring invalid [auth] key '%s'\n" | |
@@ -9701,8 +9830,8 b' msgstr "arkivet anv\xc3\xa4nder revlog-format %d\\n"' | |||||
9701 | msgid "checking changesets\n" |
|
9830 | msgid "checking changesets\n" | |
9702 | msgstr "kontrollerar ändringar\n" |
|
9831 | msgstr "kontrollerar ändringar\n" | |
9703 |
|
9832 | |||
9704 |
msgid "ch |
|
9833 | msgid "checking" | |
9705 | msgstr "ändringslogg" |
|
9834 | msgstr "kontrollerar" | |
9706 |
|
9835 | |||
9707 | #, python-format |
|
9836 | #, python-format | |
9708 | msgid "unpacking changeset %s" |
|
9837 | msgid "unpacking changeset %s" | |
@@ -9725,8 +9854,8 b' msgstr ""' | |||||
9725 | msgid "crosschecking files in changesets and manifests\n" |
|
9854 | msgid "crosschecking files in changesets and manifests\n" | |
9726 | msgstr "korskontrollerar filer i ändringar och manifest\n" |
|
9855 | msgstr "korskontrollerar filer i ändringar och manifest\n" | |
9727 |
|
9856 | |||
9728 | msgid "crosscheck" |
|
9857 | msgid "crosschecking" | |
9729 | msgstr "korskontroll" |
|
9858 | msgstr "korskontrollerar" | |
9730 |
|
9859 | |||
9731 | #, python-format |
|
9860 | #, python-format | |
9732 | msgid "changeset refers to unknown manifest %s" |
|
9861 | msgid "changeset refers to unknown manifest %s" |
General Comments 0
You need to be logged in to leave comments.
Login now