Merge git://github.com/git-l10n/git-po

* git://github.com/git-l10n/git-po:
l10n: correct indentation of show-branch usage
l10n: de.po: translate 3 messages
l10n: zh_CN: various fixes on command arguments
l10n: vi.po(2298t): Updated 3 new strings
l10n: sv.po: Update Swedish translation (2298t0f0u)
l10n: fr.po v2.3.0 round 2
l10n: git.pot: v2.3.0 round 2 (3 updated)
l10n: de.po: translate 13 new messages
l10n: de.po: fix typo
l10n: de.po: translate "track" as "versionieren"
l10n: zh_CN: translations for git v2.3.0-rc0
l10n: sv.po: Update Swedish translation (2298t0f0u)
l10n: fr.po v2.3.0 round 1
l10n: vi.po(2298t): Updated and change Plural-Forms
l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
l10n: ca.po: various fixes

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 2f6b6aabd74a24abdb3ac189118095fcee19f8d2..3e39e2815baca82fe5f1fff8791de37c3c7247ac 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -103,7 +103,7 @@ ASCIIDOC_HTML = xhtml11
 ASCIIDOC_DOCBOOK = docbook
 ASCIIDOC_CONF = -f asciidoc.conf
 ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
-               -agit-version=$(GIT_VERSION)
+               -agit_version=$(GIT_VERSION)
 TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
 TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
 MANPAGE_XSL = manpage-normal.xsl

diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 245406ab979d63d3588c4e2000b02cc5f24e493b..8cffd35fb03d7ca5abbd1a229c6c8533f8c5e917 100755 (executable)
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -658,7 +658,7 @@ test_expect_success '--show-notes=* adds to GIT_NOTES_DISPLAY_REF' '
 '
 
 test_expect_success '--no-standard-notes' '
-       cat >expect-commits <<EOF
+       cat >expect-commits <<-EOF &&
                commit 2c125331118caba0ff8238b7f4958ac6e93fe39c
                Author: A U Thor <author@example.com>
                Date:   Thu Apr 7 15:18:13 2005 -0700