Junio C Hamano wrote: > Jiang Xin <worldhello.net@xxxxxxxxx> writes: >> I have a question, which version of po should be maintained? master >> branch or maint branch. > > I would say for this round the git-po repository and its pot file should > pick up whatever new translatable strings are added to 'master'. > > After this is merged in 1.7.10, we may want to maintain separate tracks, > but at this moment there is no point maintaining something mergeable to > 1.7.9.x maintenance track. I wonder if there's a simple to ask the gettext tools to make a po template including strings from both 'maint' and 'master'. (Hackish way demonstrated below.) Hopefully that would make it easier for translators to keep both tracks well maintained at the same time. If a problem in the translation of a string shared by 'master' and 'maint' is only noticed while working on 'master', there would be no need to go through the "switch branches; make the change; switch back; merge" dance. What do you think? Jonathan diff --git i/Makefile w/Makefile index 1e91b19c..5dbc6205 100644 --- i/Makefile +++ w/Makefile @@ -2103,7 +2103,8 @@ LOCALIZED_C := $(C_OBJ:o=c) LOCALIZED_SH := $(SCRIPT_SH) po/git.pot: $(LOCALIZED_C) - $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ $(XGETTEXT_FLAGS_C) $(LOCALIZED_C) + cp $@ $@+ + $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_C) $(LOCALIZED_C) $(QUIET_XGETTEXT)$(XGETTEXT) -o$@+ --join-existing $(XGETTEXT_FLAGS_SH) \ $(LOCALIZED_SH) mv $@+ $@ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html