diff --git a/Makefile b/Makefile
index 6454ed3..7ba69bf 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_DIR = ${INSTALL} -d -m 755
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-pck_catalogs := $(wildcard po/*.po)
+pck_catalogs := $(wildcard po/*/*.po)
 
 .po.mo:; msgfmt $< -o $@
 
@@ -33,6 +33,9 @@ pck_catalogs := $(wildcard po/*.po)
 
 locales: $(pck_catalogs:.po=.mo)
 
+# TODO: test next time for integration:
+# xgettext -j bin/makedist-announcement.sh makedist/makedist-announcement --language=shell --from-code=UTF-8
+
 install-locales: locales
 	@install -d $(DESTDIR)$(localedir)
 	@for f in $(pck_catalogs); do\
diff --git a/po/it.po b/po/it.po
deleted file mode 100644
index 929059e..0000000
--- a/po/it.po
+++ /dev/null
@@ -1,186 +0,0 @@
-#: /usr/sbin/makedist-announcement:173
-msgid "Generating announcement for"
-msgstr "Generazione dell'annuncio per"
-#: /usr/sbin/makedist-announcement:201
-msgid "$distribution $distversion ${MEDIA_NAME[i]} $version release announcement"
-msgstr "Annuncio di rilascio di $distribution $distversion ${MEDIA_NAME[i]} $version"
-#: /usr/sbin/makedist-announcement:203
-msgid "The $distribution maintainer is happy to announce the immediate availability of the <b>$distversion $version</b> release of the $distribution <b>${MEDIA_NAME[i]}</b> distribution."
-msgstr "Il manutentore di $distribution &egrave; lieto di annunciare l'immediata disponibilit&agrave; della versione <b>$distversion $version</b> della distribuzione $distribution <b>${MEDIA_NAME[i]}</b>."
-#: /usr/sbin/makedist-announcement:205
-msgid "Release notes"
-msgstr "Note di rilascio"
-#: /usr/sbin/makedist-announcement:209
-msgid "Description"
-msgstr "Descrizione"
-#: /usr/sbin/makedist-announcement:216
-msgid "Who it's for"
-msgstr "Per chi &egrave;"
-#: /usr/sbin/makedist-announcement:219
-msgid "Requirements"
-msgstr "Requisiti"
-#: /usr/sbin/makedist-announcement:222
-msgid "Features"
-msgstr "Caratteristiche"
-#: /usr/sbin/makedist-announcement:225
-msgid "Downloads"
-msgstr "Scaricamenti"
-#: /usr/sbin/makedist-announcement:230
-msgid "english"
-msgstr "inglese"
-#: /usr/sbin/makedist-announcement:231
-msgid "italian"
-msgstr "italiano"
-#: /usr/sbin/makedist-announcement:232
-msgid "spanish"
-msgstr "spagnolo"
-#: /usr/sbin/makedist-announcement:233
-msgid "unknown"
-msgstr "sconosciuto"
-#: /usr/sbin/makedist-announcement:241
-msgid "Operating system information"
-msgstr "Informazioni sul sistema operativo"
-#: /usr/sbin/makedist-announcement:242
-msgid "Name"
-msgstr "Nome"
-#: /usr/sbin/makedist-announcement:243
-msgid "Type"
-msgstr "Tipo"
-#: /usr/sbin/makedist-announcement:243
-msgid "GNU/Linux operating system"
-msgstr "sistema operativo GNU/Linux"
-#: /usr/sbin/makedist-announcement:244
-msgid "License"
-msgstr "Licenza"
-#: /usr/sbin/makedist-announcement:244
-msgid "GNU General Public License (GPL) version 3"
-msgstr "GNU General Public License (GPL) versione 3"
-#: /usr/sbin/makedist-announcement:245
-msgid "Release branch"
-msgstr "Ramo di rilascio"
-#: /usr/sbin/makedist-announcement:250
-msgid "Planned maintenance"
-msgstr "Manutenzione prevista"
-#: /usr/sbin/makedist-announcement:250
-msgid "long term"
-msgstr "a lungo termine"
-#: /usr/sbin/makedist-announcement:251
-msgid "Updates level"
-msgstr "Livello degli aggiornamenti"
-#: /usr/sbin/makedist-announcement:251
-msgid "bugfix"
-msgstr ""
-#: /usr/sbin/makedist-announcement:251
-msgid "security"
-msgstr "sicurezza"
-#: /usr/sbin/makedist-announcement:251
-msgid "end-user applications"
-msgstr "applicazioni utente"
-#: /usr/sbin/makedist-announcement:252
-msgid "Default updates channels"
-msgstr "Canali di aggiornamento predefiniti"
-#: /usr/sbin/makedist-announcement:257
-msgid "architectural changes"
-msgstr "modifiche architetturali"
-#: /usr/sbin/makedist-announcement:263
-msgid "Kernel, boot and drivers"
-msgstr "Kernel, avvio e driver"
-#: /usr/sbin/makedist-announcement:264
-msgid "Linux kernel"
-msgstr "Kernel Linux"
-#: /usr/sbin/makedist-announcement:265
-msgid "bootloader (grub)"
-msgstr ""
-#: /usr/sbin/makedist-announcement:266
-msgid "boot system (dracut)"
-msgstr "sistema di avvio (dracut)"
-#: /usr/sbin/makedist-announcement:267
-msgid "NVIDIA proprietary driver"
-msgstr "driver proprietario NVIDIA"
-#: /usr/sbin/makedist-announcement:268
-msgid "AMD/ATI proprietary driver"
-msgstr "driver proprietario AMD/ATI"
-#: /usr/sbin/makedist-announcement:271
-msgid "GNU Toolchain"
-msgstr "Toolchain GNU"
-#: /usr/sbin/makedist-announcement:277
-msgid "Packages and updates management"
-msgstr "Gestione dei pacchetti e degli aggiornamenti"
-#: /usr/sbin/makedist-announcement:285
-msgid "Graphical and Desktop environment"
-msgstr "Ambiente grafico e desktop"
-#: /usr/sbin/makedist-announcement:293
-msgid "Graphics packages"
-msgstr "Pacchetti per la grafica"
-#: /usr/sbin/makedist-announcement:297
-msgid "Internet/Networking packages"
-msgstr "Pacchetti per internet e la rete"
-#: /usr/sbin/makedist-announcement:306
-msgid "Multimedia packages"
-msgstr "Pacchetti per la multimedialit&agrave;"
-#: /usr/sbin/makedist-announcement:310
-msgid "Office/Publishing packages"
-msgstr "Pacchetti per l'ufficio e l'editoria"
-#: /usr/sbin/makedist-announcement:315
-msgid "Games packages"
-msgstr "Giochi"
-#: /usr/sbin/makedist-announcement:319
-msgid "Emulation/Virtualization packages"
-msgstr "Pacchetti per l'emulazione e la virtualizzazione"
-#: /usr/sbin/makedist-announcement:325
-msgid "Recovery and diagnostic tools"
-msgstr "Utilit&agrave; per recupero dati e diagnostica"
-#: /usr/sbin/makedist-announcement:326
-msgid "Partition editor"
-msgstr "Editor di partizioni"
-#: /usr/sbin/makedist-announcement:327
-msgid "Data recovery"
-msgstr "Recupero dati"
-#: /usr/sbin/makedist-announcement:328
-msgid "MBR boot loader"
-msgstr ""
-#: /usr/sbin/makedist-announcement:329
-msgid "NTFS recovery tools"
-msgstr "Utilit&agrave; di ripristino NTFS"
-#: /usr/sbin/makedist-announcement:330
-msgid "Serial terminal emulator"
-msgstr "Emulatore di terminale seriale"
-#: /usr/sbin/makedist-announcement:335
-msgid "${MEDIA_NAME[i]} page at $siteaddress"
-msgstr "pagina ${MEDIA_NAME[i]} su $siteaddress"
-#: /usr/sbin/makedist-announcement:336
-msgid "$distversion channels and packages"
-msgstr "canali e pacchetti del ramo $distversion"
-#: /usr/sbin/makedist-announcement:337
-msgid "$distribution forum"
-msgstr "forum di $distribution"
-#: /usr/sbin/makedist-announcement:338
-msgid "$distribution bug tracking system"
-msgstr "sistema di gestione delle anomalie di $distribution"
-#: /usr/sbin/makedist-announcement:339
-msgid "$distribution wiki"
-msgstr "wiki di $distribution"
-#: /usr/sbin/makedist-announcement:342
-msgid "and signed off by"
-msgstr "e revisionato da"
-#
-msgid "Links"
-msgstr "Collegamenti"
-#
-msgid "Announcement automatically generated by"
-msgstr "Annuncio generato automaticamente da"
-#
-msgid "Language"
-msgstr "Lingua"
-#
-msgid "Download link"
-msgstr "Collegamento per il download"
-#
-msgid "Size"
-msgstr "Dimensione"
-#
-msgid "Date"
-msgstr "Data"
-#
-msgid "Send english ($outputlang) language email to $a [y/N]?"
-msgstr "Invio email in italiano ($outputlang) a $a [y/N]?"
diff --git a/po/it/messages.po b/po/it/messages.po
new file mode 100644
index 0000000..8a03eba
--- /dev/null
+++ b/po/it/messages.po
@@ -0,0 +1,384 @@
+# 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: 2012-07-27 14: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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: /usr/sbin/makedist-announcement:173
+#: /usr/share/makedist/makedist-announcement.sh:297
+msgid "Generating announcement for"
+msgstr "Generazione dell'annuncio per"
+
+#: /usr/sbin/makedist-announcement:201
+#: /usr/share/makedist/makedist-announcement.sh:300
+#: /usr/share/makedist/makedist-announcement.sh:495
+msgid ""
+"$distribution $distversion ${MEDIA_NAME[i]} $version release announcement"
+msgstr ""
+"Annuncio di rilascio di $distribution $distversion ${MEDIA_NAME[i]} $version"
+
+#: /usr/sbin/makedist-announcement:203
+#: /usr/share/makedist/makedist-announcement.sh:302
+msgid ""
+"The $distribution maintainer is happy to announce the immediate availability "
+"of the <b>$distversion $version</b> release of the $distribution <b>"
+"${MEDIA_NAME[i]}</b> distribution."
+msgstr ""
+"Il manutentore di $distribution &egrave; lieto di annunciare l'immediata "
+"disponibilit&agrave; della versione <b>$distversion $version</b> della "
+"distribuzione $distribution <b>${MEDIA_NAME[i]}</b>."
+
+#: /usr/sbin/makedist-announcement:205
+#: /usr/share/makedist/makedist-announcement.sh:310
+msgid "Release notes"
+msgstr "Note di rilascio"
+
+#: /usr/sbin/makedist-announcement:209
+#: /usr/share/makedist/makedist-announcement.sh:314
+msgid "Description"
+msgstr "Descrizione"
+
+#: /usr/sbin/makedist-announcement:216
+#: /usr/share/makedist/makedist-announcement.sh:319
+msgid "Who it's for"
+msgstr "Per chi &egrave;"
+
+#: /usr/sbin/makedist-announcement:219
+#: /usr/share/makedist/makedist-announcement.sh:321
+msgid "Requirements"
+msgstr "Requisiti"
+
+#: /usr/sbin/makedist-announcement:222
+#: /usr/share/makedist/makedist-announcement.sh:323
+msgid "Features"
+msgstr "Caratteristiche"
+
+#: /usr/sbin/makedist-announcement:225
+#: /usr/share/makedist/makedist-announcement.sh:325
+msgid "Downloads"
+msgstr "Scaricamenti"
+
+#: /usr/sbin/makedist-announcement:230
+#: /usr/share/makedist/makedist-announcement.sh:335
+msgid "english"
+msgstr "inglese"
+
+#: /usr/sbin/makedist-announcement:231
+#: /usr/share/makedist/makedist-announcement.sh:336
+msgid "italian"
+msgstr "italiano"
+
+#: /usr/sbin/makedist-announcement:232
+#: /usr/share/makedist/makedist-announcement.sh:337
+msgid "spanish"
+msgstr "spagnolo"
+
+#: /usr/sbin/makedist-announcement:233
+#: /usr/share/makedist/makedist-announcement.sh:338
+msgid "unknown"
+msgstr "sconosciuto"
+
+#: /usr/sbin/makedist-announcement:241
+#: /usr/share/makedist/makedist-announcement.sh:347
+msgid "Operating system information"
+msgstr "Informazioni sul sistema operativo"
+
+#: /usr/sbin/makedist-announcement:242
+#: /usr/share/makedist/makedist-announcement.sh:348
+msgid "Name"
+msgstr "Nome"
+
+#: /usr/sbin/makedist-announcement:243
+#: /usr/share/makedist/makedist-announcement.sh:349
+msgid "Type"
+msgstr "Tipo"
+
+#: /usr/sbin/makedist-announcement:243
+#: /usr/share/makedist/makedist-announcement.sh:349
+msgid "GNU/Linux operating system"
+msgstr "sistema operativo GNU/Linux"
+
+#: /usr/sbin/makedist-announcement:244
+#: /usr/share/makedist/makedist-announcement.sh:350
+msgid "License"
+msgstr "Licenza"
+
+#: /usr/sbin/makedist-announcement:244
+#: /usr/share/makedist/makedist-announcement.sh:350
+msgid "GNU General Public License (GPL) version 3"
+msgstr "GNU General Public License (GPL) versione 3"
+
+#: /usr/sbin/makedist-announcement:245
+#: /usr/share/makedist/makedist-announcement.sh:351
+msgid "Release branch"
+msgstr "Ramo di rilascio"
+
+#: /usr/sbin/makedist-announcement:250
+#: /usr/share/makedist/makedist-announcement.sh:356
+#: /usr/share/makedist/makedist-announcement.sh:362
+msgid "Planned maintenance"
+msgstr "Manutenzione prevista"
+
+#: /usr/sbin/makedist-announcement:250
+#: /usr/share/makedist/makedist-announcement.sh:356
+#: /usr/share/makedist/makedist-announcement.sh:362
+msgid "long term"
+msgstr "a lungo termine"
+
+#: /usr/sbin/makedist-announcement:251
+#: /usr/share/makedist/makedist-announcement.sh:357
+#: /usr/share/makedist/makedist-announcement.sh:363
+msgid "Updates level"
+msgstr "Livello degli aggiornamenti"
+
+#: /usr/sbin/makedist-announcement:251
+#: /usr/share/makedist/makedist-announcement.sh:357
+msgid "bugfix"
+msgstr ""
+
+#: /usr/sbin/makedist-announcement:251
+#: /usr/share/makedist/makedist-announcement.sh:357
+msgid "security"
+msgstr "sicurezza"
+
+#: /usr/sbin/makedist-announcement:251
+#: /usr/share/makedist/makedist-announcement.sh:357
+msgid "end-user applications"
+msgstr "applicazioni utente"
+
+#: /usr/sbin/makedist-announcement:252
+#: /usr/share/makedist/makedist-announcement.sh:358
+msgid "Default updates channels"
+msgstr "Canali di aggiornamento predefiniti"
+
+#: /usr/sbin/makedist-announcement:257
+#: /usr/share/makedist/makedist-announcement.sh:363
+msgid "architectural changes"
+msgstr "modifiche architetturali"
+
+#: /usr/sbin/makedist-announcement:263
+#: /usr/share/makedist/makedist-announcement.sh:375
+msgid "Kernel, boot and drivers"
+msgstr "Kernel, avvio e driver"
+
+#: /usr/sbin/makedist-announcement:264
+#: /usr/share/makedist/makedist-announcement.sh:370
+msgid "Linux kernel"
+msgstr "Kernel Linux"
+
+#: /usr/sbin/makedist-announcement:265
+#: /usr/share/makedist/makedist-announcement.sh:371
+msgid "bootloader (grub)"
+msgstr ""
+
+#: /usr/sbin/makedist-announcement:266
+#: /usr/share/makedist/makedist-announcement.sh:372
+msgid "boot system (dracut)"
+msgstr "sistema di avvio (dracut)"
+
+#: /usr/sbin/makedist-announcement:267
+#: /usr/share/makedist/makedist-announcement.sh:373
+msgid "NVIDIA proprietary driver"
+msgstr "driver proprietario NVIDIA"
+
+#: /usr/sbin/makedist-announcement:268
+#: /usr/share/makedist/makedist-announcement.sh:374
+msgid "AMD/ATI proprietary driver"
+msgstr "driver proprietario AMD/ATI"
+
+#: /usr/sbin/makedist-announcement:271
+#: /usr/share/makedist/makedist-announcement.sh:381
+msgid "GNU Toolchain"
+msgstr "Toolchain GNU"
+
+#: /usr/sbin/makedist-announcement:277
+#: /usr/share/makedist/makedist-announcement.sh:389
+msgid "Packages and updates management"
+msgstr "Gestione dei pacchetti e degli aggiornamenti"
+
+#: /usr/sbin/makedist-announcement:285
+#: /usr/share/makedist/makedist-announcement.sh:397
+msgid "Graphical and Desktop environment"
+msgstr "Ambiente grafico e desktop"
+
+#: /usr/sbin/makedist-announcement:293
+#: /usr/share/makedist/makedist-announcement.sh:401
+msgid "Graphics packages"
+msgstr "Pacchetti per la grafica"
+
+#: /usr/sbin/makedist-announcement:297
+#: /usr/share/makedist/makedist-announcement.sh:410
+msgid "Internet/Networking packages"
+msgstr "Pacchetti per internet e la rete"
+
+#: /usr/sbin/makedist-announcement:306
+#: /usr/share/makedist/makedist-announcement.sh:414
+msgid "Multimedia packages"
+msgstr "Pacchetti per la multimedialit&agrave;"
+
+#: /usr/sbin/makedist-announcement:310
+#: /usr/share/makedist/makedist-announcement.sh:419
+msgid "Office/Publishing packages"
+msgstr "Pacchetti per l'ufficio e l'editoria"
+
+#: /usr/sbin/makedist-announcement:315
+#: /usr/share/makedist/makedist-announcement.sh:423
+msgid "Games packages"
+msgstr "Giochi"
+
+#: /usr/sbin/makedist-announcement:319
+#: /usr/share/makedist/makedist-announcement.sh:429
+msgid "Emulation/Virtualization packages"
+msgstr "Pacchetti per l'emulazione e la virtualizzazione"
+
+#: /usr/sbin/makedist-announcement:325
+#: /usr/share/makedist/makedist-announcement.sh:437
+msgid "Recovery and diagnostic tools"
+msgstr "Utilit&agrave; per recupero dati e diagnostica"
+
+#: /usr/sbin/makedist-announcement:326
+#: /usr/share/makedist/makedist-announcement.sh:432
+msgid "Partition editor"
+msgstr "Editor di partizioni"
+
+#: /usr/sbin/makedist-announcement:327
+#: /usr/share/makedist/makedist-announcement.sh:433
+msgid "Data recovery"
+msgstr "Recupero dati"
+
+#: /usr/sbin/makedist-announcement:328
+#: /usr/share/makedist/makedist-announcement.sh:434
+msgid "MBR boot loader"
+msgstr ""
+
+#: /usr/sbin/makedist-announcement:329
+#: /usr/share/makedist/makedist-announcement.sh:435
+msgid "NTFS recovery tools"
+msgstr "Utilit&agrave; di ripristino NTFS"
+
+#: /usr/sbin/makedist-announcement:330
+#: /usr/share/makedist/makedist-announcement.sh:436
+msgid "Serial terminal emulator"
+msgstr "Emulatore di terminale seriale"
+
+#: /usr/sbin/makedist-announcement:335
+#: /usr/share/makedist/makedist-announcement.sh:441
+msgid "${MEDIA_NAME[i]} page at $siteaddress"
+msgstr "pagina ${MEDIA_NAME[i]} su $siteaddress"
+
+#: /usr/sbin/makedist-announcement:336
+#: /usr/share/makedist/makedist-announcement.sh:447
+#, sh-format
+msgid "$sitedistversion channels and packages"
+msgstr "canali e pacchetti del ramo $sitedistversion"
+
+#: /usr/sbin/makedist-announcement:337
+#: /usr/share/makedist/makedist-announcement.sh:449
+#, sh-format
+msgid "$distribution forum"
+msgstr "forum di $distribution"
+
+#: /usr/sbin/makedist-announcement:338
+#: /usr/share/makedist/makedist-announcement.sh:450
+#, sh-format
+msgid "$distribution bug tracking system"
+msgstr "sistema di gestione delle anomalie di $distribution"
+
+#: /usr/sbin/makedist-announcement:339
+#: /usr/share/makedist/makedist-announcement.sh:451
+#, sh-format
+msgid "$distribution wiki"
+msgstr "wiki di $distribution"
+
+#: /usr/sbin/makedist-announcement:342
+#: /usr/share/makedist/makedist-announcement.sh:456
+msgid "and signed off by"
+msgstr "e revisionato da"
+
+#
+#: /usr/share/makedist/makedist-announcement.sh:439
+msgid "Links"
+msgstr "Collegamenti"
+
+#
+#: /usr/share/makedist/makedist-announcement.sh:454
+msgid "Announcement automatically generated by"
+msgstr "Annuncio generato automaticamente da"
+
+#
+#: /usr/share/makedist/makedist-announcement.sh:326
+msgid "Language"
+msgstr "Lingua"
+
+#
+#: /usr/share/makedist/makedist-announcement.sh:326
+msgid "Download link"
+msgstr "Collegamento per il download"
+
+#
+#: /usr/share/makedist/makedist-announcement.sh:326
+msgid "Size"
+msgstr "Dimensione"
+
+#
+#: /usr/share/makedist/makedist-announcement.sh:326
+msgid "Date"
+msgstr "Data"
+
+#
+msgid "Send english ($outputlang) language email to $a [y/N]?"
+msgstr "Invio email in italiano ($outputlang) a $a [y/N]?"
+
+#: /usr/share/makedist/makedist-announcement.sh:271
+#, sh-format
+msgid "Generating catalog file $catalogfile"
+msgstr "Generazione del file di catalogo $catalogfile"
+
+#: /usr/share/makedist/makedist-announcement.sh:304
+msgid ""
+"$distribution $distversion ${MEDIA_NAME[i]} $version nightly snapshot "
+"announcement"
+msgstr ""
+"Annuncio di disponibilità della snapshot notturna $distribution $distversion "
+"${MEDIA_NAME[i]} $version"
+
+#: /usr/share/makedist/makedist-announcement.sh:306
+msgid ""
+"The $distribution automatic build system announces the immediate "
+"availability of the <b>$version</b> snapshot release of the $distribution <b>"
+"${MEDIA_NAME[i]}</b> distribution."
+msgstr ""
+"Il sistema di build automatico di $distribution annuncia l'immediata "
+"disponibilità della versione snapshot <b>$version</b> della distribuzione "
+"$distribution <b>${MEDIA_NAME[i]}</b>."
+
+#: /usr/share/makedist/makedist-announcement.sh:326
+msgid "Arch"
+msgstr ""
+
+#: /usr/share/makedist/makedist-announcement.sh:364
+msgid "Updates default channels"
+msgstr "Aggiorna i canali predefiniti"
+
+#: /usr/share/makedist/makedist-announcement.sh:486
+#, sh-format
+msgid "Send english ($outputlang) language email to $a for "
+msgstr "Invio email in italiano ($outputlang) a $a per "
+
+#: /usr/sbin/makedist-announcement:75
+#, sh-format
+msgid "Generating $distversion announcements index"
+msgstr "Generazione dell'indice degli annunci per $distversion"