diff --git a/src/modules/clock/e_mod_config.c b/src/modules/clock/e_mod_config.c
index bc71f535a..89f4fbe49 100644
--- a/src/modules/clock/e_mod_config.c
+++ b/src/modules/clock/e_mod_config.c
@@ -67,22 +67,33 @@ _basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
 {
    Evas_Object *ob, *tab, *of;
    E_Radio_Group *rg;
+   char daynames[7][64];
+   struct tm tm;
+   int i;
+
+   memset(&tm, 0, sizeof(struct tm));
+   for (i = 0; i < 7; i++)
+     {
+        tm.tm_wday = i;
+        strftime(daynames[i], sizeof(daynames[i]), "%A", &tm);
+	fprintf(stderr, "%d:%s\n", i, daynames[i]);
+     }
 
    tab = e_widget_table_add(evas, 0);
 
    of = e_widget_frametable_add(evas, _("Clock"), 0);
 
    rg = e_widget_radio_group_new(&(cfdata->cfg.digital_clock));
-   ob = e_widget_radio_add(evas, _("Analogue"), 0, rg);
+   ob = e_widget_radio_add(evas, _("Analog"), 0, rg);
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 0);
    ob = e_widget_radio_add(evas, _("Digital"), 1, rg);
    e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 0, 0);
    ob = e_widget_label_add(evas, "");
    e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 0, 1, 0, 0);
    rg = e_widget_radio_group_new(&(cfdata->cfg.digital_24h));
-   ob = e_widget_radio_add(evas, _("12HR"), 0, rg);
+   ob = e_widget_radio_add(evas, _("12 h"), 0, rg);
    e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("24HR"), 1, rg);
+   ob = e_widget_radio_add(evas, _("24 h"), 1, rg);
    e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0);
    ob = e_widget_check_add(evas, _("Seconds"), &(cfdata->cfg.show_seconds));
    e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 0, 0);
@@ -94,20 +105,11 @@ _basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
    ob = e_widget_label_add(evas, _("Start"));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 1, 0, 0);
    rg = e_widget_radio_group_new(&(cfdata->cfg.week.start));
-   ob = e_widget_radio_add(evas, _("Sun"), 0, rg);
-   e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Mon"), 1, rg);
-   e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Tue"), 2, rg);
-   e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Wed"), 3, rg);
-   e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Thu"), 4, rg);
-   e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Fri"), 5, rg);
-   e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Sat"), 6, rg);
-   e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 0, 0);
+   for (i = 0; i < 7; i++)
+     {
+        ob = e_widget_radio_add(evas, daynames[i], i, rg);
+        e_widget_frametable_object_append(of, ob, 0, i + 1, 1, 1, 1, 1, 0, 0);
+     }
 
    e_widget_table_object_append(tab, of, 1, 0, 1, 1, 1, 1, 1, 1);
 
@@ -116,20 +118,11 @@ _basic_create_widgets(E_Config_Dialog      *cfd __UNUSED__,
    ob = e_widget_label_add(evas, _("Start"));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 1, 0, 0);
    rg = e_widget_radio_group_new(&(cfdata->cfg.weekend.start));
-   ob = e_widget_radio_add(evas, _("Sun"), 0, rg);
-   e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Mon"), 1, rg);
-   e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Tue"), 2, rg);
-   e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Wed"), 3, rg);
-   e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Thu"), 4, rg);
-   e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Fri"), 5, rg);
-   e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 0, 0);
-   ob = e_widget_radio_add(evas, _("Sat"), 6, rg);
-   e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 1, 0, 0);
+   for (i = 0; i < 7; i++)
+     {
+        ob = e_widget_radio_add(evas, daynames[i], i, rg);
+        e_widget_frametable_object_append(of, ob, 0, i + 1, 1, 1, 1, 1, 0, 0);
+     }
 
    ob = e_widget_label_add(evas, _("Days"));
    e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 0, 1, 0, 0);