From 39f9819931519f6126298149e20a8fa52c45146b Mon Sep 17 00:00:00 2001 From: Phillip Sz Date: Sat, 9 May 2015 13:28:55 +0200 Subject: l10n: de.po: change error message from "sagen" to "Meinten Sie" We should not use "sagen" if someone has written something wrong. Although it's "say" in English, we should not use it in German and instead use our normal error message. Signed-off-by: Phillip Sz Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 2feaec1888..a435da065e 100644 --- a/po/de.po +++ b/po/de.po @@ -2183,7 +2183,7 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" #: builtin/add.c:358 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Wollten Sie vielleicht 'git add .' sagen?\n" +msgstr "Meinten Sie vielleicht 'git add .'?\n" #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920 #: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299 -- cgit v1.3 From 872b1f26b8b0b682a3101d1e3cf9e1c5e640a6f5 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 19 May 2015 10:51:32 +0200 Subject: l10n: de.po: grammar fix Signed-off-by: Michael J Gruber Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index a435da065e..c8b70ad9bf 100644 --- a/po/de.po +++ b/po/de.po @@ -10478,7 +10478,7 @@ msgstr "" #: git-am.sh:142 msgid "Using index info to reconstruct a base tree..." msgstr "" -"Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis " +"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen" #: git-am.sh:157 -- cgit v1.3 From 47a1657ab902a4cd98f34d01277246c533216beb Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 19 May 2015 10:51:33 +0200 Subject: l10n: de.po: punctuation fixes This respects the ellipsis style used in de.po. Signed-off-by: Michael J Gruber Signed-off-by: Ralf Thielow --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index c8b70ad9bf..a1274cf0ce 100644 --- a/po/de.po +++ b/po/de.po @@ -10479,7 +10479,7 @@ msgstr "" msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " -"nachzustellen" +"nachzustellen ..." #: git-am.sh:157 msgid "" @@ -10495,7 +10495,7 @@ msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..." #: git-am.sh:182 msgid "Failed to merge in the changes." -msgstr "Merge der Änderungen fehlgeschlagen" +msgstr "Merge der Änderungen fehlgeschlagen." #: git-am.sh:277 msgid "Only one StGIT patch series can be applied at once" -- cgit v1.3 From a9845c5f504498644abcb5f6fd6adc2ffd076f2b Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 19 May 2015 10:51:34 +0200 Subject: l10n: de.po: translation fix for fall-back to 3way merge The English version is correct, but misleading: It is not the 3way merge that is being patched also, but that is being fallen back to also. The German version translates the former meaning. Make it translate the latter. Signed-off-by: Michael J Gruber Signed-off-by: Ralf Thielow --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index a1274cf0ce..7d603c2602 100644 --- a/po/de.po +++ b/po/de.po @@ -10491,7 +10491,7 @@ msgstr "" #: git-am.sh:166 msgid "Falling back to patching base and 3-way merge..." -msgstr "Falle zurück zum Patchen der Basis und des 3-Wege-Merges ..." +msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." #: git-am.sh:182 msgid "Failed to merge in the changes." -- cgit v1.3 From f09bd215cde5e30029fe08f309d0554eb9256778 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 16 Jun 2015 14:38:01 -0700 Subject: Git 2.4.4 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.4.4.txt | 35 +++++++++++++++++++++++++++++++++++ Documentation/git.txt | 3 ++- GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 4 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 Documentation/RelNotes/2.4.4.txt diff --git a/Documentation/RelNotes/2.4.4.txt b/Documentation/RelNotes/2.4.4.txt new file mode 100644 index 0000000000..f1ccd001be --- /dev/null +++ b/Documentation/RelNotes/2.4.4.txt @@ -0,0 +1,35 @@ +Git v2.4.4 Release Notes +======================== + +Fixes since v2.4.3 +------------------ + + * l10n updates for German. + + * An earlier leakfix to bitmap testing code was incomplete. + + * "git clean pathspec..." tried to lstat(2) and complain even for + paths outside the given pathspec. + + * Communication between the HTTP server and http_backend process can + lead to a dead-lock when relaying a large ref negotiation request. + Diagnose the situation better, and mitigate it by reading such a + request first into core (to a reasonable limit). + + * The clean/smudge interface did not work well when filtering an + empty contents (failed and then passed the empty input through). + It can be argued that a filter that produces anything but empty for + an empty input is nonsense, but if the user wants to do strange + things, then why not? + + * Make "git stash something --help" error out, so that users can + safely say "git stash drop --help". + + * Clarify that "log --raw" and "log --format=raw" are unrelated + concepts. + + * Catch a programmer mistake to feed a pointer not an array to + ARRAY_SIZE() macro, by using a couple of GCC extensions. + +Also contains typofixes, documentation updates and trivial code +clean-ups. diff --git a/Documentation/git.txt b/Documentation/git.txt index 12d9df1aad..338ebb7265 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.4.3/git.html[documentation for release 2.4.3] +* link:v2.4.4/git.html[documentation for release 2.4.4] * release notes for + link:RelNotes/2.4.4.txt[2.4.4], link:RelNotes/2.4.3.txt[2.4.3], link:RelNotes/2.4.2.txt[2.4.2], link:RelNotes/2.4.1.txt[2.4.1], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index f94921c028..9765504553 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.4.3 +DEF_VER=v2.4.4 LF=' ' diff --git a/RelNotes b/RelNotes index 9810a70748..9294b6f080 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.4.3.txt \ No newline at end of file +Documentation/RelNotes/2.4.4.txt \ No newline at end of file -- cgit v1.3