X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c19b738e74e01e7301aec7815b5bac9782b3c9db..1f2b90153e9580ef89095cec62a61f770cb24ef9:/locale/Makefile

diff --git a/locale/Makefile b/locale/Makefile
index bd9212aae6..5e122b02c2 100644
--- 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.
 
-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
@@ -16,11 +17,11 @@ XGETTEXT=xgettext
 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
-	$(MSGFMT) -o $@ $<
+	$(MSGFMT) -c -o $@ $<
 
 # a PO file must be updated from wxstd.po to include new translations
 %.po: wxstd.po
@@ -34,7 +35,7 @@ wxstd.po:
 	find ../contrib/src -name "*.cpp" | $(XARGS) $(XGETTEXT) $(XGETTEXT_ARGS) -o wxstd.po
 
 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
@@ -42,13 +43,13 @@ allmo:
 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' \
-			-e 's/\([0-9]\+\) translated messages/TR=\1/' \
-			-e 's/\([0-9]\+\) fuzzy translations/FZ=\1/' \
-			-e 's/\([0-9]\+\) untranslated messages/UT=\1/'`; \
+			-e 's/\([0-9]\+\) translated messages\?/TR=\1/' \
+			-e 's/\([0-9]\+\) fuzzy translations\?/FZ=\1/' \
+			-e 's/\([0-9]\+\) untranslated messages\?/UT=\1/'`; \
 		TR=0 FZ=0 UT=0; \
 		eval $$x; \
 		TOTAL=`expr $$TR + $$FZ + $$UT`; \