git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Justin Lebar <jlebar@google.com>
To: git@vger.kernel.org
Cc: Justin Lebar <jlebar@google.com>, Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH 3/6] l10n: Fix misuses of "nor"
Date: Sat, 15 Mar 2014 01:41:59 -0700	[thread overview]
Message-ID: <1394872922-2000-4-git-send-email-jlebar@google.com> (raw)
In-Reply-To: <1394872922-2000-1-git-send-email-jlebar@google.com>

Signed-off-by: Justin Lebar <jlebar@google.com>
---
 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

  parent reply	other threads:[~2014-03-15  8:43 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-15  8:41 [PATCH 0/6] Fix misuses of "nor" Justin Lebar
2014-03-15  8:41 ` [PATCH 1/6] Documentation: " Justin Lebar
2014-03-15  8:41 ` [PATCH 2/6] contrib: " Justin Lebar
2014-03-15  8:41 ` Justin Lebar [this message]
2014-03-17  1:45   ` [PATCH 3/6] l10n: " Jiang Xin
2014-03-17  2:43     ` Justin Lebar
2014-03-15  8:42 ` [PATCH 4/6] Fix misuses of "nor" in comments Justin Lebar
2014-03-15  8:42 ` [PATCH 5/6] Fix misuses of "nor" outside comments Justin Lebar
2014-03-15  8:42 ` [PATCH 6/6] Tests: Fix misuses of "nor" Justin Lebar
2014-03-15  8:56 ` [PATCH 0/6] " Duy Nguyen
2014-03-15 16:56   ` Justin Lebar
2014-03-15 23:45     ` Duy Nguyen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1394872922-2000-4-git-send-email-jlebar@google.com \
    --to=jlebar@google.com \
    --cc=git@vger.kernel.org \
    --cc=worldhello.net@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).