Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 14251)
+++ apps/lang/english.lang	(working copy)
@@ -11018,3 +11018,54 @@
     *: ""
   </voice>
 </phrase>
+ <phrase>
+   id: VOICE_OCLOCK
+   desc: spoken only, for wall clock announce
+   user:
+   <source>
+     *: none
+     rtc: ""
+   </source>
+   <dest>
+     *: none
+     rtc: ""
+   </dest>
+   <voice>
+     *: none
+     rtc: "o'clock"
+   </voice>
+ </phrase>
+ <phrase>
+   id: VOICE_PM
+   desc: spoken only, for wall clock announce
+   user:
+   <source>
+     *: none
+     rtc: ""
+   </source>
+   <dest>
+     *: none
+     rtc: ""
+   </dest>
+   <voice>
+     *: none
+     rtc: "Pm"
+   </voice>
+ </phrase>
+ <phrase>
+   id: VOICE_AM
+   desc: spoken only, for wall clock announce
+   user:
+   <source>
+     *: none
+     rtc: ""
+   </source>
+   <dest>
+     *: none
+     rtc: ""
+   </dest>
+   <voice>
+     *: none
+     rtc: "A M"
+   </voice>
+ </phrase>
\ No newline at end of file
Index: apps/menus/main_menu.c
===================================================================
--- apps/menus/main_menu.c	(revision 14251)
+++ apps/menus/main_menu.c	(working copy)
@@ -213,9 +213,78 @@
                 {
                     struct tm* tm = get_time();
                     talk_id(VOICE_CURRENT_TIME, true);
-                    talk_value(tm->tm_hour, UNIT_HOUR, true);
-                    talk_value(tm->tm_min, UNIT_MIN, true);
-                    talk_value(tm->tm_sec, UNIT_SEC, true);
+                                if ( global_settings.timeformat ==1)
+                                {
+                                                if (tm->tm_hour == 12)
+                                                {
+                                                                talk_value(tm->tm_hour, UNIT_INT, true); 
+                                                                                if (tm->tm_min ==0)
+                                                                                {
+                                                                                                talk_id(VOICE_OCLOCK, true);
+                                                                                }
+                                                                                else
+                                                                                {                    
+                                                                                                talk_value(tm->tm_min, UNIT_INT, true);
+                                                                                }
+                                                }
+                                                else if (tm->tm_hour > 12)
+                                                {
+                                                                talk_value(tm->tm_hour-12, UNIT_INT, true); 
+                                                                                if (tm->tm_min ==0)
+                                                                                {
+                                                                                                talk_id(VOICE_OCLOCK, true);
+                                                                                }
+                                                                                else
+                                                                                {
+                                                                                                talk_value(tm->tm_min, UNIT_INT, true);
+                                                                                }
+                                                }
+                                                else if (tm->tm_hour ==0)
+                                                {
+                                                                talk_value(tm->tm_hour+12, UNIT_INT, true);
+                                                                                if (tm->tm_min ==0)
+                                                                                {
+                                                                                                talk_id(VOICE_OCLOCK, true);
+                                                                                }
+                                                                                else
+                                                                                {
+                                                                                                talk_value(tm->tm_min, UNIT_INT, true);
+                                                                                }
+                                                }
+                                                else
+                                                {
+                                                                talk_value(tm->tm_hour, UNIT_INT, true);
+                                                                                if (tm->tm_min ==0)
+                                                                                {
+                                                                                                talk_id(VOICE_OCLOCK, true);
+                                                                                }
+                                                                                else
+                                                                                {
+                                                                                                talk_value(tm->tm_min, UNIT_INT, true);
+                                                                                }
+                                                }
+                                                if (tm->tm_hour >12)
+                                                {
+                                                                talk_id(VOICE_PM, true);
+                                                }
+                                                else if(tm->tm_hour ==0)
+                                                {
+                                                                talk_id(VOICE_AM, true);
+                                                }
+                                                else if(tm->tm_hour ==12)
+                                                {
+                                                                talk_id(VOICE_PM, true);
+                                                }
+                                                else
+                                                {
+                                                                talk_id(VOICE_AM, true);
+                                                }
+                                }
+                                if ( global_settings.timeformat ==0)
+                                {
+                                                talk_value(tm->tm_hour, UNIT_HOUR, true);
+                                                talk_value(tm->tm_min, UNIT_MIN, true);
+                                }
                     talk_id(LANG_MONTH_JANUARY + tm->tm_mon, true);
                     talk_number(tm->tm_mday, true);
                     talk_number(1900 + tm->tm_year, true);