Merge with mpm

i18n/de.po

@@ -21,7 +21,7 b' msgstr ""'
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\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 <[e-mail]>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -19589,7 +19589,7 b' msgid "%s: untracked file differs\\n"'
 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"

i18n/pt_BR.po

@@ -21246,19 +21246,19 b' msgid ""'
 "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"

tests/run-tests.py

@@ -1211,6 +1211,10 b' def main():'
             # 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()