{"thread":{"id":"38396","subject":"Re: [L10N] Startup of Git 2.3.0 l10n round 2","startedAt":"2015-01-18T16:18:34Z","lastAt":"2015-01-21T07:49:44Z","messageCount":4,"participants":["Jiang Xin","Ralf Thielow","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"254868","messageId":"CANYiYbGL4A+ut8NjKmq6U8ADVf2M9Lq-5DOG3qxbKBp5srtrJQ@mail.gmail.com","threadId":"38396","inReplyTo":null,"subject":"Re: [L10N] Startup of Git 2.3.0 l10n round 2","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2015-01-18T16:18:34Z","receivedAt":"2015-01-18T16:18:34Z","isPatch":false,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA <jn.avila@free.fr>:\n> Hi,\n>\n> One of the new strings mixes tabs and spaces at begining of lines. Is it\n> really to be applied?\n>\n> Jean-Noël\n\nYes, it's wrong to using mixed tabs and spaces in the message. It comes\nfrom commit v2.0.5-5-g9990273, and it should be fixed.\n\n    commit 99902739174be82851143d4be2a0f85727a9efe0\n    Author: Alexander Kuleshov <kuleshovmail@gmail.com>\n    Date:   Fri Jan 9 00:08:36 2015 +0600\n\n        show-branch: line-wrap show-branch usage\n\n        Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>\n        Signed-off-by: Junio C Hamano <gitster@pobox.com>\n\n\n-- \nJiang Xin\n"},{"id":"254947","messageId":"1421782228-24005-1-git-send-email-ralf.thielow@gmail.com","threadId":"38396","inReplyTo":"CANYiYbGL4A+ut8NjKmq6U8ADVf2M9Lq-5DOG3qxbKBp5srtrJQ@mail.gmail.com","subject":"[PATCH] show-branch: fix indentation of usage string","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2015-01-20T19:30:28Z","receivedAt":"2015-01-20T19:30:28Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Noticed-by: Jean-Noël Avila <jn.avila@free.fr>\nSigned-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n---\nJiang Xin <worldhello.net@gmail.com> wrote:\n> 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA <jn.avila@free.fr>:\n> Yes, it's wrong to using mixed tabs and spaces in the message. It comes\n> from commit v2.0.5-5-g9990273, and it should be fixed.\n\nThis also breaks the indentation of the command output.\n\n builtin/show-branch.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/show-branch.c b/builtin/show-branch.c\nindex 691eeda..365228a 100644\n--- a/builtin/show-branch.c\n+++ b/builtin/show-branch.c\n@@ -7,9 +7,9 @@\n \n static const char* show_branch_usage[] = {\n     N_(\"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-       \"\t\t       [--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n-       \"\t\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-       \"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"),\n+       \"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n+       \"\t\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+       \"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"),\n     N_(\"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\"),\n     NULL\n };\n-- \n2.3.0.rc0.211.g05e7197\n"},{"id":"254968","messageId":"xmqqoaptyoql.fsf@gitster.dls.corp.google.com","threadId":"38396","inReplyTo":"1421782228-24005-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] show-branch: fix indentation of usage string","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2015-01-21T00:13:54Z","receivedAt":"2015-01-21T00:13:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ralf Thielow <ralf.thielow@gmail.com> writes:\n\n> Noticed-by: Jean-Noël Avila <jn.avila@free.fr>\n> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n> ---\n> Jiang Xin <worldhello.net@gmail.com> wrote:\n>> 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA <jn.avila@free.fr>:\n>> Yes, it's wrong to using mixed tabs and spaces in the message. It comes\n>> from commit v2.0.5-5-g9990273, and it should be fixed.\n>\n> This also breaks the indentation of the command output.\n>\n>  builtin/show-branch.c | 6 +++---\n>  1 file changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/builtin/show-branch.c b/builtin/show-branch.c\n> index 691eeda..365228a 100644\n> --- a/builtin/show-branch.c\n> +++ b/builtin/show-branch.c\n> @@ -7,9 +7,9 @@\n>  \n>  static const char* show_branch_usage[] = {\n>      N_(\"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n> -       \"\t\t       [--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n> -       \"\t\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n> -       \"\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"),\n> +       \"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n> +       \"\t\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n> +       \"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"),\n>      N_(\"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\"),\n>      NULL\n>  };\n\nThanks.\n"},{"id":"254975","messageId":"1e607449135792dd117bd528432fc1fbc1115667.1421825841.git.worldhello.net@gmail.com","threadId":"38396","inReplyTo":"1421782228-24005-1-git-send-email-ralf.thielow@gmail.com","subject":"[PATCH] l10n: correct indentation of show-branch usage","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2015-01-21T07:49:44Z","receivedAt":"2015-01-21T07:49:44Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"An indentation error was found right after we started l10n round 2, and\ncommit d6589d1 (show-branch: fix indentation of usage string) and this\nupdate would fix it.\n\nSigned-off-by: Jiang Xin <worldhello.net@gmail.com>\n---\nThis patch is based on master branch of git://github.com/git-l10n/git-po\n\n po/de.po    | 18 +++++++++---------\n po/fr.po    | 18 +++++++++---------\n po/git.pot  | 10 +++++-----\n po/sv.po    | 38 +++++++++++++++++++-------------------\n po/vi.po    | 18 +++++++++---------\n po/zh_CN.po | 24 +++++++++++-------------\n 6 files changed, 62 insertions(+), 64 deletions(-)\n\ndiff --git a/po/de.po b/po/de.po\nindex 0b93b0f..b2d4639 100644\n--- a/po/de.po\n+++ b/po/de.po\n@@ -7,8 +7,8 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: Git\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\\n\"\n-\"POT-Creation-Date: 2015-01-18 11:24+0800\\n\"\n-\"PO-Revision-Date: 2014-11-20 10:19+0800\\n\"\n+\"POT-Creation-Date: 2015-01-21 14:21+0800\\n\"\n+\"PO-Revision-Date: 2015-01-21 15:01+0800\\n\"\n \"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\\n\"\n \"Language-Team: German <>\\n\"\n \"Language: de\\n\"\n@@ -326,7 +326,7 @@ msgstr \"kann '%s' nicht erstellen\"\n msgid \"index-pack died\"\n msgstr \"Erstellung der Paketindexdatei abgebrochen\"\n \n-#: color.c:259\n+#: color.c:260\n #, c-format\n msgid \"invalid color value: %.*s\"\n msgstr \"Ungültiger Farbwert: %.*s\"\n@@ -9679,14 +9679,14 @@ msgstr \"Ausgabe mit Zeilenumbrüchen\"\n #: builtin/show-branch.c:9\n msgid \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n+\"\\t\\t[--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n msgstr \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<Wann>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]\"\n+\"\\t\\t[--current] [--color[=<Wann>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]\"\n \n #: builtin/show-branch.c:13\n msgid \"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\"\ndiff --git a/po/fr.po b/po/fr.po\nindex d1b3397..3235879 100644\n--- a/po/fr.po\n+++ b/po/fr.po\n@@ -73,8 +73,8 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: git\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\\n\"\n-\"POT-Creation-Date: 2015-01-18 11:24+0800\\n\"\n-\"PO-Revision-Date: 2015-01-18 17:01+0100\\n\"\n+\"POT-Creation-Date: 2015-01-21 14:21+0800\\n\"\n+\"PO-Revision-Date: 2015-01-21 14:57+0800\\n\"\n \"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\\n\"\n \"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\\n\"\n \"Language: fr\\n\"\n@@ -394,7 +394,7 @@ msgstr \"impossible de créer '%s'\"\n msgid \"index-pack died\"\n msgstr \"l'index de groupe a disparu\"\n \n-#: color.c:259\n+#: color.c:260\n #, c-format\n msgid \"invalid color value: %.*s\"\n msgstr \"Valeur invalide de couleur : %.*s\"\n@@ -9675,14 +9675,14 @@ msgstr \"Couper les lignes\"\n #: builtin/show-branch.c:9\n msgid \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n+\"\\t\\t[--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n msgstr \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"                [--current] [--color[=<quand>] | --no-color] [--sparse]\\n\"\n-\"                [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"                [--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]\"\n+\"\\t\\t[--current] [--color[=<quand>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]\"\n \n #: builtin/show-branch.c:13\n msgid \"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\"\ndiff --git a/po/git.pot b/po/git.pot\nindex 923d617..91fa5a1 100644\n--- a/po/git.pot\n+++ b/po/git.pot\n@@ -8,7 +8,7 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: PACKAGE VERSION\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\\n\"\n-\"POT-Creation-Date: 2015-01-18 11:24+0800\\n\"\n+\"POT-Creation-Date: 2015-01-21 14:21+0800\\n\"\n \"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\\n\"\n \"Last-Translator: FULL NAME <EMAIL@ADDRESS>\\n\"\n \"Language-Team: LANGUAGE <LL@li.org>\\n\"\n@@ -305,7 +305,7 @@ msgstr \"\"\n msgid \"index-pack died\"\n msgstr \"\"\n \n-#: color.c:259\n+#: color.c:260\n #, c-format\n msgid \"invalid color value: %.*s\"\n msgstr \"\"\n@@ -9015,9 +9015,9 @@ msgstr \"\"\n #: builtin/show-branch.c:9\n msgid \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n+\"\\t\\t[--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n msgstr \"\"\n \n #: builtin/show-branch.c:13\ndiff --git a/po/sv.po b/po/sv.po\nindex 9f8e04d..0440443 100644\n--- a/po/sv.po\n+++ b/po/sv.po\n@@ -7,8 +7,8 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: git 2.0.0\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\\n\"\n-\"POT-Creation-Date: 2015-01-18 11:24+0800\\n\"\n-\"PO-Revision-Date: 2015-01-18 20:29+0100\\n\"\n+\"POT-Creation-Date: 2015-01-21 14:21+0800\\n\"\n+\"PO-Revision-Date: 2015-01-21 14:57+0800\\n\"\n \"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\\n\"\n \"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\\n\"\n \"Language: sv\\n\"\n@@ -320,7 +320,7 @@ msgstr \"kan inte skapa \\\"%s\\\"\"\n msgid \"index-pack died\"\n msgstr \"index-pack dog\"\n \n-#: color.c:259\n+#: color.c:260\n #, c-format\n msgid \"invalid color value: %.*s\"\n msgstr \"felaktigt färgvärde: %.*s\"\n@@ -6361,11 +6361,11 @@ msgstr \" delat\"\n \n #: builtin/init-db.c:475\n msgid \"\"\n-\"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared\"\n-\"[=<permissions>]] [directory]\"\n+\"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--\"\n+\"shared[=<permissions>]] [directory]\"\n msgstr \"\"\n-\"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared\"\n-\"[=<behörigheter>]] [katalog]\"\n+\"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--\"\n+\"shared[=<behörigheter>]] [katalog]\"\n \n #: builtin/init-db.c:498\n msgid \"permissions\"\n@@ -6408,8 +6408,8 @@ msgid \"\"\n \"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] \"\n \"[<file>...]\"\n msgstr \"\"\n-\"git interpret-trailers [--trim-empty] [(--trailer <symbol>[(=|:)\"\n-\"<värde>])...] [<fil>...]\"\n+\"git interpret-trailers [--trim-empty] [(--trailer \"\n+\"<symbol>[(=|:)<värde>])...] [<fil>...]\"\n \n #: builtin/interpret-trailers.c:25\n msgid \"trim empty trailers\"\n@@ -9425,14 +9425,14 @@ msgstr \"Radbryt utdata\"\n #: builtin/show-branch.c:9\n msgid \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n+\"\\t\\t[--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n msgstr \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<när>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]\"\n+\"\\t\\t[--current] [--color[=<när>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]\"\n \n #: builtin/show-branch.c:13\n msgid \"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\"\n@@ -9504,11 +9504,11 @@ msgstr \"visa <n> nyaste refloggposter med början på bas\"\n \n #: builtin/show-ref.c:10\n msgid \"\"\n-\"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash\"\n-\"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] \"\n+\"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--\"\n+\"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] \"\n msgstr \"\"\n-\"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash\"\n-\"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] \"\n+\"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--\"\n+\"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] \"\n \n #: builtin/show-ref.c:11\n msgid \"git show-ref --exclude-existing[=pattern] < ref-list\"\ndiff --git a/po/vi.po b/po/vi.po\nindex 940e57b..9c2bba8 100644\n--- a/po/vi.po\n+++ b/po/vi.po\n@@ -8,8 +8,8 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: git v2.3.0\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\\n\"\n-\"POT-Creation-Date: 2015-01-18 11:24+0800\\n\"\n-\"PO-Revision-Date: 2015-01-19 07:19+0700\\n\"\n+\"POT-Creation-Date: 2015-01-21 14:21+0800\\n\"\n+\"PO-Revision-Date: 2015-01-21 14:58+0800\\n\"\n \"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\\n\"\n \"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\\n\"\n \"Language: vi\\n\"\n@@ -325,7 +325,7 @@ msgstr \"không thể tạo “%s”\"\n msgid \"index-pack died\"\n msgstr \"mục lục gói đã chết\"\n \n-#: color.c:259\n+#: color.c:260\n #, c-format\n msgid \"invalid color value: %.*s\"\n msgstr \"giá trị màu không hợp lệ: %.*s\"\n@@ -9500,14 +9500,14 @@ msgstr \"Ngắt dòng khi quá dài\"\n #: builtin/show-branch.c:9\n msgid \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n+\"\\t\\t[--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n msgstr \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<khi>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]\"\n+\"\\t\\t[--current] [--color[=<khi>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]\"\n \n #: builtin/show-branch.c:13\n msgid \"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\"\ndiff --git a/po/zh_CN.po b/po/zh_CN.po\nindex ccbb03c..2b8d2cb 100644\n--- a/po/zh_CN.po\n+++ b/po/zh_CN.po\n@@ -12,8 +12,8 @@ msgid \"\"\n msgstr \"\"\n \"Project-Id-Version: Git\\n\"\n \"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\\n\"\n-\"POT-Creation-Date: 2015-01-18 11:24+0800\\n\"\n-\"PO-Revision-Date: 2015-01-18 20:34+0800\\n\"\n+\"POT-Creation-Date: 2015-01-21 14:21+0800\\n\"\n+\"PO-Revision-Date: 2015-01-21 14:58+0800\\n\"\n \"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\\n\"\n \"Language-Team: GitHub <https://github.com/gotgit/git/>\\n\"\n \"Language: zh_CN\\n\"\n@@ -320,7 +320,7 @@ msgstr \"不能创建 '%s'\"\n msgid \"index-pack died\"\n msgstr \"index-pack 终止\"\n \n-#: color.c:259\n+#: color.c:260\n #, c-format\n msgid \"invalid color value: %.*s\"\n msgstr \"无效的颜色值：%.*s\"\n@@ -5368,8 +5368,7 @@ msgstr \"获取组并指定引用规则没有意义\"\n \n #: builtin/fmt-merge-msg.c:13\n msgid \"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]\"\n-msgstr \"\"\n-\"git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]\"\n+msgstr \"git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]\"\n \n #: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698\n #: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182\n@@ -6375,8 +6374,7 @@ msgstr \"不能切换目录到 %s\"\n msgid \"\"\n \"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-\"\n \"dir=<directory>)\"\n-msgstr \"\"\n-\"不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）\"\n+msgstr \"不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）\"\n \n #: builtin/init-db.c:591\n #, c-format\n@@ -9359,14 +9357,14 @@ msgstr \"折行输出\"\n #: builtin/show-branch.c:9\n msgid \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n+\"\\t\\t[--current] [--color[=<when>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]\"\n msgstr \"\"\n \"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\\n\"\n-\"\\t\\t       [--current] [--color[=<何时>] | --no-color] [--sparse]\\n\"\n-\"\\t\\t       [--more=<n> | --list | --independent | --merge-base]\\n\"\n-\"\\t       [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]\"\n+\"\\t\\t[--current] [--color[=<何时>] | --no-color] [--sparse]\\n\"\n+\"\\t\\t[--more=<n> | --list | --independent | --merge-base]\\n\"\n+\"\\t\\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]\"\n \n #: builtin/show-branch.c:13\n msgid \"git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\"\n-- \n2.3.0.rc0.7.g04cb2f2\n"}]}