Merge branch 'development'

dictsource/bn_list

-// Translation rules for Bengali
+
+// Translation rules for Bengali
+// Improvement input  by Him Prasad gautam (Nepal).
 // This file is UTF8 encoded
 
 // Numbers
 _3	t'in
 _4	tS'ar
 _5	p'a~tS
-_6	tS#'Oj
+_6	tSh'Oj
 _7	S'at
 _8	'at.#
 _9	n'Oj
 
 _2a	d'u     // with hundreds etc.
-_6a	tS#'a
+_6a	tSh'O
 _9a	n'O
 
 
 _26	tSh'abbiS
 _27	Sat'aS
 _28	'at.#aS
-_29	unOtr'iS
+_29	'unOtr'iS
 
 _30	tr'iS
-_31	ekOtr'iS
-_32	bOtr'iS
-_33	tetr'iS
-_34	tSowtr'iS
-_35	pO~jtr'iS
+_31	'ekOtr'iS
+_32	b'Otr'iS
+_33	t'etr'iS
+_34	tS'owtr'iS
+_35	p'O~jtr'iS
 _36	tS#'Otr'iS
-_37	Sa~itr'iS
-_38	at.tr'iS
+_37	S'a~itr'iS
+_38	'at.tr'iS
 _39	'unOtSOll'iS
 
 _40	tSOll'iS
-_41	ektSOll'iS
-_42	biall'iS
-_43	tetall'iS
-_44	tSoall'iS
-_45	pO~jtall'iS
-_46	tSetSOll'iS
-_47	SatSOll'is
-_48	atSOll'iS
-_49	unOpO~tSaS
-
-_50	pO~tS'aS
-_51	&kann'o
-_52	bajann'o
-_53	tepann'o
-_54	tSujann'o
-_55	pontSann'o
-_56	tS#apann'o
-_57	Satann'o
-_58	at.ann'o
-_59	unOS'at.
+_41	'ektSOll'iS
+_42	b'iall'iS
+_43	t'etall'iS
+_44	tS'oall'iS
+_45	p'O~jtall'iS
+_46	tS'etSOll'iS
+_47	S'atSOll'is
+_48	'atSOll'iS
+_49	'unOpO~tSaS
+
+_50	p'O~tS'aS
+_51	'&kann'o
+_52	b'ajann'o
+_53	t'epann'o
+_54	tS'ujann'o
+_55	p'ontSann'o
+_56	tS#'apann'o
+_57	S'atann'o
+_58	'at.ann'o
+_59	'unOS'at.
 
 
 _60	s'at.
-_61	ekSOt.t.'i
-_62	baSOt.t.'i
-_63	teSOt.t.'i
-_64	tSowSOt.t.'i
-_65	pojSOt.t.'i
-_66	SeSOt.t.'i
-_67	SatSOt.t.'i
-_68	at.SOt.t.'i
-_6X	sat.t.'i
-_69	unOSOtt'ur
-
-_70	SOtt'Or
-_71	ekatt'Or
-_72	bahatt'Or
-_73	tehatt'Or
-_74	tSuhatt'Or
-_75	pOtSatt'Or
-_76	tS#ijatt'Or
-_77	Satatt'Or
-_78	at.att'Or
-_79	unOaS'i
+_61	'ekSOt.t.'i
+_62	b'aSOt.t.'i
+_63	t'eSOt.t.'i
+_64	tS'owSOt.t.'i
+_65	p'ojSOt.t.'i
+_66	S'eSOt.t.'i
+_67	S'atSOt.t.'i
+_68	'at.SOt.t.'i
+_6X	s'at.t.'i
+_69	'unOSOtt'Or
+
+_70	S'Ott'Or
+_71	'ekatt'Or
+_72	b'ahatt'Or
+_73	t'iatt'Or
+_74	tS'uhatt'Or
+_75	p'OtSatt'Or
+_76	tS#'ijatt'Or
+_77	S'atatt'Or
+_78	'at.att'Or
+_79	'unOaS'i
 
 _80	aS'i
-_81	&kaS'i
-_82	beraS'i
-_83	teraS'i
-_84	tSuraS'i
-_85	po~tSaS'i
-_86	tS#ijaS'i
-_87	SataS'i
-_88	at.aS'i
-_89	,unOnObb'oj
+_81	'&kaS'i
+_82	b'eraS'i
+_83	t'eraS'i
+_84	tS'uraS'i
+_85	p'o~tSaS'i
+_86	tS#'ijaS'i
+_87	S'ataS'i
+_88	'at.aS'i
+_89	'unOnObb'oj
 
 _90	nObb'oj
-_91	&kanObb'oj
-_92	beranObb'oj
-_93	teranObb'oj
-_94	tSuranObb'oj
-_95	pOtSanObb'oj
-_96	tS#ijanObb'oj
-_97	SatanObb'oj
-_98	at.anObb'oj
-_99	niranObb'oj
+_91	'&kanObb'oj
+_92	b'eranObb'oj
+_93	t'eranObb'oj
+_94	tS'uranObb'oj
+_95	p'OtSanObb'oj
+_96	tS#'ijanObb'oj
+_97	S'atanObb'oj
+_98	'at.anObb'oj
+_99	n'iranObb'oj
 
 _0C	S'o
 _0M1	h'ajar
 খ	k#O
 গ	gO
 ঘ	g#O
-ঙ	'uNO~
+ঙ	'uNgO~
 চ	tSO
 ছ	tShO    // [h] to distinguish from [tS]
 জ	JO
 অ	O
 আ	a
 ই	hrOS:o'i
-ঈ	dirg#o'i
+ঈ	d'i:rg#o'i
 উ	hrOS:o'u
-ঊ	dirg#o'u
+ঊ	d'i:rg#o'u
 ঋ	ri
 ঔ	ow
 
 
 // combining vowel signs
 া	'akar
-ি	r'oS:ikar
-ী	d'irg#ikar
-ূ	r'oS:ukar
-ু	d'irg#ukar
+ি	hrOS:o'ikar
+ী	d'i:rg#ikar
+ূ	hrOS:o'ukar
+ু	d'i:rg#ukar
 ৃ	r'ikar
 ে	'ekar
 ৈ	'ojkar

dictsource/bn_rules

-
+// Pronounciation rule for Bengali.
+// Improvement input by Him Prasad Gautam (Nepal).
 // This file is UTF8 encoded 
 
 // letter groups:
 // Vowel Signs
 
 .group া
-       া         a
-       াঁ        a~
-       
+	C) া	a
+	C) াঁ	a~
+
 .group ি
-       ি         i
-       িঁ        i~
-    
+	C) ি	i
+	C) িঁ	i~
+
 .group ী
-       ী         i
-       ীঁ        i~
+	C) ী	i
+	C) ীঁ	i~
 
 .group ূ
-       ূ         u
-       ূঁ        u~
+	C) ূ	u
+	C) ূঁ	u~
 
 .group ু
-       ু         u
-       ুঁ        u~
-     
+	C) ু	u
+	C) ুঁ	u~
+
 .group ৃ
-       ৃ         ri
-       ৃঁ        ri~
+	C) ৃ	r'i
+	C) ৃঁ	r'i~
 
-       
 .group ে
-       ে        e
-       েঁ       e~
-       েউ       ew
-
+	C) ে	e
+	C) েঁ	e~
+	C) েউ	ew
 
 .group ৈ
-       ৈ        oj
-       ৈঁ       o~j
-    
+	C) ৈ	oj
+	C) ৈঁ	o~j
+
 .group ো
-       ো        o
-       োঁ       o~
-  
+	C) ো	o
+	C) োঁ	o~
+
 .group ৌ
-       ৌ        ow
-       ৌঁ       o~w
-  
-        
+	C) ৌ	ow
+	C) ৌঁ	o~w
+
+
+       
 // Consonants
 
 .group ক
         
 .group ঙ
         ঙ        NV
-        ঙ্ (B     N
+        ঙ (B     N
 
 
 .group চ
 
 
 .group ছ
-        ছ        tS#V
-        ছ  (B    tS#
+        ছ        tShV
+        ছ  (B    tSh
 
         
 .group জ
         
 .group ঞ
         ঞ        nV
-        ঞ্ (B     n
+        ঞ (B     n
  
 
 .group ট
         
 .group য়
         য়       jV
-        য় (B    j    
+     _) য় (B    j    
+        য় (B        // used to separate 2 vowels    
 
         
 .group য
         য (B    dZ
         
         য়	jV   // nukta
-        য় (B	j
+     _) য় (B	j
+        য় (B	
 
      ্) য (C    &   //  ব্যস্ত  [bæsto]
      ্) যা      &    // ব্যাকরণ [bækɔron] 
 
 
 .group ঁ
-	ঁ	 O~     // candrabindu, nasalize the previous vowel
+	C) ঁ	 O~     // candrabindu, nasalize the previous vowel/Consonants
 
 .group ং
-       ং        N     //  anusvara/onushshor
-
+       A) ং        N     //  anusvara/onushshor
+       C) ং        N     //  anusvara/onushshor
+   
 .group ঃ              // visarga/bishorgo
         ঃ             // doubles the following consonant
         ঃ (_      H
 
 .group ্		// virama/hoshonto
-	্
+     C) ্
+
 
 .group ়
 	়		// nukta, modifies a consonant

dictsource/en_list

 Capone		ka#poUn
 Carnegie	kA@n@gi
 Cohen		koU@n
+Connolly	$1
 Cthulhu		k@-Tu:l#u:
 Chrysler	kraIsl3
 (da vinci)	da#vIntSi

dictsource/hu_list

 (emelte ki) EmEltE_||ki	$unstressend
 tagságát	$unstressend
 (a szakadékot) A'||sAkAde:kot	$unstressend
-(az országban) Az_'||orsa:gbAn	$unstressend
+(az országban) Az_'||oR2sa:gbAn	$unstressend
 eszközét	$unstressend
 méretű	$unstressend
 ketyeg	$unstressend

dictsource/pt_list

 _¿	,iNtex,ogas,&U~,iNvertS'id&
 
 _"	'abRi;'asp&||d'upl&s#
-_º	o*@-dZin'almaskul'i~nU
-_ª	o*@-dZin'alfemin'i~nU
+?1   _º	O*@-din'almaskul'i~nU
+?2   _º	o*@-dZin'almaskul'i~nU
+?1   _ª	O*@-din'alfemin'i~nU
+?2   _ª	o*@-dZin'alfemin'i~nU
 °	gR'aU
 
 
 // articles
 o	$u+	$nounf
 a	$u+	$nounf
-os	$u+	$nounf
+os	Us	$u+	$nounf
 as	$u+	$nounf
 ?1 a    & $u+   $nounf
 
 te	$u	$verbf
 nos	$u	$nounf
 la	$u
-lo	$u
+lo	lU	$u
 las	$u
 los	$u
 se	$u
 desse	$u+	$nounf
 desta	$nounf
 nesse	n'esy	$u+ $nounf
-aquele	&k'ely	$u+	$nounf       // that
 aquela	$u+ $nounf
-daquele	d&k'ely	$u+	$nounf
+aquele	$alt2 $nounf
 daquela $u+ $nounf
-
+daquele	$alt2 $nounf
 	que	$u      // pronunciation is in pt_rules
 
 // possessive adjectives
 
 // prepositions
 de	$u	$nounf // of,from
-do	$u	$nounf
+do	du	$u	$nounf
 da	$u	$nounf
 dos	$u	$nounf
 das	$u	$nounf
 dumas	$u	$nounf
 
 em	$u	$noun  // in,on,at
-no	nu $u	$nounf
+no	nU	$u	$nounf
 na	$u	$nounf
 num	$u	$nounf
 numa	$u	$nounf
 às	,a:s	$nounf
 
 para	$u		// for,to
-pro	$u	$nounf
+pro	pRU	$u	$nounf
 pra	$u	$nounf
-pros	$u	$nounf
+pros	pRUs	$u	$nounf
 pras	$u	$nounf
 prò	$u	$nounf
 prà	$u	$nounf
 camelha		$alt
 camelo		$alt2
 camiseta	$alt2
+canhoto		$alt2
 cantora		$alt2
 capacete	$alt2
 caractere	$alt
 diego		$alt2
 discordo	$alt
 dispneia	dZIspyn'EI&
-dobro		$alt2 $noun
+dobro		$alt2
+dobro		$alt $verb
 doce		$alt2
 doutora		$alt2
 doze		$alt2

dictsource/pt_rules

      t) e (tra     E
 
     âC) e (CA_     e
+   âCC) e (CA_     e
     êC) e (CA_     e
    êCC) e (CA_     e
     ôC) e (CA_     e
   _cel) e (brL04_  E
    _ex) e (crL04_  E
   _enr) e (dL01_   E
+    _n) eu (trL03_ 'eU
     _v) e (dL03_   E
   _arr) e (dL03_   E
  _depr) e (dL03_   E
      _) i (_       i
         i          i
         i (A       j
+        i (a       i
+        i (ã       i
+        i (õ       i
+        i (ú       i
         i (o       i
     Cr) i          i
     Cl) i          i
         o (s_      =U
      _) o (_C      U
      _) o (_A      u
-    _d) o (_C      U
-    _d) o (_A      u
+
         ou         ow
         oi         oI
         oi ($w_alt OI
 ?1   f) o (rmulá   u         // eg: formulário, formulários.
 ?1   v) o (lt      O
 
+        o (Cuem_   o
+        o (CCuem_  o
     êC) o (CA_     o
    êCC) o (CA_     o
     ôC) o (CA_     o
     áC) o (CA_     o
-     C) o (Cá_     o
-     C) o (CCá_    o
-     C) o (CCCá_   o
+
     éC) o (CA_     o
    éCC) o (CA_     o
      í) o (CA_     U
 ?1   _) qua        kwa       // quatro, etc.
 ?1   _) que        ke        // quente, etc.
 ?1   _) quei (C    k'eI      // queira, queima, etc
-     A) quên       kw'eN     // frequência, etc.
-     C) quên       kw'eN     // quinquênio, etc.
+     A) quên       kw'eIN    // frequência, etc.
+     C) quên       kw'eIN    // delinquência, etc.
    ade) qu (e      kw
      A) qu (idade_ kw
     _a) qu (ífero_ kw
         u (A       w
         u (_A      w
      r) u (A       u
+        u (a       u
+     g) u (a+      w
+     q) u (a+      w
      r) u (_A      u
-        u (A_      'u
+        u (L04_    'u
 
-        u (am_     'u
-        u (em_     'u
         ui         uI
         ui (_      'uI
         u (iu      w

phsource/ph_bengali

       ChangePhoneme(o)
     ENDIF
     
-    IF prevPhW(r) THEN
-      ChangePhoneme(o)
+    IF prevPhW(r) AND nextVowel(isVowel) THEN
+      IF nextVowel(isWordEnd) AND nextVowel(V) THEN
+      ELSE
+        ChangePhoneme(o)
+      ENDIF
     ENDIF  
   ENDIF
 

phsource/ph_portugal

 phoneme U
   vowel starttype #u endtype #u
   length 130
-  IF nextPh(isVowel) THEN
+  IF thisPh(isWordEnd) AND thisPh(isAfterStress) AND nextPh(isVowel) THEN
     ChangePhoneme(w)
   ENDIF
   FMT(vowel/u_6)

phsource/ph_pt_brazil

 phoneme U
   vowel starttype #u endtype #u
   length 140
-  IF thisPh(isWordEnd) AND nextPh(isVowel) THEN
+  IF thisPh(isWordEnd) AND thisPh(isAfterStress) AND nextPh(isVowel) THEN
     ChangePhoneme(w)
   ENDIF
   FMT(vowel/uu_bck)