* [PATCH 0/3] ab/i18n: README and GETTEXT_POISON support
2010-09-03 18:22 [GIT PULL] New ab/i18n series and builtin fixes Ævar Arnfjörð Bjarmason
@ 2010-09-03 23:24 ` Ævar Arnfjörð Bjarmason
2010-09-03 23:24 ` [PATCH 1/3] gettext: Add po/README file documenting Git's gettext Ævar Arnfjörð Bjarmason
` (5 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-03 23:24 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Ævar Arnfjörð Bjarmason
On Fri, Sep 3, 2010 at 18:22, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> This is a pull request for an updated ab/i18n and the builtin.h
> changes. I can also send this to list on request, but it's 25 patches
> for what are trivial merge changes and a doc patch.
>
> I've rebased the ab/i18n series on top of master. Now it looks like
> this:
>
> master
> \
> use-builtin-h-for-builtin-commands-v2
> \
> ab/i18n
>
> The changes are:
>
> [....]
>
> 1c7584b gettext: Add po/README file documenting Git's gettext
>
> This is new, a README file describing how to deal with the po/
> directory. See http://github.com/avar/git/raw/ab/i18n/po/README
Here's the README patch at the tip of the new ab/i18n (for reference,
because it wasn't on-list before), and the GETTEXT_POISON support I
promised to implement.
The poison support allows us to me much more sure that this gettext
stuff is actually working as intended. For one it turned up a bug in
the gettextization in builtin/fetch.c (I'll elaborate in a
soon-to-follow series).
Ævar Arnfjörð Bjarmason (3):
gettext: Add po/README file documenting Git's gettext
gettext: Add GETTEXT_POISON=YesPlease Makefile parameter
gettext: add NO_GETTEXT_POISON prerequisite to tests
Makefile | 9 ++++
gettext.h | 4 ++
po/README | 68 ++++++++++++++++++++++++++++
t/lib-gettext.sh | 10 +++-
t/lib-httpd.sh | 2 +-
t/t0001-init.sh | 2 +-
t/t1200-tutorial.sh | 4 +-
t/t2200-add-update.sh | 2 +-
t/t2204-add-ignored.sh | 8 ++--
t/t3030-merge-recursive.sh | 2 +-
t/t3200-branch.sh | 2 +-
t/t3203-branch-output.sh | 2 +-
t/t3700-add.sh | 4 +-
t/t4001-diff-rename.sh | 4 +-
t/t4014-format-patch.sh | 2 +-
t/t5541-http-push.sh | 2 +-
t/t5601-clone.sh | 2 +-
t/t6040-tracking-info.sh | 2 +-
t/t6200-fmt-merge-msg.sh | 28 ++++++------
t/t7004-tag.sh | 6 ++-
t/t7060-wtstatus.sh | 2 +-
t/t7102-reset.sh | 2 +-
t/t7110-reset-merge.sh | 6 +-
t/t7201-co.sh | 10 ++--
t/t7500-commit.sh | 9 +++-
t/t7501-commit.sh | 16 +++++--
t/t7502-commit.sh | 46 ++++++++++----------
t/t7506-status-submodule.sh | 28 ++++++------
t/t7508-status.sh | 98 ++++++++++++++++++++--------------------
t/t7600-merge.sh | 2 +-
t/t7602-merge-octopus-many.sh | 6 +-
t/t7811-grep-open.sh | 2 +-
t/test-lib.sh | 1 +
33 files changed, 247 insertions(+), 146 deletions(-)
create mode 100644 po/README
--
1.7.2.2.336.g704fc
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 1/3] gettext: Add po/README file documenting Git's gettext
2010-09-03 18:22 [GIT PULL] New ab/i18n series and builtin fixes Ævar Arnfjörð Bjarmason
2010-09-03 23:24 ` [PATCH 0/3] ab/i18n: README and GETTEXT_POISON support Ævar Arnfjörð Bjarmason
@ 2010-09-03 23:24 ` Ævar Arnfjörð Bjarmason
2010-09-03 23:24 ` [PATCH 2/3] gettext: Add GETTEXT_POISON=YesPlease Makefile parameter Ævar Arnfjörð Bjarmason
` (4 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-03 23:24 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Ævar Arnfjörð Bjarmason
Add a po/README file. This documentation is targated at translators
and maintainers of git.git.
Currently it describes how to add new PO files and how to update
them. But in the future we want to add more things to it, e.g. how and
what to add in TRANSLATOR comments, how to make the source more
gettext friendly etc.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Turns out we do just fine with --no-location.
po/README | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
create mode 100644 po/README
diff --git a/po/README b/po/README
new file mode 100644
index 0000000..cca8012
--- /dev/null
+++ b/po/README
@@ -0,0 +1,68 @@
+Core GIT Translations
+=====================
+
+This directory holds the translations for the core of Git. This
+document describes how to add to and maintain these translations.
+
+
+Generating a .pot file
+----------------------
+
+The po/git.pot file contains a message catalog extracted from Git's
+sources. You need to generate it to add new translations with
+msginit(1), or update existing ones with msgmerge(1).
+
+Since the file can be automatically generated it's not checked into
+git.git. To generate it do, at the top-level:
+
+ make pot
+
+
+Initializing a .po file
+-----------------------
+
+To add a new translation first generate git.pot (see above) and then
+in the po/ directory do:
+
+ msginit --locale=XX --no-translator
+
+Where XX is your locale, e.g. "is", "de" or "pt_BR".
+
+Then, because msginit(1) will include a lot of superfluous info we
+don't want run this on it:
+
+ perl -ni -e '
+ if (1 .. /^$/) {
+ s/^#.*\n//;
+ s/(?<=Project-Id-Version: )PACKAGE VERSION/Git/;
+ s/"(?:PO-Revision-Date|Language-Team|Last-Translator): .*\n//;
+ }
+ s/^#: .*\n//;
+ print
+ ' XX.po
+
+We omit removing "POT-Creation-Date", because msgmerge(1) always adds
+it if it isn't present, and removing it after each msgmerge is harder
+than just including it to begin with.
+
+
+Updating a .po file
+-------------------
+
+If there's an existing *.po file for your language but you need to
+update the translation you first need to generate git.pot (see above)
+and then in the po/ directory do:
+
+ msgmerge --no-location --backup=off -U XX.po git.pot
+
+Where XX.po is the file you want to update.
+
+If you want to generate location comments (it can be very useful to
+see the source for context while translating) do:
+
+ msgmerge --add-location --backup=off -U XX.po git.pot
+
+But then you need remember to remove the comments before you submit
+the file upstream:
+
+ perl -pi -e 's/^#: .*\n//' XX.po
--
1.7.2.2.336.g704fc
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/3] gettext: Add GETTEXT_POISON=YesPlease Makefile parameter
2010-09-03 18:22 [GIT PULL] New ab/i18n series and builtin fixes Ævar Arnfjörð Bjarmason
2010-09-03 23:24 ` [PATCH 0/3] ab/i18n: README and GETTEXT_POISON support Ævar Arnfjörð Bjarmason
2010-09-03 23:24 ` [PATCH 1/3] gettext: Add po/README file documenting Git's gettext Ævar Arnfjörð Bjarmason
@ 2010-09-03 23:24 ` Ævar Arnfjörð Bjarmason
2010-09-03 23:24 ` [PATCH 3/3] gettext: add NO_GETTEXT_POISON prerequisite to tests Ævar Arnfjörð Bjarmason
` (3 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-03 23:24 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Ævar Arnfjörð Bjarmason
Add a new GETTEXT_POISON=YesPlease Makefile debug target. With this
target every invocation of _(s) will return "# GETTEXT POISON #"
instead of `s' or the msgstr that `s` would look up.
This target is intended to sanity check the gettextization series
against the test suite.
If the test suite is relying on the US English output of Git the test
should either have a NO_GETTEXT_POISON prerequisite, or the message in
question shouldn't be translated because it's a plumbing message.
We won't catch everything with this since we don't have 100% test
coverage, but the chances of us doing so are much larger.
The reason I'm using "# GETTEXT POISON #" is that a lot of tests that
rely on the fake editor would break if it wasn't a comment, since the
comment message that's inserted on e.g. `git commit --amend' is
translatable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Makefile | 9 +++++++++
gettext.h | 4 ++++
t/test-lib.sh | 1 +
3 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 7fd43ec..b6a734c 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,10 @@ all::
# on platforms where we don't expect glibc (Linux, Hurd,
# GNU/kFreeBSD), which includes libintl.
#
+# Define GETTEXT_POISON to turn all strings that use gettext into
+# gibberish. This option should only be used by the Git developers to
+# check that the Git gettext implementation itself is sane.
+#
# Define EXPATDIR=/foo/bar if your expat header and library files are in
# /foo/bar/include and /foo/bar/lib directories.
#
@@ -1506,6 +1510,10 @@ ifdef NEEDS_LIBINTL
EXTLIBS += -lintl
endif
+ifdef GETTEXT_POISON
+ COMPAT_CFLAGS += -DGETTEXT_POISON
+endif
+
ifeq ($(TCLTK_PATH),)
NO_TCLTK=NoThanks
endif
@@ -2059,6 +2067,7 @@ ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
@echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@
endif
@echo NO_GETTEXT=\''$(subst ','\'',$(subst ','\'',$(NO_GETTEXT)))'\' >>$@
+ @echo GETTEXT_POISON=\''$(subst ','\'',$(subst ','\'',$(GETTEXT_POISON)))'\' >>$@
### Detect Tck/Tk interpreter path changes
ifndef NO_TCLTK
diff --git a/gettext.h b/gettext.h
index e02939a..94ab0f3 100644
--- a/gettext.h
+++ b/gettext.h
@@ -11,8 +11,12 @@ extern void git_setup_gettext(void);
#ifdef NO_GETTEXT
#define _(s) (s)
#else
+#ifndef GETTEXT_POISON
#include <libintl.h>
#define _(s) gettext(s)
+#else
+#define _(s) "# GETTEXT POISON #"
+#endif
#endif
#endif
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 3a39c6f..dc55c78 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -921,6 +921,7 @@ esac
test -z "$NO_PERL" && test_set_prereq PERL
test -z "$NO_PYTHON" && test_set_prereq PYTHON
test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
+test -z "$GETTEXT_POISON" && test_set_prereq NO_GETTEXT_POISON
# test whether the filesystem supports symbolic links
ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
--
1.7.2.2.336.g704fc
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 3/3] gettext: add NO_GETTEXT_POISON prerequisite to tests
2010-09-03 18:22 [GIT PULL] New ab/i18n series and builtin fixes Ævar Arnfjörð Bjarmason
` (2 preceding siblings ...)
2010-09-03 23:24 ` [PATCH 2/3] gettext: Add GETTEXT_POISON=YesPlease Makefile parameter Ævar Arnfjörð Bjarmason
@ 2010-09-03 23:24 ` Ævar Arnfjörð Bjarmason
2010-09-03 23:41 ` Ævar Arnfjörð Bjarmason
2010-09-04 0:49 ` [PATCH 0/2] [PULL] ab/i18n-gettextize & translations avarab
` (2 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-03 23:24 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Ævar Arnfjörð Bjarmason
Change the tests that depend on the output of the porcelain to only
run if the NO_GETTEXT_POISON prerequisite is set. These will always
fail under GETTEXT_POISON=YesPlease.
I've manually inspected all of these and determined that they aren't
plumbing output.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/lib-gettext.sh | 10 +++-
t/lib-httpd.sh | 2 +-
t/t0001-init.sh | 2 +-
t/t1200-tutorial.sh | 4 +-
t/t2200-add-update.sh | 2 +-
t/t2204-add-ignored.sh | 8 ++--
t/t3030-merge-recursive.sh | 2 +-
t/t3200-branch.sh | 2 +-
t/t3203-branch-output.sh | 2 +-
t/t3700-add.sh | 4 +-
t/t4001-diff-rename.sh | 4 +-
t/t4014-format-patch.sh | 2 +-
t/t5541-http-push.sh | 2 +-
t/t5601-clone.sh | 2 +-
t/t6040-tracking-info.sh | 2 +-
t/t6200-fmt-merge-msg.sh | 28 ++++++------
t/t7004-tag.sh | 6 ++-
t/t7060-wtstatus.sh | 2 +-
t/t7102-reset.sh | 2 +-
t/t7110-reset-merge.sh | 6 +-
t/t7201-co.sh | 10 ++--
t/t7500-commit.sh | 9 +++-
t/t7501-commit.sh | 16 +++++--
t/t7502-commit.sh | 46 ++++++++++----------
t/t7506-status-submodule.sh | 28 ++++++------
t/t7508-status.sh | 98 ++++++++++++++++++++--------------------
t/t7600-merge.sh | 2 +-
t/t7602-merge-octopus-many.sh | 6 +-
t/t7811-grep-open.sh | 2 +-
29 files changed, 165 insertions(+), 146 deletions(-)
diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh
index 4570ead..c9a079e 100644
--- a/t/lib-gettext.sh
+++ b/t/lib-gettext.sh
@@ -11,7 +11,7 @@ export GIT_TEXTDOMAINDIR GIT_PO_PATH
. "$GIT_BUILD_DIR"/git-sh-i18n
-if test_have_prereq GETTEXT
+if test_have_prereq GETTEXT && test_have_prereq NO_GETTEXT_POISON
then
# is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian
is_IS_locale=$(locale -a | sed -n '/^is_IS\.[uU][tT][fF]-*8$/{
@@ -58,5 +58,11 @@ then
else
# Only run some tests when we don't have gettext support
test_set_prereq NO_GETTEXT
- say "# lib-gettext: No GETTEXT support available"
+
+ if test_have_prereq NO_GETTEXT_POISON
+ then
+ say "# lib-gettext: GETTEXT_POISON defined, can't test gettext"
+ else
+ say "# lib-gettext: No GETTEXT support available"
+ fi
fi
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index e733f65..817b865 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -154,7 +154,7 @@ test_http_push_nonff() {
grep "^ ! \[rejected\][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" output
'
- test_expect_success 'non-fast-forward push shows help message' '
+ test_expect_success NO_GETTEXT_POISON 'non-fast-forward push shows help message' '
grep "To prevent you from losing history, non-fast-forward updates were rejected" \
output
'
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 7c0a698..1fa4c46 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -124,7 +124,7 @@ test_expect_success 'GIT_DIR & GIT_WORK_TREE (2)' '
fi
'
-test_expect_success 'reinit' '
+test_expect_success NO_GETTEXT_POISON 'reinit' '
(
unset GIT_CONFIG GIT_WORK_TREE GIT_CONFIG
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
index ab55eda..c568e0e 100755
--- a/t/t1200-tutorial.sh
+++ b/t/t1200-tutorial.sh
@@ -163,7 +163,9 @@ test_expect_success 'git resolve' '
git checkout mybranch &&
git merge -m "Merge upstream changes." master |
sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
- -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output &&
+ -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output'
+
+test_expect_success NO_GETTEXT_POISON 'git resolve output' '
test_cmp resolve.expect resolve.output
'
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 2ad2819..b3b90ca 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -111,7 +111,7 @@ test_expect_success 'touch and then add explicitly' '
'
-test_expect_success 'add -n -u should not add but just report' '
+test_expect_success NO_GETTEXT_POISON 'add -n -u should not add but just report' '
(
echo "add '\''check'\''" &&
diff --git a/t/t2204-add-ignored.sh b/t/t2204-add-ignored.sh
index 24afdab..b7a0d71 100755
--- a/t/t2204-add-ignored.sh
+++ b/t/t2204-add-ignored.sh
@@ -27,7 +27,7 @@ done
for i in ign dir/ign dir/sub dir/sub/*ign sub/file sub sub/*
do
- test_expect_success "complaints for ignored $i" '
+ test_expect_success NO_GETTEXT_POISON "complaints for ignored $i" '
rm -f .git/index &&
test_must_fail git add "$i" 2>err &&
git ls-files "$i" >out &&
@@ -36,7 +36,7 @@ do
cat err
'
- test_expect_success "complaints for ignored $i with unignored file" '
+ test_expect_success NO_GETTEXT_POISON "complaints for ignored $i with unignored file" '
rm -f .git/index &&
test_must_fail git add "$i" file 2>err &&
git ls-files "$i" >out &&
@@ -48,7 +48,7 @@ done
for i in sub sub/*
do
- test_expect_success "complaints for ignored $i in dir" '
+ test_expect_success NO_GETTEXT_POISON "complaints for ignored $i in dir" '
rm -f .git/index &&
(
cd dir &&
@@ -63,7 +63,7 @@ done
for i in ign file
do
- test_expect_success "complaints for ignored $i in sub" '
+ test_expect_success NO_GETTEXT_POISON "complaints for ignored $i in sub" '
rm -f .git/index &&
(
cd sub &&
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index efe2900..b8ddb94 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -281,7 +281,7 @@ test_expect_success 'merge-recursive result' '
'
-test_expect_success 'fail if the index has unresolved entries' '
+test_expect_success NO_GETTEXT_POISON 'fail if the index has unresolved entries' '
rm -fr [abcd] &&
git checkout -f "$c1" &&
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index f54a533..d90d9fd 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -192,7 +192,7 @@ test_expect_success 'test deleting branch deletes branch config' \
test -z "$(git config branch.my7.remote)" &&
test -z "$(git config branch.my7.merge)"'
-test_expect_success 'test deleting branch without config' \
+test_expect_success NO_GETTEXT_POISON 'test deleting branch without config' \
'git branch my7 s &&
sha1=$(git rev-parse my7 | cut -c 1-7) &&
test "$(git branch -d my7 2>&1)" = "Deleted branch my7 (was $sha1)."'
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 809d1c4..dfdf5a7 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -72,7 +72,7 @@ cat >expect <<'EOF'
branch-two
master
EOF
-test_expect_success 'git branch shows detached HEAD properly' '
+test_expect_success NO_GETTEXT_POISON 'git branch shows detached HEAD properly' '
git checkout HEAD^0 &&
git branch >actual &&
test_cmp expect actual
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 7d7140d..1dae72c 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -266,7 +266,7 @@ test_expect_success 'git add --dry-run of existing changed file' "
echo \"add 'track-this'\" | test_cmp - actual
"
-test_expect_success 'git add --dry-run of non-existing file' "
+test_expect_success NO_GETTEXT_POISON 'git add --dry-run of non-existing file' "
echo ignored-file >>.gitignore &&
test_must_fail git add --dry-run track-this ignored-file >actual 2>&1 &&
echo \"fatal: pathspec 'ignored-file' did not match any files\" | test_cmp - actual
@@ -282,7 +282,7 @@ cat >expect.out <<\EOF
add 'track-this'
EOF
-test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
+test_expect_success NO_GETTEXT_POISON 'git add --dry-run --ignore-missing of non-existing file' '
test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err &&
test_cmp expect.out actual.out &&
test_cmp expect.err actual.err
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 71bac83..d42c077 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -64,7 +64,7 @@ test_expect_success \
'validate the output.' \
'compare_diff_patch current expected'
-test_expect_success 'favour same basenames over different ones' '
+test_expect_success NO_GETTEXT_POISON 'favour same basenames over different ones' '
cp path1 another-path &&
git add another-path &&
git commit -m 1 &&
@@ -73,7 +73,7 @@ test_expect_success 'favour same basenames over different ones' '
git mv another-path subdir/path1 &&
git status | grep "renamed: .*path1 -> subdir/path1"'
-test_expect_success 'favour same basenames even with minor differences' '
+test_expect_success NO_GETTEXT_POISON 'favour same basenames even with minor differences' '
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
git status | grep "renamed: .*path1 -> subdir/path1"'
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index f87434b..ae3659e 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -592,7 +592,7 @@ echo "fatal: --name-only does not make sense" > expect.name-only
echo "fatal: --name-status does not make sense" > expect.name-status
echo "fatal: --check does not make sense" > expect.check
-test_expect_success 'options no longer allowed for format-patch' '
+test_expect_success NO_GETTEXT_POISON 'options no longer allowed for format-patch' '
test_must_fail git format-patch --name-only 2> output &&
test_cmp expect.name-only output &&
test_must_fail git format-patch --name-status 2> output &&
diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index b0c2a2c..670d3de 100755
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -118,7 +118,7 @@ test_expect_success 'used receive-pack service' '
test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
"$ROOT_PATH"/test_repo_clone master
-test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
+test_expect_success NO_GETTEXT_POISON 'push fails for non-fast-forward refs unmatched by remote helper' '
# create a dissimilarly-named remote ref so that git is unable to match the
# two refs (viz. local, remote) unless an explicit refspec is provided.
git push origin master:retsam
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 4431dfd..2895900 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -31,7 +31,7 @@ test_expect_success 'clone with excess parameters (2)' '
'
-test_expect_success 'output from clone' '
+test_expect_success NO_GETTEXT_POISON 'output from clone' '
rm -fr dst &&
git clone -n "file://$(pwd)/src" dst >output &&
test $(grep Clon output | wc -l) = 1
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 1785e17..c9a86f6 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -42,7 +42,7 @@ b3 behind 1
b4 ahead 2
EOF
-test_expect_success 'branch -v' '
+test_expect_success NO_GETTEXT_POISON 'branch -v' '
(
cd test &&
git branch -v
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 42f8ece..5e35b9f 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -77,7 +77,7 @@ cat >expected <<\EOF
Merge branch 'left'
EOF
-test_expect_success 'merge-msg test #1' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg test #1' '
git checkout master &&
git fetch . left &&
@@ -90,7 +90,7 @@ cat >expected <<EOF
Merge branch 'left' of $(pwd)
EOF
-test_expect_success 'merge-msg test #2' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg test #2' '
git checkout master &&
git fetch "$(pwd)" left &&
@@ -110,7 +110,7 @@ Merge branch 'left'
Common #1
EOF
-test_expect_success 'merge-msg test #3-1' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg test #3-1' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -124,7 +124,7 @@ test_expect_success 'merge-msg test #3-1' '
test_cmp expected actual
'
-test_expect_success 'merge-msg test #3-2' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg test #3-2' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -156,7 +156,7 @@ Merge branches 'left' and 'right'
Common #1
EOF
-test_expect_success 'merge-msg test #4-1' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg test #4-1' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -170,7 +170,7 @@ test_expect_success 'merge-msg test #4-1' '
test_cmp expected actual
'
-test_expect_success 'merge-msg test #4-2' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg test #4-2' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -184,7 +184,7 @@ test_expect_success 'merge-msg test #4-2' '
test_cmp expected actual
'
-test_expect_success 'merge-msg test #5-1' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg test #5-1' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -198,7 +198,7 @@ test_expect_success 'merge-msg test #5-1' '
test_cmp expected actual
'
-test_expect_success 'merge-msg test #5-2' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg test #5-2' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -212,7 +212,7 @@ test_expect_success 'merge-msg test #5-2' '
test_cmp expected actual
'
-test_expect_success 'merge-msg -F' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg -F' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -226,7 +226,7 @@ test_expect_success 'merge-msg -F' '
test_cmp expected actual
'
-test_expect_success 'merge-msg -F in subdirectory' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg -F in subdirectory' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -270,7 +270,7 @@ Merge tag 'tag-r3'
Common #1
EOF
-test_expect_success 'merge-msg tag' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg tag' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -300,7 +300,7 @@ Merge tags 'tag-r3' and 'tag-l5'
Common #1
EOF
-test_expect_success 'merge-msg two tags' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg two tags' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -330,7 +330,7 @@ Merge branch 'left', tag 'tag-r3'
Common #1
EOF
-test_expect_success 'merge-msg tag and branch' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg tag and branch' '
git config --unset-all merge.log
git config --unset-all merge.summary
@@ -350,7 +350,7 @@ Merge branch 'long'
* long: (35 commits)
EOF
-test_expect_success 'merge-msg lots of commits' '
+test_expect_success NO_GETTEXT_POISON 'merge-msg lots of commits' '
git checkout master &&
test_tick &&
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index ac943f5..cf40992 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1044,12 +1044,14 @@ test_expect_success GPG \
'verify signed tag fails when public key is not present' \
'test_must_fail git tag -v signed-tag'
-test_expect_success \
+# "POISON" isn't a comment, so skip under GETTEXT_POISON
+test_expect_success NO_GETTEXT_POISON \
'git tag -a fails if tag annotation is empty' '
! (GIT_EDITOR=cat git tag -a initial-comment)
'
-test_expect_success \
+# Likewise GETTEXT_POISON doesn't emit something that looks like a comment
+test_expect_success NO_GETTEXT_POISON \
'message in editor has initial comment' '
GIT_EDITOR=cat git tag -a initial-comment > actual
# check the first line --- should be empty
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index fcac472..7205154 100755
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -38,7 +38,7 @@ cat >expect <<EOF
no changes added to commit (use "git add" and/or "git commit -a")
EOF
-test_expect_success 'M/D conflict does not segfault' '
+test_expect_success NO_GETTEXT_POISON 'M/D conflict does not segfault' '
mkdir mdconflict &&
(
cd mdconflict &&
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index b8cf260..1370949 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -423,7 +423,7 @@ Unstaged changes after reset:
M file2
EOF
-test_expect_success '--mixed refreshes the index' '
+test_expect_success NO_GETTEXT_POISON '--mixed refreshes the index' '
echo 123 >> file2 &&
git reset --mixed HEAD > output &&
test_cmp expect output
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
index 70cdd8e..8e54f0c 100755
--- a/t/t7110-reset-merge.sh
+++ b/t/t7110-reset-merge.sh
@@ -233,7 +233,7 @@ test_expect_success '"reset --merge HEAD^" is ok with pending merge' '
# working index HEAD target working index HEAD
# ----------------------------------------------------
# file1: X U B C --keep (disallowed)
-test_expect_success '"reset --keep HEAD^" fails with pending merge' '
+test_expect_success NO_GETTEXT_POISON '"reset --keep HEAD^" fails with pending merge' '
git reset --hard third &&
test_must_fail git merge branch1 &&
test_must_fail git reset --keep HEAD^ 2>err.log &&
@@ -259,7 +259,7 @@ test_expect_success '"reset --merge HEAD" is ok with pending merge' '
# working index HEAD target working index HEAD
# ----------------------------------------------------
# file1: X U B B --keep (disallowed)
-test_expect_success '"reset --keep HEAD" fails with pending merge' '
+test_expect_success NO_GETTEXT_POISON '"reset --keep HEAD" fails with pending merge' '
git reset --hard third &&
test_must_fail git merge branch1 &&
test_must_fail git reset --keep HEAD 2>err.log &&
@@ -280,7 +280,7 @@ test_expect_success '--merge is ok with added/deleted merge' '
git diff --exit-code --cached
'
-test_expect_success '--keep fails with added/deleted merge' '
+test_expect_success NO_GETTEXT_POISON '--keep fails with added/deleted merge' '
git reset --hard third &&
rm -f file2 &&
test_must_fail git merge branch3 &&
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 1337fa5..fe7536b 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -223,7 +223,7 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
test_cmp two expect
'
-test_expect_success 'checkout to detach HEAD (with advice declined)' '
+test_expect_success NO_GETTEXT_POISON 'checkout to detach HEAD (with advice declined)' '
git config advice.detachedHead false &&
git checkout -f renamer && git clean -f &&
@@ -242,7 +242,7 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' '
fi
'
-test_expect_success 'checkout to detach HEAD' '
+test_expect_success NO_GETTEXT_POISON 'checkout to detach HEAD' '
git config advice.detachedHead true &&
git checkout -f renamer && git clean -f &&
git checkout renamer^ 2>messages &&
@@ -260,7 +260,7 @@ test_expect_success 'checkout to detach HEAD' '
fi
'
-test_expect_success 'checkout to detach HEAD with branchname^' '
+test_expect_success NO_GETTEXT_POISON 'checkout to detach HEAD with branchname^' '
git checkout -f master && git clean -f &&
git checkout renamer^ &&
@@ -276,7 +276,7 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
fi
'
-test_expect_success 'checkout to detach HEAD with :/message' '
+test_expect_success NO_GETTEXT_POISON 'checkout to detach HEAD with :/message' '
git checkout -f master && git clean -f &&
git checkout ":/Initial" &&
@@ -292,7 +292,7 @@ test_expect_success 'checkout to detach HEAD with :/message' '
fi
'
-test_expect_success 'checkout to detach HEAD with HEAD^0' '
+test_expect_success NO_GETTEXT_POISON 'checkout to detach HEAD with HEAD^0' '
git checkout -f master && git clean -f &&
git checkout HEAD^0 &&
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index aa9c577..6b983b8 100755
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -59,7 +59,10 @@ test_expect_success 'adding comments to a template should not commit' '
)
'
-test_expect_success 'adding real content to a template should commit' '
+# These fail under GETTEXT_POISON because the poison editor message
+# doesn't do the right thing with comments and line breaks, this
+# message will be incorrectly broken up across lines.
+test_expect_success NO_GETTEXT_POISON 'adding real content to a template should commit' '
(
test_set_editor "$TEST_DIRECTORY"/t7500/add-content &&
git commit --template "$TEMPLATE"
@@ -67,7 +70,7 @@ test_expect_success 'adding real content to a template should commit' '
commit_msg_is "template linecommit message"
'
-test_expect_success '-t option should be short for --template' '
+test_expect_success NO_GETTEXT_POISON '-t option should be short for --template' '
echo "short template" > "$TEMPLATE" &&
echo "new content" >> foo &&
git add foo &&
@@ -78,7 +81,7 @@ test_expect_success '-t option should be short for --template' '
commit_msg_is "short templatecommit message"
'
-test_expect_success 'config-specified template should commit' '
+test_expect_success NO_GETTEXT_POISON 'config-specified template should commit' '
echo "new template" > "$TEMPLATE" &&
git config commit.template "$TEMPLATE" &&
echo "more content" >> foo &&
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 8297cb4..9dfa31e 100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -13,9 +13,12 @@ test_tick
test_expect_success \
"initial status" \
- "echo 'bongo bongo' >file &&
- git add file && \
- git status | grep 'Initial commit'"
+ "echo 'ngo bongo' >file &&
+ git add file"
+
+test_expect_success NO_GETTEXT_POISON \
+ "Constructing initial commit" \
+ "git status | grep 'Initial commit'"
test_expect_success \
"fail initial amend" \
@@ -142,7 +145,8 @@ cat >msg <<EOF
A good commit message.
EOF
-test_expect_success \
+# Can't rely on editor with POISON
+test_expect_success NO_GETTEXT_POISON \
'editor not invoked if -F is given' '
echo "moo" >file &&
EDITOR=./editor git commit -a -F msg &&
@@ -163,7 +167,9 @@ d381ac431806e53f3dd7ac2f1ae0534f36d738b9
402702b49136e7587daa9280e91e4bb7cb2179f7
EOF
-test_expect_success \
+# rev-list won't be OK under GETTEXT_POISON since the above test won't
+# run.
+test_expect_success NO_GETTEXT_POISON \
'validate git rev-list output.' \
'test_cmp expected current'
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index ac2e187..9e293f3 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -25,7 +25,7 @@ check_summary_oneline() {
test_cmp exp act
}
-test_expect_success 'output summary format' '
+test_expect_success NO_GETTEXT_POISON 'output summary format' '
echo new >file1 &&
git add file1 &&
@@ -36,12 +36,12 @@ test_expect_success 'output summary format' '
check_summary_oneline "" "a change"
'
-test_expect_success 'output summary format for commit with an empty diff' '
+test_expect_success NO_GETTEXT_POISON 'output summary format for commit with an empty diff' '
check_summary_oneline "" "empty" "--allow-empty"
'
-test_expect_success 'output summary format for merges' '
+test_expect_success NO_GETTEXT_POISON 'output summary format for merges' '
git checkout -b recursive-base &&
test_commit base file1 &&
@@ -70,7 +70,7 @@ output_tests_cleanup() {
git commit -m "cleanup"
}
-test_expect_success 'the basics' '
+test_expect_success NO_GETTEXT_POISON 'the basics' '
output_tests_cleanup &&
@@ -91,7 +91,7 @@ test_expect_success 'the basics' '
'
-test_expect_success 'partial' '
+test_expect_success NO_GETTEXT_POISON 'partial' '
echo another >"commit is" &&
echo another >not/forbid &&
@@ -103,7 +103,7 @@ test_expect_success 'partial' '
'
-test_expect_success 'partial modification in a subdirectory' '
+test_expect_success NO_GETTEXT_POISON 'partial modification in a subdirectory' '
test_tick &&
git commit -m "partial commit to subdirectory" not &&
@@ -113,7 +113,7 @@ test_expect_success 'partial modification in a subdirectory' '
'
-test_expect_success 'partial removal' '
+test_expect_success NO_GETTEXT_POISON 'partial removal' '
git rm not/forbid &&
git commit -m "partial commit to remove not/forbid" not &&
@@ -165,7 +165,7 @@ test_expect_success 'verbose respects diff config' '
git config --unset color.diff
'
-test_expect_success 'cleanup commit messages (verbatim,-t)' '
+test_expect_success NO_GETTEXT_POISON 'cleanup commit messages (verbatim,-t)' '
echo >>negative &&
{ echo;echo "# text";echo; } >expect &&
@@ -175,7 +175,7 @@ test_expect_success 'cleanup commit messages (verbatim,-t)' '
'
-test_expect_success 'cleanup commit messages (verbatim,-F)' '
+test_expect_success NO_GETTEXT_POISON 'cleanup commit messages (verbatim,-F)' '
echo >>negative &&
git commit --cleanup=verbatim -F expect -a &&
@@ -184,7 +184,7 @@ test_expect_success 'cleanup commit messages (verbatim,-F)' '
'
-test_expect_success 'cleanup commit messages (verbatim,-m)' '
+test_expect_success NO_GETTEXT_POISON 'cleanup commit messages (verbatim,-m)' '
echo >>negative &&
git commit --cleanup=verbatim -m "$(cat expect)" -a &&
@@ -220,7 +220,7 @@ echo "sample
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit." >expect
-test_expect_success 'cleanup commit messages (strip,-F,-e)' '
+test_expect_success NO_GETTEXT_POISON 'cleanup commit messages (strip,-F,-e)' '
echo >>negative &&
{ echo;echo sample;echo; } >text &&
@@ -234,7 +234,7 @@ echo "#
# Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
#" >> expect
-test_expect_success 'author different from committer' '
+test_expect_success NO_GETTEXT_POISON 'author different from committer' '
echo >>negative &&
git commit -e -m "sample"
@@ -248,7 +248,7 @@ rm -f expect.tmp
echo "# Committer:
#" >> expect
-test_expect_success 'committer is automatic' '
+test_expect_success NO_GETTEXT_POISON 'committer is automatic' '
echo >>negative &&
(
@@ -370,66 +370,66 @@ try_commit () {
try_commit_status_combo () {
- test_expect_success 'commit' '
+ test_expect_success NO_GETTEXT_POISON 'commit' '
clear_config commit.status &&
try_commit "" &&
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit' '
+ test_expect_success NO_GETTEXT_POISON 'commit' '
clear_config commit.status &&
try_commit "" &&
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit --status' '
+ test_expect_success NO_GETTEXT_POISON 'commit --status' '
clear_config commit.status &&
try_commit --status &&
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit --no-status' '
+ test_expect_success NO_GETTEXT_POISON 'commit --no-status' '
clear_config commit.status &&
try_commit --no-status
! grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit with commit.status = yes' '
+ test_expect_success NO_GETTEXT_POISON 'commit with commit.status = yes' '
clear_config commit.status &&
git config commit.status yes &&
try_commit "" &&
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit with commit.status = no' '
+ test_expect_success NO_GETTEXT_POISON 'commit with commit.status = no' '
clear_config commit.status &&
git config commit.status no &&
try_commit "" &&
! grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit --status with commit.status = yes' '
+ test_expect_success NO_GETTEXT_POISON 'commit --status with commit.status = yes' '
clear_config commit.status &&
git config commit.status yes &&
try_commit --status &&
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit --no-status with commit.status = yes' '
+ test_expect_success NO_GETTEXT_POISON 'commit --no-status with commit.status = yes' '
clear_config commit.status &&
git config commit.status yes &&
try_commit --no-status &&
! grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit --status with commit.status = no' '
+ test_expect_success NO_GETTEXT_POISON 'commit --status with commit.status = no' '
clear_config commit.status &&
git config commit.status no &&
try_commit --status &&
grep "^# Changes to be committed:" .git/COMMIT_EDITMSG
'
- test_expect_success 'commit --no-status with commit.status = no' '
+ test_expect_success NO_GETTEXT_POISON 'commit --no-status with commit.status = no' '
clear_config commit.status &&
git config commit.status no &&
try_commit --no-status &&
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 3d4f85d..2347451 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -20,17 +20,17 @@ test_expect_success 'setup' '
git commit -m "Add submodule sub"
'
-test_expect_success 'status clean' '
+test_expect_success NO_GETTEXT_POISON 'status clean' '
git status >output &&
grep "nothing to commit" output
'
-test_expect_success 'commit --dry-run -a clean' '
+test_expect_success NO_GETTEXT_POISON 'commit --dry-run -a clean' '
test_must_fail git commit --dry-run -a >output &&
grep "nothing to commit" output
'
-test_expect_success 'status with modified file in submodule' '
+test_expect_success NO_GETTEXT_POISON 'status with modified file in submodule' '
(cd sub && git reset --hard) &&
echo "changed" >sub/foo &&
git status >output &&
@@ -46,7 +46,7 @@ test_expect_success 'status with modified file in submodule (porcelain)' '
EOF
'
-test_expect_success 'status with added file in submodule' '
+test_expect_success NO_GETTEXT_POISON 'status with added file in submodule' '
(cd sub && git reset --hard && echo >foo && git add foo) &&
git status >output &&
grep "modified: sub (modified content)" output
@@ -60,14 +60,14 @@ test_expect_success 'status with added file in submodule (porcelain)' '
EOF
'
-test_expect_success 'status with untracked file in submodule' '
+test_expect_success NO_GETTEXT_POISON 'status with untracked file in submodule' '
(cd sub && git reset --hard) &&
echo "content" >sub/new-file &&
git status >output &&
grep "modified: sub (untracked content)" output
'
-test_expect_success 'status -uno with untracked file in submodule' '
+test_expect_success NO_GETTEXT_POISON 'status -uno with untracked file in submodule' '
git status -uno >output &&
grep "^nothing to commit" output
'
@@ -79,7 +79,7 @@ test_expect_success 'status with untracked file in submodule (porcelain)' '
EOF
'
-test_expect_success 'status with added and untracked file in submodule' '
+test_expect_success NO_GETTEXT_POISON 'status with added and untracked file in submodule' '
(cd sub && git reset --hard && echo >foo && git add foo) &&
echo "content" >sub/new-file &&
git status >output &&
@@ -95,7 +95,7 @@ test_expect_success 'status with added and untracked file in submodule (porcelai
EOF
'
-test_expect_success 'status with modified file in modified submodule' '
+test_expect_success NO_GETTEXT_POISON 'status with modified file in modified submodule' '
(cd sub && git reset --hard) &&
rm sub/new-file &&
(cd sub && echo "next change" >foo && git commit -m "next change" foo) &&
@@ -113,7 +113,7 @@ test_expect_success 'status with modified file in modified submodule (porcelain)
EOF
'
-test_expect_success 'status with added file in modified submodule' '
+test_expect_success NO_GETTEXT_POISON 'status with added file in modified submodule' '
(cd sub && git reset --hard && echo >foo && git add foo) &&
git status >output &&
grep "modified: sub (new commits, modified content)" output
@@ -127,7 +127,7 @@ test_expect_success 'status with added file in modified submodule (porcelain)' '
EOF
'
-test_expect_success 'status with untracked file in modified submodule' '
+test_expect_success NO_GETTEXT_POISON 'status with untracked file in modified submodule' '
(cd sub && git reset --hard) &&
echo "content" >sub/new-file &&
git status >output &&
@@ -141,7 +141,7 @@ test_expect_success 'status with untracked file in modified submodule (porcelain
EOF
'
-test_expect_success 'status with added and untracked file in modified submodule' '
+test_expect_success NO_GETTEXT_POISON 'status with added and untracked file in modified submodule' '
(cd sub && git reset --hard && echo >foo && git add foo) &&
echo "content" >sub/new-file &&
git status >output &&
@@ -167,7 +167,7 @@ test_expect_success 'setup .git file for sub' '
git commit -m "added .real to .gitignore" .gitignore
'
-test_expect_success 'status with added file in modified submodule with .git file' '
+test_expect_success NO_GETTEXT_POISON 'status with added file in modified submodule with .git file' '
(cd sub && git reset --hard && echo >foo && git add foo) &&
git status >output &&
grep "modified: sub (new commits, modified content)" output
@@ -177,12 +177,12 @@ test_expect_success 'rm submodule contents' '
rm -rf sub/* sub/.git
'
-test_expect_success 'status clean (empty submodule dir)' '
+test_expect_success NO_GETTEXT_POISON 'status clean (empty submodule dir)' '
git status >output &&
grep "nothing to commit" output
'
-test_expect_success 'status -a clean (empty submodule dir)' '
+test_expect_success NO_GETTEXT_POISON 'status -a clean (empty submodule dir)' '
test_must_fail git commit --dry-run -a >output &&
grep "nothing to commit" output
'
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 9c14b85..59099d0 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -31,7 +31,7 @@ test_expect_success 'setup' '
git add dir2/added
'
-test_expect_success 'status (1)' '
+test_expect_success NO_GETTEXT_POISON 'status (1)' '
grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
@@ -61,7 +61,7 @@ cat >expect <<\EOF
# untracked
EOF
-test_expect_success 'status (2)' '
+test_expect_success NO_GETTEXT_POISON 'status (2)' '
git status >output &&
test_cmp expect output
@@ -87,7 +87,7 @@ EOF
git config advice.statusHints false
-test_expect_success 'status (advice.statusHints false)' '
+test_expect_success NO_GETTEXT_POISON 'status (advice.statusHints false)' '
git status >output &&
test_cmp expect output
@@ -148,7 +148,7 @@ cat >expect <<EOF
#
# Untracked files not listed (use -u option to show untracked files)
EOF
-test_expect_success 'status -uno' '
+test_expect_success NO_GETTEXT_POISON 'status -uno' '
mkdir dir3 &&
: >dir3/untracked1 &&
: >dir3/untracked2 &&
@@ -156,7 +156,7 @@ test_expect_success 'status -uno' '
test_cmp expect output
'
-test_expect_success 'status (status.showUntrackedFiles no)' '
+test_expect_success NO_GETTEXT_POISON 'status (status.showUntrackedFiles no)' '
git config status.showuntrackedfiles no
git status >output &&
test_cmp expect output
@@ -173,7 +173,7 @@ cat >expect <<EOF
# Untracked files not listed
EOF
git config advice.statusHints false
-test_expect_success 'status -uno (advice.statusHints false)' '
+test_expect_success NO_GETTEXT_POISON 'status -uno (advice.statusHints false)' '
git status -uno >output &&
test_cmp expect output
'
@@ -219,12 +219,12 @@ cat >expect <<EOF
# output
# untracked
EOF
-test_expect_success 'status -unormal' '
+test_expect_success NO_GETTEXT_POISON 'status -unormal' '
git status -unormal >output &&
test_cmp expect output
'
-test_expect_success 'status (status.showUntrackedFiles normal)' '
+test_expect_success NO_GETTEXT_POISON 'status (status.showUntrackedFiles normal)' '
git config status.showuntrackedfiles normal
git status >output &&
test_cmp expect output
@@ -241,13 +241,13 @@ A dir2/added
?? output
?? untracked
EOF
-test_expect_success 'status -s -unormal' '
+test_expect_success NO_GETTEXT_POISON 'status -s -unormal' '
git config --unset status.showuntrackedfiles
git status -s -unormal >output &&
test_cmp expect output
'
-test_expect_success 'status -s (status.showUntrackedFiles normal)' '
+test_expect_success NO_GETTEXT_POISON 'status -s (status.showUntrackedFiles normal)' '
git config status.showuntrackedfiles normal
git status -s >output &&
test_cmp expect output
@@ -278,11 +278,11 @@ cat >expect <<EOF
# output
# untracked
EOF
-test_expect_success 'status -uall' '
+test_expect_success NO_GETTEXT_POISON 'status -uall' '
git status -uall >output &&
test_cmp expect output
'
-test_expect_success 'status (status.showUntrackedFiles all)' '
+test_expect_success NO_GETTEXT_POISON 'status (status.showUntrackedFiles all)' '
git config status.showuntrackedfiles all
git status >output &&
rm -rf dir3 &&
@@ -337,7 +337,7 @@ cat >expect <<\EOF
# ../untracked
EOF
-test_expect_success 'status with relative paths' '
+test_expect_success NO_GETTEXT_POISON 'status with relative paths' '
(cd dir1 && git status) >output &&
test_cmp expect output
@@ -409,7 +409,7 @@ cat >expect <<\EOF
# <BLUE>untracked<RESET>
EOF
-test_expect_success 'status with color.ui' '
+test_expect_success NO_GETTEXT_POISON 'status with color.ui' '
git config color.ui always &&
git status | test_decode_color >output &&
@@ -417,7 +417,7 @@ test_expect_success 'status with color.ui' '
'
-test_expect_success 'status with color.status' '
+test_expect_success NO_GETTEXT_POISON 'status with color.status' '
git config --unset color.ui &&
git config color.status always &&
@@ -437,7 +437,7 @@ cat >expect <<\EOF
<BLUE>??<RESET> untracked
EOF
-test_expect_success 'status -s with color.ui' '
+test_expect_success NO_GETTEXT_POISON 'status -s with color.ui' '
git config --unset color.status &&
git config color.ui always &&
@@ -446,7 +446,7 @@ test_expect_success 'status -s with color.ui' '
'
-test_expect_success 'status -s with color.status' '
+test_expect_success NO_GETTEXT_POISON 'status -s with color.status' '
git config --unset color.ui &&
git config color.status always &&
@@ -467,7 +467,7 @@ cat >expect <<\EOF
<BLUE>??<RESET> untracked
EOF
-test_expect_success 'status -s -b with color.status' '
+test_expect_success NO_GETTEXT_POISON 'status -s -b with color.status' '
git status -s -b | test_decode_color >output &&
test_cmp expect output
@@ -485,7 +485,7 @@ A dir2/added
?? untracked
EOF
-test_expect_success 'status --porcelain ignores color.ui' '
+test_expect_success NO_GETTEXT_POISON 'status --porcelain ignores color.ui' '
git config --unset color.status &&
git config color.ui always &&
@@ -494,7 +494,7 @@ test_expect_success 'status --porcelain ignores color.ui' '
'
-test_expect_success 'status --porcelain ignores color.status' '
+test_expect_success NO_GETTEXT_POISON 'status --porcelain ignores color.status' '
git config --unset color.ui &&
git config color.status always &&
@@ -539,7 +539,7 @@ cat >expect <<\EOF
EOF
-test_expect_success 'status without relative paths' '
+test_expect_success NO_GETTEXT_POISON 'status without relative paths' '
git config status.relativePaths false
(cd dir1 && git status) >output &&
@@ -558,7 +558,7 @@ A dir2/added
?? untracked
EOF
-test_expect_success 'status -s without relative paths' '
+test_expect_success NO_GETTEXT_POISON 'status -s without relative paths' '
(cd dir1 && git status -s) >output &&
test_cmp expect output
@@ -581,7 +581,7 @@ cat <<EOF >expect
# output
# untracked
EOF
-test_expect_success 'dry-run of partial commit excluding new file in index' '
+test_expect_success NO_GETTEXT_POISON 'dry-run of partial commit excluding new file in index' '
git commit --dry-run dir1/modified >output &&
test_cmp expect output
'
@@ -630,13 +630,13 @@ cat >expect <<EOF
# output
# untracked
EOF
-test_expect_success 'status submodule summary is disabled by default' '
+test_expect_success NO_GETTEXT_POISON 'status submodule summary is disabled by default' '
git status >output &&
test_cmp expect output
'
# we expect the same as the previous test
-test_expect_success 'status --untracked-files=all does not show submodule' '
+test_expect_success NO_GETTEXT_POISON 'status --untracked-files=all does not show submodule' '
git status --untracked-files=all >output &&
test_cmp expect output
'
@@ -694,7 +694,7 @@ cat >expect <<EOF
# output
# untracked
EOF
-test_expect_success 'status submodule summary' '
+test_expect_success NO_GETTEXT_POISON 'status submodule summary' '
git config status.submodulesummary 10 &&
git status >output &&
test_cmp expect output
@@ -711,7 +711,7 @@ A sm
?? output
?? untracked
EOF
-test_expect_success 'status -s submodule summary' '
+test_expect_success NO_GETTEXT_POISON 'status -s submodule summary' '
git status -s >output &&
test_cmp expect output
'
@@ -735,7 +735,7 @@ cat >expect <<EOF
# untracked
no changes added to commit (use "git add" and/or "git commit -a")
EOF
-test_expect_success 'status submodule summary (clean submodule)' '
+test_expect_success NO_GETTEXT_POISON 'status submodule summary (clean submodule)' '
git commit -m "commit submodule" &&
git config status.submodulesummary 10 &&
test_must_fail git commit --dry-run >output &&
@@ -753,7 +753,7 @@ cat >expect <<EOF
?? output
?? untracked
EOF
-test_expect_success 'status -s submodule summary (clean submodule)' '
+test_expect_success NO_GETTEXT_POISON 'status -s submodule summary (clean submodule)' '
git status -s >output &&
test_cmp expect output
'
@@ -787,7 +787,7 @@ cat >expect <<EOF
# output
# untracked
EOF
-test_expect_success 'commit --dry-run submodule summary (--amend)' '
+test_expect_success NO_GETTEXT_POISON 'commit --dry-run submodule summary (--amend)' '
git config status.submodulesummary 10 &&
git commit --dry-run --amend >output &&
test_cmp expect output
@@ -842,13 +842,13 @@ cat > expect << EOF
# untracked
EOF
-test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '
+test_expect_success NO_GETTEXT_POISON '--ignore-submodules=untracked suppresses submodules with untracked content' '
echo modified > sm/untracked &&
git status --ignore-submodules=untracked > output &&
test_cmp expect output
'
-test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
+test_expect_success NO_GETTEXT_POISON '.gitmodules ignore=untracked suppresses submodules with untracked content' '
git config diff.ignoreSubmodules dirty &&
git status >output &&
test_cmp expect output &&
@@ -860,7 +860,7 @@ test_expect_success '.gitmodules ignore=untracked suppresses submodules with unt
git config --unset diff.ignoreSubmodules
'
-test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
+test_expect_success NO_GETTEXT_POISON '.git/config ignore=untracked suppresses submodules with untracked content' '
git config --add -f .gitmodules submodule.subname.ignore none &&
git config --add -f .gitmodules submodule.subname.path sm &&
git config --add submodule.subname.ignore untracked &&
@@ -871,12 +871,12 @@ test_expect_success '.git/config ignore=untracked suppresses submodules with unt
git config --remove-section -f .gitmodules submodule.subname
'
-test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
+test_expect_success NO_GETTEXT_POISON '--ignore-submodules=dirty suppresses submodules with untracked content' '
git status --ignore-submodules=dirty > output &&
test_cmp expect output
'
-test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
+test_expect_success NO_GETTEXT_POISON '.gitmodules ignore=dirty suppresses submodules with untracked content' '
git config diff.ignoreSubmodules dirty &&
git status >output &&
! test -s actual &&
@@ -888,7 +888,7 @@ test_expect_success '.gitmodules ignore=dirty suppresses submodules with untrack
git config --unset diff.ignoreSubmodules
'
-test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '
+test_expect_success NO_GETTEXT_POISON '.git/config ignore=dirty suppresses submodules with untracked content' '
git config --add -f .gitmodules submodule.subname.ignore none &&
git config --add -f .gitmodules submodule.subname.path sm &&
git config --add submodule.subname.ignore dirty &&
@@ -899,13 +899,13 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with untrack
git config -f .gitmodules --remove-section submodule.subname
'
-test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
+test_expect_success NO_GETTEXT_POISON '--ignore-submodules=dirty suppresses submodules with modified content' '
echo modified > sm/foo &&
git status --ignore-submodules=dirty > output &&
test_cmp expect output
'
-test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
+test_expect_success NO_GETTEXT_POISON '.gitmodules ignore=dirty suppresses submodules with modified content' '
git config --add -f .gitmodules submodule.subname.ignore dirty &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
@@ -913,7 +913,7 @@ test_expect_success '.gitmodules ignore=dirty suppresses submodules with modifie
git config -f .gitmodules --remove-section submodule.subname
'
-test_expect_success '.git/config ignore=dirty suppresses submodules with modified content' '
+test_expect_success NO_GETTEXT_POISON '.git/config ignore=dirty suppresses submodules with modified content' '
git config --add -f .gitmodules submodule.subname.ignore none &&
git config --add -f .gitmodules submodule.subname.path sm &&
git config --add submodule.subname.ignore dirty &&
@@ -956,12 +956,12 @@ cat > expect << EOF
# untracked
EOF
-test_expect_success "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
+test_expect_success NO_GETTEXT_POISON "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
git status --ignore-submodules=untracked > output &&
test_cmp expect output
'
-test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
+test_expect_success NO_GETTEXT_POISON ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
git config --add -f .gitmodules submodule.subname.ignore untracked &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
@@ -969,7 +969,7 @@ test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules wi
git config -f .gitmodules --remove-section submodule.subname
'
-test_expect_success ".git/config ignore=untracked doesn't suppress submodules with modified content" '
+test_expect_success NO_GETTEXT_POISON ".git/config ignore=untracked doesn't suppress submodules with modified content" '
git config --add -f .gitmodules submodule.subname.ignore none &&
git config --add -f .gitmodules submodule.subname.path sm &&
git config --add submodule.subname.ignore untracked &&
@@ -1018,12 +1018,12 @@ cat > expect << EOF
# untracked
EOF
-test_expect_success "--ignore-submodules=untracked doesn't suppress submodule summary" '
+test_expect_success NO_GETTEXT_POISON "--ignore-submodules=untracked doesn't suppress submodule summary" '
git status --ignore-submodules=untracked > output &&
test_cmp expect output
'
-test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
+test_expect_success NO_GETTEXT_POISON ".gitmodules ignore=untracked doesn't suppress submodule summary" '
git config --add -f .gitmodules submodule.subname.ignore untracked &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
@@ -1031,7 +1031,7 @@ test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule sum
git config -f .gitmodules --remove-section submodule.subname
'
-test_expect_success ".git/config ignore=untracked doesn't suppress submodule summary" '
+test_expect_success NO_GETTEXT_POISON ".git/config ignore=untracked doesn't suppress submodule summary" '
git config --add -f .gitmodules submodule.subname.ignore none &&
git config --add -f .gitmodules submodule.subname.path sm &&
git config --add submodule.subname.ignore untracked &&
@@ -1042,11 +1042,11 @@ test_expect_success ".git/config ignore=untracked doesn't suppress submodule sum
git config -f .gitmodules --remove-section submodule.subname
'
-test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
+test_expect_success NO_GETTEXT_POISON "--ignore-submodules=dirty doesn't suppress submodule summary" '
git status --ignore-submodules=dirty > output &&
test_cmp expect output
'
-test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
+test_expect_success NO_GETTEXT_POISON ".gitmodules ignore=dirty doesn't suppress submodule summary" '
git config --add -f .gitmodules submodule.subname.ignore dirty &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
@@ -1054,7 +1054,7 @@ test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary
git config -f .gitmodules --remove-section submodule.subname
'
-test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary" '
+test_expect_success NO_GETTEXT_POISON ".git/config ignore=dirty doesn't suppress submodule summary" '
git config --add -f .gitmodules submodule.subname.ignore none &&
git config --add -f .gitmodules submodule.subname.path sm &&
git config --add submodule.subname.ignore dirty &&
@@ -1086,7 +1086,7 @@ cat > expect << EOF
no changes added to commit (use "git add" and/or "git commit -a")
EOF
-test_expect_success "--ignore-submodules=all suppresses submodule summary" '
+test_expect_success NO_GETTEXT_POISON "--ignore-submodules=all suppresses submodule summary" '
git status --ignore-submodules=all > output &&
test_cmp expect output
'
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index cde8390..263c6b3 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -543,7 +543,7 @@ test_expect_success 'merge fast-forward in a dirty tree' '
test_debug 'gitk --all'
-test_expect_success 'in-index merge' '
+test_expect_success NO_GETTEXT_POISON 'in-index merge' '
git reset --hard c0 &&
git merge --no-ff -s resolve c1 > out &&
grep "Wonderful." out &&
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 2746169..3281db0 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -63,7 +63,7 @@ Merge made by octopus.
create mode 100644 c4.c
EOF
-test_expect_success 'merge output uses pretty names' '
+test_expect_success NO_GETTEXT_POISON 'merge output uses pretty names' '
git reset --hard c1 &&
git merge c2 c3 c4 >actual &&
test_cmp actual expected
@@ -78,7 +78,7 @@ Merge made by octopus.
create mode 100644 c5.c
EOF
-test_expect_success 'merge up-to-date output uses pretty names' '
+test_expect_success NO_GETTEXT_POISON 'merge up-to-date output uses pretty names' '
git merge c4 c5 >actual &&
test_cmp actual expected
'
@@ -94,7 +94,7 @@ Merge made by octopus.
create mode 100644 c2.c
EOF
-test_expect_success 'merge fast-forward output uses pretty names' '
+test_expect_success NO_GETTEXT_POISON 'merge fast-forward output uses pretty names' '
git reset --hard c0 &&
git merge c1 c2 >actual &&
test_cmp actual expected
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index 568a6f2..3aa544c 100755
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -61,7 +61,7 @@ test_expect_success SIMPLEPAGER 'git grep -O' '
test_cmp empty out
'
-test_expect_success 'git grep -O --cached' '
+test_expect_success NO_GETTEXT_POISON 'git grep -O --cached' '
test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
grep open-files-in-pager msg
'
--
1.7.2.2.336.g704fc
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 3/3] gettext: add NO_GETTEXT_POISON prerequisite to tests
2010-09-03 23:24 ` [PATCH 3/3] gettext: add NO_GETTEXT_POISON prerequisite to tests Ævar Arnfjörð Bjarmason
@ 2010-09-03 23:41 ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 15+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-03 23:41 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Ævar Arnfjörð Bjarmason
On Fri, Sep 3, 2010 at 23:24, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
> index 8297cb4..9dfa31e 100755
> --- a/t/t7501-commit.sh
> +++ b/t/t7501-commit.sh
> @@ -13,9 +13,12 @@ test_tick
>
> test_expect_success \
> "initial status" \
> - "echo 'bongo bongo' >file &&
> - git add file && \
> - git status | grep 'Initial commit'"
> + "echo 'ngo bongo' >file &&
> + git add file"
This needs this trivial fixup:
@@ -16 +16 @@ test_expect_success \
- "echo 'ngo bongo' >file &&
+ "echo 'bongo bongo' >file &&
Otherwise the test doesn't pass when *not* using the poison
feature. Sorry about that. The fixed up version will be on my ab/i18n
branch on GitHub.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 0/2] [PULL] ab/i18n-gettextize & translations
2010-09-03 18:22 [GIT PULL] New ab/i18n series and builtin fixes Ævar Arnfjörð Bjarmason
` (3 preceding siblings ...)
2010-09-03 23:24 ` [PATCH 3/3] gettext: add NO_GETTEXT_POISON prerequisite to tests Ævar Arnfjörð Bjarmason
@ 2010-09-04 0:49 ` avarab
2010-09-04 0:49 ` [PATCH 1/2] po/de.po: add German translation avarab
2010-09-04 0:49 ` [PATCH 2/2] po/en_GB.po: add British English Translation avarab
6 siblings, 0 replies; 15+ messages in thread
From: avarab @ 2010-09-04 0:49 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jan Krüger, Sam Reed, Jeff King,
Ævar Arnfjörð Bjarmason
From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
On Fri, Sep 3, 2010 at 18:22, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> What I'm working on, which should not be pulled at this time:
>
> ab/i18n-gettextize:
> http://github.com/avar/git/compare/ab/i18n...ab/i18n-gettextize
>
> Updated version of the gettextize series rebased on master. No
> longer needs its own builtin.h patches (since ab/i18n itself now
> depends on it). I'm also fixing some minor issues raised on-list.
>
> I'm also going to add the aforementioned GETTEXT_POISON
> functionality to ab/i18n to make sure this series is OK.
>
> ab/i18n-add-translations:
> http://github.com/avar/git/compare/ab/i18n-gettextize...ab/i18n-add-translations
>
> Adds German and British English translations. More additions welcome.
The ab/i18n-gettextize series is now ready. And since I've tested it
with the new GETTEXT_POISON support I'm confident that it
works. Please pull it from:
git://github.com/avar/git.git ab/i18n-gettextize
Web view:
http://github.com/avar/git/compare/ab/i18n...ab/i18n-gettextize
Changes to the series since last time are this fixup patch:
diff --git a/builtin/fetch.c b/builtin/fetch.c
index fd0a40d..98fb202 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -349 +349 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
- kind = _("branch");
+ kind = "branch";
@@ -353 +353 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
- kind = _("tag");
+ kind = "tag";
@@ -357 +357 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
- kind = _("remote branch");
+ kind = "remote branch";
@@ -397 +397 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
- TRANSPORT_SUMMARY_WIDTH, *kind ? kind : _("branch"),
+ TRANSPORT_SUMMARY_WIDTH, *kind ? kind : "branch",
This changed what was stored in commit messages, so it was *really*
breaking the plumbing. This was turned up with the new GETTEXT_POISON
debug support.
Then there are these two commits which are new in the series:
7cd45c32 * gettextize: git-fetch split up "(non-fast-forward)" message
8b47940b * gettextize: git-fetch update_local_ref messages
Reproduced here for review:
commit 8b47940bc4081a760eb772cdea76f89ca0be83cf
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri Sep 3 23:58:01 2010 +0000
gettextize: git-fetch update_local_ref messages
Translate a "[rejected]" message spotted by Jeff King, and other
things in update_local_ref along with it.
Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 98fb202..3d2c45d 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -265 +265 @@ static int update_local_ref(struct ref *ref,
- what = "[new tag]";
+ what = _("[new tag]");
@@ -269 +269 @@ static int update_local_ref(struct ref *ref,
- what = "[new branch]";
+ what = _("[new branch]");
@@ -275 +275 @@ static int update_local_ref(struct ref *ref,
- r ? " (unable to update local ref)" : "");
+ r ? _(" (unable to update local ref)") : "");
@@ -288 +288 @@ static int update_local_ref(struct ref *ref,
- pretty_ref, r ? " (unable to update local ref)" : "");
+ pretty_ref, r ? _(" (unable to update local ref)") : "");
@@ -300 +300 @@ static int update_local_ref(struct ref *ref,
- r ? "unable to update local ref" : "forced update");
+ r ? _("unable to update local ref") : _("forced update"));
And:
commit 7cd45c32ef93c949330b7899821f184ccae52900
Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri Sep 3 23:59:27 2010 +0000
gettextize: git-fetch split up "(non-fast-forward)" message
Split up the "(non-fast-forward)" message from printf directives and
make it translatable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 3d2c45d..792123c 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -303,3 +303,3 @@ static int update_local_ref(struct ref *ref,
- sprintf(display, "! %-*s %-*s -> %s (non-fast-forward)",
- TRANSPORT_SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote,
- pretty_ref);
+ sprintf(display, "! %-*s %-*s -> %s %s",
+ TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), REFCOL_WIDTH, remote,
+ pretty_ref, _("(non-fast-forward)"));
And finally (and attached) to make use of this all the
ab/i18n-add-translations series adds German and British English
Translations:
git://github.com/avar/git.git ab/i18n-add-translations
Web view:
http://github.com/avar/git/compare/ab/i18n-gettextize...ab/i18n-add-translations
1771 lines for the British English one to translate 3 strings is a bit
of an overkill. But it seems that projects that use gettext usually
include the untranslated strings too. E.g. glibc.git does that for its
en_GB.po file.
Maybe we can prune out entries with msgstr "". That seems to work on
GNU, it probably works on all other gettext implementations.
Note that these patches might not appear at all on the list, since
they might bump into the maximum message length on the list.
Jan Krüger (1):
po/de.po: add German translation
Sam Reed (1):
po/en_GB.po: add British English Translation
po/de.po | 1888 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
po/en_GB.po | 1771 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 3659 insertions(+), 0 deletions(-)
create mode 100644 po/de.po
create mode 100644 po/en_GB.po
--
1.7.2.2.336.g704fc
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH 1/2] po/de.po: add German translation
2010-09-03 18:22 [GIT PULL] New ab/i18n series and builtin fixes Ævar Arnfjörð Bjarmason
` (4 preceding siblings ...)
2010-09-04 0:49 ` [PATCH 0/2] [PULL] ab/i18n-gettextize & translations avarab
@ 2010-09-04 0:49 ` avarab
2010-09-06 15:41 ` Thomas Rast
2010-09-04 0:49 ` [PATCH 2/2] po/en_GB.po: add British English Translation avarab
6 siblings, 1 reply; 15+ messages in thread
From: avarab @ 2010-09-04 0:49 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jan Krüger, Sam Reed, Jeff King,
Ævar Arnfjörð Bjarmason
From: Jan Krüger <jk@jk.gs>
Translate all the translatable messages currently in Git, except for
the 10 TEST messages that shouldn't be translated.
Signed-off-by: Jan Krüger <jk@jk.gs>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
po/de.po | 1888 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 1888 insertions(+), 0 deletions(-)
create mode 100644 po/de.po
diff --git a/po/de.po b/po/de.po
new file mode 100644
index 0000000..2f178f5
--- /dev/null
+++ b/po/de.po
@@ -0,0 +1,1888 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2010-09-03 15:45+0200\n"
+"Last-Translator: Jan Krüger <jk@jk.gs>\n"
+"Language-Team: Git Mailing List <git@vger.kernel.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "# Unmerged paths:"
+msgstr "# Verbleibende Konflikte in Pfaden:"
+
+#, c-format
+msgid "# (use \"git reset %s <file>...\" to unstage)"
+msgstr ""
+"# (benutze \"git reset %s <Datei>\", um die Änderungen nicht mehr "
+"vorzumerken)"
+
+msgid "# (use \"git rm --cached <file>...\" to unstage)"
+msgstr ""
+"# (benutze \"git rm --cached <Datei>\", um die Datei nicht mehr "
+"vorzumerken)"
+
+msgid "# (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"# (benutze \"git add/rm <Datei>...\", um den Konflikt als gelöst zu "
+"markieren)"
+
+msgid "# Changes to be committed:"
+msgstr "# Vorgemerkte Änderungen für den nächsten Commit:"
+
+msgid "# Changed but not updated:"
+msgstr "# Geändert, aber nicht für den nächsten Commit vorgemerkt:"
+
+msgid "# (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+"# (benutze \"git add <Datei>...\", um den aktuellen Stand vorzumerken)"
+
+msgid "# (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"# (benutze entsprechend \"git add/rm <Datei>...\", um den aktuellen Stand "
+"vorzumerken)"
+
+msgid ""
+"# (use \"git checkout -- <file>...\" to discard changes in working "
+"directory)"
+msgstr ""
+"# (benutze \"git checkout -- <Datei>...\", um Änderungen in der Datei zu "
+"verwerfen)"
+
+msgid "# (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"# (committe oder verwerfe die unberücksichtigten Dateien oder Änderungen "
+"in Submodules)"
+
+#, c-format
+msgid "# %s files:"
+msgstr "# %s Dateien:"
+
+#, c-format
+msgid "# (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+"# (benutze \"git %s <Datei>...\", um zu vorgemerkten Dateien hinzuzufügen)"
+
+msgid "bug"
+msgstr "Bug"
+
+msgid "both deleted:"
+msgstr "beide gelöscht:"
+
+msgid "added by us:"
+msgstr "hier hinzugefügt:"
+
+msgid "deleted by them:"
+msgstr "dort gelöscht:"
+
+msgid "added by them:"
+msgstr "dort hinzugefügt:"
+
+msgid "deleted by us:"
+msgstr "hier gelöscht:"
+
+msgid "both added:"
+msgstr "bei beiden hinzugefügt:"
+
+msgid "both modified:"
+msgstr "bei beiden geändert:"
+
+msgid "new commits, "
+msgstr "neue Commits, "
+
+msgid "modified content, "
+msgstr "veränderte Dateien, "
+
+msgid "untracked content, "
+msgstr "unberücksichtigte Dateien, "
+
+#, c-format
+msgid "new file: %s"
+msgstr "neue Datei: %s"
+
+#, c-format
+msgid "copied: %s -> %s"
+msgstr "kopiert: %s -> %s"
+
+#, c-format
+msgid "deleted: %s"
+msgstr "gelöscht: %s"
+
+#, c-format
+msgid "modified: %s"
+msgstr "geändert: %s"
+
+#, c-format
+msgid "renamed: %s -> %s"
+msgstr "umbenannt: %s -> %s"
+
+#, c-format
+msgid "typechange: %s"
+msgstr "neuer Typ: %s"
+
+#, c-format
+msgid "unknown: %s"
+msgstr "unbekannt: %s"
+
+#, c-format
+msgid "unmerged: %s"
+msgstr "Konflikt: %s"
+
+#, c-format
+msgid "bug: unhandled diff status %c"
+msgstr "Bug: nicht behandelter Diff-Status %c"
+
+msgid "On branch "
+msgstr "Aktueller Branch: "
+
+msgid "Not currently on any branch."
+msgstr "Aktuell ist kein Branch aktiv."
+
+msgid "# Initial commit"
+msgstr "# Erster Commit"
+
+msgid "Untracked"
+msgstr "Unberücksichtigte"
+
+msgid "add"
+msgstr "add"
+
+msgid "Ignored"
+msgstr "Ignorierte"
+
+msgid "add -f"
+msgstr "add -f"
+
+#, c-format
+msgid "# Untracked files not listed%s\n"
+msgstr "# Unberücksichtigte Dateien werden nicht aufgeführt%s\n"
+
+msgid " (use -u option to show untracked files)"
+msgstr " (benutze die Option -u, um sie anzuzeigen)"
+
+#, c-format
+msgid "# No changes\n"
+msgstr "# Keine Änderungen\n"
+
+#, c-format
+msgid "no changes added to commit%s\n"
+msgstr "keine Änderungen für den Commit vorgemerkt\n"
+
+msgid " (use \"git add\" and/or \"git commit -a\")"
+msgstr " (benutze \"git add\" und/oder \"git commit -a\")"
+
+#, c-format
+msgid "nothing added to commit but untracked files present%s\n"
+msgstr "keine Änderungen für den Commit vorgemerkt, aber unberücksichtigte Dateien vorhanden\n"
+
+msgid " (use \"git add\" to track)"
+msgstr " (benutze \"git add\", um sie zu berücksichtigen)"
+
+msgid " (create/copy files and use \"git add\" to track)"
+msgstr " (erstelle Dateien und benutze \"git add\", um sie zu berücksichtigen)"
+
+#, c-format
+msgid "nothing to commit%s\n"
+msgstr "nichts zu committen%s\n"
+
+msgid " (use -u to show untracked files)"
+msgstr " (benutze -u, um unberücksichtigte Datei anzuzeigen)"
+
+msgid " (working directory clean)"
+msgstr " (Arbeitsverzeichnis sauber)"
+
+msgid "HEAD (no branch)"
+msgstr "HEAD (kein Branch)"
+
+msgid "Initial commit on "
+msgstr "Erster Commit in "
+
+msgid "behind "
+msgstr "nur dort "
+
+msgid "ahead "
+msgstr "nur hier "
+
+msgid ", behind "
+msgstr "nur dort "
+
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "unerwarteter Diff-Status %s"
+
+msgid "updating files failed"
+msgstr "Aktualisieren der Dateien ist fehlgeschlagen"
+
+#, c-format
+msgid "remove '%s'\n"
+msgstr "entferne '%s'\n"
+
+#, c-format
+msgid "Path '%s' is in submodule '%.*s'"
+msgstr "Pfad '%s' ist im Submodule '%.*s'"
+
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Nicht vorgemerkte Änderungen nach Aktualisieren des Indexes:"
+
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "Pfadangabe '%s' passt auf keine Dateien"
+
+#, c-format
+msgid "'%s' is beyond a symbolic link"
+msgstr "'%s' befindet sich jenseits eines symbolischen Links"
+
+msgid "Could not read the index"
+msgstr "Konnte den Index nicht auslesen"
+
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+
+msgid "Could not write patch"
+msgstr "Konnte keinen Patch erstellen"
+
+# Keine genaue Übersetzung, aber IMO im Kontext passend --jk@jk.gs
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "Konnte '%s' nicht mehr finden"
+
+msgid "Empty patch. Aborted."
+msgstr "Leerer Patch. Breche ab."
+
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "Konnte '%s' nicht anwenden"
+
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "Benutze -f, wenn du sie wirklich hinzufügen willst.\n"
+
+msgid "no files added"
+msgstr "keine Dateien hinzugefügt"
+
+msgid "adding files failed"
+msgstr "Das Hinzufügen der Dateien ist fehlgeschlagen"
+
+msgid "-A and -u are mutually incompatible"
+msgstr "-A und -u vertragen sich nicht"
+
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "Option --ignore-missing kann nur zusammen mit --dry-run benutzt werden"
+
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Nichts angegeben, nichts hinzugefügt.\n"
+
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Vielleicht wolltest du 'git add .' benutzen?\n"
+
+msgid "index file corrupt"
+msgstr "Indexdatei beschädigt"
+
+msgid "Unable to write new index file"
+msgstr "Konnte keine neue Indexdatei anlegen"
+
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but it is not yet merged to HEAD."
+msgstr ""
+"lösche Branch '%', der nach '%s' gemerged wurde,\n"
+" aber er ist noch nicht nach HEAD gemerged."
+
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+"lösche Branch '%s' nicht, der noch nicht nach '%s' gemerged\n"
+"wurde, auch wenn er schon nach HEAD gemerged wurde."
+
+#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
+msgid "remote "
+msgstr "Remote-"
+
+msgid "cannot use -a with -d"
+msgstr "du kannst -a und -d nicht zusammen benutzen"
+
+msgid "Couldn't look up commit object for HEAD"
+msgstr "Konnte Commit-Objekt für HEAD nicht finden"
+
+#, c-format
+msgid "Cannot delete the branch '%s' which you are currently on."
+msgstr "Du kannst den aktiven Branch '%s' nicht löschen."
+
+#, c-format
+msgid "%sbranch '%s' not found."
+msgstr "%sBranch '%s' nicht gefunden."
+
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "Konnte Commit-Objekt für '%s' nicht finden"
+
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"Der Branch '%s' ist nicht komplett gemerged.\n"
+"Wenn du ihn trotzdem löschen willst, benutze 'git branch -D %s'."
+
+#, c-format
+msgid "Error deleting %sbranch '%s'"
+msgstr "Fehler beim Löschen von %sBranch '%s'"
+
+#, c-format
+msgid "Deleted %sbranch %s (was %s).\n"
+msgstr "%sBranch '%s' gelöscht (war %s).\n"
+
+msgid "Update of config-file failed"
+msgstr "Konfigurationsdatei konnte nicht aktualisiert werden"
+
+#, c-format
+msgid "branch '%s' does not point at a commit"
+msgstr "Branch '%s' zeigt nicht auf einen Commit"
+
+#, c-format
+msgid "behind %d] "
+msgstr "nur dort %d] "
+
+#, c-format
+msgid "ahead %d] "
+msgstr "nur hier %d] "
+
+#, c-format
+msgid "ahead %d, behind %d] "
+msgstr "nur hier %d, nur dort %d] "
+
+msgid "(no branch)"
+msgstr "(kein Branch)"
+
+msgid "some refs could not be read"
+msgstr "einige Einträge konnten nicht gelesen werden"
+
+msgid "cannot rename the current branch while not on any."
+msgstr ""
+"kann den aktuellen Branch nicht umbenennen, wenn es keinen aktuellen Branch "
+"gibt."
+
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Ungültiger Name für Branch: '%s'"
+
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "Einen Branch namens '%s' gibt es schon."
+
+msgid "Branch rename failed"
+msgstr "Umbenennung des Branches fehlgeschlagen"
+
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Ungültigen Branchnamen '%s' durch Umbenennen in Ordnung gebracht"
+
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "Branch umbenannt nach %s, aber HEAD nicht aktualisiert!"
+
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+"Branch wurde umbenannt, aber die Konfigurationsdatei konnte nicht "
+"aktualisiert werden"
+
+#, c-format
+msgid "malformed object name %s"
+msgstr "ungültiger Objektname %s"
+
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Konnte HEAD nicht als gültige Referenze auflösen."
+
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD zeigt nicht auf eine Referenz unter refs/heads!"
+
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+"Die Optionen -a und -r für 'git branch' ergeben keinen Sinn zusammen mit "
+"einem Branchnamen"
+
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "Pfad '%s' hat keine Version 'von uns' im Index"
+
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "Pfad '%s' hat keine Version 'von denen' im Index"
+
+#, c-format
+msgid "path '%s' does not have all three versions"
+msgstr "Pfad '%s' hat keine drei verschiedenen Versionen im Index"
+
+#, c-format
+msgid "path '%s' does not have all 3 versions"
+msgstr "Pfad '%s' hat keine drei verschiedenen Versionen im Index"
+
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "Pfad '%s': kann nicht mergen"
+
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Kann Merge-Ergebnis für '%s' nicht hinzufügen"
+
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry fehlgeschlagen für Pfad '%s'"
+
+msgid "corrupt index file"
+msgstr "beschädigte Indexdatei"
+
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "Pfad '%s' enthält Konflikte"
+
+msgid "unable to write new index file"
+msgstr "kann keine neue Indexdatei anlegen"
+
+msgid "diff_setup_done failed"
+msgstr "diff_setup_done fehlgeschlagen"
+
+msgid "you need to resolve your current index first"
+msgstr "du musst zuerst Konflikte im aktuellen Index auflösen"
+
+#, c-format
+msgid "Can not do reflog for '%s'\n"
+msgstr "Kann Reflog für '%s' nicht einrichten\n"
+
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "'%s' ist schon aktiv\n"
+
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Zu Branch '%s' gewechselt und Inhalt überschrieben\n"
+
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Zu neuem Branch '%s' gewechselt\n"
+
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Zu Branch '%s' gewechselt\n"
+
+msgid "HEAD is now at"
+msgstr "HEAD zeigt jetzt auf"
+
+msgid "You are on a branch yet to be born"
+msgstr "Der aktive Branch ist noch nicht angelegt"
+
+msgid "Previous HEAD position was"
+msgstr "HEAD zeigte vorher auf"
+
+msgid "-B cannot be used with -b"
+msgstr "-B kann nicht mit -b kombiniert werden"
+
+msgid "--patch is incompatible with all other options"
+msgstr "--patch verträgt sich nicht mit allen anderen Optionen"
+
+msgid "--track needs a branch name"
+msgstr "--track braucht einen Branchnamen"
+
+msgid "Missing branch name; try -b"
+msgstr "Fehlender Branchname; versuch's mit -b"
+
+msgid "--orphan and -b|-B are mutually exclusive"
+msgstr "--orphan und -b|-B vertragen sich nicht"
+
+msgid "--orphan cannot be used with -t"
+msgstr "--orphan kann nicht mit -t kombiniert werden"
+
+msgid "git checkout: -f and -m are incompatible"
+msgstr "git checkout: -f und -m sind nicht kompatibel"
+
+#. case (1)
+#, c-format
+msgid "invalid reference: %s"
+msgstr "ungültige Referenz: %s"
+
+#. case (1): want a tree
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "Referenz ist kein Tree: %s"
+
+msgid "invalid path specification"
+msgstr "ungültige Pfadangabe"
+
+#, c-format
+msgid ""
+"git checkout: updating paths is incompatible with switching branches.\n"
+"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgstr ""
+"git checkout: Pfade aktualisieren und den Branch wechseln kann nicht\n"
+"kombiniert werden. Wolltest du '%s' (das wir nicht als Commit\n"
+"finden können) auschecken?"
+
+msgid "git checkout: updating paths is incompatible with switching branches."
+msgstr ""
+"git checkout: Pfade aktualisieren und den Branch wechseln kann nicht "
+"kombiniert werden."
+
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force und --merge ergeben keinen Sinn, "
+"wenn\n"
+"Pfade aus dem Index ausgecheckt werden."
+
+#, c-format
+msgid "git checkout: we do not like '%s' as a branch name."
+msgstr "git checkout: '%s' ist kein gültiger Branchname."
+
+#, c-format
+msgid "git checkout: branch %s already exists"
+msgstr "git checkout: den Branch '%s' gibt es schon"
+
+msgid "Cannot switch branch to a non-commit."
+msgstr "Kann einen Branch nicht auf etwas anderes als einen Commit umbiegen."
+
+msgid "--ours/--theirs is incompatible with switching branches."
+msgstr "--ours/--theirs können nicht beim Branch-wechseln benutzt werden."
+
+#, c-format
+msgid "reference repository '%s' is not a local directory."
+msgstr "Referenz-Repository '%s' ist kein lokales Verzeichnis."
+
+#, c-format
+msgid "failed to open '%s'"
+msgstr "konnte '%s' nicht öffnen"
+
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "konnte Verzeichnis '%s' nicht anlegen"
+
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "konnte '%s' nicht finden/prüfen"
+
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s existiert und ist kein Verzeichnis"
+
+#, c-format
+msgid "failed to stat %s\n"
+msgstr "konnte '%s' nicht finden/prüfen\n"
+
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "konnte '%s' nicht entfernen"
+
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "konnte Link '%s' nicht anlegen"
+
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "konnte Datei nicht nach '%s' kopieren"
+
+#, c-format
+msgid "done.\n"
+msgstr "fertig.\n"
+
+msgid "Too many arguments."
+msgstr "Zu viele Parameter."
+
+msgid "You must specify a repository to clone."
+msgstr "Du musst ein Quell-Repository angeben."
+
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "--bare und --origin %s sind nicht kombinierbar."
+
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "Zielfpad '%s' existiert schon und ist kein leeres Verzeichnis."
+
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "Arbeitsverzeichnis '%s' existiert schon."
+
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "konnte übergeordnete Verzeichnisse für '%s' nicht anlegen"
+
+#, c-format
+msgid "could not create work tree dir '%s'."
+msgstr "konnte Verzeichnis '%s' im Arbeitsverzeichnis nicht anlegen."
+
+#, c-format
+msgid "Cloning into bare repository %s"
+msgstr "Klone in Lager-Repository %s"
+
+#, c-format
+msgid "Cloning into %s"
+msgstr "Klone nach %s"
+
+#, c-format
+msgid "Don't know how to clone %s"
+msgstr "Ich weiß nicht, wie man %s klonen kann"
+
+#, c-format
+msgid "Remote branch %s not found in upstream %s, using HEAD instead"
+msgstr ""
+"Remote-branch %s nicht in Ursprung %s gefunden, benutze stattdessen HEAD"
+
+msgid "You appear to have cloned an empty repository."
+msgstr "Du hast anscheinend ein leeres Repository geklont."
+
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+"Ursprungs-HEAD verweist auf fehlende Referenz, kann keinen Checkout machen.\n"
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"If the identity used for this commit is wrong, you can fix it with:\n"
+"\n"
+" git commit --amend --author='Your Name <you@example.com>'\n"
+msgstr ""
+"Dein Name und deine E-Mail-Adresse wurden automatisch übernommen aus\n"
+"deinem Benutzernamen und Hostnamen. Bitte prüfe, ob sie korrekt sind.\n"
+"Du kannst diese Nachricht loswerden, indem du sie ausdrücklich einstellst:\n"
+"\n"
+" git config --global user.name \"Dein Name\"\n"
+" git config --global user.email du@example.com\n"
+"\n"
+"Falls die Angaben nicht stimmten, kannst du sie im angelegten Commit\n"
+"nachträglich korrigieren mit:\n"
+"\n"
+" git commit --amend --author='Dein Name <du@example.com>'\n"
+
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+"Du willst den neuesten Commit nachbearbeiten, aber dadurch würde er leer\n"
+"werden. Du kannst deinen Befehl mit --allow-empty wiederholen oder den\n"
+"Commit mit \"git reset HEAD^\" komplett entfernen.\n"
+
+msgid "failed to unpack HEAD tree object"
+msgstr "konnte das HEAD-Tree-Objekt nicht entpacken"
+
+msgid "interactive add failed"
+msgstr "Interaktives 'add' fehlgeschlagen"
+
+msgid "unable to write new_index file"
+msgstr "konnte new_index-Datei nicht anlegen"
+
+msgid "cannot do a partial commit during a merge."
+msgstr ""
+"während eines Merges kannst du keinen Commit anlegen, der\n"
+"vorgemerkte Änderungen ignoriert."
+
+msgid "cannot read the index"
+msgstr "kann den Index nicht auslesen"
+
+msgid "unable to write temporary index file"
+msgstr "kann keine temporäre Indexdatei anlegen"
+
+msgid "could not parse HEAD commit"
+msgstr "konnte HEAD-Commit nicht analysieren"
+
+#, c-format
+msgid "invalid commit: %s"
+msgstr "ungültiger Commit: %s"
+
+msgid "malformed --author parameter"
+msgstr "ungültiger '--author'-Parameter"
+
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(Commit-Kommentar wird von der Standardeingabe gelesen)\n"
+
+msgid "could not read log from standard input"
+msgstr "konnte Kommentar nicht von der Standardeingabe lesen"
+
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "konnte Kommentardatei '%s' nicht lesen"
+
+msgid "commit has empty message"
+msgstr "der Commit-Kommentar ist leer"
+
+msgid "could not read MERGE_MSG"
+msgstr "konnte MERGE_MSG nicht lesen"
+
+msgid "could not read SQUASH_MSG"
+msgstr "konnte SQUASH_MSG nicht lesen"
+
+#, c-format
+msgid "could not read '%s'"
+msgstr "konnte '%s' nicht lesen"
+
+#, c-format
+msgid "could not open '%s'"
+msgstr "konnte '%s' nicht öffnen"
+
+msgid "could not write commit template"
+msgstr "konnte Kommentarvorlage nicht anlegen"
+
+#, c-format
+msgid ""
+"#\n"
+"# It looks like you may be committing a MERGE.\n"
+"# If this is not correct, please remove the file\n"
+"#\t%s\n"
+"# and try again.\n"
+"#\n"
+msgstr ""
+"#\n"
+"# Es sieht so aus, als ob du einen MERGE committen willst.\n"
+"# Falls das nicht stimmt, entferne bitte die Datei\n"
+"#\t%s\n"
+"# und versuch's noch einmal.\n"
+"#\n"
+
+#, c-format
+msgid ""
+"\n"
+"# Please enter the commit message for your changes."
+msgstr "\n# Bitte gib einen Commit-Kommentar für deine Änderungen an."
+
+#, c-format
+msgid ""
+" Lines starting\n"
+"# with '#' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+" Zeilen, die mit '#'\n"
+"# anfangen, werden ignoriert, und ein leerer Kommentar bricht den Commit "
+"ab.\n"
+
+#, c-format
+msgid ""
+" Lines starting\n"
+"# with '#' will be kept; you may remove them yourself if you want to.\n"
+"# An empty message aborts the commit.\n"
+msgstr ""
+" Zeilen, die mit '#'\n"
+"# anfangen, werden beibehalten; du kannst sie selbst entfernen, wenn du\n"
+"willst. Ein leerer Kommentar bricht den Commit ab.\n"
+
+#, c-format
+msgid "%s# Author: %s\n"
+msgstr "%s# Autor: %s\n"
+
+#, c-format
+msgid "%s# Committer: %s\n"
+msgstr "%s# Committer: %s\n"
+
+msgid "Cannot read index"
+msgstr "Kann Index nicht auslesen"
+
+msgid "Error building trees"
+msgstr "Fehler beim Anlegen der Trees"
+
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "Bitte gib den Kommentar mit der Option -m oder -F an.\n"
+
+#, c-format
+msgid "No existing author found with '%s'"
+msgstr "Kein bekannter Autor gefunden mit '%s'"
+
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Ungültiger Modus für unberücksichtigte Dateien: '%s'"
+
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "Es ist unsinnig, --reset-author und --author zusammen zu benutzen"
+
+msgid "You have nothing to amend."
+msgstr "Da ist nichts, was du nachbearbeiten könntest."
+
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Du bist mitten in einem Merge; da kannst du nichts nachbearbeiten."
+
+msgid "Only one of -c/-C/-F can be used."
+msgstr "Nur eine der Optionen -c/-C/-F kann auf einmal benutzt werden."
+
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Option -m kann nicht kombiniert werden mit -c/-C/-F."
+
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author kann nur mit -C, -c oder --amend benutzt werden."
+
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "konnte Commit %s nicht finden"
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr "konnte Commit %s nicht analysieren"
+
+msgid "Only one of --include/--only/--all/--interactive can be used."
+msgstr ""
+"Nur eins von --include/--only/--all/--interactive kann auf einmal benutzt "
+"werden."
+
+msgid "No paths with --include/--only does not make sense."
+msgstr "Für --include/--only musst du Pfade angeben."
+
+msgid "Clever... amending the last one with dirty index."
+msgstr ""
+"Bearbeite letzten Commit nach, ohne Änderungen an Dateien zu übernehmen."
+
+msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+msgstr ""
+"Pfade angegeben ohne ausdrückliches -i oder -o angegeben, ich nehme -o an..."
+
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Ungültiger Aufräummodus (--cleanup) für den Commit-Kommentar"
+
+msgid "Paths with -a does not make sense."
+msgstr "Es ist unsinnig, mit -a Pfade anzugeben."
+
+msgid "Paths with --interactive does not make sense."
+msgstr "Es ist unsinnig, Pfade mit --interactive anzugeben."
+
+msgid "couldn't look up newly created commit"
+msgstr "konnte neu angelegten Commit nicht finden"
+
+msgid "could not parse newly created commit"
+msgstr "konnte neu angelegten Commit nicht analysieren"
+
+msgid "detached HEAD"
+msgstr "von HEAD abgetrennt"
+
+msgid " (root-commit)"
+msgstr " (erster Commit)"
+
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "konnte '%s' nicht zum Lesen öffnen"
+
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
+
+msgid "could not read MERGE_MODE"
+msgstr "konnte MERGE_MODE nicht auslesen"
+
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "konnte Commit-Kommentar nicht lesen: %s"
+
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Commit abgebrochen wegen leerem Kommentar.\n"
+
+msgid "failed to write commit object"
+msgstr "konnte Commit-Objekt nicht anlegen"
+
+msgid "cannot lock HEAD ref"
+msgstr "kann kein Lock für HEAD-Referenz anfordern"
+
+msgid "cannot update HEAD ref"
+msgstr "kann HEAD-Referenz nicht aktualisieren"
+
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full or quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+"Repository wurde aktualisiert, aber ich kann die new_index-Datei nicht\n"
+"anlegen. Stelle sicher, dass der Datenträger nicht voll ist und du deine\n"
+"Limits nicht überschreitest, und benutze \"git reset HEAD\" zum Reparieren."
+
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s': weder normale Datei noch Symlink"
+
+#, c-format
+msgid "invalid option: %s"
+msgstr "ungültige Option: %s"
+
+msgid "Not a git repository"
+msgstr "Kein git-Repository"
+
+msgid "No HEAD commit to compare with (yet)"
+msgstr "Es gibt (noch) keinen HEAD-Commit als Vergleich"
+
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "ungültiges Objekt '%s' angegeben."
+
+#, c-format
+msgid "more than %d trees given: '%s'"
+msgstr "mehr als %d Trees angegeben: '%s'"
+
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "mehr als zwei Blobs angegeben: '%s'"
+
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "nicht unterstütztes Objekt '%s' angegeben."
+
+msgid "Couldn't find remote ref HEAD"
+msgstr "Konnte Remote-Referenz HEAD nicht finden"
+
+#, c-format
+msgid "object %s not found"
+msgstr "Objekt %s nicht gefunden"
+
+msgid "[up to date]"
+msgstr "[aktuell]"
+
+#.
+#. * If this is the head, and it's not okay to update
+#. * the head, and the old value of the head isn't empty...
+#.
+#, c-format
+msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
+msgstr "! %-*s %-*s -> %s (kann nicht den aktuellen Branch überschreiben)"
+
+msgid "[rejected]"
+msgstr "[abgewiesen]"
+
+msgid "[tag update]"
+msgstr "[Tag-Update]"
+
+msgid " (unable to update local ref)"
+msgstr " (kann lokale Referenz nicht aktualisieren)"
+
+#, c-format
+msgid "cannot open %s: %s\n"
+msgstr "kann %s nicht öffnen: %s\n"
+
+msgid "branch"
+msgstr "Branch"
+
+msgid "tag"
+msgstr "Tag"
+
+msgid "remote branch"
+msgstr "Remote-Branch"
+
+#, c-format
+msgid "From %.*s\n"
+msgstr "Von %.*s\n"
+
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"ein paar lokale Referenzen konnten nicht aktualisiert werden; versuche,\n"
+"alte Branches, die evtl. im Weg sind, mit 'git remote prune %s' zu entfernen"
+
+msgid "could not run rev-list"
+msgstr "konnte rev-list nicht ausführen"
+
+#, c-format
+msgid "failed write to rev-list: %s"
+msgstr "konnte Daten nicht an rev-list übergeben: %s"
+
+#, c-format
+msgid "failed to close rev-list's stdin: %s"
+msgstr "konnte Standardeingabe von rev-list nicht schließen: %s"
+
+#, c-format
+msgid " (%s will become dangling)\n"
+msgstr " (%s wird auf nichts mehr zeigen)\n"
+
+#, c-format
+msgid " (%s has become dangling)\n"
+msgstr " (%s zeigt auf nichts mehr)\n"
+
+msgid "[deleted]"
+msgstr "[entfernt]"
+
+msgid "(none)"
+msgstr "(nichts)"
+
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr ""
+"Überschreiben des aktuellen Branches %s in Arbeits-Repository verweigert"
+
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr "Ich weiß nicht, wie man von %s fetchen kann"
+
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "Option \"%s\" (Wert \"%s\") ist nicht gültig für %s"
+
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "Option \"%s\" wird für %s ignoriert\n"
+
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Hole %s\n"
+
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Konnte %s nicht holen"
+
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+"Kein Ursprungs-Repository angebene. Bitte gib entweder eine URL oder einen\n"
+"Remote-Namen an, um die Quelle für neu geholte Revisionen festzulegen."
+
+msgid "You need to specify a tag name."
+msgstr "Du musst einen Tagnamen angeben."
+
+msgid "fetch --all does not take a repository argument"
+msgstr ""
+"fetch --all akzeptiert keine ausdrückliche Angabe eines Ursprungs-Repositorys"
+
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all ergibt keinen Sinn mit Refspecs"
+
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "Es gibt keinen Remote %s und auch keine entsprechende Remote-Grouppe"
+
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "Das Holen einer Gruppe unter Angabe von Refspecs ergibt keinen Sinn"
+
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: konnte Thread nicht anlegen: %s"
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': kann %s nicht lesen"
+
+#, c-format
+msgid "'%s': %s"
+msgstr "'%s': %s"
+
+# FIXME: ich hab keine Ahnung, worum es hier geht
+#, c-format
+msgid "'%s': short read %s"
+msgstr "'%s': short read %s"
+
+#, c-format
+msgid "Failed to chdir: %s"
+msgstr "Konnte Verzeichnis nicht wechseln: %s"
+
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "kann Tree nicht lesen (%s)"
+
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "kann Objekte des Typs %s nicht greppen"
+
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "Option `%c' benötigt einen numerischen Wert"
+
+#, c-format
+msgid "cannot open '%s'"
+msgstr "kann '%s' nicht öffnen"
+
+msgid "no pattern given."
+msgstr "kein Suchmuster angegeben."
+
+msgid "cannot mix --fixed-strings and regexp"
+msgstr "kann --fixed-strings nicht mit regulärem Ausdruck kombinieren"
+
+#, c-format
+msgid "bad object %s"
+msgstr "ungültiges Objekt %s"
+
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager funktioniert nur im Arbeitsverzeichnis"
+
+msgid "--cached cannot be used with --no-index."
+msgstr "--cached kann nicht mit --no-index kombiniert werden."
+
+msgid "--no-index cannot be used with revs."
+msgstr "--no-index kann nicht mit der Angabe von Revisionen kombiniert werden."
+
+msgid "both --cached and trees are given."
+msgstr "Du hast sowohl --cached als auch Trees angegeben."
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Konnte %s nicht für die Gruppe beschreibbar machen"
+
+#, c-format
+msgid "insanely long template name %s"
+msgstr "irrsinnig langer Vorlagen-Name %s"
+
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "kann '%s' nicht finden/prüfen"
+
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "kann Vorlage '%s' nicht anlegen/prüfen"
+
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "kann Verzeichnis '%s' nicht auslesen"
+
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "kann Linkziel für '%s' nicht ermitteln"
+
+#, c-format
+msgid "insanely long symlink %s"
+msgstr "irrsinnig langer Symlink '%s'"
+
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "kann '%s' nicht von '%s' aus symlinken"
+
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "kann '%s' nicht nach '%s' kopieren"
+
+#, c-format
+msgid "ignoring template %s"
+msgstr "ignoriere Vorlage %s"
+
+#, c-format
+msgid "insanely long template path %s"
+msgstr "irrsinnig langer Vorlagen-Pfad %s"
+
+#, c-format
+msgid "templates not found %s"
+msgstr "Vorlagen nicht gefunden: %s"
+
+#, c-format
+msgid "not copying templates of a wrong format version %d from '%s'"
+msgstr "kopiere keine Vorlage in einer falschen Formatversion %d von '%s'"
+
+#, c-format
+msgid "insane git directory %s"
+msgstr "irrsinniges git-Verzeichnis %s"
+
+#. TRANSLATORS: The first '%s' is either "Reinitialized
+#. existing" or "Initialized empty", the second " shared" or
+#. "", and the last '%s%s' is the verbatim directory name.
+#, c-format
+msgid "%s%s Git repository in %s%s\n"
+msgstr "%s%s git-Repository in %s%s\n"
+
+msgid "Reinitialized existing"
+msgstr "Noch einmal neu initialisiert:"
+
+msgid "Initialized empty"
+msgstr "Neu angelegt:"
+
+msgid " shared"
+msgstr " gemeinsam benutztes"
+
+msgid "cannot tell cwd"
+msgstr "kann aktuelles Verzeichnis nicht ermitteln"
+
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "cann Verzeichnis %s nicht anlegen"
+
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "kann nicht in Verzeichnis %s wechseln"
+
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne %s (oder --git-"
+"dir=<Verzeichnis)"
+
+msgid "Cannot access current working directory"
+msgstr "Kann auf aktuelles Verzeichnis nicht zugreifen"
+
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Kann auf Arbeitsverzeichnis '%s' nicht zugreifen"
+
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "ungültige '--decorate'-Option: %s"
+
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "ungültiger Parameter: %s"
+
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "Endgültige Ausgabe: %d %s\n"
+
+msgid "revision walk setup failed"
+msgstr "Einrichtung der Revisionsverfolgung fehlgeschlagen"
+
+#, c-format
+msgid "Could not read object %s"
+msgstr "Konnte Objekt %s nicht lesen"
+
+#, c-format
+msgid "Unknown type: %d"
+msgstr "Unbekannter Typ: %d"
+
+msgid "format.headers without value"
+msgstr "format.headers ohne Wert"
+
+msgid "name of output directory is too long"
+msgstr "Name des Ausgabeverzeichnisses ist zu lang"
+
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr "Kann Patch-Datei %s nicht öffnen"
+
+msgid "Need exactly one range."
+msgstr "Brauche genau eine Bereichsangabe."
+
+msgid "Not a range."
+msgstr "Keine gültige Bereichsangabe."
+
+msgid "Could not extract email from committer identity."
+msgstr "Konnte E-Mail-Adresse nicht aus der Committer-Angabe entnehmen."
+
+msgid ""
+"*** SUBJECT HERE ***\n"
+"\n"
+"*** BLURB HERE ***\n"
+msgstr ""
+"*** BETREFF HIER ***\n"
+"\n"
+"*** DETAILS HIER ***\n"
+
+msgid "Cover letter needs email format"
+msgstr "Begleittext muss im E-Mail-Format sein"
+
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "irrsinniges in-reply-to: %s"
+
+msgid "Two output directories?"
+msgstr "Zwei Ausgabeverzeichnisse?"
+
+#, c-format
+msgid "bogus committer info %s"
+msgstr "merkwürdige Committer-Angabe %s"
+
+msgid "-n and -k are mutually exclusive."
+msgstr "-n und -k vertragen sich nicht."
+
+msgid "--subject-prefix and -k are mutually exclusive."
+msgstr "--subject-prefix und -k vertragen sich nicht."
+
+msgid "--name-only does not make sense"
+msgstr "--name-only ergibt keinen Sinn"
+
+msgid "--name-status does not make sense"
+msgstr "--name-status ergibt keinen Sinn"
+
+msgid "--check does not make sense"
+msgstr "--check ergibt keinen Sinn"
+
+msgid "standard output, or directory, which one?"
+msgstr "Standardausgabe oder Verzeichnis... entscheide dich!"
+
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr "Konnte Verzeichnis '%s' nicht anlegen"
+
+msgid "Failed to create output files"
+msgstr "Konnte Ausgabedateien nicht anlegen"
+
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"Konnte keinen verfolgten Remote-Branch finden, bitte gib <Ursprung> selbst "
+"an.\n"
+
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Unbekannter Commit %s"
+
+msgid "switch `m' requires a value"
+msgstr "Option `m' benötigt einen Wert"
+
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
+
+#, c-format
+msgid "Available strategies are:"
+msgstr "Verfügbare Strategien sind:"
+
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Verfügbare benutzerdefinierte Strategien sind:"
+
+msgid "could not run stash."
+msgstr "konnte 'stash' nicht ausführen."
+
+msgid "stash failed"
+msgstr "'stash' fehlgeschlagen"
+
+#, c-format
+msgid "not a valid object: %s"
+msgstr "kein gültiges Object: %s"
+
+msgid "read-tree failed"
+msgstr "read-tree fehlgeschlagen"
+
+msgid " (nothing to squash)"
+msgstr " (nichts zu kombinieren (--squash))"
+
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Squash-Commit -- HEAD wird nicht aktualisiert\n"
+
+#, c-format
+msgid "Could not write to '%s'"
+msgstr "Konnte '%s' nicht beschreiben"
+
+msgid "Writing SQUASH_MSG"
+msgstr "Schreibe SQUASH_MSG"
+
+msgid "Finishing SQUASH_MSG"
+msgstr "Schließe SQUASH_MSG ab"
+
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Kein Merge-Kommentar -- HEAD wird nicht aktualisiert\n"
+
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' zeigt nicht auf einen Commit"
+
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Ungültiger Wert für branch.%s.mergeoptions: %s"
+
+msgid "git write-tree failed to write a tree"
+msgstr "'git write-tree' konnte keinen Tree anlegen"
+
+msgid "failed to read the cache"
+msgstr "konnte den Index nicht auslesen"
+
+msgid "Unable to write index."
+msgstr "Konnte den Index nicht anlegen."
+
+msgid "Not handling anything other than two heads merge."
+msgstr "Ich erledige ausschließlich Merges mit zwei Quellen."
+
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Unbekannte Option für merge-recursive: -X%s"
+
+#, c-format
+msgid "unable to write %s"
+msgstr "konnte %s nicht beschreiben"
+
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Wunderbar.\n"
+
+msgid "In-index merge"
+msgstr "Merge im Index"
+
+#, c-format
+msgid "Merge made by %s."
+msgstr "Merge produziert von '%s'."
+
+#, c-format
+msgid "Could not open '%s' for writing"
+msgstr "Konnte '%s' nicht zum Schreiben öffnen"
+
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+"Automatischer Merge fehlgeschlagen; behebe die Konflikte und committe das "
+"Ergebnis.\n"
+
+#, c-format
+msgid "'%s' is not a commit"
+msgstr "'%s' ist kein Commit"
+
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+"Du hast deinen Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
+"Bitte committe deine Änderungen, bevor du einen weiteren Merge startest."
+
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Du hast deinen Merge nicht abgeschlossen (MERGE_HEAD existiert)."
+
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Du kannst --squash nicht mit --no-ff kombinieren."
+
+msgid "You cannot combine --no-ff with --ff-only."
+msgstr "Du kannst --no-ff nicht mit --ff-only kombinieren (wirklich wahr)."
+
+# Die Originalumschreibung "exactly one commit" ist irreführend; es geht
+# natürlich um die gesamte History hinter diesem Commit
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Kann nur exakt eine Historie in einen leeren Branch mergen"
+
+msgid "Squash commit into empty head not supported yet"
+msgstr "Squash-Commit in leeren Branch wird noch nicht unterstützt"
+
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "Das Erzwingen eines Merge-Commits in einem leeren Branch ist unsinnig"
+
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s ist etwas, das wir nicht mergen können"
+
+#.
+#. * If head can reach all the merge then we are up to date.
+#. * but first the most common case of merging one remote.
+#.
+msgid "Already up-to-date."
+msgstr "Bereits aktuell."
+
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Aktualisiere %s..%s\n"
+
+msgid "Fast-forward"
+msgstr "Update ohne Merge"
+
+msgid " (no commit created; -m option ignored)"
+msgstr " (kein Commit angelegt; -m ignoriert)"
+
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Probiere simplen Merge im Index...\n"
+
+#, c-format
+msgid "Nope.\n"
+msgstr "Nö.\n"
+
+msgid "Already up-to-date. Yeeah!"
+msgstr "Bereits aktuell. Juchu!"
+
+msgid "Not possible to fast-forward, aborting."
+msgstr "Kann nicht ohne Merge-Commit aktualisieren, breche ab."
+
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Räume auf...\n"
+
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Probiere Merge-Strategie %s...\n"
+
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Keine Merge-Strategie hat den Merge erledigt.\n"
+
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Merge mit Strategie '%s' fehlgeschlagen.\n"
+
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "Benutze Strategie '%s', um auf manuelle Auflösung vorzubereiten.\n"
+
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Automatischer Merge hat gut funktioniert; warte wie gewünscht vor dem "
+"Commit\n"
+
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Prüfe Umbenennen von '%s' nach '%s'\n"
+
+msgid "bad source"
+msgstr "ungültige Quelle"
+
+msgid "can not move directory into itself"
+msgstr "kann ein Verzeichnis nicht in sich selbst verschieben"
+
+msgid "cannot move directory over file"
+msgstr "kann Verzeichnis nicht an die Stelle einer Datei verschieben"
+
+#, c-format
+msgid "Huh? %.*s is in index?"
+msgstr "Hä? %.*s ist im Index?"
+
+msgid "source directory is empty"
+msgstr "Quellverzeichnis ist leer"
+
+msgid "not under version control"
+msgstr "nicht unter Versionskontrolle"
+
+msgid "destination exists"
+msgstr "Ziel existiert schon"
+
+#, c-format
+msgid "%s; will overwrite!"
+msgstr "%s; werde überschreiben!"
+
+msgid "Cannot overwrite"
+msgstr "Kann nicht überschreiben"
+
+msgid "multiple sources for the same target"
+msgstr "mehrere Quellen für das gleiche Ziel"
+
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, Quelle=%s, Ziel=%s"
+
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "Benenne %s um nach %s\n"
+
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "Umbenennen von '%s' fehlgeschlagen"
+
+msgid "tag shorthand without <tag>"
+msgstr "'tag'-Kurzschreibweise ohne <Tag>"
+
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete akzeptiert nur einfache Referenzen, keine Refspecs"
+
+msgid "You are not currently on a branch."
+msgstr "Es ist momentan kein Branch aktiv."
+
+#, c-format
+msgid "The current branch %s is not tracking anything."
+msgstr "Der aktuelle Branch %s verfolgt keinen Branch."
+
+#, c-format
+msgid "The current branch %s is tracking multiple branches, refusing to push."
+msgstr "Der aktuelle Branch %s verfolgt mehrere Branches, 'push' verweigert."
+
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Du hast keine Refspecs angegeben und push.default ist auf 'nothing' gesetzt."
+
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Übertrag zu %s\n"
+
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "Übertragen einiger Referenzen zu '%s' fehlgeschlagen"
+
+# TODO: Verweis auf Manpage aktualisieren, sobald wir die auch übersetzen
+#, c-format
+msgid ""
+"To prevent you from losing history, non-fast-forward updates were rejected\n"
+"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
+"'Note about fast-forwards' section of 'git push --help' for details.\n"
+msgstr ""
+"Um zu verhindern, dass du Daten verlierst, wurden Updates, die einen\n"
+"Merge-Commit erfordern, zurückgewiesen. Merge die Änderungen im\n"
+"im Ursprungs-Repository (z.B. 'git pull'), bevor du es nochmal versuchst.\n"
+"Siehe den Abschnitt 'Note about fast-forwards' von 'git push --help' für\n"
+"mehr Informationen.\n"
+
+#, c-format
+msgid "bad repository '%s'"
+msgstr "ungültiges Repository '%s'"
+
+msgid "No destination configured to push to."
+msgstr "Kein Ziel für 'push' festgelegt."
+
+msgid "--all and --tags are incompatible"
+msgstr "--all und --tags vertragen sich nicht"
+
+msgid "--all can't be combined with refspecs"
+msgstr "--all kann nicht mit Refspecs kombiniert werden"
+
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror und --tags vertragen sich nicht"
+
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror kann nicht mit Refspecs kombiniert werden"
+
+msgid "--all and --mirror are incompatible"
+msgstr "--all und --mirror vertragen sich nicht"
+
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete verträgt sich nicht mit --all, --mirror und --tags"
+
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete ergibt keinen Sinn ohne Angabe von Referenzen"
+
+# Originalwerte für diese Strings belassen wg. Übereinstimmung mit
+# Optionsnamen
+msgid "mixed"
+msgstr ""
+
+msgid "soft"
+msgstr ""
+
+msgid "hard"
+msgstr ""
+
+msgid "merge"
+msgstr ""
+
+msgid "keep"
+msgstr ""
+
+msgid "You do not have a valid HEAD."
+msgstr "Du hast kein gültiges HEAD."
+
+msgid "Failed to find tree of HEAD."
+msgstr "Konnte Tree von HEAD nicht finden."
+
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Konnte Tree von %s nicht finden."
+
+msgid "Could not write new index file."
+msgstr "Konnte neue Indexdatei nicht anlegen."
+
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ist jetzt bei %s"
+
+msgid "Could not read index"
+msgstr "Konnte den Index nicht auslesen"
+
+msgid "Unstaged changes after reset:"
+msgstr "Nicht vorgemerkte Änderungen nach Reset:"
+
+#, c-format
+msgid "Reflog action message too long: %.*s..."
+msgstr "Aktionsbeschreibung im Reflog zu lang: %.*s..."
+
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "Kann keinen '%s'-Reset mitten in einem Merge machen."
+
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
+
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Konnte Objekt '%s' nicht einlesen."
+
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch verträgt sich nicht mit --{hard,mixed,soft}"
+
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+"--mixed mit Pfaden ist veraltet; benutze stattdessen 'git reset -- <Pfade>'."
+
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Kann keinen '%s'-Reset mit Pfadangaben durchführen."
+
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "'%s'-Reset ist in einem Lager-Repository nicht erlaubt"
+
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "Konnte Indexdatei nicht auf Revision '%s' zurücksetzen."
+
+#, c-format
+msgid ""
+"'%s' has staged content different from both the file and the HEAD\n"
+"(use -f to force removal)"
+msgstr ""
+"'%s' hat vorgemerkte Änderungen, die sich sowohl von der Datei\n"
+"als auch vom letzten Commit unterscheiden (-f, um trotzdem zu löschen)"
+
+#, c-format
+msgid ""
+"'%s' has changes staged in the index\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"'%s' hat Änderungen im Index vorgemerkt\n"
+"(--cached, um die Datei zu behalten, oder -f, um trotzdem zu löschen)"
+
+#, c-format
+msgid ""
+"'%s' has local modifications\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"'%s' hat Änderungen im Arbeitsverzeichnis\n"
+"(--cached, um die Datei zu behalten, oder -f, um trotzdem zu löschen)"
+
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "entferne Verzeichnis '%s' nicht rekursiv ohne -r"
+
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm: kann %s nicht entfernen"
+
+#, c-format
+msgid "tag name too long: %.*s..."
+msgstr "Tagname zu lang: %.*s..."
+
+#, c-format
+msgid "tag '%s' not found."
+msgstr "Tag '%s' nicht gefunden."
+
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "Tag '%s' gelöscht (war %s)\n"
+
+#, c-format
+msgid "could not verify the tag '%s'"
+msgstr "konnte den Tag '%s' nicht überprüfen"
+
+msgid "committer info too long."
+msgstr "Committer-Angabe zu lang."
+
+msgid "could not run gpg."
+msgstr "konnte gpg nicht ausführen."
+
+msgid "gpg did not accept the tag data"
+msgstr "gpg hat die Tag-Daten nicht angenommen"
+
+msgid "gpg failed to sign the tag"
+msgstr "gpg konnte den Tag nicht signieren"
+
+msgid ""
+"\n"
+"#\n"
+"# Write a tag message\n"
+"#\n"
+msgstr ""
+"\n"
+"#\n"
+"# Schreibe einen Tag-Kommentar\n"
+"#\n"
+
+#, c-format
+msgid "signing key value too long (%.10s...)"
+msgstr "Wert für Signatur-Key zu lang (%.10s...)"
+
+msgid "unable to sign the tag"
+msgstr "kann den Tag nicht signieren"
+
+msgid "unable to write tag file"
+msgstr "kann die Tag-Datei nicht anlegen"
+
+msgid "bad object type."
+msgstr "ungültiger Objekttyp."
+
+msgid "tag header too big."
+msgstr "Tag-Header zu groß."
+
+#, c-format
+msgid "could not create file '%s'"
+msgstr "konnte Datei '%s' nicht anlegen"
+
+msgid "no tag message?"
+msgstr "kein Tag-Kommentar?"
+
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "Der Tag-Kommentar wurde nach %s gesichert\n"
+
+msgid "-n option is only allowed with -l."
+msgstr "-n ist nur in Kombination mit -l erlaubt."
+
+msgid "--contains option is only allowed with -l."
+msgstr "--contains ist nur in Kombination mit -l erlaubt."
+
+msgid "only one -F or -m option is allowed."
+msgstr "entweder -F oder -m -- entscheide dich."
+
+#, c-format
+msgid "cannot read '%s'"
+msgstr "kann '%s' nicht auslesen"
+
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "kann '%s' nicht öffnen oder auslesen"
+
+msgid "too many params"
+msgstr "zu viele Parameter"
+
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' ist kein gültiger Tagname."
+
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "Tag '%s' existiert schon"
+
+#, c-format
+msgid "%s: cannot lock the ref"
+msgstr "%s: kann kein Lock für die Referenz anfordern"
+
+#, c-format
+msgid "%s: cannot update the ref"
+msgstr "%s: kann die Referenz nicht aktualisieren"
+
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Tag '%s' aktualisiert (war %s)\n"
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+msgid "See 'git help COMMAND' for more information on a specific command."
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+msgid "TEST: A C test string"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, c-format
+msgid "TEST: A C test string %s"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, c-format
+msgid "TEST: Hello World!"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, c-format
+msgid "TEST: Old English Runes"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, c-format
+msgid "TEST: ‘single’ and “double” quotes"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+msgid "TEST: A Shell test string"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, sh-format
+msgid "TEST: A Shell test $variable"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+msgid "TEST: A Perl test string"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, perl-format
+msgid "TEST: A Perl test variable %s"
+msgstr ""
--
1.7.2.2.336.g704fc
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 1/2] po/de.po: add German translation
2010-09-04 0:49 ` [PATCH 1/2] po/de.po: add German translation avarab
@ 2010-09-06 15:41 ` Thomas Rast
2010-09-06 16:09 ` Jan Krüger
` (2 more replies)
0 siblings, 3 replies; 15+ messages in thread
From: Thomas Rast @ 2010-09-06 15:41 UTC (permalink / raw)
To: avarab; +Cc: git, Junio C Hamano, Jan Krüger, Sam Reed, Jeff King
Hi Jan
First off thanks for taking on the mammoth job of translating this. I
skimmed the entire file, and apart from the comments below everything
looks sane, though I may of course have missed something.
I already like the translation way better than the one that
gitk/git-gui have, because it doesn't try so hard to translate *every*
term. Maybe it would help to make a little translation glossary,
here's a start:
bare repository Lager-Repository
blob object Blob-Objekt
branch Branch (m.)
checkout auschecken
commit Commit/committen
commit object Commit-Objekt
dangling ... ... zeigt ins Leere
detached HEAD von HEAD abgetrennt [but see below]
directory Verzeichnis
fast-forward Update ohne Merge
fetch holen
file system Dateisystem
index Index
merge Merge
object Objekt
origin Ursprung
parent [unused, but would be interesting]
pull [dito]
push push [though only used as the command name so far]
reference Referenz
reflog Reflog
refspec Refspec
repository Repository
resolve auflösen
revision Revision
tag Tag
tracking branch ... verfolgt ...
tree Tree
unmerged verbleibende Konflikte
upstream branch Ursprung [note collision with "origin"]
working tree Arbeitsverzeichnis
As I said, I agree with the general idea of leaving certain terms
untranslated. You said on IRC that you left all English terms that
are also used on
http://de.wikipedia.org/wiki/Versionskontrolle
which seems a sound rule. In any case it roughly matches (or still
stays slightly on the more-German side of) the colloquial usage in my
group, if that is any indication.
avarab@gmail.com wrote:
> +#, c-format
> +msgid "nothing added to commit but untracked files present%s\n"
> +msgstr "keine Änderungen für den Commit vorgemerkt, aber unberücksichtigte Dateien vorhanden\n"
Loses the %s (which is used for advice).
> +#, c-format
> +msgid "unexpected diff status %c"
> +msgstr "unerwarteter Diff-Status %s"
Changes the format type.
[way earlier, and same goes for "by us" -> "hier" [lit. "here"]]
> +msgid "deleted by them:"
> +msgstr "dort gelöscht:"
[lit. "deleted there"]
> +
[...]
> +#, c-format
> +msgid "behind %d] "
> +msgstr "nur dort %d] "
[lit. "only there"]
This had me pause for a moment. The concepts of "[merge side] theirs"
and "behind" are quite different; is it a good idea to translate these
to the same?
Especially so since later on you translate
> +#, c-format
> +msgid "path '%s' does not have our version"
> +msgstr "Pfad '%s' hat keine Version 'von uns' im Index"
[lit. "... 'of us' ..."]
I do agree that the best I can come up with, "von den anderen
gelöscht", would be quite awkward.
> +msgid "You are on a branch yet to be born"
> +msgstr "Der aktive Branch ist noch nicht angelegt"
ISTR you asked about this on IRC, very nice solution.
> +msgid "--patch is incompatible with all other options"
> +msgstr "--patch verträgt sich nicht mit allen anderen Optionen"
Nit: "... den restlichen Optionen" would be less ambiguous as to how
many of them you can give until it conflicts with --patch.
> +#, c-format
> +msgid "Remote branch %s not found in upstream %s, using HEAD instead"
> +msgstr ""
> +"Remote-branch %s nicht in Ursprung %s gefunden, benutze stattdessen HEAD"
["Ursprung" is literally "origin"]
This also has a slight danger of confusion with the canonical upstream
'origin'.
> +#, c-format
> +msgid ""
> +" Lines starting\n"
> +"# with '#' will be kept; you may remove them yourself if you want to.\n"
> +"# An empty message aborts the commit.\n"
> +msgstr ""
> +" Zeilen, die mit '#'\n"
> +"# anfangen, werden beibehalten; du kannst sie selbst entfernen, wenn du\n"
> +"willst. Ein leerer Kommentar bricht den Commit ab.\n"
The last line lacks a #.
> +msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
> +msgstr ""
> +"Pfade angegeben ohne ausdrückliches -i oder -o angegeben, ich nehme -o an..."
There's a stray "angegeben".
> +# FIXME: ich hab keine Ahnung, worum es hier geht
> +#, c-format
> +msgid "'%s': short read %s"
> +msgstr "'%s': short read %s"
Judging from the code, the file size changed between lstat() and
read_in_full(), and/or read() failed to read the end of the file.
Maybe "unvollständig gelesen".
> +msgid "You cannot combine --no-ff with --ff-only."
> +msgstr "Du kannst --no-ff nicht mit --ff-only kombinieren (wirklich wahr)."
:-)
> +#, c-format
> +msgid "%s - not something we can merge"
> +msgstr "%s ist etwas, das wir nicht mergen können"
That's the message you get if you say "git merge nonexistent" in an
unborn branch, so the implication (in the German version) that %s
exists is not accurate. Maybe "Ich kann mit %s nichts anfangen" or
"%s taugt nicht für einen Merge"?
> +msgid "Fast-forward"
> +msgstr "Update ohne Merge"
Clever!
> +#, c-format
> +msgid "Pushing to %s\n"
> +msgstr "Übertrag zu %s\n"
"Übertrage"?
[probably out of order, I found it while compiling the glossary]
> +msgid "detached HEAD"
> +msgstr "von HEAD abgetrennt"
That's not strictly speaking true; HEAD always points to a commit
except in an unborn branch, and in any case (this is from commit.c)
points to a commit after this message is output. You could try
"abgetrennter HEAD", "entkoppelter HEAD" or so...
--
Thomas Rast
trast@{inf,student}.ethz.ch
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 1/2] po/de.po: add German translation
2010-09-06 15:41 ` Thomas Rast
@ 2010-09-06 16:09 ` Jan Krüger
2010-09-06 17:06 ` Ævar Arnfjörð Bjarmason
2010-09-06 16:24 ` Jens Lehmann
2010-09-06 17:15 ` Ævar Arnfjörð Bjarmason
2 siblings, 1 reply; 15+ messages in thread
From: Jan Krüger @ 2010-09-06 16:09 UTC (permalink / raw)
To: Thomas Rast; +Cc: avarab, git, Junio C Hamano, Sam Reed, Jeff King
Hi Thomas,
thanks for your comments so far. I pretty much agree with all of your
thoughts, so below I'm going to focus on those where I have something
to say in addition to that.
> > +#, c-format
> > +msgid "nothing added to commit but untracked files present%s\n"
> > +msgstr "keine Änderungen für den Commit vorgemerkt, aber
> > unberücksichtigte Dateien vorhanden\n"
>
> Loses the %s (which is used for advice).
That's me being careless. I will add an additional check to my workflow
to prevent format string bugs from happening again.
> [way earlier, and same goes for "by us" -> "hier" [lit. "here"]]
> > +msgid "deleted by them:"
> > +msgstr "dort gelöscht:"
> [lit. "deleted there"]
> > +
> [...]
> > +#, c-format
> > +msgid "behind %d] "
> > +msgstr "nur dort %d] "
> [lit. "only there"]
>
> This had me pause for a moment. The concepts of "[merge side] theirs"
> and "behind" are quite different; is it a good idea to translate these
> to the same?
>
> Especially so since later on you translate
>
> > +#, c-format
> > +msgid "path '%s' does not have our version"
> > +msgstr "Pfad '%s' hat keine Version 'von uns' im Index"
> [lit. "... 'of us' ..."]
>
> I do agree that the best I can come up with, "von den anderen
> gelöscht", would be quite awkward.
This was one of the more difficult things to decide on while
translating. Both are difficult to translate into something that
"flows", and individually I think both work okay the way I decided to
translate them (but see the next paragraph), but of course it would be
preferrable to distinguish the two different concepts better. I'll be
grateful for any suggestions.
The real problem, I think, is that "ours" and "theirs" are misnomers in
the original terminology. A good translation, I think, will not try
to translate them literally... that would get us from misnomers to
misnomers that also don't lend themselves well to the target
language. :) The question, then, is how to rephrase the messages
elegantly without removing them all too far from the original idea.
This would be easier if "ours" and "theirs" always referred to the same
concept... but they mean different things for merge vs. rebase, for
instance.
> [probably out of order, I found it while compiling the glossary]
> > +msgid "detached HEAD"
> > +msgstr "von HEAD abgetrennt"
>
> That's not strictly speaking true; HEAD always points to a commit
> except in an unborn branch, and in any case (this is from commit.c)
> points to a commit after this message is output. You could try
> "abgetrennter HEAD", "entkoppelter HEAD" or so...
Good catch. I think I might go with something a bit more verbose.
Perhaps something along the lines of "nicht Teil eines definierten
Branches", though obviously that exact phrase is a bit clunky...
-Jan
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] po/de.po: add German translation
2010-09-06 16:09 ` Jan Krüger
@ 2010-09-06 17:06 ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 15+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-06 17:06 UTC (permalink / raw)
To: Jan Krüger; +Cc: Thomas Rast, git, Junio C Hamano, Sam Reed, Jeff King
On Mon, Sep 6, 2010 at 16:09, Jan Krüger <jk@jk.gs> wrote:
> Hi Thomas,
>
> thanks for your comments so far. I pretty much agree with all of your
> thoughts, so below I'm going to focus on those where I have something
> to say in addition to that.
>
>> > +#, c-format
>> > +msgid "nothing added to commit but untracked files present%s\n"
>> > +msgstr "keine Änderungen für den Commit vorgemerkt, aber
>> > unberücksichtigte Dateien vorhanden\n"
>>
>> Loses the %s (which is used for advice).
>
> That's me being careless. I will add an additional check to my workflow
> to prevent format string bugs from happening again.
As noted on IRC this would also be flagged by a compile error if we
were using `msgfmt --check` in the Makefile:
- $(QUIET_MSGFMT)$(MSGFMT) -o $@ $<
+ $(QUIET_MSGFMT)$(MSGFMT) --check -o $@ $<
I'll add that along with some other planned fixes after Junio pulls
the outstanding stuff we have queued up.
It'll break compatibility with Solaris gettext. There are ways to work
around that, but I think we should just drop support for it
anyway. GNU gettext is needed anyway if we want libintl-perl and some
of the fancier gettext features.
Solaris support was always something I was using for an extra sanity
check, not something I planned to support, and the extra effort of
doing so isn't worth the effort I think.
>> [way earlier, and same goes for "by us" -> "hier" [lit. "here"]]
>> > +msgid "deleted by them:"
>> > +msgstr "dort gelöscht:"
>> [lit. "deleted there"]
>> > +
>> [...]
>> > +#, c-format
>> > +msgid "behind %d] "
>> > +msgstr "nur dort %d] "
>> [lit. "only there"]
>>
>> This had me pause for a moment. The concepts of "[merge side] theirs"
>> and "behind" are quite different; is it a good idea to translate these
>> to the same?
>>
>> Especially so since later on you translate
>>
>> > +#, c-format
>> > +msgid "path '%s' does not have our version"
>> > +msgstr "Pfad '%s' hat keine Version 'von uns' im Index"
>> [lit. "... 'of us' ..."]
>>
>> I do agree that the best I can come up with, "von den anderen
>> gelöscht", would be quite awkward.
>
> This was one of the more difficult things to decide on while
> translating. Both are difficult to translate into something that
> "flows", and individually I think both work okay the way I decided to
> translate them (but see the next paragraph), but of course it would be
> preferrable to distinguish the two different concepts better. I'll be
> grateful for any suggestions.
>
> The real problem, I think, is that "ours" and "theirs" are misnomers in
> the original terminology. A good translation, I think, will not try
> to translate them literally... that would get us from misnomers to
> misnomers that also don't lend themselves well to the target
> language. :) The question, then, is how to rephrase the messages
> elegantly without removing them all too far from the original idea.
>
> This would be easier if "ours" and "theirs" always referred to the same
> concept... but they mean different things for merge vs. rebase, for
> instance.
Let's keep in mind that one of the major benefits of the gettext
series is that it's bringing focus to issues like this. Ideally we'd
like to fix those issues in the English originals, not just route
around the damage.
(I don't know if theirs/ours is such a case, but generally speaking..)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] po/de.po: add German translation
2010-09-06 15:41 ` Thomas Rast
2010-09-06 16:09 ` Jan Krüger
@ 2010-09-06 16:24 ` Jens Lehmann
2010-09-06 19:58 ` Tilo Schwarz
2010-09-06 17:15 ` Ævar Arnfjörð Bjarmason
2 siblings, 1 reply; 15+ messages in thread
From: Jens Lehmann @ 2010-09-06 16:24 UTC (permalink / raw)
To: Thomas Rast
Cc: avarab, git, Junio C Hamano, Jan Krüger, Sam Reed, Jeff King
Am 06.09.2010 17:41, schrieb Thomas Rast:
> I already like the translation way better than the one that
> gitk/git-gui have, because it doesn't try so hard to translate *every*
> term.
Full Ack, I can't find my way through git-gui or gitk when I forget
to start them with "LC_ALL=C" (And when you use git mainly via these
guis, you will have to learn /every/ git command again when you
start using the command line). IMHO terms that have a special in git
should not be translated, so I would even vote for leaving terms like
"fetch", "fast-forward" and maybe even "tracking-branch" as they are.
But however, translations should be consistent between gitk/git-gui
and the command line, no? E.g. tracking branch is "Übernahmezweig"
(whatever that means) there and "verfolgter Branch" here ... :-/
> [probably out of order, I found it while compiling the glossary]
>> +msgid "detached HEAD"
>> +msgstr "von HEAD abgetrennt"
>
> That's not strictly speaking true; HEAD always points to a commit
> except in an unborn branch, and in any case (this is from commit.c)
> points to a commit after this message is output. You could try
> "abgetrennter HEAD", "entkoppelter HEAD" or so...
Yup, maybe "abgelöster HEAD" or "loser HEAD" (even if the latter may
sound funny when parsed in English ;-)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] po/de.po: add German translation
2010-09-06 16:24 ` Jens Lehmann
@ 2010-09-06 19:58 ` Tilo Schwarz
0 siblings, 0 replies; 15+ messages in thread
From: Tilo Schwarz @ 2010-09-06 19:58 UTC (permalink / raw)
To: git
On Mon, 06 Sep 2010 18:24:58 +0200, Jens Lehmann <Jens.Lehmann@web.de>
wrote:
> Am 06.09.2010 17:41, schrieb Thomas Rast:
>> I already like the translation way better than the one that
>> gitk/git-gui have, because it doesn't try so hard to translate *every*
>> term.
>
> Full Ack, I can't find my way through git-gui or gitk when I forget
> to start them with "LC_ALL=C" (And when you use git mainly via these
> guis, you will have to learn /every/ git command again when you
> start using the command line). IMHO terms that have a special in git
> should not be translated, so I would even vote for leaving terms like
> "fetch", "fast-forward" and maybe even "tracking-branch" as they are.
Full Ack again! Many german IT people use many english special terms daily
(like compiler, linker, terminal, interrupt). Normally the translation of
the special terms generates confusion all over the place. That's why I
also start git-gui or gitk only in english (and the manpages too, by the
way).
Thus the git special terms should not be translated, even though I might
be helpful to have a glossary which explains, what a "fast-forward" is.
--
Regards,
Tilo
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/2] po/de.po: add German translation
2010-09-06 15:41 ` Thomas Rast
2010-09-06 16:09 ` Jan Krüger
2010-09-06 16:24 ` Jens Lehmann
@ 2010-09-06 17:15 ` Ævar Arnfjörð Bjarmason
2 siblings, 0 replies; 15+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-09-06 17:15 UTC (permalink / raw)
To: Thomas Rast; +Cc: git, Junio C Hamano, Jan Krüger, Sam Reed, Jeff King
On Mon, Sep 6, 2010 at 15:41, Thomas Rast <trast@student.ethz.ch> wrote:
> Hi Jan
>
> First off thanks for taking on the mammoth job of translating this. I
> skimmed the entire file, and apart from the comments below everything
> looks sane, though I may of course have missed something.
>
> I already like the translation way better than the one that
> gitk/git-gui have, because it doesn't try so hard to translate *every*
> term. Maybe it would help to make a little translation glossary,
> here's a start:
>
> bare repository Lager-Repository
> blob object Blob-Objekt
> branch Branch (m.)
> checkout auschecken
> commit Commit/committen
> commit object Commit-Objekt
> dangling ... ... zeigt ins Leere
> detached HEAD von HEAD abgetrennt [but see below]
> directory Verzeichnis
> fast-forward Update ohne Merge
> fetch holen
> file system Dateisystem
> index Index
> merge Merge
> object Objekt
> origin Ursprung
> parent [unused, but would be interesting]
> pull [dito]
> push push [though only used as the command name so far]
> reference Referenz
> reflog Reflog
> refspec Refspec
> repository Repository
> resolve auflösen
> revision Revision
> tag Tag
> tracking branch ... verfolgt ...
> tree Tree
> unmerged verbleibende Konflikte
> upstream branch Ursprung [note collision with "origin"]
> working tree Arbeitsverzeichnis
git-gui/po/glossary/git-gui-glossary.txt also has something like
that. It would be useful to merge this and that into some
documentation in a top-level po/ glossary.
>> +#, c-format
>> +msgid ""
>> +" Lines starting\n"
>> +"# with '#' will be kept; you may remove them yourself if you want to.\n"
>> +"# An empty message aborts the commit.\n"
>> +msgstr ""
>> +" Zeilen, die mit '#'\n"
>> +"# anfangen, werden beibehalten; du kannst sie selbst entfernen, wenn du\n"
>> +"willst. Ein leerer Kommentar bricht den Commit ab.\n"
>
> The last line lacks a #.
Something msgfmt --check wouldn't flag, but running the test suite
under German would (I plan to add support for that down the line).
>> +msgid "Fast-forward"
>> +msgstr "Update ohne Merge"
>
> Clever!
I think Fast-forward should be changed to "Update without merge" in
the English version, although that might not be viable at this point.
It would probably improve Git for newbies a lot if we clearly told
them during every "git pull" that whether we did a merge or not by
using wording to that effect consistently.
A lot of people coming from svn/perforce/cvs don't understand why they
keep getting merge commits on "git pull", wording might help there.
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 2/2] po/en_GB.po: add British English Translation
2010-09-03 18:22 [GIT PULL] New ab/i18n series and builtin fixes Ævar Arnfjörð Bjarmason
` (5 preceding siblings ...)
2010-09-04 0:49 ` [PATCH 1/2] po/de.po: add German translation avarab
@ 2010-09-04 0:49 ` avarab
6 siblings, 0 replies; 15+ messages in thread
From: avarab @ 2010-09-04 0:49 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Jan Krüger, Sam Reed, Jeff King,
Ævar Arnfjörð Bjarmason
From: Sam Reed <sam@reedyboy.net>
Translate the three Git messages from US to British English. These all
had to do with z v.s. s differences.
Signed-off-by: Sam Reed <sam@reedyboy.net>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
po/en_GB.po | 1771 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 1771 insertions(+), 0 deletions(-)
create mode 100644 po/en_GB.po
diff --git a/po/en_GB.po b/po/en_GB.po
new file mode 100644
index 0000000..b12cd76
--- /dev/null
+++ b/po/en_GB.po
@@ -0,0 +1,1771 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2010-09-03 17:21+0000\n"
+"Language: en-gb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "# Unmerged paths:"
+msgstr ""
+
+#, c-format
+msgid "# (use \"git reset %s <file>...\" to unstage)"
+msgstr ""
+
+msgid "# (use \"git rm --cached <file>...\" to unstage)"
+msgstr ""
+
+msgid "# (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+
+msgid "# Changes to be committed:"
+msgstr ""
+
+msgid "# Changed but not updated:"
+msgstr ""
+
+msgid "# (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+
+msgid "# (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+
+msgid ""
+"# (use \"git checkout -- <file>...\" to discard changes in working "
+"directory)"
+msgstr ""
+
+msgid "# (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+
+#, c-format
+msgid "# %s files:"
+msgstr ""
+
+#, c-format
+msgid "# (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+
+msgid "bug"
+msgstr ""
+
+msgid "both deleted:"
+msgstr ""
+
+msgid "added by us:"
+msgstr ""
+
+msgid "deleted by them:"
+msgstr ""
+
+msgid "added by them:"
+msgstr ""
+
+msgid "deleted by us:"
+msgstr ""
+
+msgid "both added:"
+msgstr ""
+
+msgid "both modified:"
+msgstr ""
+
+msgid "new commits, "
+msgstr ""
+
+msgid "modified content, "
+msgstr ""
+
+msgid "untracked content, "
+msgstr ""
+
+#, c-format
+msgid "new file: %s"
+msgstr ""
+
+#, c-format
+msgid "copied: %s -> %s"
+msgstr ""
+
+#, c-format
+msgid "deleted: %s"
+msgstr ""
+
+#, c-format
+msgid "modified: %s"
+msgstr ""
+
+#, c-format
+msgid "renamed: %s -> %s"
+msgstr ""
+
+#, c-format
+msgid "typechange: %s"
+msgstr ""
+
+#, c-format
+msgid "unknown: %s"
+msgstr ""
+
+#, c-format
+msgid "unmerged: %s"
+msgstr ""
+
+#, c-format
+msgid "bug: unhandled diff status %c"
+msgstr ""
+
+msgid "On branch "
+msgstr ""
+
+msgid "Not currently on any branch."
+msgstr ""
+
+msgid "# Initial commit"
+msgstr ""
+
+msgid "Untracked"
+msgstr ""
+
+msgid "add"
+msgstr ""
+
+msgid "Ignored"
+msgstr ""
+
+msgid "add -f"
+msgstr ""
+
+#, c-format
+msgid "# Untracked files not listed%s\n"
+msgstr ""
+
+msgid " (use -u option to show untracked files)"
+msgstr ""
+
+#, c-format
+msgid "# No changes\n"
+msgstr ""
+
+#, c-format
+msgid "no changes added to commit%s\n"
+msgstr ""
+
+msgid " (use \"git add\" and/or \"git commit -a\")"
+msgstr ""
+
+#, c-format
+msgid "nothing added to commit but untracked files present%s\n"
+msgstr ""
+
+msgid " (use \"git add\" to track)"
+msgstr ""
+
+msgid " (create/copy files and use \"git add\" to track)"
+msgstr ""
+
+#, c-format
+msgid "nothing to commit%s\n"
+msgstr ""
+
+msgid " (use -u to show untracked files)"
+msgstr ""
+
+msgid " (working directory clean)"
+msgstr ""
+
+msgid "HEAD (no branch)"
+msgstr ""
+
+msgid "Initial commit on "
+msgstr ""
+
+msgid "behind "
+msgstr ""
+
+msgid "ahead "
+msgstr ""
+
+msgid ", behind "
+msgstr ""
+
+#, c-format
+msgid "unexpected diff status %c"
+msgstr ""
+
+msgid "updating files failed"
+msgstr ""
+
+#, c-format
+msgid "remove '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Path '%s' is in submodule '%.*s'"
+msgstr ""
+
+msgid "Unstaged changes after refreshing the index:"
+msgstr ""
+
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr ""
+
+#, c-format
+msgid "'%s' is beyond a symbolic link"
+msgstr ""
+
+msgid "Could not read the index"
+msgstr ""
+
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr ""
+
+msgid "Could not write patch"
+msgstr ""
+
+#, c-format
+msgid "Could not stat '%s'"
+msgstr ""
+
+msgid "Empty patch. Aborted."
+msgstr ""
+
+#, c-format
+msgid "Could not apply '%s'"
+msgstr ""
+
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr ""
+
+msgid "no files added"
+msgstr ""
+
+msgid "adding files failed"
+msgstr ""
+
+msgid "-A and -u are mutually incompatible"
+msgstr ""
+
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr ""
+
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr ""
+
+msgid "index file corrupt"
+msgstr ""
+
+msgid "Unable to write new index file"
+msgstr ""
+
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but it is not yet merged to HEAD."
+msgstr ""
+
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+
+#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
+msgid "remote "
+msgstr ""
+
+msgid "cannot use -a with -d"
+msgstr ""
+
+msgid "Couldn't look up commit object for HEAD"
+msgstr ""
+
+#, c-format
+msgid "Cannot delete the branch '%s' which you are currently on."
+msgstr ""
+
+#, c-format
+msgid "%sbranch '%s' not found."
+msgstr ""
+
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+
+#, c-format
+msgid "Error deleting %sbranch '%s'"
+msgstr ""
+
+#, c-format
+msgid "Deleted %sbranch %s (was %s).\n"
+msgstr ""
+
+msgid "Update of config-file failed"
+msgstr ""
+
+#, c-format
+msgid "branch '%s' does not point at a commit"
+msgstr ""
+
+#, c-format
+msgid "behind %d] "
+msgstr ""
+
+#, c-format
+msgid "ahead %d] "
+msgstr ""
+
+#, c-format
+msgid "ahead %d, behind %d] "
+msgstr ""
+
+msgid "(no branch)"
+msgstr ""
+
+msgid "some refs could not be read"
+msgstr ""
+
+msgid "cannot rename the current branch while not on any."
+msgstr ""
+
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr ""
+
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr ""
+
+msgid "Branch rename failed"
+msgstr ""
+
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr ""
+
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr ""
+
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+
+#, c-format
+msgid "malformed object name %s"
+msgstr ""
+
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr ""
+
+msgid "HEAD not found below refs/heads!"
+msgstr ""
+
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr ""
+
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr ""
+
+#, c-format
+msgid "path '%s' does not have all three versions"
+msgstr ""
+
+#, c-format
+msgid "path '%s' does not have all 3 versions"
+msgstr ""
+
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr ""
+
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr ""
+
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr ""
+
+msgid "corrupt index file"
+msgstr ""
+
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr ""
+
+msgid "unable to write new index file"
+msgstr ""
+
+msgid "diff_setup_done failed"
+msgstr ""
+
+msgid "you need to resolve your current index first"
+msgstr ""
+
+#, c-format
+msgid "Can not do reflog for '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Already on '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr ""
+
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr ""
+
+msgid "HEAD is now at"
+msgstr ""
+
+msgid "You are on a branch yet to be born"
+msgstr ""
+
+msgid "Previous HEAD position was"
+msgstr ""
+
+msgid "-B cannot be used with -b"
+msgstr ""
+
+msgid "--patch is incompatible with all other options"
+msgstr ""
+
+msgid "--track needs a branch name"
+msgstr ""
+
+msgid "Missing branch name; try -b"
+msgstr ""
+
+msgid "--orphan and -b|-B are mutually exclusive"
+msgstr ""
+
+msgid "--orphan cannot be used with -t"
+msgstr ""
+
+msgid "git checkout: -f and -m are incompatible"
+msgstr ""
+
+#. case (1)
+#, c-format
+msgid "invalid reference: %s"
+msgstr ""
+
+#. case (1): want a tree
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr ""
+
+msgid "invalid path specification"
+msgstr ""
+
+#, c-format
+msgid ""
+"git checkout: updating paths is incompatible with switching branches.\n"
+"Did you intend to checkout '%s' which can not be resolved as commit?"
+msgstr ""
+
+msgid "git checkout: updating paths is incompatible with switching branches."
+msgstr ""
+
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+
+#, c-format
+msgid "git checkout: we do not like '%s' as a branch name."
+msgstr ""
+
+#, c-format
+msgid "git checkout: branch %s already exists"
+msgstr ""
+
+msgid "Cannot switch branch to a non-commit."
+msgstr ""
+
+msgid "--ours/--theirs is incompatible with switching branches."
+msgstr ""
+
+#, c-format
+msgid "reference repository '%s' is not a local directory."
+msgstr ""
+
+#, c-format
+msgid "failed to open '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to stat '%s'"
+msgstr ""
+
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr ""
+
+#, c-format
+msgid "failed to stat %s\n"
+msgstr ""
+
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to create link '%s'"
+msgstr ""
+
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr ""
+
+#, c-format
+msgid "done.\n"
+msgstr ""
+
+msgid "Too many arguments."
+msgstr ""
+
+msgid "You must specify a repository to clone."
+msgstr ""
+
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr ""
+
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr ""
+
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not create work tree dir '%s'."
+msgstr ""
+
+#, c-format
+msgid "Cloning into bare repository %s"
+msgstr ""
+
+#, c-format
+msgid "Cloning into %s"
+msgstr ""
+
+#, c-format
+msgid "Don't know how to clone %s"
+msgstr ""
+
+#, c-format
+msgid "Remote branch %s not found in upstream %s, using HEAD instead"
+msgstr ""
+
+msgid "You appear to have cloned an empty repository."
+msgstr ""
+
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+" git config --global user.name \"Your Name\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"If the identity used for this commit is wrong, you can fix it with:\n"
+"\n"
+" git commit --amend --author='Your Name <you@example.com>'\n"
+msgstr ""
+
+msgid ""
+"You asked to amend the most recent commit, but doing so would make\n"
+"it empty. You can repeat your command with --allow-empty, or you can\n"
+"remove the commit entirely with \"git reset HEAD^\".\n"
+msgstr ""
+
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+msgid "interactive add failed"
+msgstr ""
+
+msgid "unable to write new_index file"
+msgstr ""
+
+msgid "cannot do a partial commit during a merge."
+msgstr ""
+
+msgid "cannot read the index"
+msgstr ""
+
+msgid "unable to write temporary index file"
+msgstr ""
+
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#, c-format
+msgid "invalid commit: %s"
+msgstr ""
+
+msgid "malformed --author parameter"
+msgstr ""
+
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+msgid "could not read log from standard input"
+msgstr ""
+
+#, c-format
+msgid "could not read log file '%s'"
+msgstr ""
+
+msgid "commit has empty message"
+msgstr ""
+
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not open '%s'"
+msgstr ""
+
+msgid "could not write commit template"
+msgstr ""
+
+#, c-format
+msgid ""
+"#\n"
+"# It looks like you may be committing a MERGE.\n"
+"# If this is not correct, please remove the file\n"
+"#\t%s\n"
+"# and try again.\n"
+"#\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"# Please enter the commit message for your changes."
+msgstr ""
+
+#, c-format
+msgid ""
+" Lines starting\n"
+"# with '#' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+" Lines starting\n"
+"# with '#' will be kept; you may remove them yourself if you want to.\n"
+"# An empty message aborts the commit.\n"
+msgstr ""
+
+#, c-format
+msgid "%s# Author: %s\n"
+msgstr ""
+
+#, c-format
+msgid "%s# Committer: %s\n"
+msgstr ""
+
+msgid "Cannot read index"
+msgstr ""
+
+msgid "Error building trees"
+msgstr ""
+
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr ""
+
+#, c-format
+msgid "No existing author found with '%s'"
+msgstr ""
+
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+msgid "Using both --reset-author and --author does not make sense"
+msgstr ""
+
+msgid "You have nothing to amend."
+msgstr ""
+
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr ""
+
+msgid "Only one of -c/-C/-F can be used."
+msgstr ""
+
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr ""
+
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+
+#, c-format
+msgid "could not lookup commit %s"
+msgstr ""
+
+#, c-format
+msgid "could not parse commit %s"
+msgstr ""
+
+msgid "Only one of --include/--only/--all/--interactive can be used."
+msgstr ""
+
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+msgid "Clever... amending the last one with dirty index."
+msgstr ""
+
+msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
+msgstr ""
+
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+msgid "Paths with -a does not make sense."
+msgstr ""
+
+msgid "Paths with --interactive does not make sense."
+msgstr ""
+
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+msgid "could not parse newly created commit"
+msgstr ""
+
+msgid "detached HEAD"
+msgstr ""
+
+msgid " (root-commit)"
+msgstr ""
+
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr ""
+
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr ""
+
+msgid "could not read MERGE_MODE"
+msgstr ""
+
+#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr ""
+
+msgid "failed to write commit object"
+msgstr ""
+
+msgid "cannot lock HEAD ref"
+msgstr ""
+
+msgid "cannot update HEAD ref"
+msgstr ""
+
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full or quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr ""
+
+#, c-format
+msgid "invalid option: %s"
+msgstr ""
+
+msgid "Not a git repository"
+msgstr ""
+
+msgid "No HEAD commit to compare with (yet)"
+msgstr ""
+
+#, c-format
+msgid "invalid object '%s' given."
+msgstr ""
+
+#, c-format
+msgid "more than %d trees given: '%s'"
+msgstr ""
+
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr ""
+
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr ""
+
+msgid "Couldn't find remote ref HEAD"
+msgstr ""
+
+#, c-format
+msgid "object %s not found"
+msgstr ""
+
+msgid "[up to date]"
+msgstr ""
+
+#.
+#. * If this is the head, and it's not okay to update
+#. * the head, and the old value of the head isn't empty...
+#.
+#, c-format
+msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
+msgstr ""
+
+msgid "[rejected]"
+msgstr ""
+
+msgid "[tag update]"
+msgstr ""
+
+msgid " (unable to update local ref)"
+msgstr ""
+
+#, c-format
+msgid "cannot open %s: %s\n"
+msgstr ""
+
+msgid "branch"
+msgstr ""
+
+msgid "tag"
+msgstr ""
+
+msgid "remote branch"
+msgstr ""
+
+#, c-format
+msgid "From %.*s\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+
+msgid "could not run rev-list"
+msgstr ""
+
+#, c-format
+msgid "failed write to rev-list: %s"
+msgstr ""
+
+#, c-format
+msgid "failed to close rev-list's stdin: %s"
+msgstr ""
+
+#, c-format
+msgid " (%s will become dangling)\n"
+msgstr ""
+
+#, c-format
+msgid " (%s has become dangling)\n"
+msgstr ""
+
+msgid "[deleted]"
+msgstr ""
+
+msgid "(none)"
+msgstr ""
+
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr ""
+
+#, c-format
+msgid "Don't know how to fetch from %s"
+msgstr ""
+
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr ""
+
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr ""
+
+#, c-format
+msgid "Fetching %s\n"
+msgstr ""
+
+#, c-format
+msgid "Could not fetch %s"
+msgstr ""
+
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+
+msgid "You need to specify a tag name."
+msgstr ""
+
+msgid "fetch --all does not take a repository argument"
+msgstr ""
+
+msgid "fetch --all does not make sense with refspecs"
+msgstr ""
+
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr ""
+
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr ""
+
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr ""
+
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr ""
+
+#, c-format
+msgid "'%s': %s"
+msgstr ""
+
+#, c-format
+msgid "'%s': short read %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to chdir: %s"
+msgstr ""
+
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr ""
+
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr ""
+
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr ""
+
+#, c-format
+msgid "cannot open '%s'"
+msgstr ""
+
+msgid "no pattern given."
+msgstr ""
+
+msgid "cannot mix --fixed-strings and regexp"
+msgstr ""
+
+#, c-format
+msgid "bad object %s"
+msgstr ""
+
+msgid "--open-files-in-pager only works on the worktree"
+msgstr ""
+
+msgid "--cached cannot be used with --no-index."
+msgstr ""
+
+msgid "--no-index cannot be used with revs."
+msgstr ""
+
+msgid "both --cached and trees are given."
+msgstr ""
+
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr ""
+
+#, c-format
+msgid "insanely long template name %s"
+msgstr ""
+
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr ""
+
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr ""
+
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr ""
+
+#, c-format
+msgid "insanely long symlink %s"
+msgstr ""
+
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr ""
+
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr ""
+
+#, c-format
+msgid "ignoring template %s"
+msgstr ""
+
+#, c-format
+msgid "insanely long template path %s"
+msgstr ""
+
+#, c-format
+msgid "templates not found %s"
+msgstr ""
+
+#, c-format
+msgid "not copying templates of a wrong format version %d from '%s'"
+msgstr ""
+
+#, c-format
+msgid "insane git directory %s"
+msgstr ""
+
+#. TRANSLATORS: The first '%s' is either "Reinitialized
+#. existing" or "Initialized empty", the second " shared" or
+#. "", and the last '%s%s' is the verbatim directory name.
+#, c-format
+msgid "%s%s Git repository in %s%s\n"
+msgstr ""
+
+msgid "Reinitialized existing"
+msgstr "Reinitialised existing"
+
+msgid "Initialized empty"
+msgstr "Initialised empty"
+
+msgid " shared"
+msgstr ""
+
+msgid "cannot tell cwd"
+msgstr ""
+
+#, c-format
+msgid "cannot mkdir %s"
+msgstr ""
+
+#, c-format
+msgid "cannot chdir to %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+
+msgid "Cannot access current working directory"
+msgstr ""
+
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr ""
+
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "unrecognised argument: %s"
+
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+msgid "revision walk setup failed"
+msgstr ""
+
+#, c-format
+msgid "Could not read object %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown type: %d"
+msgstr ""
+
+msgid "format.headers without value"
+msgstr ""
+
+msgid "name of output directory is too long"
+msgstr ""
+
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr ""
+
+msgid "Need exactly one range."
+msgstr ""
+
+msgid "Not a range."
+msgstr ""
+
+msgid "Could not extract email from committer identity."
+msgstr ""
+
+msgid ""
+"*** SUBJECT HERE ***\n"
+"\n"
+"*** BLURB HERE ***\n"
+msgstr ""
+
+msgid "Cover letter needs email format"
+msgstr ""
+
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+msgid "Two output directories?"
+msgstr ""
+
+#, c-format
+msgid "bogus committer info %s"
+msgstr ""
+
+msgid "-n and -k are mutually exclusive."
+msgstr ""
+
+msgid "--subject-prefix and -k are mutually exclusive."
+msgstr ""
+
+msgid "--name-only does not make sense"
+msgstr ""
+
+msgid "--name-status does not make sense"
+msgstr ""
+
+msgid "--check does not make sense"
+msgstr ""
+
+msgid "standard output, or directory, which one?"
+msgstr ""
+
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr ""
+
+msgid "Failed to create output files"
+msgstr ""
+
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#, c-format
+msgid "Unknown commit %s"
+msgstr ""
+
+msgid "switch `m' requires a value"
+msgstr ""
+
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+msgid "could not run stash."
+msgstr ""
+
+msgid "stash failed"
+msgstr ""
+
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+msgid "read-tree failed"
+msgstr ""
+
+msgid " (nothing to squash)"
+msgstr ""
+
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#, c-format
+msgid "Could not write to '%s'"
+msgstr ""
+
+msgid "Writing SQUASH_MSG"
+msgstr ""
+
+msgid "Finishing SQUASH_MSG"
+msgstr ""
+
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+msgid "failed to read the cache"
+msgstr ""
+
+msgid "Unable to write index."
+msgstr ""
+
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+msgid "In-index merge"
+msgstr ""
+
+#, c-format
+msgid "Merge made by %s."
+msgstr ""
+
+#, c-format
+msgid "Could not open '%s' for writing"
+msgstr ""
+
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#, c-format
+msgid "'%s' is not a commit"
+msgstr ""
+
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you can merge."
+msgstr ""
+
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr ""
+
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+msgid "You cannot combine --no-ff with --ff-only."
+msgstr ""
+
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#.
+#. * If head can reach all the merge then we are up to date.
+#. * but first the most common case of merging one remote.
+#.
+msgid "Already up-to-date."
+msgstr ""
+
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+msgid "Fast-forward"
+msgstr ""
+
+msgid " (no commit created; -m option ignored)"
+msgstr ""
+
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+msgid "Already up-to-date. Yeeah!"
+msgstr ""
+
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr ""
+
+msgid "bad source"
+msgstr ""
+
+msgid "can not move directory into itself"
+msgstr ""
+
+msgid "cannot move directory over file"
+msgstr ""
+
+#, c-format
+msgid "Huh? %.*s is in index?"
+msgstr ""
+
+msgid "source directory is empty"
+msgstr ""
+
+msgid "not under version control"
+msgstr ""
+
+msgid "destination exists"
+msgstr ""
+
+#, c-format
+msgid "%s; will overwrite!"
+msgstr ""
+
+msgid "Cannot overwrite"
+msgstr ""
+
+msgid "multiple sources for the same target"
+msgstr ""
+
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr ""
+
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+msgid "tag shorthand without <tag>"
+msgstr ""
+
+msgid "--delete only accepts plain target ref names"
+msgstr ""
+
+msgid "You are not currently on a branch."
+msgstr ""
+
+#, c-format
+msgid "The current branch %s is not tracking anything."
+msgstr ""
+
+#, c-format
+msgid "The current branch %s is tracking multiple branches, refusing to push."
+msgstr ""
+
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#, c-format
+msgid "Pushing to %s\n"
+msgstr ""
+
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"To prevent you from losing history, non-fast-forward updates were rejected\n"
+"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
+"'Note about fast-forwards' section of 'git push --help' for details.\n"
+msgstr ""
+
+#, c-format
+msgid "bad repository '%s'"
+msgstr ""
+
+msgid "No destination configured to push to."
+msgstr ""
+
+msgid "--all and --tags are incompatible"
+msgstr ""
+
+msgid "--all can't be combined with refspecs"
+msgstr ""
+
+msgid "--mirror and --tags are incompatible"
+msgstr ""
+
+msgid "--mirror can't be combined with refspecs"
+msgstr ""
+
+msgid "--all and --mirror are incompatible"
+msgstr ""
+
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr ""
+
+msgid "--delete doesn't make sense without any refs"
+msgstr ""
+
+msgid "mixed"
+msgstr ""
+
+msgid "soft"
+msgstr ""
+
+msgid "hard"
+msgstr ""
+
+msgid "merge"
+msgstr ""
+
+msgid "keep"
+msgstr ""
+
+msgid "You do not have a valid HEAD."
+msgstr ""
+
+msgid "Failed to find tree of HEAD."
+msgstr ""
+
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr ""
+
+msgid "Could not write new index file."
+msgstr ""
+
+#, c-format
+msgid "HEAD is now at %s"
+msgstr ""
+
+msgid "Could not read index"
+msgstr ""
+
+msgid "Unstaged changes after reset:"
+msgstr ""
+
+#, c-format
+msgid "Reflog action message too long: %.*s..."
+msgstr ""
+
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr ""
+
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr ""
+
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr ""
+
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr ""
+
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr ""
+
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr ""
+
+#, c-format
+msgid ""
+"'%s' has staged content different from both the file and the HEAD\n"
+"(use -f to force removal)"
+msgstr ""
+
+#, c-format
+msgid ""
+"'%s' has changes staged in the index\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+
+#, c-format
+msgid ""
+"'%s' has local modifications\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr ""
+
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr ""
+
+#, c-format
+msgid "tag name too long: %.*s..."
+msgstr ""
+
+#, c-format
+msgid "tag '%s' not found."
+msgstr ""
+
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr ""
+
+#, c-format
+msgid "could not verify the tag '%s'"
+msgstr ""
+
+msgid "committer info too long."
+msgstr ""
+
+msgid "could not run gpg."
+msgstr ""
+
+msgid "gpg did not accept the tag data"
+msgstr ""
+
+msgid "gpg failed to sign the tag"
+msgstr ""
+
+msgid ""
+"\n"
+"#\n"
+"# Write a tag message\n"
+"#\n"
+msgstr ""
+
+#, c-format
+msgid "signing key value too long (%.10s...)"
+msgstr ""
+
+msgid "unable to sign the tag"
+msgstr ""
+
+msgid "unable to write tag file"
+msgstr ""
+
+msgid "bad object type."
+msgstr ""
+
+msgid "tag header too big."
+msgstr ""
+
+#, c-format
+msgid "could not create file '%s'"
+msgstr ""
+
+msgid "no tag message?"
+msgstr ""
+
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr ""
+
+msgid "-n option is only allowed with -l."
+msgstr ""
+
+msgid "--contains option is only allowed with -l."
+msgstr ""
+
+msgid "only one -F or -m option is allowed."
+msgstr ""
+
+#, c-format
+msgid "cannot read '%s'"
+msgstr ""
+
+#, c-format
+msgid "could not open or read '%s'"
+msgstr ""
+
+msgid "too many params"
+msgstr ""
+
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr ""
+
+#, c-format
+msgid "tag '%s' already exists"
+msgstr ""
+
+#, c-format
+msgid "%s: cannot lock the ref"
+msgstr ""
+
+#, c-format
+msgid "%s: cannot update the ref"
+msgstr ""
+
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+msgid "See 'git help COMMAND' for more information on a specific command."
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+msgid "TEST: A C test string"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, c-format
+msgid "TEST: A C test string %s"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, c-format
+msgid "TEST: Hello World!"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, c-format
+msgid "TEST: Old English Runes"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, c-format
+msgid "TEST: ‘single’ and “double” quotes"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+msgid "TEST: A Shell test string"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, sh-format
+msgid "TEST: A Shell test $variable"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+msgid "TEST: A Perl test string"
+msgstr ""
+
+#. TRANSLATORS: This is a test. You don't need to translate it.
+#, perl-format
+msgid "TEST: A Perl test variable %s"
+msgstr ""
--
1.7.2.2.336.g704fc
^ permalink raw reply related [flat|nested] 15+ messages in thread