1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 06:47:52 +01:00
Commit graph

581 commits

Author SHA1 Message Date
Jiang Xin
9049ba7c0f Merge branch 'master' of github.com:jiangxin/git into master
* 'master' of github.com:jiangxin/git:
  l10n: zh_CN: Update Git Glossary: "commit message"
  l10n: zh_CN: Update Git Glossary: pickaxe
  l10n: zh_CN: Update Git Glossary: fork
  l10n: zh_CN: Update Git Glossary: tag
  l10n: zh_CN: Update Git Glossary: "dumb", "smart"
  l10n: zh_CN: Update Git Glossary: SHA-1
  l10n: zh_CN: Add Surrounding Spaces
  l10n: zh_CN: Add translations for Git glossary
  l10n: TEAMS: stash inactive zh_CN team members
  l10n: zh_CN: Update Translation of "tag"
  l10n: zh_CN: Unify Translation of "packfile"
  l10n: zh_CN: Update Translation: "tag object"

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-09-05 09:26:26 +08:00
Jiang Xin
df0617bfa7 l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)
Generate po/git.pot from v2.6.0-rc0-24-gec371ff for git v2.6.0 l10n
round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-09-05 09:21:10 +08:00
Ray Chen
667599e825 l10n: zh_CN: Update Git Glossary: "commit message"
Add "commit message" to glossary.  Translate it as "提交信息".

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-25 09:47:50 +08:00
Ray Chen
12e59059ee l10n: zh_CN: Update Git Glossary: pickaxe
Translate the term "pickaxe" as "挖掘".

Initially proposed by @louy2 .

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:12:22 +08:00
Ray Chen
e397e7e353 l10n: zh_CN: Update Git Glossary: fork
Remove "复刻" from translation option list of "fork", keeping "派生"
as the only one.

In Git context, by talking about the term "fork", one usually mean the
procedure that divides a branch into two or more history lines.  That
is quite like the "fork" concept in programming, which split a process
into two or more independent processes.

On the other hand, "复刻" by itself means "copy" or "mirror".  It is
considered more suitable for describing the procedure like
"fork a repository", which is common on public repository hosting
services, such as GitHub.  However, this is beyond the scope of
core-Git.  As a l10n work for core-Git, "复刻" should be removed here.

There used to be another option - "分岔".  Its a good idea to
translate "fork point" as "分岔点".  However, "派生点" is as good,
too.  So this option is finally discarded.

Also fix a relevant translation issue which was introduced in
`160fb2b`.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:12:22 +08:00
Ray Chen
933c015e37 l10n: zh_CN: Update Git Glossary: tag
Add verb form translation of tag.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:12:22 +08:00
Ray Chen
755c831b9f l10n: zh_CN: Update Git Glossary: "dumb", "smart"
"dumb/smart HTTP protocol" are normally considered as phrases.
Add "protocol" as a suffix after them makes more sense.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:12:22 +08:00
Ray Chen
ee7589bb22 l10n: zh_CN: Update Git Glossary: SHA-1
It's quite common to see the term "SHA-1" remain untranslated in many
l10n works. So update the "SHA-1" entry in Git glossary to match this
behavior.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-23 15:11:57 +08:00
Philip Oakley
a6926b837e po/README: Update directions for l10n contributors
Some Linux distributions (such as Ubuntu) have their own l10n workflows,
and their translations may be different.  Add notes for this case for
l10n translators.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-08-17 12:12:26 -07:00
Ray Chen
4375c10e28 l10n: zh_CN: Add Surrounding Spaces
Some English words inside the Chinese sentences appear without
surrounding spaces, which are considered irregular.

This commit try to fix this issue, with the help of some regular
express patterns.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-10 18:15:46 +08:00
Jiang Xin
160fb2b28b l10n: zh_CN: Add translations for Git glossary
Add translations of Git glossary (most of them are from the command `git
help glossary`) in the header of `zh_CN.po`.  Also fixes some translations
according to this glossary, such as "pathspec", "repository", "refspec".

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-07 17:59:31 +08:00
Jiang Xin
bbdf0acc7d l10n: TEAMS: stash inactive zh_CN team members
Add Ray Chen as member of zh_CN l10n team member, and move other
inactive zh_CN l10n team members to the header of zh_CN.po.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-08-04 00:43:08 +08:00
Ray Chen
55a16ee487 l10n: zh_CN: Update Translation of "tag"
- "tag" translated as "标签".
- "annotated tag" translated as "附注标签".
- "mergetag" translated as "合并标签".
- "tag name" translated as "标签名称".
- Relevant adjustments.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-07-30 23:42:27 +08:00
Ray Chen
dbd6cced19 l10n: zh_CN: Unify Translation of "packfile"
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-07-28 13:26:41 +08:00
Ray Chen
53438e8fe2 l10n: zh_CN: Update Translation: "tag object"
* "tag object" translated as "标签对象".
* "objects to be packed" translated as "待打包对象".
* Add "那些", for better reading experience.

Signed-off-by: Ray Chen <oldsharp@gmail.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-07-27 23:39:37 +08:00
Alex Henrie
cdab3cacf6 l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-07-20 11:54:40 -06:00
Jiang Xin
01d597feec Merge branch 'master' of https://github.com/ralfth/git-po-de
* 'master' of https://github.com/ralfth/git-po-de:
  l10n: de.po: translate 9 new messages
2015-07-16 07:44:43 +08:00
Ralf Thielow
f1e80c0829 l10n: de.po: translate 9 new messages
Translate 9 new messages came from git.pot update in a4156d2
(l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
2015-07-15 20:30:52 +02:00
Alexander Shopov
619b8f8636 l10n: Updated Bulgarian translation of git (2359t,0f,0u)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2015-07-15 20:34:23 +03:00
Jiang Xin
5bb01d4f02 l10n: zh_CN: for git v2.5.0 l10n round 2
Update 9 translations (2359t0f0u) for git v2.5.0-rc2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-07-15 23:21:08 +08:00
Peter Krefting
e557179a63 l10n: sv.po: Update Swedish translation (2359t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2015-07-15 12:54:11 +01:00
Jiang Xin
297230d490 Merge branch 'fr_v2.5.0-round2' of git://github.com/jnavila/git
* 'fr_v2.5.0-round2' of git://github.com/jnavila/git:
  l10n: fr v2.5.0 round 2 (2359t)
2015-07-15 07:06:49 +08:00
Jean-Noel Avila
be67fb4fc9 l10n: fr v2.5.0 round 2 (2359t)
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2015-07-14 23:03:24 +02:00
Jiang Xin
9ce8613349 Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru
* 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
  l10n: ru.po: update Russian translation
2015-07-14 22:30:12 +08:00
Dimitriy Ryazantcev
a3e55f72ba l10n: ru.po: update Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2015-07-14 16:34:00 +03:00
Tran Ngoc Quan
21f637378d l10n: Updated Vietnamese translation (2359t)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-07-14 07:30:51 +07:00
Jiang Xin
a4156d2034 l10n: git.pot: v2.5.0 round 2 (9 new, 5 removed)
Generate po/git.pot from v2.5.0-rc2 for git v2.5.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-07-14 07:20:08 +08:00
Ralf Thielow
262ea4a6c0 l10n: de.po: translate 65 new messages
Translate 65 new messages came from git.pot update in
64f23b0 (l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-07-08 19:50:38 +02:00
Ralf Thielow
43d2401456 l10n: de.po: translate "index" as "Index"
The term "index" is translated as "Staging-Area" to
match a majority of German books and to not confuse
Git beginners who don't know about Git's index.

"Staging Area" is used in German books as a thing where
content can be staged for commit.  While the translation
is good for those kind of messages, it's bad for messages
that mean the Git index as the tree state or the index
file, in which case we should translate as "Index".

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-07-08 19:38:42 +02:00
Ralf Thielow
121f7b0509 l10n: de.po: fix translation of "head nodes"
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Phillip Sz <phillip.szelat@gmail.com>
2015-07-08 19:38:42 +02:00
Jiang Xin
7aea43ff4e l10n: zh_CN: for git v2.5.0 l10n round 1
Update 65 translations (2355t0f0u) for git v2.5.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-07-05 23:13:37 +08:00
Alex Henrie
7363e66904 l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-07-01 22:22:02 -06:00
Jiang Xin
1976f9b527 Merge branch 'fr_2.5.0_round1' of git://github.com/jnavila/git
* 'fr_2.5.0_round1' of git://github.com/jnavila/git:
  l10n: fr.po v2.5.0-rc0 (2355t)
2015-07-02 07:01:51 +08:00
Jean-Noel Avila
7b0580583a l10n: fr.po v2.5.0-rc0 (2355t)
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Claude Dioudonnat <cdioudonnat@itnetwork.fr>
2015-06-30 21:35:11 +02:00
Jiang Xin
cda2ef6470 Merge branch 'master' of git://github.com/alshopov/git-po
* 'master' of git://github.com/alshopov/git-po:
  l10n: Updated Bulgarian translation of git (2355t,0f,0u)
2015-06-29 06:41:44 +08:00
Alexander Shopov
e1f7037167 l10n: Updated Bulgarian translation of git (2355t,0f,0u)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2015-06-28 22:50:10 +03:00
Peter Krefting
a7ec9810be l10n: sv.po: Update Swedish translation (2355t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2015-06-28 18:50:20 +01:00
Tran Ngoc Quan
bd8202f3ac l10n: Updated Vietnamese translation (2355t)
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-06-28 14:46:18 +07:00
Jiang Xin
64f23b0c20 l10n: git.pot: v2.5.0 round 1 (65 new, 15 removed)
Generate po/git.pot from v2.5.0-rc0 for git v2.5.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-06-27 19:18:04 +08:00
Michael J Gruber
a9845c5f50 l10n: de.po: translation fix for fall-back to 3way merge
The English version is correct, but misleading: It is not the 3way merge
that is being patched also, but that is being fallen back to also.

The German version translates the former meaning. Make it translate the
latter.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-06-12 20:40:04 +02:00
Michael J Gruber
47a1657ab9 l10n: de.po: punctuation fixes
This respects the ellipsis style used in de.po.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-06-12 20:40:04 +02:00
Michael J Gruber
872b1f26b8 l10n: de.po: grammar fix
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-06-12 20:40:04 +02:00
Phillip Sz
39f9819931 l10n: de.po: change error message from "sagen" to "Meinten Sie"
We should not use "sagen" if someone has written something wrong.
Although it's "say" in English, we should not use it in German
and instead use our normal error message.

Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-06-12 20:39:42 +02:00
Jiang Xin
44cc742a8c
Merge branch 'master' of git://github.com/alexhenrie/git-po
* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation
2015-04-09 08:21:39 +08:00
Jiang Xin
689664ae94 l10n: TEAMS: Change repository URL of zh_CN
Repository URL of zh_CN l10n for Git has been changed over 2 years,
update po/TEAMS for it.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-04-09 08:20:32 +08:00
Alex Henrie
c888305e1e l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-04-07 18:07:47 -06:00
Alexander Shopov
f88c11346c l10n: Updated Bulgarian translation of git (2305t,0f,0u)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2015-04-07 11:23:18 +03:00
Peter Krefting
9386878f69 l10n: sv.po: Update Swedish translation (2305t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2015-04-07 08:45:20 +01:00
Ralf Thielow
ddc7d46d9e l10n: de.po: translate one message
Translate one message came from git.pot update in 6eebb35
(l10n: git.pot: v2.4.0 round 2 (1 update)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-04-05 19:10:29 +02:00
Jean-Noel Avila
fa54b52432 l10n: fr.po v2.4.0 round 2
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2015-04-04 18:04:56 +02:00
Dimitriy Ryazantcev
9af95af05f l10n: ru: updated Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2015-04-03 16:30:14 +03:00
Tran Ngoc Quan
a4acd09bd9 l10n: vi.po(2305t): Updated 1 new string
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-04-03 08:55:06 +07:00
Jiang Xin
44f518e68e l10n: zh_CN: for git v2.4.0 l10n round 2
Translate 1 update message (2305t0f0u) for git v2.4.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-04-03 08:39:57 +08:00
Jiang Xin
6eebb35ec0 l10n: git.pot: v2.4.0 round 2 (1 update)
Generate po/git.pot from v2.4.0-rc1 for git v2.4.0 l10n round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-04-03 08:16:53 +08:00
Matthias Rüster
918de7523d l10n: de.po: translate 'symbolic link' as 'symbolische Verknüpfung'
The use of 'symbolische Verknüpfung' for 'symbolic link' is more common
than 'symbolischer Verweis'.

Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-04-02 18:35:33 +02:00
Ralf Thielow
668fa6c951 l10n: de.po: translate 99 new messages
Translate 99 messages came from git.pot update in c2ea120
(l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-04-02 18:35:28 +02:00
Ralf Thielow
1c8f034ddb l10n: de.po: fix messages with abbreviated hashs
The three dots in messages where the hash is abbreviated
were misinterpreted and are fixed with this commit.

Noticed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-04-02 18:29:03 +02:00
Phillip Sz
c9f0dbf143 l10n: de.po: add space before ellipsis
Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-04-02 18:29:03 +02:00
Tran Ngoc Quan
02507f42a0 l10n: vi.po: Updated Vietnamese translation
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-03-31 09:48:38 +08:00
Jiang Xin
814ff3141e l10n: zh_CN: translations for git v2.4.0-rc0
Translate 99 updated messages (2305t0f0u) for git v2.4.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-03-31 09:43:58 +08:00
Jiang Xin
d0cec149b2 Merge branch 'fr-v2.4.0-rc0' of git://github.com/jnavila/git
* 'fr-v2.4.0-rc0' of git://github.com/jnavila/git:
  l10n: fr.po v2.4.0-rc0 round 1
2015-03-31 09:38:47 +08:00
Jean-Noel Avila
7298ca7b2e l10n: fr.po v2.4.0-rc0 round 1
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2015-03-30 10:54:05 +02:00
Alex Henrie
d03ead9836 l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-03-28 15:07:36 -06:00
Dimitriy Ryazantcev
76f92c1684 l10n: ru: updated Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2015-03-27 12:54:35 +02:00
Peter Krefting
dc76d8fec9 l10n: sv.po: Update Swedish translation (2305t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2015-03-27 09:57:48 +01:00
Jiang Xin
c12468b71c Merge branch 'maint'
* maint:
  l10n: de.po: fix negation for commit -a with paths
2015-03-27 14:02:01 +08:00
Jiang Xin
c2ea120885 l10n: git.pot: v2.4.0 round 1 (99 new, 92 removed)
Generate po/git.pot from v2.4.0-rc0 for git v2.4.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-03-27 13:35:23 +08:00
Dimitriy Ryazantcev
f088104490 l10n: ru: added Russian translation
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2015-03-23 13:24:17 +02:00
Michael J Gruber
d0017928cb l10n: de.po: fix negation for commit -a with paths
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-02-27 18:30:45 +01:00
Alex Henrie
7471cf88f5 l10n: ca.po: Fix trailing whitespace
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-01-30 15:02:34 -07:00
Jiang Xin
b4fde1e37d Merge branch 'master' of git://github.com/alexhenrie/git-po
* 'master' of git://github.com/alexhenrie/git-po:
  l10n: ca.po: update translation
2015-01-27 15:00:48 +08:00
Michael J Gruber
07586ebd4f l10n: de.po: correct singular form
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-26 19:36:04 +01:00
Michael J Gruber
2f334c6461 l10n: de.po: translate "leave behind" correctly
This message is about leaving orphaned commits behind, not about
behind an upstream branch. Try to make this clear.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-26 19:36:04 +01:00
Benedikt Heine
3b36ef9188 l10n: de.po: fix typo
Signed-off-by: Benedikt Heine <bebe@bebehei.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-26 19:36:04 +01:00
Alex Henrie
573ed5e147 l10n: ca.po: update translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2015-01-26 10:12:50 -07:00
Jiang Xin
1e60744913 l10n: correct indentation of show-branch usage
An indentation error was found right after we started l10n round 2, and
commit d6589d1 (show-branch: fix indentation of usage string) and this
update would fix it.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-21 15:35:37 +08:00
Ralf Thielow
a235de4bd2 l10n: de.po: translate 3 messages
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-20 19:23:57 +01:00
Jiang Xin
d9d56b2357 l10n: zh_CN: various fixes on command arguments
Updated translations for Git 2.3.0 l10n round 2, and fixed various
translations for command arguments.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-19 10:23:53 +08:00
Jiang Xin
07361f12ab Merge branch 'v2.3.0' of git://github.com/jnavila/git
* 'v2.3.0' of git://github.com/jnavila/git:
  l10n: fr.po v2.3.0 round 2
2015-01-19 10:12:46 +08:00
Jiang Xin
482f68e741 Merge branch 'master' of git://github.com/nafmo/git-l10n-sv
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (2298t0f0u)
2015-01-19 10:10:57 +08:00
Tran Ngoc Quan
d1f9c7b77e l10n: vi.po(2298t): Updated 3 new strings
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-01-19 07:20:28 +07:00
Peter Krefting
0ef279509b l10n: sv.po: Update Swedish translation (2298t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2015-01-18 20:30:18 +01:00
Jean-Noel Avila
bf41b712c7 l10n: fr.po v2.3.0 round 2
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2015-01-18 17:03:27 +01:00
Jiang Xin
105979f71c l10n: git.pot: v2.3.0 round 2 (3 updated)
Generate po/git.pot from v2.3.0-rc0-44-ga94655d for git v2.3.0 l10n
round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-18 11:26:57 +08:00
Ralf Thielow
124d80928d l10n: de.po: translate 13 new messages
Translate 13 new messages came from git.pot update in
beb691f (l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-17 18:10:46 +01:00
Ralf Thielow
e1a05ad851 l10n: de.po: fix typo
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-17 18:10:02 +01:00
Ralf Thielow
463243d49c l10n: de.po: translate "track" as "versionieren"
Suggested-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-17 18:09:56 +01:00
Jiang Xin
04cb2f28cc l10n: zh_CN: translations for git v2.3.0-rc0
Translate 13 new messages (2298t0f0u) for git v2.3.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-17 15:28:36 +08:00
Peter Krefting
2a26377047 l10n: sv.po: Update Swedish translation (2298t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2015-01-14 22:55:49 +01:00
Jean-Noel Avila
9905988a57 l10n: fr.po v2.3.0 round 1
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2015-01-13 20:23:41 +01:00
Tran Ngoc Quan
fbf5d8c3d0 l10n: vi.po(2298t): Updated and change Plural-Forms
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-01-13 14:23:12 +07:00
Jiang Xin
beb691f770 l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)
Generate po/git.pot from v2.3.0-rc0 for git v2.3.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-13 14:05:57 +08:00
Joan Perals
47103bd6b3 l10n: ca.po: various fixes
Signed-off-by: Joan Perals Tresserra <j.pertres@gmail.com>
2014-12-23 21:22:04 -07:00
Hartmut Henkel
ae1dcc52c1 l10n: de.po: fix typos
Signed-off-by: Hartmut Henkel <hartmut_henkel@gmx.de>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-28 19:08:50 +01:00
Jiang Xin
7ba2ba7d12 l10n: remove a superfluous translation for push.c
Ralf reported that '--recurse-submodules' option in push.c should not be
translated [1].  Before his commit is merged, remove superfluous
translations for push.c.

[1] http://www.spinics.net/lists/git/msg241964.html

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-11-20 16:23:43 +08:00
Ralf Thielow
e6c1c391a8 l10n: de.po: translate 2 messages
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-20 07:16:18 +01:00
Ralf Thielow
388a439ca9 l10n: de.po: translate 2 new messages
Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-20 07:16:18 +01:00
Jiang Xin
9aeb4c2b57 l10n: batch updates for one trivial change
In order to catch up with the release of Git 2.2.0 final, make a batch
l10n update for the new l10n change brought by commit d52adf1 (trailer:
display a trailer without its trailing newline).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-11-20 10:53:48 +08:00
Jiang Xin
e3f9cab742 l10n: git.pot: v2.2.0 round 2 (1 updated)
Generate po/git.pot from v2.2.0-rc2-23-gca0107e for git v2.2.0 l10n
round 2.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-11-20 10:03:10 +08:00
Alex Henrie
b3e4c47565 l10n: Update Catalan translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2014-11-17 20:22:48 -07:00
Ralf Thielow
d544b2d495 l10n: de.po: translate 62 new messages
Translate 62 new messages came from git.pot update in 16742b0
(l10n: git.pot: proposed updates for v2.2.0 (+62)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-15 18:22:05 +01:00
Stefan Beller
744437f8e6 l10n: de.po: Fixup one translation
English grammar with German words doesn't make it a German translation. ;)

Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-15 18:21:58 +01:00
Ralf Thielow
c616d845b5 l10n: de.po: use imperative form for command options
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-11-14 19:21:52 +01:00
Alexander Shopov
6c31a5e94a l10n: Updated Bulgarian translation of git (2296t,0f,0u)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2014-11-02 19:11:08 +02:00
Jiang Xin
220c313cc3 l10n: zh_CN: translations for git v2.2.0-rc0
Translate 62 new messages (2296t0f0u) for git v2.2.0-rc0.  Also changed
the translation of bare (repository).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-11-02 10:59:00 +08:00
Jiang Xin
94dd79e9fe Merge branch 'fr_2.2.0' of git://github.com/jnavila/git
* 'fr_2.2.0' of git://github.com/jnavila/git:
  l10n: fr.po (2296t) update for version 2.2.0
2014-11-02 10:12:29 +08:00
Jiang Xin
ac4a73dd25 Merge branch 'master' of git://github.com/nafmo/git-l10n-sv
* 'master' of git://github.com/nafmo/git-l10n-sv:
  l10n: sv.po: Update Swedish translation (2296t0f0u)
2014-11-02 10:11:27 +08:00
Peter Krefting
5331bfd785 l10n: sv.po: Update Swedish translation (2296t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2014-11-01 20:17:37 +01:00
Jean-Noel Avila
f507e5dd62 l10n: fr.po (2296t) update for version 2.2.0
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Grégoire Paris <gparis@universcine.com>
2014-11-01 16:51:49 +01:00
Tran Ngoc Quan
4dcd03eaee l10n: vi.po: Update new message strings
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2014-11-01 09:07:24 +07:00
Jiang Xin
d07a63e47c l10n: git.pot: v2.2.0 round 1 (62 new, 23 removed)
Generate po/git.pot from v2.2.0-rc0 for git v2.2.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-11-01 07:47:46 +08:00
Phillip Sz
061540fcf7 l10n: de.po: use comma before "um"
This patch adds a comma before the "um". See:
http://www.duden.de/sprachwissen/rechtschreibregeln/komma#K117

Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-09-25 20:26:27 +02:00
Phillip Sz
f51ccda810 l10n: de.po: change Email to E-Mail
Change all Email to E-Mail, as this is the correct form in German.

Signed-off-by: Phillip Sz <phillip.szelat@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-09-25 20:25:55 +02:00
Ralf Thielow
89a0ead829 po/TEAMS: add new member to German translation team
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-09-25 20:25:30 +02:00
Ralf Thielow
782ac539ea po/TEAMS: add new members to German translation team
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-08-29 07:08:17 +02:00
Ralf Thielow
d35ea4dec6 l10n: de.po: translate 38 new messages
Translate 38 new messages came from git.pot update in fe05e19
(l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-08-29 07:07:59 +02:00
Ralf Thielow
869951babc l10n: de.po: improve message when switching branches
Suggested-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-08-23 19:17:38 +02:00
Ralf Thielow
795b9ff872 l10n: de.po: fix typo
Reported-by: Hartmut Henkel
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-08-23 19:17:38 +02:00
Alex Henrie
47abf17be5 po/TEAMS: Add Catalan team
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2014-08-22 20:10:30 -06:00
Alex Henrie
0082d82183 l10n: Add Catalan translation
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2014-08-22 20:10:22 -06:00
Jean-Noel Avila
f7fbc357f8 l10n: fr.po (2257t) update for version 2.1.0
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2014-08-07 09:07:18 +02:00
Jiang Xin
b9e343e640 Merge remote-tracking branch 'l10n/vi/vnwildman/master'
* l10n/vi/vnwildman/master:
  l10n: vi.po (2257t): Update translation
2014-08-05 23:07:22 +08:00
Jiang Xin
4b71297969 Merge branch 'master' of github.com:alshopov/git-po
* 'master' of github.com:alshopov/git-po:
  l10n: Updated Bulgarian translation of git (2257t,0f,0u)
2014-08-05 22:41:00 +08:00
Peter Krefting
dc4a1ba99c l10n: sv.po: Update Swedish translation (2257t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2014-08-05 13:49:51 +01:00
Tran Ngoc Quan
8d388239fd l10n: vi.po (2257t): Update translation
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2014-08-05 07:35:56 +07:00
Alexander Shopov
aafbee8c4b l10n: Updated Bulgarian translation of git (2257t,0f,0u)
Sync with tags v2.1.0-rc1 and v2.0.4

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2014-08-04 21:30:38 +03:00
Jiang Xin
6acbf03300 l10n: zh_CN: translations for git v2.1.0-rc0
Translate 37 new messages (2257t0f0u) for git v2.1.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-08-04 16:42:40 +08:00
Jiang Xin
afc344c4ad Merge commit 'bg/alshopov/master'
* commit 'bg/alshopov/master':
  l10n: Updated Bulgarian translation of git (2247t,0f,0u)
  l10n: Updated Bulgarian translation of git (2228t,0f,0u)
2014-08-04 16:38:00 +08:00
Jiang Xin
6d0081ad61 Merge remote-tracking branch 'sv/nafmo/master'
* sv/nafmo/master:
  l10n: Fix more typos in the Swedish translations
2014-08-04 16:33:18 +08:00
Jiang Xin
fe05e196c5 l10n: git.pot: v2.1.0 round 1 (38 new, 9 removed)
Generate po/git.pot from v2.1.0-rc0 for git v2.1.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-08-04 14:51:24 +08:00
Alexander Shopov
c099f8c7ed l10n: Updated Bulgarian translation of git (2247t,0f,0u)
Used make po/git.pot from git-l10n/git-po/master

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2014-08-03 13:14:03 +03:00
Alexander Shopov
642c7fab1d l10n: Updated Bulgarian translation of git (2228t,0f,0u)
Used po/git.pot from git-l10n/git-po/master

Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2014-08-03 13:11:46 +03:00
Peter Krefting
7cefd3431a l10n: Fix more typos in the Swedish translations
Thanks-to: Anders Jonsson <anders.jonsson@norsjovallen.se>
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2014-06-24 19:52:47 +01:00
Grégoire Paris
a6e888397c fr: a lot of good fixups
Signed-off-by: Grégoire Paris <postmaster@greg0ire.fr>
Acked-by: Jean-Noel Avila <jn.avila@free.fr>
2014-05-17 19:08:59 +02:00
Alexander Shopov
1c3c8410ef l10n: Updated Bulgarian translation of git (1307t0f921u)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2014-05-11 17:09:01 +03:00
Peter Krefting
80dad719fb l10n: Fix a couple of typos in the Swedish translation
Thanks-to: Anders Jonsson <anders.jonsson@norsjovallen.se>
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2014-05-07 07:06:37 +01:00
Ralf Thielow
94f94fcbf2 l10n: de.po: improve hint for autocorrected command execution
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-04-29 06:12:31 +02:00
Ralf Thielow
74c17bb84b l10n: de.po: translate 45 new messages
Translate 45 new messages came from git.pot update in 5e078fc
(l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <tr@thomasrast.ch>
2014-04-29 06:12:25 +02:00
Ralf Thielow
3957310734 l10n: de.po: correct translation of "completed" after resolving deltas
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2014-04-29 06:11:09 +02:00
Jiang Xin
6c94aba5fa l10n: zh_CN.po: translate 46 new messages (2229t0f0u)
Translations for git v2.0.0-rc0.  Also correct translatioins on relative
date in date.c with help from Brian Gesiak ($gmane/246390).

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-04-23 13:00:08 +08:00
Jiang Xin
937ca16645 Merge branch 'fr-po' of git://github.com/jnavila/git
* 'fr-po' of git://github.com/jnavila/git:
  l10n: fr translation for v2.0.0rc0 (2228t)
2014-04-23 12:33:47 +08:00
Jean-Noel Avila
2233806207 l10n: fr translation for v2.0.0rc0 (2228t)
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
Signed-off-by: Matthieu Baerts <matttbe@gmail.com>
Signed-off-by: Xavier Mehrenberger <xavier.mehrenberger@gmail.com>
2014-04-22 21:41:16 +02:00
Peter Krefting
d372b5cf6e l10n: Update Swedish translation (2228t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2014-04-22 10:26:02 +01:00
Tran Ngoc Quan
15fbbed790 l10n: vi.po (2228t): Update and minor fix
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2014-04-20 15:22:26 +07:00
Jiang Xin
5e078fcd83 l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)
Generate po/git.pot from v2.0.0-rc0 for git v2.0.0 l10n round 1.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2014-04-19 12:55:29 +08:00
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
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
Wang Sheng
07432cef2c l10n: zh_CN.po: 800+ new translations on command usages
Most of the 800+ new translations are contributed by Wang Sheng.
So he is a zh_CN l10n maintainer for Git now.

Also fixed translations for some terms, such as blob, dangling.

Signed-off-by: Wang Sheng <wangsheng2008love@163.com>
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-02-09 00:57:24 +08:00
Peter Krefting
eec16a65ee l10n: Update Swedish translation (1983t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2013-01-27 22:38:51 +01:00
Tran Ngoc Quan
7746f2e319 l10n: vi.po: updated Vietnamese translation
* Updated new strings (1983t0f0u)
* Fix minor errors
* Updated copyright year

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2013-01-25 14:01:23 +07:00
Jiang Xin
bbb80494e0 Merge branch 'master' of git://github.com/ralfth/git-po-de
* 'master' of git://github.com/ralfth/git-po-de:
  l10n: de.po: fix some minor issues
2013-01-25 12:46:07 +08:00
Jiang Xin
46bc4039a9 l10n: Update git.pot (11 new, 7 removed messages)
Generate po/git.pot from v1.8.1-476-gec3ae6e, and there are 11 new and 7
removed messages.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2013-01-25 12:43:19 +08:00
Ralf Thielow
07fd82d3a7 l10n: de.po: fix some minor issues
This fixes some minor issues and improves the
German translation a bit. The following things
were changed:
- use complete sentences in option related messages
- translate "use" consistently as "verwendet"
- don't translate "make sense" as "macht Sinn"

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
2013-01-23 20:46:24 +01:00
Ralf Thielow
12a097fc42 l10n: de.po: address the user formally
In the current German translation, the user was
addressed informally ("Du", "Dein") which is unusual
in German software. This commit changes the addressing
to be formal ("Sie", "Ihr").

Suggested-by: Christian Stimming <stimming@tuhh.de>
Suggested-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2013-01-07 18:33:35 +01:00
Jiang Xin
167e2f9115 Merge branch git://github.com/ralfth/git-po-de
* 'rt/de-l10n-updates-for-1.8.1' of git://github.com/ralfth/git-po-de:
  l10n: de.po: translate 22 new messages
  l10n: de.po: translate 825 new messages

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-12-07 17:30:02 +08:00
Ralf Thielow
df264e4e52 l10n: de.po: translate 22 new messages
Translate 22 new messages came from git.pot
updates in 9306b5b (l10n: Update git.pot (3 new,
6 removed messages)), fe52cd6 (l10n: Update git.pot
(14 new, 3 removed messages)) and f9472e3
(l10n: Update git.pot (5 new, 1 removed messages)).

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Michael J Gruber <git@drmicha.warpmail.net>
2012-12-06 07:32:39 +01:00
Ralf Thielow
6d0e699ddb l10n: de.po: translate 825 new messages
Translate 825 new messages came from git.pot update in
cc76011 ("l10n: Update git.pot (825 new, 24 removed messages)").

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Thomas Rast <trast@student.ethz.ch>
Helped-by: Michael J Gruber <git@drmicha.warpmail.net>
2012-12-06 07:31:52 +01:00
Peter Krefting
bf3e8fe0c7 l10n: Update Swedish translation (1979t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2012-11-30 10:51:14 +01:00
Tran Ngoc Quan
77cc392d6d l10n: vi.po: update to git-v1.8.0.1-347-gf94c3
* updated all new messages (1979t0f0u)

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2012-11-30 13:43:11 +07:00
Jiang Xin
f9472e359e l10n: Update git.pot (5 new, 1 removed messages)
L10n for git 1.8.1 round 2: Generate po/git.pot from v1.8.0.1-347-gf94c3.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-11-30 12:41:47 +08:00
Jiang Xin
f93483ac94 Merge git://github.com/vnwildman/git
* git://github.com/vnwildman/git:
  l10n: vi.po: Update follow git-v1.8.0-273-g2d242
2012-11-29 16:25:40 +08:00
Tran Ngoc Quan
dcc52a0449 l10n: vi.po: Update follow git-v1.8.0-273-g2d242
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2012-11-24 07:37:35 +07:00
Peter Krefting
647d5183b8 l10n: Update Swedish translation (1975t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2012-11-23 08:59:11 +01:00
Tran Ngoc Quan
131fa518f1 l10n: vi.po: update to git-v1.7.12-437-g1084f
* updated all new messages (1967t0f0u)
 * make quote become more good-looking

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2012-11-23 14:31:12 +08:00
Jiang Xin
fe52cd621f l10n: Update git.pot (14 new, 3 removed messages)
Generate po/git.pot from v1.8.0-273-g2d242, and there are 14 new and 3
removed messages.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-11-23 14:29:02 +08:00
Jiang Xin
b408887045 Merge branch 'master' of https://github.com/nafmo/git-l10n-sv
* 'master' of https://github.com/nafmo/git-l10n-sv:
  l10n: Update Swedish translation (1964t0f0u)
2012-10-17 09:38:30 +08:00
Tran Ngoc Quan
34a166439a l10n: vi.po: update from v1.8.0-rc2-4-g42e55
* translate 3 new messages
* review quotes

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2012-10-17 08:15:28 +07:00
Peter Krefting
8f69cccbe4 l10n: Update Swedish translation (1964t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2012-10-16 08:38:11 +01:00
Jiang Xin
9306b5b9a3 l10n: Update git.pot (3 new, 6 removed messages)
This po/git.pot update is generated from v1.8.0-rc2-4-g42e55.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-10-16 08:39:10 +08:00
Jiang Xin
6de030dd46 Merge branch 'master' of git://github.com/vnwildman/git
* 'master' of git://github.com/vnwildman/git:
  l10n: vi.po: update translation upto cc76011
2012-10-16 08:31:22 +08:00
Tran Ngoc Quan
03c82da32e l10n: vi.po: update translation upto cc76011
* translate all new messages (100%)
* review some others

Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2012-10-15 14:35:49 +07:00