subject:"\[PATCH 3\/6\] l10n\: Fix misuses of \"nor\""

Re: [PATCH 3/6] l10n: Fix misuses of nor

2014-03-16 Thread Jiang Xin

2014-03-15 16:41 GMT+08:00 Justin Lebar jle...@google.com:
 Signed-off-by: Justin Lebar jle...@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 


Hi Justin,

All the msgids you patched are extracted from Git source code using gettext,
So please patch the original files where the msgids are came from, such as
builtin/clean.c.


-- 
Jiang Xin
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3/6] l10n: Fix misuses of nor

2014-03-16 Thread Justin Lebar

Thanks.  I'll remove this patch from the queue.

On Sun, Mar 16, 2014 at 6:45 PM, Jiang Xin worldhello@gmail.com wrote:
 2014-03-15 16:41 GMT+08:00 Justin Lebar jle...@google.com:
 Signed-off-by: Justin Lebar jle...@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 


 Hi Justin,

 All the msgids you patched are extracted from Git source code using gettext,
 So please patch the original files where the msgids are came from, such as
 builtin/clean.c.


 --
 Jiang Xin
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/6] l10n: Fix misuses of nor

2014-03-15 Thread Justin Lebar

Signed-off-by: Justin Lebar jle...@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 
 
 #:

Re: [PATCH 3/6] l10n: Fix misuses of nor

Re: [PATCH 3/6] l10n: Fix misuses of nor

[PATCH 3/6] l10n: Fix misuses of nor

3 matches

Site Navigation

Mail list logo

Footer information