Mercurial > hg
changeset 13577:18937290986c
merge with stable
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 11 Mar 2011 12:35:41 +0100 |
| parents | edd06611a7c6 (current diff) 8e94a1b4e9a4 (diff) |
| children | e720b3324e35 |
| files | |
| diffstat | 3 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsigs Thu Mar 10 16:49:37 2011 +0100 +++ b/.hgsigs Fri Mar 11 12:35:41 2011 +0100 @@ -35,3 +35,4 @@ a6c855c32ea081da3c3b8ff628f1847ff271482f 0 iD8DBQBNSJJ+ywK+sNU5EO8RAoJaAKCweDEF70fu+r1Zn7pYDXdlk5RuSgCeO9gK/eit8Lin/1n3pO7aYguFLok= 2b2155623ee2559caf288fd333f30475966c4525 0 iD8DBQBNSJeBywK+sNU5EO8RAm1KAJ4hW9Cm9nHaaGJguchBaPLlAr+O3wCgqgmMok8bdAS06N6PL60PSTM//Gg= 2616325766e3504c8ae7c84bd15ee610901fe91d 0 iD8DBQBNbWy9ywK+sNU5EO8RAlWCAJ4mW8HbzjJj9GpK98muX7k+7EvEHwCfaTLbC/DH3QEsZBhEP+M8tzL6RU4= +aa1f3be38ab127280761889d2dca906ca465b5f4 0 iD8DBQBNeQq7ywK+sNU5EO8RAlEOAJ4tlEDdetE9lKfjGgjbkcR8PrC3egCfXCfF3qNVvU/2YYjpgvRwevjvDy0=
--- a/.hgtags Thu Mar 10 16:49:37 2011 +0100 +++ b/.hgtags Fri Mar 11 12:35:41 2011 +0100 @@ -47,3 +47,4 @@ a6c855c32ea081da3c3b8ff628f1847ff271482f 1.7.4 2b2155623ee2559caf288fd333f30475966c4525 1.7.5 2616325766e3504c8ae7c84bd15ee610901fe91d 1.8 +aa1f3be38ab127280761889d2dca906ca465b5f4 1.8.1
--- a/i18n/pt_BR.po Thu Mar 10 16:49:37 2011 +0100 +++ b/i18n/pt_BR.po Fri Mar 11 12:35:41 2011 +0100 @@ -14975,8 +14975,8 @@ msgid "file not tracked!" msgstr "arquivo não rastreado!" -msgid "unresolved merge conflicts (see hg resolve)" -msgstr "conflitos de mesclagem não resolvidos (veja hg resolve)" +msgid "unresolved merge conflicts (see hg help resolve)" +msgstr "conflitos de mesclagem não resolvidos (veja hg help resolve)" #, python-format msgid "committing subrepository %s\n" @@ -16022,6 +16022,10 @@ msgstr "obtenha um ramo do git se você pretender fazer mudanças\n" #, python-format +msgid "subrepo %s is missing" +msgstr "o sub-repositório %s está faltando" + +#, python-format msgid "unrelated git branch checked out in subrepo %s\n" msgstr "ramo do git não relacionado obtido no sub-repositório %s\n" @@ -16191,6 +16195,10 @@ msgstr "nenhum commonName ou subjectAltName encontrado no certificado" #, python-format +msgid "could not find web.cacerts: %s" +msgstr "não foi possível encontrar web.cacerts: %s" + +#, python-format msgid "%s certificate error: %s (use --insecure to connect insecurely)" msgstr "erro no certificado de %s: %s (use --insecure para conectar de modo inseguro)"