WikiTeki /  attachment:PALMH323-1-56-auf6.patch de VoIP/ClientMatériel/Firmware

   1 diff --ignore-file-name-case -ur PALMH323.orig/AUTOPROV/prov.c PALMH323/AUTOPROV/prov.c
   2 --- PALMH323.orig/AUTOPROV/prov.c	2006-12-07 09:41:22.000000000 +0000
   3 +++ PALMH323/AUTOPROV/prov.c	2006-12-08 10:12:05.000000000 +0000
   4 @@ -96,7 +96,7 @@
   5  {
   6  	PXCHAR_D pCur;
   7  	PXCHAR_D pContent;
   8 -	XCHAR pVer[6];
   9 +	XCHAR pVer[8];
  10  	DSHORT iCurVersion, iNewVersion;
  11  
  12  	pCur = pFileName;
  13 @@ -111,7 +111,10 @@
  14  		pVer[0] = SOFT_VER_HIGH + '0';	//X_VAL(Sdram_pDataCache, FLAGS_VERSION_HI);
  15  		pVer[1] = SOFT_VER_LOW + '0';	// X_VAL(Sdram_pDataCache, FLAGS_VERSION_LO);
  16  		pVer[2] = SOFT_VER_BUILD + '0';	//X_VAL(Sdram_pDataCache, FLAGS_VERSION_BUILD);
  17 -		pVer[3] = 0;
  18 +		/* patch AUF pour prendre en compte 5 chiffres de version */
  19 +		pVer[3] = ENG_BUILD_HIGH + '0';
  20 +		pVer[4] = ENG_BUILD_MID + '0';
  21 +		pVer[5] = 0;
  22  		iCurVersion = p_atoi(pVer, 10);
  23  		iNewVersion = p_atoi(pCur, 10);
  24  		OutputVal(iCurVersion, IDS_CHECK_POINT_7);
  25 diff --ignore-file-name-case -ur PALMH323.orig/cleanall.bat PALMH323/cleanall.bat
  26 --- PALMH323.orig/cleanall.bat	2006-12-07 09:41:20.000000000 +0000
  27 +++ PALMH323/cleanall.bat	2006-12-08 10:12:05.000000000 +0000
  28 @@ -280,42 +280,6 @@
  29  del *.tmp
  30  cd ..
  31  
  32 -cd p_epn
  33 -del *.bak
  34 -del *.lst
  35 -del *.obj
  36 -del *.hex
  37 -del *.m51
  38 -del *.abs
  39 -del *.xrf
  40 -del *.~rj
  41 -del *.wmc
  42 -del *.scc
  43 -del *.tmp
  44 -del *.aps
  45 -del *.plg
  46 -rd debug /s /q
  47 -rd release /s /q
  48 -cd ..
  49 -
  50 -cd p_h323
  51 -del *.bak
  52 -del *.lst
  53 -del *.obj
  54 -del *.hex
  55 -del *.m51
  56 -del *.abs
  57 -del *.xrf
  58 -del *.~rj
  59 -del *.wmc
  60 -del *.scc
  61 -del *.tmp
  62 -del *.aps
  63 -del *.plg
  64 -rd debug /s /q
  65 -rd release /s /q
  66 -cd ..
  67 -
  68  cd p_iax2
  69  del *.bak
  70  del *.lst
  71 @@ -334,42 +298,6 @@
  72  rd release /s /q
  73  cd ..
  74  
  75 -cd p_mgcp
  76 -del *.bak
  77 -del *.lst
  78 -del *.obj
  79 -del *.hex
  80 -del *.m51
  81 -del *.abs
  82 -del *.xrf
  83 -del *.~rj
  84 -del *.wmc
  85 -del *.scc
  86 -del *.tmp
  87 -del *.aps
  88 -del *.plg
  89 -rd debug /s /q
  90 -rd release /s /q
  91 -cd ..
  92 -
  93 -cd p_n2p
  94 -del *.bak
  95 -del *.lst
  96 -del *.obj
  97 -del *.hex
  98 -del *.m51
  99 -del *.abs
 100 -del *.xrf
 101 -del *.~rj
 102 -del *.wmc
 103 -del *.scc
 104 -del *.tmp
 105 -del *.aps
 106 -del *.plg
 107 -rd debug /s /q
 108 -rd release /s /q
 109 -cd ..
 110 -
 111  cd p_sip
 112  del *.bak
 113  del *.lst
 114 @@ -388,24 +316,6 @@
 115  rd release /s /q
 116  cd ..
 117  
 118 -cd p_tcpip
 119 -del *.bak
 120 -del *.lst
 121 -del *.obj
 122 -del *.hex
 123 -del *.m51
 124 -del *.abs
 125 -del *.xrf
 126 -del *.~rj
 127 -del *.wmc
 128 -del *.scc
 129 -del *.tmp
 130 -del *.aps
 131 -del *.plg
 132 -rd debug /s /q
 133 -rd release /s /q
 134 -cd ..
 135 -
 136  cd p_util
 137  del *.bak
 138  del *.lst
 139 @@ -424,24 +334,6 @@
 140  rd release /s /q
 141  cd ..
 142  
 143 -cd p_wp
 144 -del *.bak
 145 -del *.lst
 146 -del *.obj
 147 -del *.hex
 148 -del *.m51
 149 -del *.abs
 150 -del *.xrf
 151 -del *.~rj
 152 -del *.wmc
 153 -del *.scc
 154 -del *.tmp
 155 -del *.aps
 156 -del *.plg
 157 -rd debug /s /q
 158 -rd release /s /q
 159 -cd ..
 160 -
 161  cd page0
 162  del *.bak
 163  del *.lst
 164 @@ -689,129 +581,4 @@
 165  	
 166  cd ..
 167  
 168 -if not exist p_user goto end
 169 -
 170 -cd p_user
 171 -	cd auvtech
 172 -	del *.bak
 173 -	del *.lst
 174 -	del *.obj
 175 -	del *.hex
 176 -	del *.m51
 177 -	del *.abs
 178 -	del *.xrf
 179 -	del *.~rj
 180 -	del *.wmc
 181 -	del *.scc
 182 -	del *.tmp
 183 -	cd ..
 184 -
 185 -	cd asiainfo
 186 -	del *.bak
 187 -	del *.lst
 188 -	del *.obj
 189 -	del *.hex
 190 -	del *.m51
 191 -	del *.abs
 192 -	del *.xrf
 193 -	del *.~rj
 194 -	del *.wmc
 195 -	del *.scc
 196 -	del *.tmp
 197 -	cd ..
 198 -
 199 -	cd ringtec
 200 -	del *.bak
 201 -	del *.lst
 202 -	del *.obj
 203 -	del *.hex
 204 -	del *.m51
 205 -	del *.abs
 206 -	del *.xrf
 207 -	del *.~rj
 208 -	del *.wmc
 209 -	del *.scc
 210 -	del *.tmp
 211 -	cd ..
 212 -
 213 -	cd citron
 214 -	del *.bak
 215 -	del *.lst
 216 -	del *.obj
 217 -	del *.hex
 218 -	del *.m51
 219 -	del *.abs
 220 -	del *.xrf
 221 -	del *.~rj
 222 -	del *.wmc
 223 -	del *.scc
 224 -	del *.tmp
 225 -	cd ..
 226 -
 227 -	cd yiyang
 228 -	del *.bak
 229 -	del *.lst
 230 -	del *.obj
 231 -	del *.hex
 232 -	del *.m51
 233 -	del *.abs
 234 -	del *.xrf
 235 -	del *.~rj
 236 -	del *.wmc
 237 -	del *.scc
 238 -	del *.tmp
 239 -	cd ..
 240 -
 241 -	cd txtc
 242 -	del *.bak
 243 -	del *.lst
 244 -	del *.obj
 245 -	del *.hex
 246 -	del *.m51
 247 -	del *.abs
 248 -	del *.xrf
 249 -	del *.~rj
 250 -	del *.wmc
 251 -	del *.scc
 252 -	del *.tmp
 253 -	cd ..
 254 -
 255 -	cd skycom
 256 -	del *.bak
 257 -	del *.lst
 258 -	del *.obj
 259 -	del *.hex
 260 -	del *.m51
 261 -	del *.abs
 262 -	del *.xrf
 263 -	del *.~rj
 264 -	del *.wmc
 265 -	del *.scc
 266 -	del *.tmp
 267 -	cd ..
 268 -
 269 -	cd mediaring
 270 -	del *.bak
 271 -	del *.lst
 272 -	del *.obj
 273 -	del *.hex
 274 -	del *.m51
 275 -	del *.abs
 276 -	del *.xrf
 277 -	del *.~rj
 278 -	del *.wmc
 279 -	del *.scc
 280 -	del *.tmp
 281 -	cd ..
 282 -	
 283 -del *.scc
 284 -del *.aps
 285 -del *.plg
 286 -rd debug /s /q
 287 -rd release /s /q
 288 -cd ..
 289 -
 290 -
 291 -
 292 -:end
 293  
 294 diff --ignore-file-name-case -ur PALMH323.orig/inc/flags.h PALMH323/inc/flags.h
 295 --- PALMH323.orig/inc/flags.h	2006-12-07 09:41:26.000000000 +0000
 296 +++ PALMH323/inc/flags.h	2006-12-08 10:12:05.000000000 +0000
 297 @@ -32,7 +32,8 @@
 298  	'A', 'O', 'L', 'Y', 'N', 'K', ' ','E', 'P', '2', '0', '1', 0, 0, 0, 0,
 299  #endif
 300  #elif defined VER_YWH500
 301 -	' ', ' ', ' ', 'I', 'P', ' ', 'P', 'H', 'O', 'N', 'E', ' ', '5', 0, 0, 0,
 302 +	// ' ', ' ', ' ', 'I', 'P', ' ', 'P', 'H', 'O', 'N', 'E', ' ', '5', 0, 0, 0,
 303 +	'A', 'U', 'F', ' ', 'V', 'o', 'I', 'P', ' ', SOFT_VER_HIGH + '0', SOFT_VER_LOW + '0', SOFT_VER_BUILD + '0', '-', ENG_BUILD_HIGH + '0', ENG_BUILD_MID + '0', 0,
 304  #elif defined VER_YWH300
 305  	' ', ' ', ' ', 'I', 'P', ' ', 'P', 'H', 'O', 'N', 'E', ' ', '4', 0, 0, 0,
 306  #elif defined VER_YWH200
 307 diff --ignore-file-name-case -ur PALMH323.orig/inc/p_iax2.h PALMH323/inc/p_iax2.h
 308 --- PALMH323.orig/inc/p_iax2.h	2006-12-07 09:41:28.000000000 +0000
 309 +++ PALMH323/inc/p_iax2.h	2006-12-22 16:47:22.000000000 +0000
 310 @@ -15,7 +15,9 @@
 311  	void	Iax2AnswerCall(BOOLEAN bAnswer);
 312  	void	Iax2Hangup();
 313  	void	Iax2Connect();
 314 +	void	Iax2Flash();
 315  	void	Iax2CallHold();
 316 +	BOOLEAN Iax2HasTwoCalls();
 317  	void	Iax2AttendedTransfer();
 318  	void	Iax2UnattendedTransfer(PXCHAR pDstNumber);
 319  	void	Iax2HandleTimer();
 320 diff --ignore-file-name-case -ur PALMH323.orig/inc/version.h PALMH323/inc/version.h
 321 --- PALMH323.orig/inc/version.h	2006-12-07 15:35:18.000000000 +0000
 322 +++ PALMH323/inc/version.h	2007-01-04 11:29:34.000000000 +0000
 323 @@ -23,10 +23,10 @@
 324  //#define VER_WG2203			// MT29F016, fast TOGO Tech, 2203 and 2501 phones
 325  //#define VER_WG3051			// same as PA168V
 326  //#define VER_YWH10				// same as PA168S except different keypad
 327 -#define VER_YWH100			// same as PA168S except different keypad
 328 +//#define VER_YWH100			// same as PA168S except different keypad
 329  //#define VER_YWH200			// same as PA168S except different keypad
 330  //#define VER_YWH300			// same as PA168S except different keypad
 331 -//#define VER_YWH500			// same as PA168S except different keypad
 332 +#define VER_YWH500			// same as PA168S except different keypad
 333  //#define VER_COSUN				// same as PA168S except different keypad
 334  //#define VER_KINGTEL			// same as PA168S except different keypad
 335  //#define VER_EP668				// GW-EP668/A - same as PA168S
 336 @@ -39,9 +39,9 @@
 337  //#define CALL_H323
 338  //#define CALL_SIP
 339  //#define CALL_MGCP
 340 -#define CALL_N2P
 341 +//#define CALL_N2P
 342  //#define CALL_WP
 343 -//#define CALL_IAX2
 344 +#define CALL_IAX2
 345  //#define CALL_EPN
 346  
 347  // Country -- Web page, LCD display, IVR voice and DTMF tone
 348 @@ -60,13 +60,13 @@
 349  //#define RES_CA_E	// Canada (English) ^^^
 350  //#define RES_CA_F	// Canada (French) *** (web, lcd and ivr use French)
 351  //#define RES_CL	// Chile (Spanish) *** (web, lcd and ivr use Spain)
 352 -#define RES_CN		// China (Mandarin) ***
 353 +//#define RES_CN		// China (Mandarin) ***
 354  //#define RES_CZ	// Czech Republic *** (ivr use English)
 355  //#define RES_DE	// Germany ***
 356  //#define RES_EG	// Egypt
 357  //#define RES_ES	// Spain ***
 358  //#define RES_ES_C	// Catalonian (Spain) *** (Dtmf Tone use Spain)
 359 -//#define RES_FR	// France ***
 360 +#define RES_FR	// France ***
 361  //#define RES_GB	// United Kingdom (English) ^^^
 362  //#define RES_GR	// Greece
 363  //#define RES_HK	// China HongKong ^^^
 364 @@ -99,7 +99,7 @@
 365  //#define OEM_MEDIARING
 366  //#define OEM_NET2PHONE
 367  //#define OEM_NGTEL
 368 -//#define OEM_NONE_IVR
 369 +#define OEM_NONE_IVR
 370  //#define OEM_POLYLINK
 371  //#define OEM_RINGCHAT
 372  //#define OEM_SKYCOM
 373 @@ -451,5 +451,5 @@
 374  #define SOFT_VER_LOW		5
 375  #define SOFT_VER_BUILD		6
 376  #define ENG_BUILD_HIGH		0
 377 -#define ENG_BUILD_MID		0
 378 +#define ENG_BUILD_MID		6
 379  #define ENG_BUILD_LOW		1
 380 diff --ignore-file-name-case -ur PALMH323.orig/main/function.c PALMH323/main/function.c
 381 --- PALMH323.orig/main/function.c	2006-12-07 09:42:52.000000000 +0000
 382 +++ PALMH323/main/function.c	2006-12-22 16:07:10.000000000 +0000
 383 @@ -123,6 +123,10 @@
 384  //		OnCallTransfer();
 385  #if defined	VER_IPLINK || defined OEM_JR168
 386  		HangupPhone();
 387 +// Patch AUF : en iax2 on coupe le canal actuel
 388 +#endif
 389 +#ifdef CALL_IAX2
 390 +		Iax2Flash();
 391  #else
 392  		OnCallHold();
 393  #endif
 394 @@ -237,6 +241,8 @@
 395  					{
 396  						GetDateTimeDisplay(pBuf, TRUE, Sys_lCurrentTime);
 397  						DisplayLine(pBuf, 0);
 398 +						// patch AUF : quand on affiche la date, on efface aussi la ligne en dessous
 399 +						DisplayString(g_cBlank, 1);
 400  					}
 401  					else
 402  					{
 403 @@ -492,6 +498,7 @@
 404  		return;
 405  	}
 406  
 407 +/* patch AUF : on ne veut pas de ces affichages intempestifs
 408  	if (!(Sys_lCurrentTime % 20))
 409  	{
 410  		if (p_strlen_x(Sys_pLocalNumber))
 411 @@ -515,6 +522,7 @@
 412  			DisplayLine(Sys_pAccount, 1);
 413  		}
 414  	}
 415 +*/
 416  }
 417  
 418  void OnRedial()
 419 @@ -798,13 +806,17 @@
 420  #endif
 421  
 422  #ifdef CALL_IAX2
 423 -	if (p_strlen_x(Key_pBuf))
 424 +	// Patch AUF ergonomie transfert
 425 +	// Si deux appels en cours on transfert
 426 +	// sinon on fait un Hold pour permettre l'appel du 2nd correspondant
 427 +	if (Iax2HasTwoCalls())
 428  	{
 429 -		Iax2UnattendedTransfer(Key_pBuf);
 430 +		Iax2AttendedTransfer();
 431  	}
 432  	else
 433  	{
 434 -		Iax2AttendedTransfer();
 435 +		DisplayString((PCCHAR)"No destinataire", 0);
 436 +		Iax2CallHold();
 437  	}
 438  #endif
 439  	KeypadClear();
 440 diff --ignore-file-name-case -ur PALMH323.orig/main/keypad.c PALMH323/main/keypad.c
 441 --- PALMH323.orig/main/keypad.c	2006-12-07 09:42:54.000000000 +0000
 442 +++ PALMH323/main/keypad.c	2007-01-04 11:27:08.000000000 +0000
 443 @@ -801,7 +801,9 @@
 444  	{
 445  		Ac97StopIVR();
 446  	}
 447 -	else if (Key_iCurrentID != 'O' && Key_iCurrentID != 'P' && Key_iCurrentID != 'M')	// Andy       vol-             vol+
 448 +	// Correction AUF, ce ne sont pas ces touches, non ?...
 449 +	// else if (Key_iCurrentID != 'O' && Key_iCurrentID != 'P' && Key_iCurrentID != 'M')	// Andy       vol-             vol+
 450 +	else if (Key_iCurrentID != 'O' && Key_iCurrentID != 'G' && Key_iCurrentID != 'C' && Key_iCurrentID != 'F' && Key_iCurrentID != 'N')	// Andy       vol-             vol+
 451  	{
 452  		Sys_iScrollType = SCROLL_NULL;
 453  	}
 454 @@ -849,7 +851,16 @@
 455  		OnLoadSpeedDial();  
 456  		break;
 457  	case 'k':	
 458 -		OnBackSpace();                 
 459 +		// Patch AUF : en comm, backspace = mute
 460 +		// FIXME : mmmhhh le test IsCallMode n'est pas bon,
 461 +		// il ne détecte pas si on est _vraiment_ en communication 
 462 +		if (IsCallMode())
 463 +		{
 464 +			OnMute();
 465 +		} else 
 466 +		{
 467 +			OnBackSpace();                 
 468 +		}
 469  		break;
 470  	case 'l':	
 471  		OnHandFree();                 
 472 diff --ignore-file-name-case -ur PALMH323.orig/main/std_func.c PALMH323/main/std_func.c
 473 --- PALMH323.orig/main/std_func.c	2006-12-07 09:42:54.000000000 +0000
 474 +++ PALMH323/main/std_func.c	2007-01-04 11:48:54.000000000 +0000
 475 @@ -120,7 +120,9 @@
 476  	}
 477  #endif
 478  
 479 -	DisplayString(g_cLocalIP, 0);
 480 +	// DisplayString(g_cLocalIP, 0);
 481 +	// Patch AUF : on affiche la version 
 482 +	DisplayLine((PXCHAR)GetHardwareVersion(), 0);
 483  
 484  	// stop remote debug
 485  	UdpDebugRemoteStop();
 486 @@ -186,7 +188,13 @@
 487  
 488  void OnPhoneNumber()
 489  {
 490 -	DisplayString(g_cPhoneNumber, 0);
 491 +	// patch auf : si y'a un username, on l'affiche ici
 492 +	if (p_strlen_x(Sys_pAccount))
 493 +	{
 494 +		DisplayLine(Sys_pAccount,0);
 495 +	} else {
 496 +		DisplayString(g_cPhoneNumber, 0);
 497 +	}
 498  	if (IsCallMode())
 499  	{
 500  		if (IsSetupMode())
 501 @@ -250,33 +258,64 @@
 502  	}
 503  	else
 504  	{
 505 -		DisplayString(g_cEmpty, 1);
 506 +		DisplayString((PCCHAR)"Liste vide", 1);
 507  	}
 508  }
 509  
 510  void OnMissedCall()
 511  {
 512 -	if (!IsCallMode())
 513 -	{
 514 -		// display the unanswered phone call numbers
 515 -		_OnCallRecord(CALL_TYPE_MISSED);
 516 -	}
 517 +	//if (!IsCallMode())
 518 +	//{
 519 +		// display the missed phone call numbers
 520 +		if (Sys_iScrollType != CALL_TYPE_MISSED)
 521 +		{
 522 +			_OnCallRecord(CALL_TYPE_MISSED);
 523 +		}
 524 +		else
 525 +		{
 526 +			if (CallRecReadScroll(TRUE))
 527 +			{
 528 +				_OnCallRecord(Sys_iScrollType);
 529 +			}
 530 +		}
 531 +	//}
 532  }
 533  
 534  void OnAnsweredCall()
 535  {
 536 -	if (!IsCallMode())
 537 -	{	// display the answered phone call numbers
 538 -		_OnCallRecord(CALL_TYPE_ANSWERED);
 539 -	}
 540 +	// if (!IsCallMode())
 541 +	// {
 542 +		// display the unanswered phone call numbers
 543 +		if (Sys_iScrollType != CALL_TYPE_ANSWERED)
 544 +		{
 545 +			_OnCallRecord(CALL_TYPE_ANSWERED);
 546 +		}
 547 +		else
 548 +		{
 549 +			if (CallRecReadScroll(TRUE))
 550 +			{
 551 +				_OnCallRecord(Sys_iScrollType);
 552 +			}
 553 +		}
 554 +	// }
 555  }
 556  
 557  void OnDialedCall()
 558  {
 559 -	if (!IsCallMode())
 560 -	{	// display the dialed phone call numbers
 561 -		_OnCallRecord(CALL_TYPE_DIALED);
 562 -	}
 563 +	//if (!IsCallMode())
 564 +	//{	// display the dialed phone call numbers
 565 +		if (Sys_iScrollType != CALL_TYPE_DIALED)
 566 +		{
 567 +			_OnCallRecord(CALL_TYPE_DIALED);
 568 +		}
 569 +		else
 570 +		{
 571 +			if (CallRecReadScroll(TRUE))
 572 +			{
 573 +				_OnCallRecord(Sys_iScrollType);
 574 +			}
 575 +		}
 576 +	//}
 577  }
 578  
 579  BOOLEAN _GetSpeedDial()
 580 @@ -339,7 +378,7 @@
 581  		if (!_GetSpeedDial())
 582  		{
 583  			KeypadClear();
 584 -			DisplayString((PCCHAR)"PhoneBook Empty", 1);
 585 +			DisplayString((PCCHAR)"Annuaire vide", 1);
 586  		}
 587  		else
 588  		{
 589 diff --ignore-file-name-case -ur PALMH323.orig/main/v_task.c PALMH323/main/v_task.c
 590 --- PALMH323.orig/main/v_task.c	2006-12-07 09:42:54.000000000 +0000
 591 +++ PALMH323/main/v_task.c	2006-12-22 17:13:23.000000000 +0000
 592 @@ -863,6 +863,16 @@
 593  		TaskRestart(0);
 594  		return;
 595  	}
 596 +// patch AUF : si deux correspondants en IAX, on 
 597 +// transfert l'un vers l'autre
 598 +#ifdef CALL_IAX2
 599 +	if (Iax2HasTwoCalls()) 
 600 +	{
 601 +		DisplayString(g_cCallTransfer,0);
 602 +		Iax2AttendedTransfer();
 603 +		return;
 604 +	}
 605 +#endif
 606  
 607  	OutputString(IDS_TASK_HANGUP);
 608  
 609 diff --ignore-file-name-case -ur PALMH323.orig/p_apps/lcd_fr.c PALMH323/p_apps/lcd_fr.c
 610 --- PALMH323.orig/p_apps/lcd_fr.c	2006-12-07 09:42:56.000000000 +0000
 611 +++ PALMH323/p_apps/lcd_fr.c	2006-12-20 15:41:49.000000000 +0000
 612 @@ -1,82 +1,82 @@
 613 -CCHAR g_cWeekDay[DAYS_PER_WEEK][4] = {"DIM", "LUN", "MAR", "MER", "JEU", "VEN", "SAM"};
 614 -CCHAR g_cMonth[MONTHS_PER_YEAR][4] = {"JAN", "FEV", "MAR", "AVR", "MAI", "JUI", "JUL", "AOU", "SEP", "OCT", "NOV", "DEC"};
 615 +CCHAR g_cWeekDay[DAYS_PER_WEEK][4] = {"Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam"};
 616 +CCHAR g_cMonth[MONTHS_PER_YEAR][4] = {"jan", "fev", "mar", "avr", "mai", "jui", "jul", "aou", "sep", "oct", "nov", "dec"};
 617  
 618  CCHAR g_cPasswordPrompt[] = "Mot de passe:";
 619  CCHAR g_cSettings[] = "Configuration";
 620  
 621  CCHAR g_cEnableLabel[] = "1[Activer]";
 622 -CCHAR g_cDisableLabel[] = "0[Deactiver]";
 623 +CCHAR g_cDisableLabel[] = "0[Desactiver]";
 624  CCHAR g_cInvalidLabel[] = "Invalide";
 625 -CCHAR g_cSuperLable[] = "Passwd Administ..";
 626 +CCHAR g_cSuperLable[] = "MdP Admin.";
 627  
 628 -CCHAR g_cBooting[] = "Booting ...";
 629 -CCHAR g_cReady[] = "Pret";
 630 -CCHAR g_cLocalIP[] = "IP Locale";
 631 -CCHAR g_cSubnetMask[] = "Masque S/ Reseau";
 632 -CCHAR g_cRouterIP[] = "Adresse Routeur";
 633 -CCHAR g_cServiceIP[] = "Adresse serveur";
 634 -CCHAR g_cPhoneNumber[] = "Numero du Poste";
 635 -CCHAR g_cMissedCalls[] = "Appels Manques:";
 636 -CCHAR g_cAnsweredCalls[] = "Appels Recus:";
 637 -CCHAR g_cDialedCalls[] = "Appels Emis:";
 638 +CCHAR g_cBooting[] = "Initialisation";
 639 +CCHAR g_cReady[] = "Telephone pret !";
 640 +CCHAR g_cLocalIP[] = "IP locale";
 641 +CCHAR g_cSubnetMask[] = "Masque reseau";
 642 +CCHAR g_cRouterIP[] = "IP routeur";
 643 +CCHAR g_cServiceIP[] = "IP serveur";
 644 +CCHAR g_cPhoneNumber[] = "Numero du poste";
 645 +CCHAR g_cMissedCalls[] = "Appels manques:";
 646 +CCHAR g_cAnsweredCalls[] = "Appels recus:";
 647 +CCHAR g_cDialedCalls[] = "Appels emis:";
 648  CCHAR g_cEmpty[] = "Vide";
 649  CCHAR g_cMemory[] = "Memoire";
 650 -CCHAR g_cSpeedDial[] = "selection Rapide:";
 651 +CCHAR g_cSpeedDial[] = "Selection rapide:";
 652  CCHAR g_cVolPlus[] = "Vol+";
 653  CCHAR g_cVolMinus[] = "Vol-";
 654  CCHAR g_cRedial[] = "Bis";
 655  CCHAR g_cCall[] = "Appel";
 656 -CCHAR g_cCalling[] = "Appel En cours...";
 657 -CCHAR g_cRinging[] = "Sonnerie ...";
 658 -CCHAR g_cAnswering[] = "Reponse ...";
 659 +CCHAR g_cCalling[] = "Appel en cours";
 660 +CCHAR g_cRinging[] = "Sonnerie";
 661 +CCHAR g_cAnswering[] = "Reponse";
 662  CCHAR g_cConnected[] = "Connecte";
 663  CCHAR g_cBlank[] = " ";
 664  CCHAR g_cFailed[] = "Echoue";
 665 -CCHAR g_cHandsetUp[] = "Vol+ Combine";
 666 -CCHAR g_cHandsetDown[] = "Vol- Combine";
 667 +CCHAR g_cHandsetUp[] = "Vol+ combine";
 668 +CCHAR g_cHandsetDown[] = "Vol- combine";
 669  CCHAR g_cNetwork[] = "Reseau";
 670  CCHAR g_cDHCP[] = "DHCP";
 671  CCHAR g_cPPPoE[] = "PPPoE";
 672 -CCHAR g_cLogon[] = "Ouverture Session";
 673 -CCHAR g_cLogoff[] = "Log Off";
 674 -CCHAR g_cUpdating[] = "Mise a jour ...";
 675 -CCHAR g_cPleaseWait[] = "Patientez Svp";
 676 -CCHAR g_cTestMode[] = "Mode Test ...";
 677 +CCHAR g_cLogon[] = "Ouverture session";
 678 +CCHAR g_cLogoff[] = "Deconnexion";
 679 +CCHAR g_cUpdating[] = "Mise a jour";
 680 +CCHAR g_cPleaseWait[] = "Patientez SVP";
 681 +CCHAR g_cTestMode[] = "MODE TEST";
 682  CCHAR g_cStart[] = "Debut";
 683  CCHAR g_cStop[] = "Arret";
 684  CCHAR g_cRestart[] = "Redemarrage";
 685  CCHAR g_cPercentStart[] = "  0%";
 686  CCHAR g_cTimeStart[] = "00:00:00";
 687 -CCHAR g_cConnecting[] = "Connexion en cours";
 688 -CCHAR g_cDisconnecting[] = "Disconnecting...";
 689 +CCHAR g_cConnecting[] = "Connexion ...";
 690 +CCHAR g_cDisconnecting[] = "Deconnexion";
 691  CCHAR g_cModem[] = "Modem";
 692 -CCHAR g_cPeerHangup[] = "Dest: Raccrocher";
 693 +CCHAR g_cPeerHangup[] = "Dest. a raccroche";
 694  CCHAR g_cPeerBusy[] = "Occupe";
 695 -CCHAR g_cCallHold[] = "Appel En Attente";
 696 -CCHAR g_cPleaseDial[] = "Numerotez Svp ...";
 697 -CCHAR g_cNoAnswer[] = "Pas de Reponse";
 698 -CCHAR g_cPeerReject[] = "Dest: Rejet appel";
 699 -CCHAR g_cLocalHangup[] = "Dernier Appel:";
 700 -CCHAR g_cWaitLogon[] = "Attente D'Acces...";
 701 -CCHAR g_cNetworkError[] = "Erreur Reseau";
 702 +CCHAR g_cCallHold[] = "Nouvel appel";
 703 +CCHAR g_cPleaseDial[] = "Numerotez ...";
 704 +CCHAR g_cNoAnswer[] = "Pas de reponse";
 705 +CCHAR g_cPeerReject[] = "Dst refuse l'appel";
 706 +CCHAR g_cLocalHangup[] = "Dernier appel:";
 707 +CCHAR g_cWaitLogon[] = "Attente d'acces...";
 708 +CCHAR g_cNetworkError[] = "Erreur reseau";
 709  CCHAR g_cServiceClearCall[] = "Lib Appel Systeme";
 710 -CCHAR g_cPleaseHangup[] = "Raccrochez Svp";
 711 -CCHAR g_cCallForward[] = "Renvoie Appel";
 712 -CCHAR g_cInvalidNumber[] = "Numero Invalide";
 713 -CCHAR g_cUnknownNumber[] = "Numero Inconnu";
 714 -CCHAR g_cDuplicateNumber[] = "Numero Duplique";
 715 -CCHAR g_cCallRestricted[] = "Appel Restreint";
 716 -CCHAR g_cCallTerminated[] = "Call Terminated";
 717 -CCHAR g_cRecharge[] = "Recharger Svp";
 718 -CCHAR g_cAccountExpired[] = "Compte Expire";
 719 -CCHAR g_cInvalidPassword[] = "Passwd Invalide";
 720 -CCHAR g_cBlockedNumber[] = "Numero Bloque";
 721 -CCHAR g_cDuplicatedIP[] = "Adrs IP Duplique!";
 722 -CCHAR g_cCallWaiting[] = "Call Waiting";
 723 -CCHAR g_cNewMessage[] = "Message arrive";
 724 +CCHAR g_cPleaseHangup[] = "Raccrochez";
 725 +CCHAR g_cCallForward[] = "Renvoi";
 726 +CCHAR g_cInvalidNumber[] = "Numero invalide";
 727 +CCHAR g_cUnknownNumber[] = "Numero inconnu";
 728 +CCHAR g_cDuplicateNumber[] = "Numero duplique";
 729 +CCHAR g_cCallRestricted[] = "Appel restreint";
 730 +CCHAR g_cCallTerminated[] = "Fin d'appel";
 731 +CCHAR g_cRecharge[] = "Rechargez SVP";
 732 +CCHAR g_cAccountExpired[] = "Compte expire";
 733 +CCHAR g_cInvalidPassword[] = "MdP invalide";
 734 +CCHAR g_cBlockedNumber[] = "Numero bloque";
 735 +CCHAR g_cDuplicatedIP[] = "Adr. IP dupliquee!";
 736 +CCHAR g_cCallWaiting[] = "Appel en attente";
 737 +CCHAR g_cNewMessage[] = "Messagerie";
 738  CCHAR g_cCallTransfer[] = "Transfert";
 739 -CCHAR g_cProvisioning[] = "Provisioning";
 740 -CCHAR g_cCallMuted[] = "Call Muted";
 741 +CCHAR g_cProvisioning[] = "Autoconfig";
 742 +CCHAR g_cCallMuted[] = "Silencieux";
 743  
 744  #ifdef CALL_H323
 745  CCHAR g_cProtocol[] = "H323";
 746 diff --ignore-file-name-case -ur PALMH323.orig/P_IAX2/iax2.c PALMH323/P_IAX2/iax2.c
 747 --- PALMH323.orig/P_IAX2/iax2.c	2006-12-07 09:43:02.000000000 +0000
 748 +++ PALMH323/P_IAX2/iax2.c	2006-12-22 17:16:09.000000000 +0000
 749 @@ -1343,6 +1343,20 @@
 750  	}
 751  }
 752  
 753 +// Patch AUF : Flash = on coupe la connexion en cours
 754 +// TODO : ca marche pas super super, mais bon... je fatigue...
 755 + void Iax2Flash()
 756 +{
 757 +	DCHAR iSession;
 758 +
 759 +	iSession = Iax2_iCallSess[Iax2_iCurCall];
 760 +	if (iSession != IAX_SESSION_ERROR)
 761 +	{
 762 +		iax2_hangup(iSession, _cCauseClearing);
 763 +		iax2_call_end(Iax2_iCurCall);
 764 +	}
 765 +}
 766 +
 767   void Iax2Connect()
 768  {
 769  	DCHAR iSession;
 770 @@ -1401,6 +1415,11 @@
 771  	iax2_session_send_packet(iSession, AST_FRAME_IAX, IAX_COMMAND_TRANSFER, iax2_ie_get_len());
 772  }
 773  
 774 + BOOLEAN Iax2HasTwoCalls()
 775 +{
 776 +	return (Iax2_iCallState[Iax2_iCurCall] == IAX_CALL_STATE_CONNECTED && Iax2_iCallState[1 - Iax2_iCurCall] == IAX_CALL_STATE_CONNECTED);
 777 +}
 778 +
 779   void	Iax2AttendedTransfer()
 780  {
 781  	DCHAR iAltCall, iAltSession;