diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-06-17 20:21:20 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-17 15:46:10 -0700 |
| commit | e923a8abe9b9e1ada28153160fb86a144162b06e (patch) | |
| tree | 36b5aff5890373f61afeee367625481f6d32b694 /builtin | |
| parent | 62d09ef3191e119791902e3a87a776ab79ab60be (diff) | |
| download | git-e923a8abe9b9e1ada28153160fb86a144162b06e.tar.gz git-e923a8abe9b9e1ada28153160fb86a144162b06e.tar.xz | |
i18n: standardise messages
Standardise messages in order to save translators some work.
Nuances fixed in this commit:
"failed to read %s"
"read of %s failed"
"detach the HEAD at named commit"
"detach HEAD at named commit"
"removing '%s' failed"
"failed to remove '%s'"
"index file corrupt"
"corrupt index file"
"failed to read %s"
"read of %s failed"
"detach the HEAD at named commit"
"detach HEAD at named commit"
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 6 | ||||
| -rw-r--r-- | builtin/checkout.c | 6 | ||||
| -rw-r--r-- | builtin/repack.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 8e4da2e1b..205c9f8f3 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3226,7 +3226,7 @@ static int load_patch_target(struct strbuf *buf, { if (cached || check_index) { if (read_file_or_gitlink(ce, buf)) - return error(_("read of %s failed"), name); + return error(_("failed to read %s"), name); } else if (name) { if (S_ISGITLINK(expected_mode)) { if (ce) @@ -3237,7 +3237,7 @@ static int load_patch_target(struct strbuf *buf, return error(_("reading from '%s' beyond a symbolic link"), name); } else { if (read_old_data(st, name, buf)) - return error(_("read of %s failed"), name); + return error(_("failed to read %s"), name); } } return 0; @@ -3282,7 +3282,7 @@ static int load_preimage(struct image *image, free_fragment_list(patch->fragments); patch->fragments = NULL; } else if (status) { - return error(_("read of %s failed"), patch->old_name); + return error(_("failed to read %s"), patch->old_name); } } diff --git a/builtin/checkout.c b/builtin/checkout.c index 3398c61e9..05c7b71ca 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -276,7 +276,7 @@ static int checkout_paths(const struct checkout_opts *opts, hold_locked_index(lock_file, 1); if (read_cache_preload(&opts->pathspec) < 0) - return error(_("corrupt index file")); + return error(_("index file corrupt")); if (opts->source_tree) read_tree_some(opts->source_tree, &opts->pathspec); @@ -470,7 +470,7 @@ static int merge_working_tree(const struct checkout_opts *opts, hold_locked_index(lock_file, 1); if (read_cache_preload(NULL) < 0) - return error(_("corrupt index file")); + return error(_("index file corrupt")); resolve_undo_clear(); if (opts->force) { @@ -1138,7 +1138,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) OPT_STRING('B', NULL, &opts.new_branch_force, N_("branch"), N_("create/reset and checkout a branch")), OPT_BOOL('l', NULL, &opts.new_branch_log, N_("create reflog for new branch")), - OPT_BOOL(0, "detach", &opts.force_detach, N_("detach the HEAD at named commit")), + OPT_BOOL(0, "detach", &opts.force_detach, N_("detach HEAD at named commit")), OPT_SET_INT('t', "track", &opts.track, N_("set upstream info for new branch"), BRANCH_TRACK_EXPLICIT), OPT_STRING(0, "orphan", &opts.new_orphan_branch, N_("new-branch"), N_("new unparented branch")), diff --git a/builtin/repack.c b/builtin/repack.c index 858db38f5..01088196f 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -378,7 +378,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) item->string, exts[ext].name); if (remove_path(fname)) - warning(_("removing '%s' failed"), fname); + warning(_("failed to remove '%s'"), fname); free(fname); } } |