Re: [L10N] Startup of Git 2.3.0 l10n round 2

git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* Re: [L10N] Startup of Git 2.3.0 l10n round 2
@ 2015-01-18 16:18 Jiang Xin
  2015-01-20 19:30 ` [PATCH] show-branch: fix indentation of usage string Ralf Thielow
  0 siblings, 1 reply; 4+ messages in thread
From: Jiang Xin @ 2015-01-18 16:18 UTC (permalink / raw)
  To: Jean-Noël AVILA, Alexander Kuleshov; +Cc: Git List

2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA <jn.avila@free.fr>:
> Hi,
>
> One of the new strings mixes tabs and spaces at begining of lines. Is it
> really to be applied?
>
> Jean-Noël

Yes, it's wrong to using mixed tabs and spaces in the message. It comes
from commit v2.0.5-5-g9990273, and it should be fixed.

    commit 99902739174be82851143d4be2a0f85727a9efe0
    Author: Alexander Kuleshov <kuleshovmail@gmail.com>
    Date:   Fri Jan 9 00:08:36 2015 +0600

        show-branch: line-wrap show-branch usage

        Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
        Signed-off-by: Junio C Hamano <gitster@pobox.com>


-- 
Jiang Xin

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] show-branch: fix indentation of usage string
  2015-01-18 16:18 [L10N] Startup of Git 2.3.0 l10n round 2 Jiang Xin
@ 2015-01-20 19:30 ` Ralf Thielow
  2015-01-21  0:13   ` Junio C Hamano
  2015-01-21  7:49   ` [PATCH] l10n: correct indentation of show-branch usage Jiang Xin
  0 siblings, 2 replies; 4+ messages in thread
From: Ralf Thielow @ 2015-01-20 19:30 UTC (permalink / raw)
  To: git, gitster; +Cc: kuleshovmail, jn.avila, worldhello.net, Ralf Thielow

Noticed-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
Jiang Xin <worldhello.net@gmail.com> wrote:
> 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA <jn.avila@free.fr>:
> Yes, it's wrong to using mixed tabs and spaces in the message. It comes
> from commit v2.0.5-5-g9990273, and it should be fixed.

This also breaks the indentation of the command output.

 builtin/show-branch.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 691eeda..365228a 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -7,9 +7,9 @@
 
 static const char* show_branch_usage[] = {
     N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-       "		       [--current] [--color[=<when>] | --no-color] [--sparse]\n"
-       "		       [--more=<n> | --list | --independent | --merge-base]\n"
-       "	       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
+       "		[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+       "		[--more=<n> | --list | --independent | --merge-base]\n"
+       "		[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
     N_("git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"),
     NULL
 };
-- 
2.3.0.rc0.211.g05e7197

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] show-branch: fix indentation of usage string
  2015-01-20 19:30 ` [PATCH] show-branch: fix indentation of usage string Ralf Thielow
@ 2015-01-21  0:13   ` Junio C Hamano
  2015-01-21  7:49   ` [PATCH] l10n: correct indentation of show-branch usage Jiang Xin
  1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2015-01-21  0:13 UTC (permalink / raw)
  To: Ralf Thielow; +Cc: git, kuleshovmail, jn.avila, worldhello.net

Ralf Thielow <ralf.thielow@gmail.com> writes:

> Noticed-by: Jean-Noël Avila <jn.avila@free.fr>
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
> Jiang Xin <worldhello.net@gmail.com> wrote:
>> 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA <jn.avila@free.fr>:
>> Yes, it's wrong to using mixed tabs and spaces in the message. It comes
>> from commit v2.0.5-5-g9990273, and it should be fixed.
>
> This also breaks the indentation of the command output.
>
>  builtin/show-branch.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/show-branch.c b/builtin/show-branch.c
> index 691eeda..365228a 100644
> --- a/builtin/show-branch.c
> +++ b/builtin/show-branch.c
> @@ -7,9 +7,9 @@
>  
>  static const char* show_branch_usage[] = {
>      N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
> -       "		       [--current] [--color[=<when>] | --no-color] [--sparse]\n"
> -       "		       [--more=<n> | --list | --independent | --merge-base]\n"
> -       "	       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
> +       "		[--current] [--color[=<when>] | --no-color] [--sparse]\n"
> +       "		[--more=<n> | --list | --independent | --merge-base]\n"
> +       "		[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
>      N_("git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"),
>      NULL
>  };

Thanks.

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] l10n: correct indentation of show-branch usage
  2015-01-20 19:30 ` [PATCH] show-branch: fix indentation of usage string Ralf Thielow
  2015-01-21  0:13   ` Junio C Hamano
@ 2015-01-21  7:49   ` Jiang Xin
  1 sibling, 0 replies; 4+ messages in thread
From: Jiang Xin @ 2015-01-21  7:49 UTC (permalink / raw)
  To: Jean-Noel Avila, Jiang Xin, Joan Perals, Peter Krefting,
	Ralf Thielow, Tran Ngoc Quan
  Cc: Git List

An indentation error was found right after we started l10n round 2, and
commit d6589d1 (show-branch: fix indentation of usage string) and this
update would fix it.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
This patch is based on master branch of git://github.com/git-l10n/git-po

 po/de.po    | 18 +++++++++---------
 po/fr.po    | 18 +++++++++---------
 po/git.pot  | 10 +++++-----
 po/sv.po    | 38 +++++++++++++++++++-------------------
 po/vi.po    | 18 +++++++++---------
 po/zh_CN.po | 24 +++++++++++-------------
 6 files changed, 62 insertions(+), 64 deletions(-)

diff --git a/po/de.po b/po/de.po
index 0b93b0f..b2d4639 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-01-18 11:24+0800\n"
-"PO-Revision-Date: 2014-11-20 10:19+0800\n"
+"POT-Creation-Date: 2015-01-21 14:21+0800\n"
+"PO-Revision-Date: 2015-01-21 15:01+0800\n"
 "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
 "Language-Team: German <>\n"
 "Language: de\n"
@@ -326,7 +326,7 @@ msgstr "kann '%s' nicht erstellen"
 msgid "index-pack died"
 msgstr "Erstellung der Paketindexdatei abgebrochen"
 
-#: color.c:259
+#: color.c:260
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "Ungültiger Farbwert: %.*s"
@@ -9679,14 +9679,14 @@ msgstr "Ausgabe mit Zeilenumbrüchen"
 #: builtin/show-branch.c:9
 msgid ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
+"\t\t[--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
 
 #: builtin/show-branch.c:13
 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
diff --git a/po/fr.po b/po/fr.po
index d1b3397..3235879 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -73,8 +73,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-01-18 11:24+0800\n"
-"PO-Revision-Date: 2015-01-18 17:01+0100\n"
+"POT-Creation-Date: 2015-01-21 14:21+0800\n"
+"PO-Revision-Date: 2015-01-21 14:57+0800\n"
 "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language: fr\n"
@@ -394,7 +394,7 @@ msgstr "impossible de créer '%s'"
 msgid "index-pack died"
 msgstr "l'index de groupe a disparu"
 
-#: color.c:259
+#: color.c:260
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "Valeur invalide de couleur : %.*s"
@@ -9675,14 +9675,14 @@ msgstr "Couper les lignes"
 #: builtin/show-branch.c:9
 msgid ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"                [--current] [--color[=<quand>] | --no-color] [--sparse]\n"
-"                [--more=<n> | --list | --independent | --merge-base]\n"
-"                [--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
+"\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
 
 #: builtin/show-branch.c:13
 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
diff --git a/po/git.pot b/po/git.pot
index 923d617..91fa5a1 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-01-18 11:24+0800\n"
+"POT-Creation-Date: 2015-01-21 14:21+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -305,7 +305,7 @@ msgstr ""
 msgid "index-pack died"
 msgstr ""
 
-#: color.c:259
+#: color.c:260
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr ""
@@ -9015,9 +9015,9 @@ msgstr ""
 #: builtin/show-branch.c:9
 msgid ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 
 #: builtin/show-branch.c:13
diff --git a/po/sv.po b/po/sv.po
index 9f8e04d..0440443 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git 2.0.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-01-18 11:24+0800\n"
-"PO-Revision-Date: 2015-01-18 20:29+0100\n"
+"POT-Creation-Date: 2015-01-21 14:21+0800\n"
+"PO-Revision-Date: 2015-01-21 14:57+0800\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -320,7 +320,7 @@ msgstr "kan inte skapa \"%s\""
 msgid "index-pack died"
 msgstr "index-pack dog"
 
-#: color.c:259
+#: color.c:260
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "felaktigt färgvärde: %.*s"
@@ -6361,11 +6361,11 @@ msgstr " delat"
 
 #: builtin/init-db.c:475
 msgid ""
-"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
-"[=<permissions>]] [directory]"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [directory]"
 msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared"
-"[=<behörigheter>]] [katalog]"
+"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
+"shared[=<behörigheter>]] [katalog]"
 
 #: builtin/init-db.c:498
 msgid "permissions"
@@ -6408,8 +6408,8 @@ msgid ""
 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
 "[<file>...]"
 msgstr ""
-"git interpret-trailers [--trim-empty] [(--trailer <symbol>[(=|:)"
-"<värde>])...] [<fil>...]"
+"git interpret-trailers [--trim-empty] [(--trailer "
+"<symbol>[(=|:)<värde>])...] [<fil>...]"
 
 #: builtin/interpret-trailers.c:25
 msgid "trim empty trailers"
@@ -9425,14 +9425,14 @@ msgstr "Radbryt utdata"
 #: builtin/show-branch.c:9
 msgid ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<när>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
+"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
 
 #: builtin/show-branch.c:13
 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -9504,11 +9504,11 @@ msgstr "visa <n> nyaste refloggposter med början på bas"
 
 #: builtin/show-ref.c:10
 msgid ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
-"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
+"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
 msgstr ""
-"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
-"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] "
+"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] "
 
 #: builtin/show-ref.c:11
 msgid "git show-ref --exclude-existing[=pattern] < ref-list"
diff --git a/po/vi.po b/po/vi.po
index 940e57b..9c2bba8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git v2.3.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-01-18 11:24+0800\n"
-"PO-Revision-Date: 2015-01-19 07:19+0700\n"
+"POT-Creation-Date: 2015-01-21 14:21+0800\n"
+"PO-Revision-Date: 2015-01-21 14:58+0800\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "Language: vi\n"
@@ -325,7 +325,7 @@ msgstr "không thể tạo “%s”"
 msgid "index-pack died"
 msgstr "mục lục gói đã chết"
 
-#: color.c:259
+#: color.c:260
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "giá trị màu không hợp lệ: %.*s"
@@ -9500,14 +9500,14 @@ msgstr "Ngắt dòng khi quá dài"
 #: builtin/show-branch.c:9
 msgid ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<khi>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
+"\t\t[--current] [--color[=<khi>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
 
 #: builtin/show-branch.c:13
 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ccbb03c..2b8d2cb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2015-01-18 11:24+0800\n"
-"PO-Revision-Date: 2015-01-18 20:34+0800\n"
+"POT-Creation-Date: 2015-01-21 14:21+0800\n"
+"PO-Revision-Date: 2015-01-21 14:58+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
 "Language: zh_CN\n"
@@ -320,7 +320,7 @@ msgstr "不能创建 '%s'"
 msgid "index-pack died"
 msgstr "index-pack 终止"
 
-#: color.c:259
+#: color.c:260
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "无效的颜色值：%.*s"
@@ -5368,8 +5368,7 @@ msgstr "获取组并指定引用规则没有意义"
 
 #: builtin/fmt-merge-msg.c:13
 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
-msgstr ""
-"git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]"
+msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]"
 
 #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
 #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
@@ -6375,8 +6374,7 @@ msgstr "不能切换目录到 %s"
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
-msgstr ""
-"不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
+msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
 
 #: builtin/init-db.c:591
 #, c-format
@@ -9359,14 +9357,14 @@ msgstr "折行输出"
 #: builtin/show-branch.c:9
 msgid ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<when>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
 msgstr ""
 "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
-"\t\t       [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
-"\t\t       [--more=<n> | --list | --independent | --merge-base]\n"
-"\t       [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
+"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
 
 #: builtin/show-branch.c:13
 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
-- 
2.3.0.rc0.7.g04cb2f2

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-01-21  7:50 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-18 16:18 [L10N] Startup of Git 2.3.0 l10n round 2 Jiang Xin
2015-01-20 19:30 ` [PATCH] show-branch: fix indentation of usage string Ralf Thielow
2015-01-21  0:13   ` Junio C Hamano
2015-01-21  7:49   ` [PATCH] l10n: correct indentation of show-branch usage Jiang Xin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).