Signed-off-by: Justin Lebar <jlebar@xxxxxxxxxx> --- po/bg.po | 6 +++--- po/de.po | 6 +++--- po/fr.po | 6 +++--- po/git.pot | 6 +++--- po/it.po | 2 +- po/pt_PT.po | 2 +- po/sv.po | 6 +++--- po/vi.po | 6 +++--- po/zh_CN.po | 6 +++--- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/po/bg.po b/po/bg.po index fb450b2..983e575 100644 --- a/po/bg.po +++ b/po/bg.po @@ -3699,13 +3699,13 @@ msgstr "" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" @@ -4253,7 +4253,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "" #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" #: builtin/commit.c:1136 builtin/tag.c:572 diff --git a/po/de.po b/po/de.po index b777ef4..f539bf5 100644 --- a/po/de.po +++ b/po/de.po @@ -3876,7 +3876,7 @@ msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, or -f given; refusing to " "clean" msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " @@ -3884,7 +3884,7 @@ msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, or -f given; " "refusing to clean" msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -" @@ -4496,7 +4496,7 @@ msgstr "" "Klug... den letzten Commit mit einer geänderten Staging-Area nachbessern." #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Explizite Pfade ohne -i oder -o angegeben; unter der Annahme von --only " "Pfaden..." diff --git a/po/fr.po b/po/fr.po index 0b9d59e..9683264 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3917,7 +3917,7 @@ msgstr "-x et -X ne peuvent pas être utilisés ensemble" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, or -f given; refusing to " "clean" msgstr "" "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de " @@ -3925,7 +3925,7 @@ msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, or -f given; " "refusing to clean" msgstr "" "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de " @@ -4526,7 +4526,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "Malin... correction du dernier avec un index sale." #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Chemins explicites spécifiés sans -i ni -o ; --only supposé..." #: builtin/commit.c:1136 builtin/tag.c:572 diff --git a/po/git.pot b/po/git.pot index 33cc31d..3553bfc 100644 --- a/po/git.pot +++ b/po/git.pot @@ -3598,13 +3598,13 @@ msgstr "" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, or -f given; refusing to " "clean" msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, or -f given; " "refusing to clean" msgstr "" @@ -4150,7 +4150,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "" #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" #: builtin/commit.c:1136 builtin/tag.c:572 diff --git a/po/it.po b/po/it.po index 9080219..e0ad39a 100644 --- a/po/it.po +++ b/po/it.po @@ -2316,7 +2316,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "" #: builtin/commit.c:1059 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" #: builtin/commit.c:1069 builtin/tag.c:577 diff --git a/po/pt_PT.po b/po/pt_PT.po index 689ad1b..d749524 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -2153,7 +2153,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "" #: builtin/commit.c:1116 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" #: builtin/commit.c:1126 diff --git a/po/sv.po b/po/sv.po index 8c3c59a..06feb39 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3773,7 +3773,7 @@ msgstr "-x och -X kan inte användas samtidigt" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " @@ -3781,7 +3781,7 @@ msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " @@ -4375,7 +4375,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." #: builtin/commit.c:1136 builtin/tag.c:572 diff --git a/po/vi.po b/po/vi.po index b9676a8..e2d8c48 100644 --- a/po/vi.po +++ b/po/vi.po @@ -3842,7 +3842,7 @@ msgstr "-x và -X không thể dùng cùng một lúc với nhau" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce được đặt thành true và không đưa ra tùy chọn -n mà cũng " @@ -3850,7 +3850,7 @@ msgstr "" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -n mà " @@ -4460,7 +4460,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "Giỏi... “tu bổ” cái cuối với bảng mục lục bẩn." #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; đang " "giả định --only những-đường-dẫn..." diff --git a/po/zh_CN.po b/po/zh_CN.po index 0942835..04a926d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3778,14 +3778,14 @@ msgstr "-x 和 -X 不能同时使用" #: builtin/clean.c:906 msgid "" -"clean.requireForce set to true and neither -i, -n nor -f given; refusing to " +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" #: builtin/clean.c:909 msgid "" -"clean.requireForce defaults to true and neither -i, -n nor -f given; " +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" @@ -4371,7 +4371,7 @@ msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" #: builtin/commit.c:1126 -msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." #: builtin/commit.c:1136 builtin/tag.c:572 -- 1.9.0.279.gdc9e3eb -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html