--- a/smsprotocols/smsstack/gsmu/traces/fixed_id.definitions	Mon Jul 19 14:53:33 2010 +0100
+++ b/smsprotocols/smsstack/gsmu/traces/fixed_id.definitions	Wed Jul 21 17:41:03 2010 +0100
@@ -369,6 +369,15 @@
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CHECKALLOCBUFFERL_1=0x43
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONSTRUCTL_1=0x2a
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERSIONPROPERTIESL_1=0x2b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_1=0x1a5
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_2=0x1a6
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_3=0x1a7
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITH7BITENCODINGL_4=0x1a8
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_1=0x1a9
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_2=0x1aa
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_3=0x1ab
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_4=0x1ac
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_CONVERTWITHALTERNATIVEEENCODINGL_5=0x1ad
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_1=0x3c
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_FINDBESTALTERNATIVEENCODINGL_2=0x3d
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_GETALTERNATIVEENCODERIDL_1=0x42
@@ -376,18 +385,12 @@
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_2=0x2f
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_3=0x30
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_4=0x31
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_1=0x32
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_2=0x33
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_3=0x34
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL2_4=0x35
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_1=0x36
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_2=0x37
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_3=0x38
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_4=0x39
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_5=0x3a
-[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL3_6=0x3b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_5=0x18d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL1_6=0x18e
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_1=0x2c
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_2=0x2d
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_3=0x18b
+[TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_ISSUPPORTEDL_4=0x18c
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_1=0x3e
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONFROMNATIVEL_2=0x3f
 [TRACE]TRACE_INTERNALS[0x88]_CSMSALPHABETCONVERTER_PREPAREFORCONVERSIONTONATIVEL_1=0x40