Skip to content

Commit

Permalink
l10n: correct indentation of show-branch usage
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
jiangxin committed Jan 21, 2015
1 parent 54d80a9 commit 1e60744
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 64 deletions.
18 changes: 9 additions & 9 deletions po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\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 <[email protected]>\n"
"Language-Team: German <>\n"
"Language: de\n"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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>]"
Expand Down
18 changes: 9 additions & 9 deletions po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\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 <[email protected]>\n"
"Language-Team: Jean-Noël Avila <[email protected]>\n"
"Language: fr\n"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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>]"
Expand Down
10 changes: 5 additions & 5 deletions po/git.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\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 <[email protected]>\n"
Expand Down Expand Up @@ -305,7 +305,7 @@ msgstr ""
msgid "index-pack died"
msgstr ""

#: color.c:259
#: color.c:260
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
Expand Down Expand Up @@ -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
Expand Down
38 changes: 19 additions & 19 deletions po/sv.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git 2.0.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\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 <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
"Language: sv\n"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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>]"
Expand Down Expand Up @@ -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"
Expand Down
18 changes: 9 additions & 9 deletions po/vi.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: git v2.3.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\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 <[email protected]>\n"
"Language-Team: Vietnamese <[email protected]>\n"
"Language: vi\n"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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>]"
Expand Down
24 changes: 11 additions & 13 deletions po/zh_CN.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\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 <[email protected]>\n"
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
"Language: zh_CN\n"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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>]"
Expand Down

0 comments on commit 1e60744

Please sign in to comment.