Merge branch 'upstream' into development

Conflicts:
	dictsource/dict_phonemes
	phsource/compile_report
	phsource/ph_greenlandic

phsource/mbrola/de2

@@ -37,7 +37,8 @@
 0  V# NULL   0  R
 0  UR NULL   60 U R
 
-0  eI NULL   60  E j
+0  eI VWL    60  E j
+0  eI NULL   0  e:
 0  oU NULL   0  o:
 0  W~ NULL   0  E~
 0  A~ NULL   0  a~
@@ -49,7 +50,7 @@
 0  @5  NULL  0  @
 0  a#  NULL  0  @
 0  I2  NULL  0  I
-0  i   NULL  0  I
+0  i   NULL  0  i:
 0  aa  NULL  0  a
 0  V   NULL  0  a:
 0  0   NULL  0  O

phsource/mbrola/de4

@@ -59,7 +59,7 @@
 0  @5  NULL  0  @
 0  a#  NULL  0  @
 0  I2  NULL  0  I
-0  i   NULL  0  I
+0  i   NULL  0  i:
 0  aa  NULL  0  a
 0  V   NULL  0  a:
 0  0   NULL  0  O

phsource/mbrola/de6

@@ -41,7 +41,7 @@
 0  @5  NULL  0  @
 0  a#  NULL  0  @
 0  I2  NULL  0  I
-0  i   NULL  0  I
+0  i   NULL  0  i:
 0  aa  NULL  0  a
 0  V   NULL  0  a:
 0  0   NULL  0  a:

phsource/ph_greenlandic

@@ -8,7 +8,7 @@ phoneme a
   FMT(vowel/a)
 endphoneme
 
-phoneme e
+phoneme E
   vowel starttype #e endtype #e
   length 150
   IF thisPh(isWordEnd) THEN
@@ -42,16 +42,32 @@ phoneme aI
 endphoneme
 
 
+phoneme e
+  import_phoneme da/e
+endphoneme
+
 phoneme &
   import_phoneme da/&
 endphoneme
 
+phoneme V
+  import_phoneme da/V
+endphoneme
+
+phoneme O
+  import_phoneme da/O
+endphoneme
+
+phoneme y
+  import_phoneme da/y
+endphoneme
+
 phoneme W
   import_phoneme da/W
 endphoneme
 
-phoneme O
-  import_phoneme da/O
+phoneme 3
+  import_phoneme da/3
 endphoneme
 
 phoneme : //  lengthen previous vowel by "length"