diff --git a/Makefile b/Makefile
index ce6034b..4dbc58c 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/po/de.po \
 		$(PACKAGE)-$(VERSION)/po/es.po \
 		$(PACKAGE)-$(VERSION)/po/fr.po \
+		$(PACKAGE)-$(VERSION)/po/it.po \
 		$(PACKAGE)-$(VERSION)/po/project.conf \
 		$(PACKAGE)-$(VERSION)/src/callbacks.c \
 		$(PACKAGE)-$(VERSION)/src/editor.c \
diff --git a/po/.cvsignore b/po/.cvsignore
index 491cd17..2ab723b 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -3,3 +3,4 @@ Editor.pot
 de.mo
 es.mo
 fr.mo
+it.mo
diff --git a/po/Makefile b/po/Makefile
index 925e198..54bc7c9 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,4 +1,4 @@
-TARGETS	= Editor.pot de.po de.mo es.po es.mo fr.po fr.mo
+TARGETS	= Editor.pot de.mo es.mo fr.mo it.mo
 RM	= rm -f
 LN	= ln -f
 MKDIR	= mkdir -p
@@ -10,26 +10,20 @@ all: $(TARGETS)
 Editor.pot: POTFILES
 	./gettext.sh "Editor.pot"
 
-de.po: Editor.pot
-	./gettext.sh "de.po"
-
-de.mo: de.po
+de.mo: Editor.pot de.po
 	./gettext.sh "de.mo"
 
-es.po: Editor.pot
-	./gettext.sh "es.po"
-
-es.mo: es.po
+es.mo: Editor.pot es.po
 	./gettext.sh "es.mo"
 
-fr.po: Editor.pot
-	./gettext.sh "fr.po"
-
-fr.mo: fr.po
+fr.mo: Editor.pot fr.po
 	./gettext.sh "fr.mo"
 
+it.mo: Editor.pot it.po
+	./gettext.sh "it.mo"
+
 clean:
-	$(RM) $(Editor.pot_OBJS) $(de.po_OBJS) $(de.mo_OBJS) $(es.po_OBJS) $(es.mo_OBJS) $(fr.po_OBJS) $(fr.mo_OBJS)
+	$(RM) $(Editor.pot_OBJS) $(de.mo_OBJS) $(es.mo_OBJS) $(fr.mo_OBJS) $(it.mo_OBJS)
 
 distclean: clean
 	$(RM) $(TARGETS)
@@ -38,10 +32,12 @@ install: all
 	./gettext.sh -p "$(PREFIX)" install "de.mo"
 	./gettext.sh -p "$(PREFIX)" install "es.mo"
 	./gettext.sh -p "$(PREFIX)" install "fr.mo"
+	./gettext.sh -p "$(PREFIX)" install "it.mo"
 
 uninstall:
 	./gettext.sh -p "$(PREFIX)" uninstall "de.mo"
 	./gettext.sh -p "$(PREFIX)" uninstall "es.mo"
 	./gettext.sh -p "$(PREFIX)" uninstall "fr.mo"
+	./gettext.sh -p "$(PREFIX)" uninstall "it.mo"
 
 .PHONY: all clean distclean install uninstall
diff --git a/po/gettext.sh b/po/gettext.sh
index 289d0ad..71abf2e 100755
--- a/po/gettext.sh
+++ b/po/gettext.sh
@@ -35,25 +35,17 @@ _debug()
 
 #gettext_mo
 _gettext_mo()
-{
-	lang="$2"
-
-	$DEBUG $MSGFMT -c -v -o "$lang.mo" "$lang.po"		|| return 1
-}
-
-
-#gettext_po
-_gettext_po()
 {
 	package="$1"
 	lang="$2"
 
 	if [ -f "$lang.po" ]; then
 		$DEBUG $MSGMERGE -U "$lang.po" "$package.pot"	|| return 1
-		return 0
-	fi
-	$DEBUG $MSGINIT -l "$lang" -o "$lang.po" -i "$package.pot" \
+	else
+		$DEBUG $MSGINIT -l "$lang" -o "$lang.po" -i "$package.pot" \
 								|| return 1
+	fi
+	$DEBUG $MSGFMT -c -v -o "$lang.mo" "$lang.po"		|| return 1
 }
 
 
@@ -85,9 +77,6 @@ case "$1" in
 	*.mo)
 		_gettext_mo "$PACKAGE" "${1%%.mo}"		|| exit 2
 		;;
-	*.po)
-		_gettext_po "$PACKAGE" "${1%%.po}"		|| exit 2
-		;;
 	*.pot)
 		_gettext_pot "${1%%.pot}"			|| exit 2
 		;;
diff --git a/po/it.po b/po/it.po
new file mode 100644
index 0000000..5e80cdf
--- /dev/null
+++ b/po/it.po
@@ -0,0 +1,211 @@
+# $Id$
+# Traduzioni italiane per il pacchetto Editor.
+# Copyright (c) 2010 Pierre Pronchery <khorben@defora.org>
+# This file is distributed under the same license as the Editor package.
+# Pierre Pronchery <khorben@defora.org>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Editor 0.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-09 16:41+0200\n"
+"PO-Revision-Date: 2010-04-09 16:43+0200\n"
+"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
+"Language-Team: Italian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../src/callbacks.c:81
+msgid "Text editor preferences"
+msgstr ""
+
+#: ../src/callbacks.c:90
+msgid "Font:"
+msgstr ""
+
+#: ../src/callbacks.c:260
+msgid "About Editor"
+msgstr ""
+
+#: ../src/callbacks.c:271
+msgid "C_redits"
+msgstr ""
+
+#: ../src/callbacks.c:275
+msgid "_License"
+msgstr ""
+
+#: ../src/callbacks.c:325
+msgid "Credits"
+msgstr ""
+
+#: ../src/callbacks.c:348
+msgid "Written by"
+msgstr ""
+
+#: ../src/callbacks.c:377
+msgid "License"
+msgstr ""
+
+#: ../src/editor.c:50
+msgid "_New"
+msgstr ""
+
+#: ../src/editor.c:51
+msgid "_Open"
+msgstr ""
+
+#: ../src/editor.c:53
+msgid "_Save"
+msgstr ""
+
+#: ../src/editor.c:54
+msgid "_Save as..."
+msgstr ""
+
+#: ../src/editor.c:57
+msgid "_Close"
+msgstr ""
+
+#: ../src/editor.c:63
+msgid "_Undo"
+msgstr ""
+
+#: ../src/editor.c:64
+msgid "_Redo"
+msgstr ""
+
+#: ../src/editor.c:66
+msgid "_Cut"
+msgstr ""
+
+#: ../src/editor.c:67
+msgid "_Copy"
+msgstr ""
+
+#: ../src/editor.c:68
+msgid "_Paste"
+msgstr ""
+
+#: ../src/editor.c:70
+msgid "_Find"
+msgstr ""
+
+#: ../src/editor.c:72
+msgid "_Preferences"
+msgstr ""
+
+#: ../src/editor.c:80 ../src/editor.c:82
+msgid "_About"
+msgstr ""
+
+#: ../src/editor.c:89
+msgid "_File"
+msgstr ""
+
+#: ../src/editor.c:90
+msgid "_Edit"
+msgstr ""
+
+#: ../src/editor.c:91
+msgid "_Help"
+msgstr ""
+
+#: ../src/editor.c:98
+msgid "New"
+msgstr ""
+
+#: ../src/editor.c:99
+msgid "Open"
+msgstr ""
+
+#: ../src/editor.c:101
+msgid "Save"
+msgstr ""
+
+#: ../src/editor.c:102
+msgid "Save as"
+msgstr ""
+
+#: ../src/editor.c:105
+msgid "Preferences"
+msgstr ""
+
+#: ../src/editor.c:195
+msgid "Text editor - "
+msgstr ""
+
+#: ../src/editor.c:196
+msgid "(Untitled)"
+msgstr ""
+
+#: ../src/editor.c:233 ../src/editor.c:238
+msgid "Error"
+msgstr ""
+
+#: ../src/editor.c:265 ../src/editor.c:274 ../src/editor.c:384
+#: ../src/editor.c:398 ../src/editor.c:530
+msgid "Warning"
+msgstr ""
+
+#: ../src/editor.c:269
+msgid ""
+"There are unsaved changes.\n"
+"Are you sure you want to close?"
+msgstr ""
+
+#: ../src/editor.c:304
+msgid "Find text"
+msgstr ""
+
+#: ../src/editor.c:311
+msgid "Text:"
+msgstr ""
+
+#: ../src/editor.c:318
+msgid "Case-sensitive"
+msgstr ""
+
+#: ../src/editor.c:320
+msgid "Wrap"
+msgstr ""
+
+#: ../src/editor.c:343
+msgid "Text not found"
+msgstr ""
+
+#: ../src/editor.c:388
+msgid ""
+"There are unsaved changes.\n"
+"Are you sure you want to discard them?"
+msgstr ""
+
+#: ../src/editor.c:395
+msgid "Discard"
+msgstr ""
+
+#: ../src/editor.c:456
+msgid "Open file..."
+msgstr ""
+
+#: ../src/editor.c:506
+msgid "Partial write"
+msgstr ""
+
+#: ../src/editor.c:534
+msgid "File exists. Overwrite?"
+msgstr ""
+
+#: ../src/editor.c:543
+msgid "Allocation error"
+msgstr ""
+
+#: ../src/editor.c:558
+msgid "Save as..."
+msgstr ""
+
+#: ../src/main.c:43
+msgid "Usage: editor [file]\n"
+msgstr ""
diff --git a/po/project.conf b/po/project.conf
index 8c7832f..bee8891 100644
--- a/po/project.conf
+++ b/po/project.conf
@@ -1,40 +1,31 @@
-targets=Editor.pot,de.po,de.mo,es.po,es.mo,fr.po,fr.mo
-dist=Makefile,gettext.sh,POTFILES,de.po,es.po,fr.po
+targets=Editor.pot,de.mo,es.mo,fr.mo,it.mo
+dist=Makefile,gettext.sh,POTFILES,de.po,es.po,fr.po,it.po
 
 [Editor.pot]
 type=script
 script=./gettext.sh
 depends=POTFILES
 
-[de.po]
-type=script
-script=./gettext.sh
-depends=Editor.pot
-
 [de.mo]
 type=script
 script=./gettext.sh
 install=
-depends=de.po
-
-[es.po]
-type=script
-script=./gettext.sh
-depends=Editor.pot
+depends=Editor.pot,de.po
 
 [es.mo]
 type=script
 script=./gettext.sh
 install=
-depends=es.po
-
-[fr.po]
-type=script
-script=./gettext.sh
-depends=Editor.pot
+depends=Editor.pot,es.po
 
 [fr.mo]
 type=script
 script=./gettext.sh
 install=
-depends=fr.po
+depends=Editor.pot,fr.po
+
+[it.mo]
+type=script
+script=./gettext.sh
+install=
+depends=Editor.pot,it.po