mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'va/i18n'

Browse Source 
More i18n marking.

* va/i18n:
  i18n: config: unfold error messages marked for translation
  i18n: notes: mark comment for translation
This commit is contained in:
Junio C Hamano
2016-08-08 14:48:38 -07:00
parent 6b9114c649 1b8132d99d
commit 768ededa9c
4 changed files with 112 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cache.h
View File

@ -1567,10 +1567,18 @@ struct git_config_source {
const char *blob;
};
enum config_origin_type {
CONFIG_ORIGIN_BLOB,
CONFIG_ORIGIN_FILE,
CONFIG_ORIGIN_STDIN,
CONFIG_ORIGIN_SUBMODULE_BLOB,
CONFIG_ORIGIN_CMDLINE
};
typedef int (*config_fn_t)(const char *, const char *, void *);
extern int git_default_config(const char *, const char *, void *);
extern int git_config_from_file(config_fn_t fn, const char *, void *);
extern int git_config_from_mem(config_fn_t fn, const char *origin_type,
extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type,
const char *name, const char *buf, size_t len, void *data);
extern void git_config_push_parameter(const char *text);
extern int git_config_from_parameters(config_fn_t fn, void *data);
@ -1714,7 +1722,7 @@ extern int ignore_untracked_cache_config;
struct key_value_info {
const char *filename;
int linenr;
const char *origin_type;
enum config_origin_type origin_type;
enum config_scope scope;
};