diff --git a/.gitignore b/.gitignore
index c66a86f..90d298b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 *.eo.*
 *.sed
 *.sin
+*.gmo
 
 Enventor.h
 
diff --git a/Makefile.am b/Makefile.am
index e678dde..1a867bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,3 +26,6 @@ SUBDIRS = src data . po
 pkgconfigdir = $(libdir)/pkgconfig
 
 pkgconfig_DATA = pc/enventor.pc
+
+update-po:
+	$(MAKE) $(AM_MAKEFLAGS) -C po update-po
diff --git a/po/LINGUAS b/po/LINGUAS
index 8b13789..c574d07 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1 +1 @@
-
+en
diff --git a/po/en.po b/po/en.po
new file mode 100644
index 0000000..1be1b2f
--- /dev/null
+++ b/po/en.po
@@ -0,0 +1,446 @@
+# English translation for Enventor package.
+# Copyright (C) 2015 Enventor development team
+# This file is distributed under the same license as the enventor package.
+# nikawhite belyavskijnb@gmail.com
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enventor 0.6.0\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2015-11-17 17:37+0000\n"
+"PO-Revision-Date: 2015-11-17 17:37+0000\n"
+"Last-Translator: nikawhite belyavskijnb@gmail.com \n"
+"Language-Team: \n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/bin/base_gui.c:61
+#, c-format
+msgid "%s - Enventor"
+msgstr ""
+
+#: src/bin/config_data.c:66
+msgid "Failed to generate tmp folder!"
+msgstr ""
+
+#: src/bin/config_data.c:85 src/bin/config_data.c:98
+#, c-format
+msgid "Cannot create a config folder \"%s\""
+msgstr ""
+
+#: src/bin/config_data.c:109
+#, c-format
+msgid "Cannot save a config file \"%s\""
+msgstr ""
+
+#: src/bin/config_data.c:148
+#, c-format
+msgid "Cannot load a config file \"%s\""
+msgstr ""
+
+#: src/bin/config_data.c:156 src/bin/file_mgr.c:193 src/bin/goto.c:132
+#: src/bin/menu.c:687 src/bin/newfile.c:140 src/bin/panes.c:281
+#: src/bin/search.c:332 src/bin/setting.c:467 src/bin/statusbar.c:42
+#: src/bin/text_setting.c:487 src/bin/text_setting.c:540
+#: src/bin/text_setting.c:571 src/bin/text_setting.c:1070 src/bin/tools.c:170
+msgid "Failed to allocate Memory!"
+msgstr ""
+
+#: src/bin/file_mgr.c:70
+msgid "EDC has been changed on the file system."
+msgstr ""
+
+#: src/bin/file_mgr.c:72
+msgid "Do you want to replace the contents?"
+msgstr ""
+
+#: src/bin/file_mgr.c:83
+msgid "Save As"
+msgstr ""
+
+#: src/bin/file_mgr.c:91 src/bin/search.c:402
+msgid "Replace"
+msgstr ""
+
+#: src/bin/file_mgr.c:97
+msgid "Ignore"
+msgstr ""
+
+#: src/bin/file_mgr.c:157
+#, c-format
+msgid "File saved. \"%s\""
+msgstr ""
+
+#: src/bin/file_mgr.c:159
+#, c-format
+msgid "Already saved. \"%s\""
+msgstr ""
+
+#: src/bin/goto.c:89
+msgid "Invalid line number"
+msgstr ""
+
+#: src/bin/goto.c:138
+msgid "Enventor Goto Line"
+msgstr ""
+
+#: src/bin/goto.c:142
+msgid "Go to Line"
+msgstr ""
+
+#: src/bin/goto.c:164
+#, c-format
+msgid "Enter line number [1..%d]:"
+msgstr ""
+
+#: src/bin/goto.c:188 src/bin/menu.c:162
+msgid "Ok"
+msgstr ""
+
+#: src/bin/goto.c:200 src/bin/search.c:424
+msgid "Failed to grab key - Escape"
+msgstr ""
+
+#: src/bin/live_edit.c:918
+msgid "Double click the part to confirm."
+msgstr ""
+
+#: src/bin/live_edit.c:988
+msgid "Select a part to add in Live View."
+msgstr ""
+
+#: src/bin/live_edit.c:1063
+msgid "Faild to allocate Memory!"
+msgstr ""
+
+#: src/bin/main.c:24
+msgid "Auto Completion Enabled."
+msgstr ""
+
+#: src/bin/main.c:25
+msgid "Auto Completion Disabled."
+msgstr ""
+
+#: src/bin/main.c:34
+msgid "Auto Indentation Enabled."
+msgstr ""
+
+#: src/bin/main.c:35
+msgid "Auto Indentation Disabled."
+msgstr ""
+
+#: src/bin/main.c:179
+#, c-format
+msgid "Live View Scale: %2.2fx"
+msgstr ""
+
+#: src/bin/main.c:205
+#, c-format
+msgid "Font Size: %1.1fx"
+msgstr ""
+
+#: src/bin/main.c:458
+#, c-format
+msgid "Program Run: \"%s\""
+msgstr ""
+
+#: src/bin/main.c:557
+msgid "Insertion of template code is disabled while in Live Edit mode"
+msgstr ""
+
+#: src/bin/main.c:565
+#, c-format
+msgid "Template code inserted, (%s)"
+msgstr ""
+
+#: src/bin/main.c:571
+msgid ""
+"Can't insert template code here. Move the cursor inside the \"Collections,"
+"Images,Parts,Part,Programs\" scope."
+msgstr ""
+
+#: src/bin/main.c:824
+#, c-format
+msgid "Failed to grab key - %s"
+msgstr ""
+
+#: src/bin/menu.c:149
+msgid "New File: Choose a template"
+msgstr ""
+
+#: src/bin/menu.c:168 src/bin/menu.c:212 src/bin/setting.c:522
+msgid "Cancel"
+msgstr ""
+
+#: src/bin/menu.c:185
+msgid "Without save, you will lose last changes!"
+msgstr ""
+
+#: src/bin/menu.c:187
+msgid "Will you save changes?"
+msgstr ""
+
+#: src/bin/menu.c:198 src/bin/menu.c:548 src/bin/menu.c:648
+msgid "Save"
+msgstr ""
+
+#: src/bin/menu.c:206
+msgid "Discard"
+msgstr ""
+
+#: src/bin/menu.c:412
+msgid "Choose a file to save"
+msgstr ""
+
+#: src/bin/menu.c:436
+#, c-format
+msgid "Failed to save: %s."
+msgstr ""
+
+#: src/bin/menu.c:491
+msgid "Support only .edc file."
+msgstr ""
+
+#: src/bin/menu.c:501
+msgid "Choose a file to load."
+msgstr ""
+
+#: src/bin/menu.c:512
+#, c-format
+msgid "Failed to load: %s."
+msgstr ""
+
+#: src/bin/menu.c:540
+msgid "Save File: Choose a EDC"
+msgstr ""
+
+#: src/bin/menu.c:549 src/bin/menu.c:584
+msgid "Close"
+msgstr ""
+
+#: src/bin/menu.c:574
+msgid "Load File: Choose a EDC"
+msgstr ""
+
+#: src/bin/menu.c:583 src/bin/menu.c:652
+msgid "Load"
+msgstr ""
+
+#: src/bin/menu.c:643
+msgid "New"
+msgstr ""
+
+#: src/bin/menu.c:656
+msgid "Settings"
+msgstr ""
+
+#: src/bin/menu.c:660
+msgid "About"
+msgstr ""
+
+#: src/bin/menu.c:664
+msgid "Exit"
+msgstr ""
+
+#: src/bin/menu.c:671
+msgid "Close Enventor Menu (Esc)"
+msgstr ""
+
+#: src/bin/menu.c:672
+msgid "Back"
+msgstr ""
+
+#: src/bin/newfile.c:56 src/bin/newfile.c:78
+#, c-format
+msgid "Cannot find file! \"%s\""
+msgstr ""
+
+#: src/bin/newfile.c:124
+#, c-format
+msgid "Cannot find templates folder! \"%s\""
+msgstr ""
+
+#: src/bin/search.c:81
+#, c-format
+msgid "%d matches replaced"
+msgstr ""
+
+#: src/bin/search.c:130 src/bin/search.c:190
+#, c-format
+msgid "No \"%s\" in the text"
+msgstr ""
+
+#: src/bin/search.c:228 src/bin/search.c:394
+msgid "Backward"
+msgstr ""
+
+#: src/bin/search.c:260 src/bin/search.c:387
+msgid "Forward"
+msgstr ""
+
+#: src/bin/search.c:338
+msgid "Enventor Search"
+msgstr ""
+
+#: src/bin/search.c:341
+msgid "Find/Replace"
+msgstr ""
+
+#: src/bin/search.c:409
+msgid "Replace All"
+msgstr ""
+
+#: src/bin/setting.c:288
+msgid "Live View Scale"
+msgstr ""
+
+#: src/bin/setting.c:315
+msgid "Fixed Live View Size"
+msgstr ""
+
+#: src/bin/setting.c:376
+msgid "Part Highlighting"
+msgstr ""
+
+#: src/bin/setting.c:381
+msgid "Dummy Swallow"
+msgstr ""
+
+#: src/bin/setting.c:386
+msgid "Status"
+msgstr ""
+
+#: src/bin/setting.c:391
+msgid "Tools"
+msgstr ""
+
+#: src/bin/setting.c:396
+msgid "Auto Hiding Console"
+msgstr ""
+
+#: src/bin/setting.c:492
+msgid "General"
+msgstr ""
+
+#: src/bin/setting.c:493
+msgid "Text Editor"
+msgstr ""
+
+#: src/bin/setting.c:508
+msgid "Apply"
+msgstr ""
+
+#: src/bin/setting.c:515
+msgid "Reset"
+msgstr ""
+
+#: src/bin/text_setting.c:522
+#, c-format
+msgid "Failed to open file \"%s\""
+msgstr ""
+
+#: src/bin/text_setting.c:844
+msgid "Font Size "
+msgstr ""
+
+#: src/bin/text_setting.c:853
+msgid "Line Number"
+msgstr ""
+
+#: src/bin/text_setting.c:858
+msgid "Auto Indentation"
+msgstr ""
+
+#: src/bin/text_setting.c:863
+msgid "Auto Completion"
+msgstr ""
+
+#: src/bin/text_setting.c:891
+msgid "Font Name"
+msgstr ""
+
+#: src/bin/text_setting.c:917
+msgid "Font Style"
+msgstr ""
+
+#: src/bin/tools.c:117
+msgid "Redo text."
+msgstr ""
+
+#: src/bin/tools.c:119
+msgid "No text to be redo."
+msgstr ""
+
+#: src/bin/tools.c:128
+msgid "Undo text."
+msgstr ""
+
+#: src/bin/tools.c:130
+msgid "No text to be undo."
+msgstr ""
+
+#: src/bin/tools.c:183
+msgid "Enventor Menu (Esc)"
+msgstr ""
+
+#: src/bin/tools.c:196
+msgid "Save File (Ctrl + S)"
+msgstr ""
+
+#: src/bin/tools.c:202
+msgid "Undo Text (Ctrl + Z)"
+msgstr ""
+
+#: src/bin/tools.c:208
+msgid "Redo Text (Ctrl + R)"
+msgstr ""
+
+#: src/bin/tools.c:214
+msgid "Find/Replace (Ctrl + F)"
+msgstr ""
+
+#: src/bin/tools.c:221
+msgid "Goto Lines (Ctrl + L)"
+msgstr ""
+
+#: src/bin/tools.c:228
+msgid "Line Numbers (F5)"
+msgstr ""
+
+#: src/bin/tools.c:239
+msgid "Part Highlighting (Ctrl + H)"
+msgstr ""
+
+#: src/bin/tools.c:246
+msgid "Dummy Swallow (Ctrl + W)"
+msgstr ""
+
+#: src/bin/tools.c:253
+msgid "Live View Edit (Ctrl + E)"
+msgstr ""
+
+#: src/bin/tools.c:265
+msgid "Console Box (Alt + Down)"
+msgstr ""
+
+#: src/bin/tools.c:273
+msgid "Status (F11)"
+msgstr ""
+
+#: src/bin/tools.c:309
+msgid "Part Highlighting Enabled."
+msgstr ""
+
+#: src/bin/tools.c:311
+msgid "Part Highlighting Disabled."
+msgstr ""
+
+#: src/bin/tools.c:349
+msgid "Dummy Swallow Enabled."
+msgstr ""
+
+#: src/bin/tools.c:351
+msgid "Dummy Swallow Disabled."
+msgstr ""