[PATCH 01/66] i18n: mark "style" in OPT_COLUMN() for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- parse-options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parse-options.h b/parse-options.h index 77a4a8b..71a39c6 100644 --- a/parse-options.h +++ b/parse-options.h @@ -238,6 +238,6 @@ extern int parse_opt_noop_cb(const struct op

[PATCH 02/66] i18n: archive: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- archive.c | 38 +++--- builtin/archive.c | 12 ++-- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/archive.c b/archive.c index a484433..2584324 100644 --- a/archive.c +++ b/archive.c @@ -7,10

[PATCH 03/66] i18n: add: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/add.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index 89dce56..2816789 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -16,7 +16,7 @@ #include "bulk-checkin.h"

[PATCH 04/66] i18n: bisect--helper: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/bisect--helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 8d325a5..e3884e3 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -4,7 +4,7 @

[PATCH 05/66] i18n: blame: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/blame.c | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 0d50273..c0c99c3 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -22,12 +22,12

[PATCH 06/66] i18n: branch: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/branch.c | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 0e060f2..3f34101 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @

[PATCH 07/66] i18n: cat-file: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/cat-file.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index af74e77..512072a 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -244,8 +244,8 @@ static

[PATCH 08/66] i18n: check-attr: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/check-attr.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 44c421e..e1ff575 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -8,19 +8,19 @@ static in

[PATCH 09/66] i18n: checkout-index: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout-index.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index c16d82b..86b7d36 100644 --- a/builtin/checkout-index.c +++ b/builtin/checkout-i

[PATCH 10/66] i18n: checkout: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index d812219..9f6dbe6 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -22,

[PATCH 11/66] i18n: cherry: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index ecc2793..dcd3e13 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1443,7 +1443,7 @@ static int add_pending_commit(const char *arg, st

[PATCH 12/66] i18n: clean: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/clean.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/clean.c b/builtin/clean.c index 0c7b3d0..69c1cda 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -16,7 +16,7 @@ static int force = -1; /* u

[PATCH 13/66] i18n: clone: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/clone.c | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/clone.c b/builtin/clone.c index e314b0b..5e8f3ba 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -33

[PATCH 14/66] i18n: column: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/column.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/column.c b/builtin/column.c index 5ea798a..e125a55 100644 --- a/builtin/column.c +++ b/builtin/column.c @@ -6,7 +6,7 @@ #include "column.h" sta

[PATCH 15/66] i18n: commit: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/commit.c | 78 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 20cef95..33b78fe 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @

[PATCH 16/66] i18n: config: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/config.c | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 8cd08da..41032cc 100644 --- a/builtin/config.c +++ b/builtin/config.c @

[PATCH 17/66] i18n: count-objects: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/count-objects.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/count-objects.c b/builtin/count-objects.c index c37cb98..9afaa88 100644 --- a/builtin/count-objects.c +++ b/builtin/count-objects.c @@ -66,7 +66,7 @@ sta

[PATCH 18/66] i18n: describe: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/describe.c | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/describe.c b/builtin/describe.c index 9f63067..9fe11ed 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -12,8 +12,8 @@

[PATCH 19/66] i18n: fast-export: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/fast-export.c | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 9ab6db3..12220ad 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -

[PATCH 20/66] i18n: fetch: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/fetch.c | 48 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index bb9a074..3f2ad77 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -16,10 +16,

[PATCH 21/66] i18n: fmt-merge-msg: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/fmt-merge-msg.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 2c4d435..e2e27b2 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -10,7

[PATCH 22/66] i18n: for-each-ref: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/for-each-ref.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index b01d76a..afe83b9 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -974,7 +

[PATCH 23/66] i18n: format-patch: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/log.c | 66 +-- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index dcd3e13..ba59110 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -890,7 +89

[PATCH 24/66] i18n: fsck: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/fsck.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index a710227..bb9a2cd 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -605,23 +605,23 @@ static int fsck_cache

[PATCH 25/66] i18n: gc: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/gc.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/gc.c b/builtin/gc.c index 9b4232c..6d46608 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -19,7 +19,7 @@ #define FAILED_RUN "failed to run %s" static

[PATCH 26/66] i18n: grep: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/grep.c | 90 +- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index 29adb0a..d73841c 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -19,7

[PATCH 27/66] i18n: hash-object: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/hash-object.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/builtin/hash-object.c b/builtin/hash-object.c index 33911fd..8d184f1 100644 --- a/builtin/hash-object.c +++ b/builtin/hash-object.c @@ -57,8 +57,8 @@

[PATCH 28/66] i18n: help: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/help.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/help.c b/builtin/help.c index efea4f5..bd86253 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -40,17 +40,17 @@ static int show_all = 0; static unsign

[PATCH 29/66] i18n: init-db: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/init-db.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/init-db.c b/builtin/init-db.c index 244fb7f..78aa387 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -464,7 +464,7 @@ static int share

[PATCH 30/66] i18n: log: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/log.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index ba59110..1ff2d8d 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -34,8 +34,8 @@ static const char *fmt_patch_subject_prefix =

[PATCH 31/66] i18n: ls-files: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/ls-files.c | 54 +++--- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 31b3f2d..b5434af 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-f

[PATCH 32/66] i18n: ls-tree: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/ls-tree.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index 6b666e1..235c17c 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -24,7 +24,7 @@ static int c

[PATCH 33/66] i18n: merge-base: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/merge-base.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/merge-base.c b/builtin/merge-base.c index 4f30f1b..2f223a6 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -23,9 +23,9 @@ static in

[PATCH 34/66] i18n: merge-file: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/merge-file.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 6f0efef..c0570f2 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -5,7 +5,7 @@

[PATCH 35/66] i18n: merge: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/merge.c | 48 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index dd50a0c..e9871ab 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -40,9 +40,9

[PATCH 36/66] i18n: mktree: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mktree.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/mktree.c b/builtin/mktree.c index 4ae1c41..f92ba40 100644 --- a/builtin/mktree.c +++ b/builtin/mktree.c @@ -64,7 +64,7 @@ static void write_tree(unsigned ch

[PATCH 37/66] i18n: mv: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 2a144b0..034fec9 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -11,7 +11,7 @@ #include "parse-options.h" static const char *

[PATCH 38/66] i18n: name-rev: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/name-rev.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 1b37458..6238247 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -172,9 +172,9 @@ stati

[PATCH 39/66] i18n: notes: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/notes.c | 120 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/builtin/notes.c b/builtin/notes.c index 3644d14..423c6e8 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -2

[PATCH 40/66] i18n: pack-objects: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 64 +- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 782e7d0..5e14064 100644 --- a/builtin/pack-objects.c +++ b/

[PATCH 41/66] i18n: pack-refs: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-refs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/pack-refs.c b/builtin/pack-refs.c index 39a9d89..b5a0f88 100644 --- a/builtin/pack-refs.c +++ b/builtin/pack-refs.c @@ -3,7 +3,7 @@ #include "pack-refs.h"

[PATCH 42/66] i18n: prune-packed: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/prune-packed.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c index b58a2e1..83382c1 100644 --- a/builtin/prune-packed.c +++ b/builtin/prune-packed.c @@ -4,7 +4,7 @@ #includ

[PATCH 43/66] i18n: prune: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/prune.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/prune.c b/builtin/prune.c index b99b635..a9e2241 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -9,7 +9,7 @@ #include "dir.h" static const char

[PATCH 44/66] i18n: push: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/push.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index fdfcc6c..4840bc2 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -11,7 +11,7 @@ #include "subm

[PATCH 45/66] i18n: read-tree: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/read-tree.c | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/builtin/read-tree.c b/builtin/read-tree.c index df6c4c8..042ac1b 100644 --- a/builtin/read-tree.c +++ b/builtin/read-tree.c @@ -

[PATCH 46/66] i18n: remote: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/remote.c | 84 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 920262d..8a670d8 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @

[PATCH 47/66] i18n: replace: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/replace.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index 4a8970e..e3aaf70 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -14,9 +14,9 @@ #include "parse-options

[PATCH 48/66] i18n: status: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/commit.c | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 33b78fe..feb43f4 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -35,7 +35,7 @@ static const char

[PATCH 49/66] i18n: rerere: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/rerere.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/rerere.c b/builtin/rerere.c index 08213c7..dc1708e 100644 --- a/builtin/rerere.c +++ b/builtin/rerere.c @@ -8,7 +8,7 @@ #include "xdiff-interface.h" static

[PATCH 50/66] i18n: reset: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/reset.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/builtin/reset.c b/builtin/reset.c index 74442bd..915cc9f 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -22,9 +22,9 @@ #include "cache-tree.h"

[PATCH 51/66] i18n: rev-parse: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/rev-parse.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 32788a9..bb3a516 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -324,15 +324,15 @@ stat

[PATCH 52/66] i18n: revert, cherry-pick: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/revert.c | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index 82d1bf8..02ca95f 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -19,14 +19,14 @@

[PATCH 53/66] i18n: rm: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/rm.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/rm.c b/builtin/rm.c index 90c8a50..b384c4c 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -11,7 +11,7 @@ #include "parse-options.h" static const cha

[PATCH 54/66] i18n: shortlog: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/shortlog.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 37f3193..b316cf3 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -10,9 +10,9 @@ #include "parse-

[PATCH 55/66] i18n: show-branch: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/show-branch.c | 42 +- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index a59e088..d208fd6 100644 --- a/builtin/show-branch.c +++ b/builtin/show

[PATCH 56/66] i18n: show-ref: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/show-ref.c | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 3911661..4eb016d 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -7,8 +7,8 @@ #i

[PATCH 57/66] i18n: symbolic-ref: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/symbolic-ref.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c index 801d62e..9e92828 100644 --- a/builtin/symbolic-ref.c +++ b/builtin/symbolic-ref.c @@ -4,7 +4,7 @@ #incl

[PATCH 58/66] i18n: tag: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/tag.c | 56 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c index 7b1be85..c581e0a 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -19,11 +19,11

[PATCH 59/66] i18n: update-index: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/update-index.c | 56 +- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/builtin/update-index.c b/builtin/update-index.c index 4ce341c..74986bf 100644 --- a/builtin/update-index.c +++ b/

[PATCH 60/66] i18n: update-ref: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/update-ref.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 835c62a..b30394f 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -4,8 +4,8 @@ #include "pa

[PATCH 61/66] i18n: update-server-info: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/update-server-info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/update-server-info.c b/builtin/update-server-info.c index 0d63c44..6c8cc3e 100644 --- a/builtin/update-server-info.c +++ b/builtin/update-server-inf

[PATCH 62/66] i18n: verify-pack: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/verify-pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c index e841b4a..66cd2df 100644 --- a/builtin/verify-pack.c +++ b/builtin/verify-pack.c @@ -53,7 +53,7 @@ static int

[PATCH 63/66] i18n: verify-tag: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/verify-tag.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index 986789f..a8eee88 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -14,7 +14,7 @@ #include "gpg-int

[PATCH 64/66] i18n: write-tree: mark parseopt strings for translation

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/write-tree.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/write-tree.c b/builtin/write-tree.c index b223af4..084c0df 100644 --- a/builtin/write-tree.c +++ b/builtin/write-tree.c @@ -10,7 +10,7 @@ #include "

[PATCH 65/66] Reduce translations by using same terminologies

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Somewhere in help usage, we use both "message" and "msg", "command" and "cmd", "key id" and "key-id". This patch makes all help text from parseopt use the first form. Clearer and 3 fewer strings for translators. Signed-off-by: Nguyễn Thái Ngọc Duy --- archive.c | 2 +- builtin/archive.c

[PATCH 66/66] Use imperative form in help usage to describe an action

2012-08-20 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- My guts tell me this is correct, but my English foundation is shaking so I say "change in the name of consistency"! builtin/apply.c | 2 +- builtin/checkout-index.c | 4 ++-- builtin/config.c | 8 builtin/grep.c | 2 +

Re: "Temporary merge branch 2" Conflicts

2012-08-20 Thread Stephen Bash
- Original Message - > From: "Junio C Hamano" > Sent: Friday, August 17, 2012 5:10:47 PM > Subject: Re: "Temporary merge branch 2" Conflicts > > Stephen Bash writes: > > > What is the recommended method for resolving this sort of merge? > > kdiff3 obviously doesn't understand the situat

receive.denyNonNonFastForwards not denying force update

2012-08-20 Thread John Arthorne
At eclipse.org we wanted all git repositories to disallow non-fastforward commits by default. So, we set receive.denyNonFastForwards=true as a system configuration setting. However, this does not prevent a non-fastforward force push. If we set the same configuration setting in the local repository

Re: [RFC 1/5] GSOC: prepare svndump for branch detection

2012-08-20 Thread Florian Achleitner
On Sunday 19 August 2012 23:57:23 Junio C Hamano wrote: > Florian Achleitner writes: > >> This change makes me uncomfortable. > >> We are doubling up on hashing with fast-import. > >> This introduces git-specific logic into vcs-svn. > > IIUC, vcs-svn/fast-export is meant to produce a stream in th

Re: [PATCH/RFC v4 01/16] GSOC remote-svn

2012-08-20 Thread Florian Achleitner
On Saturday 18 August 2012 13:13:47 Junio C Hamano wrote: > That indicates that one necessary patch to add logic to Makefile to > go and build that subdirectory, at least before running the test, > but possibly as part of the "all" target, is missing, isn't it? > > Or you can add, at the beginning

[PATCH 3/3] branch: suggest how to undo a --set-upstream when given one branch

2012-08-20 Thread Carlos Martín Nieto
This interface is error prone, and a better one (--set-upstream-to) exists. Suggest how to fix a --set-upstream invocation in case the user only gives one argument, which makes it likely that he meant to do the opposite, like with git branch --set-upstream origin/master when they meant one of

<    1   2