1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-09 02:33:11 +01:00
Commit graph

205 commits

Author SHA1 Message Date
Junio C Hamano
89dde7882f Merge branch 'rh/ishes-doc'
We liberally use "committish" and "commit-ish" (and "treeish" and
"tree-ish"); as these are non-words, let's unify these terms to
their dashed form.  More importantly, clarify the documentation on
object peeling using these terms.

* rh/ishes-doc:
  glossary: fix and clarify the definition of 'ref'
  revisions.txt: fix and clarify <rev>^{<type>}
  glossary: more precise definition of tree-ish (a.k.a. treeish)
  use 'commit-ish' instead of 'committish'
  use 'tree-ish' instead of 'treeish'
  glossary: define commit-ish (a.k.a. committish)
  glossary: mention 'treeish' as an alternative to 'tree-ish'
2013-09-17 11:42:51 -07:00
Ralf Thielow
8766343faf l10n: de.po: use "das Tag" instead of "der Tag"
Use "das Tag" to avoid confusion with the German word "Tag" (day).

Reported-by: Dirk Heinrichs <dirk.heinrichs@altum.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2013-09-08 18:37:13 +02:00
Richard Hansen
a8a5406ab3 use 'commit-ish' instead of 'committish'
Replace 'committish' in documentation and comments with 'commit-ish'
to match gitglossary(7) and to be consistent with 'tree-ish'.

The only remaining instances of 'committish' are:
  * variable, function, and macro names
  * "(also committish)" in the definition of commit-ish in
    gitglossary[7]

Signed-off-by: Richard Hansen <rhansen@bbn.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-04 15:03:03 -07:00
Sebastien Helleu
21860882c8 l10n: fr.po: hotfix for commit 6b388fc
Fix many typos and add some new translations (1277/2080 messages
translated).

Closes git-l10n/git-po/pull/63.

Signed-off-by: Sebastien Helleu <flashcode@flashtux.org>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-08-30 16:59:29 +08:00
Jean-Noel Avila
1b5f46f159 l10n: Add reference for french translation team
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2013-08-11 17:14:58 +02:00
Jean-Noel Avila
6b388fca90 l10n: fr.po: 821/2112 messages translated
Trying to focus on most useful phrases.

Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2013-08-11 17:14:58 +02:00
Ralf Thielow
4402f30155 l10n: de.po: translate 5 messages
Translate 5 new messages came from git.pot update in b8ecf23
(l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2013-08-09 06:53:44 +02:00
Ralf Thielow
770c73ffc9 l10n: de.po: translate 99 new messages
Translate 99 new messages came from git.pot update in
28b3cff (l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
2013-08-09 06:53:35 +02:00
Ralf Thielow
eb5accfece l10n: de.po: switch from pure German to German+English
This switches the translation from pure German to German+English.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
2013-08-08 17:55:25 +02:00
Wieland Hoffmann
b5c0a216f8 l10n: de.po: Fix a typo
Signed-off-by: Wieland Hoffmann <themineo@gmail.com>
2013-08-08 17:55:25 +02:00
Peter Krefting
aa4e5fe40f l10n: Update Swedish translation (2135t0f0u)
Fix some incorrect translations in existing messages while at it.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2013-08-06 12:44:17 +01:00
Jiang Xin
b18943845c l10n: zh_CN.po: translate 5 messages (2135t0f0u)
Translate 5 new messages came from git.pot update in b8ecf23
(l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-08-06 17:22:16 +08:00
Tran Ngoc Quan
85ef881f6c l10n: vi.po(2135t): v1.8.4 round 2
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2013-08-06 14:34:48 +07:00
Jiang Xin
b8ecf239d0 l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)
Generate po/git.pot from v1.8.4-rc1-21-gfb56570 for git v1.8.4
l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-08-06 14:13:23 +08:00
Jiang Xin
2e8451e860 l10n: zh_CN.po: translate 99 messages (2133t0f0u)
Translate 99 new messages came from git.pot update in 28b3cff
(l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-08-03 14:14:07 +08:00
Tran Ngoc Quan
e06dc12a83 l10n: vi.po (2133t)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2013-07-27 09:54:25 +07:00
Jiang Xin
28b3cffcec l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)
Generate po/git.pot from v1.8.4-rc0 for git v1.8.4 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-07-26 14:40:28 +08:00
Jiang Xin
4dcdc3d8cc l10n: zh_CN.po: translate 44 messages (2080t0f0u)
Translate 44 new messages came from git.pot update in c6bc7d4
(l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed))

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-05-08 08:13:32 +08:00
Ralf Thielow
a09ab03a5b l10n: de.po: translate 44 new messages
Translate 44 new messages came from git.pot update in
c6bc7d4 (l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
2013-05-07 19:28:19 +02:00
Jiang Xin
674c502f52 Merge remote-tracking branch 'vi-vnwildman/master'
* vi-vnwildman/master:
  l10n: Update Vietnamese translation (2080t0f0u)
2013-05-01 19:49:18 +08:00
Tran Ngoc Quan
efc90c7810 l10n: Update Vietnamese translation (2080t0f0u)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2013-05-01 14:29:03 +07:00
Peter Krefting
cc7ca63c04 l10n: Update Swedish translation (2080t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2013-04-30 12:30:21 +01:00
Jiang Xin
c6bc7d435b l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)
Generate po/git.pot from v1.8.3-rc0-19-g7e6a0 for git v1.8.3
l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-04-30 08:31:19 +08:00
Junio C Hamano
30d925541e Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po:
  l10n: de.po: translate 54 new messages
  l10n: zh_CN.po: translate 54 messages (2048t0f0u)
  l10n: Update Swedish translation (2048t0f0u)
  l10n: vi.po: Update translation (2048t0u0f)
  l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)
2013-04-23 22:55:33 -07:00
Ralf Thielow
b94490bd57 l10n: de.po: translate 54 new messages
Translate 54 new messages came from git.pot update in
c138af5 (l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)).

While at there, fix some small issues.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
2013-04-20 17:31:59 +02:00
Stefano Lattarini
e1c3bf496f doc: various spelling fixes
Most of these were found using Lucas De Marchi's codespell tool.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-12 12:00:52 -07:00
Jiang Xin
1003b3a55d l10n: zh_CN.po: translate 54 messages (2048t0f0u)
Translate 54 new messages came from git.pot update in c138af5
(l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed))

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-04-12 09:42:58 +08:00
Jiang Xin
81af23f684 Merge remote-tracking branch 'sv-nafmo/master'
* sv-nafmo/master:
  l10n: Update Swedish translation (2048t0f0u)
2013-04-12 09:17:30 +08:00
Peter Krefting
25d1d7e1c3 l10n: Update Swedish translation (2048t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2013-04-11 11:58:56 +01:00
Tran Ngoc Quan
7db011eb20 l10n: vi.po: Update translation (2048t0u0f)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2013-04-11 14:23:02 +07:00
Jiang Xin
c138af56da l10n: git.pot: v1.8.3 round 1 (54 new, 15 removed)
Generate po/git.pot from v1.8.2.1-342-gfa728 for git vl.8.3
l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-04-10 15:19:54 +08:00
Jiang Xin
a7409dfbc1 l10n: zh_CN.po: translate 1 new message
Translate 1 new message came from git.pot update in ed1ddaf
(l10n: git.pot: v1.8.2 round 4 (1 changed)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-03-07 08:46:19 +08:00
Ralf Thielow
79d0f37337 l10n: de.po: translate 1 new message
Translate 1 new message came from git.pot update in
ed1ddaf (l10n: git.pot: v1.8.2 round 4 (1 changed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2013-03-06 19:26:29 +01:00
Tran Ngoc Quan
3fef5536a0 l10n: vi.po: Update translation (2009t0f0u)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2013-03-06 13:57:17 +07:00
Peter Krefting
b6eab8bdaa l10n: Update Swedish translation (2009t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2013-03-05 09:18:25 +01:00
Jiang Xin
ed1ddafa60 l10n: git.pot: v1.8.2 round 4 (1 changed)
Generate po/git.pot from v1.8.2-rc2-4-g77995 for git v1.8.2
l10n round 4.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-03-05 12:41:45 +08:00
Ralf Thielow
5e93cd307b l10n: de.po: correct translation of "bisect" messages
The term "bisect" was translated as "halbieren", we should
translate it as "binäre Suche" (binary search). While at
there, we should leave "bisect run" untranslated since it's
a subcommand of "git bisect".

Suggested-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2013-02-26 07:38:34 +01:00
Ralf Thielow
a295fe616f l10n: de.po: translate 5 new messages
Translate 5 new messages came from git.pot update in 235537a
(l10n: git.pot: v1.8.2 round 3 (5 new)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
2013-02-26 07:38:34 +01:00
Ralf Thielow
48cc7c1b24 l10n: de.po: translate 35 new messages
Translate 35 new messages came from git.pot update
in 9caaf23 (l10n: Update git.pot (35 new, 14 removed
messages)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
2013-02-26 07:38:34 +01:00
Tran Ngoc Quan
c527acebc2 l10n: vi.po: Updated 5 new messages (2009t0f0u)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2013-02-20 07:17:58 +07:00
Peter Krefting
2afd3ef728 l10n: Update Swedish translation (2009t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2013-02-19 10:26:36 +01:00
Peter Krefting
1415174ad5 l10n: Update Swedish translation (2004t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2013-02-19 10:23:54 +01:00
Jiang Xin
63af42fe30 l10n: zh_CN.po: translate 5 new messages
Translate 5 new messages came from git.pot update in 235537a
(l10n: git.pot: v1.8.2 round 3 (5 new)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-02-19 14:52:24 +08:00
Jiang Xin
235537a07e l10n: git.pot: v1.8.2 round 3 (5 new)
Generate po/git.pot from v1.8.2-rc0-16-g20a59 for git v1.8.2
l10n round 3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-02-19 13:36:11 +08:00
Jiang Xin
a77c07d974 l10n: zh_CN.po: translate 35 new messages
Translate 35 new messages came from git.pot update in 9caaf23
(l10n: Update git.pot (35 new, 14 removed messages)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-02-18 09:52:33 +08:00
Tran Ngoc Quan
77c8e54321 l10n: vi.po: update new strings (2004t0u0f)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2013-02-17 08:43:34 +07:00
Jiang Xin
9caaf23ef0 l10n: Update git.pot (35 new, 14 removed messages)
L10n for git 1.8.2 round 2: Generate po/git.pot from v1.8.1.3-568-g5bf72.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-02-14 14:51:38 +08:00
Ralf Thielow
1bbe7c3c12 l10n: de.po: translate "reset" as "neu setzen"
According to the glossary, "reset" should be
translated as "neu setzen" but in a couple of
messages we've translated it as "zurücksetzen".
This fixes that.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2013-02-08 20:43:30 +01:00
Ralf Thielow
d4c6552719 l10n: de.po: translate "revision" consistently as "Revision"
In the current German translation, the word "revision" was
translated as both "Version" (translation of "commit") and
"Revision". Since a revision in Git is not necessarily a
commit, we should not translate it with the same word in
order to give the user an idea that it's not necessarily
the same. After this commit, "revision" is consistently
translated as "Revision".

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2013-02-08 20:43:30 +01:00
Ralf Thielow
cad5d26909 l10n: de.po: translate 11 new messages
Translate 11 new messages came from git.pot update
in 46bc403 (l10n: Update git.pot (11 new, 7 removed
messages)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
2013-02-08 20:43:30 +01:00