diff --git a/fuel.pro b/fuel.pro
index 347d7cc..672c40a 100644
--- a/fuel.pro
+++ b/fuel.pro
@@ -22,8 +22,8 @@ macx {
 
 # FreeBSD needs explicit paths to Qt install
 unix:freebsd {
-        INCLUDEPATH += /usr/local/include
-        LIBS += -L/usr/local/lib
+		INCLUDEPATH += /usr/local/include
+		LIBS += -L/usr/local/lib
 }
 
 unix:!macx {
@@ -89,5 +89,6 @@ TRANSLATIONS += \
 	intl/es_ES.ts \
 	intl/fr_FR.ts \
 	intl/ru_RU.ts \
-	intl/pt_PT.ts
+	intl/pt_PT.ts \
+	intl/it_IT.ts
 
diff --git a/manifest b/manifest
index 33d1827..8a019a5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sFreeBSD
-D 2015-07-08T20:04:10.255
+C Added\sItalian\stranslation.\sThanks\smaxxlupi\sand\sZangune\nSorted\sthe\slanguage\sselection\scombo-box\n
+D 2015-07-11T13:38:13.325
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
 F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
@@ -15,7 +15,7 @@ F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
 F doc/Building.txt 17b43fa23da764b5d1b828cc48c5a95e612bbd8f
 F doc/Changes.txt b03302545e4a6c0b16a30d623a7627f8aef65ef6
 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
-F fuel.pro 15c71da64dcb95bbb8c56aae3947564903a20dcf
+F fuel.pro 3c6ad6d4ce941eca2b48c8660022adf1ad43cae4
 F intl/convert.bat 4222ae403418381452b843929d15259ea9850ab1 x
 F intl/convert.sh 2ca2179ff53e727f241925b75e19182607883c45 x
 F intl/de_DE.ts e2faceab920ac60c97bbc6fba038e261d51fc741
@@ -183,7 +183,7 @@ F rsrc/icons/Zoom-01.png 67ca532922e9166325c5c75fce1ca3fbb0d2b6a6
 F rsrc/icons/fuel.icns 81e535004b62db801a02f3e15d0a33afc9d4070b
 F rsrc/icons/fuel.ico eb529ab3332a17b9302ef3e851db5b9ebce2a038
 F rsrc/icons/fuel.png 40daf53b7f6bdcdd0d6aa5ef433d078ec5ea4342
-F rsrc/resources.qrc 4098be128fd6c045db933d041fe8844b14643a6f
+F rsrc/resources.qrc fefa8bf056d3c64cc692c507f94ea678ca06e354
 F src/BrowserWidget.cpp 8b8f545cdff4a4188edc698a1b4777f5df46f056
 F src/BrowserWidget.h 764d66aa9a93b890298bd0301097739cb4e16597
 F src/CloneDialog.cpp 812ef7d361c16da21540b7047c9d4d5e74f18539
@@ -198,9 +198,9 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp 6758e29796f411f920a0a59ece5002e4aeefd9f2
+F src/MainWindow.cpp 1fc0bec39404f9f6198bf170f4b5cd488cc628a6
 F src/MainWindow.h 77038e9c9fe8a64a1c2dfb8d4c2be7558ab5f372
-F src/SettingsDialog.cpp a46cff5e5dd425e3dbdd15632abfd5829f5562b4
+F src/SettingsDialog.cpp d0485749c977d6285e10d442f64d97e465683d64
 F src/SettingsDialog.h 4e2790f581e991c744ae9f86580f1972b8c7ff43
 F src/Utils.cpp 9aff456712e4276b49083426301b3b96d3819c77
 F src/Utils.h c546e478a1225a28c99cd4c30f70cf9be9804a2a
@@ -213,7 +213,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/MainWindow.ui 8677f5c8bca5bf7561d5f64bfdd0cef5157c6ac7
 F ui/SettingsDialog.ui 2b7c2870e0054b0f4106f495d85d02c0b814df8b
-P c446f431e8de6fad9d05dbbfe992e58f256560bb
-R ae798f8a5199917992377599ba5117b3
+P 0987410cc3fd8d64510e762b1845880a416c27b3
+R 1572f41ad884057cb81876717888fb58
 U kostas
-Z cf9658be8cb1d19d9859b3ac781ddd17
+Z cf1052ed1fb7b288d0bd173470fe737e
diff --git a/manifest.uuid b/manifest.uuid
index 748da10..4f4eb84 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0987410cc3fd8d64510e762b1845880a416c27b3
\ No newline at end of file
+ddb8c7f5e5fd5b341b90ddafef349af789147d88
\ No newline at end of file
diff --git a/rsrc/resources.qrc b/rsrc/resources.qrc
index 8c17330..ceeaa9c 100644
--- a/rsrc/resources.qrc
+++ b/rsrc/resources.qrc
@@ -159,5 +159,6 @@
 		<file>intl/fr_FR.qm</file>
 		<file>intl/ru_RU.qm</file>
 		<file>intl/pt_PT.qm</file>
+		<file>intl/it_IT.qm</file>
 	</qresource>
 </RCC>
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 3a7e9ff..be4db98 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -2088,6 +2088,8 @@ void MainWindow::on_actionAbout_triggered()
 							"Fringale: fr_FR\n"
 							"mouse166: ru_RU\n"
 							"emansije: pt_PT\n"
+							"maxxlupi: it_IT\n"
+							"Zangune: it_IT\n"
 					   );
 }
 
diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp
index 3cf5810..816beda 100644
--- a/src/SettingsDialog.cpp
+++ b/src/SettingsDialog.cpp
@@ -154,13 +154,14 @@ void SettingsDialog::on_btnClearMessageHistory_clicked()
 //-----------------------------------------------------------------------------
 void SettingsDialog::CreateLangMap()
 {
-	langMap.append(LangMap("de_DE", "German (DE)"));
-	langMap.append(LangMap("el_GR", "Greek"));
 	langMap.append(LangMap("en_US", "English (US)"));
-	langMap.append(LangMap("es_ES", "Spanish (ES)"));
 	langMap.append(LangMap("fr_FR", "French (FR)"));
-	langMap.append(LangMap("ru_RU", "Russian (RU)"));
+	langMap.append(LangMap("de_DE", "German (DE)"));
+	langMap.append(LangMap("el_GR", "Greek (GR)"));
+	langMap.append(LangMap("it_IT", "Italian (IT)"));
 	langMap.append(LangMap("pt_PT", "Portuguese (PT)"));
+	langMap.append(LangMap("ru_RU", "Russian (RU)"));
+	langMap.append(LangMap("es_ES", "Spanish (ES)"));
 }
 
 //-----------------------------------------------------------------------------