diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-03-15 01:26:31 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-15 01:26:31 +0400 |
commit | 0963008cbf266db8001521c87084cea353005020 (patch) | |
tree | 0b3539923c45dd02000a0f27eade9e37d04f3b33 | |
parent | 060be00621dbac572ac71d07ae40884e0d4303f3 (diff) | |
parent | 754dbc43f078625f38c7908f19dc71a0c617ec85 (diff) |
Merge branch 'nd/i18n-progress'
Mark the progress indicators from various time-consuming commands
for i18n/l10n.
* nd/i18n-progress:
i18n: mark all progress lines for translation
-rw-r--r-- | builtin/fsck.c | 6 | ||||
-rw-r--r-- | builtin/pack-objects.c | 6 | ||||
-rw-r--r-- | builtin/prune-packed.c | 2 | ||||
-rw-r--r-- | builtin/prune.c | 2 | ||||
-rw-r--r-- | builtin/unpack-objects.c | 2 | ||||
-rw-r--r-- | diffcore-rename.c | 2 | ||||
-rw-r--r-- | progress.c | 3 | ||||
-rw-r--r-- | unpack-trees.c | 2 |
8 files changed, 13 insertions, 12 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 1affdd5e92..73afedd129 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 c73337931b..8b89f8121a 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -755,7 +755,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(to_pack.nr_objects * sizeof(*written_list)); write_order = compute_write_order(); @@ -2154,7 +2154,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); @@ -2687,7 +2687,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 fcf5fb6129..6879468c46 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 de43b26cfe..25f1477edb 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 62ff673f68..e6856f18cd 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"), nr_objects); 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 9b4f068eb3..39effecd84 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -522,7 +522,7 @@ void diffcore_rename(struct diff_options *options) 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); } diff --git a/progress.c b/progress.c index 10652b174d..261314ef3c 100644 --- a/progress.c +++ b/progress.c @@ -9,6 +9,7 @@ */ #include "git-compat-util.h" +#include "gettext.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) { - stop_progress_msg(p_progress, "done"); + stop_progress_msg(p_progress, _("done")); } void stop_progress_msg(struct progress **p_progress, const char *msg) diff --git a/unpack-trees.c b/unpack-trees.c index 0692ebe16e..97fc995467 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -203,7 +203,7 @@ static int check_updates(struct unpack_trees_options *o) total++; } - progress = start_progress_delay("Checking out files", + progress = start_progress_delay(_("Checking out files"), total, 50, 1); cnt = 0; } |