diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-05-31 19:20:42 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-01 07:43:10 -0700 |
| commit | f50b565a0f3af5a4045d0e713ac43e3f0de3aa9a (patch) | |
| tree | 679b69b8b79f80c84e4982e8d6622d6c38714f37 /builtin/apply.c | |
| parent | b2478aa0858811c29061ed32c2686468b89d7296 (diff) | |
| download | git-f50b565a0f3af5a4045d0e713ac43e3f0de3aa9a.tar.gz | |
i18n: apply: split to fix a partial i18n message
The 4th arg of "new mode (%o) of %s does not match old mode (%o)%s%s"
is blank string or string " of ". Even mark the string " of " for a
complete i18n, this message is still hard to translate right.
Split it into two slight different messages would make l10n teams happy.
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/apply.c')
| -rw-r--r-- | builtin/apply.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index dda9ea09c9..b4428ea34f 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3262,10 +3262,18 @@ static int check_patch(struct patch *patch) int same = !strcmp(old_name, new_name); if (!patch->new_mode) patch->new_mode = patch->old_mode; - if ((patch->old_mode ^ patch->new_mode) & S_IFMT) - return error(_("new mode (%o) of %s does not match old mode (%o)%s%s"), - patch->new_mode, new_name, patch->old_mode, - same ? "" : " of ", same ? "" : old_name); + if ((patch->old_mode ^ patch->new_mode) & S_IFMT) { + if (same) + return error(_("new mode (%o) of %s does not " + "match old mode (%o)"), + patch->new_mode, new_name, + patch->old_mode); + else + return error(_("new mode (%o) of %s does not " + "match old mode (%o) of %s"), + patch->new_mode, new_name, + patch->old_mode, old_name); + } } if (apply_data(patch, &st, ce) < 0) |