Mercurial > hg-stable
changeset 20563:06f46bad8714
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 24 Feb 2014 18:49:09 -0600 |
| parents | 165b117ffc1e (current diff) 7b9d66c0e4fa (diff) |
| children | 0ad353831461 |
| files | |
| diffstat | 1 files changed, 27 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/pt_BR.po Mon Feb 24 09:27:32 2014 -0800 +++ b/i18n/pt_BR.po Mon Feb 24 18:49:09 2014 -0600 @@ -17978,10 +17978,10 @@ msgid "" " [hostfingerprints]\n" -" hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:d4:89:2a:9d" +" hg.intevation.org = fa:1f:d9:48:f1:e7:74:30:38:8d:d8:58:b6:94:b8:58:28:7d:8b:d0" msgstr "" " [hostfingerprints]\n" -" hg.intevation.org = 44:ed:af:1f:97:11:b6:01:7a:48:45:fc:10:3c:b7:f9:d4:89:2a:9d" +" hg.intevation.org = fa:1f:d9:48:f1:e7:74:30:38:8d:d8:58:b6:94:b8:58:28:7d:8b:d0" msgid "This feature is only supported when using Python 2.6 or later." msgstr "" @@ -18414,30 +18414,36 @@ " Fase de revisões criadas usando commit.\n" " Padrão: draft (rascunho)" -msgid "``checksubrepos``" -msgstr "``checksubrepos``" - -msgid "" -" Check phase of state in each subrepositories, allowed values are\n" -" \"ignore\", \"follow\" or \"abort\". For settings other than \"ignore\",\n" -" the phase of each subrepository commit is checked before committing\n" -" in the parent repository. If there is any greater phase than the parent\n" -" (\"secret\" vs \"draft\", for example), the commit is either aborted\n" -" with \"abort\" or the higher phase is used with \"follow\". Default: \"follow\"." -msgstr "" -" Verifica a fase do estado de cada sub-repositório. Os valores\n" +msgid "" +"``checksubrepos``\n" +" Check the phase of the current revision of each subrepository. Allowed\n" +" values are \"ignore\", \"follow\" and \"abort\". For settings other than\n" +" \"ignore\", the phase of the current revision of each subrepository is\n" +" checked before committing the parent repository. If any of those phases is\n" +" greater than the phase of the parent repository (e.g. if a subrepo is in a\n" +" \"secret\" phase while the parent repo is in \"draft\" phase), the commit is\n" +" either aborted (if checksubrepos is set to \"abort\") or the higher phase is\n" +" used for the parent repository commit (if set to \"follow\").\n" +" Default: \"follow\"" +msgstr "" +"``checksubrepos``\n" +" Verifica a fase da revisão atual de cada sub-repositório. Os valores\n" " possíveis são \"ignore\", \"follow\" ou \"abort\". Para valores\n" -" diferentes de \"ignore\", a fase da consolidação de cada\n" +" diferentes de \"ignore\", a fase da revisão atual de cada\n" " sub-repositório será verificada antes da consolidação no repositório\n" -" pai. Se houver qualquer fase maior que a do pai (\"secret\" versus\n" -" \"draft\", por exemplo), o valor \"abort\" faz com que a consolidação\n" -" seja abortada, e \"follow\" faz com que seja usada a fase mais\n" -" alta. O valor padrão é: \"follow\"." - -msgid "" +" pai. Se houver qualquer fase maior que a do pai (por exemplo, se um\n" +" sub-repositório estiver na fase \"secret\" e o repositório pai estiver\n" +" na fase \"draft\"), o valor \"abort\" faz com que a consolidação\n" +" seja abortada, e \"follow\" faz com que a fase mais alta seja usada\n" +" na consolidação do repositório pai.\n" +" O valor padrão é: \"follow\"." + +msgid "" +"\n" "``profiling``\n" "-------------" msgstr "" +"\n" "``profiling``\n" "-------------"