diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-09-21 15:15:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-21 15:15:28 -0700 |
| commit | 1fe6f5fb0a4bf348b22790b4d766a463e013a384 (patch) | |
| tree | 8edd9f522bdb14e170d7ac53f34454268e5ad5bb /builtin/update-index.c | |
| parent | e8f871a9cefbcf46211c1fe0d0893f1ef5eb304b (diff) | |
| parent | 43073f89848d4683656a0770e8ee8d1e1734e6e3 (diff) | |
| download | git-1fe6f5fb0a4bf348b22790b4d766a463e013a384.tar.gz | |
Merge branch 'va/i18n'
More i18n.
* va/i18n:
i18n: update-index: mark warnings for translation
i18n: show-branch: mark plural strings for translation
i18n: show-branch: mark error messages for translation
i18n: receive-pack: mark messages for translation
notes: spell first word of error messages in lowercase
i18n: notes: mark error messages for translation
i18n: merge-recursive: mark verbose message for translation
i18n: merge-recursive: mark error messages for translation
i18n: config: mark error message for translation
i18n: branch: mark option description for translation
i18n: blame: mark error messages for translation
Diffstat (limited to 'builtin/update-index.c')
| -rw-r--r-- | builtin/update-index.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index 44fb2e4fd0..73f6b3e1be 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1128,9 +1128,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) break; case UC_DISABLE: if (git_config_get_untracked_cache() == 1) - warning("core.untrackedCache is set to true; " - "remove or change it, if you really want to " - "disable the untracked cache"); + warning(_("core.untrackedCache is set to true; " + "remove or change it, if you really want to " + "disable the untracked cache")); remove_untracked_cache(&the_index); report(_("Untracked cache disabled")); break; @@ -1140,9 +1140,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) case UC_ENABLE: case UC_FORCE: if (git_config_get_untracked_cache() == 0) - warning("core.untrackedCache is set to false; " - "remove or change it, if you really want to " - "enable the untracked cache"); + warning(_("core.untrackedCache is set to false; " + "remove or change it, if you really want to " + "enable the untracked cache")); add_untracked_cache(&the_index); report(_("Untracked cache enabled for '%s'"), get_git_work_tree()); break; |