diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-26 13:17:20 -0700 |
| commit | b262b8f889392623f8b6772505de013d0796824d (patch) | |
| tree | b881fb40018e11736be1dde03896dbaa0630462e /builtin/rm.c | |
| parent | 57b76d3379ade86d72cc9db83141e6ec084e6c8c (diff) | |
| parent | 2e3926b9489cb767b38526a3a72403087053a1d8 (diff) | |
| download | git-b262b8f889392623f8b6772505de013d0796824d.tar.gz | |
Merge branch 'va/i18n-misc-updates' into maint
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
Diffstat (limited to 'builtin/rm.c')
| -rw-r--r-- | builtin/rm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 8829b09d0b..be83c4347a 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -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) { |