--- a/src/ui/bmi/mmiBlkLangDB.h	Sun Nov 08 05:12:05 2020 +0000
+++ b/src/ui/bmi/mmiBlkLangDB.h	Sun Nov 08 06:39:16 2020 +0000
@@ -5,26 +5,26 @@
 
 					CONDAT (UK)
 
-********************************************************************************                                                                              
+********************************************************************************
 
  This software product is the property of Condat (UK) Ltd and may not be
- disclosed to any third party without the express permission of the owner.                                 
-                                                                              
+ disclosed to any third party without the express permission of the owner.
+
 ********************************************************************************
 
- $Project name:	Basic MMI                                                      
- $Project code:	BMI (6349)                                                           
+ $Project name:	Basic MMI
+ $Project code:	BMI (6349)
  $Module:		Resource Manager
  $File:		    MmiBlkLanfDB.h
- $Revision:		1.0                                                       
-                                                                              
- $Author:		Condat(UK)                                                         
- $Date:		    25/10/00                                                      
-                                                                               
+ $Revision:		1.0
+
+ $Author:		Condat(UK)
+ $Date:		    25/10/00
+
 ********************************************************************************
-                                                                              
+
  Description:
- 
+
     This file contains the basic resource manager information relating
 	to the textual entries managed.
 
@@ -34,25 +34,25 @@
 
     This module is derived from an auto generated version of the file with
 	additional commenting added.
-                        
+
 ********************************************************************************
  $History: MmiBlkLangDB.h
-	
+
  	Nov 22, 2007 DR: OMAPS00152315 x0080701(Bharat)
  	Description: MP3 - AAC cannot be disabled in Locosto
  	Solution: MP3 AAC Flags Usage have been corrected
 
  	July 06, 2007 DR: OMAPS00137334 x0062172(Syed Sirajudeen)
  	Description:[MPY]Wrong indication when add party if conference full
- 	Solution: Added strings 	TxtConferenceFull to notify that the conference reached the MAX_CALLS 
- 
- 	
- 			
+ 	Solution: Added strings 	TxtConferenceFull to notify that the conference reached the MAX_CALLS
+
+
+
    April 03 2007 ER:OMAPS00116772 x0061088 (Prachi)
    Description:Support of 1.3 Mpixel camera on Locosto Plus
-   Solution: Defined New strings TxtAutoSave,TxtAutoSaveOn,TxtAutoSaveOff,TxtSoftSave 
-   and TxtSoftCancel. 
-    
+   Solution: Defined New strings TxtAutoSave,TxtAutoSaveOn,TxtAutoSaveOff,TxtSoftSave
+   and TxtSoftCancel.
+
 	Apr 03, 2007    ER: OMAPS00122561  x0pleela
 	Description:   [ACI] Phone lock feature has to be supported by ACI
 	Solution: Phone Lock ER implementation
@@ -60,11 +60,11 @@
     Mar 22 2007 ER:OMAPS00113882 x0061088 (Prachi)
     Description:SMS alphanumeric address
     Solution: Defined New string TxtTo for SMS alphanumeric support
- 
+
 	Nov 07, 2006 ER:OMAPS00070661 R.Prabakar(a0393213)
 	R99 network compliancy : Implemented Language Notification and Provide Local Information (Language setting)
 	SAT proactive commands and Language Selection SAT event
- 
+
  	Jan 30, 2007 DR: OMAPS00108892 x0pleela
  	Description: TCMIDITEST.23(Apps) - Play All File feature fails when different Configurations
  				like Mono/Stereo, Loop On/Off are selected
@@ -72,24 +72,24 @@
  			error message if we try to enable Loop on while playing all files
  	Feb 27, 2007 ER: OMAPS00113891 x0pleela
  	Description:[ACI] MTC related call forwarded SS notification not differentiable on BAT/ATI level
- 	Solution: Added strings TxtFwdIncomingTTYCall( for Fwd. TTY call ) and 
+ 	Solution: Added strings TxtFwdIncomingTTYCall( for Fwd. TTY call ) and
  			TxtFwdIncomingCall (Fwd. Inc. Call)to display for any forwarded incoming call
- 			
+
       Oct 30 2006 ER:OMAPS00091029 x0039928(sumanth)
       Boot time measurement
-      
+
       Oct 30, 2006 ER:OMAPS00098881 Prabakar
       Removing power variant
-      
+
  	Sep 26, 2006 DR: OMAPS00095524 x0pleela
  	Description:Implement 2 missing SIM Lock types
- 	Solution: Added strings TxtBlkNetwork( for category Blocked Network) and 
+ 	Solution: Added strings TxtBlkNetwork( for category Blocked Network) and
  			TxtEnterPbLock (for editor title "Enter Blocked NW code")
 
       Oct 8 2006 OMAPS00097714 x0039928(sumanth)
       TTY HCO/VCO options in MMI
-      
- 	xashmic 27 Sep 2006, OMAPS00096389 
+
+ 	xashmic 27 Sep 2006, OMAPS00096389
 	ENH - a) Providing static menu for re-selection of enum options for enumeration
 	b) Popup menu displayed on connect event, can be enabled or disabled via menu option
 
@@ -98,12 +98,12 @@
 
   	Sep 08, 2006 DR: OMAPS00091250 x0pleela
  	Description:The phone resets if no MEPD data is presented
- 	Solution: Added string TxtNoMEPD to display MEPD not present 	
+ 	Solution: Added string TxtNoMEPD to display MEPD not present
 
 	Aug 28, 2006  DR: OMAPS00083503 x0pleela
 	Description: Result of ss_check_ss_string may be ignored
-	Solution:	Added new strings TxtUSSDMsgRxd and TxtFontNotSupported to display if the characters 
-			are UCS2 in USSD transactions 
+	Solution:	Added new strings TxtUSSDMsgRxd and TxtFontNotSupported to display if the characters
+			are UCS2 in USSD transactions
 
 	July 21, 2006 ER: OMAPS00087586, OMAPS00087587 x0pleela
 	Description: 	OMAPS00087586: MasterKey funtion in TCS3.2 SW
@@ -122,11 +122,11 @@
     function. This function has now been implemented to pass on the received values to MMI
     for user confirmation and RTC updation.
 
-       Jun 06, 2006 REF: ERT OMAPS00070659  x0039928  
+       Jun 06, 2006 REF: ERT OMAPS00070659  x0039928
        Bug:MP3 RWD and FWD function - MOT
        Fix: Forward and Rewind functionalities are handled. New strings
        Forward, Rewind, Forwarding and Rewinding are added.
-       
+
  	May 30, 2006  DR: OMAPS00070657 x0pleela
 	Description: CPHS feature on Locosto-Lite
 	Solution: For ALS feature,
@@ -139,39 +139,39 @@
 	replaced with 'Pending'.
 
     Apr 26, 2006 OMAPS00074886 a0393213 (Prabakar R)
-    Description : No option in MMI to release the held call. 
+    Description : No option in MMI to release the held call.
     Solution    : No option was available. Added a menu option.
-    
+
 	Apr 06, 2006    ERT: OMAPS00070660 x0039928(sumanth)
-   	Description: Need to reduce flash foot-print for Locosto Lite 
-   	Solution: Voice Memo feature is put under the flag #ifndef FF_NO_VOICE_MEMO to compile 
+   	Description: Need to reduce flash foot-print for Locosto Lite
+   	Solution: Voice Memo feature is put under the flag #ifndef FF_NO_VOICE_MEMO to compile
    	out voice memo feature if the above flag is enabled.
 
 	Feb 07, 2006    DR: OMAPS00059261 x0pleela
-   	Description: SMS is not forwarding STATUS reports that are read from SIM storage to ACI 
+   	Description: SMS is not forwarding STATUS reports that are read from SIM storage to ACI
    	Solution: Renamed "TxtPendReport" to "TxtReport"
-   	
+
        Feb 01, 2006    DR: OMAPS00059261 x0pleela
-   	Description: SMS is not forwarding STATUS reports that are read from SIM storage to ACI 
+   	Description: SMS is not forwarding STATUS reports that are read from SIM storage to ACI
    	Solution: Added "TxtPendReport" to display when status report status is pending
-   	
+
  	Mar 14, 2006   ER: OMAPS00067709  x0pleela
-	Description: Voice Buffering implementation on C+ for PTT via PCM API 
-	Solution: Added new strings for menu items and dialog displays for PCM voice memo and voice buffering 
-	
+	Description: Voice Buffering implementation on C+ for PTT via PCM API
+	Solution: Added new strings for menu items and dialog displays for PCM voice memo and voice buffering
+
 	Feb 24, 2006    ER: OMAPS00067709 x0pleela
-	Description: Voice Buffering implementation on C+ for PTT via PCM API 
+	Description: Voice Buffering implementation on C+ for PTT via PCM API
 	Solution: Added new strings which are used in menu items to support PCM Voice memo feature
-	
+
 	Jan 03, 2006    REF: SPR OMAPS00060036  xdeepadh
  	Description:In file viewer, the user is not allowed to retain the old name once he/she goes to the rename file option.
  	Solution:While renaming the file,if the name already exists,  display a proper error message
- 	
+
 
 	Dec 07, 2005    REF: OMAPS00050087 x0039928
 	Description: Deactivated is displayed while activate Hide Id option is selected
 	Solution: String "Not Activated" is added.
-	
+
 	Nov 24, 2005 DR: OMAPS00045909 - Shashi Shekar B.S.
 	Description: Improve IMEI control mechanism
 	Solution : When MMI calls sAT_PLUSCFUN, if an IMEI invalid error is returned,
@@ -193,7 +193,7 @@
 
 	 Aug 22, 2005    REF: ENH 31154 xdeepadh
    	Description: Application to Test Camera
-   	Solution: Implemeted the Fileviewer to view the jpeg images.Camera Application to 
+   	Solution: Implemeted the Fileviewer to view the jpeg images.Camera Application to
    	preview,capture and save image has been implemented.
    	Strings for Fileviewer and Camera  have been added.
 
@@ -203,26 +203,26 @@
  			The audio device is enabled as per the user actions.
 
 	July 19, 2005 REF: CRR LOCOSTO-ENH-28173 xpradipg
-  	Description: To provide MMI Support to enable/disable/change password and 
+  	Description: To provide MMI Support to enable/disable/change password and
   				query all the Personalization locks
-  	Solution: Integration of the changes for the same provided by the soldel 
+  	Solution: Integration of the changes for the same provided by the soldel
   			  team
 
    Jun 13, 2005	REF: SPR 31705 x0021308
-   Description: After the maximum limit of the My Number is exceeded, display info : Phonebook full 
+   Description: After the maximum limit of the My Number is exceeded, display info : Phonebook full
    expected is MyNumber Full
    Solution: Added Strings "MyNumber Full" string in Enum IndexTag.
 
    Jun 13, 2005	REF: SPR 31710 x0021308
-   Description: After the maximum limit of the FDN Number  is exceeded, display info : Phonebook full 
+   Description: After the maximum limit of the FDN Number  is exceeded, display info : Phonebook full
    expected is FDNList Full
    Solution: Added Strings "FDNList Full" string in Enum IndexTag.
     May 11 2005  REF:  MMI-SPR-29887  x0012849
     To Implement the deferred MMS retrieval.
-   
+
    Apr 06, 2005	REF: ENH 30011 xdeepadh
-   Description: Replacing the Test Application compilation flags with new flags. 
-   Solution:  The existing flags for Camera and MP3 test application have  beeen replaced with the 
+   Description: Replacing the Test Application compilation flags with new flags.
+   Solution:  The existing flags for Camera and MP3 test application have  beeen replaced with the
    new compilation flags,FF_MMI_TEST_CAMERA and FF_MMI_TEST_MP3 respectively.
 
    x0018858 24 Mar, 2005 MMI-FIX-11321
@@ -233,7 +233,7 @@
    Apr 05, 2005    REF: ENH 29994 xdeepadh
    Description: Implementation of Generic Midi Ringer and Modification of existing Midi Test Application
    Solution: Generic Midi Ringer and Midi Test Application were implemented.
- 
+
 
    March 2, 2005    REF: CRR 11536 x0018858
    Description: Reply path not supported while sending a reply.
@@ -242,14 +242,14 @@
     xrashmic 7 Dec, 2004 MMI-SPR-23965
     Nov 29, 2004    REF: CRR 25051 xkundadu
     Description: INCALL SCREEN ?ADJUSTING THE VOLUME
-    Fix: Added volume level list linked to up/down keys. 
+    Fix: Added volume level list linked to up/down keys.
           User can select the speaker volume among those levels.
 
         xrashmic 29 Nov, 2004 MMI-SPR-26161
         xrashmic 14 Oct, 2004 MMI-SPR-25291
 
         xrashmic 26 Aug, 2004 MMI-SPR-23931
-       
+
 //  xrashmic 19 Aug, 2004 Bug: 2, 3, 36 and 42
 
 
@@ -258,18 +258,18 @@
     Fix:    Modfied enum and array in source file to display a better alert.
 
 //  Jun 25, 2004        REF: CRR 21547  xvilliva  (Added TxtInvalidInput.)
- 
+
 
-//    Jun 10, 2004        	REF: CRR MMI-SPR-13614  Rashmi C N(Sasken) 
+//    Jun 10, 2004        	REF: CRR MMI-SPR-13614  Rashmi C N(Sasken)
 //  	Added  Strings "All Divert", "Divert when not reachable", "Divert if Busy", "Divert when no answer"
-	"Divert for Cond. Forward" , "Divert for All calls"	
-May 10, 2004    REF: CRR 15753  Deepa M.D 
-	Menuitem provided to set the validity period to maximum.		
+	"Divert for Cond. Forward" , "Divert for All calls"
+May 10, 2004    REF: CRR 15753  Deepa M.D
+	Menuitem provided to set the validity period to maximum.
 
 
 //  Apr 14, 2004        REF: CRR 12653  xvilliva  (Added "Limited Service".)
 
-	25/10/00			Original Condat(UK) BMI version.	
+	25/10/00			Original Condat(UK) BMI version.
 
 
     Mar 28, 2006 REF:ER OMAPS00071798  x0043642
@@ -288,9 +288,9 @@
 
 
 /*******************************************************************************
-                                                                              
+
                                 Required Include Files
-                                                                              
+
 *******************************************************************************/
 
 #include "mfw_lng.h"
@@ -339,9 +339,9 @@
 
 
 /*******************************************************************************
-                                                                              
+
                                 Public Definitions
-                                                                              
+
 *******************************************************************************/
 
 typedef enum {
@@ -362,9 +362,9 @@
 TxtStartRec,
 TxtStopRec,
 #endif
-#ifdef SIM_PERS 
+#ifdef SIM_PERS
 //x0pleela 25 Sep, 2006 ER: OMAPS00095524
-TxtBlkNetwork,  //For new category "Blocked Network" 
+TxtBlkNetwork,  //For new category "Blocked Network"
 TxtEnterPbLock, //Editor string to display "Enter Blocked Network password"
 //x0pleela 20 July, 2006 ER: OMAPS00087586, OMAPS00087587
 TxtBusy,
@@ -398,16 +398,16 @@
     TxtEnterSpLock,
     TxtEnterCLock,
     TxtEnterPsLock,
-    
-    
+
+
      TxtPsLockConfWrong,
     TxtPsLockConfwrong2,
-    
-    
+
+
     TxtPsLockChanged,
     TxtCounterReset,
     TxtPassfailed,
-    TxtUnblock, 
+    TxtUnblock,
     TxtAlreadyLocked,
     TxtAlreadyUnlocked,
     TxtPhoneUnblocked,
@@ -420,15 +420,15 @@
 #ifdef FF_MMI_CPHS
     TxtViewAll,
     TxtEmergencyNumbers,
-#endif    
-   TxtReport,	//x0pleela 01 Feb, 2006 DR: OMAPS00059261 
+#endif
+   TxtReport,	//x0pleela 01 Feb, 2006 DR: OMAPS00059261
    TxtNotImplemented,
     TxtManu,
     TxtEnterPin1,
     TxtEnterPin2,
     TxtEnterPuk1,
     TxtEnterPuk2,
-    TxtInvalidCard, 
+    TxtInvalidCard,
     TxtNoCard,
 	TxtInvalidIMEI, // Nov 24, 2005, a0876501, DR: OMAPS00045909
     TxtSoftCall,
@@ -440,73 +440,73 @@
     TxtMessages,
     TxtAlarm,
     TxtSettings,
-    TxtExtra, 
-    TxtSend, 
+    TxtExtra,
+    TxtSend,
     TxtSent,
-    TxtNotSent, 
-    TxtServiceCentre, 
+    TxtNotSent,
+    TxtServiceCentre,
     TxtPleaseWait,
-    TxtSmsEnterNumber, 
-    TxtRead, 
+    TxtSmsEnterNumber,
+    TxtRead,
     TxtRetrieve,   // x0012849 11 May 205 MMI-SPR-29887
-    TxtDeleteAll, 
+    TxtDeleteAll,
     TxtSave,
     TxtVoicemail,
-    TxtBroadcast, 
-    TxtNew, 
-    TxtDigits, 
-    TxtLowercase, 
-    TxtUppercase, 
-    TxtApplications, 
+    TxtBroadcast,
+    TxtNew,
+    TxtDigits,
+    TxtLowercase,
+    TxtUppercase,
+    TxtApplications,
 #ifndef FF_NO_VOICE_MEMO
-    TxtVoiceMemo, 
+    TxtVoiceMemo,
 #endif
-    TxtSimNot, 
-    TxtReady, 
+    TxtSimNot,
+    TxtReady,
     TxtSmsListFull,
-    TxtNewCbMessage, 
+    TxtNewCbMessage,
     TxtSaved,
-    TxtDelete, 
-    TxtReply, 
+    TxtDelete,
+    TxtReply,
     TxtStoreNumber,
-#ifdef FF_CPHS_REL4      
+#ifdef FF_CPHS_REL4
     TxtMSP,
     TxtMessageStatus,
     TxtMailBox,
     TxtElectronic,
-#endif    
+#endif
     TxtForward,
-    TxtActivate, 
+    TxtActivate,
     TxtTopics,
     TxtConsult,
-    TxtAddNew, 
-    TxtContacts, 
-    TxtSearchName, 
-    TxtMemory, 
-    TxtMyNumber, 
+    TxtAddNew,
+    TxtContacts,
+    TxtSearchName,
+    TxtMemory,
+    TxtMyNumber,
     TxtMyNumberFull, //SPR 31705 x0021308: RamG
     TxtRinger,
     TxtVolume,
     TxtKeypadTones,
-    TxtNewMessage, 
-    TxtNewBroadcast, 
-    TxtAutoAnswer, 
-    TxtTimeDate, 
-    TxtLanguages, 
-    TxtVoiceMail, 
-    TxtPinCode, 
+    TxtNewMessage,
+    TxtNewBroadcast,
+    TxtAutoAnswer,
+    TxtTimeDate,
+    TxtLanguages,
+    TxtVoiceMail,
+    TxtPinCode,
     TxtAutoredial,
-    TxtDTMF, 
+    TxtDTMF,
     TxtOn,
     TxtOff,
-    TxtNetworkSel, 
+    TxtNetworkSel,
     TxtSendID,
     TxtChargeTimers,
     TxtCallDivert,
     TxtCallWaiting,
     TxtIfBusy,
     TxtIfNoAnswer,
-    TxtIfNotReachable, 
+    TxtIfNotReachable,
     TxtAllCalls,
     TxtCancelAll,
     TxtAll,
@@ -535,9 +535,9 @@
     TxtMainMenu,
     TxtSwap,
     TxtEndAll,
-    // Apr 26 2006, a0393213 (Prabakar R), OMAPS00074886 : No option in MMI to release the held call. 
+    // Apr 26 2006, a0393213 (Prabakar R), OMAPS00074886 : No option in MMI to release the held call.
     // Added a menu option. Added "End held" text.
-    TxtEndHeld, 
+    TxtEndHeld,
     TxtPrivateCall,
     TxtStartConference,
     TxtReStartConference,
@@ -547,9 +547,9 @@
     TxtOutofRange,
     TxtDone,
     TxtFailed,
-#ifdef FF_MMI_MULTIMEDIA    
+#ifdef FF_MMI_MULTIMEDIA
     TxtFileNotSupported,
-#endif    
+#endif
     TxtEnterNewPin,
     TxtConfPin,
     TxtChangPin,
@@ -561,12 +561,12 @@
     TxtFixedNames,
     TxtFactoryReset,
     TxtSearching,
-    TxtChangPIN2, 
+    TxtChangPIN2,
     TxtOldPIN,
-    TxtOldPIN2, 
-    TxtNotAcc, 
+    TxtOldPIN2,
+    TxtNotAcc,
     TxtEnabled,
-    TxtDisabled, 
+    TxtDisabled,
     TxtPINOK,
     TxtSimBlocked,
     TxtNewPIN,
@@ -577,12 +577,12 @@
     TxtEnterTime,
     TxtScratchPad,
     TxtDeleted,
-    TxtActivated, 
+    TxtActivated,
     TxtDeActivated,
     TxtDeactivate,
     TxtNotActivated, // Dec 07, 2005    REF: OMAPS00050087 x0039928 - Added string to lang table
     TxtCheck,
-    TxtYes, 
+    TxtYes,
     TxtCallNumber,
     TxtEnterMid,
     TxtReadError,
@@ -625,16 +625,16 @@
     TxtResetCharge,
     TxtIfNoService,
     TxtDiscard,
-    TxtEDIT,  
+    TxtEDIT,
     TxtExtractNumber,
-    TxtWrite, 
+    TxtWrite,
     TxtCheckStatus,
     TxtSetDivert,
     TxtCancelDivert,
     TxtHideID,
     TxtTones,
     TxtClock,
-    TxtPhone, 
+    TxtPhone,
     TxtStop,
 #ifndef FF_NO_VOICE_MEMO
     TxtRecording,
@@ -643,39 +643,39 @@
     TxtNoNumber,
     TxtOkToDelete,
     TxtBalance,
-    TxtLimit, 
+    TxtLimit,
     TxtLimitEq,
     TxtRate,
     TxtMinutes,
     TxtCost,
-    TxtCredit, 
-    TxtPressOk, 
+    TxtCredit,
+    TxtPressOk,
     TxtReset,
     TxtIncoming,
     TxtCounter,
     TxtOutgoingCalls,
     TxtCostCounter,
-    TxtEnterCurrency, 
+    TxtEnterCurrency,
     Txt1Unit,
     TxtChanged,
     TxtEnterLimit,
-    TxtCancelled, 
+    TxtCancelled,
     TxtView,
     TxtEnterPCK,
     TxtEnterCCK,
     TxtEnterNCK,
     TxtEnterNSCK,
-    TxtEnterSPCK, 
+    TxtEnterSPCK,
     TxtCodeInc,
     TxtBlckPerm,
     TxtDealer,
     TxtSendingDTMF,
     TxtCheckNumber,
     TxtNumberBusy,
-    TxtNoAnswer, 
+    TxtNoAnswer,
     TxtNumberChanged,
     TxtNetworkBusy,
-    TxtNotSubscribed, 
+    TxtNotSubscribed,
     TxtAnyKeyAnswer,
     TxtPINBlock,
     TxtEdit,
@@ -686,52 +686,52 @@
     TxtSilent,
     TxtClick,
     TxtClearAlarm,
-    TxtTimeFormat,	
+    TxtTimeFormat,
     TxtTwelveHour,
 	TxtTwentyfourHour,
     TxtInCallTimer,
     TxtStore,
     TxtNone,
     TxtPIN,
-    TxtPIN2, 
+    TxtPIN2,
     TxtConfPin2,
-    TxtNewPIN2, 
-    TxtUnlockOK, 
-    TxtIMEI, 
-    TxtList, 
-    TxtFull, 
-    TxtNotAvailable, 
-    TxtCallBAOC, 
-    TxtCallBAOIC, 
-    TxtCallBAOICexH, 
+    TxtNewPIN2,
+    TxtUnlockOK,
+    TxtIMEI,
+    TxtList,
+    TxtFull,
+    TxtNotAvailable,
+    TxtCallBAOC,
+    TxtCallBAOIC,
+    TxtCallBAOICexH,
     TxtCallBAIC,
-    TxtCallBAICroam, 
+    TxtCallBAICroam,
     TxtCallBarringAll,
     TxtCallBAOCAll,
-    TxtCallBAICAll, 
-    TxtCLIP, 
-    TxtCOLP, 
-    TxtCOLR, 
-    TxtSimToolkit, 
-    TxtPhonebook, 
-    TxtRecentCalls, 
+    TxtCallBAICAll,
+    TxtCLIP,
+    TxtCOLP,
+    TxtCOLR,
+    TxtSimToolkit,
+    TxtPhonebook,
+    TxtRecentCalls,
     TxtNames,
     TxtInterCalls,
     TxtInterHome,
     TxtWhenRoaming,
     TxtCancelAllBars,
     TxtWaiting,
-    TxtBarred, 
-    TxtForwarded, 
-    TxtCallDivertNoReach, 
-    TxtCallDivertNoReply, 
-    TxtCallDivertIfBusy, 
-    TxtPressMenu, 
-    TxtPlus, 
+    TxtBarred,
+    TxtForwarded,
+    TxtCallDivertNoReach,
+    TxtCallDivertNoReply,
+    TxtCallDivertIfBusy,
+    TxtPressMenu,
+    TxtPlus,
     TxtMinus,
-    TxtDivideBy, 
-    TxtMultiplyBy, 
-    TxtEquals, 
+    TxtDivideBy,
+    TxtMultiplyBy,
+    TxtEquals,
     TxtSending,
     TxtMessage,
     TxtSoftNext,
@@ -741,15 +741,15 @@
     TxtMedium,
     TxtHigh,
     TxtIncreasing,
-    TxtTimerReset, 
-    TxtClockSetTo, 
+    TxtTimerReset,
+    TxtClockSetTo,
     TxtSilentMode,
     TxtSmsValidityPeriodSet,
     Txt1Hour,
     Txt12Hours,
     Txt24Hours,
     Txt1Week,
-    TxtMaxTime,  //  May 10, 2004    REF: CRR 15753  Deepa M.D 
+    TxtMaxTime,  //  May 10, 2004    REF: CRR 15753  Deepa M.D
     TxtPin2Code,
     TxtEnablePIN,
     TxtRequesting,
@@ -790,7 +790,7 @@
     TxtEntAnw,
     TxtSsMsg,
     TxtOld,
-    TxtInsertnote, 
+    TxtInsertnote,
    	TxtMelodygenerator,
    	TxtOctaveHigher,
    	TxtOctaveLower,
@@ -813,15 +813,15 @@
    	TxtPort1,
    	TxtPort2,
    	TxtAPN,
-    TxtConnectionType, 
+    TxtConnectionType,
 //xpradipg - Aug 4:changes for WAP2.0 Menu
 #if defined (FF_WAP) && defined (FF_GPF_TCPIP)
-    TxtNameServer1, 
+    TxtNameServer1,
     TxtNameServer2,
     TxtPPGAuthentication,
     TxtWirelessProfiledHTTP,
 #endif
-    TxtGPRS, 
+    TxtGPRS,
     TxtOutgoingData,
 	TxtGame,
     TxtHomepage,
@@ -927,7 +927,7 @@
 	TxtCallBlocked,
 	TxtSRR,  // Marcus: Issue 1170: 30/09/2002
         //March 2, 2005    REF: CRR 11536 x0018858
-	TxtRP,//added for reply path 
+	TxtRP,//added for reply path
 	TxtDelivered,  // Marcus: Issue 1170: 07/10/2002
 	TxtTempError,  // Marcus: Issue 1170: 07/10/2002
 	TxtUnknownCode,/*MC SPR 1111*/
@@ -938,7 +938,7 @@
 	TxtMobileInfo, /*SPR1209*/
   	TxtServingCell,/*SPR1209*/
 
-#ifdef TI_PS_FF_EM 
+#ifdef TI_PS_FF_EM
 /*EngMode */
     TxtServingCellRF,
     TxtServingChannel,
@@ -958,34 +958,34 @@
  	TxtLocation, /*SPR1209*/
 	TxtCiphHopDTX,/*SPR1209*/
 	TxtConcat,
-	TxtColourMenu,	
-	TxtColourBlack,	
+	TxtColourMenu,
+	TxtColourBlack,
 	TxtColourBlue,
 	TxtColourCyan,
-	TxtColourGreen, 
-	TxtColourMagenta, 
+	TxtColourGreen,
+	TxtColourMagenta,
 	TxtColourYellow,
-	TxtColourRed, 
-	TxtColourWhite,	
+	TxtColourRed,
+	TxtColourWhite,
 	TxtColourPink,
 	TxtColourOrange,
 	TxtColourLightBlue,
-	TxtColourLightGreen, 
-	TxtColourPaleYellow, 
+	TxtColourLightGreen,
+	TxtColourPaleYellow,
 	TxtColourTransparent,
     TxtIdleScreenBackground,
 	TxtIdleScreenSoftKey,
 	TxtIdleScreenText,
-	TxtIdleScreenNetworkName,  
-	TxtGeneralBackground ,  		
-	TxtMenuSoftKeyForeground , 
-	TxtMenuSoftKeyBackground ,  	
-	TxtSubMenuHeadingText ,  	
-	TxtSubMenuHeadingBackground,  
-	TxtSubMenuTextForeground ,  	
-	TxtSubMenuTextBackground,  	
-	TxtSubMenuSelectionBar,  	
-	TxtPopUpTextForeground,  	
+	TxtIdleScreenNetworkName,
+	TxtGeneralBackground ,
+	TxtMenuSoftKeyForeground ,
+	TxtMenuSoftKeyBackground ,
+	TxtSubMenuHeadingText ,
+	TxtSubMenuHeadingBackground,
+	TxtSubMenuTextForeground ,
+	TxtSubMenuTextBackground,
+	TxtSubMenuSelectionBar,
+	TxtPopUpTextForeground,
 	TxtPopUpTextBackground,
 	TxtColour,
     TxtLoser,
@@ -998,8 +998,8 @@
     TxtThisEntry,
     TxtBackground,	/* for selecting backgrounds*/
     TxtProviderIcon,
-    TxtIdleScreen,		
-	TxtMenuScreen,		
+    TxtIdleScreen,
+	TxtMenuScreen,
 	TxtBgdSquares,
 	TxtBgdO2,
 	TxtBgdTree,
@@ -1008,7 +1008,7 @@
 	TxtBgdEdinburgh1,
 	TxtBgdEdinburgh2,
 	TxtBgdEdinburgh3,
-	TxtBgdEdinburgh4,			
+	TxtBgdEdinburgh4,
 	TxtDeflectCall, //SPR 1392 call-deflection
 	TxtDeflectCallTo, //SPR 1392 call deflection
 	TxtDeflect, //SPR 1392 call deflection
@@ -1019,7 +1019,7 @@
 	TxtHeldCall,
 	TxtActiveTTYCall,
 	TxtHeldTTYCall,
-	TxtTTY,							
+	TxtTTY,
 #ifdef NEPTUNE_BOARD /* Mar 27, 2006    REF:ER OMAPS00071798 */
         TxtAudioMode,
 	TxtAudioModeText,
@@ -1031,7 +1031,7 @@
 	TxtTTYAll,
 	TxtTTYVco,
 	TxtTTYHco,
-#endif	
+#endif
 	TxtOnNextCall,
 	TxtAlwaysOn,
 	TxtTTYCalling,
@@ -1066,7 +1066,7 @@
 	TxtCallTime, /* API - 05/09/03 - SPR2357 - Added */
 	TxtInvalidMessage,/*MC SPR 2530*/
 	TxtIncompleteMessage,/*MC SPR 2530*/
-	//yanbin add MMS string	
+	//yanbin add MMS string
        //TISHMMS Project
     TxtDownload,
 #if defined (FF_WAP) && defined (FF_GPF_TCPIP)
@@ -1097,7 +1097,7 @@
         TxtMMSInsert,
         TxtMMSSendSucess,
         TxtMMSSendFail,
-        TxtMMSSendng,    
+        TxtMMSSendng,
         TxtMMSDownloading,
         TxtNewMMS,
         TxtMMSRcvFail,
@@ -1106,33 +1106,33 @@
         TxtMMSNotification,//x0012849 May 11 2005 MMI-SPR-29887
         TxtImmediate,        //x0012849 May 11 2005 MMI-SPR-29887
         TxtDeferred,           //x0012849 May 11 2005 MMI-SPR-29887
-        TxtMMSRetrieving,  //x0012849 May 11 2005 MMI-SPR-29887    // MMS Retrieving 
+        TxtMMSRetrieving,  //x0012849 May 11 2005 MMI-SPR-29887    // MMS Retrieving
         TxtMMSRetrieved,        //x0012849 May 11 2005 MMI-SPR-29887      // MMS Retrieved
 	TxtEMSNew, //xrashmic 26 Aug, 2004 MMI-SPR-23931
 	TxtType,//xrashmic 29 Nov, 2004 MMI-SPR-26161
         TxtObject,//xrashmic 29 Nov, 2004 MMI-SPR-26161
         TxtLarge,//xrashmic 29 Nov, 2004 MMI-SPR-26161
         //xrashmic 7 Dec, 2004 MMI-SPR-23965
-        TxtMMSInsertPrePicture,	
+        TxtMMSInsertPrePicture,
         TxtMMSInsertPreSound,
-        TxtAllObjects, 
-        TxtExtracted,        
+        TxtAllObjects,
+        TxtExtracted,
         TxtExtracting,
-        TxtNoObjects, 
+        TxtNoObjects,
         TxtExtractable,
-#endif//MMI-SPR 49811 - x0035544 07 nov 2005       
+#endif//MMI-SPR 49811 - x0035544 07 nov 2005
 	TxtLockAls, /* NDH : CQ16317 */
 	TxtUnlockAls, /* NDH : CQ16317 */
 	TxtAlsLocked, /* NDH : CQ16317 */
 	TxtAlsUnlocked, /* NDH : CQ16317 */
 	TxtLimService, /* SPR12653 */
-	
+
 //   Apr 06, 2005	REF: ENH 30011 xdeepadh
-//Strings for Camera, Mp3 and midi test application are 
-//under the respective flags.	
+//Strings for Camera, Mp3 and midi test application are
+//under the respective flags.
 // 	Nov 14, 2005    REF: OMAPS00044445 xdeepadh
 /* Nov 22, 2007 DR: OMAPS00152315 x0080701(Bharat) -- Commented #if defined */
-//#if defined(FF_MMI_TEST_MP3) ||  defined(FF_MMI_TEST_AAC) 
+//#if defined(FF_MMI_TEST_MP3) ||  defined(FF_MMI_TEST_AAC)
 	TxtPlayerMonoChannel,
 	TxtPlayerStereoChannel,
 	TxtPlayerSetChannels,
@@ -1144,37 +1144,37 @@
 	TxtPlayerResume,
 	TxtPlayerStop,
 	TxtPlayerPlaying,
-	TxtPlayerForward,  //  Jun 06, 2006 REF: ERT OMAPS00070659  x0039928  
+	TxtPlayerForward,  //  Jun 06, 2006 REF: ERT OMAPS00070659  x0039928
 	TxtPlayerRewind,
 	TxtPlayerForwarding,
-	TxtPlayerRewinding,   //  Jun 06, 2006 REF: ERT OMAPS00070659  x0039928  
+	TxtPlayerRewinding,   //  Jun 06, 2006 REF: ERT OMAPS00070659  x0039928
 	TxtPlayerFileNotLoaded, //Jul 18, 2005    REF: SPR 31695   xdeepadh
 	TxtPlayerOptionNotImplemented,//Jul 18, 2005    REF: SPR 31695   xdeepadh
 //#endif //FF_MMI_TEST_MP3
 /* Nov 22, 2007 DR: OMAPS00152315 x0080701(Bharat) -- Commented #endif */
 //Aug 22, 2005    REF: ENH 31154 xdeepadh
-#if defined(FF_MMI_TEST_CAMERA) ||defined(FF_MMI_CAMERA_APP)	
+#if defined(FF_MMI_TEST_CAMERA) ||defined(FF_MMI_CAMERA_APP)
 	TxtCameraTest,
-	TxtViewFinder, 
-	TxtSnapshot, 
-	TxtSaveSnapshot, 
+	TxtViewFinder,
+	TxtSnapshot,
+	TxtSaveSnapshot,
 	TxtSnapshotSaved,
 	TxtSoftSnap,
 	TxtSoftSnapSave,
 	TxtSnapSaving,
 	TxtQuality,
 	TxtEconomy,
-	TxtStandard, 
+	TxtStandard,
 	 TxtColor,
-	 TxtSepia, 
-	 TxtBlackandWhite, 
-	 TxtNegative, 
-	 TxtFilename, 
+	 TxtSepia,
+	 TxtBlackandWhite,
+	 TxtNegative,
+	 TxtFilename,
 	 TxtDigiZoom,
  	 TxtFrame,
 	 TxtFrame1,
-	 TxtFrame2,	 
-	 TxtNoFrame,	 	 
+	 TxtFrame2,
+	 TxtNoFrame,
 	 TxtShootingMode,
 	 TxtSingleshot,
 	 Txt2Shots,
@@ -1188,17 +1188,17 @@
 	TxtMidiChangeConfig,
 	TxtMidiPlay,
 	TxtMidiPlayAllFiles,
-	TxtMidiExit,   
+	TxtMidiExit,
 	TxtChConfigFile,
 	TxtChConfigVoiceLimit,
 	TxtChConfigLoop,
 	TxtChConfigChannels,
-	TxtChConfigBankLocation,    	
+	TxtChConfigBankLocation,
 	TxtMidiEnterVoiceNumber,
 	TxtMidiSelectFile,
 	TxtMidiOptionNotImplemented,
 	TxtMidiLoopOn,
-	TxtMidiLoopOff,       
+	TxtMidiLoopOff,
 	TxtMidiChannels,
 	TxtMidiMonoChannel,
 	TxtMidiStereoChannel,
@@ -1209,8 +1209,8 @@
 	TxtMidiFileNotLoaded,
 	TxtMidiFileSelected,
 	TxtChConfigAudioOutput,
-	TxtMidiSpeaker, 
-	TxtMidiHeadset, 
+	TxtMidiSpeaker,
+	TxtMidiHeadset,
 //x0pleela 30 Jan, 2007  DR: OMAPS00108892
 //Adding the following strings to display error message
 //when loop on is enabled while playing all files
@@ -1239,7 +1239,7 @@
 	TxtBtPairDevice,
 	TxtBtChangePassKey,
 	TxtBtShowServices,
-	TxtBtAddToKnown,	
+	TxtBtAddToKnown,
 	TxtBtRemoveDevice,
 	TxtBtDeviceName,
 	TxtBtSet,
@@ -1271,7 +1271,7 @@
     	/*
     	** End of Bluetooth Related Strings
     	*/
-    	
+
  	TxtFDNName,// MMI SPR 18555
 	TxtAllDivert,// MMI SPR 13614
 	TxtNoReachDivert,  // MMI SPR 13614
@@ -1286,9 +1286,9 @@
 
 //Nov 29, 2004    REF: CRR 25051 xkundadu
 //Description: INCALL SCREEN ?ADJUSTING THE VOLUME
-//Fix: Enums corresponding to various speaker volume 
-//      level strings. 
-	TxtLevel1,  
+//Fix: Enums corresponding to various speaker volume
+//      level strings.
+	TxtLevel1,
 	TxtLevel2,
 	TxtLevel3,
 	TxtLevel4,
@@ -1301,32 +1301,32 @@
         Txt10Second,
         Txt15Second,
         Txt20Second,
-	 TxtSetParam1,     
+	 TxtSetParam1,
 #endif
 #endif
 #ifdef FF_MMI_MULTIMEDIA
 	/* String to be displayed in BMI. Menu Strings. */
-	TxtMultimediaApp,                      
-	TxtConfigurationParameters,     
-	TxtAudioVideoPlayback,             
-	TxtMidiPlayback,                         
-	TxtImageViewer,                         
-	TxtCameraCapture,                     
-	TxtVideoRecording,            
+	TxtMultimediaApp,
+	TxtConfigurationParameters,
+	TxtAudioVideoPlayback,
+	TxtMidiPlayback,
+	TxtImageViewer,
+	TxtCameraCapture,
+	TxtVideoRecording,
 	TxtAudioRecording,
 	TxtPlayRecording,
-	TxtFileListType,                          
-	TxtNoFileAvail,                           
-	TxtOutputScreenSize,                 
-	TxtAudioEncodingFormat,          
-	TxtVideoEncodingFormat,          
-	TxtVideoCaptureSize,                 
-	TxtVideoFrameRateSelection,   
-	TxtAudioBitRate,                        
-	TxtVideoBitRate,                        
-	TxtMidiPlayerSelect,                  
+	TxtFileListType,
+	TxtNoFileAvail,
+	TxtOutputScreenSize,
+	TxtAudioEncodingFormat,
+	TxtVideoEncodingFormat,
+	TxtVideoCaptureSize,
+	TxtVideoFrameRateSelection,
+	TxtAudioBitRate,
+	TxtVideoBitRate,
+	TxtMidiPlayerSelect,
 	/* Configuration Parameter Strings. */
-	TxtHalfScreenMode,                   
+	TxtHalfScreenMode,
 	TxtFullScreenMode,
 	/* Audio Format */
 	TxtAAC,
@@ -1376,10 +1376,10 @@
 	/* Softkey display strings */
 	TxtPauseKey,
 	TxtResumeKey,
-	TxtEncodeKey,     
-	TxtSoftIVT,            
-	TxtPictureDisp, 
-	TxtSetParam,     
+	TxtEncodeKey,
+	TxtSoftIVT,
+	TxtPictureDisp,
+	TxtSetParam,
 	/* Audio Path Configuration Parameter */
 	TxtAudioPath,
 	TxtHeadset,
@@ -1387,9 +1387,9 @@
 	/* Audio / Video Recording related strings. */
 	TxtSoftStart,
 	TxtAudvidRecord,
-	TxtQQVga,           
-	TxtEncdTo,          
-	TxtJPEGFile,       
+	TxtQQVga,
+	TxtEncdTo,
+	TxtJPEGFile,
 	TxtFTPApp,
 	TxtPut,
 	TxtGet,
@@ -1399,7 +1399,7 @@
 	TxtAudioDecodeConfig,
 	TxtAudioEncodeConfig,
 	TxtVideoEncodeConfig,
-	TxtSpeaker,             
+	TxtSpeaker,
 	TxtEnterPath,
 	TxtInvalidPath,
    	TxtVMPlayback,
@@ -1413,7 +1413,7 @@
       TxtUseCase,
       TxtRepeateForEver,
       TxtPlayonce,
-      TxtCamera, 
+      TxtCamera,
       TxtCapture,
       TxtCrop,
       TxtRescale,
@@ -1431,7 +1431,7 @@
        Txt44kRate,
        Txt48kRate,
        TxtPcmRate,
-       TxtPcmChannelMode, 
+       TxtPcmChannelMode,
        /* Image Capture Quality Setting */
       TxtImgCaptureQuality,
       Txt0Set,
@@ -1444,7 +1444,7 @@
       Txt70Set,
       Txt80Set,
       Txt90Set,
-      Txt100Set,      
+      Txt100Set,
       TxtStreoMode,
       TxtMonoMode,
       TxtVideoPlayOption,
@@ -1469,28 +1469,28 @@
 	TxtHeadset,
 	TxtInserted,
 	TxtRemoved,
-#endif	
+#endif
 //Aug 22, 2005    REF: ENH 31154 xdeepadh
 #ifdef F_MMI_FILE_VIEWER
 	TxtFileNotLoaded,//file viewer
 	TxtFileViewer,////May 02, 2005 REF:Camera App xdeepadh
-	TxtRename, 
+	TxtRename,
 	TxtDeleteConfirm,
 	TxtFileTooBig,
-	TxtFileExists, //Jan 03, 2006    REF: SPR OMAPS00060036  xdeepadh 
+	TxtFileExists, //Jan 03, 2006    REF: SPR OMAPS00060036  xdeepadh
 	TxtWrongFilename, 	//Aug 31, 2005    REF: SPR 34050 xdeepadh
 	TxtNoExtension,		// 	Aug 31, 2005    REF: SPR 34050 xdeepadh
 #endif // FF_MMI_FILE_VIEWER
 #if defined(FF_MMI_FILE_VIEWER) || defined(FF_MMI_TEST_CAMERA) ||defined(FF_MMI_CAMERA_APP)
 	TxtRotate,
-	TxtRotate90Degree, 
-	TxtRotate180Degree, 
-	TxtRotate270Degree, 
-	TxtZoom, 
-	TxtZoomIn, 
+	TxtRotate90Degree,
+	TxtRotate180Degree,
+	TxtRotate270Degree,
+	TxtZoom,
+	TxtZoomIn,
 	TxtZoomOut,
-	TxtZoomInMax, 
-	TxtZoomOutMax, 
+	TxtZoomInMax,
+	TxtZoomOutMax,
 
 #endif // FF_MMI_FILE_VIEWER
 
@@ -1503,14 +1503,14 @@
 	TxtUSB,
 	TxtUSBEnumeration,
 	TxtUSBMode,
- 	TxtContinue,	
+ 	TxtContinue,
  	TxtUSBDisconnect,
  	TxtUSBMS,
  	TxtUSBTrace,
- 	TxtUSBFax, 
+ 	TxtUSBFax,
  	TxtPSShutdown,
  	TxtNoPSShutdown,
- 	//xashmic 27 Sep 2006, OMAPS00096389 
+ 	//xashmic 27 Sep 2006, OMAPS00096389
 	TxtUSBFaxnTrace,
 	TxtUSBMSnTrace,
 	TxtUSBFaxnMS,
@@ -1528,13 +1528,13 @@
     TxtNitzTimeUpdate,
 #endif
     //x0pleela 30 Aug, 2006 DR: OMAPS00091250
-	TxtNoMEPD,   
+	TxtNoMEPD,
 //x0pleela 24 Aug, 2006  DR:OMAPS00083503
 //Adding new strings to display if the characters are UCS2 in USSD transactions
 #ifdef MMI_LITE
-	TxtUSSDMsgRxd, 
+	TxtUSSDMsgRxd,
 	TxtFontNotSupported,
-#endif   
+#endif
 //x0pleela 19 Feb, 2007 ER: OMAPS00122561
 #ifdef FF_PHONE_LOCK
 	TxtPhoneLock,
@@ -1549,7 +1549,7 @@
 	TxtAlreadyEnabled,
 	TxtAlreadyDisabled,
 	TxtAutoLockDisable,
-	TxtAutoPhone, 
+	TxtAutoPhone,
 	TxtSuccess,
 	TxtNotLocked,
 #endif	/* FF_PHONE_LOCK */
@@ -1566,7 +1566,7 @@
 	TxtFwdIncomingTTYCall, /* String for Fwd Incoming TTY call */
 	TxtFwdIncomingCall,  /* String for Fwd Incoming  call */
 	 //06 July, 2007 DR: OMAPS00137334 x0062172 Syed
-	TxtConferenceFull,  // String for Conference Full notification 
+	TxtConferenceFull,  // String for Conference Full notification
 
 #ifdef FF_MMI_FILEMANAGER
 	/* File Management related Strings. */
@@ -1607,10 +1607,10 @@
 	TxtCopying,
 	TxtFileNotLoaded,//file viewer
 	TxtFileViewer,////May 02, 2005 REF:Camera App xdeepadh
-	TxtRename, 
+	TxtRename,
 	TxtDeleteConfirm,
 	TxtFileTooBig,
-	TxtFileExists, //Jan 03, 2006    REF: SPR OMAPS00060036  xdeepadh 
+	TxtFileExists, //Jan 03, 2006    REF: SPR OMAPS00060036  xdeepadh
 	TxtWrongFilename, 	//Aug 31, 2005    REF: SPR 34050 xdeepadh
 	TxtNoExtension,		// 	Aug 31, 2005    REF: SPR 34050 xdeepadh
 	TxtStorageDevice,
@@ -1625,7 +1625,7 @@
     TxtAutoSaveOff,
     TxtSoftSave,
     TxtSoftCancel,
-#endif /* FF_MMI_CAMERA_APP */ 
+#endif /* FF_MMI_CAMERA_APP */
 //May 03 2007 ER: x0061088 (Prachi)
 #if CAM_SENSOR == 1
     TxtCamMenuResolution,
@@ -1634,7 +1634,7 @@
     TxtCamSxga,
     TxtCamNot,
     TxtCamSupported,
-#endif 
+#endif
    NO_OF_DEFINED_TEXT_IDS	//GW Leave this as the last element.
 } tIndexTagNames, LangTxt;
 
@@ -1643,7 +1643,7 @@
 #define LEN_LANGUAGE1 662 //English language
 //SPR#1147 - DS - Added one string for incoming fax to lang table.
 #ifndef CHINESE_MMI //German language
-#define LEN_LANGUAGE2 662 
+#define LEN_LANGUAGE2 662
 #else //Chinese language
 #define LEN_LANGUAGE2 662
 #endif /* CHINESE_MMI */
@@ -1662,9 +1662,9 @@
 #endif
 
 /*******************************************************************************
-                                                                              
-                                Public Routine Definitions                                 
-                                                                              
+
+                                Public Routine Definitions
+
 *******************************************************************************/
 
 #ifdef __cplusplus
@@ -1679,9 +1679,9 @@
 
 
 /*******************************************************************************
-                                                                              
+
                                 End of File
-                                                                              
+
 *******************************************************************************/
 
 #endif