development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 02:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mg/describe-debug-l10n'

Browse source 
Some debugging output from "git describe" were marked for l10n,
but some weren't.  Mark missing ones for l10n.

* mg/describe-debug-l10n:
  l10n: de: translate describe debug terms
  describe: localize debug output fully
This commit is contained in:
Junio C Hamano 2017-03-30 14:07:17 -07:00
parent 42e1cc517b 7d5a38b61f
commit 3e8ff5e4f3
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
builtin/describe.c
View file

@ -50,7 +50,7 @@ struct commit_name {
};
static const char *prio_names[] = {
"head", "lightweight", "annotated",
N_("head"), N_("lightweight"), N_("annotated"),
};
static int commit_name_cmp(const struct commit_name *cn1,
@ -395,10 +395,19 @@ static void describe(const char *arg, int last_one)
free_commit_list(list);
if (debug) {
static int label_width = -1;
if (label_width < 0) {
int i, w;
for (i = 0; i < ARRAY_SIZE(prio_names); i++) {
w = strlen(_(prio_names[i]));
if (label_width < w)
label_width = w;
}
}
for (cur_match = 0; cur_match < match_cnt; cur_match++) {
struct possible_tag *t = &all_matches[cur_match];
fprintf(stderr, " %-11s %8d %s\n",
prio_names[t->name->prio],
fprintf(stderr, " %-*s %8d %s\n",
label_width, _(prio_names[t->name->prio]),
t->depth, t->name->path);
}
fprintf(stderr, _("traversed %lu commits\n"), seen_commits);

14
po/de.po
View file

@ -7530,7 +7530,19 @@ msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
msgid "git describe [<options>] --dirty"
msgstr "git describe [<Optionen>] --dirty"
#: builtin/describe.c:217
#: builtin/describe.c:52
msgid "head"
msgstr "Branch"
#: builtin/describe.c:52
msgid "lightweight"
msgstr "nicht-annotiert"
#: builtin/describe.c:52
msgid "annotated"
msgstr "annotiert"
#: builtin/describe.c:249
#, c-format
msgid "annotated tag %s not available"
msgstr "annotiertes Tag %s ist nicht verfügbar"