Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report

phsource/ph_english_us

@@ -130,7 +130,6 @@ phoneme 0
   ChangeIfDiminished(@)
   IF nextPh(r) THEN
     ChangePhoneme(O:)
-//    FMT(vwl_en_us/oor)
   ENDIF
   FMT(vowel/aa_8)
 endphoneme
@@ -366,7 +365,8 @@ phoneme t
   voicingswitch d
   lengthmod 2
 
-  IF prevPhW(isVowel) OR prevPhW(n) THEN
+//  IF prevPhW(isVowel) OR prevPhW(n) THEN
+  IF prevPhW(isVowel) THEN   // test, don't reduce [t] after [n]
     IF nextPhW(isVowel) AND nextPh(isUnstressed) THEN
       IF next2Ph(n) AND next2Ph(notWordStart) THEN
       ELSE

phsource/ph_georgian

@@ -113,10 +113,22 @@ phoneme k
   import_phoneme consonants/k-
 endphoneme
 
+phoneme q
+  vls uvl stop
+  lengthmod 2
+  Vowelin f1=1  f2=1700 0 200  f3=-300 80 gpaus f4 rms=30
+  Vowelout f1=1 f2=1700 -100 200  f3=-300 80  f4 rms=35
+
+  IF nextPh(#i) THEN
+    WAV(ustop/q2_i, 40)
+  ENDIF
+  WAV(ustop/q2, 48)
+endphoneme
+
 
 
 phoneme Q
-  import_phoneme base/Q"
+  import_phoneme base/r"
 endphoneme
 
 phoneme r

phsource/phonemes

@@ -1727,6 +1727,9 @@ include ph_kannada
 phonemetable ml hi
 include ph_malayalam
 
+phonemetable ur hi
+include ph_urdu
+
 
 phonemetable hu base
 include ph_hungarian