--- trunk/CHDK/LANG/Finnish.lng (revision 534)
+++ trunk/CHDK/LANG/Finnish.lng (revision 551)
@@ -152,7 +152,7 @@
 105 "Haluatko varmasti\npalauttaa asetukset?"
 
 106 "*** Buildin tiedot ***"
-107 "CHDK Ver: %s %s\nPvm:     %s\nAika:    %s\nKamera:  %s\nFW Ver:  %s"
+107 "CHDK Ver: %s %s\nPvm:     %s\nAika:    %s\nKamera:  %s\nFW Ver:  %s\nCompiler: %s"
 
 108 "*** Muistin tiedot ***"
 109 "Vapaa muisti: %d tavua"

--- trunk/CHDK/LANG/czech.lng (revision 531)
+++ trunk/CHDK/LANG/czech.lng (revision 551)
@@ -149,7 +149,7 @@
 105 "Opravdu vrátit nastavení na výchozí hodnoty?"
 
 106 "*** Informace o programu ***"
-107 "CHDK Ver: %s, #%s\nDatum:    %s\nCas:    %s\nPrístr:  %s\nFW Ver: %s"
+107 "CHDK Ver: %s, #%s\nDatum:    %s\nCas:    %s\nPrístr:  %s\nFW Ver: %s\nCompiler: %s"
 
 108 "*** Informace o pameti ***"
 109 "Volná pamet: %d bytu"

--- trunk/CHDK/LANG/dutch.lng (revision 537)
+++ trunk/CHDK/LANG/dutch.lng (revision 551)
@@ -147,7 +147,7 @@
 105 "Ben je ZEKER om te herstellen?"
 
 106 "*** Versie-info ***"
-107 "CHDK-ver: %s, #%s\nDatum:    %s\nTijd:    %s\nCamera:  %s\nFW Vers: %s"
+107 "CHDK-ver: %s, #%s\nDatum:    %s\nTijd:    %s\nCamera:  %s\nFW Vers: %s\nCompiler: %s"
 
 108 "*** Geheugen-info ***"
 109 "Vrij geheugen: %d bytes\nCHDK-grootte: %d bytes\ngeladen op: 0x%X"

--- trunk/CHDK/LANG/english.lng (revision 546)
+++ trunk/CHDK/LANG/english.lng (revision 551)
@@ -161,7 +161,7 @@
 105 "Are you SURE to reset\noptions to default?"
 
 106 "*** Build Info ***"
-107 "CHDK Ver: %s %s\nDate:    %s\nTime:    %s\nCamera:  %s\nFW Vers: %s"
+107 "CHDK Ver: %s %s\nDate:    %s\nTime:    %s\nCamera:  %s\nFW Vers: %s\nCompiler: %s"
 
 108 "*** Memory Info ***"
 109 "Free Memory: %d bytes\nCHDK size:   %d bytes\nloaded at: 0x%X"
@@ -553,4 +553,6 @@
 412 "   Zoom Override Value"
 413 "Zoom Override"
 414 "   Clear on start"
+415 "add raw suffix"
+416 "  in Fahrenheit"
 

--- trunk/CHDK/LANG/german.lng (revision 546)
+++ trunk/CHDK/LANG/german.lng (revision 551)
@@ -154,7 +154,7 @@
 105 "Sicher, daß Sie die\nOptionen zurücksetzen möchten?"
 
 106 "***Versions-Info***"
-107 "CHDK Ver: %s %s\nDatum:    %s\nZeit:    %s\nKamera:  %s\nFW Vers: %s"
+107 "CHDK Ver: %s %s\nDatum:    %s\nZeit:    %s\nKamera:  %s\nFW Vers: %s\nCompiler: %s"
 
 108 "***Speicher Info***"
 109 "Freier Speicher: %d Bytes\nCHDK Größe:      %d Bytes\ngeladen bei: 0x%X"
@@ -582,4 +582,6 @@
 // Extra Foto
 412 "    Zoom-Wert"
 413 "Ersetze Zoom-Wert"
-414 "    Bei Neustart löschen"
\ No newline at end of file
+414 "    Bei Neustart löschen"
+415 "Raw Suffix"
+416 "  in Fahrenheit"

--- trunk/CHDK/LANG/hungarian.lng (revision 534)
+++ trunk/CHDK/LANG/hungarian.lng (revision 551)
@@ -159,7 +159,7 @@
 105 "Biztos visszaállítod\nalaphelyzetbe?"
 
 106 "*** Build Info ***"
-107 "CHDK Ver: %s, #%s\nDate:    %s\nTime:    %s\nCamera:  %s\nFW Vers: %s"
+107 "CHDK Ver: %s, #%s\nDate:    %s\nTime:    %s\nCamera:  %s\nFW Vers: %s\nCompiler: %s"
 
 108 "*** Memory Info ***"
 109 "Free memory: %d bytes"

--- trunk/CHDK/LANG/italian.lng (revision 515)
+++ trunk/CHDK/LANG/italian.lng (revision 551)
@@ -153,7 +153,7 @@
 105 "Sei SICURO di resettare\n alle opzioni predefinite?"
  
 106 "*** Info Versione ***"
-107 "CHDK Ver: %s %s\nData:    %s\nOra:    %s\nCamera:  %s\nFW Vers: %s"
+107 "CHDK Ver: %s %s\nData:    %s\nOra:    %s\nCamera:  %s\nFW Vers: %s\nCompiler: %s"
  
 108 "*** Info Memoria ***"
 109 "Memoria Libera: %d bytes"

--- trunk/CHDK/LANG/slovak.lng (revision 515)
+++ trunk/CHDK/LANG/slovak.lng (revision 551)
@@ -147,7 +147,7 @@
 105 "Naozaj vrátit nastavenie\nna prvotné hodnoty?"
 
 106 "*** Informácie o programe ***"
-107 "CHDK Ver: %s, #%s\nDátum:    %s\nCas:    %s\nPrístr:  %s\nFW Ver: %s"
+107 "CHDK Ver: %s, #%s\nDátum:    %s\nCas:    %s\nPrístr:  %s\nFW Ver: %s\nCompiler: %s"
 
 108 "*** Informácie o pamäti ***"
 109 "Volná pamät: %d bytov"

--- trunk/CHDK/LANG/spanish.lng (revision 546)
+++ trunk/CHDK/LANG/spanish.lng (revision 551)
@@ -167,18 +167,18 @@
 116 "Escoja Archivo de Idioma"
 
 / / Para el calendario
-117 "enero"
-118 "febrero"
-119 "marzo"
-120 "abril"
-121 "mayo"
-122 "junio"
-123 "julio"
-124 "agosto"
-125 "septiembre"
-126 "octubre"
-127 "noviembre"
-128 "diciembre"
+117 "ene"
+118 "feb"
+119 "mar"
+120 "abr"
+121 "may"
+122 "jun"
+123 "jul"
+124 "ago"
+125 "sep"
+126 "oct"
+127 "nov"
+128 "dic"
 
 129 "Lunes"
 130 "Martes"
@@ -532,9 +532,18 @@
 400 "Time-out de Zoom 0.1s "
 401 "Sonido de Inicio"
 402 "Prefijo Resta de RAW"
+
+
 403 "Extensión Resta de RAW"
-404 "Subtract input dark value"
-405 "Subtract output dark value"
+
+/ / 404->sets what value in the file being subtracted is considered zero.
+/ / 404 "Subtract input dark value"
+404 "Valor Cero en Archivo Restado"
+
+/ / 405->sets the minimum value that will produced by subtracting.
+/ / 405 "Subtract output dark value"
+405 "Valor Mínimo al restar"
+
 406 "desde"
 407 "...%d archivos mas"
 408 "Restar"

--- trunk/core/conf.c (revision 546)
+++ trunk/core/conf.c (revision 551)
@@ -367,6 +367,8 @@
     CONF_INFO(216, conf.zoom_override_value,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(217, conf.zoom_override,      CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(218, conf.clear_zoom_override,         CONF_DEF_VALUE, i:1, NULL),			
+    CONF_INFO(219, conf.bracketing_add_raw_suffix,         CONF_DEF_VALUE, i:0, NULL),			
+    CONF_INFO(220, conf.temperature_unit,              CONF_DEF_VALUE, i:0, NULL),
     };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))
 

--- trunk/core/gui.c (revision 546)
+++ trunk/core/gui.c (revision 551)
@@ -345,6 +345,25 @@
 static CMenu reader_submenu = {0x37,LANG_MENU_READ_TITLE, NULL, reader_submenu_items };
 #endif
 
+#if DEBUGGING
+static CMenuItem debug_submenu_items[] = {
+    {0x5c,LANG_MENU_DEBUG_DISPLAY,           MENUITEM_ENUM,          (int*)gui_debug_display_enum },
+    {0x2a,LANG_MENU_DEBUG_PROPCASE_PAGE,     MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,   &debug_propcase_page, MENU_MINMAX(0, 128) },
+    {0x2a,LANG_MENU_DEBUG_TASKLIST_START,    MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,   &debug_tasklist_start, MENU_MINMAX(0, 63) },
+    {0x5c,LANG_MENU_DEBUG_SHOW_MISC_VALS,    MENUITEM_BOOL,          &debug_vals_show },
+    {0x2a,LANG_MENU_DEBUG_MEMORY_BROWSER,    MENUITEM_PROC,          (int*)gui_draw_debug },
+    {0x2a,LANG_MENU_DEBUG_BENCHMARK,         MENUITEM_PROC,          (int*)gui_draw_bench },
+    {0x5c,LANG_MENU_DEBUG_SHORTCUT_ACTION,   MENUITEM_ENUM,          (int*)gui_debug_shortcut_enum },
+#if CAM_MULTIPART
+    {0x33,LANG_MENU_DEBUG_CREATE_MULTIPART , MENUITEM_PROC, 	    	(int*)gui_menuproc_break_card },
+#endif
+    {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
+    {0}
+};
+static CMenu debug_submenu = {0x2a,LANG_MENU_DEBUG_TITLE, NULL, debug_submenu_items };
+#endif
+
+
 static CMenuItem misc_submenu_items[] = {
     {0x35,LANG_MENU_MISC_FILE_BROWSER,       MENUITEM_PROC,    (int*)gui_draw_fselect },
 #if CALENDAR
@@ -377,31 +396,15 @@
 #if CAM_MULTIPART
     {0x33,LANG_MENU_DEBUG_SWAP_PART,         MENUITEM_PROC, 	    	(int*)gui_menuproc_swap_patitons },
 #endif
+#if DEBUGGING
+    {0x2a,LANG_MENU_MAIN_DEBUG,              MENUITEM_SUBMENU,   (int*)&debug_submenu },
+#endif
     {0x2b,LANG_MENU_MAIN_RESET_OPTIONS,      MENUITEM_PROC,      (int*)gui_menuproc_reset },
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
     {0},
 };
 static CMenu misc_submenu = {0x29,LANG_MENU_MISC_TITLE, NULL, misc_submenu_items };
 
-
-#if DEBUGGING
-static CMenuItem debug_submenu_items[] = {
-    {0x5c,LANG_MENU_DEBUG_DISPLAY,           MENUITEM_ENUM,          (int*)gui_debug_display_enum },
-    {0x2a,LANG_MENU_DEBUG_PROPCASE_PAGE,     MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,   &debug_propcase_page, MENU_MINMAX(0, 128) },
-    {0x2a,LANG_MENU_DEBUG_TASKLIST_START,    MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,   &debug_tasklist_start, MENU_MINMAX(0, 63) },
-    {0x5c,LANG_MENU_DEBUG_SHOW_MISC_VALS,    MENUITEM_BOOL,          &debug_vals_show },
-    {0x2a,LANG_MENU_DEBUG_MEMORY_BROWSER,    MENUITEM_PROC,          (int*)gui_draw_debug },
-    {0x2a,LANG_MENU_DEBUG_BENCHMARK,         MENUITEM_PROC,          (int*)gui_draw_bench },
-    {0x5c,LANG_MENU_DEBUG_SHORTCUT_ACTION,   MENUITEM_ENUM,          (int*)gui_debug_shortcut_enum },
-#if CAM_MULTIPART
-    {0x33,LANG_MENU_DEBUG_CREATE_MULTIPART , MENUITEM_PROC, 	    	(int*)gui_menuproc_break_card },
-#endif
-    {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
-    {0}
-};
-static CMenu debug_submenu = {0x2a,LANG_MENU_DEBUG_TITLE, NULL, debug_submenu_items };
-#endif
-
 static int voltage_step;
 static CMenuItem battery_submenu_items[] = {
     {0x66,LANG_MENU_BATT_VOLT_MAX,           MENUITEM_INT|MENUITEM_ARG_ADDR_INC,     &conf.batt_volts_max,   (int)&voltage_step },
@@ -518,6 +521,7 @@
 	  {0x5f,LANG_MENU_ISO_BRACKET_KOEF,             MENUITEM_ENUM,    (int*)gui_iso_bracket_koef_enum},
 	  {0x60,LANG_MENU_BRACKET_TYPE,                 MENUITEM_ENUM,    (int*)gui_bracket_type_enum },
 	  {0x5b,LANG_MENU_CLEAR_BRACKET_VALUES,        MENUITEM_BOOL,        (int*)&conf.clear_bracket},
+     {0x5c,LANG_MENU_BRACKETING_ADD_RAW_SUFFIX,                MENUITEM_BOOL,      &conf.bracketing_add_raw_suffix },
       {0x51,LANG_MENU_BACK,                         MENUITEM_UP },
       {0}
 };
@@ -675,6 +679,7 @@
     {0x5c,LANG_MENU_USER_MENU_AS_ROOT,       MENUITEM_BOOL,      &conf.user_menu_as_root },
     {0x5f,LANG_MENU_OSD_SHOW_STATES,         MENUITEM_BOOL,      &conf.show_state },
     {0x5f,LANG_MENU_OSD_SHOW_TEMP,         MENUITEM_ENUM,      (int*)gui_temp_mode_enum },
+    {0x59,LANG_MENU_OSD_TEMP_FAHRENHEIT,      MENUITEM_BOOL,      &conf.temperature_unit},
     {0x72,LANG_MENU_OSD_LAYOUT_EDITOR,       MENUITEM_PROC,      (int*)gui_draw_osd_le },
     {0x7f,LANG_MENU_EDGE_OVERLAY,         MENUITEM_SUBMENU,   (int*)&edge_overlay_submenu },
     {0x2f,LANG_MENU_OSD_GRID_PARAMS,         MENUITEM_SUBMENU,   (int*)&grid_submenu },
@@ -773,11 +778,12 @@
 
 static CMenuItem root_menu_items[] = {
     {0x21,LANG_MENU_OPERATION_PARAM,         MENUITEM_SUBMENU,   (int*)&operation_submenu },
-    {0x22,LANG_MENU_MAIN_OSD_PARAM,          MENUITEM_SUBMENU,   (int*)&osd_submenu },
 #if CAM_CHDK_HAS_EXT_VIDEO_MENU
     {0x23,LANG_MENU_VIDEO_PARAM,             MENUITEM_SUBMENU,   (int*)&video_submenu },
 #endif
     {0x24,LANG_MENU_MAIN_RAW_PARAM,          MENUITEM_SUBMENU,   (int*)&raw_submenu },
+    {0x22,LANG_MENU_MAIN_OSD_PARAM,          MENUITEM_SUBMENU,   (int*)&osd_submenu },
+    {0x28,LANG_MENU_MAIN_VISUAL_PARAM,       MENUITEM_SUBMENU,   (int*)&visual_submenu },
     {0x25,LANG_MENU_MAIN_HISTO_PARAM,        MENUITEM_SUBMENU,   (int*)&histo_submenu },
     {0x26,LANG_MENU_MAIN_ZEBRA_PARAM,        MENUITEM_SUBMENU,   (int*)&zebra_submenu },
     {0x27,LANG_MENU_MAIN_SCRIPT_PARAM,       MENUITEM_SUBMENU,   (int*)&script_submenu },
@@ -785,11 +791,7 @@
     {0x85,LANG_MENU_CURVE_PARAM,             MENUITEM_SUBMENU,   (int*)&curve_submenu },
 #endif
     {0x86,LANG_MENU_REMOTE_PARAM,            MENUITEM_SUBMENU,   (int*)&remote_submenu },
-    {0x28,LANG_MENU_MAIN_VISUAL_PARAM,       MENUITEM_SUBMENU,   (int*)&visual_submenu },
     {0x29,LANG_MENU_MAIN_MISC,               MENUITEM_SUBMENU,   (int*)&misc_submenu },
-#if DEBUGGING
-    {0x2a,LANG_MENU_MAIN_DEBUG,              MENUITEM_SUBMENU,   (int*)&debug_submenu },
-#endif
 #ifndef OPTIONS_AUTOSAVE
     {0x33,LANG_MENU_MAIN_SAVE_OPTIONS,       MENUITEM_PROC,      (int*)gui_menuproc_save },
 #endif
@@ -2460,7 +2462,7 @@
            
            if (conf.show_dof==DOF_SHOW_IN_DOF) gui_osd_draw_dof();  
            
-           if (conf.values_show_real_iso || conf.values_show_market_iso || conf.values_show_ev_seted || conf.values_show_ev_measured || conf.values_show_bv_measured || conf.values_show_bv_seted || conf.values_show_overexposure || conf.values_show_canon_overexposure) gui_osd_calc_expo_param();           	           
+           if (conf.values_show_real_iso || conf.values_show_market_iso || conf.values_show_ev_seted || conf.values_show_ev_measured || conf.values_show_bv_measured || conf.values_show_bv_seted || conf.values_show_overexposure || conf.values_show_canon_overexposure || conf.values_show_luminance) gui_osd_calc_expo_param();           	           
         }
         if (conf.show_state) gui_osd_draw_state();
         if (conf.save_raw && conf.show_raw_state && !mode_video && (!kbd_is_key_pressed(KEY_SHOOT_HALF))) gui_osd_draw_raw_info();
@@ -2621,9 +2623,18 @@
 //-------------------------------------------------------------------
 void gui_show_build_info(int arg) {
     static char buf[192];
+    static char comp[64];
 
-    sprintf(buf, lang_str(LANG_MSG_BUILD_INFO_TEXT), HDK_VERSION, BUILD_NUMBER, __DATE__, __TIME__, PLATFORM, PLATFORMSUB);
-    gui_mbox_init(LANG_MSG_BUILD_INFO_TITLE, (int)buf, MBOX_FUNC_RESTORE|MBOX_TEXT_LEFT, NULL);
+#ifdef __GNUC__
+# ifndef __GNUC_PATCHLEVEL__
+# define __GNUC_PATCHLEVEL 0
+# endif
+    sprintf(comp, "GCC %d.%d.%d", __GNUC__ ,__GNUC_MINOR__,__GNUC_PATCHLEVEL__ );
+#else
+    sprintf(comp, "UNKNOWN" );
+#endif
+    sprintf(buf, lang_str(LANG_MSG_BUILD_INFO_TEXT), HDK_VERSION, BUILD_NUMBER, __DATE__, __TIME__, PLATFORM, PLATFORMSUB, comp);
+gui_mbox_init(LANG_MSG_BUILD_INFO_TITLE, (int)buf, MBOX_FUNC_RESTORE|MBOX_TEXT_LEFT, NULL);
 }
 
 //-------------------------------------------------------------------

--- trunk/core/gui_lang.c (revision 546)
+++ trunk/core/gui_lang.c (revision 551)
@@ -157,7 +157,7 @@
 "105 \"Are you SURE to reset\\noptions to default?\"\n"
 
 "106 \"*** Build Info ***\"\n"
-"107 \"CHDK Ver: %s %s\\nDate:    %s\\nTime:    %s\\nCamera:  %s\\nFW Vers: %s\"\n"
+"107 \"CHDK Ver: %s %s\\nDate:    %s\\nTime:    %s\\nCamera:  %s\\nFW Vers: %s\\nCompiler: %s\"\n"
 
 "108 \"*** Memory Info ***\"\n"
 "109 \"Free Memory: %d bytes\\nCHDK size:   %d bytes\\nloaded at: 0x%X\"\n"
@@ -533,6 +533,9 @@
 "412 \"   Zoom Value\"\n"
 "413 \"Zoom Override\"\n"
 "414 \"   Clear on start\"\n"
+"415 \"Add raw-suffix\"\n"
+"416 \"  in Fahrenheit\"\n"
+
 ;
 
 //-------------------------------------------------------------------

--- trunk/core/gui_lang.h (revision 531)
+++ trunk/core/gui_lang.h (revision 551)
@@ -523,9 +523,11 @@
 #define	LANG_MENU_OVERRIDE_ZOOM_VALUE          412
 #define	LANG_MENU_OVERRIDE_ZOOM           413
 #define LANG_MENU_CLEAR_ZOOM_OVERRIDE_VALUES 414
+#define LANG_MENU_BRACKETING_ADD_RAW_SUFFIX 415
+#define LANG_MENU_OSD_TEMP_FAHRENHEIT 416
 //-------------------------------------------------------------------
 
-#define GUI_LANG_ITEMS                  414
+#define GUI_LANG_ITEMS                  416
 
 //-------------------------------------------------------------------
 extern void gui_lang_init();

--- trunk/core/gui_osd.c (revision 546)
+++ trunk/core/gui_osd.c (revision 551)
@@ -1025,7 +1025,7 @@
 void gui_osd_draw_temp() {
  		if (conf.show_temp == 1)
  			{
- 				if (conf.clock_format == 0)
+ 				if (conf.temperature_unit == 0)
  						{
  							sprintf(osd_buf," opt: %i°",get_optical_temp());
  						}
@@ -1037,7 +1037,7 @@
  			}
  		if (conf.show_temp==2)
  			{
- 				if (conf.clock_format == 0)
+ 				if (conf.temperature_unit == 0)
  						{
  							sprintf(osd_buf," ccd: %i°",get_ccd_temp());
  						}
@@ -1049,7 +1049,7 @@
  			}
  		if (conf.show_temp==3)
  			{
- 				if (conf.clock_format == 0)
+ 				if (conf.temperature_unit == 0)
  						{
  							sprintf(osd_buf," batt:%i°",get_battery_temp());
  						}
@@ -1061,7 +1061,7 @@
  			}
  		if (conf.show_temp==4)
  			{
-				if (conf.clock_format == 0)
+				if (conf.temperature_unit == 0)
  					{ 				
  						sprintf(osd_buf," opt: %i°",get_optical_temp());
  						draw_string(conf.temp_pos.x, conf.temp_pos.y, osd_buf, conf.osd_color);

--- trunk/core/raw.c (revision 547)
+++ trunk/core/raw.c (revision 551)
@@ -11,6 +11,7 @@
 #define RAW_TARGET_DIRECTORY    "A/DCIM/%03dCANON"
 //#define RAW_TMP_FILENAME        "HDK_RAW.TMP"
 #define RAW_TARGET_FILENAME     "%s%04d%s"
+#define RAW_BRACKETING_FILENAME "%s%04d_%02d%s" 
 
 //-------------------------------------------------------------------
 static char fn[64];
@@ -28,7 +29,8 @@
 int raw_savefile() {
 		int fd, m=(mode_get()&MODE_SHOOTING_MASK);
     static struct utimbuf t;
-
+    static int br_counter; 
+    
     if (state_kbd_script_run && shot_histogram_enabled) build_shot_histogram();
 
     if (develop_raw) {
@@ -50,6 +52,16 @@
 
     shooting_bracketing();
 
+    if(conf.tv_bracket_value || conf.av_bracket_value || conf.iso_bracket_value || conf.subj_dist_bracket_value) {
+        if(state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)
+            br_counter = 1;
+        else
+            br_counter++;
+    }
+    else
+        br_counter=0;
+
+
     // got here second time in a row. Skip second RAW saving.
     if (conf.raw_save_first_only && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING) {
         return 0;
@@ -69,8 +81,10 @@
         mkdir(dir);
 
         sprintf(fn, "%s/", dir);
-        sprintf(fn+strlen(fn), RAW_TARGET_FILENAME, img_prefixes[conf.raw_prefix], get_target_file_num(), img_exts[conf.raw_ext]);
-
+        if(br_counter && conf.bracketing_add_raw_suffix)
+            sprintf(fn+strlen(fn), RAW_BRACKETING_FILENAME, img_prefixes[conf.raw_prefix], get_target_file_num(), br_counter, img_exts[conf.raw_ext]);
+        else
+            sprintf(fn+strlen(fn), RAW_TARGET_FILENAME, img_prefixes[conf.raw_prefix], get_target_file_num(), img_exts[conf.raw_ext]); 
         fd = open(fn, O_WRONLY|O_CREAT, 0777);
         if (fd>=0) {
             write(fd, hook_raw_image_addr(), hook_raw_size());

--- trunk/doc/version.txt (revision 546)
+++ trunk/doc/version.txt (revision 551)
@@ -5,6 +5,35 @@
 
 log
 
+
+0.7.2 / #551 / PhyrePhoX
+
+* updated spanish lang file - http://chdk.kernreaktor.org/mantis/view.php?id=84
+* added & updated fonts - http://chdk.kernreaktor.org/mantis/view.php?id=85 (note: there are a lot of fonts now, maybe we need to discuss and vote if need them all, also licenses need to be checked)
+* small bugfix, "Show Screne luminance" Does not get computed when enabled alone, see http://chdk.kernreaktor.org/mantis/view.php?id=82
+* changed menu structure (moved debug menu to misc menu, switched some entries in the main menu - now imo most used features are on the top, comments welcome!)
++ added feature: in bracketing mode you now have the option to add a suffix to the raw filename, so that later you can easily identifiy the raws that were created during bracketing. it is disabled at default, and can be enabled in the bracketing submenu (or should it be moved to the raw submenu?). idea & patch by rr807 in the german forum, see http://www.wirklemms.de/chdk/forum/viewtopic.php?p=4482#4482 & http://chdk.kernreaktor.org/mantis/view.php?id=86. btw if you enable this, it is likely that your raw files cant be seen by the PC anymore when you connect your cam via usb cable to it, so use your cardreader (also note that dng4-ps will not find the corresponding jpgs!)
++ added compiler info to buildinfo (changed all lang files accordingly). shows the compiler version - found in PlasmaHHs diff @ http://plasmahh.projectiwear.org/chdk.html (rest will follow soon, need PlasmaHHs help though)
++ added option to show temperature in fahrenheit (up to now it was coupled with time format) http://chdk.kernreaktor.org/mantis/view.php?id=34
+
+0.7.1 / #549-550 / reyalp
+
+* made raw hook stuff generic http://chdk.kernreaktor.org/mantis/view.php?id=80
+Also protect preserve regs for raw hook calls on all cams.
+fix some EOLs and eol-style props. 
+* moved .ltorg up a bit for gcc4 (works fine with gcc3 too) See http://chdk.setepontos.com/index.php/topic,2500.0.html 
+
+0.7.1 / #548 / php
+
++ added ukrainian.lng - http://chdk.setepontos.com/index.php/topic,2514.msg23414.html#msg23414 
+
+0.7.1 / #547 / EWAVR
+
++ G7: added jogdial support in menu, file browser and text reader
+* G7, A650: fixed "sporadic RAW images" bug
+* increased maximum 'badpixel' file size
+* fixed ND filter control for IXUS960 (maybe) 
+
 0.7.0 / #546 / PhP
 
 * enabled default param save in scripts again, as it *might* have been fixed by reyalp by his previous checkins

--- trunk/include/conf.h (revision 531)
+++ trunk/include/conf.h (revision 551)
@@ -49,6 +49,7 @@
     int space_icon_show;
     int show_clock;
     int show_temp;
+    int temperature_unit;
     int clock_format;
     int clock_indicator;
     int clock_halfpress;
@@ -164,6 +165,7 @@
     int subj_dist_bracket_value;
     int subj_dist_bracket_koef;
     int bracket_type;
+    int bracketing_add_raw_suffix;
     int clear_bracket;
     int clear_video;
     int override_disable;

--- trunk/version.inc (revision 547)
+++ trunk/version.inc (revision 551)
@@ -1 +1 @@
-BUILD_NUMBER := 0.7.1
+BUILD_NUMBER := 0.7.2