summaryrefslogtreecommitdiff
path: root/navit/support/espeak/espeak-data/voices
diff options
context:
space:
mode:
Diffstat (limited to 'navit/support/espeak/espeak-data/voices')
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/f18
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/f21
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/!v/f30
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/!v/f40
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/f523
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/fast11
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/klatt4
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/klatt24
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/klatt34
-rw-r--r--navit/support/espeak/espeak-data/voices/!v/klatt44
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/m119
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/!v/m20
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/!v/m31
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/!v/m40
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/m735
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/!v/whisperf24
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/fa3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/fa-pin6
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/hi3
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/asia/hy (renamed from navit/support/espeak/espeak-data/voices/hy)0
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/asia/hy-west (renamed from navit/support/espeak/espeak-data/voices/hy-west)13
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/id (renamed from navit/support/espeak/espeak-data/voices/id)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/ka2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/kn5
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/ku (renamed from navit/support/espeak/espeak-data/voices/ku)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/ml6
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/ms17
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/ne5
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/pa2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/ta (renamed from navit/support/espeak/espeak-data/voices/ta)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/tr (renamed from navit/support/espeak/espeak-data/voices/tr)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/vi (renamed from navit/support/espeak/espeak-data/voices/vi)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/vi-hue12
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/vi-sgn12
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/asia/zh (renamed from navit/support/espeak/espeak-data/voices/zh)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/asia/zh-yue (renamed from navit/support/espeak/espeak-data/voices/zh-yue)3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/da3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/en (renamed from navit/support/espeak/espeak-data/voices/en/en)6
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/en-us (renamed from navit/support/espeak/espeak-data/voices/en/en-us)10
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/es-la7
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/an3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/bg5
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/bs (renamed from navit/support/espeak/espeak-data/voices/bs)0
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/europe/ca (renamed from navit/support/espeak/espeak-data/voices/ca)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/cs (renamed from navit/support/espeak/espeak-data/voices/cs)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/cy (renamed from navit/support/espeak/espeak-data/voices/cy)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/da7
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/el (renamed from navit/support/espeak/espeak-data/voices/el)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/es (renamed from navit/support/espeak/espeak-data/voices/es)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/et3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/fi (renamed from navit/support/espeak/espeak-data/voices/fi)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/fr-be9
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/ga4
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/hr (renamed from navit/support/espeak/espeak-data/voices/hr)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/hu (renamed from navit/support/espeak/espeak-data/voices/hu)4
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/is (renamed from navit/support/espeak/espeak-data/voices/is)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/it (renamed from navit/support/espeak/espeak-data/voices/it)4
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/lt5
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/lv (renamed from navit/support/espeak/espeak-data/voices/lv)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/mk (renamed from navit/support/espeak/espeak-data/voices/mk)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/nl (renamed from navit/support/espeak/espeak-data/voices/nl)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/no (renamed from navit/support/espeak/espeak-data/voices/no)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/pl (renamed from navit/support/espeak/espeak-data/voices/pl)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/pt-pt (renamed from navit/support/espeak/espeak-data/voices/pt-pt)3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/ro (renamed from navit/support/espeak/espeak-data/voices/ro)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/ru (renamed from navit/support/espeak/espeak-data/voices/ru)3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/sk (renamed from navit/support/espeak/espeak-data/voices/sk)0
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/europe/sq (renamed from navit/support/espeak/espeak-data/voices/sq)0
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/europe/sr (renamed from navit/support/espeak/espeak-data/voices/sr)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/europe/sv (renamed from navit/support/espeak/espeak-data/voices/sv)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/fr6
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/fr-be7
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/hi9
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-br12
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/mb/mb-br33
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/mb/mb-br42
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-cr11
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-de21
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-de38
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-de42
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-de4-en2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-de5-en2
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/mb/mb-de60
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/mb/mb-de6-grc0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-de71
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-ee18
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-en11
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-es11
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/mb/mb-es22
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-fr12
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-fr1-en1
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-fr41
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-fr4-en1
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-gr21
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-gr2-en3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-hu11
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-hu1-en1
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-ic17
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-id11
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-ir122
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-ir222
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-it31
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-it41
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-mx110
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-mx210
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-nl22
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-nl2-en2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-pl11
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/mb/mb-pt13
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-sw12
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-sw1-en2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-sw22
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-sw2-en4
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-tr17
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-tr210
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-us12
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-us23
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-us33
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/mb/mb-vz111
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/af (renamed from navit/support/espeak/espeak-data/voices/af)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/en-n (renamed from navit/support/espeak/espeak-data/voices/en/en-n)9
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/en-rp (renamed from navit/support/espeak/espeak-data/voices/en/en-rp)7
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/en-sc (renamed from navit/support/espeak/espeak-data/voices/en/en-sc)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/en-wi (renamed from navit/support/espeak/espeak-data/voices/en/en-wi)7
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/en-wm (renamed from navit/support/espeak/espeak-data/voices/en/en-wm)4
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/eo (renamed from navit/support/espeak/espeak-data/voices/eo)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/grc (renamed from navit/support/espeak/espeak-data/voices/test/grc)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/jbo4
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/other/la (renamed from navit/support/espeak/espeak-data/voices/la)0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/lfn6
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/other/sw (renamed from navit/support/espeak/espeak-data/voices/sw)2
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/pt3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/am3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/as4
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/az3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/bn3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/eu3
-rw-r--r--navit/support/espeak/espeak-data/voices/test/gd3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/gu3
-rw-r--r--navit/support/espeak/espeak-data/voices/test/jbo3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/kl3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/ko6
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/nci7
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/or2
-rwxr-xr-x[-rw-r--r--]navit/support/espeak/espeak-data/voices/test/pap0
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/si4
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/sl3
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/te5
-rwxr-xr-xnavit/support/espeak/espeak-data/voices/test/ur5
149 files changed, 506 insertions, 118 deletions
diff --git a/navit/support/espeak/espeak-data/voices/!v/f1 b/navit/support/espeak/espeak-data/voices/!v/f1
index 13664a34f..8f03a73a4 100755
--- a/navit/support/espeak/espeak-data/voices/!v/f1
+++ b/navit/support/espeak/espeak-data/voices/!v/f1
@@ -1,9 +1,9 @@
language variant
name female1
-gender female
+gender female 70
-pitch 145 200
-flutter 7
+pitch 140 200
+flutter 8
roughness 4
formant 0 115 80 150
formant 1 120 80 180
@@ -15,4 +15,4 @@ formant 6 105 80 150
formant 7 110 70 150
formant 8 110 70 150
-stressAdd -10 -10 -20 -20 0 0 40 70
+stressAdd -10 -10 -20 -20 0 0 40 60
diff --git a/navit/support/espeak/espeak-data/voices/!v/f2 b/navit/support/espeak/espeak-data/voices/!v/f2
index e92946707..4122d96b3 100755
--- a/navit/support/espeak/espeak-data/voices/!v/f2
+++ b/navit/support/espeak/espeak-data/voices/!v/f2
@@ -18,3 +18,4 @@ formant 8 110 70 150
stressAdd 0 0 -10 -10 0 0 10 40
breath 0 2 3 3 3 3 3 2
echo 140 10
+consonants 125 125
diff --git a/navit/support/espeak/espeak-data/voices/!v/f3 b/navit/support/espeak/espeak-data/voices/!v/f3
index 92a158281..92a158281 100644..100755
--- a/navit/support/espeak/espeak-data/voices/!v/f3
+++ b/navit/support/espeak/espeak-data/voices/!v/f3
diff --git a/navit/support/espeak/espeak-data/voices/!v/f4 b/navit/support/espeak/espeak-data/voices/!v/f4
index 52c5ac935..52c5ac935 100644..100755
--- a/navit/support/espeak/espeak-data/voices/!v/f4
+++ b/navit/support/espeak/espeak-data/voices/!v/f4
diff --git a/navit/support/espeak/espeak-data/voices/!v/f5 b/navit/support/espeak/espeak-data/voices/!v/f5
new file mode 100755
index 000000000..f43b093ec
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/!v/f5
@@ -0,0 +1,23 @@
+language variant
+name female5
+gender female
+
+pitch 160 228
+roughness 0
+
+formant 0 105 80 150
+formant 1 110 80 160
+formant 2 110 70 150
+formant 3 110 70 150
+formant 4 115 80 200
+formant 5 115 80 100
+formant 6 110 70 150
+formant 7 110 70 100
+formant 8 110 70 150
+
+stressAdd 0 0 -10 -10 0 0 10 40
+breath 0 4 6 6 6 6 0 10
+echo 140 10
+voicing 75
+consonants 150 150
+breathw 150 150 200 200 400 400
diff --git a/navit/support/espeak/espeak-data/voices/!v/fast b/navit/support/espeak/espeak-data/voices/!v/fast
deleted file mode 100755
index 30441d7e2..000000000
--- a/navit/support/espeak/espeak-data/voices/!v/fast
+++ /dev/null
@@ -1,11 +0,0 @@
-language variant
-name fast_test
-
-// Try decreasing these values to make eSpeak's fastest speed faster.
-// The 3 parameters affect:
-// pauses,
-// unvoiced consonants,
-// vowels and voiced consonants
-// The default values are: fast 15 72 110
-
-fast_test 15 72 110
diff --git a/navit/support/espeak/espeak-data/voices/!v/klatt b/navit/support/espeak/espeak-data/voices/!v/klatt
new file mode 100755
index 000000000..b739a86e4
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/!v/klatt
@@ -0,0 +1,4 @@
+language variant
+name klatt
+klatt 1
+
diff --git a/navit/support/espeak/espeak-data/voices/!v/klatt2 b/navit/support/espeak/espeak-data/voices/!v/klatt2
new file mode 100755
index 000000000..01477be54
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/!v/klatt2
@@ -0,0 +1,4 @@
+language variant
+name klatt2
+klatt 2
+
diff --git a/navit/support/espeak/espeak-data/voices/!v/klatt3 b/navit/support/espeak/espeak-data/voices/!v/klatt3
new file mode 100755
index 000000000..b1a874be6
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/!v/klatt3
@@ -0,0 +1,4 @@
+language variant
+name klatt3
+klatt 3
+
diff --git a/navit/support/espeak/espeak-data/voices/!v/klatt4 b/navit/support/espeak/espeak-data/voices/!v/klatt4
new file mode 100644
index 000000000..65278087c
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/!v/klatt4
@@ -0,0 +1,4 @@
+language variant
+name klatt4
+klatt 4
+
diff --git a/navit/support/espeak/espeak-data/voices/!v/m1 b/navit/support/espeak/espeak-data/voices/!v/m1
index 57603a885..4cc9a00bf 100755
--- a/navit/support/espeak/espeak-data/voices/!v/m1
+++ b/navit/support/espeak/espeak-data/voices/!v/m1
@@ -2,18 +2,19 @@ language variant
name male1
gender male 70
-pitch 74 109
-flutter 4
+pitch 75 109
+flutter 5
roughness 4
+consonants 80 100
-formant 0 98 95 100
-formant 1 97 95 100
+formant 0 98 100 100
+formant 1 97 100 100
formant 2 97 95 100
-formant 3 97 100 100
-formant 4 97 100 100
-formant 5 105 100 100
-formant 6 95 100 100
+formant 3 97 95 100
+formant 4 97 85 100
+formant 5 105 80 100
+formant 6 95 80 100
formant 7 100 100 100
formant 8 100 100 100
-stressAdd -10 -10 -20 -20 0 0 40 70
+//stressAdd -10 -10 -20 -20 0 0 40 70
diff --git a/navit/support/espeak/espeak-data/voices/!v/m2 b/navit/support/espeak/espeak-data/voices/!v/m2
index c234f4687..c234f4687 100644..100755
--- a/navit/support/espeak/espeak-data/voices/!v/m2
+++ b/navit/support/espeak/espeak-data/voices/!v/m2
diff --git a/navit/support/espeak/espeak-data/voices/!v/m3 b/navit/support/espeak/espeak-data/voices/!v/m3
index 581cd883f..00479dc35 100644..100755
--- a/navit/support/espeak/espeak-data/voices/!v/m3
+++ b/navit/support/espeak/espeak-data/voices/!v/m3
@@ -13,4 +13,5 @@ formant 6 100 100 100
formant 7 100 100 100
formant 8 100 100 100
+consonants 100
stressAdd 10 10 0 0 0 0 -30 -30
diff --git a/navit/support/espeak/espeak-data/voices/!v/m4 b/navit/support/espeak/espeak-data/voices/!v/m4
index 7199341c3..7199341c3 100644..100755
--- a/navit/support/espeak/espeak-data/voices/!v/m4
+++ b/navit/support/espeak/espeak-data/voices/!v/m4
diff --git a/navit/support/espeak/espeak-data/voices/!v/m7 b/navit/support/espeak/espeak-data/voices/!v/m7
index 9a8370622..11b49ed2a 100755
--- a/navit/support/espeak/espeak-data/voices/!v/m7
+++ b/navit/support/espeak/espeak-data/voices/!v/m7
@@ -1,18 +1,17 @@
-language variant
-gender male 35
-name male5
-
-formant 0 120 150 220
-
-formant 1 100 100 100
-formant 2 100 100 100
-formant 3 100 100 100
-
-formant 4 100 80 100
-formant 5 100 100 100
-
-formant 6 80 200 80
-formant 7 80 200 100
-
-pitch 80 118
-tone 600 150 255 50 100 100
+language variant
+name male7
+gender male
+
+pitch 75 125
+
+formant 0 100 125 100
+formant 1 100 90 80
+formant 2 100 70 90
+formant 3 100 60 90
+formant 4 100 60 90
+formant 5 75 50 90
+formant 6 90 50 100
+formant 7 100 50 100
+formant 8 100 50 100
+voicing 155
+
diff --git a/navit/support/espeak/espeak-data/voices/!v/whisperf b/navit/support/espeak/espeak-data/voices/!v/whisperf
new file mode 100755
index 000000000..f239e8a29
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/!v/whisperf
@@ -0,0 +1,24 @@
+language variant
+name female_whisper
+gender female
+
+pitch 160 220
+roughness 3
+
+formant 0 105 0 150
+formant 1 110 40 160
+formant 2 110 70 150
+formant 3 110 70 150
+formant 4 115 80 150
+formant 5 115 80 150
+formant 6 110 70 150
+formant 7 110 70 150
+formant 8 110 70 150
+
+stressAdd 0 0 -10 -10 0 0 10 40
+
+// whisper
+voicing 20
+breath 75 75 50 40 15 10
+breathw 150 150 200 200 400 400
+
diff --git a/navit/support/espeak/espeak-data/voices/asia/fa b/navit/support/espeak/espeak-data/voices/asia/fa
new file mode 100755
index 000000000..60ee250e8
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/fa
@@ -0,0 +1,3 @@
+name persian
+language fa
+
diff --git a/navit/support/espeak/espeak-data/voices/asia/fa-pin b/navit/support/espeak/espeak-data/voices/asia/fa-pin
new file mode 100755
index 000000000..f3adbfca4
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/fa-pin
@@ -0,0 +1,6 @@
+name persian-pinglish
+// Sometimes, Farsi speakers write Farsi words using English characters, particularly in Chat and SMS (texte messages).), called Pinglish
+language fa-pin
+dictrules 1
+phonemes fa
+
diff --git a/navit/support/espeak/espeak-data/voices/asia/hi b/navit/support/espeak/espeak-data/voices/asia/hi
new file mode 100755
index 000000000..2d41b07b3
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/hi
@@ -0,0 +1,3 @@
+name hindi
+language hi
+gender male
diff --git a/navit/support/espeak/espeak-data/voices/hy b/navit/support/espeak/espeak-data/voices/asia/hy
index 6c65e3c68..6c65e3c68 100644..100755
--- a/navit/support/espeak/espeak-data/voices/hy
+++ b/navit/support/espeak/espeak-data/voices/asia/hy
diff --git a/navit/support/espeak/espeak-data/voices/hy-west b/navit/support/espeak/espeak-data/voices/asia/hy-west
index 46317618d..85b3f75b6 100644..100755
--- a/navit/support/espeak/espeak-data/voices/hy-west
+++ b/navit/support/espeak/espeak-data/voices/asia/hy-west
@@ -1,19 +1,22 @@
name armenian-west
-language hy
+language hy-west
+language hy 8
gender male
+dictrules 1
+
// change consonants for West Armenian pronunciation
replace 00 b p#
replace 00 d t#
replace 00 dz ts#
-replace 00 dZ tS
+replace 00 dZ tS#
replace 00 g k#
replace 00 p b
replace 00 t d
replace 00 ts dz
-replace 00 c dZ
+replace 00 tS dZ
replace 00 k g
-replace 00 ** R // ??
-replace 00 r R
+replace 00 R2 R // ??
+
diff --git a/navit/support/espeak/espeak-data/voices/id b/navit/support/espeak/espeak-data/voices/asia/id
index ce800f70b..f35b116af 100755
--- a/navit/support/espeak/espeak-data/voices/id
+++ b/navit/support/espeak/espeak-data/voices/asia/id
@@ -1,4 +1,4 @@
-name indonesian-test
+name indonesian
language id
gender male
diff --git a/navit/support/espeak/espeak-data/voices/asia/ka b/navit/support/espeak/espeak-data/voices/asia/ka
new file mode 100755
index 000000000..6f748b7f6
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/ka
@@ -0,0 +1,2 @@
+name georgian
+language ka
diff --git a/navit/support/espeak/espeak-data/voices/asia/kn b/navit/support/espeak/espeak-data/voices/asia/kn
new file mode 100755
index 000000000..ced1b1fa9
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/kn
@@ -0,0 +1,5 @@
+name kannada
+language kn
+
+intonation 2
+//consonants 80
diff --git a/navit/support/espeak/espeak-data/voices/ku b/navit/support/espeak/espeak-data/voices/asia/ku
index 536957cb8..536957cb8 100755
--- a/navit/support/espeak/espeak-data/voices/ku
+++ b/navit/support/espeak/espeak-data/voices/asia/ku
diff --git a/navit/support/espeak/espeak-data/voices/asia/ml b/navit/support/espeak/espeak-data/voices/asia/ml
new file mode 100755
index 000000000..45bdf8528
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/ml
@@ -0,0 +1,6 @@
+name malayalam
+language ml
+gender male
+
+intonation 2
+//consonants 80
diff --git a/navit/support/espeak/espeak-data/voices/asia/ms b/navit/support/espeak/espeak-data/voices/asia/ms
new file mode 100755
index 000000000..90a38a37c
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/ms
@@ -0,0 +1,17 @@
+// Last updated: 14 October 2010, Jason Ong (jason@portalgroove.com)
+name malay
+language ms
+gender male
+phonemes id
+
+translator id
+
+stressLength 160 200 180 180 0 0 220 240
+stressAmp 16 18 18 18 0 0 22 21
+intonation 3 // Less intonation, and comma does not raise the pitch.
+
+// Nuance - Peninsula Malaysia
+// replace 3 a @ // change 'saya' to 'saye'
+ // (only the last phoneme of a word, only in unstressed syllables)
+
+consonants 80 80
diff --git a/navit/support/espeak/espeak-data/voices/asia/ne b/navit/support/espeak/espeak-data/voices/asia/ne
new file mode 100755
index 000000000..fc8295329
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/ne
@@ -0,0 +1,5 @@
+name nepali
+language ne
+gender male
+
+dictrules 1
diff --git a/navit/support/espeak/espeak-data/voices/asia/pa b/navit/support/espeak/espeak-data/voices/asia/pa
new file mode 100755
index 000000000..4cd585d1d
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/pa
@@ -0,0 +1,2 @@
+name punjabi
+language pa
diff --git a/navit/support/espeak/espeak-data/voices/ta b/navit/support/espeak/espeak-data/voices/asia/ta
index 8848d6820..8848d6820 100755
--- a/navit/support/espeak/espeak-data/voices/ta
+++ b/navit/support/espeak/espeak-data/voices/asia/ta
diff --git a/navit/support/espeak/espeak-data/voices/tr b/navit/support/espeak/espeak-data/voices/asia/tr
index 4f1904e51..4f1904e51 100755
--- a/navit/support/espeak/espeak-data/voices/tr
+++ b/navit/support/espeak/espeak-data/voices/asia/tr
diff --git a/navit/support/espeak/espeak-data/voices/vi b/navit/support/espeak/espeak-data/voices/asia/vi
index 1596e3c77..dbd23b566 100755
--- a/navit/support/espeak/espeak-data/voices/vi
+++ b/navit/support/espeak/espeak-data/voices/asia/vi
@@ -1,4 +1,4 @@
-name vietnam-test
+name vietnam
language vi
gender male
diff --git a/navit/support/espeak/espeak-data/voices/asia/vi-hue b/navit/support/espeak/espeak-data/voices/asia/vi-hue
new file mode 100755
index 000000000..83849f897
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/vi-hue
@@ -0,0 +1,12 @@
+name vietnam_hue
+language vi-hue
+phonemes vi-hue
+dictrules 1
+gender male
+
+words 1
+pitch 82 118 //80 118
+//breath 75 75 60 40 15 10
+ //breathw 150 150 200 200 400 400
+ voicing 90 //18
+ flutter 20
diff --git a/navit/support/espeak/espeak-data/voices/asia/vi-sgn b/navit/support/espeak/espeak-data/voices/asia/vi-sgn
new file mode 100755
index 000000000..07c4a12e2
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/asia/vi-sgn
@@ -0,0 +1,12 @@
+name vietnam_sgn
+language vi-sgn
+phonemes vi-sgn
+dictrules 2
+gender male
+
+words 1
+pitch 82 118 //80 118
+//breath 75 75 60 40 15 10
+ //breathw 150 150 200 200 400 400
+ voicing 90 //18
+ flutter 20
diff --git a/navit/support/espeak/espeak-data/voices/zh b/navit/support/espeak/espeak-data/voices/asia/zh
index 03edde41d..559a64030 100644..100755
--- a/navit/support/espeak/espeak-data/voices/zh
+++ b/navit/support/espeak/espeak-data/voices/asia/zh
@@ -4,6 +4,8 @@ gender male
words 1
pitch 80 118
+dict_min 100000
+
//for some dialects
//[en]: replace ng with n
diff --git a/navit/support/espeak/espeak-data/voices/zh-yue b/navit/support/espeak/espeak-data/voices/asia/zh-yue
index ba8723264..8e2b8a7ed 100755
--- a/navit/support/espeak/espeak-data/voices/zh-yue
+++ b/navit/support/espeak/espeak-data/voices/asia/zh-yue
@@ -1,4 +1,4 @@
-name cantonese-test
+name cantonese
language zh-yue
language yue
language zhy
@@ -12,3 +12,4 @@ gender male
dictrules 1
words 1
+dict_min 10000
diff --git a/navit/support/espeak/espeak-data/voices/da b/navit/support/espeak/espeak-data/voices/da
deleted file mode 100755
index ec9936cc2..000000000
--- a/navit/support/espeak/espeak-data/voices/da
+++ /dev/null
@@ -1,3 +0,0 @@
-name danish-test
-language da
-gender male
diff --git a/navit/support/espeak/espeak-data/voices/en/en b/navit/support/espeak/espeak-data/voices/en
index 43e2ca1fc..84d12dd8c 100755
--- a/navit/support/espeak/espeak-data/voices/en/en
+++ b/navit/support/espeak/espeak-data/voices/en
@@ -1,9 +1,9 @@
name english
+language en-gb 2
language en-uk 2
language en 2
gender male
-//pitch 80 117
+//pitch 80 118
-replace 03 I i
-replace 03 I2 i
+tunes s1 c1 q1 e1
diff --git a/navit/support/espeak/espeak-data/voices/en/en-us b/navit/support/espeak/espeak-data/voices/en-us
index c2656b28c..6846aa8b7 100755
--- a/navit/support/espeak/espeak-data/voices/en/en-us
+++ b/navit/support/espeak/espeak-data/voices/en-us
@@ -5,13 +5,13 @@ language en-r
language en 3
gender male
-phonemes en_us
+phonemes en-us
dictrules 3 6
-option 12 1 // reduce [t]
+option reduce_t 1
-stressLength 145 125 170 170 0 0 265 290
-stressAmp 17 16 20 20 20 22 22 20
+stressLength 140 120 190 170 0 0 255 300
+stressAmp 17 16 19 19 19 19 21 19
replace 03 I i
replace 03 I2 i
-replace 03 @ @/
+
diff --git a/navit/support/espeak/espeak-data/voices/es-la b/navit/support/espeak/espeak-data/voices/es-la
index c326c46f5..4fbacd1bc 100755
--- a/navit/support/espeak/espeak-data/voices/es-la
+++ b/navit/support/espeak/espeak-data/voices/es-la
@@ -1,11 +1,12 @@
-name spanish-latin-american
+name spanish-latin-am
language es-la
language es-mx 6
+language es 6
gender male
-phonemes es_la
+phonemes es-la
dictrules 2
intonation 2
-stressLength 170 200 180 180 0 0 250 280
+stressLength 170 200 230 180 0 0 250 280
replace 00 T s
diff --git a/navit/support/espeak/espeak-data/voices/europe/an b/navit/support/espeak/espeak-data/voices/europe/an
new file mode 100755
index 000000000..7bf245e03
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/europe/an
@@ -0,0 +1,3 @@
+name aragonese
+language an
+gender male
diff --git a/navit/support/espeak/espeak-data/voices/europe/bg b/navit/support/espeak/espeak-data/voices/europe/bg
new file mode 100755
index 000000000..c3842ca78
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/europe/bg
@@ -0,0 +1,5 @@
+name bulgarian
+language bg
+
+stressAmp 13 12 17 17 20 22 22 21
+stressLength 180 170 200 200 200 200 210 220 \ No newline at end of file
diff --git a/navit/support/espeak/espeak-data/voices/bs b/navit/support/espeak/espeak-data/voices/europe/bs
index eadd70732..eadd70732 100755
--- a/navit/support/espeak/espeak-data/voices/bs
+++ b/navit/support/espeak/espeak-data/voices/europe/bs
diff --git a/navit/support/espeak/espeak-data/voices/ca b/navit/support/espeak/espeak-data/voices/europe/ca
index dc51396ce..dc51396ce 100644..100755
--- a/navit/support/espeak/espeak-data/voices/ca
+++ b/navit/support/espeak/espeak-data/voices/europe/ca
diff --git a/navit/support/espeak/espeak-data/voices/cs b/navit/support/espeak/espeak-data/voices/europe/cs
index 1c2992dd5..1c2992dd5 100755
--- a/navit/support/espeak/espeak-data/voices/cs
+++ b/navit/support/espeak/espeak-data/voices/europe/cs
diff --git a/navit/support/espeak/espeak-data/voices/cy b/navit/support/espeak/espeak-data/voices/europe/cy
index 2991e99d1..30abd9432 100755
--- a/navit/support/espeak/espeak-data/voices/cy
+++ b/navit/support/espeak/espeak-data/voices/europe/cy
@@ -1,5 +1,5 @@
language cy
-name welsh-test
+name welsh
gender male
intonation 4
diff --git a/navit/support/espeak/espeak-data/voices/europe/da b/navit/support/espeak/espeak-data/voices/europe/da
new file mode 100755
index 000000000..12ce1096a
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/europe/da
@@ -0,0 +1,7 @@
+name danish
+language da
+gender male
+
+tunes s2 c2 q2 e2
+
+
diff --git a/navit/support/espeak/espeak-data/voices/el b/navit/support/espeak/espeak-data/voices/europe/el
index 1e9a757f8..1e9a757f8 100755
--- a/navit/support/espeak/espeak-data/voices/el
+++ b/navit/support/espeak/espeak-data/voices/europe/el
diff --git a/navit/support/espeak/espeak-data/voices/es b/navit/support/espeak/espeak-data/voices/europe/es
index 1a9e53b6e..43c852c8b 100755
--- a/navit/support/espeak/espeak-data/voices/es
+++ b/navit/support/espeak/espeak-data/voices/europe/es
@@ -3,5 +3,5 @@ language es
gender male
dictrules 1
-intonation 3
+//intonation 3
diff --git a/navit/support/espeak/espeak-data/voices/europe/et b/navit/support/espeak/espeak-data/voices/europe/et
new file mode 100755
index 000000000..6caf78ce0
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/europe/et
@@ -0,0 +1,3 @@
+name estonian
+language et
+
diff --git a/navit/support/espeak/espeak-data/voices/fi b/navit/support/espeak/espeak-data/voices/europe/fi
index 6e11c9312..6e11c9312 100755
--- a/navit/support/espeak/espeak-data/voices/fi
+++ b/navit/support/espeak/espeak-data/voices/europe/fi
diff --git a/navit/support/espeak/espeak-data/voices/europe/fr-be b/navit/support/espeak/espeak-data/voices/europe/fr-be
new file mode 100755
index 000000000..4a7418204
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/europe/fr-be
@@ -0,0 +1,9 @@
+name french-Belgium
+language fr-be
+language fr 8
+gender male
+
+dictrules 2
+tunes s3 c3 q3 e3
+
+
diff --git a/navit/support/espeak/espeak-data/voices/europe/ga b/navit/support/espeak/espeak-data/voices/europe/ga
new file mode 100755
index 000000000..30d32e07e
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/europe/ga
@@ -0,0 +1,4 @@
+name irish-gaeilge
+language ga
+
+dictrules 1 // fix for eclipsis
diff --git a/navit/support/espeak/espeak-data/voices/hr b/navit/support/espeak/espeak-data/voices/europe/hr
index d6811d3ae..d6811d3ae 100755
--- a/navit/support/espeak/espeak-data/voices/hr
+++ b/navit/support/espeak/espeak-data/voices/europe/hr
diff --git a/navit/support/espeak/espeak-data/voices/hu b/navit/support/espeak/espeak-data/voices/europe/hu
index ba2bdde41..25d78c05c 100755
--- a/navit/support/espeak/espeak-data/voices/hu
+++ b/navit/support/espeak/espeak-data/voices/europe/hu
@@ -1,3 +1,7 @@
name hungarian
language hu
gender male
+option bracket 0 0
+pitch 81 117
+
+
diff --git a/navit/support/espeak/espeak-data/voices/is b/navit/support/espeak/espeak-data/voices/europe/is
index 9e9c4e747..b8f238345 100755
--- a/navit/support/espeak/espeak-data/voices/is
+++ b/navit/support/espeak/espeak-data/voices/europe/is
@@ -1,4 +1,4 @@
-name icelandic-test
+name icelandic
language is
gender male
diff --git a/navit/support/espeak/espeak-data/voices/it b/navit/support/espeak/espeak-data/voices/europe/it
index 53c2a7048..cf4966c8d 100755
--- a/navit/support/espeak/espeak-data/voices/it
+++ b/navit/support/espeak/espeak-data/voices/europe/it
@@ -1,6 +1,8 @@
+
name italian
language it
gender male
-replace 03 i I
+tunes s4 c4 q4 e4
+replace 03 i I
diff --git a/navit/support/espeak/espeak-data/voices/europe/lt b/navit/support/espeak/espeak-data/voices/europe/lt
new file mode 100755
index 000000000..8295f6b26
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/europe/lt
@@ -0,0 +1,5 @@
+
+name lithuanian
+language lt
+gender male
+
diff --git a/navit/support/espeak/espeak-data/voices/lv b/navit/support/espeak/espeak-data/voices/europe/lv
index 0278ea213..0278ea213 100755
--- a/navit/support/espeak/espeak-data/voices/lv
+++ b/navit/support/espeak/espeak-data/voices/europe/lv
diff --git a/navit/support/espeak/espeak-data/voices/mk b/navit/support/espeak/espeak-data/voices/europe/mk
index 4607dd079..47a8398c9 100755
--- a/navit/support/espeak/espeak-data/voices/mk
+++ b/navit/support/espeak/espeak-data/voices/europe/mk
@@ -1,4 +1,4 @@
-name macedonian-test
+name macedonian
language mk
gender male
diff --git a/navit/support/espeak/espeak-data/voices/nl b/navit/support/espeak/espeak-data/voices/europe/nl
index 6a8d5efd8..beef33fa3 100755
--- a/navit/support/espeak/espeak-data/voices/nl
+++ b/navit/support/espeak/espeak-data/voices/europe/nl
@@ -1,3 +1,3 @@
language nl
-name dutch-test
+name dutch
gender male
diff --git a/navit/support/espeak/espeak-data/voices/no b/navit/support/espeak/espeak-data/voices/europe/no
index 77b60b963..a90c7b725 100755
--- a/navit/support/espeak/espeak-data/voices/no
+++ b/navit/support/espeak/espeak-data/voices/europe/no
@@ -1,4 +1,4 @@
-name norwegian-test
+name norwegian
language no
language nb
gender male
diff --git a/navit/support/espeak/espeak-data/voices/pl b/navit/support/espeak/espeak-data/voices/europe/pl
index 8fc65d4ba..8fc65d4ba 100755
--- a/navit/support/espeak/espeak-data/voices/pl
+++ b/navit/support/espeak/espeak-data/voices/europe/pl
diff --git a/navit/support/espeak/espeak-data/voices/pt-pt b/navit/support/espeak/espeak-data/voices/europe/pt-pt
index e23915f39..43cb971c4 100755
--- a/navit/support/espeak/espeak-data/voices/pt-pt
+++ b/navit/support/espeak/espeak-data/voices/europe/pt-pt
@@ -1,7 +1,8 @@
name portugal
language pt-pt
+language pt 6
gender male
-phonemes pt_pt
+phonemes pt-pt
dictrules 1
intonation 2
diff --git a/navit/support/espeak/espeak-data/voices/ro b/navit/support/espeak/espeak-data/voices/europe/ro
index d8ecd252c..d8ecd252c 100755
--- a/navit/support/espeak/espeak-data/voices/ro
+++ b/navit/support/espeak/espeak-data/voices/europe/ro
diff --git a/navit/support/espeak/espeak-data/voices/ru b/navit/support/espeak/espeak-data/voices/europe/ru
index 238c69126..4136ab21c 100755
--- a/navit/support/espeak/espeak-data/voices/ru
+++ b/navit/support/espeak/espeak-data/voices/europe/ru
@@ -1,6 +1,7 @@
-name russian_test
+name russian
language ru
gender male
replace 03 a a#
+dict_min 20000
diff --git a/navit/support/espeak/espeak-data/voices/sk b/navit/support/espeak/espeak-data/voices/europe/sk
index 026363f6a..026363f6a 100755
--- a/navit/support/espeak/espeak-data/voices/sk
+++ b/navit/support/espeak/espeak-data/voices/europe/sk
diff --git a/navit/support/espeak/espeak-data/voices/sq b/navit/support/espeak/espeak-data/voices/europe/sq
index d0b729579..d0b729579 100644..100755
--- a/navit/support/espeak/espeak-data/voices/sq
+++ b/navit/support/espeak/espeak-data/voices/europe/sq
diff --git a/navit/support/espeak/espeak-data/voices/sr b/navit/support/espeak/espeak-data/voices/europe/sr
index a7a8223db..a7a8223db 100644..100755
--- a/navit/support/espeak/espeak-data/voices/sr
+++ b/navit/support/espeak/espeak-data/voices/europe/sr
diff --git a/navit/support/espeak/espeak-data/voices/sv b/navit/support/espeak/espeak-data/voices/europe/sv
index df70f4387..df70f4387 100755
--- a/navit/support/espeak/espeak-data/voices/sv
+++ b/navit/support/espeak/espeak-data/voices/europe/sv
diff --git a/navit/support/espeak/espeak-data/voices/fr b/navit/support/espeak/espeak-data/voices/fr
index 973073161..a0b4986ec 100755
--- a/navit/support/espeak/espeak-data/voices/fr
+++ b/navit/support/espeak/espeak-data/voices/fr
@@ -1,7 +1,7 @@
-language fr
name french
+language fr-fr
+language fr
gender male
dictrules 1
-intonation 3
-
+tunes s3 c3 q3 e3
diff --git a/navit/support/espeak/espeak-data/voices/fr-be b/navit/support/espeak/espeak-data/voices/fr-be
deleted file mode 100755
index cba9b2757..000000000
--- a/navit/support/espeak/espeak-data/voices/fr-be
+++ /dev/null
@@ -1,7 +0,0 @@
-language fr-be
-name french (Belgium)
-gender male
-
-dictrules 2
-intonation 3
-
diff --git a/navit/support/espeak/espeak-data/voices/hi b/navit/support/espeak/espeak-data/voices/hi
deleted file mode 100755
index de4786c94..000000000
--- a/navit/support/espeak/espeak-data/voices/hi
+++ /dev/null
@@ -1,9 +0,0 @@
-name hindi-test
-language hi
-gender male
-
-translator hi
-phonemes hi
-dictionary hi
-
-dictrules 1
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-br1 b/navit/support/espeak/espeak-data/voices/mb/mb-br1
index ba7c42cc4..370a5ea13 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-br1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-br1
@@ -1,7 +1,9 @@
language pt 7
name brazil-mbrola-1
gender male
+
pitch 82 117
+voicing 80
dictrules 2 3 4
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-br3 b/navit/support/espeak/espeak-data/voices/mb/mb-br3
index 8479e658e..0cf9daa53 100644..100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-br3
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-br3
@@ -1,9 +1,10 @@
language pt 7
name brazil-mbrola-3
gender male
-pitch 82 117
+pitch 80 120
dictrules 2 3 4
+voicing 120
mbrola br3 ptbr_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-br4 b/navit/support/espeak/espeak-data/voices/mb/mb-br4
index d3d772007..1cc596d85 100644..100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-br4
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-br4
@@ -1,7 +1,9 @@
language pt 7
name brazil-mbrola-4
gender female
+
pitch 140 220
+voicing 80
dictrules 2 3 4
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-cr1 b/navit/support/espeak/espeak-data/voices/mb/mb-cr1
index 9b280bf8b..1f0ab08a0 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-cr1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-cr1
@@ -5,5 +5,6 @@ gender male
dictionary hbs
dictrules 1
+voicing 150
pitch 82 117
mbrola cr1 cr1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-de2 b/navit/support/espeak/espeak-data/voices/mb/mb-de2
index c0a5475ec..39e3c4343 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-de2
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-de2
@@ -1,6 +1,7 @@
name german-mbrola-2
language de 6
gender male
+voicing 80
mbrola de2 de2_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-de3 b/navit/support/espeak/espeak-data/voices/mb/mb-de3
new file mode 100755
index 000000000..d2ff8dd71
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-de3
@@ -0,0 +1,8 @@
+name german-mbrola-3
+language de 6
+gender female
+voicing 80
+pitch 140 220
+
+mbrola de3 de2_phtrans
+
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-de4 b/navit/support/espeak/espeak-data/voices/mb/mb-de4
index 31bd479a3..abd8713da 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-de4
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-de4
@@ -2,5 +2,7 @@ name german-mbrola-4
language de 6
gender male
+voicing 130
+
mbrola de4 de4_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-de4-en b/navit/support/espeak/espeak-data/voices/mb/mb-de4-en
index 8fd4a63a1..5980fbf06 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-de4-en
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-de4-en
@@ -2,5 +2,7 @@ name en-german
language en 9
gender male
+voicing 130
+
mbrola de4 de4_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-de5-en b/navit/support/espeak/espeak-data/voices/mb/mb-de5-en
index e416c6dc5..e30a0257b 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-de5-en
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-de5-en
@@ -1,5 +1,5 @@
name en-german-5
-language en
+language en 9
gender female
pitch 140 220
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-de6 b/navit/support/espeak/espeak-data/voices/mb/mb-de6
index 35a4a3fc5..35a4a3fc5 100644..100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-de6
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-de6
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-de6-grc b/navit/support/espeak/espeak-data/voices/mb/mb-de6-grc
index a6e0f46bb..a6e0f46bb 100644..100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-de6-grc
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-de6-grc
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-de7 b/navit/support/espeak/espeak-data/voices/mb/mb-de7
index aa80edaad..d51583c86 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-de7
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-de7
@@ -2,6 +2,7 @@ name german-mbrola-7
language de 7
gender female
+voicing 150
pitch 140 220
mbrola de7 de6_phtrans 22050
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-ee1 b/navit/support/espeak/espeak-data/voices/mb/mb-ee1
new file mode 100755
index 000000000..4d62a5b17
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-ee1
@@ -0,0 +1,8 @@
+name estonian-mbrola
+language et
+gender male
+
+pitch 75 125
+voicing 80
+mbrola ee1 ee1_phtrans
+
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-en1 b/navit/support/espeak/espeak-data/voices/mb/mb-en1
index fc60f4167..8de8e01ca 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-en1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-en1
@@ -3,5 +3,6 @@ language en-uk 3
language en 2
gender male
+voicing 150
pitch 82 117
mbrola en1 en1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-es1 b/navit/support/espeak/espeak-data/voices/mb/mb-es1
index d59fe7952..d5ffea2d1 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-es1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-es1
@@ -4,4 +4,5 @@ gender male
pitch 82 117
mbrola es1 es_phtrans
+voicing 120
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-es2 b/navit/support/espeak/espeak-data/voices/mb/mb-es2
index 42de58882..d38fa08d8 100644..100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-es2
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-es2
@@ -3,5 +3,5 @@ name spanish-mbrola-2
gender male
pitch 82 117
-mbrola es2 es_phtrans
+mbrola es2 es_phtrans 22050
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-fr1 b/navit/support/espeak/espeak-data/voices/mb/mb-fr1
index 7cbdab338..046515271 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-fr1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-fr1
@@ -5,5 +5,7 @@ gender male
dictrules 1
stressLength 180 180 180 180 0 0 220 220
pitch 82 117
+voicing 70
+
mbrola fr1 fr1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-fr1-en b/navit/support/espeak/espeak-data/voices/mb/mb-fr1-en
index 366653147..47cb1825b 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-fr1-en
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-fr1-en
@@ -4,5 +4,6 @@ gender male
dictrules 1
pitch 82 117
+voicing 70
mbrola fr1 fr1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-fr4 b/navit/support/espeak/espeak-data/voices/mb/mb-fr4
index c276bec0d..8e3c3921a 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-fr4
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-fr4
@@ -4,5 +4,6 @@ gender female
dictrules 1
pitch 140 220
+voicing 90
mbrola fr1 fr1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-fr4-en b/navit/support/espeak/espeak-data/voices/mb/mb-fr4-en
index b8f782946..8126770b4 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-fr4-en
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-fr4-en
@@ -4,5 +4,6 @@ gender female
dictrules 1
pitch 140 220
+voicing 90
mbrola fr1 fr1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-gr2 b/navit/support/espeak/espeak-data/voices/mb/mb-gr2
index 30dea8920..92d2f20fc 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-gr2
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-gr2
@@ -3,4 +3,5 @@ language el 7
gender male
pitch 82 117
+voicing 65
mbrola gr2 gr2_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-gr2-en b/navit/support/espeak/espeak-data/voices/mb/mb-gr2-en
index b48b1788b..c9bd20d1e 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-gr2-en
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-gr2-en
@@ -1,6 +1,7 @@
name en-greek
-language en 7
+language en 9
gender male
pitch 82 117
+voicing 65
mbrola gr2 gr2_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-hu1 b/navit/support/espeak/espeak-data/voices/mb/mb-hu1
index b8519559d..195ea330a 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-hu1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-hu1
@@ -3,4 +3,5 @@ language hu 7
gender female
pitch 140 220
+voicing 160
mbrola hu1 hu1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-hu1-en b/navit/support/espeak/espeak-data/voices/mb/mb-hu1-en
index 73ac62a4a..28ce3754d 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-hu1-en
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-hu1-en
@@ -3,4 +3,5 @@ language en 10
gender female
pitch 140 220
+voicing 160
mbrola hu1 hu1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-ic1 b/navit/support/espeak/espeak-data/voices/mb/mb-ic1
new file mode 100755
index 000000000..b08b53a23
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-ic1
@@ -0,0 +1,7 @@
+name mbrola-icelandic
+language is 6
+gender male
+
+voicing 180
+mbrola ic1 ic1_phtrans
+
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-id1 b/navit/support/espeak/espeak-data/voices/mb/mb-id1
index b86f59306..aa57c3159 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-id1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-id1
@@ -3,5 +3,6 @@ language id 7
gender male
pitch 82 117
+voicing 120
mbrola id1 id1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-ir1 b/navit/support/espeak/espeak-data/voices/mb/mb-ir1
new file mode 100755
index 000000000..c47d2079b
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-ir1
@@ -0,0 +1,22 @@
+name persian-mb-ir1
+language fa
+gender male
+phonemes fa
+mbrola ir1 ir1_phtrans
+
+// "speed 82" adjust default speed of "mb-ir1" with eSpeak "fa".
+speed 82
+// Please don't change this value. It's result of several tests.
+
+// "voicing 125" adjust output volume of "mb-ir1" with eSpeak "fa".
+voicing 125
+// Please don't change this value. It's result of several tests.
+
+// "pitch 82 118" adjust default pitch of "mb-ir1" like other male voices.
+pitch 82 118
+// Please don't change this value. The result male voice is good and natural.
+
+// If you want use Pinglish instead of English for reading, just delete // from start of next line.
+// dictrules 1
+// "dictrules 1" read English text as Pinglish (Persian text that written with English alphabets).
+
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-ir2 b/navit/support/espeak/espeak-data/voices/mb/mb-ir2
new file mode 100755
index 000000000..819bfa566
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-ir2
@@ -0,0 +1,22 @@
+name persian-mb-ir2
+language fa
+gender female
+phonemes fa
+mbrola ir2 ir1_phtrans 22050
+
+// "speed 78" adjust default speed of "mb-ir2" with eSpeak "fa".
+speed 78
+// Please don't change this value. It's result of several tests.
+
+// "voicing 150" adjust output volume of "mb-ir2" with eSpeak "fa".
+voicing 150
+// Please don't change this value. It's result of several tests.
+
+// "pitch 140 220" adjust default pitch of "mb-ir2" like other female voices.
+pitch 140 220
+// Please don't change this value. The result female voice is good and natural.
+
+// If you want use Pinglish instead of English for reading, just delete // from start of next line.
+// dictrules 1
+// "dictrules 1" read English text as Pinglish (Persian text that written with English alphabets).
+
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-it3 b/navit/support/espeak/espeak-data/voices/mb/mb-it3
index 00e88867c..89f7dcd4f 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-it3
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-it3
@@ -3,6 +3,7 @@ language it 7
gender male
pitch 82 117
+voicing 65
mbrola it3 it3_phtrans
replace 03 i I // final unstressed "i"
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-it4 b/navit/support/espeak/espeak-data/voices/mb/mb-it4
index f2130ba4f..cb3a6ffbe 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-it4
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-it4
@@ -3,6 +3,7 @@ language it 7
gender female
pitch 140 220
+voicing 60
mbrola it4 it3_phtrans
replace 03 i I // final unstressed "i"
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-mx1 b/navit/support/espeak/espeak-data/voices/mb/mb-mx1
new file mode 100755
index 000000000..99b723c31
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-mx1
@@ -0,0 +1,10 @@
+language es-mx 7
+language es 8
+name mexican-mbrola-1
+gender male
+pitch 82 117
+
+mbrola mx1 mx1_phtrans
+
+replace 00 T s
+
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-mx2 b/navit/support/espeak/espeak-data/voices/mb/mb-mx2
new file mode 100755
index 000000000..f46f0be1f
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-mx2
@@ -0,0 +1,10 @@
+language es-mx 7
+language es 8
+name mexican-mbrola-2
+gender male
+pitch 82 117
+
+mbrola mx2 mx2_phtrans
+
+replace 00 T s
+
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-nl2 b/navit/support/espeak/espeak-data/voices/mb/mb-nl2
index fc377156b..273f98b61 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-nl2
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-nl2
@@ -3,5 +3,7 @@ name dutch-mbrola-2
gender male
pitch 82 117
+voicing 130
+
mbrola nl2 nl_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-nl2-en b/navit/support/espeak/espeak-data/voices/mb/mb-nl2-en
index 0c2d13a65..ad0ac4063 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-nl2-en
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-nl2-en
@@ -3,5 +3,7 @@ name en-dutch
gender male
pitch 82 117
+voicing 130
+
mbrola nl2 nl_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-pl1 b/navit/support/espeak/espeak-data/voices/mb/mb-pl1
index 4e2b9d23e..cedeb46bb 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-pl1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-pl1
@@ -3,4 +3,5 @@ language pl 7
gender female
pitch 140 220
+voicing 120
mbrola pl1 pl1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-pt1 b/navit/support/espeak/espeak-data/voices/mb/mb-pt1
index ebd92ffb3..a2168959b 100644..100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-pt1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-pt1
@@ -1,9 +1,10 @@
language pt 7
name portugal-mbrola-1
gender female
-pitch 140 220
+pitch 145 240
dictrules 1
+voicing 70
mbrola pt1 pt1_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-sw1 b/navit/support/espeak/espeak-data/voices/mb/mb-sw1
index 4c6239268..57ee32a92 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-sw1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-sw1
@@ -3,5 +3,7 @@ language sv 7
gender male
pitch 82 117
+voicing 120
+
mbrola sw1 sv_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-sw1-en b/navit/support/espeak/espeak-data/voices/mb/mb-sw1-en
index 52692c385..627af2fbb 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-sw1-en
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-sw1-en
@@ -3,5 +3,7 @@ language en 11
gender male
pitch 82 117
+voicing 120
+
mbrola sw1 sv_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-sw2 b/navit/support/espeak/espeak-data/voices/mb/mb-sw2
index c632e263c..55cfa0d74 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-sw2
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-sw2
@@ -3,5 +3,7 @@ language sv 8
gender female
pitch 140 220
+voicing 130
+
mbrola sw2 sv2_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-sw2-en b/navit/support/espeak/espeak-data/voices/mb/mb-sw2-en
index f2033dc11..015cc9c03 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-sw2-en
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-sw2-en
@@ -1,7 +1,9 @@
name en-swedish-f
-language en
+language en 10
gender female
pitch 140 220
+voicing 130
+
mbrola sw2 sv2_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-tr1 b/navit/support/espeak/espeak-data/voices/mb/mb-tr1
new file mode 100755
index 000000000..97a337d34
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-tr1
@@ -0,0 +1,7 @@
+name turkish-mbrola-1
+language tr 7
+gender male
+
+mbrola tr1 tr1_phtrans
+dictrules 1
+
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-tr2 b/navit/support/espeak/espeak-data/voices/mb/mb-tr2
new file mode 100755
index 000000000..1dfbf9532
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-tr2
@@ -0,0 +1,10 @@
+name turkish-mbrola-1
+language tr 7
+gender female
+
+pitch 160 230
+voicing 170
+
+mbrola tr2 tr1_phtrans
+dictrules 1
+
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-us1 b/navit/support/espeak/espeak-data/voices/mb/mb-us1
index c62589be7..3dd75260a 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-us1
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-us1
@@ -3,7 +3,7 @@ language en-us
language en 8
gender female
-phonemes en_us
+phonemes en-us
dictrules 3 6
stressLength 170 135 205 205 0 0 245 275
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-us2 b/navit/support/espeak/espeak-data/voices/mb/mb-us2
index d94fce5a4..de799f065 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-us2
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-us2
@@ -3,10 +3,11 @@ language en-us
language en 7
gender male
-phonemes en_us
+phonemes en-us
dictrules 3 6
stressLength 170 135 205 205 0 0 245 275
pitch 82 117
+voicing 80
mbrola us2 us_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-us3 b/navit/support/espeak/espeak-data/voices/mb/mb-us3
index 645e1b7d0..c538b134f 100755
--- a/navit/support/espeak/espeak-data/voices/mb/mb-us3
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-us3
@@ -3,10 +3,11 @@ language en-us
language en 8
gender male
-phonemes en_us
+phonemes en-us
dictrules 3 6
stressLength 170 135 205 205 0 0 245 275
+voicing 150
pitch 82 117
mbrola us3 us3_phtrans
diff --git a/navit/support/espeak/espeak-data/voices/mb/mb-vz1 b/navit/support/espeak/espeak-data/voices/mb/mb-vz1
new file mode 100755
index 000000000..d64a9e5aa
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/mb/mb-vz1
@@ -0,0 +1,11 @@
+language es-vz 7
+language es 8
+name venezuala-mbrola-1
+gender male
+pitch 82 117
+
+mbrola vz1 vz_phtrans
+
+dictrules 3
+replace 00 T s
+voicing 200
diff --git a/navit/support/espeak/espeak-data/voices/af b/navit/support/espeak/espeak-data/voices/other/af
index bcbb2a005..bcbb2a005 100755
--- a/navit/support/espeak/espeak-data/voices/af
+++ b/navit/support/espeak/espeak-data/voices/other/af
diff --git a/navit/support/espeak/espeak-data/voices/en/en-n b/navit/support/espeak/espeak-data/voices/other/en-n
index 933311dad..755bf5f7d 100755
--- a/navit/support/espeak/espeak-data/voices/en/en-n
+++ b/navit/support/espeak/espeak-data/voices/other/en-n
@@ -1,14 +1,15 @@
-name lancashire
+name english-north
language en-uk-north
language en-uk 3
+language en 5
gender male
-phonemes en_n
+phonemes en-n
stressLength 160 150 180 180 220 220 290 290
replace 00 i@3 i@
replace 03 N n
-//replace 03 I i
-//replace 03 I2 i
+replace 03 i I2
+
diff --git a/navit/support/espeak/espeak-data/voices/en/en-rp b/navit/support/espeak/espeak-data/voices/other/en-rp
index 3489f28ad..abc1dbcbf 100755
--- a/navit/support/espeak/espeak-data/voices/en/en-rp
+++ b/navit/support/espeak/espeak-data/voices/other/en-rp
@@ -1,12 +1,13 @@
name english_rp
language en-uk-rp
language en-uk 4
+language en 5
gender male
-phonemes en_rp
+phonemes en-rp
replace 00 o@ O@
replace 00 i@3 i@
replace 03 I i
replace 03 I2 i
-replace 03 @ a2
-replace 03 3 a2
+replace 03 @ a#
+replace 03 3 a#
diff --git a/navit/support/espeak/espeak-data/voices/en/en-sc b/navit/support/espeak/espeak-data/voices/other/en-sc
index e16ae25a8..e0783ec3b 100755
--- a/navit/support/espeak/espeak-data/voices/en/en-sc
+++ b/navit/support/espeak/espeak-data/voices/other/en-sc
@@ -3,7 +3,7 @@ language en-sc
language en 4
gender male
-phonemes en_sc
+phonemes en-sc
dictrules 5 6 7
stressLength 180 130 200 200 0 0 250 270
diff --git a/navit/support/espeak/espeak-data/voices/en/en-wi b/navit/support/espeak/espeak-data/voices/other/en-wi
index 28a42a563..302538de6 100755
--- a/navit/support/espeak/espeak-data/voices/en/en-wi
+++ b/navit/support/espeak/espeak-data/voices/other/en-wi
@@ -1,9 +1,10 @@
name en-westindies
language en-wi
language en-uk 4
+language en 10
gender male
-phonemes en_wi
+phonemes en-wi
dictrules 8
stressLength 175 175 175 175 220 220 250 290
@@ -11,8 +12,8 @@ replace 00 D d
replace 00 T t[
replace 00 U@ o@
replace 00 i@3 i@
-replace 03 @ a2
-replace 03 3 a2
+replace 03 @ a#
+replace 03 3 a#
replace 03 N n
formant 1 98 100 100
diff --git a/navit/support/espeak/espeak-data/voices/en/en-wm b/navit/support/espeak/espeak-data/voices/other/en-wm
index aa82f88fb..33ff4fe41 100755
--- a/navit/support/espeak/espeak-data/voices/en/en-wm
+++ b/navit/support/espeak/espeak-data/voices/other/en-wm
@@ -1,8 +1,10 @@
name english_wmids
language en-uk-wmids
+language en-uk 9
+language en 9
gender male
-phonemes en_wm
+phonemes en-wm
replace 00 h NULL
replace 00 o@ O@
diff --git a/navit/support/espeak/espeak-data/voices/eo b/navit/support/espeak/espeak-data/voices/other/eo
index 36a4bff65..be18c0a7b 100755
--- a/navit/support/espeak/espeak-data/voices/eo
+++ b/navit/support/espeak/espeak-data/voices/other/eo
@@ -1,3 +1,5 @@
name esperanto
language eo
gender male
+
+apostrophe 2
diff --git a/navit/support/espeak/espeak-data/voices/test/grc b/navit/support/espeak/espeak-data/voices/other/grc
index ffa942063..ffa942063 100755
--- a/navit/support/espeak/espeak-data/voices/test/grc
+++ b/navit/support/espeak/espeak-data/voices/other/grc
diff --git a/navit/support/espeak/espeak-data/voices/other/jbo b/navit/support/espeak/espeak-data/voices/other/jbo
new file mode 100755
index 000000000..f43ef84fa
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/other/jbo
@@ -0,0 +1,4 @@
+name lojban
+language jbo
+
+speed 80 // speed adjustment, percentage
diff --git a/navit/support/espeak/espeak-data/voices/la b/navit/support/espeak/espeak-data/voices/other/la
index f3e97b523..f3e97b523 100644..100755
--- a/navit/support/espeak/espeak-data/voices/la
+++ b/navit/support/espeak/espeak-data/voices/other/la
diff --git a/navit/support/espeak/espeak-data/voices/other/lfn b/navit/support/espeak/espeak-data/voices/other/lfn
new file mode 100755
index 000000000..5c814a121
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/other/lfn
@@ -0,0 +1,6 @@
+name lingua_franca_nova
+language lfn
+gender male
+
+phonemes base2
+l_unpronouncable 0
diff --git a/navit/support/espeak/espeak-data/voices/sw b/navit/support/espeak/espeak-data/voices/other/sw
index cf584b7dd..57db0e57d 100755
--- a/navit/support/espeak/espeak-data/voices/sw
+++ b/navit/support/espeak/espeak-data/voices/other/sw
@@ -1,4 +1,4 @@
-name swahihi-test
+name swahili-test
language sw
gender male
diff --git a/navit/support/espeak/espeak-data/voices/pt b/navit/support/espeak/espeak-data/voices/pt
index 53cb31446..10d62711a 100755
--- a/navit/support/espeak/espeak-data/voices/pt
+++ b/navit/support/espeak/espeak-data/voices/pt
@@ -1,7 +1,8 @@
name brazil
-language pt
language pt-br
+language pt
gender male
dictrules 2
+stressLength 200 115 230 230 0 0 250 270
diff --git a/navit/support/espeak/espeak-data/voices/test/am b/navit/support/espeak/espeak-data/voices/test/am
new file mode 100755
index 000000000..729d1f07e
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/am
@@ -0,0 +1,3 @@
+name amharic-test
+language am
+
diff --git a/navit/support/espeak/espeak-data/voices/test/as b/navit/support/espeak/espeak-data/voices/test/as
new file mode 100755
index 000000000..109f92c82
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/as
@@ -0,0 +1,4 @@
+name assamese-test
+language as
+
+ \ No newline at end of file
diff --git a/navit/support/espeak/espeak-data/voices/test/az b/navit/support/espeak/espeak-data/voices/test/az
new file mode 100755
index 000000000..6fdf38274
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/az
@@ -0,0 +1,3 @@
+name azerbaijani-test
+language az
+
diff --git a/navit/support/espeak/espeak-data/voices/test/bn b/navit/support/espeak/espeak-data/voices/test/bn
new file mode 100755
index 000000000..e1e569fbe
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/bn
@@ -0,0 +1,3 @@
+name bengali-test
+language bn
+gender male
diff --git a/navit/support/espeak/espeak-data/voices/test/eu b/navit/support/espeak/espeak-data/voices/test/eu
new file mode 100755
index 000000000..35ada0cf4
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/eu
@@ -0,0 +1,3 @@
+name basque-test
+language eu
+
diff --git a/navit/support/espeak/espeak-data/voices/test/gd b/navit/support/espeak/espeak-data/voices/test/gd
new file mode 100644
index 000000000..9f8ed6123
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/gd
@@ -0,0 +1,3 @@
+name scottish-gaelic-test
+language gd
+
diff --git a/navit/support/espeak/espeak-data/voices/test/gu b/navit/support/espeak/espeak-data/voices/test/gu
new file mode 100755
index 000000000..4d983c68d
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/gu
@@ -0,0 +1,3 @@
+name gujarati-test
+language gu
+
diff --git a/navit/support/espeak/espeak-data/voices/test/jbo b/navit/support/espeak/espeak-data/voices/test/jbo
deleted file mode 100644
index ebab1a875..000000000
--- a/navit/support/espeak/espeak-data/voices/test/jbo
+++ /dev/null
@@ -1,3 +0,0 @@
-name lojban
-language jbo
-
diff --git a/navit/support/espeak/espeak-data/voices/test/kl b/navit/support/espeak/espeak-data/voices/test/kl
new file mode 100755
index 000000000..1ee5f0b5f
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/kl
@@ -0,0 +1,3 @@
+name greenlandic
+language kl
+
diff --git a/navit/support/espeak/espeak-data/voices/test/ko b/navit/support/espeak/espeak-data/voices/test/ko
new file mode 100755
index 000000000..d9330a8ff
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/ko
@@ -0,0 +1,6 @@
+name korean-test
+language ko
+gender male
+pitch 80 118
+intonation 2
+
diff --git a/navit/support/espeak/espeak-data/voices/test/nci b/navit/support/espeak/espeak-data/voices/test/nci
new file mode 100755
index 000000000..6ce7eee49
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/nci
@@ -0,0 +1,7 @@
+name nahuatl-classical
+language nci
+gender male
+
+intonation 3
+stressrule 2
+stressLength 190 190 200 200 0 0 220 240
diff --git a/navit/support/espeak/espeak-data/voices/test/or b/navit/support/espeak/espeak-data/voices/test/or
new file mode 100755
index 000000000..b3dec7161
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/or
@@ -0,0 +1,2 @@
+name oriya-test
+language or
diff --git a/navit/support/espeak/espeak-data/voices/test/pap b/navit/support/espeak/espeak-data/voices/test/pap
index 3b105a7fb..3b105a7fb 100644..100755
--- a/navit/support/espeak/espeak-data/voices/test/pap
+++ b/navit/support/espeak/espeak-data/voices/test/pap
diff --git a/navit/support/espeak/espeak-data/voices/test/si b/navit/support/espeak/espeak-data/voices/test/si
new file mode 100755
index 000000000..87d564d67
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/si
@@ -0,0 +1,4 @@
+name sinhala-test
+language si
+
+intonation 2
diff --git a/navit/support/espeak/espeak-data/voices/test/sl b/navit/support/espeak/espeak-data/voices/test/sl
new file mode 100755
index 000000000..6044e9d04
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/sl
@@ -0,0 +1,3 @@
+name slovenian-test
+language sl
+ \ No newline at end of file
diff --git a/navit/support/espeak/espeak-data/voices/test/te b/navit/support/espeak/espeak-data/voices/test/te
new file mode 100755
index 000000000..c23078a86
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/te
@@ -0,0 +1,5 @@
+name telugu-test
+language te
+
+intonation 2
+//consonants 80
diff --git a/navit/support/espeak/espeak-data/voices/test/ur b/navit/support/espeak/espeak-data/voices/test/ur
new file mode 100755
index 000000000..d4d113c4c
--- /dev/null
+++ b/navit/support/espeak/espeak-data/voices/test/ur
@@ -0,0 +1,5 @@
+name urdu-test
+language ur
+
+stressrule 6
+