i18n: mark all progress lines for translation

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 1affdd5e924c9e71605be603f253e34f6a995f36..73afedd12964505b6e0d2ea0886e4f7a3abb59e5 100644 (file)
--- 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)
        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;
        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)
                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);
        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;
                        }
 
                                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 */
                }
                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 541667f1026d7ba62be8e029c31138d5661f65c7..91b861248beb306b6a95985ade58c9f3bc8dd276 100644 (file)
--- 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)
        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();
 
        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)
        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);
                                                        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)
        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 {
        if (!use_internal_rev_list)
                read_object_list_from_stdin();
        else {

diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index fcf5fb6129c05156c7fd7bbb22ac380dbd0b3245..6879468c46a7baca69e5e28b0c6e38ff7099a6ff 100644 (file)
--- 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)
 
        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] != '/')
                        256, 95, 2);
 
        if (pathname.len && pathname.buf[pathname.len - 1] != '/')

diff --git a/builtin/prune.c b/builtin/prune.c
index de43b26cfe9c7610c13e3320bdac9fa2049e4db6..25f1477edbbee6c3756350ac1c4cbb5fbf9dc20b 100644 (file)
--- 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)
        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);
 
        mark_reachable_objects(&revs, 1, progress);
        stop_progress(&progress);

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 62ff673f68b48cc2147fc7f7b17dc5269da022bf..e6856f18cd1e4f093062f91d0b594b547d6be1a5 100644 (file)
--- 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)
        use(sizeof(struct pack_header));
 
        if (!quiet)

-               progress = start_progress("Unpacking objects", nr_objects);
+               progress = start_progress(_("Unpacking objects"), nr_objects);

        obj_list = xcalloc(nr_objects, sizeof(*obj_list));
        for (i = 0; i < nr_objects; i++) {
                unpack_one(i);
        obj_list = xcalloc(nr_objects, sizeof(*obj_list));
        for (i = 0; i < nr_objects; i++) {
                unpack_one(i);

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 6c7a72fbe74e8dd6fca07d2555cdea62c16b8b1e..20a5c5df22d10763b4ae71f68e5029c2f49a0e88 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -579,7 +579,7 @@ void diffcore_rename(struct diff_options *options)
 
        if (options->show_rename_progress) {
                progress = start_progress_delay(
 
        if (options->show_rename_progress) {
                progress = start_progress_delay(

-                               "Performing inexact rename detection",
+                               _("Performing inexact rename detection"),

                                rename_dst_nr * rename_src_nr, 50, 1);
        }
 
                                rename_dst_nr * rename_src_nr, 50, 1);
        }
 

diff --git a/progress.c b/progress.c
index 10652b174d1ccfb941b3d4122a882f1af3323084..261314ef3cd60662300129df98afff7ea2a1673c 100644 (file)
--- a/progress.c
+++ b/progress.c
@@ -9,6 +9,7 @@
  */
 
 #include "git-compat-util.h"
  */
 
 #include "git-compat-util.h"

+#include "gettext.h"

 #include "progress.h"
 #include "strbuf.h"
 
 #include "progress.h"
 #include "strbuf.h"
 


@@ -220,7 +221,7 @@ struct progress *start_progress(const char *title, unsigned total)
 
 void stop_progress(struct progress **p_progress)
 {
 
 void stop_progress(struct progress **p_progress)
 {

-       stop_progress_msg(p_progress, "done");
+       stop_progress_msg(p_progress, _("done"));

 }
 
 void stop_progress_msg(struct progress **p_progress, const char *msg)
 }
 
 void stop_progress_msg(struct progress **p_progress, const char *msg)

diff --git a/unpack-trees.c b/unpack-trees.c
index 164354dad7cbbaa7100f73256807680a75188021..9535793f666522e49879ae02297b4b6b00c99501 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -204,7 +204,7 @@ static int check_updates(struct unpack_trees_options *o)
                                total++;
                }
 
                                total++;
                }
 

-               progress = start_progress_delay("Checking out files",
+               progress = start_progress_delay(_("Checking out files"),

                                                total, 50, 1);
                cnt = 0;
        }
                                                total, 50, 1);
                cnt = 0;
        }