diff --git a/ChangeLog b/ChangeLog
index 0c7131d23..230147f67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-22 Igor Murzov
+
+        * Marked some messages for translation
+        * Better gettext usage in a few places
+        * Fixed some typos and improved some messages a bit
+
 2013-01-22 Mike Blumenkrantz
 
         * No longer build illume edj files
diff --git a/NEWS b/NEWS
index ab746098f..b13d67569 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Removed:
 Improvements:
     * Mixer settings dialog is now resizable
     * No longer build illume edj files
+    * Better messages in UI
 
 Fixes:
     * Fixed crash when changing ibar source
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d1f946632..815cb3ff4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -255,6 +255,7 @@ src/modules/start/e_mod_main.c
 src/modules/syscon/e_int_config_syscon.c
 src/modules/syscon/e_mod_main.c
 src/modules/syscon/e_syscon.c
+src/modules/syscon/e_syscon_gadget.c
 src/modules/temperature/e_mod_config.c
 src/modules/temperature/e_mod_main.c
 src/modules/wizard/e_mod_main.c
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 87f16d0a0..2a6ba3d01 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1618,7 +1618,7 @@ _e_int_menus_shelves_pre_cb(void *data __UNUSED__, E_Menu *m)
         if (es->zone->num != zone->num) continue;
         if (es->cfg->container != (int)con->num) continue;
 
-        snprintf(buf, sizeof(buf), "%s %s", _("Shelf"),
+        snprintf(buf, sizeof(buf), _("Shelf %s"),
                  e_shelf_orient_string_get(es));
 
         mi = e_menu_item_new(m);
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index 3de432da1..1cf508013 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -202,7 +202,6 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, E
 {
    E_Shelf *es;
    char buf[1024];
-   const char *locname;
 
    es = E_OBJECT_ALLOC(E_Shelf, E_SHELF_TYPE, _e_shelf_free);
    if (!es) return NULL;
@@ -263,9 +262,10 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, E
 
    es->gadcon = 
      e_gadcon_swallowed_new(es->name, es->id, es->o_base, "e.swallow.content");
-   locname = es->name;
-   if (!name) locname = _("Shelf #");
-   snprintf(buf, sizeof(buf), "%s %i", locname, es->id);
+   if (es->name)
+     snprintf(buf, sizeof(buf), "%s", es->name);
+   else
+     snprintf(buf, sizeof(buf), _("Shelf #%d"), es->id);
    es->gadcon->location = 
      e_gadcon_location_new(buf, E_GADCON_SITE_SHELF, 
                            _e_shelf_gadcon_client_add, es, 
@@ -1118,7 +1118,7 @@ e_shelf_new_dialog(E_Zone *zone)
 {
    char buf[256];
 
-   snprintf(buf, sizeof(buf), "%s #%d", _("Shelf"), eina_list_count(e_config->shelves));
+   snprintf(buf, sizeof(buf), _("Shelf #%d"), eina_list_count(e_config->shelves));
    return e_entry_dialog_show(_("Add New Shelf"), "preferences-desktop-shelf",
                                _("Name:"), buf, NULL, NULL,
                                _e_shelf_new_dialog_ok, NULL, zone);
@@ -1633,7 +1633,7 @@ _e_shelf_menu_append(E_Shelf *es, E_Menu *mn)
    if (es->name)
      snprintf(buf, sizeof(buf), "%s", es->name);
    else
-     snprintf(buf, sizeof(buf), "%s %s", _("Shelf"), 
+     snprintf(buf, sizeof(buf), _("Shelf %s"),
               e_shelf_orient_string_get(es));
 
    e_shelf_locked_set(es, 1);
diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c
index 760d3f26d..be3c331f4 100644
--- a/src/bin/e_startup.c
+++ b/src/bin/e_startup.c
@@ -63,7 +63,7 @@ _e_startup(void)
         return;
      }
    e_exec(NULL, desktop, NULL, NULL, NULL);
-   snprintf(buf, sizeof(buf), "%s %s", _("Starting"), desktop->name);
+   snprintf(buf, sizeof(buf), _("Starting %s"), desktop->name);
    e_init_status_set(buf);
    ecore_job_add(_e_startup_next_cb, NULL);
 }
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index 4c2d2d087..9a5f5ab49 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -1202,7 +1202,7 @@ _e_util_conf_timer_new(void *data)
        "restored to<br>defaults. Sorry for the "
        "inconvenience.<br>");
 
-   snprintf(buf, sizeof(buf), N_("%s Configuration Updated"), module_name);
+   snprintf(buf, sizeof(buf), _("%s Configuration Updated"), module_name);
    e_util_dialog_internal(buf, msg);
    E_FREE(module_name);
 
@@ -1290,54 +1290,36 @@ e_util_time_str_get(long int seconds)
    else
      {
         if (seconds <= 60)
-          snprintf(buf, sizeof(buf), _("%li Seconds"), seconds);
+          snprintf(buf, sizeof(buf), P_("A second", "%li Seconds", seconds), seconds);
         else if (seconds >= 31526000)
           {
              test = seconds / 31526000;
-             if (test == 1)
-               snprintf(buf, sizeof(buf), _("One year"));
-             else
-               snprintf(buf, sizeof(buf), _("%li Years"), test);
+             snprintf(buf, sizeof(buf), P_("One year", "%li Years", test), test);
           }
         else if (seconds >= 2592000)
           {
              test = seconds / 2592000;
-             if (test == 1)
-               snprintf(buf, sizeof(buf), _("One month"));
-             else
-               snprintf(buf, sizeof(buf), _("%li Months"), test);
+             snprintf(buf, sizeof(buf), P_("One month", "%li Months", test), test);
           }
         else if (seconds >= 604800)
           {
              test = seconds / 604800;
-             if (test == 1)
-               snprintf(buf, sizeof(buf), _("One week"));
-             else
-               snprintf(buf, sizeof(buf), _("%li Weeks"), test);
+             snprintf(buf, sizeof(buf), P_("One week", "%li Weeks", test), test);
           }
         else if (seconds >= 86400)
           {
              test = seconds / 86400;
-             if (test == 1)
-               snprintf(buf, sizeof(buf), _("One day"));
-             else
-               snprintf(buf, sizeof(buf), _("%li Days"), test);
+             snprintf(buf, sizeof(buf), P_("One day", "%li Days", test), test);
           }
         else if (seconds >= 3600)
           {
              test = seconds / 3600;
-             if (test == 1)
-               snprintf(buf, sizeof(buf), _("An hour"));
-             else
-               snprintf(buf, sizeof(buf), _("%li Hours"), test);
+             snprintf(buf, sizeof(buf), P_("An hour", "%li Hours", test), test);
           }
         else if (seconds > 60)
           {
              test = seconds / 60;
-             if (test == 1)
-               snprintf(buf, sizeof(buf), _("A minute"));
-             else
-               snprintf(buf, sizeof(buf), _("%li Minutes"), test);
+             snprintf(buf, sizeof(buf), P_("A minute", "%li Minutes", test), test);
           }
      }
    return buf;
diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index 591531421..7a3a1b2da 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -296,7 +296,7 @@ e_modapi_init(E_Module *m)
    conf = e_config_domain_load("module.conf", conf_edd);
    if (conf)
      {
-        if (!e_util_module_config_check("Configuration Panel", conf->version, MOD_CONFIG_FILE_VERSION))
+        if (!e_util_module_config_check(_("Configuration Panel"), conf->version, MOD_CONFIG_FILE_VERSION))
           _conf_free();
      }
 
diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c
index f00ce105d..7c0108912 100644
--- a/src/modules/conf_menus/e_int_config_menus.c
+++ b/src/modules/conf_menus/e_int_config_menus.c
@@ -303,7 +303,7 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
    ow = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/s"), 0, 20000, 100, 
                             0, &(cfdata->scroll_speed), NULL, 100);
    e_widget_list_object_append(ol, ow, 1, 0, 0.5);
-   ow = e_widget_label_add(evas, _("Fast Mouse Move Threshhold"));
+   ow = e_widget_label_add(evas, _("Fast Mouse Move Threshold"));
    e_widget_list_object_append(ol, ow, 1, 0, 0.5);
    ow = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/s"), 0, 2000, 10, 
                             0, &(cfdata->fast_mouse_move_threshhold), NULL, 100);
diff --git a/src/modules/conf_shelves/e_int_config_shelf.c b/src/modules/conf_shelves/e_int_config_shelf.c
index 251bb5c58..105874409 100644
--- a/src/modules/conf_shelves/e_int_config_shelf.c
+++ b/src/modules/conf_shelves/e_int_config_shelf.c
@@ -124,7 +124,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    
    ol = e_widget_list_add(evas, 0, 0);
    zone = cfdata->cfd->dia->win->border ? cfdata->cfd->dia->win->border->zone : e_zone_current_get(cfdata->cfd->con);
-   snprintf(buf, sizeof(buf), "%s %d", _("Configured Shelves: Display"), zone->num);
+   snprintf(buf, sizeof(buf), _("Configured Shelves: Display %d"), zone->num);
    of = e_widget_framelist_add(evas, buf, 0);
    cfdata->o_list = e_widget_ilist_add(evas, 24, 24, &(cfdata->cur_shelf));
    e_widget_size_min_set(cfdata->o_list, (140 * e_scale), (80 * e_scale));
@@ -188,7 +188,7 @@ _ilist_item_new(E_Config_Dialog_Data *cfdata, Eina_Bool append, E_Shelf *es)
    if (es->name)
      snprintf(buf, sizeof(buf), "%s", es->name);
    else
-     snprintf(buf, sizeof(buf), "%s %s", _("Shelf"), e_shelf_orient_string_get(es));
+     snprintf(buf, sizeof(buf), _("Shelf %s"), e_shelf_orient_string_get(es));
    e_object_del_func_set(E_OBJECT(es), (E_Object_Cleanup_Func)_ilist_refresh);
 
    ob = e_icon_add(evas_object_evas_get(cfdata->o_list));
diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c
index c90c72fc0..a1f5520e0 100644
--- a/src/modules/conf_theme/e_mod_main.c
+++ b/src/modules/conf_theme/e_mod_main.c
@@ -169,7 +169,7 @@ _e_mod_menu_theme_add(void *data __UNUSED__, E_Menu *m)
    cur_theme = ct->file;   
    m = e_menu_new();
    e_object_del_attach_func_set(E_OBJECT(m), _e_mod_menu_theme_del);
-   e_menu_title_set(m, "Themes");
+   e_menu_title_set(m, _("Themes"));
    e_menu_item_submenu_set(mi, m);
    e_object_unref(E_OBJECT(m));
 
diff --git a/src/modules/everything/evry_plug_files.c b/src/modules/everything/evry_plug_files.c
index 20c24b08e..a13f0ff28 100644
--- a/src/modules/everything/evry_plug_files.c
+++ b/src/modules/everything/evry_plug_files.c
@@ -1328,7 +1328,7 @@ _plugins_init(const Evry_API *api)
               _file_trash_action, NULL, 1);
    EVRY_ITEM_DATA_INT_SET(act, ACT_TRASH);
 
-   ACTION_NEW("Open Folder (EFM)", 0, "folder-open",
+   ACTION_NEW("Open Directory", 0, "folder-open",
               _open_folder_action, _open_folder_check, 1);
    act->remember_context = EINA_TRUE;
 
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index 4fc97cc41..53c062784 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -272,7 +272,7 @@ _e_mod_fileman_config_load(void)
    fileman_config = e_config_domain_load("module.fileman", conf_edd);
    if (fileman_config)
      {
-        if (!e_util_module_config_check("Fileman", fileman_config->config_version, MOD_CONFIG_FILE_VERSION))
+        if (!e_util_module_config_check(_("Fileman"), fileman_config->config_version, MOD_CONFIG_FILE_VERSION))
           _e_mod_fileman_config_free();
      }
 
diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c
index 9a7f6995c..e48d792bb 100644
--- a/src/modules/gadman/e_mod_config.c
+++ b/src/modules/gadman/e_mod_config.c
@@ -18,8 +18,8 @@ struct _E_Config_Dialog_Data
 
 static const char *gadman_layer_names[] =
 {
-   "Background",
-   "Hover (Key Toggle)",
+   N_("Background"),
+   N_("Hover (Key Toggle)"),
    NULL
 };
 
diff --git a/src/modules/physics/e_mod_main.c b/src/modules/physics/e_mod_main.c
index 72f234eaf..66ee7822c 100644
--- a/src/modules/physics/e_mod_main.c
+++ b/src/modules/physics/e_mod_main.c
@@ -51,7 +51,7 @@ e_modapi_init(E_Module *m)
    mod->conf = e_config_domain_load("module.physics", mod->conf_edd);
    if (mod->conf)
      {
-        if (!e_util_module_config_check("Physics", mod->conf->config_version, MOD_CONFIG_FILE_VERSION))
+        if (!e_util_module_config_check(_("Physics"), mod->conf->config_version, MOD_CONFIG_FILE_VERSION))
           {
              e_mod_cfdata_config_free(mod->conf);
              mod->conf = NULL;
diff --git a/src/modules/quickaccess/e_mod_main.c b/src/modules/quickaccess/e_mod_main.c
index e05f33823..8b3778b7c 100644
--- a/src/modules/quickaccess/e_mod_main.c
+++ b/src/modules/quickaccess/e_mod_main.c
@@ -44,7 +44,7 @@ e_modapi_init(E_Module *m)
    qa_config = e_config_domain_load("module.quickaccess", conf_edd);
    if (qa_config)
      {
-        if (!e_util_module_config_check("Quickaccess", qa_config->config_version, MOD_CONFIG_FILE_VERSION))
+        if (!e_util_module_config_check(_("Quickaccess"), qa_config->config_version, MOD_CONFIG_FILE_VERSION))
           {
              e_qa_config_free(qa_config);
              qa_config = NULL;
diff --git a/src/modules/quickaccess/e_mod_quickaccess.c b/src/modules/quickaccess/e_mod_quickaccess.c
index 934935ab8..c0acf57f0 100644
--- a/src/modules/quickaccess/e_mod_quickaccess.c
+++ b/src/modules/quickaccess/e_mod_quickaccess.c
@@ -364,11 +364,14 @@ _e_qa_entry_relaunch_setup(E_Quick_Access_Entry *entry)
           }
         entry->dia = dia = e_dialog_new(NULL, "E", "_quickaccess_cmd_dialog");
 
-        snprintf(buf, sizeof(buf), "%s<br>%s<br>%s<br>%s<br>%s", _("The selected window created with name:"),
-                 entry->name, _("and class:"), entry->class, _("could not be found in the Quickaccess app database<br"
-                                                               "This means that either the app is unknown to us<br>"
-                                                               "or it is not intended for use with this option.<br>"
-                                                               "Please choose an action to take:"));
+        snprintf(buf, sizeof(buf),
+                 _("The selected window created with name:<br>%s<br>"
+                   "and class:<br>%s<br>"
+                   "could not be found in the Quickaccess app database<br>"
+                   "This means that either the app is unknown to us<br>"
+                   "or it is not intended for use with this option.<br>"
+                   "Please choose an action to take:"),
+                 entry->name, entry->class);
 
         e_dialog_title_set(dia, _("Quickaccess Error"));
         e_dialog_icon_set(dia, "enlightenment", 64);
diff --git a/src/modules/wizard/page_170.c b/src/modules/wizard/page_170.c
index 5903aa7b8..0fe0dc1e1 100644
--- a/src/modules/wizard/page_170.c
+++ b/src/modules/wizard/page_170.c
@@ -36,13 +36,13 @@ wizard_page_show(E_Wizard_Page *pg)
        "This is very useful, because it lets<br>"
        "you know about available bug fixes and<br>"
        "security fixes when they happen. As a<br>"
-       "bi-product of this, Enlightenment will<br>"
-       "connect to enlightenment.org and transmit<br>"
-       "some information as a result much like any<br>"
-       "web browser might do. No personal information<br>"
-       "such as username, password or any personal<br>"
-       "files will be transmitted. If you do not like<br>"
-       "this, please disable this below. It is highly<br>"
+       "result, Enlightenment will connect to<br>"
+       "enlightenment.org and transmit some<br>"
+       "information, much like any web browser<br>"
+       "might do. No personal information such as<br>"
+       "username, password or any personal files<br>"
+       "will be transmitted. If you don't like this,<br>"
+       "please disable this below. It is highly<br>"
        "advised that you do not disable this as it<br>"
        "may leave you vulnerable or having to live<br>"
        "with bugs."