mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'va/i18n-misc-updates'
Mark several messages for translation. * va/i18n-misc-updates: i18n: unpack-trees: avoid substituting only a verb in sentences i18n: builtin/pull.c: split strings marked for translation i18n: builtin/pull.c: mark placeholders for translation i18n: git-parse-remote.sh: mark strings for translation i18n: branch: move comment for translators i18n: branch: unmark string for translation i18n: builtin/rm.c: remove a comma ',' from string i18n: unpack-trees: mark strings for translation i18n: builtin/branch.c: mark option for translation i18n: index-pack: use plural string instead of normal one
This commit is contained in:
Junio C Hamano
commit
e5e7a9115d
2
Makefile
2
Makefile
|
|
@ -2062,7 +2062,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
|
|||
--keyword=gettextln --keyword=eval_gettextln
|
||||
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
|
||||
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
|
||||
LOCALIZED_SH = $(SCRIPT_SH)
|
||||
LOCALIZED_SH = $(SCRIPT_SH) git-parse-remote.sh
|
||||
LOCALIZED_PERL = $(SCRIPT_PERL)
|
||||
|
||||
ifdef XGETTEXT_INCLUDE_TESTS
|
||||
|
|
|
|||
|
|
@ -375,12 +375,14 @@ static char *get_head_description(void)
|
|||
strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
|
||||
state.branch);
|
||||
else if (state.detached_from) {
|
||||
/* TRANSLATORS: make sure these match _("HEAD detached at ")
|
||||
and _("HEAD detached from ") in wt-status.c */
|
||||
if (state.detached_at)
|
||||
/* TRANSLATORS: make sure this matches
|
||||
"HEAD detached at " in wt-status.c */
|
||||
strbuf_addf(&desc, _("(HEAD detached at %s)"),
|
||||
state.detached_from);
|
||||
else
|
||||
/* TRANSLATORS: make sure this matches
|
||||
"HEAD detached from " in wt-status.c */
|
||||
strbuf_addf(&desc, _("(HEAD detached from %s)"),
|
||||
state.detached_from);
|
||||
}
|
||||
|
|
@ -630,7 +632,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
|||
BRANCH_TRACK_EXPLICIT),
|
||||
OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
|
||||
BRANCH_TRACK_OVERRIDE),
|
||||
OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"),
|
||||
OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
|
||||
OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"),
|
||||
OPT__COLOR(&branch_use_color, N_("use colored output")),
|
||||
OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"),
|
||||
|
|
@ -838,8 +840,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
|
|||
if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
|
||||
!branch_existed && remote_tracking) {
|
||||
fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
|
||||
fprintf(stderr, _(" git branch -d %s\n"), branch->name);
|
||||
fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name);
|
||||
fprintf(stderr, " git branch -d %s\n", branch->name);
|
||||
fprintf(stderr, " git branch --set-upstream-to %s\n", branch->name);
|
||||
}
|
||||
|
||||
} else
|
||||
|
|
|
|||
|
|
@ -1250,7 +1250,9 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
|
|||
nr_unresolved * sizeof(*objects));
|
||||
f = sha1fd(output_fd, curr_pack);
|
||||
fix_unresolved_deltas(f);
|
||||
strbuf_addf(&msg, _("completed with %d local objects"),
|
||||
strbuf_addf(&msg, Q_("completed with %d local object",
|
||||
"completed with %d local objects",
|
||||
nr_objects - nr_objects_initial),
|
||||
nr_objects - nr_objects_initial);
|
||||
stop_progress_msg(&progress, msg.buf);
|
||||
strbuf_release(&msg);
|
||||
|
|
|
|||
|
|
@ -478,13 +478,13 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
|
|||
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
|
||||
fprintf_ln(stderr, _("See git-pull(1) for details."));
|
||||
fprintf(stderr, "\n");
|
||||
fprintf_ln(stderr, " git pull <remote> <branch>");
|
||||
fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
|
||||
fprintf(stderr, "\n");
|
||||
} else if (!curr_branch->merge_nr) {
|
||||
const char *remote_name = NULL;
|
||||
|
||||
if (for_each_remote(get_only_remote, &remote_name) || !remote_name)
|
||||
remote_name = "<remote>";
|
||||
remote_name = _("<remote>");
|
||||
|
||||
fprintf_ln(stderr, _("There is no tracking information for the current branch."));
|
||||
if (opt_rebase)
|
||||
|
|
@ -493,12 +493,12 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
|
|||
fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
|
||||
fprintf_ln(stderr, _("See git-pull(1) for details."));
|
||||
fprintf(stderr, "\n");
|
||||
fprintf_ln(stderr, " git pull <remote> <branch>");
|
||||
fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
|
||||
fprintf(stderr, "\n");
|
||||
fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:\n"
|
||||
"\n"
|
||||
" git branch --set-upstream-to=%s/<branch> %s\n"),
|
||||
remote_name, curr_branch->name);
|
||||
fprintf_ln(stderr, _("If you wish to set tracking information for this branch you can do so with:"));
|
||||
fprintf(stderr, "\n");
|
||||
fprintf_ln(stderr, " git branch --set-upstream-to=%s/%s %s\n",
|
||||
remote_name, _("<branch>"), curr_branch->name);
|
||||
} else
|
||||
fprintf_ln(stderr, _("Your configuration specifies to merge with the ref '%s'\n"
|
||||
"from the remote, but no such ref was fetched."),
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
|
|||
list.entry[list.nr].is_submodule = S_ISGITLINK(ce->ce_mode);
|
||||
if (list.entry[list.nr++].is_submodule &&
|
||||
!is_staging_gitmodules_ok())
|
||||
die (_("Please, stage your changes to .gitmodules or stash them to proceed"));
|
||||
die (_("Please stage your changes to .gitmodules or stash them to proceed"));
|
||||
}
|
||||
|
||||
if (pathspec.nr) {
|
||||
|
|
|
|||
|
|
@ -56,11 +56,13 @@ get_remote_merge_branch () {
|
|||
error_on_missing_default_upstream () {
|
||||
cmd="$1"
|
||||
op_type="$2"
|
||||
op_prep="$3"
|
||||
op_prep="$3" # FIXME: op_prep is no longer used
|
||||
example="$4"
|
||||
branch_name=$(git symbolic-ref -q HEAD)
|
||||
display_branch_name="${branch_name#refs/heads/}"
|
||||
# If there's only one remote, use that in the suggestion
|
||||
remote="<remote>"
|
||||
remote="$(gettext "<remote>")"
|
||||
branch="$(gettext "<branch>")"
|
||||
if test $(git remote | wc -l) = 1
|
||||
then
|
||||
remote=$(git remote)
|
||||
|
|
@ -68,22 +70,32 @@ error_on_missing_default_upstream () {
|
|||
|
||||
if test -z "$branch_name"
|
||||
then
|
||||
echo "You are not currently on a branch. Please specify which
|
||||
branch you want to $op_type $op_prep. See git-${cmd}(1) for details.
|
||||
|
||||
$example
|
||||
"
|
||||
gettextln "You are not currently on a branch."
|
||||
else
|
||||
echo "There is no tracking information for the current branch.
|
||||
Please specify which branch you want to $op_type $op_prep.
|
||||
See git-${cmd}(1) for details
|
||||
|
||||
$example
|
||||
|
||||
If you wish to set tracking information for this branch you can do so with:
|
||||
|
||||
git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/}
|
||||
"
|
||||
gettextln "There is no tracking information for the current branch."
|
||||
fi
|
||||
case "$op_type" in
|
||||
rebase)
|
||||
gettextln "Please specify which branch you want to rebase against."
|
||||
;;
|
||||
merge)
|
||||
gettextln "Please specify which branch you want to merge with."
|
||||
;;
|
||||
*)
|
||||
echo >&2 "BUG: unknown operation type: $op_type"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
eval_gettextln "See git-\${cmd}(1) for details."
|
||||
echo
|
||||
echo " $example"
|
||||
echo
|
||||
if test -n "$branch_name"
|
||||
then
|
||||
gettextln "If you wish to set tracking information for this branch you can do so with:"
|
||||
echo
|
||||
echo " git branch --set-upstream-to=$remote/$branch $display_branch_name"
|
||||
echo
|
||||
fi
|
||||
exit 1
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,14 +37,14 @@ EOF
|
|||
|
||||
test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
|
||||
test_must_fail git merge branch 2>out &&
|
||||
test_cmp out expect &&
|
||||
test_i18ncmp out expect &&
|
||||
git commit --allow-empty -m empty &&
|
||||
(
|
||||
GIT_MERGE_VERBOSITY=0 &&
|
||||
export GIT_MERGE_VERBOSITY &&
|
||||
test_must_fail git merge branch 2>out2
|
||||
) &&
|
||||
test_cmp out2 expect &&
|
||||
test_i18ncmp out2 expect &&
|
||||
git reset --hard HEAD^
|
||||
'
|
||||
|
||||
|
|
@ -53,7 +53,7 @@ error: Your local changes to the following files would be overwritten by merge:
|
|||
four
|
||||
three
|
||||
two
|
||||
Please, commit your changes or stash them before you can merge.
|
||||
Please commit your changes or stash them before you can merge.
|
||||
error: The following untracked working tree files would be overwritten by merge:
|
||||
five
|
||||
Please move or remove them before you can merge.
|
||||
|
|
@ -65,14 +65,14 @@ test_expect_success 'untracked files or local changes ovewritten by merge' '
|
|||
git add three &&
|
||||
git add four &&
|
||||
test_must_fail git merge branch 2>out &&
|
||||
test_cmp out expect
|
||||
test_i18ncmp out expect
|
||||
'
|
||||
|
||||
cat >expect <<\EOF
|
||||
error: Your local changes to the following files would be overwritten by checkout:
|
||||
rep/one
|
||||
rep/two
|
||||
Please, commit your changes or stash them before you can switch branches.
|
||||
Please commit your changes or stash them before you can switch branches.
|
||||
Aborting
|
||||
EOF
|
||||
|
||||
|
|
@ -87,21 +87,21 @@ test_expect_success 'cannot switch branches because of local changes' '
|
|||
echo uno >rep/one &&
|
||||
echo dos >rep/two &&
|
||||
test_must_fail git checkout branch 2>out &&
|
||||
test_cmp out expect
|
||||
test_i18ncmp out expect
|
||||
'
|
||||
|
||||
cat >expect <<\EOF
|
||||
error: Your local changes to the following files would be overwritten by checkout:
|
||||
rep/one
|
||||
rep/two
|
||||
Please, commit your changes or stash them before you can switch branches.
|
||||
Please commit your changes or stash them before you can switch branches.
|
||||
Aborting
|
||||
EOF
|
||||
|
||||
test_expect_success 'not uptodate file porcelain checkout error' '
|
||||
git add rep/one rep/two &&
|
||||
test_must_fail git checkout branch 2>out &&
|
||||
test_cmp out expect
|
||||
test_i18ncmp out expect
|
||||
'
|
||||
|
||||
cat >expect <<\EOF
|
||||
|
|
@ -132,7 +132,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' '
|
|||
>rep/untracked-file &&
|
||||
>rep2/untracked-file &&
|
||||
test_must_fail git checkout branch 2>out &&
|
||||
test_cmp out ../expect
|
||||
test_i18ncmp out ../expect
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
|
|
@ -58,40 +58,74 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
|
|||
int i;
|
||||
const char **msgs = opts->msgs;
|
||||
const char *msg;
|
||||
const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
|
||||
|
||||
if (advice_commit_before_merge)
|
||||
msg = "Your local changes to the following files would be overwritten by %s:\n%%s"
|
||||
"Please, commit your changes or stash them before you can %s.";
|
||||
if (!strcmp(cmd, "checkout"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
|
||||
"Please commit your changes or stash them before you can switch branches.")
|
||||
: _("Your local changes to the following files would be overwritten by checkout:\n%%s");
|
||||
else if (!strcmp(cmd, "merge"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("Your local changes to the following files would be overwritten by merge:\n%%s"
|
||||
"Please commit your changes or stash them before you can merge.")
|
||||
: _("Your local changes to the following files would be overwritten by merge:\n%%s");
|
||||
else
|
||||
msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
|
||||
msg = advice_commit_before_merge
|
||||
? _("Your local changes to the following files would be overwritten by %s:\n%%s"
|
||||
"Please commit your changes or stash them before you can %s.")
|
||||
: _("Your local changes to the following files would be overwritten by %s:\n%%s");
|
||||
msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
|
||||
xstrfmt(msg, cmd, cmd2);
|
||||
xstrfmt(msg, cmd, cmd);
|
||||
|
||||
msgs[ERROR_NOT_UPTODATE_DIR] =
|
||||
"Updating the following directories would lose untracked files in it:\n%s";
|
||||
_("Updating the following directories would lose untracked files in it:\n%s");
|
||||
|
||||
if (advice_commit_before_merge)
|
||||
msg = "The following untracked working tree files would be %s by %s:\n%%s"
|
||||
"Please move or remove them before you can %s.";
|
||||
if (!strcmp(cmd, "checkout"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be removed by checkout:\n%%s"
|
||||
"Please move or remove them before you can switch branches.")
|
||||
: _("The following untracked working tree files would be removed by checkout:\n%%s");
|
||||
else if (!strcmp(cmd, "merge"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be removed by merge:\n%%s"
|
||||
"Please move or remove them before you can merge.")
|
||||
: _("The following untracked working tree files would be removed by merge:\n%%s");
|
||||
else
|
||||
msg = "The following untracked working tree files would be %s by %s:\n%%s";
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be removed by %s:\n%%s"
|
||||
"Please move or remove them before you can %s.")
|
||||
: _("The following untracked working tree files would be removed by %s:\n%%s");
|
||||
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
|
||||
|
||||
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, "removed", cmd, cmd2);
|
||||
msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, "overwritten", cmd, cmd2);
|
||||
if (!strcmp(cmd, "checkout"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
|
||||
"Please move or remove them before you can switch branches.")
|
||||
: _("The following untracked working tree files would be overwritten by checkout:\n%%s");
|
||||
else if (!strcmp(cmd, "merge"))
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be overwritten by merge:\n%%s"
|
||||
"Please move or remove them before you can merge.")
|
||||
: _("The following untracked working tree files would be overwritten by merge:\n%%s");
|
||||
else
|
||||
msg = advice_commit_before_merge
|
||||
? _("The following untracked working tree files would be overwritten by %s:\n%%s"
|
||||
"Please move or remove them before you can %s.")
|
||||
: _("The following untracked working tree files would be overwritten by %s:\n%%s");
|
||||
msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, cmd, cmd);
|
||||
|
||||
/*
|
||||
* Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
|
||||
* cannot easily display it as a list.
|
||||
*/
|
||||
msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind.";
|
||||
msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
|
||||
|
||||
msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
|
||||
"Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
|
||||
_("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
|
||||
msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
|
||||
"The following Working tree files would be overwritten by sparse checkout update:\n%s";
|
||||
_("The following Working tree files would be overwritten by sparse checkout update:\n%s");
|
||||
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
|
||||
"The following Working tree files would be removed by sparse checkout update:\n%s";
|
||||
_("The following Working tree files would be removed by sparse checkout update:\n%s");
|
||||
|
||||
opts->show_all_errors = 1;
|
||||
/* rejected paths may not have a static buffer */
|
||||
|
|
@ -168,7 +202,7 @@ static void display_error_msgs(struct unpack_trees_options *o)
|
|||
string_list_clear(rejects, 0);
|
||||
}
|
||||
if (something_displayed)
|
||||
fprintf(stderr, "Aborting\n");
|
||||
fprintf(stderr, _("Aborting\n"));
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue