Re: [PATCH] i18n: mark all progress lines for translation

2014-02-22 Thread Peter Krefting

Nguy?n Thái Ng?c Duy:

I can't think of any case that progress lines are for machine. It 
started because of the only local untranslated line in git clone. 
But I think we should do all at once.


Indeed, a good move. Anything that is to be displayed to the end user 
should be subject to localization; if it is part of a protocol, then 
it needs to be translated on the receiving end.


--
\\// Peter - http://www.softwolves.pp.se/
--
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] i18n: mark all progress lines for translation

2014-02-21 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
 I can't think of any case that progress lines are for machine. It
 started because of the only local untranslated line in git clone.
 But I think we should do all at once.

 builtin/fsck.c   | 6 +++---
 builtin/pack-objects.c   | 6 +++---
 builtin/prune-packed.c   | 2 +-
 builtin/prune.c  | 2 +-
 builtin/unpack-objects.c | 2 +-
 diffcore-rename.c| 2 +-
 progress.c   | 3 ++-
 unpack-trees.c   | 2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 1affdd5..73afedd 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -144,7 +144,7 @@ static int traverse_reachable(void)
unsigned int nr = 0;
int result = 0;
if (show_progress)
-   progress = start_progress_delay(Checking connectivity, 0, 0, 
2);
+   progress = start_progress_delay(_(Checking connectivity), 0, 
0, 2);
while (pending.nr) {
struct object_array_entry *entry;
struct object *obj;
@@ -541,7 +541,7 @@ static void fsck_object_dir(const char *path)
fprintf(stderr, Checking object directory\n);
 
if (show_progress)
-   progress = start_progress(Checking object directories, 256);
+   progress = start_progress(_(Checking object directories), 
256);
for (i = 0; i  256; i++) {
static char dir[4096];
sprintf(dir, %s/%02x, path, i);
@@ -670,7 +670,7 @@ int cmd_fsck(int argc, const char **argv, const char 
*prefix)
total += p-num_objects;
}
 
-   progress = start_progress(Checking objects, total);
+   progress = start_progress(_(Checking objects), total);
}
for (p = packed_git; p; p = p-next) {
/* verify gives error messages itself */
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 541667f..91b8612 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -723,7 +723,7 @@ static void write_pack_file(void)
struct object_entry **write_order;
 
if (progress  pack_to_stdout)
-   progress_state = start_progress(Writing objects, nr_result);
+   progress_state = start_progress(_(Writing objects), 
nr_result);
written_list = xmalloc(nr_objects * sizeof(*written_list));
write_order = compute_write_order();
 
@@ -2097,7 +2097,7 @@ static void prepare_pack(int window, int depth)
if (nr_deltas  n  1) {
unsigned nr_done = 0;
if (progress)
-   progress_state = start_progress(Compressing objects,
+   progress_state = start_progress(_(Compressing 
objects),
nr_deltas);
qsort(delta_list, n, sizeof(*delta_list), type_size_sort);
ll_find_deltas(delta_list, n, window+1, depth, nr_done);
@@ -2576,7 +2576,7 @@ int cmd_pack_objects(int argc, const char **argv, const 
char *prefix)
prepare_packed_git();
 
if (progress)
-   progress_state = start_progress(Counting objects, 0);
+   progress_state = start_progress(_(Counting objects), 0);
if (!use_internal_rev_list)
read_object_list_from_stdin();
else {
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index fcf5fb6..6879468 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -46,7 +46,7 @@ void prune_packed_objects(int opts)
 
strbuf_addstr(pathname, dir);
if (opts  PRUNE_PACKED_VERBOSE)
-   progress = start_progress_delay(Removing duplicate objects,
+   progress = start_progress_delay(_(Removing duplicate objects),
256, 95, 2);
 
if (pathname.len  pathname.buf[pathname.len - 1] != '/')
diff --git a/builtin/prune.c b/builtin/prune.c
index de43b26..25f1477 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -169,7 +169,7 @@ int cmd_prune(int argc, const char **argv, const char 
*prefix)
if (show_progress == -1)
show_progress = isatty(2);
if (show_progress)
-   progress = start_progress_delay(Checking connectivity, 0, 0, 
2);
+   progress = start_progress_delay(_(Checking connectivity), 0, 
0, 2);
 
mark_reachable_objects(revs, 1, progress);
stop_progress(progress);
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 62ff673..e6856f1 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -480,7 +480,7 @@ static void unpack_all(void)
use(sizeof(struct pack_header));
 
if (!quiet)
-   progress = start_progress(Unpacking objects, nr_objects);
+   progress = start_progress(_(Unpacking objects),