delta/git.git, branch js/git-gui-msgfmt-on-windows

Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows

2017-07-25T20:42:41+00:00

* 'js/msgfmt-on-windows' of ../git-gui:
  git-gui (MinGW): make use of MSys2's msgfmt
  git gui: allow for a long recentrepo list
  git gui: de-dup selected repo from recentrepo history
  git gui: cope with duplicates in _get_recentrepo
  git-gui: remove duplicate entries from .gitconfig's gui.recentrepo

git-gui (MinGW): make use of MSys2's msgfmt

2017-07-25T19:32:14+00:00

When Git for Windows was still based on MSys1, we had no gettext, ergo
no msgfmt, either. Therefore, we introduced a small and simple Tcl
script to perform the same task.

However, with MSys2, we no longer need that because we have a proper
msgfmt executable. Plus, the po2msg.sh script somehow manages to hang
when run in parallel in Git for Windows' SDK (symptom: the Continuous
Testing tasks timing out).

Two reasons to use real msgfmt.exe instead.

Signed-off-by: Johannes Schindelin 
Signed-off-by: Junio C Hamano

Git 2.14-rc1

2017-07-24T21:50:35+00:00

Signed-off-by: Junio C Hamano

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

2017-07-24T21:01:08+00:00

* https://github.com/git-l10n/git-po:
  l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed)
  l10n: sv.po: Update Swedish translation (3206t0f0u)
  l10n: ko.po: Update Korean translation
  l10n: Update Catalan translation
  l10n: bg.po: Updated Bulgarian translation (3206t)
  l10n: vi.po(3206t): Update Vietnamese translation
  l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed)
  l10n: ru.po: update Russian translation
  l10n: Fixes to Catalan translation

l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed)

2017-07-24T14:00:44+00:00

Generate po/git.pot from v2.14.0-rc0-40-g5eada8987e for git v2.14.0 l10n round 2.

Signed-off-by: Jiang Xin

Merge branch 'master' of git://github.com/git-l10n/git-po

2017-07-24T13:53:47+00:00

* 'master' of git://github.com/git-l10n/git-po:
  l10n: sv.po: Update Swedish translation (3206t0f0u)
  l10n: ko.po: Update Korean translation
  l10n: Update Catalan translation
  l10n: bg.po: Updated Bulgarian translation (3206t)
  l10n: vi.po(3206t): Update Vietnamese translation
  l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed)
  l10n: ru.po: update Russian translation
  l10n: Fixes to Catalan translation

Merge branch 'master' of git://github.com/nafmo/git-l10n-sv

2017-07-21T22:19:21+00:00

* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (3206t0f0u)

Sync with maint

2017-07-21T22:13:25+00:00

* maint:
  fixes from 'master' for 2.13.4

fixes from 'master' for 2.13.4

2017-07-21T22:06:09+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ew/fd-cloexec-fix' into maint

2017-07-21T22:03:40+00:00

Portability/fallback fix.

* ew/fd-cloexec-fix:
  set FD_CLOEXEC properly when O_CLOEXEC is not supported