git, branch v1.8.5-rc2

Git 1.8.5-rc2

2013-11-13T20:59:31Z

Signed-off-by: Junio C Hamano

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

2013-11-12T19:26:11Z

* git://github.com/git-l10n/git-po: l10n: de.po: improve error message when pushing to unknown upstream l10n: de.po: translate 68 new messages po/TEAMS: update Thomas Rast's email address l10n: Update Swedish translation (2194t0f0u) l10n: fr.po 2194/1294 messages translated l10n: zh_CN.po: translate 68 messages (2194t0f0u) l10n: vi.po (2194t): Update and minor fix l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)

Correct word usage of "timezone" in "Documentation" directory

2013-11-12T18:47:17Z

"timezone" is two words, not one (i.e. "time zone" is correct). Correct this in these files: -- date-formats.txt -- git-blame.txt -- git-cvsimport.txt -- git-fast-import.txt -- git-svn.txt -- gitweb.conf.txt -- rev-list-options.txt Signed-off-by: Jason St. John Signed-off-by: Junio C Hamano

l10n: de.po: improve error message when pushing to unknown upstream

2013-11-12T05:31:15Z

Signed-off-by: Ralf Thielow Acked-by: Thomas Rast

l10n: de.po: translate 68 new messages

2013-11-12T05:31:15Z

Translate 68 new messages came from git.pot update in 727b957 (l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed)). Signed-off-by: Ralf Thielow Acked-by: Thomas Rast

po/TEAMS: update Thomas Rast's email address

2013-11-12T05:31:15Z

Signed-off-by: Ralf Thielow Acked-by: Thomas Rast

Merge remote-tracking branch 'sv/nafmo/master'

2013-11-10T00:48:23Z

* sv/nafmo/master: l10n: Update Swedish translation (2194t0f0u)

l10n: Update Swedish translation (2194t0f0u)

2013-11-09T18:08:23Z

And fix a typo. Signed-off-by: Peter Krefting

l10n: fr.po 2194/1294 messages translated

2013-11-08T22:27:57Z

Signed-off-by: Jean-Noel Avila Signed-off-by: Sebastien Helleu

Sync with 1.8.4.3

2013-11-08T20:08:43Z