Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	dictsource/pt_list
	dictsource/pt_rules
	phsource/compile_report
	phsource/vowel/uu#_2
	src/synthdata.cpp
	src/translate.h

phsource/ph_english_rp

@@ -193,7 +193,7 @@ endphoneme
 phoneme u:
   vowel  starttype #u  endtype #u
   length 190
-  FMT(vowel/u_6)
+  FMT(vowel/uu#_2)
 endphoneme
 
 

phsource/ph_pt_brazil

@@ -189,8 +189,12 @@ endphoneme
 phoneme x   // this is [R] from Slovak/Czech
   liquid
   trill
-  ipa r
+  ipa ʁ
   lengthmod 6
+  IF thisPh(isWordStart) THEN
+    ChangePhoneme(h)  // Change by Cleverson 22.09.2012
+  ENDIF
+
   Vowelin  f1=0  f2=1700 -300 300  f3=-300 80
   Vowelout f1=2  f2=1700 -300 300  f3=-300 80 brk
   FMT(r3/r_trill) addWav(r3/r_trill.wav, 50)

phsource/phonemes

@@ -1927,3 +1927,7 @@ include ph_tatar
 phonemetable ko base
 include ph_korean
 
+phonemetable kl base
+include ph_greenlandic
+
+