Translate one message came from git.pot update in 6eebb35e
(l10n: git.pot: v2.4.0 round 2 (1 update)).
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>

Signed-off-by: NDimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>

Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

Translate 1 update message (2305t0f0u) for git v2.4.0 l10n round 2.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Generate po/git.pot from v2.4.0-rc1 for git v2.4.0 l10n round 2.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'master' of git://github.com/git-l10n/git-po:
  l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung'
  l10n: de.po: translate 99 new messages
  l10n: de.po: fix messages with abbreviated hashs
  l10n: de.po: add space before ellipsis
  l10n: vi.po: Updated Vietnamese translation
  l10n: zh_CN: translations for git v2.4.0-rc0
  l10n: fr.po v2.4.0-rc0 round 1
  l10n: ca.po: update translation
  l10n: ru: updated Russian translation
  l10n: sv.po: Update Swedish translation (2305t0f0u)
  l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)
  l10n: ru: added Russian translation
  l10n: de.po: fix negation for commit -a with paths

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* sb/atomic-push:
  send-pack: unify error messages for unsupported capabilities

If --signed is not supported, the error message names the remote
"receiving end". If --atomic is not supported, the error message
names the remote "server". Unify the naming to "receiving end"
as we're in the context of "push".
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The use of 'symbolische Verknüpfung' for 'symbolic link' is more common
than 'symbolischer Verweis'.
Signed-off-by: NMatthias Rüster <matthias.ruester@gmail.com>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Translate 99 messages came from git.pot update in c2ea1208
(l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)).
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

The three dots in messages where the hash is abbreviated
were misinterpreted and are fixed with this commit.
Noticed-by: NJunio C Hamano <gitster@pobox.com>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Signed-off-by: NPhillip Sz <phillip.szelat@gmail.com>
Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

* maint:
  Git 2.3.5
  docs: clarify what git-rebase's "-p" / "--preserve-merges" does

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* ss/pull-rebase-preserve:
  docs: clarify what git-rebase's "-p" / "--preserve-merges" does
  docs: clarify "preserve" option wording for git-pull

Code clean-up.

* jc/report-path-error-to-dir:
  report_path_error(): move to dir.c

* ph/push-doc-cas:
  git-push.txt: clean up force-with-lease wording

Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

Translate 99 updated messages (2305t0f0u) for git v2.4.0-rc0.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'fr-v2.4.0-rc0' of git://github.com/jnavila/git:
  l10n: fr.po v2.4.0-rc0 round 1

Ignoring a merge can be read as ignoring the changes a merge commit
introduces altogether, as if the entire side branch the merge commit
merged was removed from the history.  But that is not what happens
if "-p" is not specified.  What happens is that the individual
commits a merge commit introduces are replayed in order, and only
any possible merge conflict resolutions or manual amendments to the
merge commit are ignored.

Get this straight in the docs.

Also, do not say that merge commits are *tried* to be recreated. As that is
true almost everywhere it is better left unsaid.
Signed-off-by: NSebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>

Signed-off-by: NAlex Henrie <alexhenrie24@gmail.com>

* maint:
  Prepare for 2.3.5
  2.3.2 release notes: typofix

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* ph/push-doc-cas:
  git-push.txt: clean up force-with-lease wording

* ss/pull-rebase-preserve:
  docs: clarify "preserve" option wording for git-pull

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Code clean-up.

* sg/completion-gitcomp-nl-for-refs:
  completion: use __gitcomp_nl() for completing refs

Code simplification.

* jk/simplify-csum-file-sha1fd-check:
  sha1fd_check: die when we cannot open the file

A test fix.

* tg/test-index-v4:
  t1700: make test pass with index-v4

Doc clean-up.

* nd/doc-git-index-version:
  git.txt: list index versions in plain English

The prompt script (in contrib/) did not show the untracked sign
when working in a subdirectory without any untracked files.

* ct/prompt-untracked-fix:
  git prompt: use toplevel to find untracked files

Even though "git grep --quiet" is run merely to ask for the exit
status, we spawned the pager regardless.  Stop doing that.

* ws/grep-quiet-no-pager:
  grep: fix "--quiet" overwriting current output

Recommend format-patch and send-email for those who want to submit
patches to this project.

* jc/submitting-patches-mention-send-email:
  SubmittingPatches: encourage users to use format-patch and send-email

An failure early in the "git clone" that started creating the
working tree and repository could have resulted in some directories
and files left without getting cleaned up.

* jk/cleanup-failed-clone:
  clone: drop period from end of die_errno message
  clone: initialize atexit cleanup handler earlier

"git fetch" that fetches a commit using the allow-tip-sha1-in-want
extension could have failed to fetch all the requested refs.

* jk/fetch-pack:
  fetch-pack: remove dead assignment to ref->new_sha1
  fetch_refs_via_pack: free extra copy of refs
  filter_ref: make a copy of extra "sought" entries
  filter_ref: avoid overwriting ref->old_sha1 with garbage

The split-index mode introduced at v2.3.0-rc0~41 was broken in the
codepath to protect us against a broken reimplementation of Git
that writes an invalid index with duplicated index entries, etc.

* tg/fix-check-order-with-split-index:
  read-cache: fix reading of split index