diff --git a/src/bin/main.c b/src/bin/main.c
index 37b5e7b6..5d498b07 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -2643,8 +2643,6 @@ static const char *emotion_choices[] = {
   NULL
 };
 
-#define gettext_noop(String) String
-
 static Ecore_Getopt options = {
    PACKAGE_NAME,
    "%prog [options]",
diff --git a/src/bin/options.c b/src/bin/options.c
index 6eea718c..c787898a 100644
--- a/src/bin/options.c
+++ b/src/bin/options.c
@@ -131,7 +131,7 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term,
         op_frame = o = elm_frame_add(win);
         evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
         evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-        elm_object_text_set(o, "Options");
+        elm_object_text_set(o, _("Options"));
 
         op_box = o = elm_box_add(win);
         elm_box_horizontal_set(o, EINA_TRUE);
@@ -160,14 +160,14 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term,
                                 (void*) OPTION_##_option_mode)
 
         it_fn =
-        ITEM_APPEND("preferences-desktop-font", "Font", FONT);
-        ITEM_APPEND("preferences-desktop-theme", "Theme", THEME);
-        ITEM_APPEND("preferences-desktop-wallpaper", "Wallpaper", WALLPAPER);
-        ITEM_APPEND("video-display", "Video", VIDEO);
-        ITEM_APPEND("preferences-desktop-theme", "Colors", COLORS);
-        ITEM_APPEND("preferences-system", "Behavior", BEHAVIOR);
-        ITEM_APPEND("preferences-desktop-keyboard-shortcuts", "Keys", KEYS);
-        ITEM_APPEND("system-run", "Helpers", HELPERS);
+        ITEM_APPEND("preferences-desktop-font", _("Font"), FONT);
+        ITEM_APPEND("preferences-desktop-theme", _("Theme"), THEME);
+        ITEM_APPEND("preferences-desktop-wallpaper", _("Wallpaper"), WALLPAPER);
+        ITEM_APPEND("video-display", _("Video"), VIDEO);
+        ITEM_APPEND("preferences-desktop-theme", _("Colors"), COLORS);
+        ITEM_APPEND("preferences-system", _("Behavior"), BEHAVIOR);
+        ITEM_APPEND("preferences-desktop-keyboard-shortcuts", _("Keys"), KEYS);
+        ITEM_APPEND("system-run", _("Helpers"), HELPERS);
 #undef ITEM_APPEND
 
         elm_box_pack_end(op_tbox, o);
@@ -178,7 +178,7 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term,
         op_temp = o = elm_check_add(win);
         evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
         evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 1.0);
-        elm_object_text_set(o, "Temporary");
+        elm_object_text_set(o, _("Temporary"));
         elm_check_state_set(o, config->temporary);
         elm_box_pack_end(op_tbox, o);
         evas_object_show(o);
diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c
index 32aa5786..d9a36f39 100644
--- a/src/bin/options_behavior.c
+++ b/src/bin/options_behavior.c
@@ -124,7 +124,7 @@ _behavior_option_restore_opened_views_add(Evas_Object *term,
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Restore opened views");
+   elm_object_text_set(o, _("Restore opened views"));
    elm_check_state_set(o, config->application_server_restore_views);
    elm_box_pack_after(bx, o, check);
    evas_object_show(o);
@@ -295,13 +295,14 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    Evas_Object *o, *bx, *sc, *fr;
    char *txt;
    int w, h;
+   const char *tooltip;
 
    termio_size_get(term, &w, &h);
 
    fr = o = elm_frame_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_object_text_set(o, "Behavior");
+   elm_object_text_set(o, _("Behavior"));
    elm_box_pack_end(opbox, o);
    evas_object_show(o);
 
@@ -321,7 +322,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Jump on change");
+   elm_object_text_set(o, _("Jump on change"));
    elm_check_state_set(o, config->jump_on_change);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -331,7 +332,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Jump on key");
+   elm_object_text_set(o, _("Jump on key"));
    elm_check_state_set(o, config->jump_on_keypress);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -341,7 +342,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "React to key presses");
+   elm_object_text_set(o, _("React to key presses"));
    elm_check_state_set(o, config->flicker_on_key);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -351,7 +352,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Cursor blinking");
+   elm_object_text_set(o, _("Cursor blinking"));
    elm_check_state_set(o, !config->disable_cursor_blink);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -361,7 +362,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Visual Bell");
+   elm_object_text_set(o, _("Visual Bell"));
    elm_check_state_set(o, !config->disable_visual_bell);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -371,7 +372,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Bell rings");
+   elm_object_text_set(o, _("Bell rings"));
    elm_check_state_set(o, config->bell_rings);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -381,7 +382,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Urgent Bell");
+   elm_object_text_set(o, _("Urgent Bell"));
    elm_check_state_set(o, config->urg_bell);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -391,7 +392,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Active Links");
+   elm_object_text_set(o, _("Active Links"));
    elm_check_state_set(o, config->active_links);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -401,7 +402,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Enable application server");
+   elm_object_text_set(o, _("Enable application server"));
    elm_check_state_set(o, config->application_server);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -415,7 +416,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Multiple instances, one process");
+   elm_object_text_set(o, _("Multiple instances, one process"));
    elm_check_state_set(o, config->multi_instance);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -425,7 +426,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Set TERM to xterm-256color");
+   elm_object_text_set(o, _("Set TERM to xterm-256color"));
    elm_check_state_set(o, config->xterm_256color);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -435,7 +436,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "BackArrow sends Del (instead of BackSpace)");
+   elm_object_text_set(o, _("BackArrow sends Del (instead of BackSpace)"));
    elm_check_state_set(o, config->erase_is_del);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -445,7 +446,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Drag & drop links");
+   elm_object_text_set(o, _("Drag & drop links"));
    elm_check_state_set(o, config->drag_links);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -455,7 +456,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Start as login shell");
+   elm_object_text_set(o, _("Start as login shell"));
    elm_check_state_set(o, config->login_shell);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -465,7 +466,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Focus split under the Mouse");
+   elm_object_text_set(o, _("Focus split under the Mouse"));
    elm_check_state_set(o, config->mouse_over_focus);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -475,7 +476,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(bx);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Always open at size:");
+   elm_object_text_set(o, _("Always open at size:"));
    elm_check_state_set(o, config->custom_geometry);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -485,7 +486,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(bx);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Width:");
+   elm_object_text_set(o, _("Width:"));
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
@@ -505,7 +506,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(bx);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Height:");
+   elm_object_text_set(o, _("Height:"));
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
@@ -532,7 +533,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(bx);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Word separators:");
+   elm_object_text_set(o, _("Word separators:"));
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
@@ -563,7 +564,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(bx);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Scrollback:");
+   elm_object_text_set(o, _("Scrollback:"));
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
@@ -583,21 +584,17 @@ options_behavior(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(bx);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Tab zoom/switch animation time:");
-   elm_object_tooltip_text_set
-      (o, "Set the time of the animation that<br>"
+   elm_object_text_set(o, _("Tab zoom/switch animation time:"));
+   tooltip = _("Set the time of the animation that<br>"
        "takes places on tab switches,<br>"
        "be them by key binding, mouse<br>"
        "wheel or tabs panel mouse move");
+   elm_object_tooltip_text_set(o, tooltip);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_slider_add(bx);
-   elm_object_tooltip_text_set
-      (o, "Set the time of the animation that<br>"
-       "takes places on tab switches,<br>"
-       "be them by key binding, mouse<br>"
-       "wheel or tabs panel mouse move");
+   elm_object_tooltip_text_set(o, tooltip);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
    elm_slider_span_size_set(o, 40);
diff --git a/src/bin/options_colors.c b/src/bin/options_colors.c
index 10f025d8..f8e0c686 100644
--- a/src/bin/options_colors.c
+++ b/src/bin/options_colors.c
@@ -9,17 +9,17 @@
 static const char mapping[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 11 };
 static const char *mapping_names[] =
   {
-     "Default",
-     "Black",
-     "Red",
-     "Green",
-     "Yellow",
-     "Blue",
-     "Magenta",
-     "Cyan",
-     "White",
-     "Inverse",
-     "Inverse Base"
+     gettext_noop("Default"),
+     gettext_noop("Black"),
+     gettext_noop("Red"),
+     gettext_noop("Green"),
+     gettext_noop("Yellow"),
+     gettext_noop("Blue"),
+     gettext_noop("Magenta"),
+     gettext_noop("Cyan"),
+     gettext_noop("White"),
+     gettext_noop("Inverse"),
+     gettext_noop("Inverse Base")
   };
 
 static Elm_Object_Item *colitem[4][11] = { { NULL } };
@@ -60,7 +60,7 @@ _cb_op_color_item_sel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
         for (i = 0; i < 11; i++)
           {
              if (colitem[j][i] == it)
-               elm_object_text_set(label, mapping_names[i]);
+               elm_object_text_set(label, gettext(mapping_names[i]));
           }
      }
 }
@@ -156,7 +156,7 @@ options_colors(Evas_Object *opbox, Evas_Object *term)
    fr = o = elm_frame_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_object_text_set(o, "Colors");
+   elm_object_text_set(o, _("Colors"));
    elm_box_pack_end(opbox, o);
    evas_object_show(o);
    
@@ -184,10 +184,10 @@ options_colors(Evas_Object *opbox, Evas_Object *term)
    for (j = 0; j < 4; j++)
      {
         o = elm_label_add(opbox);
-        if (j == 0) elm_object_text_set(o, "Normal");
-        else if (j == 1) elm_object_text_set(o, "Bright");
-        else if (j == 2) elm_object_text_set(o, "Normal 2");
-        else if (j == 3) elm_object_text_set(o, "Bright 2");
+        if (j == 0) elm_object_text_set(o, _("Normal"));
+        else if (j == 1) elm_object_text_set(o, _("Bright"));
+        else if (j == 2) elm_object_text_set(o, _("Normal 2"));
+        else if (j == 3) elm_object_text_set(o, _("Bright 2"));
         evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
         evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
         elm_box_pack_end(bx3, o);
@@ -233,7 +233,7 @@ options_colors(Evas_Object *opbox, Evas_Object *term)
    evas_object_show(o);
    
    label = o = elm_label_add(opbox);
-   elm_object_text_set(o, mapping_names[0]);
+   elm_object_text_set(o, gettext(mapping_names[0]));
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_box_pack_end(bx2, o);
@@ -259,7 +259,7 @@ options_colors(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(opbox);
    evas_object_size_hint_weight_set(o, 1.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Use");
+   elm_object_text_set(o, _("Use"));
    elm_check_state_set(o, config->colors_use);
    elm_box_pack_end(bx4, o);
    evas_object_show(o);
@@ -269,9 +269,8 @@ options_colors(Evas_Object *opbox, Evas_Object *term)
    elm_object_disabled_set(o, EINA_TRUE);
    evas_object_size_hint_weight_set(o, 1.0, 0.0);
    evas_object_size_hint_align_set(o, 1.0, 0.5);
-   elm_object_text_set(o, "Reset");
+   elm_object_text_set(o, _("Reset"));
    elm_box_pack_end(bx4, o);
    evas_object_show(o);
    evas_object_smart_callback_add(o, "clicked", _cb_op_reset, term);
-   
 }
diff --git a/src/bin/options_font.c b/src/bin/options_font.c
index c0797b73..ef139ebb 100644
--- a/src/bin/options_font.c
+++ b/src/bin/options_font.c
@@ -349,7 +349,7 @@ options_font(Evas_Object *opbox, Evas_Object *term)
    fr = o = elm_frame_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_object_text_set(o, "Font");
+   elm_object_text_set(o, _("Font"));
    elm_box_pack_end(opbox, o);
    evas_object_show(o);
    
@@ -411,7 +411,7 @@ options_font(Evas_Object *opbox, Evas_Object *term)
    files = ecore_file_ls(buf);
    if (files)
      {
-        grp_it = elm_genlist_item_append(o, it_group, "Bitmap", NULL,
+        grp_it = elm_genlist_item_append(o, it_group, _("Bitmap"), NULL,
                                          ELM_GENLIST_ITEM_GROUP,
                                          NULL, NULL);
         elm_genlist_item_select_mode_set(grp_it,
@@ -451,7 +451,7 @@ options_font(Evas_Object *opbox, Evas_Object *term)
    fonthash = eina_hash_string_superfast_new(NULL);
    if (fonts)
      {
-        grp_it = elm_genlist_item_append(o, it_group, "Standard", NULL,
+        grp_it = elm_genlist_item_append(o, it_group, _("Standard"), NULL,
                                          ELM_GENLIST_ITEM_GROUP,
                                          NULL, NULL);
         elm_genlist_item_select_mode_set(grp_it,
diff --git a/src/bin/options_helpers.c b/src/bin/options_helpers.c
index 27e3dcf6..31f35083 100644
--- a/src/bin/options_helpers.c
+++ b/src/bin/options_helpers.c
@@ -174,7 +174,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    fr = o = elm_frame_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_object_text_set(o, "Helpers");
+   elm_object_text_set(o, _("Helpers"));
    elm_box_pack_end(opbox, o);
    evas_object_show(o);
    
@@ -187,7 +187,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    o = elm_check_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Inline if possible");
+   elm_object_text_set(o, _("Inline if possible"));
    elm_check_state_set(o, config->helper.inline_please);
    elm_box_pack_end(bx, o);
    evas_object_show(o);
@@ -217,7 +217,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(tb);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "E-mail:");
+   elm_object_text_set(o, _("E-mail:"));
    elm_table_pack(tb, o, 0, row, 1, 1);
    evas_object_show(o);
 
@@ -250,7 +250,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(tb);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "URL (Images):");
+   elm_object_text_set(o, _("URL (Images):"));
    elm_table_pack(tb, o, 0, row, 1, 1);
    evas_object_show(o);
 
@@ -275,7 +275,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(tb);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "URL (Video):");
+   elm_object_text_set(o, _("URL (Video):"));
    elm_table_pack(tb, o, 0, row, 1, 1);
    evas_object_show(o);
 
@@ -300,7 +300,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(tb);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "URL (All):");
+   elm_object_text_set(o, _("URL (All):"));
    elm_table_pack(tb, o, 0, row, 1, 1);
    evas_object_show(o);
 
@@ -333,7 +333,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(tb);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Local (Images):");
+   elm_object_text_set(o, _("Local (Images):"));
    elm_table_pack(tb, o, 0, row, 1, 1);
    evas_object_show(o);
 
@@ -358,7 +358,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(tb);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Local (Video):");
+   elm_object_text_set(o, _("Local (Video):"));
    elm_table_pack(tb, o, 0, row, 1, 1);
    evas_object_show(o);
 
@@ -383,7 +383,7 @@ options_helpers(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(tb);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Local (All):");
+   elm_object_text_set(o, _("Local (All):"));
    elm_table_pack(tb, o, 0, row, 1, 1);
    evas_object_show(o);
 
diff --git a/src/bin/options_keys.c b/src/bin/options_keys.c
index 8e16fa48..08ef2c1a 100644
--- a/src/bin/options_keys.c
+++ b/src/bin/options_keys.c
@@ -30,34 +30,34 @@ options_keys(Evas_Object *opbox, Evas_Object *term EINA_UNUSED)
    elm_list_item_append(li, _action, NULL, lbl, NULL, NULL);  \
 } while (0)
 
-   KB("Scroll one page up", "Shift + PgUp");
-   KB("Scroll one page down", "Shift + PgDn");
-   KB("Paste Clipboard (ctrl+v/c) selection", "Shift + Insert");
-   KB("Paste Clipboard (ctrl+v/c) selection", "Ctrl + Shift + v");
-   KB("Paste Primary (highlight) selection", "Shift + Ctrl + Insert");
-   KB("Paste Primary (highlight) selection", "Alt + Return");
-   KB("Copy current selection to clipboard", "Ctrl + Shift + c");
-   KB("Copy current selection to clipboard", "Shift+Keypad-Divide");
-   KB("Font size up 1", "Shift+Keypad-Plus");
-   KB("Font size down 1", "Shift+Keypad-Minus");
-   KB("Reset font size to 10", "Shift+Keypad-Multiply");
-   KB("Split horizontally (new below)", "Ctrl + Shift + PgUp");
-   KB("Split vertically (new on right)", "Ctrl + Shift + PgDn");
-   KB("Focus to previous terminal", "Ctrl + PgUp");
-   KB("Focus to next terminal", "Ctrl + PgDn");
-   KB("Create new \"tab\"", "Ctrl + Shift + t");
-   KB("Bring up \"tab\" switcher", "Ctrl + Shift + Home");
-   KB("Switch to terminal tab 1", "Ctrl + 1");
-   KB("Switch to terminal tab 2", "Ctrl + 2");
-   KB("Switch to terminal tab 3", "Ctrl + 3");
-   KB("Switch to terminal tab 4", "Ctrl + 4");
-   KB("Switch to terminal tab 5", "Ctrl + 5");
-   KB("Switch to terminal tab 6", "Ctrl + 6");
-   KB("Switch to terminal tab 7", "Ctrl + 7");
-   KB("Switch to terminal tab 8", "Ctrl + 8");
-   KB("Switch to terminal tab 9", "Ctrl + 9");
-   KB("Switch to terminal tab 10", "Ctrl + 0");
-   KB("Enter command mode", "Alt + Home");
-   KB("Toggle miniview of the history", "Ctrl + Shift + h");
+   KB(_("Scroll one page up"), "Shift + PgUp");
+   KB(_("Scroll one page down"), "Shift + PgDn");
+   KB(_("Paste Clipboard (ctrl+v/c) selection"), "Shift + Insert");
+   KB(_("Paste Clipboard (ctrl+v/c) selection"), "Ctrl + Shift + v");
+   KB(_("Paste Primary (highlight) selection"), "Shift + Ctrl + Insert");
+   KB(_("Paste Primary (highlight) selection"), "Alt + Return");
+   KB(_("Copy current selection to clipboard"), "Ctrl + Shift + c");
+   KB(_("Copy current selection to clipboard"), "Shift+Keypad-Divide");
+   KB(_("Font size up 1"), "Shift+Keypad-Plus");
+   KB(_("Font size down 1"), "Shift+Keypad-Minus");
+   KB(_("Reset font size to 10"), "Shift+Keypad-Multiply");
+   KB(_("Split horizontally (new below)"), "Ctrl + Shift + PgUp");
+   KB(_("Split vertically (new on right)"), "Ctrl + Shift + PgDn");
+   KB(_("Focus to previous terminal"), "Ctrl + PgUp");
+   KB(_("Focus to next terminal"), "Ctrl + PgDn");
+   KB(_("Create new \"tab\""), "Ctrl + Shift + t");
+   KB(_("Bring up \"tab\" switcher"), "Ctrl + Shift + Home");
+   KB(_("Switch to terminal tab 1"), "Ctrl + 1");
+   KB(_("Switch to terminal tab 2"), "Ctrl + 2");
+   KB(_("Switch to terminal tab 3"), "Ctrl + 3");
+   KB(_("Switch to terminal tab 4"), "Ctrl + 4");
+   KB(_("Switch to terminal tab 5"), "Ctrl + 5");
+   KB(_("Switch to terminal tab 6"), "Ctrl + 6");
+   KB(_("Switch to terminal tab 7"), "Ctrl + 7");
+   KB(_("Switch to terminal tab 8"), "Ctrl + 8");
+   KB(_("Switch to terminal tab 9"), "Ctrl + 9");
+   KB(_("Switch to terminal tab 10"), "Ctrl + 0");
+   KB(_("Enter command mode"), "Alt + Home");
+   KB(_("Toggle miniview of the history"), "Ctrl + Shift + h");
 #undef KB
 }
diff --git a/src/bin/options_theme.c b/src/bin/options_theme.c
index e1ce254b..5e419556 100644
--- a/src/bin/options_theme.c
+++ b/src/bin/options_theme.c
@@ -109,7 +109,7 @@ options_theme(Evas_Object *opbox, Evas_Object *term)
    fr = o = elm_frame_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_object_text_set(o, "Theme");
+   elm_object_text_set(o, _("Theme"));
    elm_box_pack_end(opbox, o);
    evas_object_show(o);
 
diff --git a/src/bin/options_video.c b/src/bin/options_video.c
index d3b0a18f..90e2afaf 100644
--- a/src/bin/options_video.c
+++ b/src/bin/options_video.c
@@ -62,7 +62,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
    fr = o = elm_frame_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_object_text_set(o, "Video");
+   elm_object_text_set(o, _("Video"));
    elm_box_pack_end(opbox, o);
    evas_object_show(o);
    
@@ -75,7 +75,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
    op_trans = o = elm_check_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Translucent");
+   elm_object_text_set(o, _("Translucent"));
    elm_check_state_set(o, config->translucent);
    elm_box_pack_end(bx0, o);
    evas_object_show(o);
@@ -86,8 +86,8 @@ options_video(Evas_Object *opbox, Evas_Object *term)
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
    elm_slider_span_size_set(o, 40);
-   elm_slider_unit_format_set(o, "%1.0f%%");
-   elm_slider_indicator_format_set(o, "%1.0f%%");
+   elm_slider_unit_format_set(o, _("%1.0f%%"));
+   elm_slider_indicator_format_set(o, _("%1.0f%%"));
    elm_slider_min_max_set(o, 0, 100);
    elm_slider_value_set(o, config->opacity);
    elm_object_disabled_set(o, !config->translucent);
@@ -106,7 +106,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
    op_mute = o = elm_check_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Audio muted");
+   elm_object_text_set(o, _("Audio muted"));
    elm_check_state_set(o, config->mute);
    elm_box_pack_end(bx0, o);
    evas_object_show(o);
@@ -122,14 +122,14 @@ options_video(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(opbox);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, 0.0, 0.5);
-   elm_object_text_set(o, "Video Engine:");
+   elm_object_text_set(o, _("Video Engine:"));
    elm_box_pack_end(bx0, o);
    evas_object_show(o);
 
    op_vidmod = o = elm_radio_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Automatic");
+   elm_object_text_set(o, _("Automatic"));
    elm_radio_state_value_set(o, 0);
    elm_box_pack_end(bx0, o);
    evas_object_show(o);
@@ -161,7 +161,7 @@ options_video(Evas_Object *opbox, Evas_Object *term)
    o = elm_radio_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5);
-   elm_object_text_set(o, "Generic (VLC)");
+   elm_object_text_set(o, _("VLC"));
    elm_radio_state_value_set(o, 3);
    elm_radio_group_add(o, op_vidmod);
    elm_box_pack_end(bx0, o);
diff --git a/src/bin/options_wallpaper.c b/src/bin/options_wallpaper.c
index 5636630d..aeb87c6a 100644
--- a/src/bin/options_wallpaper.c
+++ b/src/bin/options_wallpaper.c
@@ -98,7 +98,7 @@ _grid_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_U
    Background_Item *item = data;
    const char *s;
 
-   if (!item->path) return strdup("None");
+   if (!item->path) return strdup(_("None"));
    s = ecore_file_file_get(item->path);
    if (s) return strdup(s);
    return NULL;
@@ -389,7 +389,7 @@ _cb_grid_doubleclick(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
    if (strncmp(config_background_dir, _user_path, 
                strlen(config_background_dir)) == 0)
      {
-        _bubble_show("Source file is target file!");
+        _bubble_show(_("Source file is target file!"));
         free(config_background_dir);
         return;
      }
@@ -402,12 +402,12 @@ _cb_grid_doubleclick(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
         config_save(config, NULL);
         main_media_update(config);
         eina_stringshare_del(newfile);
-        _bubble_show("Picture imported!");
+        _bubble_show(_("Picture imported"));
         elm_object_text_set(_entry, config_background_dir);
      }
    else
      {
-       _bubble_show("Failed!");
+       _bubble_show(_("Failed!"));
      }
    free(config_background_dir);
 }
@@ -424,7 +424,7 @@ options_wallpaper(Evas_Object *opbox, Evas_Object *term)
    frame = o = elm_frame_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_object_text_set(o, "Background");
+   elm_object_text_set(o, _("Background"));
    evas_object_show(o);
    elm_box_pack_end(opbox, o);
 
@@ -468,19 +468,19 @@ options_wallpaper(Evas_Object *opbox, Evas_Object *term)
    o = elm_hoversel_add(opbox);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
-   elm_object_text_set(o,"Select Path");
+   elm_object_text_set(o, _("Select Path"));
    elm_box_pack_end(bx2, o);
    evas_object_show(o);
 
    snprintf(path, PATH_MAX, "%s/backgrounds/", elm_app_data_dir_get());
    _system_background_dir_init();
-   elm_hoversel_item_add(o, "System", NULL, ELM_ICON_NONE, _cb_hoversel_select ,
+   elm_hoversel_item_add(o, _("System"), NULL, ELM_ICON_NONE, _cb_hoversel_select ,
                          _system_path);
    if (_user_background_dir_init())
-     elm_hoversel_item_add(o, "User", NULL, ELM_ICON_NONE, _cb_hoversel_select ,
+     elm_hoversel_item_add(o, _("User"), NULL, ELM_ICON_NONE, _cb_hoversel_select ,
                            _user_path);
    //In the other case it has failed, so dont show the user item
-   elm_hoversel_item_add(o, "Other", NULL, ELM_ICON_NONE, _cb_hoversel_select , 
+   elm_hoversel_item_add(o, _("Other"), NULL, ELM_ICON_NONE, _cb_hoversel_select , 
                          NULL);
 
    _bg_grid = o = elm_gengrid_add(opbox);
@@ -495,7 +495,7 @@ options_wallpaper(Evas_Object *opbox, Evas_Object *term)
    o = elm_label_add(opbox);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
-   elm_object_text_set(o, "Double click on a picture to import it!");
+   elm_object_text_set(o, _("Double click on a picture to import it!"));
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
diff --git a/src/bin/private.h b/src/bin/private.h
index c4531d51..5711e248 100644
--- a/src/bin/private.h
+++ b/src/bin/private.h
@@ -9,7 +9,9 @@
 #define _(string) gettext (string)
 #else
 #define _(string) (string)
+#define gettext(string) (string)
 #endif
+#define gettext_noop(String) String
 
 extern int _log_domain;