examples: Improve error message when there is a mistake in a PO file.

* gettext-tools/examples/hello-*/po/Makefile.am (.po.gmo): Use suffix .gpo
instead of .1po.
* gettext-tools/examples/hello-java*/po/Makefile.am (update-properties,
update-classes): Likewise.
* gettext-tools/examples/hello-c++-qt/po/Makefile.am (.po.qm): Likewise.
* gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile ($(STRINGSFILES)):
Likewise.

diff --git a/gettext-tools/examples/hello-c++-qt/po/Makefile.am b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
index cbea4dd4790dd219a2b4d78e27e01a956ba2baf9..9a0c28404dd5692194d5fbee0eb259e4026aa04a 100644 (file)
--- a/gettext-tools/examples/hello-c++-qt/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-qt/po/Makefile.am
@@ -131,13 +131,13 @@ $(QMFILES): $(srcdir)/$(DOMAIN).pot
 .po.qm:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.qm && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --qt --statistics --verbose -o $${lang}.qm $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.qm && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --qt --statistics --verbose -o $${lang}.qm $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.qm && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --qt --statistics --verbose -o t-$${lang}.qm $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --qt --statistics --verbose -o t-$${lang}.qm $${lang}.gpo && \
        mv t-$${lang}.qm $${lang}.qm && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
index 444ec0953ddaf46537bc24535129b89fac58bfb6..0243bf6be82986e32f87082f4882a2cf37a90cbb 100644 (file)
--- a/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
+++ b/gettext-tools/examples/hello-c++-wxwidgets/po/Makefile.am
@@ -134,13 +134,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-clisp/po/Makefile.am b/gettext-tools/examples/hello-clisp/po/Makefile.am
index eebfcdbf3ba45e5f0f91cd483c8bf7bf9fe9a2fc..bcc190bd58bc06cad89da591620e349c6d01cc4f 100644 (file)
--- a/gettext-tools/examples/hello-clisp/po/Makefile.am
+++ b/gettext-tools/examples/hello-clisp/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-d/po/Makefile.am b/gettext-tools/examples/hello-d/po/Makefile.am
index 42d7beddc06887c11eec9d6702933e1687fff579..cc988084daf8207975f7c17095ce2795b2f59c89 100644 (file)
--- a/gettext-tools/examples/hello-d/po/Makefile.am
+++ b/gettext-tools/examples/hello-d/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-gawk/po/Makefile.am b/gettext-tools/examples/hello-gawk/po/Makefile.am
index 26d04996f3b8f24ee226596addb32fd9b1eff903..6f2038ce494957002719acddeda21b791d84bb73 100644 (file)
--- a/gettext-tools/examples/hello-gawk/po/Makefile.am
+++ b/gettext-tools/examples/hello-gawk/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-go-http/po/Makefile.am b/gettext-tools/examples/hello-go-http/po/Makefile.am
index ba5a3fdab9f5d2694faf90efa552c61c96c6dca5..4460d506014addc0134eed336a6ac472a939ea60 100644 (file)
--- a/gettext-tools/examples/hello-go-http/po/Makefile.am
+++ b/gettext-tools/examples/hello-go-http/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-go/po/Makefile.am b/gettext-tools/examples/hello-go/po/Makefile.am
index 341ba0a4cc14f1295ee555f6f00f42a6afbb3251..25470f2143bdf908cd5b29ff3ea64ddf6ecc8a1c 100644 (file)
--- a/gettext-tools/examples/hello-go/po/Makefile.am
+++ b/gettext-tools/examples/hello-go/po/Makefile.am
@@ -131,13 +131,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-guile/po/Makefile.am b/gettext-tools/examples/hello-guile/po/Makefile.am
index 5f605c68a5c84c39d78c8349ea0240c1892a881d..38a52b3502fed4f20efd459fd5a1d0b2f5920aa0 100644 (file)
--- a/gettext-tools/examples/hello-guile/po/Makefile.am
+++ b/gettext-tools/examples/hello-guile/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-java-awt/po/Makefile.am b/gettext-tools/examples/hello-java-awt/po/Makefile.am
index 0e41b794aa8672803bb9fc1a4b5777743690d23f..3c08f83236dc3e6d04338a23ba4203c33edf6fe3 100644 (file)
--- a/gettext-tools/examples/hello-java-awt/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-awt/po/Makefile.am
@@ -342,12 +342,12 @@ update-properties: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
        fi
        @for f in $(POFILES); do \
          lang=`echo $$f | sed -e 's,.*/,,' -e 's,\.po$$,,'`; \
-         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
-         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
-         echo "$(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.1po"; \
-         $(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.1po || exit 1; \
-         echo "$(MSGCAT) --properties-output -o $(srcdir)/$(DOMAIN)_$$lang.properties $${lang}.1po"; \
-         $(MSGCAT) --properties-output -o $(DOMAIN)_$$lang.properties.tmp $${lang}.1po || exit 1; \
+         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
+         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
+         echo "$(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.gpo"; \
+         $(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.gpo || exit 1; \
+         echo "$(MSGCAT) --properties-output -o $(srcdir)/$(DOMAIN)_$$lang.properties $${lang}.gpo"; \
+         $(MSGCAT) --properties-output -o $(DOMAIN)_$$lang.properties.tmp $${lang}.gpo || exit 1; \
          if test '$(srcdir)' = .; then \
            mv -f $(DOMAIN)_$$lang.properties.tmp $(DOMAIN)_$$lang.properties || exit 1; \
          else \
@@ -357,7 +357,7 @@ update-properties: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
              mv -f $(DOMAIN)_$$lang.properties.tmp $(srcdir)/$(DOMAIN)_$$lang.properties || exit 1; \
            fi; \
          fi; \
-         rm -f $${lang}.1po; \
+         rm -f $${lang}.gpo; \
        done
 
 # Alternatively, we could create classes instead of properties files.
@@ -375,10 +375,10 @@ update-classes: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
        fi
        @for f in $(POFILES); do \
          lang=`echo $$f | sed -e 's,.*/,,' -e 's,\.po$$,,'`; \
-         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
-         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
-         echo "$(GMSGFMT) -c --statistics --verbose -j -d $(srcdir) -r $(DOMAIN) -l $${lang} $${lang}.1po"; \
-         $(GMSGFMT) -c --statistics --verbose -j -d . -r $(DOMAIN) -l $${lang} $${lang}.1po || exit 1; \
+         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
+         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
+         echo "$(GMSGFMT) -c --statistics --verbose -j -d $(srcdir) -r $(DOMAIN) -l $${lang} $${lang}.gpo"; \
+         $(GMSGFMT) -c --statistics --verbose -j -d . -r $(DOMAIN) -l $${lang} $${lang}.gpo || exit 1; \
          if test '$(srcdir)' != .; then \
            if test -f $(srcdir)/$(DOMAIN)_$$lang.class && cmp $(DOMAIN)_$$lang.class $(srcdir)/$(DOMAIN)_$$lang.class >/dev/null; then \
              rm -f $(DOMAIN)_$$lang.class; \
@@ -386,7 +386,7 @@ update-classes: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
              mv -f $(DOMAIN)_$$lang.class $(srcdir)/$(DOMAIN)_$$lang.class || exit 1; \
            fi; \
          fi; \
-         rm -f $${lang}.1po; \
+         rm -f $${lang}.gpo; \
        done
 
 echo-catalogs:

diff --git a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am
index 0e41b794aa8672803bb9fc1a4b5777743690d23f..3c08f83236dc3e6d04338a23ba4203c33edf6fe3 100644 (file)
--- a/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-qtjambi/po/Makefile.am
@@ -342,12 +342,12 @@ update-properties: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
        fi
        @for f in $(POFILES); do \
          lang=`echo $$f | sed -e 's,.*/,,' -e 's,\.po$$,,'`; \
-         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
-         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
-         echo "$(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.1po"; \
-         $(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.1po || exit 1; \
-         echo "$(MSGCAT) --properties-output -o $(srcdir)/$(DOMAIN)_$$lang.properties $${lang}.1po"; \
-         $(MSGCAT) --properties-output -o $(DOMAIN)_$$lang.properties.tmp $${lang}.1po || exit 1; \
+         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
+         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
+         echo "$(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.gpo"; \
+         $(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.gpo || exit 1; \
+         echo "$(MSGCAT) --properties-output -o $(srcdir)/$(DOMAIN)_$$lang.properties $${lang}.gpo"; \
+         $(MSGCAT) --properties-output -o $(DOMAIN)_$$lang.properties.tmp $${lang}.gpo || exit 1; \
          if test '$(srcdir)' = .; then \
            mv -f $(DOMAIN)_$$lang.properties.tmp $(DOMAIN)_$$lang.properties || exit 1; \
          else \
@@ -357,7 +357,7 @@ update-properties: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
              mv -f $(DOMAIN)_$$lang.properties.tmp $(srcdir)/$(DOMAIN)_$$lang.properties || exit 1; \
            fi; \
          fi; \
-         rm -f $${lang}.1po; \
+         rm -f $${lang}.gpo; \
        done
 
 # Alternatively, we could create classes instead of properties files.
@@ -375,10 +375,10 @@ update-classes: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
        fi
        @for f in $(POFILES); do \
          lang=`echo $$f | sed -e 's,.*/,,' -e 's,\.po$$,,'`; \
-         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
-         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
-         echo "$(GMSGFMT) -c --statistics --verbose -j -d $(srcdir) -r $(DOMAIN) -l $${lang} $${lang}.1po"; \
-         $(GMSGFMT) -c --statistics --verbose -j -d . -r $(DOMAIN) -l $${lang} $${lang}.1po || exit 1; \
+         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
+         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
+         echo "$(GMSGFMT) -c --statistics --verbose -j -d $(srcdir) -r $(DOMAIN) -l $${lang} $${lang}.gpo"; \
+         $(GMSGFMT) -c --statistics --verbose -j -d . -r $(DOMAIN) -l $${lang} $${lang}.gpo || exit 1; \
          if test '$(srcdir)' != .; then \
            if test -f $(srcdir)/$(DOMAIN)_$$lang.class && cmp $(DOMAIN)_$$lang.class $(srcdir)/$(DOMAIN)_$$lang.class >/dev/null; then \
              rm -f $(DOMAIN)_$$lang.class; \
@@ -386,7 +386,7 @@ update-classes: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
              mv -f $(DOMAIN)_$$lang.class $(srcdir)/$(DOMAIN)_$$lang.class || exit 1; \
            fi; \
          fi; \
-         rm -f $${lang}.1po; \
+         rm -f $${lang}.gpo; \
        done
 
 echo-catalogs:

diff --git a/gettext-tools/examples/hello-java-swing/po/Makefile.am b/gettext-tools/examples/hello-java-swing/po/Makefile.am
index 0e41b794aa8672803bb9fc1a4b5777743690d23f..3c08f83236dc3e6d04338a23ba4203c33edf6fe3 100644 (file)
--- a/gettext-tools/examples/hello-java-swing/po/Makefile.am
+++ b/gettext-tools/examples/hello-java-swing/po/Makefile.am
@@ -342,12 +342,12 @@ update-properties: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
        fi
        @for f in $(POFILES); do \
          lang=`echo $$f | sed -e 's,.*/,,' -e 's,\.po$$,,'`; \
-         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
-         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
-         echo "$(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.1po"; \
-         $(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.1po || exit 1; \
-         echo "$(MSGCAT) --properties-output -o $(srcdir)/$(DOMAIN)_$$lang.properties $${lang}.1po"; \
-         $(MSGCAT) --properties-output -o $(DOMAIN)_$$lang.properties.tmp $${lang}.1po || exit 1; \
+         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
+         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
+         echo "$(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.gpo"; \
+         $(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.gpo || exit 1; \
+         echo "$(MSGCAT) --properties-output -o $(srcdir)/$(DOMAIN)_$$lang.properties $${lang}.gpo"; \
+         $(MSGCAT) --properties-output -o $(DOMAIN)_$$lang.properties.tmp $${lang}.gpo || exit 1; \
          if test '$(srcdir)' = .; then \
            mv -f $(DOMAIN)_$$lang.properties.tmp $(DOMAIN)_$$lang.properties || exit 1; \
          else \
@@ -357,7 +357,7 @@ update-properties: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
              mv -f $(DOMAIN)_$$lang.properties.tmp $(srcdir)/$(DOMAIN)_$$lang.properties || exit 1; \
            fi; \
          fi; \
-         rm -f $${lang}.1po; \
+         rm -f $${lang}.gpo; \
        done
 
 # Alternatively, we could create classes instead of properties files.
@@ -375,10 +375,10 @@ update-classes: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
        fi
        @for f in $(POFILES); do \
          lang=`echo $$f | sed -e 's,.*/,,' -e 's,\.po$$,,'`; \
-         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
-         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
-         echo "$(GMSGFMT) -c --statistics --verbose -j -d $(srcdir) -r $(DOMAIN) -l $${lang} $${lang}.1po"; \
-         $(GMSGFMT) -c --statistics --verbose -j -d . -r $(DOMAIN) -l $${lang} $${lang}.1po || exit 1; \
+         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
+         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
+         echo "$(GMSGFMT) -c --statistics --verbose -j -d $(srcdir) -r $(DOMAIN) -l $${lang} $${lang}.gpo"; \
+         $(GMSGFMT) -c --statistics --verbose -j -d . -r $(DOMAIN) -l $${lang} $${lang}.gpo || exit 1; \
          if test '$(srcdir)' != .; then \
            if test -f $(srcdir)/$(DOMAIN)_$$lang.class && cmp $(DOMAIN)_$$lang.class $(srcdir)/$(DOMAIN)_$$lang.class >/dev/null; then \
              rm -f $(DOMAIN)_$$lang.class; \
@@ -386,7 +386,7 @@ update-classes: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
              mv -f $(DOMAIN)_$$lang.class $(srcdir)/$(DOMAIN)_$$lang.class || exit 1; \
            fi; \
          fi; \
-         rm -f $${lang}.1po; \
+         rm -f $${lang}.gpo; \
        done
 
 echo-catalogs:

diff --git a/gettext-tools/examples/hello-java/po/Makefile.am b/gettext-tools/examples/hello-java/po/Makefile.am
index 0e41b794aa8672803bb9fc1a4b5777743690d23f..3c08f83236dc3e6d04338a23ba4203c33edf6fe3 100644 (file)
--- a/gettext-tools/examples/hello-java/po/Makefile.am
+++ b/gettext-tools/examples/hello-java/po/Makefile.am
@@ -342,12 +342,12 @@ update-properties: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
        fi
        @for f in $(POFILES); do \
          lang=`echo $$f | sed -e 's,.*/,,' -e 's,\.po$$,,'`; \
-         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
-         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
-         echo "$(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.1po"; \
-         $(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.1po || exit 1; \
-         echo "$(MSGCAT) --properties-output -o $(srcdir)/$(DOMAIN)_$$lang.properties $${lang}.1po"; \
-         $(MSGCAT) --properties-output -o $(DOMAIN)_$$lang.properties.tmp $${lang}.1po || exit 1; \
+         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
+         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
+         echo "$(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.gpo"; \
+         $(GMSGFMT) -c --statistics --verbose -o /dev/null $${lang}.gpo || exit 1; \
+         echo "$(MSGCAT) --properties-output -o $(srcdir)/$(DOMAIN)_$$lang.properties $${lang}.gpo"; \
+         $(MSGCAT) --properties-output -o $(DOMAIN)_$$lang.properties.tmp $${lang}.gpo || exit 1; \
          if test '$(srcdir)' = .; then \
            mv -f $(DOMAIN)_$$lang.properties.tmp $(DOMAIN)_$$lang.properties || exit 1; \
          else \
@@ -357,7 +357,7 @@ update-properties: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
              mv -f $(DOMAIN)_$$lang.properties.tmp $(srcdir)/$(DOMAIN)_$$lang.properties || exit 1; \
            fi; \
          fi; \
-         rm -f $${lang}.1po; \
+         rm -f $${lang}.gpo; \
        done
 
 # Alternatively, we could create classes instead of properties files.
@@ -375,10 +375,10 @@ update-classes: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
        fi
        @for f in $(POFILES); do \
          lang=`echo $$f | sed -e 's,.*/,,' -e 's,\.po$$,,'`; \
-         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
-         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
-         echo "$(GMSGFMT) -c --statistics --verbose -j -d $(srcdir) -r $(DOMAIN) -l $${lang} $${lang}.1po"; \
-         $(GMSGFMT) -c --statistics --verbose -j -d . -r $(DOMAIN) -l $${lang} $${lang}.1po || exit 1; \
+         echo "$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot"; \
+         $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $(srcdir)/$${lang}.po $(srcdir)/$(DOMAIN).pot || exit 1; \
+         echo "$(GMSGFMT) -c --statistics --verbose -j -d $(srcdir) -r $(DOMAIN) -l $${lang} $${lang}.gpo"; \
+         $(GMSGFMT) -c --statistics --verbose -j -d . -r $(DOMAIN) -l $${lang} $${lang}.gpo || exit 1; \
          if test '$(srcdir)' != .; then \
            if test -f $(srcdir)/$(DOMAIN)_$$lang.class && cmp $(DOMAIN)_$$lang.class $(srcdir)/$(DOMAIN)_$$lang.class >/dev/null; then \
              rm -f $(DOMAIN)_$$lang.class; \
@@ -386,7 +386,7 @@ update-classes: Makefile $(srcdir)/$(DOMAIN).pot $(POFILES)
              mv -f $(DOMAIN)_$$lang.class $(srcdir)/$(DOMAIN)_$$lang.class || exit 1; \
            fi; \
          fi; \
-         rm -f $${lang}.1po; \
+         rm -f $${lang}.gpo; \
        done
 
 echo-catalogs:

diff --git a/gettext-tools/examples/hello-librep/po/Makefile.am b/gettext-tools/examples/hello-librep/po/Makefile.am
index 9682cd0e63cd9d310d638b5fe0bee95c2ffb06a1..03e90b5ab7adfcba965d4baa544bf566b0d6f175 100644 (file)
--- a/gettext-tools/examples/hello-librep/po/Makefile.am
+++ b/gettext-tools/examples/hello-librep/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-modula2/po/Makefile.am b/gettext-tools/examples/hello-modula2/po/Makefile.am
index ee396b8ae7d494e62b538cdb402ebfbb9f476707..a1282f20d7308158e86467d0be52f582f69ff0a0 100644 (file)
--- a/gettext-tools/examples/hello-modula2/po/Makefile.am
+++ b/gettext-tools/examples/hello-modula2/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
index cdc2fee28db705be257368c1176f4879df0f38dd..5479b2024ab148a7e32a2e794af0ca867fd610d5 100644 (file)
--- a/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
+++ b/gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
@@ -246,10 +246,10 @@ update-strings: $(CATALOGS)
 # under version control.
 $(STRINGSFILES): $(DOMAIN).pot $(POFILES)
        mkdir -p $(patsubst %/,%, $(dir $@))
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $@.1po $(UNIXLOCALE_$(patsubst %.lproj,%, $(notdir $(patsubst %/,%, $(dir $@))))).po $(DOMAIN).pot
-       msgcat --stringtable-output -o $@.tmp $@.1po
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $@.gpo $(UNIXLOCALE_$(patsubst %.lproj,%, $(notdir $(patsubst %/,%, $(dir $@))))).po $(DOMAIN).pot
+       msgcat --stringtable-output -o $@.tmp $@.gpo
        mv $@.tmp $@
-       rm -f $@.1po
+       rm -f $@.gpo
 
 $(ENSTRINGSFILES): $(DOMAIN).pot
        mkdir -p $(patsubst %/,%, $(dir $@))

diff --git a/gettext-tools/examples/hello-ocaml/po/Makefile.am b/gettext-tools/examples/hello-ocaml/po/Makefile.am
index 55056aec59da971c70c293cb7d46517a00e284c5..6759d699c50223d21099beca0681981d1980cb23 100644 (file)
--- a/gettext-tools/examples/hello-ocaml/po/Makefile.am
+++ b/gettext-tools/examples/hello-ocaml/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-pascal/po/Makefile.am b/gettext-tools/examples/hello-pascal/po/Makefile.am
index 21c7e7ea673ccda17ccb068d6a5ba88212c3b4ad..0d0de0720b6b1b5ff78cca003699350b382f7c8f 100644 (file)
--- a/gettext-tools/examples/hello-pascal/po/Makefile.am
+++ b/gettext-tools/examples/hello-pascal/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-perl/po/Makefile.am b/gettext-tools/examples/hello-perl/po/Makefile.am
index be499f57c4015b0a4a4b65855e0bfaf85abb62d8..0e3b0ca27fbc27798c3ddb6860388899e9f48367 100644 (file)
--- a/gettext-tools/examples/hello-perl/po/Makefile.am
+++ b/gettext-tools/examples/hello-perl/po/Makefile.am
@@ -138,13 +138,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-php/po/Makefile.am b/gettext-tools/examples/hello-php/po/Makefile.am
index c8d72c65b6b9e98879c36927889fa3980722e9e5..b9cb205d4268e715f8c6f59ac7693a5cf881b887 100644 (file)
--- a/gettext-tools/examples/hello-php/po/Makefile.am
+++ b/gettext-tools/examples/hello-php/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-python/po/Makefile.am b/gettext-tools/examples/hello-python/po/Makefile.am
index 9823860ee0fcced0a3b8f03dc9beca4357b429b9..d1d82a688c029abb80fa345075e462913869cb2f 100644 (file)
--- a/gettext-tools/examples/hello-python/po/Makefile.am
+++ b/gettext-tools/examples/hello-python/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-ruby/po/Makefile.am b/gettext-tools/examples/hello-ruby/po/Makefile.am
index fc68f5a053bc87e7c1c032ee861ee81d3b59f8f9..a5492990f688df2a0a01b167dc0f986f04412a3a 100644 (file)
--- a/gettext-tools/examples/hello-ruby/po/Makefile.am
+++ b/gettext-tools/examples/hello-ruby/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-rust/po/Makefile.am b/gettext-tools/examples/hello-rust/po/Makefile.am
index 2f1fd6f7e760e1ae0a89ea9d38b023805e8efb8b..29d4e014afa0762e74e486cdef6a03ab2fd89543 100644 (file)
--- a/gettext-tools/examples/hello-rust/po/Makefile.am
+++ b/gettext-tools/examples/hello-rust/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-sh/po/Makefile.am b/gettext-tools/examples/hello-sh/po/Makefile.am
index 7b842f2bd0bb16138cbb0f1121484c8cfad1b2b5..131be9267972cc21aab40c60b3f859677feee52e 100644 (file)
--- a/gettext-tools/examples/hello-sh/po/Makefile.am
+++ b/gettext-tools/examples/hello-sh/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-smalltalk/po/Makefile.am b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
index 1f38b16fe7d4d12e0adb31830b514140f367f273..f6cd3e3b6492ccb97f0c235df30fff5bb6d9df9d 100644 (file)
--- a/gettext-tools/examples/hello-smalltalk/po/Makefile.am
+++ b/gettext-tools/examples/hello-smalltalk/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@

diff --git a/gettext-tools/examples/hello-ycp/po/Makefile.am b/gettext-tools/examples/hello-ycp/po/Makefile.am
index e13ef3a86647f2f33c182059cb551898d10f7d6b..657a3345739979ef761f95ad2b6da417169aac3b 100644 (file)
--- a/gettext-tools/examples/hello-ycp/po/Makefile.am
+++ b/gettext-tools/examples/hello-ycp/po/Makefile.am
@@ -128,13 +128,13 @@ $(GMOFILES): $(srcdir)/$(DOMAIN).pot
 .po.gmo:
        @lang=`echo $* | sed -e 's,.*/,,'`; \
        test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.gpo && rm -f $${lang}.gpo"; \
        cd $(srcdir) && \
        rm -f $${lang}.gmo && \
-       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
-       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+       $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.gpo $${lang}.po $(DOMAIN).pot && \
+       $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.gpo && \
        mv t-$${lang}.gmo $${lang}.gmo && \
-       rm -f $${lang}.1po
+       rm -f $${lang}.gpo
 
 
 all-local: all-local-@USE_NLS@