aboutsummaryrefslogtreecommitdiff
path: root/po
Commit message (Collapse)AuthorAge
...
* | l10n: pt_PT: merge git.pot fileVasco Almeida2016-05-31
| | | | | | | | Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
* | l10n: Updated Bulgarian translation of git (2597t,0f,0u)Alexander Shopov2016-05-29
| | | | | | | | Signed-off-by: Alexander Shopov <ash@kambanaria.org>
* | Merge branch 'v2.9.0_rnd1_fr' of git://github.com/jnavila/gitJiang Xin2016-05-29
|\ \ | | | | | | | | | | | | * 'v2.9.0_rnd1_fr' of git://github.com/jnavila/git: l10n: fr.po v2.9.0rnd1
| * | l10n: fr.po v2.9.0rnd1Jean-Noel Avila2016-05-26
| | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
* | | l10n: sv.po: Update Swedish translation (2597t0f0u)Peter Krefting2016-05-27
|/ / | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
* | Merge branch 'fix_fr' of git://github.com/jnavila/gitJiang Xin2016-05-26
|\ \ | | | | | | | | | | | | * 'fix_fr' of git://github.com/jnavila/git: l10n: fr.po Fixed grammar mistake
| * | l10n: fr.po Fixed grammar mistakeAntonin2016-04-28
| | | | | | | | | | | | | | | | | | "tous le dépôts distants" -> "tous les dépôts distants" Signed-off-by: Antonin <antonin@delpeuch.eu>
* | | l10n: Updated Vietnamese translation (2597t)Tran Ngoc Quan2016-05-25
| | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
* | | l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed)Jiang Xin2016-05-24
| |/ |/| | | | | | | | | Generate po/git.pot from v2.9.0-rc0 for git v2.9.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* | Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maintJunio C Hamano2016-04-25
|\ \ | |/ |/| | | | | | | | | | | | | | | 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"
| * Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maintJiang Xin2016-04-24
| |\ | | | | | | | | | | | | | | | | | | | | | * '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"
| | * l10n: fr: don't translate "merge" as a parameterVasco Almeida2016-03-25
| | | | | | | | | | | | | | | | | | | | | At builtin/checkout.c:1154, merge is a parameter to --conflict=<style> (git checkout --conflict=merge). Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
| | * l10n: fr: change "id de clé" to match "id-clé"Vasco Almeida2016-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * l10n: fr: fix wrongly translated option nameVasco Almeida2016-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * l10n: fr: fix transcation of "dir"Vasco Almeida2016-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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>
* | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2016-03-23
|\ \ \ | | | | | | | | | | | | | | | | * 'master' of https://github.com/vnwildman/git: l10n: vi.po (2530t): Update translation
| * | | l10n: vi.po (2530t): Update translationTran Ngoc Quan2016-03-21
| |/ / | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
* | | Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin2016-03-23
|\ \ \ | | | | | | | | | | | | | | | | * 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation
| * | | l10n: ca.po: update translationAlex Henrie2016-03-21
| |/ / | | | | | | | | | Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
* | | l10n: pt_PT: Update and add new translationsVasco Almeida2016-03-22
|/ / | | | | | | Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
* | l10n: zh_CN: review for git v2.8.0 l10n round 2Ray Chen2016-03-20
| | | | | | | | Signed-off-by: Ray Chen <oldsharp@gmail.com>
* | l10n: de.po: add missing newlinesRalf Thielow2016-03-17
| | | | | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
* | l10n: de.po: translate 22 new messagesRalf Thielow2016-03-17
| | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/gitJiang Xin2016-03-17
|\ \ | |/ | | | | | | * 'fr_v2.8.0_r3' of git://github.com/jnavila/git: l10n: fr.po v2.8.0 round 3
| * l10n: fr.po v2.8.0 round 3Jean-Noel Avila2016-03-15
| | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
* | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2016-03-17
|\ \ | | | | | | | | | | | | * 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation
| * | l10n: ko.po: Update Korean translationChangwoo Ryu2016-03-16
| |/ | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
* | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2016-03-17
|\ \ | | | | | | | | | | | | * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2530t0f0u)
| * | l10n: sv.po: Update Swedish translation (2530t0f0u)Peter Krefting2016-03-15
| |/ | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
* | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-03-15
|/ | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
* l10n: zh_CN: for git v2.8.0 l10n round 3Jiang Xin2016-03-16
| | | | | | Update 1 new translations (2530t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* l10n: git.pot: Add one new message for Git 2.8.0Jiang Xin2016-03-16
| | | | | | | | 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>
* l10n: zh_CN: for git v2.8.0 l10n round 2Jiang Xin2016-03-16
| | | | | | Update 21 new translations (2529t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* l10n: fr.po v2.8.0 round 2Jean-Noel Avila2016-03-14
| | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
* Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-03-13
|\ | | | | | | | | * 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation
| * l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-03-13
| | | | | | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
* | l10n: ko: Update Korean translationChangwoo Ryu2016-03-13
|/ | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
* l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed)Jiang Xin2016-03-12
| | | | | | 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>
* l10n: zh_CN: for git v2.8.0 l10n round 1Jiang Xin2016-03-12
| | | | | | | | | 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
* l10n: de.po: translate 48 new messagesRalf Thielow2016-03-05
| | | | | | | | 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>
* l10n: de.po: translate "command" as "Befehl"Ralf Thielow2016-03-05
| | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
* l10n: de.po: fix interactive rebase messageRalf Thielow2016-03-05
| | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
* l10n: de.po: add space to abbreviation "z. B."Ralf Thielow2016-03-05
| | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com>
* l10n: de.po: fix typoChristoph Hoopmann2016-03-05
| | | | | Signed-off-by: Christoph Hoopmann <christophhoopmann@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
* l10n: TEAMS: update Ralf Thielow's email addressRalf Thielow2016-03-05
| | | | | Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2016-03-05
|\ | | | | | | | | | | * '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"
| * l10n: sv.po: Update Swedish translation (2509t0f0u)Peter Krefting2016-03-04
| | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| * l10n: sv.po: Fix inconsistent translation of "progress meter"Peter Krefting2016-03-04
| | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
* | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2016-03-05
|\ \ | | | | | | | | | | | | * 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation
| * | l10n: ko.po: Update Korean translationChangwoo Ryu2016-03-03
| |/ | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>