summaryrefslogtreecommitdiff
path: root/po
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint' into masterJiang Xin2012-05-162-130/+116
|\ | | | | | | | | | | | | By Ralf Thielow(1) and Jiang Xin(1) * maint: l10n: de.po: translate 3 new messages l10n: zh_CN.po: translate 3 new messages
| * l10n: de.po: translate 3 new messagesRalf Thielow2012-05-151-101/+127
| | | | | | | | | | | | Translate 3 new messages for upcoming git 1.7.10.3. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
| * l10n: zh_CN.po: translate 3 new messagesJiang Xin2012-05-151-99/+121
| | | | | | | | | | | | Translate 3 new messages for upcoming git 1.7.10.3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * l10n: Update git.pot (3 new, 2 removed messages)Jiang Xin2012-05-151-96/+108
| | | | | | | | | | | | | | | | | | | | 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>
| * l10n: zh_CN.po: translate 1 new messageJiang Xin2012-05-121-94/+98
| | | | | | | | | | | | Translate new message '[new ref]' since git 1.7.10.1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* | Merge branch 'master' of git://github.com/marcomsousa/git-l10n-pt_PTJiang Xin2012-05-151-585/+1970
|\ \ | | | | | | | | | | | | | | | By Marco Sousa * marcomsousa/git-l10n-pt_PT/master: l10n: pt_PT.po translate new messages
| * | l10n: pt_PT.po translate new messagesMarco Sousa2012-05-151-585/+1970
| | | | | | | | | | | | | | | | | | | | | 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>
* | | l10n: Update git.pot (8 new, 4 removed messages)Jiang Xin2012-05-151-226/+246
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'maint' into masterRalf Thielow2012-05-092-235/+255
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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
| * l10n: de.po: translate one new messageRalf Thielow2012-05-081-130/+148
| | | | | | | | | | | | | | | | 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>
| * l10n: de.po: unify translation of "ahead" and "behind"Ralf Thielow2012-05-081-8/+9
| | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
| * l10n: de.po: collection of improvementsRalf Thielow2012-05-081-125/+129
| | | | | | | | | | | | | | A list of improvements for German translation which contains a couple of spellings and grammar. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
| * l10n: de.po: translate "remote" as "extern"Ralf Thielow2012-05-081-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * l10n: de.po: translate "track" as "beobachten"Ralf Thielow2012-05-081-12/+12
| | | | | | | | | | | | | | | | | | | | 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>
| * l10n: add new members to German translation teamRalf Thielow2012-05-081-0/+3
| | | | | | | | | | | | | | Add Thomas Rast, Jan Krüger and Christian Stimming to German translation team. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
| * l10n: de.po: collection of suggestionsThomas Rast2012-05-081-55/+44
| | | | | | | | | | | | | | | | 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>
| * l10n: de.po: translate "bad" as "ungültig" ("invalid")Thomas Rast2012-05-081-13/+13
| | | | | | | | | | | | | | | | | | "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>
| * l10n: de.po: hopefully uncontroversial fixesThomas Rast2012-05-081-11/+11
| | | | | | | | | | | | | | | | | | 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>
| * l10n: de.po: translate "bare" as "bloß"Thomas Rast2012-05-081-2/+2
| | | | | | | | | | Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
| * l10n: Update git.pot (1 new messages)Jiang Xin2012-05-081-94/+98
| | | | | | | | | | | | | | | | 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>
* | l10n: Update git.pot (275 new, 15 removed messages)Jiang Xin2012-05-081-293/+1588
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | l10n: Update German translationRalf Thielow2012-05-021-345/+399
| | | | | | | | | | | | Translate new messages for git master branch. Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
* | Merge l10n updates from branch 'maint' into masterJiang Xin2012-05-021-717/+984
|\ \ | |/ | | | | | | | | By Ralf Thielow * maint: l10n: Initial German translation
| * l10n: Initial German translationRalf Thielow2012-05-011-717/+984
| | | | | | | | | | Helped-by: Thomas Kuchs Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com>
* | l10n: Update Simplified Chinese translationJiang Xin2012-04-301-306/+351
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'maint'Jiang Xin2012-04-281-84/+100
|\ \ | |/ | | | | | | | | | | By Jiang Xin * maint: l10n: Update Simplified Chinese translation l10n: Update git.pot (2 new messages)
| * l10n: Update Simplified Chinese translationJiang Xin2012-04-281-84/+100
| | | | | | | | | | | | Translate 2 new messages come from git maint branch. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * l10n: Update git.pot (2 new messages)Jiang Xin2012-04-281-83/+96
| | | | | | | | | | | | | | | | 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>
* | l10n: Update git.pot (33 new, 24 deleted messages)Jiang Xin2012-04-281-334/+386
|/ | | | | | | | | | | | | | | | 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>
* l10n: Add the German translation team and initialize de.poRalf Thielow2012-04-282-0/+3508
| | | | | Signed-off-by: Ralf Thielow <ralf.thielow@googlemail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* l10n: Add Danish team (da) to list of teamsByrial Jensen2012-04-121-0/+4
|
* l10n: New da.po file with 0 translationsByrial Jensen2012-04-121-0/+3503
|
* l10n: Updated pt_PT languageMarco Sousa2012-04-111-115/+127
|
* l10n: Add the Dutch translation team and initialize nl.poVincent van Ravesteijn2012-04-022-0/+3497
| | | | Signed-off-by: Vincent van Ravesteijn <vfr@lyx.org>
* l10n: Inital Portuguese Portugal language (pt_PT)Marco Sousa2012-04-022-0/+3587
| | | | Signed-off-by: Marco Sousa <marcomsousa@gmail.com>
* l10n: Improve zh_CN translation for Git 1.7.10-rc3Jiang Xin2012-03-301-19/+19
| | | | | | | | | Improvements of zh_CN translations: - Update translation for msg "Changes not staged for commit:". - Remove unnecessary leading spaces for some messages. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* correct a few doubled-word nits in comments and documentationJim Meyering2012-03-281-1/+1
| | | | | | | | | | | | | | | | | | | Found by running this command: $ git ls-files -z|xargs -0 perl -0777 -n \ -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\s+\1\b/gims)' \ -e ' {' \ -e ' $n = ($` =~ tr/\n/\n/ + 1);' \ -e ' ($v = $&) =~ s/\n/\\n/g;' \ -e ' print "$ARGV:$n:$v\n";' \ -e ' }' Why not just git grep -E ...? That wouldn't work then the doubled words are separated by a newline. This is derived from a Makefile syntax-check rule in gnulib's maint.mk: http://git.sv.gnu.org/cgit/gnulib.git/tree/top/maint.mk Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Add url of Swedish l10n team in TEAMS fileJiang Xin2012-03-271-0/+1
| | | | Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* l10n: Review zh_CN translation for Git 1.7.10-rc1Jiang Xin2012-03-271-250/+252
| | | | | | | | | | | | Overall review of the zh_CN translation: - Distinguish the translations of index and stage, though they are the same thing. - Many other fixes, e.g., add the lost periods at the end of translated sentences. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* Update Swedish translation (724t0f0u).Peter Krefting2012-03-271-18/+23
| | | | | | - Update for 1.7.10-rc1. - Add a missing -e when generaring the "Untracked files" message. - Fixed some wordings after playing with the localized version.
* l10n: Update zh_CN translation for Git 1.7.10-rc1Jiang Xin2012-03-161-12/+17
| | | | | | Translate 1 new message from Git 1.7.10-rc1: "Gitdir '$a' is ..." Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* l10n: Update git.pot (1 new message)Jiang Xin2012-03-161-12/+17
| | | | | | | | Changes of po/git.pot from v1.7.10-rc0 to v1.7.10-rc1: * 1 new l10n message at line: 3361. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* l10n: Improve zh_CN translation for msg "not something we can merge"Thynson2012-03-091-1/+1
| | | | Signed-off-by: Thynson <lanxingcan@gmail.com>
* l10n: Improve zh_CN trans for msg that cannot fast-forwardThynson2012-03-091-1/+1
| | | | Signed-off-by: Thynson <lanxingcan@gmail.com>
* l10n: Update zh_CN translation for 1.7.10-rc0Jiang Xin2012-03-081-169/+177
| | | | | | Translate 1 new message from Git 1.7.10-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* Update Swedish translation (732t0f0u).Peter Krefting2012-03-082-1396/+1767
| | | | | | | | | This update includes a replay of some review fixes from the initial translation run in 2010, which I cannot find having committed anywhere. Add myself to the po/TEAMS file as well. Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
* po/sv.po: add Swedish translationPeter Krefting2012-03-081-0/+3492
| | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> (cherry picked from commit 54ce07007c7988268d43619c580e81fbca09d37b)
* l10n: Update git.pot (1 new message)Jiang Xin2012-03-081-169/+175
| | | | | | | | | Update file 'po/git.pot' to v1.7.10-rc0: * Add 1 new l10n string in the new generated "git.pot" file at line: 191 Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* Merge v1.7.10-rc0 for git l10n updateJiang Xin2012-03-082-22/+100
|\
| * Merge branch 'master' of https://github.com/git-l10n/git-po into l10nl10nJunio C Hamano2012-03-011-4/+4
| |\ | | | | | | | | | | | | * 'master' of https://github.com/git-l10n/git-po: l10n: leave leading space unchanged for zh_CN.po
View Lorry Controller Status