optimized highlighting to reduce flicker

[wxWidgets.git] / locale / Makefile

diff --git a/locale/Makefile b/locale/Makefile
index 4f62faa3236b99058c24f9853ceb325d4f373f98..fd460c7e53cf1776bbf2d2ff498726b02df3907d 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -7,7 +7,8 @@
 # being called with this dir as the cwd, but if we generate this file
 # with configure an explicit path should be specified -- RL.
 
 # being called with this dir as the cwd, but if we generate this file
 # with configure an explicit path should be specified -- RL.
 

-WX_LINGUAS := `ls *.po 2> /dev/null | sed -n 's/\(wxstd\)\?\.po//p'`
+WX_LINGUAS := $(shell ls *.po */*.po 2> /dev/null | sed 's/wxstd.po//g' | sed 's/.po//g')
+WX_LINGUAS_UPDATE := $(shell ls *.po 2> /dev/null | sed 's/wxstd.po//g' | sed 's/.po//g')

 
 # the programs we use (TODO: use configure to detect them)
 MSGFMT=msgfmt --verbose
 
 # the programs we use (TODO: use configure to detect them)
 MSGFMT=msgfmt --verbose


@@ -16,25 +17,28 @@ XGETTEXT=xgettext
 XARGS=xargs
 
 # common xgettext args: C++ syntax, use the specified macro names as markers
 XARGS=xargs
 
 # common xgettext args: C++ syntax, use the specified macro names as markers

-XGETTEXT_ARGS=-C -k_ -kwxGetTranslation -kwxTRANSLATE -s -j
+XGETTEXT_ARGS=-C -k_ -kwxPLURAL:1,2 -kwxTRANSLATE -s -j

 
 # implicit rules
 %.mo: %.po
 
 # implicit rules
 %.mo: %.po

-       $(MSGFMT) -o $@ $<
+       $(MSGFMT) -c -o $@ $<

 
 # a PO file must be updated from wxstd.po to include new translations
 %.po: wxstd.po
        if [ -f $@ ]; then $(MSGMERGE) $@ wxstd.po > $@.new && mv $@.new $@; else cp wxstd.po $@; fi
 
 
 # a PO file must be updated from wxstd.po to include new translations
 %.po: wxstd.po
        if [ -f $@ ]; then $(MSGMERGE) $@ wxstd.po > $@.new && mv $@.new $@; else cp wxstd.po $@; fi
 

+# note the extra -kAddToPopUp used for Scintilla files: this is a hack to
+# translate the popup menu items

 wxstd.po:
        touch $@
        find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
        find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
        find ../contrib/include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
        find ../contrib/src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
 wxstd.po:
        touch $@
        find ../include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
        find ../src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
        find ../contrib/include -name "*.h" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
        find ../contrib/src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po

+       find ../contrib/src/stc/scintilla/src -name "*.cxx" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -kAddToPopUp -o wxstd.po

 
 allpo: force-update
 
 allpo: force-update

-       @-for t in $(WX_LINGUAS); do $(MAKE) $$t.po; done
+       @-for t in $(WX_LINGUAS_UPDATE); do $(MAKE) $$t.po; done

 
 allmo:
        @for t in $(WX_LINGUAS); do $(MAKE) $$t.mo; done
 
 allmo:
        @for t in $(WX_LINGUAS); do $(MAKE) $$t.mo; done


@@ -42,7 +46,7 @@ allmo:
 force-update:
        $(RM) wxstd.po
 
 force-update:
        $(RM) wxstd.po
 

-# print out the percentage of the trsnalted strings
+# print out the percentage of the translated strings

 stats: FORCE
        @for i in $(WX_LINGUAS); do \
                x=`$(MSGFMT) -o /dev/null "$$i.po" 2>&1 | sed -e 's/[,\.]//g' \
 stats: FORCE
        @for i in $(WX_LINGUAS); do \
                x=`$(MSGFMT) -o /dev/null "$$i.po" 2>&1 | sed -e 's/[,\.]//g' \