Skip to content

Commit 1be65ed

Browse files
gitstergitster
committed
Merge branch 'nd/i18n'
More message strings marked for i18n. By Nguyễn Thái Ngọc Duy (10) and Jonathan Nieder (1) * nd/i18n: help: replace underlining "help -a" headers using hyphens with a blank line i18n: bundle: mark strings for translation i18n: index-pack: mark strings for translation i18n: apply: update say_patch_name to give translators complete sentence i18n: apply: mark strings for translation i18n: remote: mark strings for translation i18n: make warn_dangling_symref() automatically append \n i18n: help: mark strings for translation i18n: mark relative dates for translation strbuf: convenience format functions with \n automatically appended Makefile: feed all header files to xgettext
2 parents a3db851 + 4470ef9 commit 1be65ed

File tree

17 files changed

+499
-384
lines changed

17 files changed

+499
-384
lines changed

‎Makefile‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ XDIFF_OBJS =
386386
VCSSVN_H =
387387
VCSSVN_OBJS =
388388
VCSSVN_TEST_OBJS =
389+
MISC_H =
389390
EXTRA_CPPFLAGS =
390391
LIB_H =
391392
LIB_OBJS =
@@ -546,6 +547,36 @@ LIB_FILE=libgit.a
546547
XDIFF_LIB=xdiff/lib.a
547548
VCSSVN_LIB=vcs-svn/lib.a
548549

550+
XDIFF_H += xdiff/xinclude.h
551+
XDIFF_H += xdiff/xmacros.h
552+
XDIFF_H += xdiff/xdiff.h
553+
XDIFF_H += xdiff/xtypes.h
554+
XDIFF_H += xdiff/xutils.h
555+
XDIFF_H += xdiff/xprepare.h
556+
XDIFF_H += xdiff/xdiffi.h
557+
XDIFF_H += xdiff/xemit.h
558+
559+
VCSSVN_H += vcs-svn/line_buffer.h
560+
VCSSVN_H += vcs-svn/sliding_window.h
561+
VCSSVN_H += vcs-svn/repo_tree.h
562+
VCSSVN_H += vcs-svn/fast_export.h
563+
VCSSVN_H += vcs-svn/svndiff.h
564+
VCSSVN_H += vcs-svn/svndump.h
565+
566+
MISC_H += branch.h
567+
MISC_H += bundle.h
568+
MISC_H += bisect.h
569+
MISC_H += common-cmds.h
570+
MISC_H += fetch-pack.h
571+
MISC_H += thread-utils.h
572+
MISC_H += send-pack.h
573+
MISC_H += shortlog.h
574+
MISC_H += reachable.h
575+
MISC_H += wt-status.h
576+
MISC_H += tar.h
577+
MISC_H += url.h
578+
MISC_H += walker.h
579+
549580
LIB_H += advice.h
550581
LIB_H += archive.h
551582
LIB_H += argv-array.h
@@ -2184,24 +2215,8 @@ connect.o transport.o url.o http-backend.o: url.h
21842215
http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
21852216
http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h
21862217

2187-
XDIFF_H += xdiff/xinclude.h
2188-
XDIFF_H += xdiff/xmacros.h
2189-
XDIFF_H += xdiff/xdiff.h
2190-
XDIFF_H += xdiff/xtypes.h
2191-
XDIFF_H += xdiff/xutils.h
2192-
XDIFF_H += xdiff/xprepare.h
2193-
XDIFF_H += xdiff/xdiffi.h
2194-
XDIFF_H += xdiff/xemit.h
2195-
21962218
xdiff-interface.o $(XDIFF_OBJS): $(XDIFF_H)
21972219

2198-
VCSSVN_H += vcs-svn/line_buffer.h
2199-
VCSSVN_H += vcs-svn/sliding_window.h
2200-
VCSSVN_H += vcs-svn/repo_tree.h
2201-
VCSSVN_H += vcs-svn/fast_export.h
2202-
VCSSVN_H += vcs-svn/svndiff.h
2203-
VCSSVN_H += vcs-svn/svndump.h
2204-
22052220
$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) $(VCSSVN_H)
22062221
endif
22072222

@@ -2298,7 +2313,7 @@ XGETTEXT_FLAGS_C = $(XGETTEXT_FLAGS) --language=C \
22982313
--keyword=_ --keyword=N_ --keyword="Q_:1,2"
22992314
XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell
23002315
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
2301-
LOCALIZED_C := $(C_OBJ:o=c)
2316+
LOCALIZED_C := $(C_OBJ:o=c) $(LIB_H) $(XDIFF_H) $(VCSSVN_H) $(MISC_H)
23022317
LOCALIZED_SH := $(SCRIPT_SH)
23032318
LOCALIZED_PERL := $(SCRIPT_PERL)
23042319

0 commit comments

Comments
 (0)