development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity
36134 commits 6 branches 956 tags 486 MiB
Commit graph

236 commits

Author SHA1 Message Date
Sandy Carter
16216b6ab1 i18n: proposed command missing leading dash 
Add missing leading dash to proposed commands in french output when
using the command:
    git branch --set-upstream remotename/branchname
and when upstream is gone

Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2014-03-05 22:10:24 +08:00
Ralf Thielow
92cd3e35a0 l10n: de.po: correct message when hiding commits by craft 
The recent translation was giving the idea that all commits
based on a graft were meant to be hidden. Make it clear that
it is the graft commit itself.

Reported-by: David Kastrup <dak@gnu.org>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-02-12 07:16:03 +01:00
Ralf Thielow
0dd2a2c9b4 l10n: de.po: translate 28 new messages 
Translate 28 new messages came from git.pot update in
df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed)
and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-02-12 07:15:55 +01:00
Jiang Xin
98b2761d5e l10n: zh_CN.po: Disambiguation for rebase 
Disambiguate the Chinese translation for "rebase", and update other
related entries.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-02-06 23:15:33 +08:00
Jiang Xin
8376b58d1c l10n: zh_CN.po: translate 1 new message (2211t0f0u) 
Update translation for git v1.9-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-02-03 10:53:18 +08:00
Jiang Xin
afa41284a2 Merge branch 'master' of git://github.com/nafmo/git-l10n-sv 
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: Update Swedish translation (2211t0f0u)
 2014-02-03 09:47:27 +08:00
Jiang Xin
e8f4a7cb6e Merge branch 'master' of git://github.com/vnwildman/git 
* 'master' of git://github.com/vnwildman/git:
  l10n: vi.po (2211t): Updated one new string
 2014-02-03 09:45:14 +08:00
Tran Ngoc Quan
8620ed578b l10n: vi.po (2211t): Updated one new string 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2014-02-03 07:49:47 +07:00
Peter Krefting
b6c0df8948 l10n: Update Swedish translation (2211t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2014-02-02 17:22:21 +01:00
Jean-Noel Avila
893fcc3e4d l10n: fr: 1.9rc2 2211t 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2014-02-02 14:38:05 +01:00
Jiang Xin
d57b24b60b l10n: git.pot: v1.9 round 2 (1 new) 
Generate po/git.pot from v1.9-rc2 for git v1.9 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-02-01 08:07:02 +08:00
Alexander Shopov
25e2fbb4e2 l10n: Bulgarian translation of git (222t21f1967u) 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2014-01-29 14:29:15 +02:00
Alexander Shopov
5123e7d54f po/TEAMS: Added Bulgarian team 
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
 2014-01-28 19:16:53 +02:00
Jiang Xin
608a82348b l10n: remove 2 blank translations on Danish, Dutch 
Two l10n teams haven't contributed a single translation for about two
years since they was initialized with a blank template.  Remove them
can make the Git package smaller and give opportunities to other
contributors.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-01-25 06:17:14 +08:00
Jiang Xin
cfff71a961 l10n: zh_CN.po: translate 27 messages (2210t0f0u) 
Translations for git v1.9-rc0, and also update translations on "graft"
and "reference repository".

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-01-25 06:17:14 +08:00
Peter Krefting
d74d01808a l10n: Update Swedish translation (2210t0f0u) 
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2014-01-21 09:26:56 +01:00
Jiang Xin
812b5e1c11 Merge branch 'fr-po' of git://github.com/jnavila/git 
* 'fr-po' of git://github.com/jnavila/git:
  [fr] update french translation 2210/2210
 2014-01-18 22:49:27 +08:00
Jean-Noel Avila
561580eadd [fr] update french translation 2210/2210 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2014-01-18 14:44:13 +01:00
Tran Ngoc Quan
5832c3f2f4 l10n: vi.po (2210t): Updated git-core translation 
* Updated new strings
 * Fix typos and review
 * Change meaning of stage

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2014-01-18 09:07:40 +07:00
Jiang Xin
df49095ac2 l10n: git.pot: v1.9 round 1 (27 new, 11 removed) 
Generate po/git.pot from v1.9-rc0 for git v1.9 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2014-01-18 07:45:37 +08:00
Ralf Thielow
cb0553651d l10n: de.po: fix translation of 'prefix' 
The word 'prefix' is currently translated as 'Prefix'
which is not a German word. It should be translated as
'Präfix'.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
 2014-01-03 18:21:38 +01:00
Ralf Thielow
1f6fb7ffc3 l10n: de.po: improve error message when pushing to unknown upstream 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
 2013-11-12 06:31:15 +01:00
Ralf Thielow
1d38363d86 l10n: de.po: translate 68 new messages 
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 <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
 2013-11-12 06:31:15 +01:00
Ralf Thielow
1b12df5262 po/TEAMS: update Thomas Rast's email address 
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
 2013-11-12 06:31:15 +01:00
Jiang Xin
86fe7c0117 Merge remote-tracking branch 'sv/nafmo/master' 
* sv/nafmo/master:
  l10n: Update Swedish translation (2194t0f0u)
 2013-11-10 08:48:23 +08:00
Peter Krefting
1f32de1e14 l10n: Update Swedish translation (2194t0f0u) 
And fix a typo.

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
 2013-11-09 19:08:23 +01:00
Jean-Noel Avila
eadd122b5e l10n: fr.po 2194/1294 messages translated 
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Sebastien Helleu <flashcode@flashtux.org>
 2013-11-08 23:27:57 +01:00
Jiang Xin
903147923e l10n: zh_CN.po: translate 68 messages (2194t0f0u) 
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: Jiang Xin <worldhello.net@gmail.com>
 2013-11-03 14:09:08 +08:00
Tran Ngoc Quan
44bb9364e2 l10n: vi.po (2194t): Update and minor fix 
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
 2013-11-02 13:21:55 +07:00
Jiang Xin
727b9576eb l10n: git.pot: v1.8.5 round 1 (68 new, 9 removed) 
Generate po/git.pot from v1.8.5-rc0-23-gaa27064 for git v1.8.5
l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
 2013-11-02 08:08:26 +08:00
Jean-Noel Avila
ba1b8cfac1 l10n: fr.po: 2135/2135 messages translated 
Signed-off-by: Sebastien Helleu <flashcode@flashtux.org>
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
 2013-10-18 10:29:33 +08:00
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