1
0
mirror of https://github.com/git/git.git synced 2024-10-21 06:59:20 +02:00
Commit Graph

86 Commits

Author SHA1 Message Date
Jiang Xin
b694fbb144 l10n: zh_CN.po: translate 27 new messages
Translate 19 new and 8 fuzzy messages which are marked by shell gettext
wrappers, and ignored by previous 'git.pot' updates.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-06-08 12:24:35 +08:00
Jiang Xin
7256fd7c80 l10n: Update git.pot (27 new, 1 removed messages)
Extract messages marked by shell gettext wrappers which are ignored
before. See:

 * http://thread.gmane.org/gmane.comp.version-control.git/199112

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-06-08 10:40:20 +08:00
Jiang Xin
958a3143ee Merge git://github.com/ralfth/git-po-de
By Ralf Thielow
via Ralf Thielow
* ralfth/git-po-de/master:
  l10n: de.po: add additional newline
  l10n: de.po: translate 2 new, 3 fuzzy messages
  l10n: de.po: translate 41 new messages
  l10n: de.po: translate 265 new messages
2012-06-04 23:45:13 +08:00
Tran Ngoc Quan
9e383e8807 l10n: Update translation for Vietnamese
* Updated 5 strings for v1.7.11-rc0-100-g5498c
 * Retranslated about 16 strings

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2012-06-04 13:25:25 +07:00
Ralf Thielow
c0dd803da1 l10n: de.po: add additional newline
The translation of "builtin/gc.c:224" was missing of
a newline which made the second part of the message
quite long. We simply add a newline.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-06-02 20:23:21 +02:00
Ralf Thielow
16abda814b l10n: de.po: translate 2 new, 3 fuzzy messages
Translate 2 new and 3 fuzzy messages came from git.pot update
in 75f7b4b (l10n: Update git.pot (5 new, 3 removed messages)).

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-06-02 17:03:29 +02:00
Ralf Thielow
65752f94d1 l10n: de.po: translate 41 new messages
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-06-02 16:49:40 +02:00
Ralf Thielow
f88416b2a4 l10n: de.po: translate 265 new messages
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-06-02 16:49:40 +02:00
Jiang Xin
d691f47942 l10n: zh_CN.po: translate 2 new, 3 fuzzy messages
Translate 2 new and 3 fuzzy messages came from git.pot update
in 75f7b4b (l10n: Update git.pot (5 new, 3 removed messages)).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-06-02 17:12:59 +08:00
Jiang Xin
75f7b4b965 l10n: Update git.pot (5 new, 3 removed messages)
Generate po/git.pot from v1.7.11-rc0-100-g5498c:

 * 5 new l10n messages at lines:
   635, 639, 1203, 1208, 3946

 * 3 removed l10n messages at lines:
   1194, 3158, 3936

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-06-02 07:07:27 +08:00
Jiang Xin
5ae481e0ad l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".

But what makes 'nplurals=1' hard to work right for Chinese is:

    #: bundle.c:192
    #, c-format
    msgid "The bundle requires this ref"
    msgid_plural "The bundle requires these %d refs"

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-06-01 17:43:38 +08:00
Jiang Xin
81809b9984 l10n: zh_CN.po: translate 323 new messages
Update Simplified Chinese translation for 134 fuzzy, 189 new messages
from Git v1.7.10.2-548-g9de96.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Zhuang Ya <zhuangya@me.com>
2012-06-01 17:42:18 +08:00
Jiang Xin
8ada95983c l10n: zh.CN.po: update by msgmerge git.pot
Update of zh_CN.po: 134 fuzzy translations, 189 untranslated messages.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 16:34:51 +08:00
Tran Ngoc Quan
db484bad10 First release translation for Vietnamese
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2012-05-31 12:31:05 +08:00
Tran Ngoc Quan
774cfe0c52 Init translation for Vietnamese
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 12:31:05 +08:00
Marco Paolone
9d1c2255dc l10n: New it.po file with 504 translations
Signed-off-by: Marco Paolone <marcopaolone@gmail.com>
2012-05-30 13:30:24 +02:00
Jiang Xin
6f3c0ef937 Merge branch 'maint'
By Peter Krefting
via Peter Krefting
* maint:
  Update Swedish translation (728t0f0u)
2012-05-29 16:48:05 +08:00
Peter Krefting
3f0812f68d Update Swedish translation (728t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2012-05-29 09:28:34 +01:00
Jiang Xin
6f6731e719 l10n: Update git.pot (41 new messages)
Generate po/git.pot from v1.7.10.2-548-g9de96:

 * 41 new l10n messages at lines:

   332, 337, 344, 349, 967, 1288, 1292, 1296, 1300, 1304, 1308, 1312,
   1316, 1320, 1324, 1328, 1332, 1336, 1340, 1344, 1348, 1352, 1356,
   1360, 1364, 1368, 1372, 1376, 1380, 1384, 1388, 1392, 1396, 4465,
   4469, 4473, 4477, 4481, 4485, 4489, 4493.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-21 09:00:39 +08:00
Jiang Xin
154ca11d4b Merge branch 'maint' into master
By Ralf Thielow(1) and Jiang Xin(1)
* maint:
  l10n: de.po: translate 3 new messages
  l10n: zh_CN.po: translate 3 new messages
2012-05-16 07:32:20 +08:00
Ralf Thielow
042e9f94a7 l10n: de.po: translate 3 new messages
Translate 3 new messages for upcoming git 1.7.10.3.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-15 19:09:02 +02:00
Jiang Xin
eff6d3a9e3 l10n: zh_CN.po: translate 3 new messages
Translate 3 new messages for upcoming git 1.7.10.3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-15 12:07:00 +08:00
Jiang Xin
59e62277fc Merge branch 'master' of git://github.com/marcomsousa/git-l10n-pt_PT
By Marco Sousa
* marcomsousa/git-l10n-pt_PT/master:
  l10n: pt_PT.po translate new messages
2012-05-15 07:11:58 +08:00
Marco Sousa
388698ce61 l10n: pt_PT.po translate new messages
Translate new and old messages came from git.pot.

Signed-off-by: Marco Sousa <marcomsousa@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-15 07:10:28 +08:00
Jiang Xin
933297211e l10n: Update git.pot (8 new, 4 removed messages)
Generate po/git.pot from v1.7.10.2-520-g6a4a48:

 * 8 new l10n messages at lines:

   977, 982, 1404, 1409, 1414, 1419, 1424, 1429.

 * 4 removed l10n messages from lines:

   977, 1399, 1404, 1409.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-15 06:43:03 +08:00
Jiang Xin
b741611c06 l10n: Update git.pot (3 new, 2 removed messages)
Generate po/git.pot from v1.7.10.2-35-g0b9f4:

 * 3 new l10n messages at lines: 2743, 2751, 2759.

 * 2 removed l10n messages from lines: 1879, 2757.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-15 06:36:36 +08:00
Jiang Xin
2f64542f9c l10n: zh_CN.po: translate 1 new message
Translate new message '[new ref]' since git 1.7.10.1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-12 14:56:06 +08:00
Ralf Thielow
1a8e08cdf4 Merge branch 'maint' into master
* maint: (10 commits)
  l10n: de.po: translate one new message
  l10n: de.po: unify translation of "ahead" and "behind"
  l10n: de.po: collection of improvements
  l10n: de.po: translate "remote" as "extern"
  l10n: de.po: translate "track" as "beobachten"
  ...

Conflicts:
	po/de.po
2012-05-09 18:44:37 +02:00
Ralf Thielow
1ec31a33e2 l10n: de.po: translate one new message
Translate one new messages came from git.pot
update in 7795e42 (l10n: Update git.pot (1 new messages)).
It also updates and reformats the de.po file due to "msgmerge".

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:19:36 +02:00
Ralf Thielow
90d25380df l10n: de.po: unify translation of "ahead" and "behind"
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:19:35 +02:00
Ralf Thielow
b9f3b4c1ba l10n: de.po: collection of improvements
A list of improvements for German translation
which contains a couple of spellings and grammar.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:19:30 +02:00
Ralf Thielow
080d422139 l10n: de.po: translate "remote" as "extern"
The word "remote" was translated as "entfernt"
and "anders". Both of them aren't really good
because "anders" in German means "other" and
"entfernt" has two different meanings and could
result in confusion to the users.
We've changed the translation to "extern".

Suggested-by: Jan Krüger <jk@jk.gs>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:16:14 +02:00
Ralf Thielow
1ef3ab1648 l10n: de.po: translate "track" as "beobachten"
The word "track" was translated as "verfolgen"
and "folgen". We've decided to translate "track" in
the meaning of tracked files/content as "beobachten"
and in the remote-tracking sense as "folgen".

Suggested-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:16:14 +02:00
Ralf Thielow
9bdd868744 l10n: add new members to German translation team
Add Thomas Rast, Jan Krüger and Christian Stimming
to German translation team.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:16:14 +02:00
Thomas Rast
232f61300b l10n: de.po: collection of suggestions
A long list of suggested changes to the translation.  None of them are
clear-cut, though I of course think they are an improvement ;-)

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:16:07 +02:00
Thomas Rast
b41597d3d5 l10n: de.po: translate "bad" as "ungültig" ("invalid")
"schlecht" doesn't quite sound right to me, especially in messages
like "bad object" where the object doesn't even exist in the first
place.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:15:52 +02:00
Thomas Rast
f6e1224d6b l10n: de.po: hopefully uncontroversial fixes
These are all obviously wrong, such as typos or messages where the
current translation is based on a misunderstanding of the original
message.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 19:15:41 +02:00
Thomas Rast
7eba504686 l10n: de.po: translate "bare" as "bloß"
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-08 18:47:04 +02:00
Jiang Xin
822e4a653d l10n: Update git.pot (275 new, 15 removed messages)
Generate po/git.pot from v1.7.10.1-489-g9394:

 * 275 new l10n messages at lines:

   41, 46, 55, 67, 74, 79, 89, 93, 97, 101, 106, 110, 142, 148, 155,
   162, 169, 176, 183, 190, 197, 204, 286, 290, 301, 308, 313, 318, 327,
   411, 415, 420, 425, 947, 952, 957, 962, 967, 972, 977, 982, 987, 992,
   1002, 1007, 1011, 1016, 1021, 1026, 1031, 1036, 1042, 1047, 1052, ...

 * 15 removed l10n messages from lines:

   803, 821, 838, 843, 912, 1356, 1377, 1454, 1458, 1464, 1471, 1517,
   1819, 1824, 1898

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-08 16:10:22 +08:00
Jiang Xin
7795e424c6 l10n: Update git.pot (1 new messages)
Changes of po/git.pot from v1.7.10.1 to v1.7.10.1-36-g42325:

 * 1 new l10n message at line: 1761

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-08 15:49:57 +08:00
Ralf Thielow
839f7f8eed l10n: Update German translation
Translate new messages for git master branch.

Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-02 07:46:35 +08:00
Jiang Xin
89c0aac440 Merge l10n updates from branch 'maint' into master
By Ralf Thielow
* maint:
  l10n: Initial German translation
2012-05-02 07:30:14 +08:00
Ralf Thielow
720e309bf6 l10n: Initial German translation
Helped-by: Thomas Kuchs
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
2012-05-01 16:28:58 +02:00
Jiang Xin
170e989983 l10n: Update Simplified Chinese translation
Translate new messages for git master branch.

 - sha1_name.c: 4 new messages.
 - builtin/push.c: 3 new messages.
 - git-submodule.sh: variable name changed from '$path' to '$sm_path'.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-04-30 00:14:59 +08:00
Jiang Xin
fac15bc683 Merge branch 'maint'
By Jiang Xin
* maint:
  l10n: Update Simplified Chinese translation
  l10n: Update git.pot (2 new messages)
2012-04-28 23:26:36 +08:00
Jiang Xin
73a60cd252 l10n: Update Simplified Chinese translation
Translate 2 new messages come from git maint branch.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-04-28 22:53:41 +08:00
Jiang Xin
df3ef6fb98 l10n: Update git.pot (2 new messages)
Changes of po/git.pot from v1.7.10 to v1.7.10-55-g868d6

 * 2 new l10n messages at lines: 1583, 2730

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-04-28 20:35:24 +08:00
Jiang Xin
cd1e748740 l10n: Update git.pot (33 new, 24 deleted messages)
Changes of po/git.pot from v1.7.10 to v1.7.10-382-g62bc8

 * 33 new l10n messages at lines:
   401, 406, 411, 416, 1602, 1780, 2753, 2766, 2774, 2782, 3403, 3408,
   3423, 3428, 3433, 3438, 3443, 3448, 3453, 3458, 3463, 3468, 3473,
   3480, 3485, 3490, 3495, 3500, 3505, 3510, 3515, 3520, 3525

 * 24 deleted l10n messages at lines:
   2740, 3351, 3356, 3371, 3376, 3381, 3386, 3391, 3396, 3401, 3406,
   3411, 3416, 3421, 3428, 3433, 3438, 3443, 3448, 3453, 3458, 3463,
   3468, 3473

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-04-28 20:27:01 +08:00
Ralf Thielow
01b127cdc5 l10n: Add the German translation team and initialize de.po
Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-04-28 08:25:48 +08:00
Byrial Jensen
36cbbde3bf l10n: Add Danish team (da) to list of teams 2012-04-12 02:03:30 +02:00