update translation framework - second stage

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-11-23 23:17:17 +01:00
parent 962a8d7f82
commit bf480b6358
19 changed files with 46 additions and 41 deletions

View File

@ -24,6 +24,11 @@ Changes in version 1.16.0
Do not ignore the option '--changelog' when the variable Do not ignore the option '--changelog' when the variable
'changelog_userdef' is defined in one of the configuration files. '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 Changes in version 1.14.3

View File

@ -17,7 +17,6 @@
include VERSION include VERSION
include Makefile.env include Makefile.env
PACKAGE = autospec
FRONTEND = $(PACKAGE) FRONTEND = $(PACKAGE)
PACKAGE_LIB = libspec.lib PACKAGE_LIB = libspec.lib
@ -93,6 +92,11 @@ locales:
$(MAKE) -C po/$$loc || exit 1;\ $(MAKE) -C po/$$loc || exit 1;\
done done
locales-concatenate: locales pot-files
@for loc in $(LOCALES); do\
$(MAKE) locales-concatenate -C po/$$loc || exit 1;\
done
install-frontend: $(PACKAGE) install-frontend: $(PACKAGE)
@echo "Installing frontend..." @echo "Installing frontend..."
@$(INSTALL_DIR) $(DESTDIR)$(bindir) @$(INSTALL_DIR) $(DESTDIR)$(bindir)
@ -225,5 +229,5 @@ mostlyclean:
$(MAKE) clean -C man/$$loc || exit 1;\ $(MAKE) clean -C man/$$loc || exit 1;\
$(MAKE) clean -C po/$$loc || exit 1;\ $(MAKE) clean -C po/$$loc || exit 1;\
done done
@rm -f po/$(PACKAGE).pot @rm -f po/*.pot

View File

@ -36,5 +36,7 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DATA = ${INSTALL} -m 644
INSTALL_DIR = ${INSTALL} -d -m 755 INSTALL_DIR = ${INSTALL} -d -m 755
PACKAGE = autospec
PO_COPYRIGH_HOLDER = Davide Madrisan PO_COPYRIGH_HOLDER = Davide Madrisan
PO_BUGS_ADDRESS = davide.madrisan@gmail.com PO_BUGS_ADDRESS = davide.madrisan@gmail.com

View File

@ -41,7 +41,7 @@ pot-files: $(pck_libs)
--no-location \ --no-location \
--package-name=$(PACKAGE) \ --package-name=$(PACKAGE) \
--package-version=${VERSION} \ --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; };\ && echo "[DONE]" || { echo "[ERROR]"; exit 1; };\
done done

View File

@ -31,13 +31,20 @@ all: locales
locales: $(pck_catalogs:.po=.mo) 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\ @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 \ /usr/bin/msgmerge --update --no-wrap \
$(srcdir)/po/it/$$f.po $(srcdir)/po/$$f.pot;\ $$f.po $(srcdir)/po/$$f.pot;\
done 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 install: locales
@destdir="$(DESTDIR)$(localedir)/$(LANG)/LC_MESSAGES";\ @destdir="$(DESTDIR)$(localedir)/$(LANG)/LC_MESSAGES";\
$(INSTALL_DIR) $$destdir;\ $(INSTALL_DIR) $$destdir;\
@ -53,4 +60,5 @@ uninstall:
clean: clean:
rm -f $(pck_catalogs:.po=.mo) rm -f $(pck_catalogs:.po=.mo)
rm -f $(srcdir)/po/$(PACKAGE)-all.po
rm -f *.po~ rm -f *.po~

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
@ -99,4 +98,3 @@ msgstr "plugin non trovato"
msgid "can't create temporary files" msgid "can't create temporary files"
msgstr "impossibile creare file temporanei" msgstr "impossibile creare file temporanei"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
@ -20,7 +19,7 @@ msgstr ""
# lib/librepository.lib # lib/librepository.lib
#, fuzzy #, fuzzy
msgid "this script requires bash version 3 or better" 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" msgid "library not found"
msgstr "libreria non trovata" msgstr "libreria non trovata"
@ -38,14 +37,14 @@ msgid "\\`getopt' error"
msgstr "errore in \\`getopt'" msgstr "errore in \\`getopt'"
msgid "\\`getopt' error: bad command \\`$1'" 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)" msgid "usage error (--ftp/--html)"
msgstr "" msgstr "errato utilizzo (--ftp/--html)"
#, sh-format #, sh-format
msgid "'\\\\' characters detected in \\$pck_name" msgid "'\\\\' characters detected in \\$pck_name"
msgstr "" msgstr "trovato carattere '\\\\' in \\$pck_name"
msgid "not a number" msgid "not a number"
msgstr "non è un numero" msgstr "non è un numero"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
@ -18,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
msgid "this script requires bash version 3 or better" 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 #, fuzzy
msgid "library not found" msgid "library not found"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \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'):" msgstr "i nomi dei moduli python devono avere questa struttura (usare \\`-n'):"
msgid "can't create temporary directory" msgid "can't create temporary directory"
msgstr "impossibile creare directory temporanee" msgstr "impossibile creare la cartella temporanea"
msgid "unsupported package compression method" msgid "unsupported package compression method"
msgstr "metodo di compressione del pacchetto non supportato" msgstr "metodo di compressione del pacchetto non supportato"

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"

View File

@ -3,12 +3,11 @@
# This file is distributed under the same license as the autospec package. # This file is distributed under the same license as the autospec package.
# Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012. # Davide Madrisan <davide.madrisan@gmail.com>, 2004-2012.
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: autospec 1.16.0\n" "Project-Id-Version: autospec 1.16.0\n"
"Report-Msgid-Bugs-To: davide.madrisan@gmail.com\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" "PO-Revision-Date: 2012-11-19 23:37+0100\n"
"Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n" "Last-Translator: Davide Madrisan <davide.madrisan@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"