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
---
sha1_name.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sha1_name.c b
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
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
---
usage.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/usage.c b/usage.c
index ed14645..24a450e 100644
--- a
Le 2014-03-12 16:12, Junio C Hamano a écrit :
Sandy Carter 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:
- return _("new
Le 2014-03-12 15:28, Junio C Hamano a écrit :
Sandy Carter writes:
Add space between how and one when printing status of unmerged data.
This fixes an appending of the how message when it is longer than 20,
such is the case in some translations such as the french one where the
colon gets
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:
- return _("new file");
+ return _("new file:");
case DIFF_STATUS_COPIED:
-
advantage of aligning unmerged paths with paths
of regular statuses.
Signed-off-by: Sandy Carter
---
t/t7060-wtstatus.sh | 16 +++
t/t7506-status-submodule.sh | 18
t/t7508-status.sh | 94 +++
t/t7512-status-help.sh | 30
Le 2014-03-11 15:59, Junio C Hamano a écrit :
Sandy Carter 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,
case 6: how = _("both
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
---
wt-status.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wt-status.c b/wt-status.c
index a452407..69e0dfc 100644
--- a/wt-status.c
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
---
builtin/branch.c | 10 ++
1 file changed, 6 insertions
Separate message from command examples to avoid translation issues
such as a dash being omitted in a translation.
Signed-off-by: Sandy Carter
---
builtin/branch.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/builtin/branch.c b/builtin/branch.c
index b4d7716
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
---
po/fr.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/fr.po b/po
Should I also update the relevant git.pot and *.po sections?
- Original Message -
From: "Junio C Hamano"
To: "Jonathan Nieder"
Cc: "Sandy Carter" , git@vger.kernel.org,
"jn avila" , "Carlos Martín Nieto"
Sent: Friday, February 28, 2
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
---
po/fr.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/po/fr.po b/po/fr.po
index e10263f..7b44229 100644
14 matches
Mail list logo
