* remove ^wrong^ rank translation of "Green" from Dutch translation (looks to much like translation for "Rookie")

* revert changes to po/Makefile.in.in from r1417
 * add some makevars to raw makefile system
 * add definitions of gettext macros P_ and NP_ to raw makefiles (and remove Q_ and Qn_)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1436 4a71c877-e1ca-e34f-864e-861f7616d084

makerules/config.mk.tmpl

@@ -30,3 +30,5 @@
 # Gettext stuff
 #PACKAGE=warzone2100
 #LOCALEDIR=""
+#XGETTEXT="xgettext"
+#MSGMERGE="msgmerge"

po/Makefile.in.in

@@ -55,7 +55,6 @@ XGETTEXT_ = @XGETTEXT@
 XGETTEXT_no = @XGETTEXT@
 XGETTEXT_yes = @XGETTEXT_015@
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-XGETTEXT_OPTIONS+=--keyword=Q_ --keyword=Qn_
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit

po/Makefile.raw

@@ -13,11 +13,11 @@ po-files: nb.po de.po da.po nl.po la.po
 update-po: clean po-files
 
 $(PACKAGE).pot: POTFILES.in
-	xgettext --default-domain=$(PACKAGE) --directory=.. --add-comments=TRANSLATORS: --keyword=_ --keyword=N_ --keyword=Q_ --keyword=Qn_ --files-from=$< --copyright-holder="Warzone Resurrection Project" --msgid-bugs-address="warzone-dev@gna.org"
+	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=.. --add-comments=TRANSLATORS: --keyword=_ --keyword=N_ --keyword=P_:1c,2 --keyword=NP_:1c,2 --files-from=$< --copyright-holder="Warzone Resurrection Project" --msgid-bugs-address="warzone-dev@gna.org"
 	mv $(PACKAGE).po $@
 
 %.po: $(PACKAGE).pot
-	msgmerge $@ $(PACKAGE).pot -o $@.new
+	$(MSGMERGE) $@ $(PACKAGE).pot -o $@.new
 	mv $@.new $@
 
 clean: