Skip to content

Commit 1e60744

Browse files
jiangxinjiangxin
committed
l10n: correct indentation of show-branch usage
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]>
1 parent 54d80a9 commit 1e60744

File tree

6 files changed

+62
-64
lines changed

6 files changed

+62
-64
lines changed

‎po/de.po‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Git\n"
99
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
10-
"POT-Creation-Date: 2015-01-18 11:24+0800\n"
11-
"PO-Revision-Date: 2014-11-20 10:19+0800\n"
10+
"POT-Creation-Date: 2015-01-21 14:21+0800\n"
11+
"PO-Revision-Date: 2015-01-21 15:01+0800\n"
1212
"Last-Translator: Ralf Thielow <[email protected]>\n"
1313
"Language-Team: German <>\n"
1414
"Language: de\n"
@@ -326,7 +326,7 @@ msgstr "kann '%s' nicht erstellen"
326326
msgid "index-pack died"
327327
msgstr "Erstellung der Paketindexdatei abgebrochen"
328328

329-
#: color.c:259
329+
#: color.c:260
330330
#, c-format
331331
msgid "invalid color value: %.*s"
332332
msgstr "Ungültiger Farbwert: %.*s"
@@ -9679,14 +9679,14 @@ msgstr "Ausgabe mit Zeilenumbrüchen"
96799679
#: builtin/show-branch.c:9
96809680
msgid ""
96819681
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9682-
"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n"
9683-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9684-
"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9682+
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9683+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9684+
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
96859685
msgstr ""
96869686
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9687-
"\t\t [--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
9688-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9689-
"\t [--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
9687+
"\t\t[--current] [--color[=<Wann>] | --no-color] [--sparse]\n"
9688+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9689+
"\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]"
96909690

96919691
#: builtin/show-branch.c:13
96929692
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

‎po/fr.po‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ msgid ""
7373
msgstr ""
7474
"Project-Id-Version: git\n"
7575
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
76-
"POT-Creation-Date: 2015-01-18 11:24+0800\n"
77-
"PO-Revision-Date: 2015-01-18 17:01+0100\n"
76+
"POT-Creation-Date: 2015-01-21 14:21+0800\n"
77+
"PO-Revision-Date: 2015-01-21 14:57+0800\n"
7878
"Last-Translator: Jean-Noël Avila <[email protected]>\n"
7979
"Language-Team: Jean-Noël Avila <[email protected]>\n"
8080
"Language: fr\n"
@@ -394,7 +394,7 @@ msgstr "impossible de créer '%s'"
394394
msgid "index-pack died"
395395
msgstr "l'index de groupe a disparu"
396396

397-
#: color.c:259
397+
#: color.c:260
398398
#, c-format
399399
msgid "invalid color value: %.*s"
400400
msgstr "Valeur invalide de couleur : %.*s"
@@ -9675,14 +9675,14 @@ msgstr "Couper les lignes"
96759675
#: builtin/show-branch.c:9
96769676
msgid ""
96779677
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9678-
"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n"
9679-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9680-
"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9678+
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9679+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9680+
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
96819681
msgstr ""
96829682
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9683-
" [--current] [--color[=<quand>] | --no-color] [--sparse]\n"
9684-
" [--more=<n> | --list | --independent | --merge-base]\n"
9685-
" [--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
9683+
"\t\t[--current] [--color[=<quand>] | --no-color] [--sparse]\n"
9684+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9685+
"\t\t[--no-name | --sha1-name] [--topics] [(<rév> | <glob>)...]"
96869686

96879687
#: builtin/show-branch.c:13
96889688
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

‎po/git.pot‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
11-
"POT-Creation-Date: 2015-01-18 11:24+0800\n"
11+
"POT-Creation-Date: 2015-01-21 14:21+0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -305,7 +305,7 @@ msgstr ""
305305
msgid "index-pack died"
306306
msgstr ""
307307

308-
#: color.c:259
308+
#: color.c:260
309309
#, c-format
310310
msgid "invalid color value: %.*s"
311311
msgstr ""
@@ -9015,9 +9015,9 @@ msgstr ""
90159015
#: builtin/show-branch.c:9
90169016
msgid ""
90179017
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9018-
"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n"
9019-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9020-
"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9018+
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9019+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9020+
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
90219021
msgstr ""
90229022

90239023
#: builtin/show-branch.c:13

‎po/sv.po‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: git 2.0.0\n"
99
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
10-
"POT-Creation-Date: 2015-01-18 11:24+0800\n"
11-
"PO-Revision-Date: 2015-01-18 20:29+0100\n"
10+
"POT-Creation-Date: 2015-01-21 14:21+0800\n"
11+
"PO-Revision-Date: 2015-01-21 14:57+0800\n"
1212
"Last-Translator: Peter Krefting <[email protected]>\n"
1313
"Language-Team: Swedish <[email protected]>\n"
1414
"Language: sv\n"
@@ -320,7 +320,7 @@ msgstr "kan inte skapa \"%s\""
320320
msgid "index-pack died"
321321
msgstr "index-pack dog"
322322

323-
#: color.c:259
323+
#: color.c:260
324324
#, c-format
325325
msgid "invalid color value: %.*s"
326326
msgstr "felaktigt färgvärde: %.*s"
@@ -6361,11 +6361,11 @@ msgstr " delat"
63616361

63626362
#: builtin/init-db.c:475
63636363
msgid ""
6364-
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
6365-
"[=<permissions>]] [directory]"
6364+
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6365+
"shared[=<permissions>]] [directory]"
63666366
msgstr ""
6367-
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared"
6368-
"[=<behörigheter>]] [katalog]"
6367+
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
6368+
"shared[=<behörigheter>]] [katalog]"
63696369

63706370
#: builtin/init-db.c:498
63716371
msgid "permissions"
@@ -6408,8 +6408,8 @@ msgid ""
64086408
"git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
64096409
"[<file>...]"
64106410
msgstr ""
6411-
"git interpret-trailers [--trim-empty] [(--trailer <symbol>[(=|:)"
6412-
"<värde>])...] [<fil>...]"
6411+
"git interpret-trailers [--trim-empty] [(--trailer "
6412+
"<symbol>[(=|:)<värde>])...] [<fil>...]"
64136413

64146414
#: builtin/interpret-trailers.c:25
64156415
msgid "trim empty trailers"
@@ -9425,14 +9425,14 @@ msgstr "Radbryt utdata"
94259425
#: builtin/show-branch.c:9
94269426
msgid ""
94279427
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9428-
"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n"
9429-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9430-
"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9428+
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9429+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9430+
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
94319431
msgstr ""
94329432
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9433-
"\t\t [--current] [--color[=<när>] | --no-color] [--sparse]\n"
9434-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9435-
"\t [--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
9433+
"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"
9434+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9435+
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
94369436

94379437
#: builtin/show-branch.c:13
94389438
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -9504,11 +9504,11 @@ msgstr "visa <n> nyaste refloggposter med början på bas"
95049504

95059505
#: builtin/show-ref.c:10
95069506
msgid ""
9507-
"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
9508-
"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
9507+
"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9508+
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "
95099509
msgstr ""
9510-
"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash"
9511-
"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] "
9510+
"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--"
9511+
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [mönster*] "
95129512

95139513
#: builtin/show-ref.c:11
95149514
msgid "git show-ref --exclude-existing[=pattern] < ref-list"

‎po/vi.po‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: git v2.3.0\n"
1010
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
11-
"POT-Creation-Date: 2015-01-18 11:24+0800\n"
12-
"PO-Revision-Date: 2015-01-19 07:19+0700\n"
11+
"POT-Creation-Date: 2015-01-21 14:21+0800\n"
12+
"PO-Revision-Date: 2015-01-21 14:58+0800\n"
1313
"Last-Translator: Trần Ngọc Quân <[email protected]>\n"
1414
"Language-Team: Vietnamese <[email protected]>\n"
1515
"Language: vi\n"
@@ -325,7 +325,7 @@ msgstr "không thể tạo “%s”"
325325
msgid "index-pack died"
326326
msgstr "mục lục gói đã chết"
327327

328-
#: color.c:259
328+
#: color.c:260
329329
#, c-format
330330
msgid "invalid color value: %.*s"
331331
msgstr "giá trị màu không hợp lệ: %.*s"
@@ -9500,14 +9500,14 @@ msgstr "Ngắt dòng khi quá dài"
95009500
#: builtin/show-branch.c:9
95019501
msgid ""
95029502
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9503-
"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n"
9504-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9505-
"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9503+
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9504+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9505+
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
95069506
msgstr ""
95079507
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9508-
"\t\t [--current] [--color[=<khi>] | --no-color] [--sparse]\n"
9509-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9510-
"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
9508+
"\t\t[--current] [--color[=<khi>] | --no-color] [--sparse]\n"
9509+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9510+
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)…]"
95119511

95129512
#: builtin/show-branch.c:13
95139513
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

‎po/zh_CN.po‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ msgid ""
1212
msgstr ""
1313
"Project-Id-Version: Git\n"
1414
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
15-
"POT-Creation-Date: 2015-01-18 11:24+0800\n"
16-
"PO-Revision-Date: 2015-01-18 20:34+0800\n"
15+
"POT-Creation-Date: 2015-01-21 14:21+0800\n"
16+
"PO-Revision-Date: 2015-01-21 14:58+0800\n"
1717
"Last-Translator: Jiang Xin <[email protected]>\n"
1818
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
1919
"Language: zh_CN\n"
@@ -320,7 +320,7 @@ msgstr "不能创建 '%s'"
320320
msgid "index-pack died"
321321
msgstr "index-pack 终止"
322322

323-
#: color.c:259
323+
#: color.c:260
324324
#, c-format
325325
msgid "invalid color value: %.*s"
326326
msgstr "无效的颜色值：%.*s"
@@ -5368,8 +5368,7 @@ msgstr "获取组并指定引用规则没有意义"
53685368

53695369
#: builtin/fmt-merge-msg.c:13
53705370
msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"
5371-
msgstr ""
5372-
"git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]"
5371+
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>]|--no-log] [--file <文件>]"
53735372

53745373
#: builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 builtin/grep.c:698
53755374
#: builtin/merge.c:198 builtin/repack.c:178 builtin/repack.c:182
@@ -6375,8 +6374,7 @@ msgstr "不能切换目录到 %s"
63756374
msgid ""
63766375
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
63776376
"dir=<directory>)"
6378-
msgstr ""
6379-
"不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
6377+
msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
63806378

63816379
#: builtin/init-db.c:591
63826380
#, c-format
@@ -9359,14 +9357,14 @@ msgstr "折行输出"
93599357
#: builtin/show-branch.c:9
93609358
msgid ""
93619359
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9362-
"\t\t [--current] [--color[=<when>] | --no-color] [--sparse]\n"
9363-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9364-
"\t [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
9360+
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
9361+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9362+
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
93659363
msgstr ""
93669364
"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
9367-
"\t\t [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9368-
"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
9369-
"\t [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
9365+
"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
9366+
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
9367+
"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
93709368

93719369
#: builtin/show-branch.c:13
93729370
msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"

0 commit comments

Comments
 (0)