[PATCH 0/2] Translations for ambiguous refname warning

2014-09-05 Thread Sandy Carter
Here is a pair of commit which allow messages from git to be translated when running an ambiguous checkout such as when a branch name and a tag name are the same. Sandy Carter (2): i18n: ambiguous refname message is not translated i18n translate builtin warning, error, usage, fatal messages

[PATCH 2/2] i18n translate builtin warning, error, usage, fatal messages

2014-09-05 Thread Sandy Carter
Allow warnings, errors, usage and fatal messages to be translated to user when checking out a ambiguous refname for example Signed-off-by: Sandy Carter sandy.car...@savoirfairelinux.com --- usage.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usage.c b/usage.c

[PATCH 1/2] i18n: ambiguous refname message is not translated

2014-09-05 Thread Sandy Carter
Allow warning message about ambuiguous refname to be exported to .pot files when checking out a refname which is the name of a tag and of a branch for example. Signed-off-by: Sandy Carter sandy.car...@savoirfairelinux.com --- sha1_name.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions

Re: [PATCH] wt-status: i18n of section labels

2014-03-12 Thread Sandy Carter
Le 2014-03-12 16:12, Junio C Hamano a écrit : Sandy Carter sandy.car...@savoirfairelinux.com writes: Le 2014-03-12 15:22, Junio C Hamano a écrit : static const char *wt_status_diff_status_string(int status) { switch (status) { case DIFF_STATUS_ADDED

[PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Sandy Carter
as the following, which is more proper: supprimé par nous : wt-status.c modifié des deux côtés : wt-status.h Signed-off-by: Sandy Carter sandy.car...@savoirfairelinux.com --- wt-status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wt-status.c b/wt-status.c index a452407

Re: [PATCH] status merge: guarentee space between msg and path

2014-03-11 Thread Sandy Carter
Le 2014-03-11 15:59, Junio C Hamano a écrit : Sandy Carter sandy.car...@savoirfairelinux.com writes: diff --git a/wt-status.c b/wt-status.c index a452407..69e0dfc 100644 --- a/wt-status.c +++ b/wt-status.c @@ -264,7 +264,7 @@ static void wt_status_print_unmerged_data(struct wt_status *s

[PATCH v2] status merge: guarentee space between msg and path

2014-03-11 Thread Sandy Carter
advantage of aligning unmerged paths with paths of regular statuses. Signed-off-by: Sandy Carter sandy.car...@savoirfairelinux.com --- t/t7060-wtstatus.sh | 16 +++ t/t7506-status-submodule.sh | 18 t/t7508-status.sh | 94 +++ t

Re: [PATCH v2 2/2] i18n: assure command not corrupted by _() process

2014-03-10 Thread Sandy Carter
Is there any update on this patch? Le 2014-03-03 09:55, Sandy Carter a écrit : Separate message from command examples to avoid translation issues such as a dash being omitted in a translation. Signed-off-by: Sandy Carter sandy.car...@savoirfairelinux.com --- builtin/branch.c | 10

[PATCH v2 2/2] i18n: assure command not corrupted by _() process

2014-03-03 Thread Sandy Carter
Separate message from command examples to avoid translation issues such as a dash being omitted in a translation. Signed-off-by: Sandy Carter sandy.car...@savoirfairelinux.com --- builtin/branch.c | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builtin/branch.c b

[PATCH v2 1/2] i18n: proposed command missing leading dash

2014-03-03 Thread Sandy Carter
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.car...@savoirfairelinux.com --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions

[PATCH] i18n: proposed command missing leading dash

2014-02-28 Thread Sandy Carter
Add missing leading dash to proposed commands in french output when using the command: git branch --set-upstream remotename/branchname Signed-off-by: Sandy Carter sandy.car...@savoirfairelinux.com --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po

Re: [PATCH] i18n: proposed command missing leading dash

2014-02-28 Thread Sandy Carter
Should I also update the relevant git.pot and *.po sections? - Original Message - From: Junio C Hamano gits...@pobox.com To: Jonathan Nieder jrnie...@gmail.com Cc: Sandy Carter sandy.car...@savoirfairelinux.com, git@vger.kernel.org, jn avila jn.av...@free.fr, Carlos Martín Nieto c