diff --git a/misc/po/Makefile b/misc/po/Makefile
new file mode 100644
index 000000000..ed9727bda
--- /dev/null
+++ b/misc/po/Makefile
@@ -0,0 +1,71 @@
+INSTALL= /usr/bin/install -c
+INSTALL_PROGRAM= ${INSTALL}
+INSTALL_DATA= ${INSTALL} -m 644
+INSTALLNLSDIR=$(DESTDIR)/usr/share/locale
+top_srcdir = "."
+
+
+MSGMERGE = intltool-update -x --gettext-package=$(NLSPACKAGE) --dist
+
+NLSPACKAGE = entropy
+
+CATALOGS = $(shell ls *.po)
+FMTCATALOGS = $(patsubst %.po,%.mo,$(CATALOGS))
+
+PYFILES  = $(wildcard ../../entropy/*.py) $(wildcard ../../client/*.py) $(wildcard ../../server/*.py) $(wildcard ../../client/equo) $(wildcard ../../server/reagent) $(wildcard ../../server/activator)
+POTFILES  = $(PYFILES)
+
+all: $(NLSPACKAGE).pot $(FMTCATALOGS)
+
+POTFILES.in:
+	for file in $(POTFILES); do \
+		echo "$${file#../}" ; \
+	done > $@
+
+$(NLSPACKAGE).pot: $(POTFILES) POTFILES.in
+	intltool-update --gettext-package=$(NLSPACKAGE) --pot
+
+update-po: Makefile $(NLSPACKAGE).pot refresh-po
+
+refresh-po: Makefile POTFILES.in
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+		lang=`basename $$cat .po`; \
+		cp $$lang.po $$lang.old.po; \
+		if $(MSGMERGE) $$lang ; then \
+			rm -f $$lang.old.po ; \
+			echo "$(MSGMERGE) of $$lang succeeded" ; \
+		else \
+			echo "$(MSGMERGE) of $$lang failed" ; \
+			mv $$lang.old.po $$lang.po ; \
+		fi \
+	done
+
+report:
+	@for cat in *.po ; do \
+		echo -n "$$cat: "; \
+		msgfmt --statistics -o /dev/null $$cat; \
+	done    
+
+clean:
+	@rm -fv *mo *~ .depend *.autosave
+   
+distclean: clean
+	rm -f *mo .depend Makefile $(NLSPACKAGE).pot POTFILES.in
+
+depend:
+
+install:	all
+	mkdir -p $(PREFIX)/$(INSTALLNLSDIR)
+	for n in $(CATALOGS); do \
+	    l=`basename $$n .po`; \
+	    mo=$$l.mo; \
+	    if [ ! -f $$mo ]; then continue; fi; \
+	    $(INSTALL) -m 755 -d $(PREFIX)/$(INSTALLNLSDIR)/$$l; \
+	    $(INSTALL) -m 755 -d $(PREFIX)/$(INSTALLNLSDIR)/$$l/LC_MESSAGES; \
+	    $(INSTALL) -m 644 $$mo \
+		$(PREFIX)/$(INSTALLNLSDIR)/$$l/LC_MESSAGES/$(NLSPACKAGE).mo; \
+	done
+
+%.mo: %.po
+	msgfmt -o $@ $<
diff --git a/misc/po/POTFILES.in b/misc/po/POTFILES.in
new file mode 100644
index 000000000..2df2536c5
--- /dev/null
+++ b/misc/po/POTFILES.in
@@ -0,0 +1,25 @@
+../libraries/outputTools.py
+../libraries/entropy.py
+../libraries/entropyTools.py
+../libraries/databaseTools.py
+../libraries/exceptionTools.py
+../libraries/entropyConstants.py
+../libraries/entropy_i18n.py
+../libraries/etpXpak.py
+../libraries/test.py
+../libraries/dumpTools.py
+../client/text_cache.py
+../client/text_configuration.py
+../client/text_ui.py
+../client/text_repositories.py
+../client/text_rescue.py
+../client/text_smart.py
+../client/text_query.py
+../client/text_security.py
+../server/server_query.py
+../server/server_reagent.py
+../server/server_activator.py
+../client/equo
+../server/activator
+../server/reagent
+
diff --git a/misc/po/entropy.pot b/misc/po/entropy.pot
new file mode 100644
index 000000000..8ce3cae59
--- /dev/null
+++ b/misc/po/entropy.pot
@@ -0,0 +1,121 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-16 17:57+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../libraries/entropy.py:134 ../../libraries/entropy.py:142
+msgid "Repository"
+msgstr ""
+
+#: ../../libraries/entropy.py:134
+msgid "is not available"
+msgstr ""
+
+#: ../../libraries/entropy.py:134 ../../libraries/entropy.py:142
+msgid "Cannot validate"
+msgstr ""
+
+#: ../../libraries/entropy.py:142
+msgid "is corrupted"
+msgstr ""
+
+#: ../../libraries/entropy.py:204
+msgid ""
+"Another Entropy instance is currently active, cannot satisfy your request."
+msgstr ""
+
+#: ../../libraries/entropy.py:224
+msgid "Resources unlocked, let's go!"
+msgstr ""
+
+#: ../../libraries/entropy.py:233
+#, python-format
+msgid "Resources still locked after %s minutes, giving up!"
+msgstr ""
+
+#: ../../libraries/entropy.py:241
+#, python-format
+msgid "Resources locked, sleeping %s seconds, check #%s/%s"
+msgstr ""
+
+#: ../../libraries/entropy.py:291
+#, python-format
+msgid "Nothing to backup in etpConst with %s key"
+msgstr ""
+
+#: ../../libraries/entropy.py:351
+msgid "System database not found or corrupted"
+msgstr ""
+
+#: ../../libraries/entropy.py:386 ../../libraries/entropy.py:417
+#: ../../libraries/entropy.py:425
+msgid "Sanity Check"
+msgstr ""
+
+#: ../../libraries/entropy.py:386
+msgid "system database"
+msgstr ""
+
+#: ../../libraries/entropy.py:394
+msgid "Scanning..."
+msgstr ""
+
+#: ../../libraries/entropy.py:411
+#, python-format
+msgid "Errors on idpackage %s, error: %s"
+msgstr ""
+
+#: ../../libraries/entropy.py:417
+msgid "PASSED"
+msgstr ""
+
+#: ../../libraries/entropy.py:425
+msgid "CORRUPTED"
+msgstr ""
+
+#: ../../libraries/entropy.py:471
+#, python-format
+msgid "Repository %s hasn't been downloaded yet."
+msgstr ""
+
+#: ../../libraries/entropy.py:554
+#, python-format
+msgid "Cleaning %s => *.dmp..."
+msgstr ""
+
+#: ../../libraries/entropy.py:563
+msgid "Cache is now empty."
+msgstr ""
+
+#: ../../libraries/entropy.py:578
+msgid "Configuration files"
+msgstr ""
+
+#: ../../libraries/entropy.py:583
+msgid "Scanning hard disk"
+msgstr ""
+
+#: ../../libraries/entropy.py:589
+msgid "Cache generation complete."
+msgstr ""
+
+#: ../../libraries/entropy.py:597
+msgid "Resolving metadata"
+msgstr ""
+
+#: ../../libraries/entropy.py:614
+msgid "Dependencies cache filled."
+msgstr ""
diff --git a/misc/po/it.po b/misc/po/it.po
new file mode 100644
index 000000000..d8ae24f37
--- /dev/null
+++ b/misc/po/it.po
@@ -0,0 +1,127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Spritz 0.14\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-05-16 17:57+0200\n"
+"PO-Revision-Date: 2008-05-16 18:03+0100\n"
+"Last-Translator: Fabio Erculiani <lxnay@sabayonlinux.org>\n"
+"Language-Team: Fabio Erculiani <lxnay@sabayonlinux.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Italian\n"
+"X-Poedit-Country: ITALY\n"
+"X-Poedit-SourceCharset: iso-8859-1\n"
+
+#: ../../libraries/entropy.py:134
+#: ../../libraries/entropy.py:142
+msgid "Repository"
+msgstr "Repository"
+
+#: ../../libraries/entropy.py:134
+msgid "is not available"
+msgstr "non è disponibile"
+
+#: ../../libraries/entropy.py:134
+#: ../../libraries/entropy.py:142
+msgid "Cannot validate"
+msgstr "Impossibile validare"
+
+#: ../../libraries/entropy.py:142
+msgid "is corrupted"
+msgstr "è corrotto."
+
+#: ../../libraries/entropy.py:204
+msgid "Another Entropy instance is currently active, cannot satisfy your request."
+msgstr ""
+
+#: ../../libraries/entropy.py:224
+msgid "Resources unlocked, let's go!"
+msgstr ""
+
+#: ../../libraries/entropy.py:233
+#, python-format
+msgid "Resources still locked after %s minutes, giving up!"
+msgstr ""
+
+#: ../../libraries/entropy.py:241
+#, python-format
+msgid "Resources locked, sleeping %s seconds, check #%s/%s"
+msgstr ""
+
+#: ../../libraries/entropy.py:291
+#, python-format
+msgid "Nothing to backup in etpConst with %s key"
+msgstr ""
+
+#: ../../libraries/entropy.py:351
+msgid "System database not found or corrupted"
+msgstr "Database di sistema non trovato o corrotto"
+
+#: ../../libraries/entropy.py:386
+#: ../../libraries/entropy.py:417
+#: ../../libraries/entropy.py:425
+msgid "Sanity Check"
+msgstr "Controllo sanità"
+
+#: ../../libraries/entropy.py:386
+msgid "system database"
+msgstr "database di sistema"
+
+#: ../../libraries/entropy.py:394
+msgid "Scanning..."
+msgstr "Scansione..."
+
+#: ../../libraries/entropy.py:411
+#, python-format
+msgid "Errors on idpackage %s, error: %s"
+msgstr ""
+
+#: ../../libraries/entropy.py:417
+msgid "PASSED"
+msgstr ""
+
+#: ../../libraries/entropy.py:425
+msgid "CORRUPTED"
+msgstr ""
+
+#: ../../libraries/entropy.py:471
+#, python-format
+msgid "Repository %s hasn't been downloaded yet."
+msgstr ""
+
+#: ../../libraries/entropy.py:554
+#, python-format
+msgid "Cleaning %s => *.dmp..."
+msgstr ""
+
+#: ../../libraries/entropy.py:563
+msgid "Cache is now empty."
+msgstr "Cache svuotata."
+
+#: ../../libraries/entropy.py:578
+#, fuzzy
+msgid "Configuration files"
+msgstr "File di configurazione"
+
+#: ../../libraries/entropy.py:583
+msgid "Scanning hard disk"
+msgstr "Scansione dell'hard disk."
+
+#: ../../libraries/entropy.py:589
+msgid "Cache generation complete."
+msgstr "Generazione Cache completata."
+
+#: ../../libraries/entropy.py:597
+msgid "Resolving metadata"
+msgstr "Risoluzione metadati"
+
+#: ../../libraries/entropy.py:614
+msgid "Dependencies cache filled."
+msgstr "Cache dipendenze riempita."
+