From 1e607449135792dd117bd528432fc1fbc1115667 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Wed, 21 Jan 2015 15:05:03 +0800 Subject: [PATCH] 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 --- 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 0b93b0ff5a..b2d4639cd2 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 \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 \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[=] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [( | )...]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )...]" msgstr "" "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" -"\t\t [--current] [--color[=] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [( | )...]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )...]" #: builtin/show-branch.c:13 msgid "git show-branch (-g|--reflog)[=[,]] [--list] []" diff --git a/po/fr.po b/po/fr.po index d1b339718e..3235879de0 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 \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 \n" "Language-Team: Jean-Noël Avila \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[=] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [( | )...]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )...]" msgstr "" "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" -" [--current] [--color[=] | --no-color] [--sparse]\n" -" [--more= | --list | --independent | --merge-base]\n" -" [--no-name | --sha1-name] [--topics] [( | )...]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )...]" #: builtin/show-branch.c:13 msgid "git show-branch (-g|--reflog)[=[,]] [--list] []" diff --git a/po/git.pot b/po/git.pot index 923d617f5e..91fa5a1be6 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 \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 \n" "Language-Team: LANGUAGE \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[=] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [( | )...]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )...]" msgstr "" #: builtin/show-branch.c:13 diff --git a/po/sv.po b/po/sv.po index 9f8e04dce0..0440443132 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 \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 \n" "Language-Team: Swedish \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=] [--shared" -"[=]] [directory]" +"git init [-q | --quiet] [--bare] [--template=] [--" +"shared[=]] [directory]" msgstr "" -"git init [-q | --quiet] [--bare] [--template=] [--shared" -"[=]] [katalog]" +"git init [-q | --quiet] [--bare] [--template=] [--" +"shared[=]] [katalog]" #: builtin/init-db.c:498 msgid "permissions" @@ -6408,8 +6408,8 @@ msgid "" "git interpret-trailers [--trim-empty] [(--trailer [(=|:)])...] " "[...]" msgstr "" -"git interpret-trailers [--trim-empty] [(--trailer [(=|:)" -"])...] [...]" +"git interpret-trailers [--trim-empty] [(--trailer " +"[(=|:)])...] [...]" #: 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[=] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [( | )...]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )...]" msgstr "" "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" -"\t\t [--current] [--color[=] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [( | )...]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )...]" #: builtin/show-branch.c:13 msgid "git show-branch (-g|--reflog)[=[,]] [--list] []" @@ -9504,11 +9504,11 @@ msgstr "visa nyaste refloggposter med början på bas" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" -"[=]] [--abbrev[=]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=]] [--abbrev[=]] [--tags] [--heads] [--] [pattern*] " msgstr "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" -"[=]] [--abbrev[=]] [--tags] [--heads] [--] [mönster*] " +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=]] [--abbrev[=]] [--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 940e57b2b5..9c2bba889c 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 \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 \n" "Language-Team: Vietnamese \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[=] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [( | )...]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )...]" msgstr "" "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" -"\t\t [--current] [--color[=] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [( | )…]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )…]" #: builtin/show-branch.c:13 msgid "git show-branch (-g|--reflog)[=[,]] [--list] []" diff --git a/po/zh_CN.po b/po/zh_CN.po index ccbb03c493..2b8d2cbb77 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 \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 \n" "Language-Team: GitHub \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 ] [--log[=]|--no-log] [--file ]" -msgstr "" -"git fmt-merge-msg [-m <说明>] [--log[=]|--no-log] [--file <文件>]" +msgstr "git fmt-merge-msg [-m <说明>] [--log[=]|--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=) not allowed without specifying %s (or --git-" "dir=)" -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[=] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [( | )...]" +"\t\t[--current] [--color[=] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [( | )...]" msgstr "" "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" -"\t\t [--current] [--color[=<何时>] | --no-color] [--sparse]\n" -"\t\t [--more= | --list | --independent | --merge-base]\n" -"\t [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" +"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" +"\t\t[--more= | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]" #: builtin/show-branch.c:13 msgid "git show-branch (-g|--reflog)[=[,]] [--list] []" -- 2.11.4.GIT