diff --git a/ChangeLog b/ChangeLog index 83f33a6..1bff58f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,11 @@ Changes in version 1.16.0 Do not ignore the option '--changelog' when the variable 'changelog_userdef' is defined in one of the configuration files. ++ improvement + * Makefiles.env, Makefile's, po files - Davide Madrisan: + Improved translation framework. + New makefile targets: 'pot-files', 'pot-merge', and 'locales-concatenate'. + ------------------------------------------------------------------------------- Changes in version 1.14.3 diff --git a/Makefile b/Makefile index 81ffcc9..716954d 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,6 @@ include VERSION include Makefile.env -PACKAGE = autospec FRONTEND = $(PACKAGE) PACKAGE_LIB = libspec.lib @@ -93,6 +92,11 @@ locales: $(MAKE) -C po/$$loc || exit 1;\ done +locales-concatenate: locales pot-files + @for loc in $(LOCALES); do\ + $(MAKE) locales-concatenate -C po/$$loc || exit 1;\ + done + install-frontend: $(PACKAGE) @echo "Installing frontend..." @$(INSTALL_DIR) $(DESTDIR)$(bindir) @@ -225,5 +229,5 @@ mostlyclean: $(MAKE) clean -C man/$$loc || exit 1;\ $(MAKE) clean -C po/$$loc || exit 1;\ done - @rm -f po/$(PACKAGE).pot + @rm -f po/*.pot diff --git a/Makefile.env b/Makefile.env index eb41b7a..d6b8258 100644 --- a/Makefile.env +++ b/Makefile.env @@ -36,5 +36,7 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM} INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DIR = ${INSTALL} -d -m 755 +PACKAGE = autospec + PO_COPYRIGH_HOLDER = Davide Madrisan -PO_BUGS_ADDRESS = davide.madrisan@gmail.com \ No newline at end of file +PO_BUGS_ADDRESS = davide.madrisan@gmail.com diff --git a/lib/Makefile b/lib/Makefile index 2ec13fb..ebf2df0 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -41,7 +41,7 @@ pot-files: $(pck_libs) --no-location \ --package-name=$(PACKAGE) \ --package-version=${VERSION} \ - $$f -o $(srcdir)/po/$$f.pot 2>/dev/null \ + $$f -o $(srcdir)/po/$${f/.lib}.pot 2>/dev/null \ && echo "[DONE]" || { echo "[ERROR]"; exit 1; };\ done diff --git a/po/it/Makefile b/po/it/Makefile index 80a6a27..0177a05 100644 --- a/po/it/Makefile +++ b/po/it/Makefile @@ -31,13 +31,20 @@ all: locales locales: $(pck_catalogs:.po=.mo) -pot-merge: +pck_manpages := + +pot-merge: $(patsubst %.po,%.pot,$(wildcard $(srcdir)/po/*.po)) @for f in $(pck_catalogs:.po=); do\ - echo "Merging '$$f.po' with '$$f.lib.pot'...";\ + echo "Merging '$$f.po' with '$$f.pot'...";\ /usr/bin/msgmerge --update --no-wrap \ - $(srcdir)/po/it/$$f.po $(srcdir)/po/$$f.pot;\ + $$f.po $(srcdir)/po/$$f.pot;\ done +locales-concatenate: pot-merge + @echo "Concatenating locales...";\ + /usr/bin/msgcat $(pck_catalogs:.po=) -o $(PACKAGE)-all.po;\ + echo "... $(PACKAGE)-all.po [DONE]" + install: locales @destdir="$(DESTDIR)$(localedir)/$(LANG)/LC_MESSAGES";\ $(INSTALL_DIR) $$destdir;\ @@ -53,4 +60,5 @@ uninstall: clean: rm -f $(pck_catalogs:.po=.mo) + rm -f $(srcdir)/po/$(PACKAGE)-all.po rm -f *.po~ diff --git a/po/it/autospec.po b/po/it/autospec.po index 117cead..177d9e0 100644 --- a/po/it/autospec.po +++ b/po/it/autospec.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" @@ -99,4 +98,3 @@ msgstr "plugin non trovato" msgid "can't create temporary files" msgstr "impossibile creare file temporanei" - diff --git a/po/it/config-getvar.po b/po/it/config-getvar.po index f3e42c9..32b780e 100644 --- a/po/it/config-getvar.po +++ b/po/it/config-getvar.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" diff --git a/po/it/libapse.po b/po/it/libapse.po index 0961b64..ae79a30 100644 --- a/po/it/libapse.po +++ b/po/it/libapse.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" diff --git a/po/it/libcfg.po b/po/it/libcfg.po index 873aa32..f02f1ed 100644 --- a/po/it/libcfg.po +++ b/po/it/libcfg.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" diff --git a/po/it/libmsgmng.po b/po/it/libmsgmng.po index 718171b..1b112bb 100644 --- a/po/it/libmsgmng.po +++ b/po/it/libmsgmng.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" diff --git a/po/it/libnetwork.po b/po/it/libnetwork.po index f612ff3..b71797b 100644 --- a/po/it/libnetwork.po +++ b/po/it/libnetwork.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" @@ -20,7 +19,7 @@ msgstr "" # lib/librepository.lib #, fuzzy msgid "this script requires bash version 3 or better" -msgstr "questo script richiede bash versione 2 o superiore" +msgstr "questo script richiede bash versione 3 o superiore" msgid "library not found" msgstr "libreria non trovata" @@ -38,14 +37,14 @@ msgid "\\`getopt' error" msgstr "errore in \\`getopt'" msgid "\\`getopt' error: bad command \\`$1'" -msgstr "errore in \\`getopt': commando errato \\`$1'" +msgstr "errore in \\`getopt': comando errato \\`$1'" msgid "usage error (--ftp/--html)" -msgstr "" +msgstr "errato utilizzo (--ftp/--html)" #, sh-format msgid "'\\\\' characters detected in \\$pck_name" -msgstr "" +msgstr "trovato carattere '\\\\' in \\$pck_name" msgid "not a number" msgstr "non รจ un numero" diff --git a/po/it/libspec.po b/po/it/libspec.po index 82ec181..e6c2be0 100644 --- a/po/it/libspec.po +++ b/po/it/libspec.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" diff --git a/po/it/libtest.po b/po/it/libtest.po index 69668bf..232605f 100644 --- a/po/it/libtest.po +++ b/po/it/libtest.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" @@ -18,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" msgid "this script requires bash version 3 or better" -msgstr "questo script richiede bash versione 2 o superiore" +msgstr "questo script richiede bash versione 3 o superiore" #, fuzzy msgid "library not found" diff --git a/po/it/pck-extract.po b/po/it/pck-extract.po index 1fd93e9..a6a6e8c 100644 --- a/po/it/pck-extract.po +++ b/po/it/pck-extract.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" diff --git a/po/it/pck-update.po b/po/it/pck-update.po index 9908391..64c9eec 100644 --- a/po/it/pck-update.po +++ b/po/it/pck-update.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" diff --git a/po/it/spec-create.po b/po/it/spec-create.po index d325514..8b9170a 100644 --- a/po/it/spec-create.po +++ b/po/it/spec-create.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" @@ -199,7 +198,7 @@ msgid "python modules must have this name structure (use \\`-n'):" msgstr "i nomi dei moduli python devono avere questa struttura (usare \\`-n'):" msgid "can't create temporary directory" -msgstr "impossibile creare directory temporanee" +msgstr "impossibile creare la cartella temporanea" msgid "unsupported package compression method" msgstr "metodo di compressione del pacchetto non supportato" diff --git a/po/it/test00_specsyntax.po b/po/it/test00_specsyntax.po index 0709b5e..066be2f 100644 --- a/po/it/test00_specsyntax.po +++ b/po/it/test00_specsyntax.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-22 22:08+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" diff --git a/po/it/test01_pkgquality.po b/po/it/test01_pkgquality.po index d83f7cd..6593dc2 100644 --- a/po/it/test01_pkgquality.po +++ b/po/it/test01_pkgquality.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n" diff --git a/po/it/test02_pkgsecurity.po b/po/it/test02_pkgsecurity.po index 378ef3d..080883f 100644 --- a/po/it/test02_pkgsecurity.po +++ b/po/it/test02_pkgsecurity.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the autospec package. # Davide Madrisan , 2004-2012. # - msgid "" msgstr "" "Project-Id-Version: autospec 1.16.0\n" "Report-Msgid-Bugs-To: davide.madrisan@gmail.com\n" -"POT-Creation-Date: 2012-11-19 23:37+0100\n" +"POT-Creation-Date: 2012-11-23 22:50+0100\n" "PO-Revision-Date: 2012-11-19 23:37+0100\n" "Last-Translator: Davide Madrisan \n" "Language-Team: \n"