diff --git a/configure.in b/configure.in
index f60378510..966022cb7 100644
--- a/configure.in
+++ b/configure.in
@@ -95,7 +95,7 @@ else
   AC_DEFINE_UNQUOTED(LOCALE_DIR, "${datadir}/locale", "Locale directory")
 fi
 
-ALL_LINGUAS="bg de es fi fr ja pl pt ru"
+ALL_LINGUAS="bg de es fi fr ja pl pt ru zh_CN hu"
 
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.12.1)
diff --git a/po/Makefile.am b/po/Makefile.am
index facbc3973..517d85134 100644
--- a/po/Makefile.am
+++ b/po/Makefile.am
@@ -12,7 +12,9 @@ fi.mo \
 ru.mo \
 bg.mo \
 de.mo \
-pl.mo
+pl.mo \
+zh_CN.mo \
+hu.mo
 
 LANGS = \
 fr \
@@ -23,7 +25,9 @@ fi \
 ru \
 bg \
 de \
-pl
+pl \
+zh_CN \
+hu
 
 EXTRA_DIST = \
 enlightenment.pot \
@@ -35,7 +39,9 @@ fi.po \
 ru.po \
 bg.po \
 de.po \
-pl.po
+pl.po \
+zh_CN.po \
+hu.po
 
 ja.mo:
 	$(MSGFMT) -f -o $@ $(top_srcdir)/po/ja.po
@@ -55,6 +61,10 @@ de.mo:
 	$(MSGFMT) -f -o $@ $(top_srcdir)/po/de.po
 pl.mo:
 	$(MSGFMT) -f -o $@ $(top_srcdir)/po/pl.po
+zh_CN.mo:
+	$(MSGFMT) -f -o $@ $(top_srcdir)/po/zh_CN.po
+hu.mo:
+	$(MSGFMT) -f -o $@ $(top_srcdir)/po/hu.po
 
 install-poDATA:
 uninstall-poDATA:
diff --git a/po/hu.po b/po/hu.po
new file mode 100644
index 000000000..dd3d71414
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,962 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2005-04-26 09:09+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=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/modules/cpufreq/e_mod_main.c:460
+#, c-format
+msgid "%i Mhz"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:463
+#, c-format
+msgid "%i.%i Ghz"
+msgstr ""
+
+#: src/bin/e_int_menus.c:279
+msgid "(No Applications)"
+msgstr "(Nincs alkalmazás)"
+
+#: src/bin/e_int_menus.c:452
+msgid "(No Windows)"
+msgstr "(Nincs ablak)"
+
+#: src/bin/e_int_menus.c:528
+msgid "(Unused)"
+msgstr "(Nem használt)"
+
+#: src/modules/battery/e_mod_main.c:418
+msgid "1 hour"
+msgstr "1 óra"
+
+#: src/modules/temperature/e_mod_main.c:596
+msgid "100C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:500
+msgid "10C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:507
+#: src/modules/temperature/e_mod_main.c:540
+msgid "20C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:514
+#: src/modules/temperature/e_mod_main.c:547
+msgid "30C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:521
+#: src/modules/temperature/e_mod_main.c:554
+msgid "40C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:528
+#: src/modules/temperature/e_mod_main.c:561
+msgid "50C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:568
+msgid "60C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:575
+msgid "70C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:582
+msgid "80C"
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:589
+msgid "90C"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:99
+msgid ""
+"A basic battery meter that uses either ACPI or APM\n"
+"on Linux to monitor your battery and AC power adaptor\n"
+"status. This will only work under Linux and is only\n"
+"as accurate as your BIOS or kernel drivers."
+msgstr ""
+"Egyszerű teleptöltöttség jelző, mely vagy az ACPI-n vagy\n"
+"az APM-en keresztül képes mérni a telep töltöttségét illetve\n"
+"a hálózati csatlakozás meglétét. Ez csak Linuxon működik és\n"
+"csak annyira pontos, amennyire a BIOS és a kernel meghajtók."
+
+#: src/modules/temperature/e_mod_main.c:97
+msgid ""
+"A module to measure the ACPI Thermal sensor on Linux.\n"
+"It is especially useful for modern Laptops with high speed\n"
+"CPUs that generate a lot of heat."
+msgstr ""
+"Ez a modul az ACPI hőmérők mérésére van Linuxon."
+
+#: src/modules/pager/e_mod_main.c:138
+msgid "A pager module to navigate virtual desktops."
+msgstr "Pager modul a virtuális asztalok közötti váltásra."
+
+#: src/modules/cpufreq/e_mod_main.c:108
+msgid ""
+"A simple module to control the frequency of the system CPU. This is "
+"especially useful to save power on laptops."
+msgstr ""
+"Egyszerű processzor frekvencia mérő és beállító modul."
+
+#: src/modules/clock/e_mod_main.c:96
+msgid "A simple module to give E17 a clock."
+msgstr "Egyszerű óra modul."
+
+#: src/bin/e_int_menus.c:106 src/bin/e_int_menus.c:217
+msgid "About Enlightenment"
+msgstr "Az Enlightenmentről"
+
+#: src/bin/e_module.c:380
+msgid "About..."
+msgstr "Névjegy..."
+
+#: src/bin/e_main.c:389
+msgid "Artificially slowing startup so you can see it all."
+msgstr "Mesterségesen lassított indítás, hogy mindent láss."
+
+#: src/modules/ibar/e_mod_main.c:709
+msgid "Auto fit icons"
+msgstr "Ikonok automatikus méretezése"
+
+#: src/modules/cpufreq/e_mod_main.c:434
+msgid "Automatic"
+msgstr "Automatikus"
+
+#: src/bin/e_gadman.c:530
+msgid "Automatic Height"
+msgstr "Automatikus magasság"
+
+#: src/bin/e_gadman.c:483
+msgid "Automatic Width"
+msgstr "Automatikus szélesség"
+
+#: src/modules/battery/e_mod_main.c:903
+msgid "BAD DRIVER"
+msgstr "Rossz meghajtó"
+
+#: src/modules/battery/e_mod_main.c:89
+msgid "Battery"
+msgstr "Telep"
+
+#: src/modules/battery/e_mod_main.c:686
+msgid "Battery Running Low"
+msgstr "Teleptöltöttség alacsony"
+
+#: src/modules/cpufreq/e_mod_main.c:107
+msgid "CPU Frequency Controller Module"
+msgstr "Processzor frekvencia beállító modul"
+
+#: src/modules/cpufreq/e_mod_main.c:270 src/modules/cpufreq/e_mod_main.c:287
+msgid "CPU Frequency ERROR"
+msgstr "Processzor frekvencia hiba"
+
+#: src/bin/e_gadman.c:512
+msgid "Center Horizontally"
+msgstr "Vízszintesen középre"
+
+#: src/bin/e_gadman.c:559
+msgid "Center Vertically"
+msgstr "Függőlegesen középre"
+
+#: src/modules/battery/e_mod_main.c:999
+msgid "Charging"
+msgstr "Töltés"
+
+#: src/modules/cpufreq/e_mod_main.c:388
+msgid "Check Fast (0.5 sec)"
+msgstr "Gyakori ellenőrzés (0.5 mp)"
+
+#: src/modules/battery/e_mod_main.c:430
+msgid "Check Fast (1 sec)"
+msgstr "Gyakori ellenőrzés (1 mp)"
+
+#: src/modules/temperature/e_mod_main.c:184
+#: src/modules/temperature/e_mod_main.c:608
+msgid "Check Interval"
+msgstr "Ellenőrzési gyakoriság"
+
+#: src/modules/cpufreq/e_mod_main.c:395
+msgid "Check Medium (1 sec)"
+msgstr "Közepesen gyakori ellenőrzés (1 mp)"
+
+#: src/modules/battery/e_mod_main.c:437
+msgid "Check Medium (5 sec)"
+msgstr "Közepesen gyakori ellenőrzés (5 mp)"
+
+#: src/modules/battery/e_mod_main.c:444
+msgid "Check Normal (10 sec)"
+msgstr "Alap ellenőrzési gyakoriság (10 mp)"
+
+#: src/modules/cpufreq/e_mod_main.c:402
+msgid "Check Normal (2 sec)"
+msgstr "Alap ellenőrzési gyakoriság (2 mp)"
+
+#: src/modules/battery/e_mod_main.c:451
+msgid "Check Slow (30 sec)"
+msgstr "Ritka ellenőrzés (30 mp)"
+
+#: src/modules/cpufreq/e_mod_main.c:409
+msgid "Check Slow (5 sec)"
+msgstr "Ritka ellenőrzés (5mp)"
+
+#: src/modules/cpufreq/e_mod_main.c:416
+msgid "Check Very Slow (30 sec)"
+msgstr "Nagyok ritka ellenőrzés (30 mp)"
+
+#: src/modules/battery/e_mod_main.c:458
+msgid "Check Very Slow (60 sec)"
+msgstr "Nagyon ritka ellenőrzés (60 mp)"
+
+#: src/modules/clock/e_mod_main.c:86
+msgid "Clock"
+msgstr "Óra"
+
+#: src/bin/e_border.c:3485
+msgid "Close"
+msgstr "Bezár"
+
+#: src/bin/e_module.c:395
+msgid "Configuration"
+msgstr "Beállítás"
+
+#: src/modules/cpufreq/e_mod_main.c:98
+msgid "CpuFreq"
+msgstr "ProcFrek"
+
+#: src/bin/e_border.c:3579
+msgid "Create Icon"
+msgstr "Ikon készítés"
+
+#: src/modules/battery/e_mod_main.c:995
+msgid "Danger"
+msgstr "Veszély"
+
+#: src/modules/dropshadow/e_mod_main.c:316
+msgid "Dark"
+msgstr "Sötét"
+
+#: src/bin/e_int_menus.c:78
+msgid "Desktops"
+msgstr "Asztalok"
+
+#: src/modules/dropshadow/e_mod_main.c:139
+msgid "Dropshadow"
+msgstr "Árnyék"
+
+#: src/bin/e_border.c:3553
+msgid "Edit Icon"
+msgstr "Ikon szerkesztés"
+
+#: src/bin/e_int_menus.c:522 src/modules/battery/e_mod_main.c:561
+#: src/modules/clock/e_mod_main.c:309 src/modules/cpufreq/e_mod_main.c:814
+#: src/modules/ibar/e_mod_main.c:554 src/modules/pager/e_mod_main.c:420
+#: src/modules/temperature/e_mod_main.c:721
+msgid "Edit Mode"
+msgstr "Szerkesztési mód"
+
+#: src/bin/e_module.c:384
+msgid "Enabled"
+msgstr "Engedélyezve"
+
+#: src/bin/e_gadman.c:571
+msgid "End Edit Mode"
+msgstr "Szerkesztési mód befejezése"
+
+#: src/bin/e_main.c:373
+msgid "Enlightenment"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:98
+msgid "Enlightenment Battery Module"
+msgstr "Enlightenment telepmérő modul"
+
+#: src/modules/clock/e_mod_main.c:95
+msgid "Enlightenment Clock Module"
+msgstr "Enlightenment óra modul"
+
+#: src/modules/dropshadow/e_mod_main.c:148
+msgid "Enlightenment Dropshadow Module"
+msgstr "Enlightenment árnyék modul"
+
+#: src/modules/ibar/e_mod_main.c:158
+msgid "Enlightenment IBar Module"
+msgstr "Enlightenment IBar modul"
+
+#: src/bin/e_main.c:358
+msgid "Enlightenment IPC setup error!"
+msgstr "Enlightenment IPC beállítási hiba!"
+
+#: src/modules/pager/e_mod_main.c:137
+msgid "Enlightenment Pager Module"
+msgstr "Enlighenment pager modul"
+
+#: src/bin/e_main.c:375
+msgid "Enlightenment Starting. Please wait."
+msgstr "Enlightenment indítása. Kérem várjon."
+
+#: src/modules/temperature/e_mod_main.c:96
+msgid "Enlightenment Temperature Module"
+msgstr "Enlightenment hőmérő modul"
+
+#: src/modules/test/e_mod_main.c:66
+msgid "Enlightenment Test Module"
+msgstr "Enlightenment teszt modul"
+
+#: src/bin/e_main.c:155
+msgid ""
+"Enlightenment cannot Initialize Ecore!\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Hiba az Ecore inicializálásakor!\n"
+"Talán nincs elég memóra?"
+
+#: src/bin/e_main.c:241
+msgid ""
+"Enlightenment cannot create directories in your home directory.\n"
+"Perhaps you have no home directory or the disk is full?"
+msgstr ""
+"Nem sikerült létrehozni a szükséges könyvtárakat.\n"
+"Talán írásvédett a könyvtára vagy megtelt a lemez?"
+
+#: src/bin/e_main.c:182
+msgid ""
+"Enlightenment cannot initialize its X connection.\n"
+"Have you set your DISPLAY variable?"
+msgstr ""
+"Nem sikerült inicializálni az X kapcsolatot.\n"
+"Jól van beállítva a DISPLAY változó?"
+
+#: src/bin/e_main.c:221
+msgid ""
+"Enlightenment cannot initialize the Evas system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Nem sikerült az Evas inicializálása.\n"
+"Talán nincs elág memória?"
+
+#: src/bin/e_main.c:229
+msgid ""
+"Enlightenment cannot initialize the File system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Nem sikerült inicializálni a File rendszert.\n"
+"Talán nincs elág memória?"
+
+#: src/bin/e_main.c:213
+msgid ""
+"Enlightenment cannot initialize the IPC system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Nem sikerült az IPC rendszer inicializálása.\n"
+"Talán nincs elág memória?"
+
+#: src/bin/e_main.c:205
+msgid ""
+"Enlightenment cannot initialize the connections system.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Nem sikerült a kapcsolat rendszer inicializálása.\n"
+"Talán nincs elág memória?"
+
+#: src/bin/e_main.c:171
+msgid ""
+"Enlightenment cannot set up a HUP signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Nem sikerült a HUP kezelő inicializálása.\n"
+"Talán nincs elág memória?"
+
+#: src/bin/e_main.c:165
+msgid ""
+"Enlightenment cannot set up an exit signal handler.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Nem sikerült a kilépési szgnál kezelő inicializáslása.\n"
+"Talán nincs elág memória?"
+
+#: src/bin/e_main.c:278
+msgid ""
+"Enlightenment cannot set up init screen.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+"Nem sikerült a képernyő beállítása.\n"
+"Talán nincs elág memória?"
+
+#: src/bin/e_main.c:294
+msgid "Enlightenment cannot set up its app system."
+msgstr ""
+
+#: src/bin/e_main.c:313
+msgid "Enlightenment cannot set up its bindings system."
+msgstr ""
+
+#: src/bin/e_main.c:257
+msgid "Enlightenment cannot set up its config system."
+msgstr ""
+
+#: src/bin/e_main.c:341
+msgid "Enlightenment cannot set up its dnd system."
+msgstr ""
+
+#: src/bin/e_main.c:268
+msgid "Enlightenment cannot set up its font system."
+msgstr ""
+
+#: src/bin/e_main.c:333
+msgid "Enlightenment cannot set up its module system."
+msgstr ""
+
+#: src/bin/e_main.c:301
+msgid "Enlightenment cannot set up its theme system."
+msgstr ""
+
+#: src/bin/e_main.c:249
+msgid ""
+"Enlightenment cannot set up paths for finding files.\n"
+"Perhaps you are out of memory?"
+msgstr ""
+
+#: src/bin/e_main.c:320 src/bin/e_main.c:359
+msgid ""
+"Enlightenment cannot set up the IPC socket.\n"
+"It likely is already in use by an exisiting copy of Enlightenment.\n"
+"Double check to see if Enlightenment is not already on this display,\n"
+"but if that fails try deleting all files in ~/.ecore/enlightenment-*\n"
+"and try running again."
+msgstr ""
+
+#: src/bin/e_main.c:189
+msgid ""
+"Enlightenment cannot setup xinerama wrapping.\n"
+"This should not happen."
+msgstr ""
+
+#: src/bin/e_main.c:286
+msgid ""
+"Enlightenment set up window management for all the screens on your system\n"
+"failed. Perhaps another window manager is running?\n"
+msgstr ""
+
+#: src/bin/e_error.c:350
+msgid "Enlightenment: Error!"
+msgstr "Enlightenment: Hiba!"
+
+#: src/modules/ibar/e_mod_main.c:781
+msgid "Enormous"
+msgstr "Rengeteg"
+
+#: src/modules/battery/e_mod_main.c:46
+#, c-format
+msgid ""
+"Error initializing Module: Battery\n"
+"It requires a minimum module API version of: %i.\n"
+"The module API advertized by Enlightenment is: %i.\n"
+"Aborting module."
+msgstr ""
+
+#: src/modules/clock/e_mod_main.c:41
+#, c-format
+msgid ""
+"Error initializing Module: Clock\n"
+"It requires a minimum module API version of: %i.\n"
+"The module API advertized by Enlightenment is: %i.\n"
+"Aborting module."
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_main.c:92
+#, c-format
+msgid ""
+"Error initializing Module: Dropshadow\n"
+"It requires a minimum module API version of: %i.\n"
+"The module API advertized by Enlightenment is: %i.\n"
+"Aborting module."
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:106
+#, c-format
+msgid ""
+"Error initializing Module: IBar\n"
+"It requires a minimum module API version of: %i.\n"
+"The module API advertized by Enlightenment is: %i.\n"
+"Aborting module."
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:82
+#, c-format
+msgid ""
+"Error initializing Module: Pager\n"
+"It requires a minimum module API version of: %i.\n"
+"The module API advertized by Enlightenment is: %i.\n"
+"Aborting module."
+msgstr ""
+
+#: src/modules/temperature/e_mod_main.c:44
+#, c-format
+msgid ""
+"Error initializing Module: Temperature\n"
+"It requires a minimum module API version of: %i.\n"
+"The module API advertized by Enlightenment is: %i.\n"
+"Aborting module."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:58
+#, c-format
+msgid ""
+"Error initializing Module: cpufreq\n"
+"It requires a minimum module API version of: %i.\n"
+"The module API advertized by Enlightenment is %i.\n"
+"Aborting module."
+msgstr ""
+
+#: src/modules/test/e_mod_main.c:10
+#, c-format
+msgid ""
+"Error initializing Module: test\n"
+"It requires a minimum module API version of: %i.\n"
+"The module API advertized by Enlightenment is: %i.\n"
+"Aborting module."
+msgstr ""
+
+#: src/bin/e_module.c:97 src/bin/e_module.c:108 src/bin/e_module.c:130
+msgid "Error loading Module"
+msgstr ""
+
+#: src/bin/e_border.c:3653
+msgid ""
+"Error starting icon editor\n"
+"\n"
+"please install e_util_eapp_edit\n"
+"or make sure it is in your PATH\n"
+msgstr ""
+
+#: src/bin/e_int_menus.c:123
+msgid "Exit Enlightenment"
+msgstr "Kilépés"
+
+#: src/modules/ibar/e_mod_main.c:767
+msgid "Extremely Large"
+msgstr "Nagyon nagy"
+
+#: src/modules/dropshadow/e_mod_main.c:382
+msgid "Extremely Near"
+msgstr "Nagyon közel"
+
+#: src/modules/battery/e_mod_main.c:927
+msgid "FULL"
+msgstr "Feltöltve"
+
+#: src/modules/dropshadow/e_mod_main.c:355
+msgid "Far"
+msgstr "Messze"
+
+#: src/modules/temperature/e_mod_main.c:460
+msgid "Fast (1 sec)"
+msgstr "Gyors (1 mp)"
+
+#: src/bin/e_int_menus.c:57
+msgid "Favorite Applications"
+msgstr "Kedvenc programok"
+
+#: src/bin/e_gadman.c:547
+msgid "Full Screen Height"
+msgstr "Teljes képernyős magasság"
+
+#: src/bin/e_gadman.c:500
+msgid "Full Screen Width"
+msgstr "Teljes képernyős szélesség"
+
+#: src/modules/dropshadow/e_mod_main.c:268
+msgid "Fuzzy"
+msgstr "Elmosott"
+
+#: src/bin/e_int_menus.c:96
+msgid "Gadgets"
+msgstr "Bigyók"
+
+#: src/modules/ibar/e_mod_main.c:788
+msgid "Gigantic"
+msgstr "Gigantikus"
+
+#: src/bin/e_gadman.c:541
+msgid "Half Screen Height"
+msgstr "Fél képernyő magas"
+
+#: src/bin/e_gadman.c:494
+msgid "Half Screen Width"
+msgstr "Fél képernyő széles"
+
+#: src/modules/battery/e_mod_main.c:987
+msgid "High"
+msgstr "Magas"
+
+#: src/modules/temperature/e_mod_main.c:192
+#: src/modules/temperature/e_mod_main.c:616
+msgid "High Temperature"
+msgstr "Magas hőmérséklet"
+
+#: src/modules/ibar/e_mod_main.c:774
+msgid "Huge"
+msgstr "Óriási"
+
+#: src/modules/ibar/e_mod_main.c:149
+msgid "IBar"
+msgstr ""
+
+#: src/bin/e_border.c:3652
+msgid "Icon Edit Error"
+msgstr ""
+
+#: src/bin/e_border.c:3493
+msgid "Iconify"
+msgstr "Ikonizálás"
+
+#: src/modules/dropshadow/e_mod_main.c:391
+msgid "Immediately Underneath"
+msgstr "Közvetlenül alatta"
+
+#: src/modules/ibar/e_mod_main.c:753
+msgid "Large"
+msgstr "Nagy"
+
+#: src/modules/dropshadow/e_mod_main.c:325
+msgid "Light"
+msgstr "Világos"
+
+#: src/modules/battery/e_mod_main.c:991
+msgid "Low"
+msgstr "Alacsony"
+
+#: src/modules/temperature/e_mod_main.c:188
+#: src/modules/temperature/e_mod_main.c:612
+msgid "Low Temperature"
+msgstr "Alacsony hőmérséklet"
+
+#: src/modules/cpufreq/e_mod_main.c:432
+msgid "Manual"
+msgstr "Kézi"
+
+#: src/bin/e_border.c:3514
+msgid "Maximized"
+msgstr "Maximalizált"
+
+#: src/modules/cpufreq/e_mod_main.c:438
+msgid "Maximum Speed"
+msgstr "Teljes sebesség"
+
+#: src/modules/dropshadow/e_mod_main.c:277 src/modules/ibar/e_mod_main.c:746
+msgid "Medium"
+msgstr "Közepes"
+
+#: src/modules/temperature/e_mod_main.c:467
+msgid "Medium (5 sec)"
+msgstr "Közepes (5 mp)"
+
+#: src/modules/ibar/e_mod_main.c:718
+msgid "Microscopic"
+msgstr "Mikroszkópikus"
+
+#: src/modules/cpufreq/e_mod_main.c:436
+msgid "Minimum Speed"
+msgstr "Minimum sebesség"
+
+#: src/modules/battery/e_mod_main.c:45 src/modules/clock/e_mod_main.c:40
+#: src/modules/cpufreq/e_mod_main.c:57 src/modules/dropshadow/e_mod_main.c:91
+#: src/modules/ibar/e_mod_main.c:105 src/modules/pager/e_mod_main.c:81
+#: src/modules/temperature/e_mod_main.c:43 src/modules/test/e_mod_main.c:9
+msgid "Module API Error"
+msgstr "Modul API hiba"
+
+#: src/modules/test/e_mod_main.c:24
+msgid "Module Config Menu Item 1"
+msgstr ""
+
+#: src/modules/test/e_mod_main.c:26
+msgid "Module Config Menu Item 2"
+msgstr ""
+
+#: src/modules/test/e_mod_main.c:28
+msgid "Module Config Menu Item 3"
+msgstr ""
+
+#: src/bin/e_int_menus.c:69
+msgid "Modules"
+msgstr "Modulok"
+
+#: src/bin/e_main.c:391
+msgid "Most features do not work yet, and those that do are buggy."
+msgstr "A legtöbb megoldés még nem működik, vagy hibát tartalmazhat."
+
+#: src/modules/battery/e_mod_main.c:879
+msgid "NO BAT"
+msgstr "Nincs telep"
+
+#: src/modules/battery/e_mod_main.c:748
+msgid "NO INFO"
+msgstr "Nincs infó"
+
+#: src/modules/dropshadow/e_mod_main.c:364
+msgid "Near"
+msgstr "Közel"
+
+#: src/bin/e_int_menus.c:369
+msgid "New Column of Desktops"
+msgstr "Új oszlop az asztalokhoz"
+
+#: src/bin/e_int_menus.c:361
+msgid "New Row of Desktops"
+msgstr "Új sor az asztalokhoz"
+
+#: src/modules/temperature/e_mod_main.c:474
+msgid "Normal (10 sec)"
+msgstr "Normál (10 sec)"
+
+#: src/bin/e_error.c:184 src/bin/e_error.c:193
+msgid "OK"
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:796
+msgid "Options"
+msgstr "Opciók"
+
+#: src/bin/e_main.c:110
+#, c-format
+msgid ""
+"Options:\n"
+"\t-display DISPLAY\n"
+"\t\tConnect to display named DISPLAY.\n"
+"\t\tEG: -display :1.0\n"
+"\t-fake-xinerama-screen WxH+X+Y\n"
+"\t\tAdd a FAKE xinerama screen (instead of the real ones)\n"
+"\t\tgiven the geometry. Add as many as you like. They all\n"
+"\t\treplace the real xinerama screens, if any. This can\n"
+"\t\tbe used to simulate xinerama.\n"
+"\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800"
+"+0\n"
+msgstr ""
+
+#: src/modules/pager/e_mod_main.c:128
+msgid "Pager"
+msgstr ""
+
+#: src/bin/e_int_menus.c:373
+msgid "Remove Column of Desktops"
+msgstr "Oszlop eltávolítása az asztalok közül"
+
+#: src/bin/e_int_menus.c:365
+msgid "Remove Row of Desktops"
+msgstr "Sor eltávolítása az asztalok közül"
+
+#: src/bin/e_int_menus.c:116
+msgid "Restart Enlightement"
+msgstr "Újraindítás"
+
+#: src/bin/e_border.c:3537
+msgid "Send To"
+msgstr "Áthelyezés"
+
+#: src/modules/battery/e_mod_main.c:194 src/modules/battery/e_mod_main.c:473
+msgid "Set Alarm"
+msgstr "Figyelmeztetés beállítása"
+
+#: src/modules/cpufreq/e_mod_main.c:198 src/modules/cpufreq/e_mod_main.c:484
+msgid "Set Controller"
+msgstr "Kezelő beállítása"
+
+#: src/modules/battery/e_mod_main.c:190 src/modules/battery/e_mod_main.c:469
+#: src/modules/cpufreq/e_mod_main.c:191 src/modules/cpufreq/e_mod_main.c:478
+msgid "Set Poll Time"
+msgstr "Lekérdezési idő beállítása"
+
+#: src/modules/cpufreq/e_mod_main.c:206 src/modules/cpufreq/e_mod_main.c:491
+msgid "Set Speed"
+msgstr "Sebesség beálllítása"
+
+#: src/bin/e_border.c:3504
+msgid "Shaded"
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_main.c:286
+msgid "Sharp"
+msgstr "Éles"
+
+#: src/modules/ibar/e_mod_main.c:800
+msgid "Size"
+msgstr "Méret"
+
+#: src/modules/temperature/e_mod_main.c:481
+msgid "Slow (30 sec)"
+msgstr "Lassú (30 mp)"
+
+#: src/modules/ibar/e_mod_main.c:739
+msgid "Small"
+msgstr "Kicsi"
+
+#: src/modules/test/e_mod_main.c:32
+msgid "Something Else"
+msgstr "Valami más"
+
+#: src/bin/e_border.c:3524
+msgid "Sticky"
+msgstr "Ragadós"
+
+#: src/modules/temperature/e_mod_main.c:87
+msgid "Temperature"
+msgstr "Hőmérséklet"
+
+#: src/modules/test/e_mod_main.c:59
+msgid "Test!!!"
+msgstr "Test!!!"
+
+#: src/bin/e_module.c:98
+#, c-format
+msgid ""
+"There was an error loading module named: %s\n"
+"No module named %s could be found in the\n"
+"module search directories\n"
+msgstr ""
+
+#: src/bin/e_module.c:109 src/bin/e_module.c:131
+#, c-format
+msgid ""
+"There was an error loading module named: %s\n"
+"The full path to this module is:\n"
+"%s\n"
+"The error reported was:\n"
+"%s"
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:271
+msgid ""
+"There was an error trying to set the cpu frequency\n"
+"governor via the module's setfreq utility."
+msgstr ""
+
+#: src/modules/cpufreq/e_mod_main.c:288
+msgid ""
+"There was an error trying to set the cpu frequency\n"
+"setting via the module's setfreq utility."
+msgstr ""
+
+#: src/bin/e_int_menus.c:218
+#, c-format
+msgid ""
+"This is Enlightenment %s.\n"
+"Copyright Š 1999-2004, by the Enlightenment Dev Team.\n"
+"\n"
+"We hope you enjoy using this software as much as we enjoyed writing it.\n"
+"\n"
+"Please think of the aardvarks. They need some love too."
+msgstr ""
+
+#: src/bin/e_main.c:390
+msgid "This is development code, so be warned."
+msgstr "Fejlesztői változat!"
+
+#: src/bin/e_main.c:350
+msgid ""
+"This is program has barely been started on, so it is not complete by a long\n"
+"shot. Please do NOT expect anything to work properly at this stage. It's\n"
+"being worked on.\n"
+"\n"
+"Hit \"OK\" to dismiss this dialog and continue using Enlightenment 0.17."
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:159
+msgid ""
+"This is the IBar Application Launcher bar module for Enlightenment.\n"
+"It is a first example module and is being used to flesh out several\n"
+"Interfaces in Enlightenment 0.17.0. It is under heavy development,\n"
+"so expect it to break often and change as it improves."
+msgstr ""
+
+#: src/modules/dropshadow/e_mod_main.c:149
+msgid ""
+"This is the dropshadow module that allows dropshadows to be cast\n"
+"on the desktop background - without special X-Server extensions\n"
+"or hardware acceleration."
+msgstr ""
+
+#: src/modules/test/e_mod_main.c:67
+msgid ""
+"This module is VERY simple and is only used to test the basic\n"
+"interface of the Enlightenment 0.17.0 module system. Please\n"
+"Ignore this module unless you are working on the module system."
+msgstr ""
+
+#: src/modules/ibar/e_mod_main.c:725
+msgid "Tiny"
+msgstr "Apró"
+
+#: src/modules/dropshadow/e_mod_main.c:307
+msgid "Very Dark"
+msgstr "nagyon sötét"
+
+#: src/modules/dropshadow/e_mod_main.c:346
+msgid "Very Far"
+msgstr "Nagyon távol"
+
+#: src/modules/dropshadow/e_mod_main.c:259
+msgid "Very Fuzzy"
+msgstr "Nagyon elmosott"
+
+#: src/modules/ibar/e_mod_main.c:760
+msgid "Very Large"
+msgstr "Nagyon nagy"
+
+#: src/modules/dropshadow/e_mod_main.c:334
+msgid "Very Light"
+msgstr "Nagyon világos"
+
+#: src/modules/dropshadow/e_mod_main.c:373
+msgid "Very Near"
+msgstr "Nagyon közel"
+
+#: src/modules/dropshadow/e_mod_main.c:295
+msgid "Very Sharp"
+msgstr "Nagyon éles"
+
+#: src/modules/temperature/e_mod_main.c:488
+msgid "Very Slow (60 sec)"
+msgstr "Nagyon lassú (60 mp)"
+
+#: src/modules/ibar/e_mod_main.c:732
+msgid "Very Small"
+msgstr "Nagyon kicsi"
+
+#: src/bin/e_main.c:349
+msgid "Welcome to Enlightenment 0.17"
+msgstr "Üdvözli az Enlightenment 0.17"
+
+#: src/bin/e_int_menus.c:87
+msgid "Windows"
+msgstr "Ablakok"
+
+#: src/bin/e_init.c:34
+#, c-format
+msgid "X reports there are no root windows and %i screens!\n"
+msgstr ""
+
+#: src/modules/battery/e_mod_main.c:687
+msgid ""
+"Your battery is running low.\n"
+"You may wish to switch to an AC source."
+msgstr ""
+"A teleptöltöttség alacsony.\n"
+"Érdemes lenne csatlakoztatni a hálózathoz."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 891f027d2..269773bd6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -465,7 +465,7 @@ msgid ""
 "failed. Perhaps another window manager is running?\n"
 msgstr ""
 "Enlightenment 在您的所有的screen上建立窗口管理失败。\n"
-"可能有另外一个窗口管理器在运行？"
+"可能有另外一个窗口管理器在运行？\n"
 
 #: src/bin/e_error.c:350
 msgid "Enlightenment: Error!"
@@ -593,7 +593,7 @@ msgstr ""
 "启动图标编辑器错误\n"
 "\n"
 "请安装 e_util_eapp_edit\n"
-"或者确认它已经在你的路径设置中"
+"或者确认它已经在你的路径设置中\n"
 
 #: src/bin/e_int_menus.c:123
 msgid "Exit Enlightenment"
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 2d474e3b8..e9fc9f4c6 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -49,7 +49,8 @@ e_intl.h \
 e_theme.h \
 e_dnd.h \
 e_bindings.h \
-e_moveresize.h
+e_moveresize.h \
+e_actions.h
 
 enlightenment_SOURCES = \
 e_main.c \
@@ -92,6 +93,7 @@ e_theme.c \
 e_dnd.c \
 e_bindings.c \
 e_moveresize.c \
+e_actions.c \
 $(ENLIGHTENMENTHEADERS)
 
 enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
new file mode 100644
index 000000000..cf5bcd774
--- /dev/null
+++ b/src/bin/e_actions.c
@@ -0,0 +1,30 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+
+/* local subsystem functions */
+
+/* local subsystem globals */
+
+/* externally accessible functions */
+
+int
+e_actions_init(void)
+{
+   return 1;
+}
+
+int
+e_actions_shutdown(void)
+{
+   return 1;
+}
+
+E_Action *
+e_action_find(char *name)
+{
+   return NULL;
+}
+
+/* local subsystem functions */
diff --git a/src/bin/e_actions.h b/src/bin/e_actions.h
new file mode 100644
index 000000000..cace8cb30
--- /dev/null
+++ b/src/bin/e_actions.h
@@ -0,0 +1,27 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+
+typedef struct _E_Action E_Action;
+
+struct _E_Action
+{
+   char *name;
+   struct {
+      void (*go) (E_Object *obj, char *params);
+      void (*go_mouse) (E_Object *obj, char *params, Ecore_X_Event_Mouse_Button_Down *ev);
+   } func;
+};
+
+#else
+#ifndef E_ACTIONS_H
+#define E_ACTIONS_H
+
+EAPI int         e_actions_init(void);
+EAPI int         e_actions_shutdown(void);
+
+EAPI E_Action   *e_action_find(char *name);
+
+#endif
+#endif
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 1118d902e..01de30695 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -4,9 +4,48 @@
 #include "e.h"
 
 /* local subsystem functions */
+typedef struct _E_Binding_Mouse  E_Binding_Mouse;
+typedef struct _E_Binding_Key    E_Binding_Key;
+typedef struct _E_Binding_Signal E_Binding_Signal;
+
+struct _E_Binding_Mouse
+{
+   E_Binding_Context ctxt;
+   int button;
+   E_Binding_Modifier mod;
+   unsigned char any_mod : 1;
+   char *action;
+   char *params;
+};
+
+struct _E_Binding_Key
+{
+   E_Binding_Context ctxt;
+   char *key;
+   E_Binding_Modifier mod;
+   unsigned char any_mod : 1;
+   char *action;
+   char *params;
+};
+
+struct _E_Binding_Signal
+{
+   E_Binding_Context ctxt;
+   char *sig;
+   char *src;
+   char *action;
+   char *params;
+};
+
+static void _e_bindings_mouse_free(E_Binding_Mouse *bind);
+static int _e_bindings_context_match(E_Binding_Context bctxt, E_Binding_Context ctxt);
 
 /* local subsystem globals */
 
+static Evas_List *mouse_bindings = NULL;
+static Evas_List *key_bindings = NULL;
+static Evas_List *signal_bindings = NULL;
+
 /* externally accessible functions */
 
 int
@@ -22,18 +61,97 @@ e_bindings_shutdown(void)
 }
 
 void
-e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, char *action, char *param)
+e_bindings_mouse_add(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, char *action, char *params)
 {
+   E_Binding_Mouse *bind;
+   
+   if (!params) params = "";
+   bind = calloc(1, sizeof(E_Binding_Mouse));
+   bind->ctxt = ctxt;
+   bind->button = button;
+   bind->mod = mod;
+   bind->any_mod = any_mod;
+   bind->action = strdup(action);
+   bind->params = strdup(params);
+   mouse_bindings = evas_list_append(mouse_bindings, bind);
 }
 
 void
-e_bindings_mouse_grab(Ecore_X_Window win)
+e_bindings_mouse_del(E_Binding_Context ctxt, int button, E_Binding_Modifier mod, int any_mod, char *action, char *params)
 {
+   Evas_List *l;
+   
+   if (!params) params = "";
+   for (l = mouse_bindings; l; l = l->next)
+     {
+	E_Binding_Mouse *bind;
+	
+	bind = l->data;
+	if ((bind->ctxt == ctxt) &&
+	    (bind->button == button) &&
+	    (bind->mod == mod) &&
+	    (bind->any_mod == any_mod) &&
+	    (!strcmp(bind->action, action)) &&
+	    (!strcmp(bind->params, params)))
+	  {
+	     _e_bindings_mouse_free(bind);
+	     mouse_bindings = evas_list_remove_list(mouse_bindings, l);
+	     break;
+	  }
+     }
 }
 
 void
-e_bindings_mouse_ungrab(Ecore_X_Window win)
+e_bindings_mouse_grab(E_Binding_Context ctxt, Ecore_X_Window win)
 {
+   Evas_List *l;
+   
+   for (l = mouse_bindings; l; l = l->next)
+     {
+	E_Binding_Mouse *bind;
+	
+	bind = l->data;
+	if (bind->ctxt == ctxt)
+	  {
+	     int mod;
+	     
+	     mod = 0;
+	     if (bind->mod & E_BINDING_MODIFIER_SHIFT) mod |= ECORE_X_MODIFIER_SHIFT;
+	     if (bind->mod & E_BINDING_MODIFIER_CTRL) mod |= ECORE_X_MODIFIER_CTRL;
+	     if (bind->mod & E_BINDING_MODIFIER_ALT) mod |= ECORE_X_MODIFIER_ALT;
+	     if (bind->mod & E_BINDING_MODIFIER_WIN) mod |= ECORE_X_MODIFIER_WIN;
+	     ecore_x_window_button_grab(win, bind->button, 
+					ECORE_X_EVENT_MASK_KEY_DOWN | 
+					ECORE_X_EVENT_MASK_MOUSE_UP | 
+					ECORE_X_EVENT_MASK_MOUSE_MOVE, 
+					mod, bind->any_mod);
+	  }
+     }
+}
+
+void
+e_bindings_mouse_ungrab(E_Binding_Context ctxt, Ecore_X_Window win)
+{
+   Evas_List *l;
+   
+   for (l = mouse_bindings; l; l = l->next)
+     {
+	E_Binding_Mouse *bind;
+	
+	bind = l->data;
+	if (bind->ctxt == ctxt)
+	  {
+	     int mod;
+	     
+	     mod = 0;
+	     if (bind->mod & E_BINDING_MODIFIER_SHIFT) mod |= ECORE_X_MODIFIER_SHIFT;
+	     if (bind->mod & E_BINDING_MODIFIER_CTRL) mod |= ECORE_X_MODIFIER_CTRL;
+	     if (bind->mod & E_BINDING_MODIFIER_ALT) mod |= ECORE_X_MODIFIER_ALT;
+	     if (bind->mod & E_BINDING_MODIFIER_WIN) mod |= ECORE_X_MODIFIER_WIN;
+	     ecore_x_window_button_ungrab(win, bind->button,
+					  mod, bind->any_mod);
+	  }
+     }
 }
 
 int
@@ -46,10 +164,35 @@ e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_
    if (ev->modifiers & ECORE_X_MODIFIER_CTRL) mod |= E_BINDING_MODIFIER_CTRL;
    if (ev->modifiers & ECORE_X_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT;
    if (ev->modifiers & ECORE_X_MODIFIER_WIN) mod |= E_BINDING_MODIFIER_WIN;
-   
+   for (l = mouse_bindings; l; l = l->next)
+     {
+	E_Binding_Mouse *bind;
+	
+	bind = l->data;
+	if ((bind->button == ev->button) &&
+	    ((bind->any_mod) || (bind->mod == mod)))
+	  {
+	     if (_e_bindings_context_match(bind->ctxt, ctxt))
+	       {
+		  E_Action *act;
+		  
+		  act = e_action_find(bind->action);
+		  if (act)
+		    {
+		       if (act->func.go_mouse)
+			 act->func.go_mouse(obj, bind->params, ev);
+		       else if (act->func.go)
+			 act->func.go(obj, bind->params);
+		       return 1;
+		    }
+		  return 0;
+	       }
+	  }
+     }
    return 0;
 }
 
+/* FIXME: finish off key bindings */
 int
 e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Key_Down *ev)
 {
@@ -64,4 +207,30 @@ e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_
    return 0;
 }
 
+/* FIXME: finish off signal bindings */
+int
+e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, char *sig, char *src)
+{
+   Evas_List *l;
+   
+   return 0;
+}
+
 /* local subsystem functions */
+
+static void
+_e_bindings_mouse_free(E_Binding_Mouse *bind)
+{
+   E_FREE(bind->action);
+   E_FREE(bind->params);
+   free(bind);
+}
+
+static int
+_e_bindings_context_match(E_Binding_Context bctxt, E_Binding_Context ctxt)
+{
+   if (bctxt) return 1;
+   if (ctxt == E_BINDING_CONTEXT_UNKNOWN) return 0;
+   if (bctxt == ctxt) return 1;
+   return 0;
+}
diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h
index bc1032128..fd4e7c50d 100644
--- a/src/bin/e_bindings.h
+++ b/src/bin/e_bindings.h
@@ -6,9 +6,10 @@
 typedef enum _E_Binding_Context
 {
    E_BINDING_CONTEXT_NONE,
-   E_BINDING_CONTEXT_UNKOWN,
+   E_BINDING_CONTEXT_UNKNOWN,
    E_BINDING_CONTEXT_BORDER,
-   E_BINDING_CONTEXT_ZONE
+   E_BINDING_CONTEXT_ZONE,
+   E_BINDING_CONTEXT_ANY
 } E_Binding_Context;
 
 /* why do we do this? config stored bindings must be fixed. x's modifier masks
@@ -32,6 +33,7 @@ EAPI int         e_bindings_shutdown(void);
 
 EAPI int         e_bindings_mouse_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Mouse_Button_Down *ev);
 EAPI int         e_bindings_key_down_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Event_Key_Down *ev);
+EAPI int         e_bindings_signale_handle(E_Binding_Context ctxt, E_Object *obj, char *sig, char *src);
 					 
 #endif
 #endif
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index c66fbcc78..5ea2514eb 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -39,3 +39,4 @@
 #include "e_dnd.h"
 #include "e_bindings.h"
 #include "e_moveresize.h"
+#include "e_actions.h"
diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c
index 77e914c80..04effd13b 100644
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@@ -49,6 +49,8 @@ e_intl_init(void)
    ADD_LANG("bg");
    ADD_LANG("de");
    ADD_LANG("pl");
+   ADD_LANG("zh_CN");
+   ADD_LANG("hu");
 
    /* FIXME: NULL == use LANG. make this read a config value if it exists */
    e_intl_language_set(getenv("LANG"));
@@ -146,7 +148,7 @@ e_intl_language_name_get(const char *lang)
    IFL("uk") "Ukrainian";
    IFL("vi") "Vietnamese";
    /* must keep both - politically sensitive */
-   IFL("zh") "Chinese (Simplified)";
+   IFL("zh_CN") "Chinese (Simplified)";
    IFL("zh_TW") "Chinese (Traditional)";
    return "Unknown";
 }
@@ -191,6 +193,12 @@ e_intl_language_simple_get(const char *lang)
      return "de";
    if (ISL("pl") || ISL("pl_PL") || ISL("PL") || ISL("pl_PL@euro"))
      return "pl";
+   if (ISL("zh") || ISL("zh_CN") || ISL("CN"))
+     return "zh_CN";
+   if (ISL("zh") || ISL("zh_TW") || ISL("TW"))
+     return "zh_TW";
+   if (ISL("hu") || ISL("hu_HU") || ISL("HU"))
+     return "hu";
    /* this is the default fallback - we have no special cases for this lang
     * so just strip off anything after and including the _ for country region
     * and just return the language encoding
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index c12915c7b..8f457a144 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -307,6 +307,13 @@ main(int argc, char **argv)
    /* tell the error system that it can use gui dialogs now */
    e_error_gui_set(1);
    
+   /* init actions system */
+   if (!e_actions_init())
+     {
+	e_error_message_show(_("Enlightenment cannot set up its actions system."));
+	_e_main_shutdown(-1);
+     }
+   _e_main_shutdown_push(e_actions_shutdown);
    /* init bindings system */
    if (!e_bindings_init())
      {