[PATCH] i18n: fix dangling dot in die() messages

Signed-off-by: Jean-Noël Avila --- It is not clear what the style guide for messages is. builtin/submodule--helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index b56028ba9d..a011abfd7c 100644 ---

[PATCH] submodule--helper.c: i18n: add a missing space in message

The message spans over 2 lines but the C conconcatenation does not add the needed space between the two lines. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- builtin/submodule--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/submodule--help

[PATCH] submodule--helper.c: i18n: add a missing space in message

The message spans over 2 lines but the C conconcatenation does not add the needed space between the two lines. --- builtin/submodule--helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 2086f0eb0..a5c4a8a69

[PATCH] i18n: add a missing space in message

The message spans over 2 lines but the C conconcatenation does not add the needed space between the two lines. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) This is a single change discovered while doing the locali

[PATCH v4 3/3] git-filter-branch: be more direct in an error message

, just state that the branch specification is missing. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- git-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 2b8cdba15..aafaf708d 100755 --- a/git-filter-bra

[PATCH v4 2/3] read-tree -m: make error message for merging 0 trees less smart aleck

more than 3 trees can be merged. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- Documentation/git-read-tree.txt | 7 +++ builtin/read-tree.c | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/git-read-tree.txt b/Documentation/g

[PATCH v4 1/3] usability: don't ask questions if no reply is required

he source. Requested at https://github.com/git/git-scm.com/issues/999 by rpai1 Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- builtin/am.c | 5 +++-- builtin/checkout.c | 5 ++--- help.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin

[PATCH v3 1/3] usability: don't ask questions if no reply is required

he source. Requested at https://github.com/git/git-scm.com/issues/999 by rpai1 Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- builtin/am.c | 5 +++-- builtin/checkout.c | 5 ++--- help.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin

[PATCH v3 2/3] read-tree -m: make error message for merging 0 trees less smart aleck

o document this requirement in the git-read-tree(1) manpage where there is room to explain it in a more straightforward way. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> Signed-off-by: Jonathan Nieder <jrnie...@gmail.com> --- Documentation/git-read-tree.txt | 8 builtin/read-tree.c

[PATCH v3 3/3] git-filter-branch:

, just state that the branch specification is missing. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- git-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 2b8cdba15..aafaf708d 100755 --- a/git-filter-bra

[PATCH v2 2/3] read-tree -m: make error message for merging 0 trees less smart aleck

o document this requirement in the git-read-tree(1) manpage where there is room to explain it in a more straightforward way. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> Signed-off-by: Jonathan Nieder <jrnie...@gmail.com> --- Documentation/git-read-tree.txt | 8 builtin/read-tree.c

[PATCH v2 3/3] git-filter-branch: make the error msg when missing branch more open

solution is to just print the usage in this case. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- git-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 2b8cdba15..bda2bae23 100755 --- a/git-filter-branch.sh

[PATCH v2 1/3] usability: don't ask questions if no reply is required

he source. Requested at https://github.com/git/git-scm.com/issues/999 by rpai1 Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- builtin/am.c | 4 ++-- builtin/checkout.c | 2 +- help.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/am.c b/bui

[PATCH 4/4] git-filter-branch: be assertative on dying message

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- git-filter-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-filter-branch.sh b/git-filter-branch.sh index 2b8cdba15..dd3a605d0 100755 --- a/git-filter-branch.sh +++ b/git-filter-branch.sh @@ -239,7

[PATCH 3/4] read-tree.c: rework UI when merging no trees

The initial test was inherited from a previous commit, but it is no longer needed, given the following switch case. Moreover, the question sentence ending the program has been replace by an assertative one. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- builtin/read-tree.c | 5 ++

[PATCH 2/4] usability: fix am and checkout for nevermind questions

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- builtin/am.c | 4 ++-- builtin/checkout.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index a95dd8b4e..f5afa438d 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1312,7 +

[PATCH 1/4] usability: don't ask questions if no reply is required

in a non-interactive session * is printed last before exit * is a question addressing the user ("you") the sentence is turned into affirmative and proposes the option. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- help.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletion

[PATCH v2 2/2] i18n: read-cache: Fix typo

From: Peter Krefting <pe...@softwolves.pp.se> Signed-off-by: Peter Krefting <pe...@softwolves.pp.se> Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index b3

[PATCH v2] i18n patches to apply for rc2

Please apply the following patches for rc2 so that the localization can be applied on a cleaned up pot file.

[PATCH v2 1/2] i18n: remove i18n from tag reflog message

The building of the reflog message is using strbuf, which is not friendly with internationalization frameworks. No other reflog messages are translated right now and switching all the messages to i18n would require a major rework of the way the messages are built. Signed-off-by: Jean-Noel Avila

[PATCH] i18n: remove i18n from tag reflog message

The building of the reflog message is using strbuf, which is not friendly with internationalization frameworks. No other reflog messages are translated right now and switching all the messages to i18n would require a major rework of the way the messages are built. Signed-off-by: Jean-Noel Avila

Rework manpage localisation

The patch series has been reworked to remove the manpage localization task from the main documentation task. The Travis build should be back to normal, while still retaining the capability to generate localized man pages. Right now, there are some limitations with the version of po4a provided by

[PATCH v3 1/2] l10n: Introduce framework for localizing man pages

be accessed by man. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- Documentation/Makefile | 21 - Documentation/po4a.conf | 5 + 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 Documentation/po4a.conf diff --git a/Documentation/Make

[PATCH v3 2/2] l10n: Add git-add.txt to localized man pages

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- Documentation/po/documentation.fr.po | 1095 ++ Documentation/po/documentation.pot | 787 2 files changed, 1882 insertions(+) create mode 100644 Documentation/po/documentation

[PATCH v2 2/2] l10n: Add git-add.txt to localized man pages

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- Documentation/po/documentation.fr.po | 1095 ++ Documentation/po/documentation.pot | 787 2 files changed, 1882 insertions(+) create mode 100644 Documentation/po/documentation

[PATCH v2 1/2] l10n: Introduce framework for localizing man pages

Providing git in localized version is a good step for general adoption of the tool. But as of now, if one needs to refer to the manual pages, they are still confronted to english. The aim is to provide documentation to users in their own language. signed-off-by: Jean-Noel Avila <jn.av...@free

[PATCH] l10n: add framework for localizing the manpages

Providing git in localized version is a good step for general adoption of the tool. But as of now, if one needs to refer to the manual pages, they are still confronted to english. The aim is to provide documentation to users in their own language. Signed-off-by: Jean-Noel Avila <jn.av...@free

[PATCH] l10n: add framework for localizing the manpages

This is first attempt at starting the internationalisation of the git man pages. For now, only man pages are generated, only for git-add and only in french. The chosen tool for this is po4a (PO for anything) which can ingest asciidoc files and spit po files for each structural entity. Then from

[PATCH 1/3] i18n: fix typos for translation

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- bisect.c| 10 +- sequencer.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bisect.c b/bisect.c index 6f512c2..b9a0701 100644 --- a/bisect.c +++ b/bisect.c @@ -760,7 +760,7 @@ stati

[PATCH 2/3] i18n: fix git rebase interactive commit messages

For proper i18n, the logic cannot embed english specific processing. Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- git-rebase--interactive.sh | 16 1 file changed, 16 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index e

[PATCH 3/3] i18n: simplify numeric error reporting

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- config.c | 43 +++ 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/config.c b/config.c index 584cacf..e33c703 100644 --- a/config.c +++ b/config.c @@ -655,43 +655,30 @@ stati

[PATCH 1/2] gitk: fr.po: Update translation (311t)

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- po/fr.po | 761 +++ 1 file changed, 373 insertions(+), 388 deletions(-) diff --git a/po/fr.po b/po/fr.po index 80f72fb..2e55c89 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,14

[PATCH 2/2] gitk: fr.po: Sync translations with git

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- po/fr.po | 96 +++- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2e55c89..c44f994 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,

[PATCH 1/2] gitk: fr.po: Update translation (311t)

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- po/fr.po | 761 +++ 1 file changed, 373 insertions(+), 388 deletions(-) diff --git a/po/fr.po b/po/fr.po index 80f72fb..2e55c89 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3,14

[PATCH 2/2] gitk: fr.po: Sync translations with git

Signed-off-by: Jean-Noel Avila <jn.av...@free.fr> --- po/fr.po | 96 +++- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2e55c89..c44f994 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,

[PATCHv2] Add hint interactive cleaning

For translators, specify that a y/N reply is needed. Signed-off-by: Jean-Noel Avila jn.av...@free.fr --- builtin/clean.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/clean.c b/builtin/clean.c index 7e7fdcf..98c103f 100644 --- a/builtin/clean.c +++ b/builtin

[PATCH] Add hint for translators for y/n reply.

Signed-off-by: Jean-Noel Avila jn.av...@free.fr --- builtin/clean.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/clean.c b/builtin/clean.c index 7e7fdcf..2c98661 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -754,6 +754,9 @@ static int ask_each_cmd(void