Mercurial > hg-stable
changeset 17552:453d790fe089
Merge with mpm
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Thu, 13 Sep 2012 17:00:56 -0700 |
| parents | a7b3fdaf768d (current diff) fc1a5d0eb3bb (diff) |
| children | 5ab863922e0f |
| files | |
| diffstat | 3 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/de.po Sun Aug 26 01:28:22 2012 +0200 +++ b/i18n/de.po Thu Sep 13 17:00:56 2012 -0700 @@ -21,7 +21,7 @@ "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" "POT-Creation-Date: 2012-09-01 14:20+0200\n" -"PO-Revision-Date: 2012-09-01 14:29+0100\n" +"PO-Revision-Date: 2012-09-10 09:39+0100\n" "Last-Translator: Martin Schröder <martinschroeder@vcp-sh.de>\n" "Language-Team: \n" "Language: de\n" @@ -19589,7 +19589,7 @@ msgstr "%s: Unversionierte Datei verändert\n" msgid "untracked files in working directory differ from files in requested revision" -msgstr "Unversionierte Dateien in der Arbeitskopie unterscheidet sich von der angeforderten Revision: '%s'" +msgstr "Unversionierte Dateien in der Arbeitskopie unterscheidet sich von der angeforderten Revision" #, python-format msgid "case-folding collision between %s and %s"
--- a/i18n/pt_BR.po Sun Aug 26 01:28:22 2012 +0200 +++ b/i18n/pt_BR.po Thu Sep 13 17:00:56 2012 -0700 @@ -21246,19 +21246,19 @@ "2. Nested repository references. They are defined in ``.hgsub``, which\n" " should be placed in the root of working directory, and\n" " tell where the subrepository checkouts come from. Mercurial\n" -" subrepositories are referenced like:" +" subrepositories are referenced like::" msgstr "" "2. Referências a repositórios aninhados. São definidas no\n" " arquivo ``.hgsub`` no raiz do repositório,\n" " e informam ao Mercurial de onde as cópias\n" " locais devem ser obtidas. Sub-repositórios do Mercurial são\n" -" referenciados da seguinte maneira:" +" referenciados da seguinte maneira::" msgid " path/to/nested = https://example.com/nested/repo/path" msgstr " caminho/aninhado = https://exemplo.com/aninhado/repo/caminho" -msgid " Git and Subversion subrepos are also supported:" -msgstr " Subrepositórios do Git e do Subversion também são suportados:" +msgid " Git and Subversion subrepos are also supported::" +msgstr " Subrepositórios do Git e do Subversion também são suportados::" msgid "" " path/to/nested = [git]git://example.com/nested/repo/path\n"
--- a/tests/run-tests.py Sun Aug 26 01:28:22 2012 +0200 +++ b/tests/run-tests.py Thu Sep 13 17:00:56 2012 -0700 @@ -1211,6 +1211,10 @@ # can't remove on solaris os.environ[k] = '' del os.environ[k] + if 'HG' in os.environ: + # can't remove on solaris + os.environ['HG'] = '' + del os.environ['HG'] global TESTDIR, HGTMP, INST, BINDIR, PYTHONDIR, COVERAGE_FILE TESTDIR = os.environ["TESTDIR"] = os.getcwd()