Show More
@@ -31,3 +31,4 b' 93d8bff78c96fe7e33237b257558ee97290048a4' | |||
|
31 | 31 | 333421b9e0f96c7bc788e5667c146a58a9440a55 0 iD8DBQBMz0HOywK+sNU5EO8RAlsEAJ0USh6yOG7OrWkADGunVt9QimBQnwCbBqeMnKgSbwEw8jZwE3Iz1mdrYlo= |
|
32 | 32 | 4438875ec01bd0fc32be92b0872eb6daeed4d44f 0 iD8DBQBM4WYUywK+sNU5EO8RAhCVAJ0dJswachwFAHALmk1x0RJehxzqPQCbBNskP9n/X689jB+btNTZTyKU/fw= |
|
33 | 33 | 6aff4f144ad356311318b0011df0bb21f2c97429 0 iD8DBQBM9uxXywK+sNU5EO8RAv+4AKCDj4qKP16GdPaq1tP6BUwpM/M1OACfRyzLPp/qiiN8xJTWoWYSe/XjJug= |
|
34 | e3bf16703e2601de99e563cdb3a5d50b64e6d320 0 iD8DBQBNH8WqywK+sNU5EO8RAiQTAJ9sBO+TeiGro4si77VVaQaA6jcRUgCfSA28dBbjj0oFoQwvPoZjANiZBH8= |
@@ -43,3 +43,4 b' 93d8bff78c96fe7e33237b257558ee97290048a4' | |||
|
43 | 43 | 333421b9e0f96c7bc788e5667c146a58a9440a55 1.7 |
|
44 | 44 | 4438875ec01bd0fc32be92b0872eb6daeed4d44f 1.7.1 |
|
45 | 45 | 6aff4f144ad356311318b0011df0bb21f2c97429 1.7.2 |
|
46 | e3bf16703e2601de99e563cdb3a5d50b64e6d320 1.7.3 |
@@ -2533,7 +2533,7 b' def strip(ui, repo, *revs, **opts):' | |||
|
2533 | 2533 | backup = 'all' |
|
2534 | 2534 | if opts.get('backup'): |
|
2535 | 2535 | backup = 'strip' |
|
2536 |
elif opts.get('no |
|
|
2536 | elif opts.get('no_backup') or opts.get('nobackup'): | |
|
2537 | 2537 | backup = 'none' |
|
2538 | 2538 | |
|
2539 | 2539 | cl = repo.changelog |
@@ -2335,30 +2335,35 b' msgstr ""' | |||
|
2335 | 2335 | "do Mercurial. Ele usa duas seções ``[patterns]`` e ``[repository]``." |
|
2336 | 2336 | |
|
2337 | 2337 | msgid "" |
|
2338 |
"The ``[patterns]`` section specifies |
|
|
2339 | "working directory. The format is specified by a file pattern. The\n" | |
|
2340 | "first match is used, so put more specific patterns first. The\n" | |
|
2341 | "available line endings are ``LF``, ``CRLF``, and ``BIN``." | |
|
2342 | msgstr "" | |
|
2343 | "A seção ``[patterns]`` especifica as quebras de linha usadas no\n" | |
|
2344 | "diretório de trabalho. O formato é especificado por um padrão de nomes\n" | |
|
2338 | "The ``[patterns]`` section specifies how line endings should be\n" | |
|
2339 | "converted between the working copy and the repository. The format is\n" | |
|
2340 | "specified by a file pattern. The first match is used, so put more\n" | |
|
2341 | "specific patterns first. The available line endings are ``LF``,\n" | |
|
2342 | "``CRLF``, and ``BIN``." | |
|
2343 | msgstr "" | |
|
2344 | "A seção ``[patterns]`` especifica como quebras de linha devem ser\n" | |
|
2345 | "convertidas entre o diretório de trabalho e o repositório.\n" | |
|
2346 | "O formato é especificado por um padrão de nomes\n" | |
|
2345 | 2347 | "de arquivo. O primeiro padrão que combinar será usado, de modo que\n" |
|
2346 | 2348 | "padrões mais específicos devem ser especificados primeiro. Os tipos\n" |
|
2347 | 2349 | "de quebra de linha disponíveis são ``LF``, ``CRLF`` e ``BIN``." |
|
2348 | 2350 | |
|
2349 | 2351 | msgid "" |
|
2350 | 2352 | "Files with the declared format of ``CRLF`` or ``LF`` are always\n" |
|
2351 | "checked out in that format and files declared to be binary (``BIN``)\n" | |
|
2352 | "are left unchanged. Additionally, ``native`` is an alias for the\n" | |
|
2353 | "platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" | |
|
2354 | "and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" | |
|
2355 | "endings) is Mercurial's default behaviour; it is only needed if you\n" | |
|
2356 | "need to override a later, more general pattern." | |
|
2353 | "checked out and stored in the repository in that format and files\n" | |
|
2354 | "declared to be binary (``BIN``) are left unchanged. Additionally,\n" | |
|
2355 | "``native`` is an alias for checking out in the platform's default line\n" | |
|
2356 | "ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on\n" | |
|
2357 | "Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's\n" | |
|
2358 | "default behaviour; it is only needed if you need to override a later,\n" | |
|
2359 | "more general pattern." | |
|
2357 | 2360 | msgstr "" |
|
2358 | 2361 | "Arquivos com formato declarado como ``CRLF`` ou ``LF`` são sempre trazidos\n" |
|
2359 |
"para o diretório de trabalho |
|
|
2362 | "para o diretório de trabalho e guardados no repositório no tal formato,\n" | |
|
2363 | "e arquivos declarados como\n" | |
|
2360 | 2364 | "binários (``BIN``) não são alterados. Adicionalmente, ``native`` é um\n" |
|
2361 | "apelido para o tipo de quebra de linha padrão na plataforma: ``LF`` em\n" | |
|
2365 | "apelido para trazer o arquivo para o diretório de trabalho\n" | |
|
2366 | "no tipo de quebra de linha padrão na plataforma: ``LF`` em\n" | |
|
2362 | 2367 | "Unix (inclusive no Mac OS X) e ``CRLF`` no Windows. Note que ``BIN`` (não\n" |
|
2363 | 2368 | "fazer nada em relação a quebra de linhas) é o comportamento padrão do\n" |
|
2364 | 2369 | "Mercurial; em geral só é necessário se você precisar sobrepor um padrão\n" |
@@ -2412,6 +2417,17 b' msgstr ""' | |||
|
2412 | 2417 | " native = LF" |
|
2413 | 2418 | |
|
2414 | 2419 | msgid "" |
|
2420 | ".. note::\n" | |
|
2421 | " The rules will first apply when files are touched in the working\n" | |
|
2422 | " copy, e.g. by updating to null and back to tip to touch all files." | |
|
2423 | msgstr "" | |
|
2424 | ".. note::\n" | |
|
2425 | " As regras passarão a ser aplicadas a partir do momento em que os\n" | |
|
2426 | " arquivos forem mexidos na cópia de trabalho, por exemplo após um\n" | |
|
2427 | " update para null e de volta para a revisão atual para mexer em\n" | |
|
2428 | " todos os arquivos." | |
|
2429 | ||
|
2430 | msgid "" | |
|
2415 | 2431 | "The extension uses an optional ``[eol]`` section in your hgrc file\n" |
|
2416 | 2432 | "(not the ``.hgeol`` file) for settings that control the overall\n" |
|
2417 | 2433 | "behavior. There are two settings:" |
@@ -10122,12 +10138,15 b' msgstr " Nomeia uma determinada revis\xc3\xa3o usando <nome>."' | |||
|
10122 | 10138 | msgid "" |
|
10123 | 10139 | " Tags are used to name particular revisions of the repository and are\n" |
|
10124 | 10140 | " very useful to compare different revisions, to go back to significant\n" |
|
10125 | " earlier versions or to mark branch points as releases, etc." | |
|
10141 | " earlier versions or to mark branch points as releases, etc. Changing\n" | |
|
10142 | " an existing tag is normally disallowed; use -f/--force to override." | |
|
10126 | 10143 | msgstr "" |
|
10127 | 10144 | " Etiquetas são usadas para nomear determinadas revisões do\n" |
|
10128 | 10145 | " repositório e são muito úteis para comparar diferentes revisões,\n" |
|
10129 | 10146 | " para voltar para versões significativas anteriores ou para marcar\n" |
|
10130 | " pontos de ramificação para versões de distribuição, etc." | |
|
10147 | " pontos de ramificação para versões de distribuição, etc.\n" | |
|
10148 | " Alterar uma etiqueta existente normalmente não é permitido\n" | |
|
10149 | " use -f/--force para forçar essa alteração." | |
|
10131 | 10150 | |
|
10132 | 10151 | msgid "" |
|
10133 | 10152 | " If no revision is given, the parent of the working directory is\n" |
@@ -10139,19 +10158,32 b' msgstr ""' | |||
|
10139 | 10158 | |
|
10140 | 10159 | msgid "" |
|
10141 | 10160 | " To facilitate version control, distribution, and merging of tags,\n" |
|
10142 | " they are stored as a file named \".hgtags\" which is managed\n" | |
|
10143 |
" |
|
|
10144 | " necessary. The file '.hg/localtags' is used for local tags (not\n" | |
|
10145 | " shared among repositories)." | |
|
10161 | " they are stored as a file named \".hgtags\" which is managed similarly\n" | |
|
10162 | " to other project files and can be hand-edited if necessary. This\n" | |
|
10163 | " also means that tagging creates a new commit. The file\n" | |
|
10164 | " \".hg/localtags\" is used for local tags (not shared among\n" | |
|
10165 | " repositories)." | |
|
10146 | 10166 | msgstr "" |
|
10147 | 10167 | " Para facilitar o controle de versão, a distribuição e a\n" |
|
10148 | 10168 | " mesclagem de etiquetas, elas são armazenadas em um arquivo\n" |
|
10149 | 10169 | " chamado \".hgtags\" que é gerenciado de forma similar a\n" |
|
10150 | 10170 | " outros arquivos do projeto, e pode ser editado manualmente se\n" |
|
10151 |
" necessário. O arquivo |
|
|
10171 | " necessário. O arquivo \".hg/localtags\" é usado para etiquetas\n" | |
|
10152 | 10172 | " locais (não compartilhadas entre repositórios)." |
|
10153 | 10173 | |
|
10154 | 10174 | msgid "" |
|
10175 | " Tag commits are usually made at the head of a branch. If the parent\n" | |
|
10176 | " of the working directory is not a branch head, :hg:`tag` aborts; use\n" | |
|
10177 | " -f/--force to force the tag commit to be based on a non-head\n" | |
|
10178 | " changeset." | |
|
10179 | msgstr "" | |
|
10180 | " A consolidação de revisões de etiqueta são em geral feitas na\n" | |
|
10181 | " cabeça de um ramo. Se o pai do diretório de trabalho não for a\n" | |
|
10182 | " cabeça de um ramo, :hg:`tag` abortará; use -f/--force para\n" | |
|
10183 | " forçar a consolidação de uma etiqueta a se basear em uma \n" | |
|
10184 | " revisão que não seja uma cabeça de ramo." | |
|
10185 | ||
|
10186 | msgid "" | |
|
10155 | 10187 | " Since tag names have priority over branch names during revision\n" |
|
10156 | 10188 | " lookup, using an existing branch name as a tag name is discouraged." |
|
10157 | 10189 | msgstr "" |
@@ -10184,6 +10216,12 b' msgstr "a etiqueta \'%s\' n\xc3\xa3o \xc3\xa9 uma etiqueta local"' | |||
|
10184 | 10216 | msgid "tag '%s' already exists (use -f to force)" |
|
10185 | 10217 | msgstr "a etiqueta '%s' já existe (use -f para forçar)" |
|
10186 | 10218 | |
|
10219 | msgid "uncommitted merge" | |
|
10220 | msgstr "mesclagem não consolidada pendente" | |
|
10221 | ||
|
10222 | msgid "not at a branch head (use -f to force)" | |
|
10223 | msgstr "não está em uma cabeça de ramo (use -f para forçar)" | |
|
10224 | ||
|
10187 | 10225 | msgid "list repository tags" |
|
10188 | 10226 | msgstr "lista as etiquetas do repositório" |
|
10189 | 10227 | |
@@ -11094,8 +11132,8 b' msgstr "mostra diferen\xc3\xa7a a partir da revis\xc3\xa3o"' | |||
|
11094 | 11132 | msgid "list the changed files of a revision" |
|
11095 | 11133 | msgstr "lista os arquivos modificados por uma revisão" |
|
11096 | 11134 | |
|
11097 |
msgid "r |
|
|
11098 | msgstr "substitui etiqueta existente" | |
|
11135 | msgid "force tag" | |
|
11136 | msgstr "força a mudança da etiqueta" | |
|
11099 | 11137 | |
|
11100 | 11138 | msgid "make the tag local" |
|
11101 | 11139 | msgstr "torna a etiqueta local" |
@@ -14063,10 +14101,11 b' msgid ":author: String. The unmodified a' | |||
|
14063 | 14101 | msgstr ":author: String. O autor da revisão, sem modificações." |
|
14064 | 14102 | |
|
14065 | 14103 | msgid "" |
|
14066 |
":branches: |
|
|
14067 |
" committed. Will be empty if the branch name was |
|
|
14068 | msgstr "" | |
|
14069 | ":branches: String. O nome do ramo no qual a revisão foi\n" | |
|
14104 | ":branches: List of strings. The name of the branch on which the\n" | |
|
14105 | " changeset was committed. Will be empty if the branch name was\n" | |
|
14106 | " default." | |
|
14107 | msgstr "" | |
|
14108 | ":branches: Lista de strings. O nome do ramo no qual a revisão foi\n" | |
|
14070 | 14109 | " consolidada. Será vazio se o nome do ramo for default." |
|
14071 | 14110 | |
|
14072 | 14111 | msgid ":children: List of strings. The children of the changeset." |
@@ -15895,6 +15934,10 b' msgid "%s certificate error: %s"' | |||
|
15895 | 15934 | msgstr "erro no certificado de %s: %s" |
|
15896 | 15935 | |
|
15897 | 15936 | #, python-format |
|
15937 | msgid "warning: %s certificate not verified (check web.cacerts config setting)\n" | |
|
15938 | msgstr "aviso: certificado %s não verificado (confira a opção de configuração web.cacerts)\n" | |
|
15939 | ||
|
15940 | #, python-format | |
|
15898 | 15941 | msgid "command '%s' failed: %s" |
|
15899 | 15942 | msgstr "falha ao executar o comando '%s' : %s" |
|
15900 | 15943 | |
@@ -16170,6 +16213,8 b' msgstr "o push falhou:"' | |||
|
16170 | 16213 | msgid "push failed (unexpected response):" |
|
16171 | 16214 | msgstr "o push falhou (resposta inesperada):" |
|
16172 | 16215 | |
|
16216 | msgid "replace existing tag" | |
|
16217 | msgstr "substitui etiqueta existente" | |
|
16218 | ||
|
16173 | 16219 | msgid "- You should use single encoding in one repository." |
|
16174 | 16220 | msgstr "- Você deve usar uma única codificação em um repositório." |
|
16175 |
@@ -13,8 +13,8 b' msgid ""' | |||
|
13 | 13 | msgstr "" |
|
14 | 14 | "Project-Id-Version: Mercurial\n" |
|
15 | 15 | "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" |
|
16 |
"POT-Creation-Date: 2010-1 |
|
|
17 |
"PO-Revision-Date: 2010-1 |
|
|
16 | "POT-Creation-Date: 2010-12-19 19:38+0100\n" | |
|
17 | "PO-Revision-Date: 2010-12-19 19:40+0100\n" | |
|
18 | 18 | "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" |
|
19 | 19 | "Language-Team: Swedish\n" |
|
20 | 20 | "Language: Swedish\n" |
@@ -1884,20 +1884,22 b' msgid ""' | |||
|
1884 | 1884 | msgstr "" |
|
1885 | 1885 | |
|
1886 | 1886 | msgid "" |
|
1887 |
"The ``[patterns]`` section specifies |
|
|
1888 | "working directory. The format is specified by a file pattern. The\n" | |
|
1889 | "first match is used, so put more specific patterns first. The\n" | |
|
1890 | "available line endings are ``LF``, ``CRLF``, and ``BIN``." | |
|
1887 | "The ``[patterns]`` section specifies how line endings should be\n" | |
|
1888 | "converted between the working copy and the repository. The format is\n" | |
|
1889 | "specified by a file pattern. The first match is used, so put more\n" | |
|
1890 | "specific patterns first. The available line endings are ``LF``,\n" | |
|
1891 | "``CRLF``, and ``BIN``." | |
|
1891 | 1892 | msgstr "" |
|
1892 | 1893 | |
|
1893 | 1894 | msgid "" |
|
1894 | 1895 | "Files with the declared format of ``CRLF`` or ``LF`` are always\n" |
|
1895 | "checked out in that format and files declared to be binary (``BIN``)\n" | |
|
1896 | "are left unchanged. Additionally, ``native`` is an alias for the\n" | |
|
1897 | "platform's default line ending: ``LF`` on Unix (including Mac OS X)\n" | |
|
1898 | "and ``CRLF`` on Windows. Note that ``BIN`` (do nothing to line\n" | |
|
1899 | "endings) is Mercurial's default behaviour; it is only needed if you\n" | |
|
1900 | "need to override a later, more general pattern." | |
|
1896 | "checked out and stored in the repository in that format and files\n" | |
|
1897 | "declared to be binary (``BIN``) are left unchanged. Additionally,\n" | |
|
1898 | "``native`` is an alias for checking out in the platform's default line\n" | |
|
1899 | "ending: ``LF`` on Unix (including Mac OS X) and ``CRLF`` on\n" | |
|
1900 | "Windows. Note that ``BIN`` (do nothing to line endings) is Mercurial's\n" | |
|
1901 | "default behaviour; it is only needed if you need to override a later,\n" | |
|
1902 | "more general pattern." | |
|
1901 | 1903 | msgstr "" |
|
1902 | 1904 | |
|
1903 | 1905 | msgid "" |
@@ -1930,6 +1932,12 b' msgid ""' | |||
|
1930 | 1932 | msgstr "" |
|
1931 | 1933 | |
|
1932 | 1934 | msgid "" |
|
1935 | ".. note::\n" | |
|
1936 | " The rules will first apply when files are touched in the working\n" | |
|
1937 | " copy, e.g. by updating to null and back to tip to touch all files." | |
|
1938 | msgstr "" | |
|
1939 | ||
|
1940 | msgid "" | |
|
1933 | 1941 | "The extension uses an optional ``[eol]`` section in your hgrc file\n" |
|
1934 | 1942 | "(not the ``.hgeol`` file) for settings that control the overall\n" |
|
1935 | 1943 | "behavior. There are two settings:" |
@@ -1951,6 +1959,13 b' msgid ""' | |||
|
1951 | 1959 | msgstr "" |
|
1952 | 1960 | |
|
1953 | 1961 | msgid "" |
|
1962 | "The ``win32text.forbid*`` hooks provided by the win32text extension\n" | |
|
1963 | "have been unified into a single hook named ``eol.hook``. The hook will\n" | |
|
1964 | "lookup the expected line endings from the ``.hgeol`` file, which means\n" | |
|
1965 | "you must migrate to a ``.hgeol`` file first before using the hook." | |
|
1966 | msgstr "" | |
|
1967 | ||
|
1968 | msgid "" | |
|
1954 | 1969 | "See :hg:`help patterns` for more information about the glob patterns\n" |
|
1955 | 1970 | "used.\n" |
|
1956 | 1971 | msgstr "" |
@@ -2828,7 +2843,7 b' msgstr ""' | |||
|
2828 | 2843 | msgid "" |
|
2829 | 2844 | "The default template mappings (view with :hg:`kwdemo -d`) can be\n" |
|
2830 | 2845 | "replaced with customized keywords and templates. Again, run\n" |
|
2831 | ":hg:`kwdemo` to control the results of your config changes." | |
|
2846 | ":hg:`kwdemo` to control the results of your configuration changes." | |
|
2832 | 2847 | msgstr "" |
|
2833 | 2848 | |
|
2834 | 2849 | msgid "" |
@@ -3313,6 +3328,18 b' msgstr ""' | |||
|
3313 | 3328 | msgid "cannot refresh a revision with children" |
|
3314 | 3329 | msgstr "" |
|
3315 | 3330 | |
|
3331 | #, python-format | |
|
3332 | msgid "warning: not refreshing %s\n" | |
|
3333 | msgstr "varning: uppdaterar inte %s\n" | |
|
3334 | ||
|
3335 | #, python-format | |
|
3336 | msgid "warning: not adding %s\n" | |
|
3337 | msgstr "varning: lägger inte till %s\n" | |
|
3338 | ||
|
3339 | #, python-format | |
|
3340 | msgid "warning: not removing %s\n" | |
|
3341 | msgstr "varning: tar inte bort %s\n" | |
|
3342 | ||
|
3316 | 3343 | msgid "" |
|
3317 | 3344 | "refresh interrupted while patch was popped! (revert --all, qpush to " |
|
3318 | 3345 | "recover)\n" |
@@ -5057,8 +5084,8 b' msgstr ""' | |||
|
5057 | 5084 | msgid "changesets" |
|
5058 | 5085 | msgstr "ändringar" |
|
5059 | 5086 | |
|
5060 |
msgid " |
|
|
5061 |
msgstr " |
|
|
5087 | msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)" | |
|
5088 | msgstr "olösta konflikter (se hg resolve, sedan hg rebase --continue)" | |
|
5062 | 5089 | |
|
5063 | 5090 | #, python-format |
|
5064 | 5091 | msgid "no changes, revision %d skipped\n" |
@@ -5647,11 +5674,13 b' msgstr ""' | |||
|
5647 | 5674 | msgid "Note that there are some limitations on using this extension:" |
|
5648 | 5675 | msgstr "" |
|
5649 | 5676 | |
|
5650 | msgid "- You should use single encoding in one repository." | |
|
5651 | msgstr "" | |
|
5652 | ||
|
5653 | msgid "" | |
|
5654 | "\n" | |
|
5677 | msgid "" | |
|
5678 | "- You should use single encoding in one repository.\n" | |
|
5679 | "- If the repository path ends with 0x5c, .hg/hgrc cannot be read.\n" | |
|
5680 | "- win32mbcs is not compatible with fixutf8 extention." | |
|
5681 | msgstr "" | |
|
5682 | ||
|
5683 | msgid "" | |
|
5655 | 5684 | "By default, win32mbcs uses encoding.encoding decided by Mercurial.\n" |
|
5656 | 5685 | "You can specify the encoding by config option::" |
|
5657 | 5686 | msgstr "" |
@@ -8417,7 +8446,7 b' msgstr "starta frist\xc3\xa5ende webbserver"' | |||
|
8417 | 8446 | |
|
8418 | 8447 | msgid "" |
|
8419 | 8448 | " Start a local HTTP repository browser and pull server. You can use\n" |
|
8420 | " this for ad-hoc sharing and browing of repositories. It is\n" | |
|
8449 | " this for ad-hoc sharing and browsing of repositories. It is\n" | |
|
8421 | 8450 | " recommended to use a real web server to serve a repository for\n" |
|
8422 | 8451 | " longer periods of time." |
|
8423 | 8452 | msgstr "" |
@@ -8657,12 +8686,14 b' msgstr " Namnge en specifik revision ' | |||
|
8657 | 8686 | msgid "" |
|
8658 | 8687 | " Tags are used to name particular revisions of the repository and are\n" |
|
8659 | 8688 | " very useful to compare different revisions, to go back to significant\n" |
|
8660 | " earlier versions or to mark branch points as releases, etc." | |
|
8689 | " earlier versions or to mark branch points as releases, etc. Changing\n" | |
|
8690 | " an existing tag is normally disallowed; use -f/--force to override." | |
|
8661 | 8691 | msgstr "" |
|
8662 | 8692 | " Märken används för att namnge specifika revisioner i arkivet och är\n" |
|
8663 | 8693 | " väldigt användbara för at jämföra olika revisioner, för att gå\n" |
|
8664 | 8694 | " tillbaka till tidigare versioner eller för att markera förgreningar\n" |
|
8665 | " som releaser, osv." | |
|
8695 | " som releaser, osv. Att ändra ett existerande märke är normalt inte\n" | |
|
8696 | " tillåtet; använd -f/--force för att tvinga." | |
|
8666 | 8697 | |
|
8667 | 8698 | msgid "" |
|
8668 | 8699 | " If no revision is given, the parent of the working directory is\n" |
@@ -8673,20 +8704,33 b' msgstr ""' | |||
|
8673 | 8704 | |
|
8674 | 8705 | msgid "" |
|
8675 | 8706 | " To facilitate version control, distribution, and merging of tags,\n" |
|
8676 | " they are stored as a file named \".hgtags\" which is managed\n" | |
|
8677 |
" |
|
|
8678 | " necessary. The file '.hg/localtags' is used for local tags (not\n" | |
|
8679 | " shared among repositories)." | |
|
8707 | " they are stored as a file named \".hgtags\" which is managed similarly\n" | |
|
8708 | " to other project files and can be hand-edited if necessary. This\n" | |
|
8709 | " also means that tagging creates a new commit. The file\n" | |
|
8710 | " \".hg/localtags\" is used for local tags (not shared among\n" | |
|
8711 | " repositories)." | |
|
8680 | 8712 | msgstr "" |
|
8681 | 8713 | " För att underlätta versionshantering, distribution, och sammanfogning\n" |
|
8682 | 8714 | " av märken, lagras de som en fil vid namn \".hgtags\" som hanteras på\n" |
|
8683 | 8715 | " samma sätt som andra projektfiler och kan ändras för hand vid behov.\n" |
|
8684 |
" Filen |
|
|
8716 | " Filen \".hg/localtags\" används för lokala märken (ej delad i arkiv)." | |
|
8717 | ||
|
8718 | msgid "" | |
|
8719 | " Tag commits are usually made at the head of a branch. If the parent\n" | |
|
8720 | " of the working directory is not a branch head, :hg:`tag` aborts; use\n" | |
|
8721 | " -f/--force to force the tag commit to be based on a non-head\n" | |
|
8722 | " changeset." | |
|
8723 | msgstr "" | |
|
8724 | " Arkivering av märken görs vanligtvis på huvudet av en gren. Om\n" | |
|
8725 | " föräldern till arbetskatalogen inte är ett grenhuvud, så avbryts\n" | |
|
8726 | " :hg:`tag`; använd -f/--force för att tvinga arkiveringen." | |
|
8685 | 8727 | |
|
8686 | 8728 | msgid "" |
|
8687 | 8729 | " Since tag names have priority over branch names during revision\n" |
|
8688 | 8730 | " lookup, using an existing branch name as a tag name is discouraged." |
|
8689 | 8731 | msgstr "" |
|
8732 | " Eftersom märkesnamn har prioritet över grennamn vid uppslagning av\n" | |
|
8733 | " revisioner, avråds det att använda existerande grennamn som märkesnamn." | |
|
8690 | 8734 | |
|
8691 | 8735 | msgid "tag names must be unique" |
|
8692 | 8736 | msgstr "märkesnamn måste vara unika" |
@@ -8713,6 +8757,12 b' msgstr "m\xc3\xa4rket \'%s\' \xc3\xa4r inte ett lokalt m\xc3\xa4rke"' | |||
|
8713 | 8757 | msgid "tag '%s' already exists (use -f to force)" |
|
8714 | 8758 | msgstr "märket '%s' existerar redan (använd -f för att tvinga)" |
|
8715 | 8759 | |
|
8760 | msgid "uncommitted merge" | |
|
8761 | msgstr "oarkiverad sammanfogning" | |
|
8762 | ||
|
8763 | msgid "not at a branch head (use -f to force)" | |
|
8764 | msgstr "inte vid ett grenhuvud (använd -f för att tvinga)" | |
|
8765 | ||
|
8716 | 8766 | msgid "list repository tags" |
|
8717 | 8767 | msgstr "lista arkivmärken" |
|
8718 | 8768 | |
@@ -9615,8 +9665,8 b' msgstr "visa differens fr\xc3\xa5n revision"' | |||
|
9615 | 9665 | msgid "list the changed files of a revision" |
|
9616 | 9666 | msgstr "visa de ändrade filerna från en revision" |
|
9617 | 9667 | |
|
9618 |
msgid "r |
|
|
9619 |
msgstr " |
|
|
9668 | msgid "force tag" | |
|
9669 | msgstr "tvinga märkning" | |
|
9620 | 9670 | |
|
9621 | 9671 | msgid "make the tag local" |
|
9622 | 9672 | msgstr "gör märket lokalt" |
@@ -12108,7 +12158,7 b' msgstr ""' | |||
|
12108 | 12158 | msgid "" |
|
12109 | 12159 | "Paths in the local filesystem can either point to Mercurial\n" |
|
12110 | 12160 | "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" |
|
12111 | "incoming --bundle`)." | |
|
12161 | "incoming --bundle`). See also :hg:`help paths`." | |
|
12112 | 12162 | msgstr "" |
|
12113 | 12163 | |
|
12114 | 12164 | msgid "" |
@@ -12461,6 +12511,10 b' msgstr ""' | |||
|
12461 | 12511 | msgid "working directory of %s" |
|
12462 | 12512 | msgstr "" |
|
12463 | 12513 | |
|
12514 | #, python-format | |
|
12515 | msgid "warning: can't find ancestor for '%s' copied from '%s'!\n" | |
|
12516 | msgstr "varning: kan inte hitta anfader för '%s', kopierad från '%s'!\n" | |
|
12517 | ||
|
12464 | 12518 | msgid "cannot partially commit a merge (do not specify files or patterns)" |
|
12465 | 12519 | msgstr "" |
|
12466 | 12520 | |
@@ -13295,6 +13349,10 b' msgid "invalid entry in fncache, line %s' | |||
|
13295 | 13349 | msgstr "" |
|
13296 | 13350 | |
|
13297 | 13351 | #, python-format |
|
13352 | msgid "warning: subrepo spec file %s not found\n" | |
|
13353 | msgstr "" | |
|
13354 | ||
|
13355 | #, python-format | |
|
13298 | 13356 | msgid "subrepo spec file %s not found" |
|
13299 | 13357 | msgstr "" |
|
13300 | 13358 | |
@@ -13495,6 +13553,13 b' msgid "%s certificate error: %s"' | |||
|
13495 | 13553 | msgstr "%s certifikatfel: %s" |
|
13496 | 13554 | |
|
13497 | 13555 | #, python-format |
|
13556 | msgid "" | |
|
13557 | "warning: %s certificate not verified (check web.cacerts config setting)\n" | |
|
13558 | msgstr "" | |
|
13559 | "varning: %s-certificatet overifierad (kontrollera inställningen " | |
|
13560 | "web.cacerts)\n" | |
|
13561 | ||
|
13562 | #, python-format | |
|
13498 | 13563 | msgid "command '%s' failed: %s" |
|
13499 | 13564 | msgstr "kommandot '%s' misslyckades: %s" |
|
13500 | 13565 | |
@@ -13517,17 +13582,28 b' msgstr ""' | |||
|
13517 | 13582 | msgid "could not symlink to %r: %s" |
|
13518 | 13583 | msgstr "" |
|
13519 | 13584 | |
|
13585 | msgid "check your clock" | |
|
13586 | msgstr "kontrollera din klocka" | |
|
13587 | ||
|
13588 | #, python-format | |
|
13589 | msgid "negative timestamp: %d" | |
|
13590 | msgstr "negativ tidsstämpel: %d" | |
|
13591 | ||
|
13520 | 13592 | #, python-format |
|
13521 | 13593 | msgid "invalid date: %r" |
|
13522 | 13594 | msgstr "ogiltigt datum: %r" |
|
13523 | 13595 | |
|
13524 | 13596 | #, python-format |
|
13525 | 13597 | msgid "date exceeds 32 bits: %d" |
|
13526 | msgstr "" | |
|
13598 | msgstr "datum överskrider 32 bitar: %d" | |
|
13599 | ||
|
13600 | #, python-format | |
|
13601 | msgid "negative date value: %d" | |
|
13602 | msgstr "negativt datumvärde: %d" | |
|
13527 | 13603 | |
|
13528 | 13604 | #, python-format |
|
13529 | 13605 | msgid "impossible time zone offset: %d" |
|
13530 | msgstr "" | |
|
13606 | msgstr "omöjlig tidzonsoffset: %d" | |
|
13531 | 13607 | |
|
13532 | 13608 | #, python-format |
|
13533 | 13609 | msgid "invalid day spec: %s" |
@@ -13535,43 +13611,43 b' msgstr ""' | |||
|
13535 | 13611 | |
|
13536 | 13612 | #, python-format |
|
13537 | 13613 | msgid "%.0f GB" |
|
13538 | msgstr "" | |
|
13614 | msgstr "%.0f GB" | |
|
13539 | 13615 | |
|
13540 | 13616 | #, python-format |
|
13541 | 13617 | msgid "%.1f GB" |
|
13542 | msgstr "" | |
|
13618 | msgstr "%.1f GB" | |
|
13543 | 13619 | |
|
13544 | 13620 | #, python-format |
|
13545 | 13621 | msgid "%.2f GB" |
|
13546 | msgstr "" | |
|
13622 | msgstr "%.2f GB" | |
|
13547 | 13623 | |
|
13548 | 13624 | #, python-format |
|
13549 | 13625 | msgid "%.0f MB" |
|
13550 | msgstr "" | |
|
13626 | msgstr "%.0f MB" | |
|
13551 | 13627 | |
|
13552 | 13628 | #, python-format |
|
13553 | 13629 | msgid "%.1f MB" |
|
13554 | msgstr "" | |
|
13630 | msgstr "%.1f MB" | |
|
13555 | 13631 | |
|
13556 | 13632 | #, python-format |
|
13557 | 13633 | msgid "%.2f MB" |
|
13558 | msgstr "" | |
|
13634 | msgstr "%.2f MB" | |
|
13559 | 13635 | |
|
13560 | 13636 | #, python-format |
|
13561 | 13637 | msgid "%.0f KB" |
|
13562 | msgstr "" | |
|
13638 | msgstr "%.0f KB" | |
|
13563 | 13639 | |
|
13564 | 13640 | #, python-format |
|
13565 | 13641 | msgid "%.1f KB" |
|
13566 | msgstr "" | |
|
13642 | msgstr "%.1f KB" | |
|
13567 | 13643 | |
|
13568 | 13644 | #, python-format |
|
13569 | 13645 | msgid "%.2f KB" |
|
13570 | msgstr "" | |
|
13646 | msgstr "%.2f KB" | |
|
13571 | 13647 | |
|
13572 | 13648 | #, python-format |
|
13573 | 13649 | msgid "%.0f bytes" |
|
13574 | msgstr "" | |
|
13650 | msgstr "%.0f bytes" | |
|
13575 | 13651 | |
|
13576 | 13652 | #, python-format |
|
13577 | 13653 | msgid "no port number associated with service '%s'" |
@@ -1244,12 +1244,23 b' def email(author):' | |||
|
1244 | 1244 | r = None |
|
1245 | 1245 | return author[author.find('<') + 1:r] |
|
1246 | 1246 | |
|
1247 | def _ellipsis(text, maxlength): | |
|
1248 | if len(text) <= maxlength: | |
|
1249 | return text, False | |
|
1250 | else: | |
|
1251 | return "%s..." % (text[:maxlength - 3]), True | |
|
1252 | ||
|
1247 | 1253 | def ellipsis(text, maxlength=400): |
|
1248 | 1254 | """Trim string to at most maxlength (default: 400) characters.""" |
|
1249 | if len(text) <= maxlength: | |
|
1250 | return text | |
|
1251 | else: | |
|
1252 | return "%s..." % (text[:maxlength - 3]) | |
|
1255 | try: | |
|
1256 | # use unicode not to split at intermediate multi-byte sequence | |
|
1257 | utext, truncated = _ellipsis(text.decode(encoding.encoding), | |
|
1258 | maxlength) | |
|
1259 | if not truncated: | |
|
1260 | return text | |
|
1261 | return utext.encode(encoding.encoding) | |
|
1262 | except (UnicodeDecodeError, UnicodeEncodeError): | |
|
1263 | return _ellipsis(text, maxlength)[0] | |
|
1253 | 1264 | |
|
1254 | 1265 | def walkrepos(path, followsym=False, seen_dirs=None, recurse=False): |
|
1255 | 1266 | '''yield every hg repository under path, recursively.''' |
@@ -302,3 +302,49 b' test merge' | |||
|
302 | 302 | changeset 22c88b85aa27 in b |
|
303 | 303 | description: merge |
|
304 | 304 | (run 'hg update' to get a working copy) |
|
305 | ||
|
306 | truncate multi-byte subject | |
|
307 | ||
|
308 | $ cat <<EOF >> $HGRCPATH | |
|
309 | > [notify] | |
|
310 | > maxsubject = 4 | |
|
311 | > EOF | |
|
312 | $ echo a >> a/a | |
|
313 | $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \ | |
|
314 | > -m `python -c 'print "\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4"'` | |
|
315 | $ hg --traceback --cwd b --encoding utf-8 pull ../a | \ | |
|
316 | > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' | |
|
317 | pulling from ../a | |
|
318 | searching for changes | |
|
319 | adding changesets | |
|
320 | adding manifests | |
|
321 | adding file changes | |
|
322 | added 1 changesets with 1 changes to 1 files | |
|
323 | Content-Type: text/plain; charset="us-ascii" | |
|
324 | MIME-Version: 1.0 | |
|
325 | Content-Transfer-Encoding: 8bit | |
|
326 | X-Test: foo | |
|
327 | Date: * (glob) | |
|
328 | Subject: \xc3\xa0... (esc) | |
|
329 | From: test@test.com | |
|
330 | X-Hg-Notification: changeset 4a47f01c1356 | |
|
331 | Message-Id: <*> (glob) | |
|
332 | To: baz@test.com, foo@bar | |
|
333 | ||
|
334 | changeset 4a47f01c1356 in b | |
|
335 | description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc) | |
|
336 | diffstat: | |
|
337 | ||
|
338 | a | 1 + | |
|
339 | 1 files changed, 1 insertions(+), 0 deletions(-) | |
|
340 | ||
|
341 | diffs (7 lines): | |
|
342 | ||
|
343 | diff -r 22c88b85aa27 -r 4a47f01c1356 a | |
|
344 | --- a/a Thu Jan 01 00:00:03 1970 +0000 | |
|
345 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
|
346 | @@ -1,2 +1,3 @@ | |
|
347 | a | |
|
348 | a | |
|
349 | +a | |
|
350 | (run 'hg update' to get a working copy) |
General Comments 0
You need to be logged in to leave comments.
Login now