summaryrefslogtreecommitdiff
path: root/po
AgeCommit message (Collapse)Author
2016-04-25Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maintJunio C Hamano
l10n-2.8.0-rnd3-fr * tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po: l10n: fr: don't translate "merge" as a parameter l10n: fr: change "id de clé" to match "id-clé" l10n: fr: fix wrongly translated option name l10n: fr: fix transcation of "dir"
2016-04-24Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maintJiang Xin
* 'fr_v2.8.0_r3' of git://github.com/jnavila/git: l10n: fr: don't translate "merge" as a parameter l10n: fr: change "id de clé" to match "id-clé" l10n: fr: fix wrongly translated option name l10n: fr: fix transcation of "dir"
2016-03-25l10n: fr: don't translate "merge" as a parameterVasco Almeida
At builtin/checkout.c:1154, merge is a parameter to --conflict=<style> (git checkout --conflict=merge). Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-03-25l10n: fr: change "id de clé" to match "id-clé"Vasco Almeida
At builtin/tag.c:23 French message translation, "<key-id>" was translated to "<id-clé>", but at builtin/tag.c:355 "key-id" was translated to "id de clé", hence an inconsistency in git tag -h output. Translate "key-id" to "id-clé". Alternatively, both places could use "id de clé" instead of "id-clé". Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-03-25l10n: fr: fix wrongly translated option nameVasco Almeida
In the original source, tags and heads refer to that options (--head and --tags) for git show-ref. Don't translate that terms, since they refer to actual option names. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-03-25l10n: fr: fix transcation of "dir"Vasco Almeida
"dir" was translated to the same string at builtin/log.c:1236, but, also at that code line, "<dir>" was translate to "<répertoire>". Before this commit, git format-patch -h would output "-o, --output-directory <dir>" and <répertoire> in its description. Use <répertoire> in both the parameter and description. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-03-23Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin
* 'master' of https://github.com/vnwildman/git: l10n: vi.po (2530t): Update translation
2016-03-23Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin
* 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation
2016-03-22l10n: pt_PT: Update and add new translationsVasco Almeida
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
2016-03-22l10n: ca.po: update translationAlex Henrie
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
2016-03-21l10n: vi.po (2530t): Update translationTran Ngoc Quan
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2016-03-20l10n: zh_CN: review for git v2.8.0 l10n round 2Ray Chen
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2016-03-17l10n: de.po: add missing newlinesRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2016-03-17l10n: de.po: translate 22 new messagesRalf Thielow
Translate 22 new messages came from git.pot update in f1522b2 (l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)) and a5a4168 (l10n: git.pot: Add one new message for Git 2.8.0). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2016-03-16Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/gitJiang Xin
* 'fr_v2.8.0_r3' of git://github.com/jnavila/git: l10n: fr.po v2.8.0 round 3
2016-03-16Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin
* 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation
2016-03-16Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin
* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2530t0f0u)
2016-03-16l10n: ko.po: Update Korean translationChangwoo Ryu
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2016-03-15l10n: fr.po v2.8.0 round 3Jean-Noel Avila
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2016-03-15l10n: sv.po: Update Swedish translation (2530t0f0u)Peter Krefting
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2016-03-15l10n: ru.po: update Russian translationDimitriy Ryazantcev
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2016-03-15l10n: zh_CN: for git v2.8.0 l10n round 3Jiang Xin
Update 1 new translations (2530t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-03-15l10n: git.pot: Add one new message for Git 2.8.0Jiang Xin
Add one new message came from this commit: * df22724 wt-status: allow "ahead " to be picked up by l10n Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-03-15l10n: zh_CN: for git v2.8.0 l10n round 2Jiang Xin
Update 21 new translations (2529t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-03-14l10n: fr.po v2.8.0 round 2Jean-Noel Avila
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2016-03-13Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin
* 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation
2016-03-13l10n: ru.po: update Russian translationDimitriy Ryazantcev
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2016-03-12l10n: ko: Update Korean translationChangwoo Ryu
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2016-03-12l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)Jiang Xin
Generate po/git.pot from v2.8.0-rc2 for git v2.8.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-03-12l10n: zh_CN: for git v2.8.0 l10n round 1Jiang Xin
Update 48 new translations (2509t0f0u) for git v2.8.0-rc0. Reviewed-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> l10n: zh_CN: review for git v2.8.0 l10n round 1
2016-03-05l10n: de.po: translate 48 new messagesRalf Thielow
Translate 48 new messages came from git.pot update in 9eb3984 (l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2016-03-05l10n: de.po: translate "command" as "Befehl"Ralf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
2016-03-05l10n: de.po: fix interactive rebase messageRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2016-03-05l10n: de.po: add space to abbreviation "z. B."Ralf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
2016-03-05l10n: de.po: fix typoChristoph Hoopmann
Signed-off-by: Christoph Hoopmann <christophhoopmann@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2016-03-05l10n: TEAMS: update Ralf Thielow's email addressRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-03-05Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin
* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter"
2016-03-05Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin
* 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation
2016-03-04l10n: sv.po: Update Swedish translation (2509t0f0u)Peter Krefting
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2016-03-04l10n: sv.po: Fix inconsistent translation of "progress meter"Peter Krefting
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2016-03-03l10n: ko.po: Update Korean translationChangwoo Ryu
Signed-off-by: Changwoo Ryu <cwryu@debian.org>
2016-03-02l10n: ru.po: update Russian translationDimitriy Ryazantcev
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
2016-02-29Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin
* 'master' of https://github.com/vnwildman/git: l10n: vi.po (2509t): Updated Vietnamese translation
2016-02-29l10n: vi.po (2509t): Updated Vietnamese translationTran Ngoc Quan
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2016-02-28l10n: fr.po v2.8.0 round 1 2509tJean-Noel Avila
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2016-02-28l10n: fr.po: Correct case in sentenceAudric Schiltknecht
Signed-off-by: Audric Schiltknecht <storm@chemicalstorm.org>
2016-02-28l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)Jiang Xin
Generate po/git.pot from v2.8.0-rc0 for git v2.8.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2016-01-03l10n: ko.po: Add Korean translationChangwoo Ryu
Signed-off-by: Changwoo Ryu <cwryu@debian.org> Signed-off-by: Hyunjun Kim <yoloseem@users.noreply.github.com>
2015-12-29l10n: de.po: translate 68 new messagesRalf Thielow
Translate 68 new messages came from git.pot update in f4f2c8f (l10n: git.pot: v2.7.0 round 1 (66 new, 29 removed)) and 2c0ca05 (l10n: git.pot: v2.7.0 round 2 (2 new, 2 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com>
2015-12-29l10n: de.po: improve some translationsRalf Thielow
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>