diff --git a/README.md b/README.md
index 47d10b87..3d2c0a1c 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@
----------
The eSpeak NG (Next Generation) Text-to-Speech program is an open source speech
-synthesizer that supports [99 languages and accents](docs/languages.md).
+synthesizer that supports [100 languages and accents](docs/languages.md).
It is based on the eSpeak engine created by Jonathan Duddington. It uses
spectral formant synthesis by default which sounds robotic, but can be
configured to use Klatt formant synthesis or MBROLA to give it a more natural
diff --git a/docs/add_language.md b/docs/add_language.md
index 02c47fbe..f0c2fb47 100644
--- a/docs/add_language.md
+++ b/docs/add_language.md
@@ -159,11 +159,12 @@ Each language needs a language file in `espeak-ng-data/lang` grouped by the
[language family](#language-family). The filename of the default voice for a
language should be the same as the language code (e.g. `fr` for French).
-
The simplest voice file would contain just 2 lines to give the language
-name and language code, eg:
+name (from the
+[IANA Language Subtag Registry](https://github.com/rhdunn/bcp47-data/blob/master/language-subtag-registry)
+and language code, e.g.:
- name french
+ name French
language fr
This language code specifies which phoneme table and dictionary to use
diff --git a/docs/languages.md b/docs/languages.md
index cecf4b0b..962acd51 100644
--- a/docs/languages.md
+++ b/docs/languages.md
@@ -39,14 +39,15 @@ The supported languages are:
| `gmw` | `en-GB-x-gbclan` | West Germanic | English | Lancastrian |
| `gmw` | `en-GB-x-rp` | West Germanic | English | Received Pronunciation |
| `gmw` | `en-GB-scotland` | West Germanic | English | Scottish |
-| `gmw` | `en-GB-x-gbcwnd` | West Germanic | English | West Midlands |
+| `gmw` | `en-GB-x-gbcwmd` | West Germanic | English | West Midlands |
+| `art` | `eo` | Constructed | Esperanto | |
| `urj` | `et` | Uralic | Estonian | |
-| `ira` | `fa` | Iranian | Farsi/Persian[1] | |
-| `ira` | `fa-en-us` | Iranian | Farsi/Persian[2] | |
-| `ira` | `fa-Latin` | Iranian | Farsi/Persian[3] | |
+| `ira` | `fa` | Iranian | Persian[1] | |
+| `ira` | `fa-en-us` | Iranian | Persian[2] | |
+| `ira` | `fa-Latn` | Iranian | Persian[3] | |
| `urj` | `fi` | Uralic | Finnish | |
+| `roa` | `fr-BE` | Romance | French | Belgium |
| `roa` | `fr` | Romance | French | France |
-| `roa` | `fr-BE` | Romance | French | Belgian |
| `cel` | `ga` | Celtic | Gaelic | Irish |
| `cel` | `gd` | Celtic | Gaelic | Scottish |
| `ccs` | `ka` | South Caucasian | Georgian | |
@@ -59,7 +60,7 @@ The supported languages are:
| `inc` | `hi` | Indic | Hindi | |
| `urj` | `hu` | Uralic | Hungarian | |
| `gmq` | `is` | North Germanic | Icelandic | |
-| `poz` | `in` | Malayo-Polynesian | Indonesian | |
+| `poz` | `id` | Malayo-Polynesian | Indonesian | |
| `art` | `ia` | Constructed | Interlingua | |
| `roa` | `it` | Romance | Italian | |
| `jpx` | `jp` | Japanese | Japanese[4] | |
@@ -88,7 +89,7 @@ The supported languages are:
| `und` | `und-fonipa` | | Phonemes[5] | IPA |
| `zls` | `pl` | South Slavic | Polish | |
| `roa` | `pt-BR` | Romance | Portuguese | Brazillian |
-| `roa` | `pt` | Romance | Portuguese | Portugal |
+| `roa` | `pt-PT` | Romance | Portuguese | Portugal |
| `inc` | `pa` | Indic | Punjabi | |
| `roa` | `ro` | Romance | Romanian | |
| `zls` | `ru` | South Slavic | Russian | |
diff --git a/espeak-ng-data/lang/aav/vi b/espeak-ng-data/lang/aav/vi
index dbd23b56..91e2aba4 100644
--- a/espeak-ng-data/lang/aav/vi
+++ b/espeak-ng-data/lang/aav/vi
@@ -1,4 +1,4 @@
-name vietnam
+name Vietnamese (Northern)
language vi
gender male
diff --git a/espeak-ng-data/lang/aav/vi-VN-x-central b/espeak-ng-data/lang/aav/vi-VN-x-central
index 8a609173..7248d0b4 100644
--- a/espeak-ng-data/lang/aav/vi-VN-x-central
+++ b/espeak-ng-data/lang/aav/vi-VN-x-central
@@ -1,4 +1,4 @@
-name vietnam_hue
+name Vietnamese (Central)
language vi-vn-x-central
phonemes vi-hue
dictrules 1
diff --git a/espeak-ng-data/lang/aav/vi-VN-x-south b/espeak-ng-data/lang/aav/vi-VN-x-south
index 7556ccea..2f46869a 100644
--- a/espeak-ng-data/lang/aav/vi-VN-x-south
+++ b/espeak-ng-data/lang/aav/vi-VN-x-south
@@ -1,4 +1,4 @@
-name vietnam_sgn
+name Vietnamese (Southern)
language vi-vn-x-south
phonemes vi-sgn
dictrules 2
diff --git a/espeak-ng-data/lang/art/eo b/espeak-ng-data/lang/art/eo
index be18c0a7..d8a69b67 100644
--- a/espeak-ng-data/lang/art/eo
+++ b/espeak-ng-data/lang/art/eo
@@ -1,4 +1,4 @@
-name esperanto
+name Esperanto
language eo
gender male
diff --git a/espeak-ng-data/lang/art/ia b/espeak-ng-data/lang/art/ia
index 57acc04a..6a147287 100644
--- a/espeak-ng-data/lang/art/ia
+++ b/espeak-ng-data/lang/art/ia
@@ -1,2 +1,2 @@
-name interlingua
+name Interlingua
language ia
diff --git a/espeak-ng-data/lang/art/jbo b/espeak-ng-data/lang/art/jbo
index f43ef84f..9cf2f309 100644
--- a/espeak-ng-data/lang/art/jbo
+++ b/espeak-ng-data/lang/art/jbo
@@ -1,4 +1,4 @@
-name lojban
+name Lojban
language jbo
speed 80 // speed adjustment, percentage
diff --git a/espeak-ng-data/lang/art/lfn b/espeak-ng-data/lang/art/lfn
index 0f05b22b..53d52e0c 100644
--- a/espeak-ng-data/lang/art/lfn
+++ b/espeak-ng-data/lang/art/lfn
@@ -1,4 +1,4 @@
-name lingua_franca_nova
+name Lingua Franca Nova
language lfn
gender male
diff --git a/espeak-ng-data/lang/azc/nci b/espeak-ng-data/lang/azc/nci
index 6ce7eee4..33ef1402 100644
--- a/espeak-ng-data/lang/azc/nci
+++ b/espeak-ng-data/lang/azc/nci
@@ -1,4 +1,4 @@
-name nahuatl-classical
+name Nahuatl (Classical)
language nci
gender male
diff --git a/espeak-ng-data/lang/bat/lt b/espeak-ng-data/lang/bat/lt
index 8295f6b2..00e7eb28 100644
--- a/espeak-ng-data/lang/bat/lt
+++ b/espeak-ng-data/lang/bat/lt
@@ -1,5 +1,4 @@
-
-name lithuanian
+name Lithuanian
language lt
gender male
diff --git a/espeak-ng-data/lang/bat/lv b/espeak-ng-data/lang/bat/lv
index 9ac82564..19091a2d 100644
--- a/espeak-ng-data/lang/bat/lv
+++ b/espeak-ng-data/lang/bat/lv
@@ -1,4 +1,4 @@
-name latvian
+name Latvian
language lv
gender male
maintainer Valdis Vitolins
diff --git a/espeak-ng-data/lang/bnt/sw b/espeak-ng-data/lang/bnt/sw
index a495fa88..7074b1b4 100644
--- a/espeak-ng-data/lang/bnt/sw
+++ b/espeak-ng-data/lang/bnt/sw
@@ -1,4 +1,4 @@
-name swahili
+name Swahili
language sw
gender male
diff --git a/espeak-ng-data/lang/bnt/tn b/espeak-ng-data/lang/bnt/tn
index ba875144..6aef67a7 100644
--- a/espeak-ng-data/lang/bnt/tn
+++ b/espeak-ng-data/lang/bnt/tn
@@ -1,4 +1,4 @@
-name setswana
+name Setswana
language tn
gender male
diff --git a/espeak-ng-data/lang/ccs/ka b/espeak-ng-data/lang/ccs/ka
index 6f748b7f..3a457c87 100644
--- a/espeak-ng-data/lang/ccs/ka
+++ b/espeak-ng-data/lang/ccs/ka
@@ -1,2 +1,2 @@
-name georgian
+name Georgian
language ka
diff --git a/espeak-ng-data/lang/cel/cy b/espeak-ng-data/lang/cel/cy
index 30abd943..cb06776b 100644
--- a/espeak-ng-data/lang/cel/cy
+++ b/espeak-ng-data/lang/cel/cy
@@ -1,5 +1,5 @@
+name Welsh
language cy
-name welsh
gender male
intonation 4
diff --git a/espeak-ng-data/lang/cel/ga b/espeak-ng-data/lang/cel/ga
index 30d32e07..9fea2ae7 100644
--- a/espeak-ng-data/lang/cel/ga
+++ b/espeak-ng-data/lang/cel/ga
@@ -1,4 +1,4 @@
-name irish-gaeilge
+name Gaelic (Irish)
language ga
dictrules 1 // fix for eclipsis
diff --git a/espeak-ng-data/lang/cel/gd b/espeak-ng-data/lang/cel/gd
index d0b15d9f..e416f6fa 100644
--- a/espeak-ng-data/lang/cel/gd
+++ b/espeak-ng-data/lang/cel/gd
@@ -1,4 +1,4 @@
-name scottish-gaelic
+name Gaelic (Scottish)
language gd
status testing
diff --git a/espeak-ng-data/lang/cus/om b/espeak-ng-data/lang/cus/om
index 6568cfda..1d6b396d 100644
--- a/espeak-ng-data/lang/cus/om
+++ b/espeak-ng-data/lang/cus/om
@@ -1,4 +1,4 @@
-name oromo
+name Oromo
language om
status testing
diff --git a/espeak-ng-data/lang/dra/kn b/espeak-ng-data/lang/dra/kn
index ced1b1fa..a32732c4 100644
--- a/espeak-ng-data/lang/dra/kn
+++ b/espeak-ng-data/lang/dra/kn
@@ -1,4 +1,4 @@
-name kannada
+name Kannada
language kn
intonation 2
diff --git a/espeak-ng-data/lang/dra/ml b/espeak-ng-data/lang/dra/ml
index 45bdf852..98a69261 100644
--- a/espeak-ng-data/lang/dra/ml
+++ b/espeak-ng-data/lang/dra/ml
@@ -1,4 +1,4 @@
-name malayalam
+name Malayalam
language ml
gender male
diff --git a/espeak-ng-data/lang/dra/ta b/espeak-ng-data/lang/dra/ta
index 8848d682..d9bee8b1 100644
--- a/espeak-ng-data/lang/dra/ta
+++ b/espeak-ng-data/lang/dra/ta
@@ -1,4 +1,4 @@
-name tamil
+name Tamil
language ta
gender male
diff --git a/espeak-ng-data/lang/dra/te b/espeak-ng-data/lang/dra/te
index adce71fe..8acbb187 100644
--- a/espeak-ng-data/lang/dra/te
+++ b/espeak-ng-data/lang/dra/te
@@ -1,4 +1,4 @@
-name telugu
+name Telugu
language te
status testing
diff --git a/espeak-ng-data/lang/esx/kl b/espeak-ng-data/lang/esx/kl
index 1ee5f0b5..e581b588 100644
--- a/espeak-ng-data/lang/esx/kl
+++ b/espeak-ng-data/lang/esx/kl
@@ -1,3 +1,3 @@
-name greenlandic
+name Greenlandic
language kl
diff --git a/espeak-ng-data/lang/eu b/espeak-ng-data/lang/eu
index dc4219d5..09e8c18b 100644
--- a/espeak-ng-data/lang/eu
+++ b/espeak-ng-data/lang/eu
@@ -1,4 +1,4 @@
-name basque
+name Basque
language eu
status testing
diff --git a/espeak-ng-data/lang/gmq/da b/espeak-ng-data/lang/gmq/da
index 12ce1096..3b9b669c 100644
--- a/espeak-ng-data/lang/gmq/da
+++ b/espeak-ng-data/lang/gmq/da
@@ -1,4 +1,4 @@
-name danish
+name Danish
language da
gender male
diff --git a/espeak-ng-data/lang/gmq/is b/espeak-ng-data/lang/gmq/is
index b8f23834..bbaa0eeb 100644
--- a/espeak-ng-data/lang/gmq/is
+++ b/espeak-ng-data/lang/gmq/is
@@ -1,4 +1,4 @@
-name icelandic
+name Icelandic
language is
gender male
diff --git a/espeak-ng-data/lang/gmq/no b/espeak-ng-data/lang/gmq/no
index a90c7b72..a389b5c4 100644
--- a/espeak-ng-data/lang/gmq/no
+++ b/espeak-ng-data/lang/gmq/no
@@ -1,4 +1,4 @@
-name norwegian
+name Norwegian
language no
language nb
gender male
diff --git a/espeak-ng-data/lang/gmq/sv b/espeak-ng-data/lang/gmq/sv
index df70f438..96a39516 100644
--- a/espeak-ng-data/lang/gmq/sv
+++ b/espeak-ng-data/lang/gmq/sv
@@ -1,4 +1,4 @@
-name swedish
+name Swedish
language sv
gender male
diff --git a/espeak-ng-data/lang/gmw/af b/espeak-ng-data/lang/gmw/af
index 99e2b2f5..d8159de4 100644
--- a/espeak-ng-data/lang/gmw/af
+++ b/espeak-ng-data/lang/gmw/af
@@ -1,4 +1,4 @@
-name afrikaans
+name Afrikaans
language af
gender male
diff --git a/espeak-ng-data/lang/gmw/de b/espeak-ng-data/lang/gmw/de
index 653c3f5c..fb33bdfe 100644
--- a/espeak-ng-data/lang/gmw/de
+++ b/espeak-ng-data/lang/gmw/de
@@ -1,4 +1,4 @@
-name german
+name German
language de
gender male
diff --git a/espeak-ng-data/lang/gmw/en b/espeak-ng-data/lang/gmw/en
index 5262c924..069604af 100644
--- a/espeak-ng-data/lang/gmw/en
+++ b/espeak-ng-data/lang/gmw/en
@@ -1,4 +1,4 @@
-name english
+name English (Great Britain)
language en-gb 2
language en 2
gender male
diff --git a/espeak-ng-data/lang/gmw/en-029 b/espeak-ng-data/lang/gmw/en-029
index 459c8c4a..4672c78d 100644
--- a/espeak-ng-data/lang/gmw/en-029
+++ b/espeak-ng-data/lang/gmw/en-029
@@ -1,4 +1,4 @@
-name en-westindies
+name English (Caribbean)
language en-029
language en 10
gender male
diff --git a/espeak-ng-data/lang/gmw/en-GB-scotland b/espeak-ng-data/lang/gmw/en-GB-scotland
index 2290169f..b510791b 100644
--- a/espeak-ng-data/lang/gmw/en-GB-scotland
+++ b/espeak-ng-data/lang/gmw/en-GB-scotland
@@ -1,4 +1,4 @@
-name en-scottish
+name English (Scotland)
language en-gb-scotland
language en 4
gender male
diff --git a/espeak-ng-data/lang/gmw/en-GB-x-gbclan b/espeak-ng-data/lang/gmw/en-GB-x-gbclan
index d2e0ee9f..b1508d1d 100644
--- a/espeak-ng-data/lang/gmw/en-GB-x-gbclan
+++ b/espeak-ng-data/lang/gmw/en-GB-x-gbclan
@@ -1,4 +1,4 @@
-name english-north
+name English (Lancaster)
language en-gb-x-gbclan
language en-gb 3
language en 5
diff --git a/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd b/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd
index 2c614799..4b52f297 100644
--- a/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd
+++ b/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd
@@ -1,4 +1,4 @@
-name english_wmids
+name English (West Midlands)
language en-gb-x-gbcwmd
language en-gb 9
language en 9
diff --git a/espeak-ng-data/lang/gmw/en-GB-x-rp b/espeak-ng-data/lang/gmw/en-GB-x-rp
index 3454db8b..7e1b9146 100644
--- a/espeak-ng-data/lang/gmw/en-GB-x-rp
+++ b/espeak-ng-data/lang/gmw/en-GB-x-rp
@@ -1,4 +1,4 @@
-name english_rp
+name English (Received Pronunciation)
language en-gb-x-rp
language en-gb 4
language en 5
diff --git a/espeak-ng-data/lang/gmw/en-US b/espeak-ng-data/lang/gmw/en-US
index 8476036a..d90ddf53 100644
--- a/espeak-ng-data/lang/gmw/en-US
+++ b/espeak-ng-data/lang/gmw/en-US
@@ -1,4 +1,4 @@
-name english-us
+name English (America)
language en-us 2
language en 3
gender male
diff --git a/espeak-ng-data/lang/gmw/nl b/espeak-ng-data/lang/gmw/nl
index beef33fa..4e34d7e4 100644
--- a/espeak-ng-data/lang/gmw/nl
+++ b/espeak-ng-data/lang/gmw/nl
@@ -1,3 +1,3 @@
+name Dutch
language nl
-name dutch
gender male
diff --git a/espeak-ng-data/lang/grk/el b/espeak-ng-data/lang/grk/el
index 1e9a757f..5c541d4e 100644
--- a/espeak-ng-data/lang/grk/el
+++ b/espeak-ng-data/lang/grk/el
@@ -1,4 +1,4 @@
-name greek
+name Greek (Modern)
language el
gender male
diff --git a/espeak-ng-data/lang/grk/grc b/espeak-ng-data/lang/grk/grc
index ffa94206..09f1db19 100644
--- a/espeak-ng-data/lang/grk/grc
+++ b/espeak-ng-data/lang/grk/grc
@@ -1,4 +1,4 @@
-name greek-ancient
+name Greek (Ancient)
language grc
gender male
diff --git a/espeak-ng-data/lang/inc/as b/espeak-ng-data/lang/inc/as
index ae167450..23991ad7 100644
--- a/espeak-ng-data/lang/inc/as
+++ b/espeak-ng-data/lang/inc/as
@@ -1,4 +1,4 @@
-name assamese
+name Assamese
language as
status testing
diff --git a/espeak-ng-data/lang/inc/bn b/espeak-ng-data/lang/inc/bn
index 1e99fa8c..ee6d5c29 100644
--- a/espeak-ng-data/lang/inc/bn
+++ b/espeak-ng-data/lang/inc/bn
@@ -1,3 +1,3 @@
-name bengali
+name Bengali
language bn
gender male
diff --git a/espeak-ng-data/lang/inc/gu b/espeak-ng-data/lang/inc/gu
index 08b3b284..fcdacd21 100644
--- a/espeak-ng-data/lang/inc/gu
+++ b/espeak-ng-data/lang/inc/gu
@@ -1,4 +1,4 @@
-name gujarati
+name Gujarati
language gu
status testing
diff --git a/espeak-ng-data/lang/inc/hi b/espeak-ng-data/lang/inc/hi
index 2d41b07b..ad70ab82 100644
--- a/espeak-ng-data/lang/inc/hi
+++ b/espeak-ng-data/lang/inc/hi
@@ -1,3 +1,3 @@
-name hindi
+name Hindi
language hi
gender male
diff --git a/espeak-ng-data/lang/inc/kok b/espeak-ng-data/lang/inc/kok
index 1ae81a10..f2b1cc53 100644
--- a/espeak-ng-data/lang/inc/kok
+++ b/espeak-ng-data/lang/inc/kok
@@ -1,2 +1,2 @@
-name konkani
+name Konkani
language kok
diff --git a/espeak-ng-data/lang/inc/mr b/espeak-ng-data/lang/inc/mr
index 07d7b515..d9181f90 100644
--- a/espeak-ng-data/lang/inc/mr
+++ b/espeak-ng-data/lang/inc/mr
@@ -1,4 +1,4 @@
-name marathi
+name Marathi
language mr
status testing
diff --git a/espeak-ng-data/lang/inc/ne b/espeak-ng-data/lang/inc/ne
index fc829532..d8d4419b 100644
--- a/espeak-ng-data/lang/inc/ne
+++ b/espeak-ng-data/lang/inc/ne
@@ -1,4 +1,4 @@
-name nepali
+name Nepali
language ne
gender male
diff --git a/espeak-ng-data/lang/inc/or b/espeak-ng-data/lang/inc/or
index 2774f9dd..95a990ec 100644
--- a/espeak-ng-data/lang/inc/or
+++ b/espeak-ng-data/lang/inc/or
@@ -1,4 +1,4 @@
-name oriya
+name Oriya
language or
status testing
diff --git a/espeak-ng-data/lang/inc/pa b/espeak-ng-data/lang/inc/pa
index 4cd585d1..0e9552d3 100644
--- a/espeak-ng-data/lang/inc/pa
+++ b/espeak-ng-data/lang/inc/pa
@@ -1,2 +1,2 @@
-name punjabi
+name Punjabi
language pa
diff --git a/espeak-ng-data/lang/inc/sd b/espeak-ng-data/lang/inc/sd
index 2e94326b..dc4801ff 100644
--- a/espeak-ng-data/lang/inc/sd
+++ b/espeak-ng-data/lang/inc/sd
@@ -1,2 +1,2 @@
-name sindhi
+name Sindhi
language sd
diff --git a/espeak-ng-data/lang/inc/si b/espeak-ng-data/lang/inc/si
index 622d02f9..3f877191 100644
--- a/espeak-ng-data/lang/inc/si
+++ b/espeak-ng-data/lang/inc/si
@@ -1,4 +1,4 @@
-name sinhala
+name Sinhala
language si
status testing
diff --git a/espeak-ng-data/lang/inc/ur b/espeak-ng-data/lang/inc/ur
index a0a1b349..4071ac56 100644
--- a/espeak-ng-data/lang/inc/ur
+++ b/espeak-ng-data/lang/inc/ur
@@ -1,4 +1,4 @@
-name urdu
+name Urdu
language ur
maintainer Ejaz Shah
status testing
diff --git a/espeak-ng-data/lang/ine/hy b/espeak-ng-data/lang/ine/hy
index 6c65e3c6..63837b42 100644
--- a/espeak-ng-data/lang/ine/hy
+++ b/espeak-ng-data/lang/ine/hy
@@ -1,3 +1,3 @@
-name armenian
+name Armenian (East Armenia)
language hy
gender male
diff --git a/espeak-ng-data/lang/ine/hy-arevmda b/espeak-ng-data/lang/ine/hy-arevmda
index 234f1bca..018970fa 100644
--- a/espeak-ng-data/lang/ine/hy-arevmda
+++ b/espeak-ng-data/lang/ine/hy-arevmda
@@ -1,4 +1,4 @@
-name armenian-west
+name Armenian (West Armenia)
language hy-arevmda
language hy 8
gender male
diff --git a/espeak-ng-data/lang/ine/sq b/espeak-ng-data/lang/ine/sq
index d0b72957..bf8d18ec 100644
--- a/espeak-ng-data/lang/ine/sq
+++ b/espeak-ng-data/lang/ine/sq
@@ -1,4 +1,4 @@
-name albanian
+name Albanian
language sq
gender male
diff --git a/espeak-ng-data/lang/ira/fa b/espeak-ng-data/lang/ira/fa
index 46948cef..5a0c2b6d 100644
--- a/espeak-ng-data/lang/ira/fa
+++ b/espeak-ng-data/lang/ira/fa
@@ -1,6 +1,4 @@
-name Persian+English-UK
+name Persian
language fa
maintainer Shadyar Khodayari
status mature
-// There is Classic fa file, for person who installs eSpeak using the ISO-Code of language.
-// This language reads Persian and English with U.K pronunciation, as Persian uses a collection of special characters which differs entirely from English characters.
diff --git a/espeak-ng-data/lang/ira/fa-Latn b/espeak-ng-data/lang/ira/fa-Latn
index 2afcccb6..7a43725b 100644
--- a/espeak-ng-data/lang/ira/fa-Latn
+++ b/espeak-ng-data/lang/ira/fa-Latn
@@ -1,4 +1,4 @@
-name persian-pinglish
+name Persian (Pinglish)
// Sometimes, Farsi speakers write Farsi words using English characters, particularly in Chat and SMS (texte messages).), called Pinglish
language fa-Latn
maintainer Shadyar Khodayari
diff --git a/espeak-ng-data/lang/ira/ku b/espeak-ng-data/lang/ira/ku
index 536957cb..f2b78c9c 100644
--- a/espeak-ng-data/lang/ira/ku
+++ b/espeak-ng-data/lang/ira/ku
@@ -1,4 +1,4 @@
-name kurdish
+name Kurdish
language ku
gender male
diff --git a/espeak-ng-data/lang/itc/la b/espeak-ng-data/lang/itc/la
index f3e97b52..367eafc2 100644
--- a/espeak-ng-data/lang/itc/la
+++ b/espeak-ng-data/lang/itc/la
@@ -1,4 +1,4 @@
-name latin
+name Latin
language la
gender male
stressrule 2 33 0 2
diff --git a/espeak-ng-data/lang/jpx/jp b/espeak-ng-data/lang/jpx/jp
index 5dac975a..2fa69800 100644
--- a/espeak-ng-data/lang/jpx/jp
+++ b/espeak-ng-data/lang/jpx/jp
@@ -1,5 +1,5 @@
+name Japanese
language jp
-name japanese
phonemes jp
gender male
diff --git a/espeak-ng-data/lang/poz/id b/espeak-ng-data/lang/poz/id
index f35b116a..fc74fa01 100644
--- a/espeak-ng-data/lang/poz/id
+++ b/espeak-ng-data/lang/poz/id
@@ -1,4 +1,4 @@
-name indonesian
+name Indonesian
language id
gender male
diff --git a/espeak-ng-data/lang/poz/ms b/espeak-ng-data/lang/poz/ms
index 90a38a37..ac625c66 100644
--- a/espeak-ng-data/lang/poz/ms
+++ b/espeak-ng-data/lang/poz/ms
@@ -1,5 +1,5 @@
// Last updated: 14 October 2010, Jason Ong (jason@portalgroove.com)
-name malay
+name Malay
language ms
gender male
phonemes id
diff --git a/espeak-ng-data/lang/roa/an b/espeak-ng-data/lang/roa/an
index 7bf245e0..067118b7 100644
--- a/espeak-ng-data/lang/roa/an
+++ b/espeak-ng-data/lang/roa/an
@@ -1,3 +1,3 @@
-name aragonese
+name Aragonese
language an
gender male
diff --git a/espeak-ng-data/lang/roa/ca b/espeak-ng-data/lang/roa/ca
index dc51396c..8fc46e90 100644
--- a/espeak-ng-data/lang/roa/ca
+++ b/espeak-ng-data/lang/roa/ca
@@ -1,4 +1,4 @@
-name catalan
+name Catalan
language ca
gender male
diff --git a/espeak-ng-data/lang/roa/es b/espeak-ng-data/lang/roa/es
index 07619bf3..bcc02291 100644
--- a/espeak-ng-data/lang/roa/es
+++ b/espeak-ng-data/lang/roa/es
@@ -1,8 +1,5 @@
-
-name spanish
+name Spanish (Spain)
language es
gender male
dictrules 1
tunes s6 c6 q6 e6
-
-
diff --git a/espeak-ng-data/lang/roa/es-419 b/espeak-ng-data/lang/roa/es-419
index ba9ca064..c57a5b23 100644
--- a/espeak-ng-data/lang/roa/es-419
+++ b/espeak-ng-data/lang/roa/es-419
@@ -1,4 +1,4 @@
-name spanish-latin-am
+name Spanish (Latin America)
language es-419
language es-mx 6
language es 6
diff --git a/espeak-ng-data/lang/roa/fr b/espeak-ng-data/lang/roa/fr
index a0b4986e..1d6dcab3 100644
--- a/espeak-ng-data/lang/roa/fr
+++ b/espeak-ng-data/lang/roa/fr
@@ -1,4 +1,4 @@
-name french
+name French (France)
language fr-fr
language fr
gender male
diff --git a/espeak-ng-data/lang/roa/fr-BE b/espeak-ng-data/lang/roa/fr-BE
index 4a741820..0b4f06c6 100644
--- a/espeak-ng-data/lang/roa/fr-BE
+++ b/espeak-ng-data/lang/roa/fr-BE
@@ -1,4 +1,4 @@
-name french-Belgium
+name French (Belgium)
language fr-be
language fr 8
gender male
diff --git a/espeak-ng-data/lang/roa/it b/espeak-ng-data/lang/roa/it
index aa67c956..9548ecb9 100644
--- a/espeak-ng-data/lang/roa/it
+++ b/espeak-ng-data/lang/roa/it
@@ -1,4 +1,4 @@
-name italian
+name Italian
language it
gender male
diff --git a/espeak-ng-data/lang/roa/pap b/espeak-ng-data/lang/roa/pap
index 6ca9d735..b9e07fe0 100644
--- a/espeak-ng-data/lang/roa/pap
+++ b/espeak-ng-data/lang/roa/pap
@@ -1,4 +1,4 @@
-name papiamento
+name Papiamento
language pap
status testing
diff --git a/espeak-ng-data/lang/roa/pt-BR b/espeak-ng-data/lang/roa/pt-BR
index 10d62711..f1b44d25 100644
--- a/espeak-ng-data/lang/roa/pt-BR
+++ b/espeak-ng-data/lang/roa/pt-BR
@@ -1,4 +1,4 @@
-name brazil
+name Portuguese (Brazil)
language pt-br
language pt
gender male
diff --git a/espeak-ng-data/lang/roa/pt-PT b/espeak-ng-data/lang/roa/pt-PT
index 43cb971c..f84b5e08 100644
--- a/espeak-ng-data/lang/roa/pt-PT
+++ b/espeak-ng-data/lang/roa/pt-PT
@@ -1,4 +1,4 @@
-name portugal
+name Portuguese (Portugal)
language pt-pt
language pt 6
gender male
diff --git a/espeak-ng-data/lang/roa/ro b/espeak-ng-data/lang/roa/ro
index d8ecd252..135c1226 100644
--- a/espeak-ng-data/lang/roa/ro
+++ b/espeak-ng-data/lang/roa/ro
@@ -1,5 +1,3 @@
-name romanian
+name Romanian
language ro
gender male
-
-
diff --git a/espeak-ng-data/lang/sai/gn b/espeak-ng-data/lang/sai/gn
index a437bfc6..6e183e5a 100644
--- a/espeak-ng-data/lang/sai/gn
+++ b/espeak-ng-data/lang/sai/gn
@@ -1,5 +1,4 @@
-
-name guarani
+name Guarani
language gn
dictrules 1
words 0 1
diff --git a/espeak-ng-data/lang/sem/am b/espeak-ng-data/lang/sem/am
index ee923440..87ed65a3 100644
--- a/espeak-ng-data/lang/sem/am
+++ b/espeak-ng-data/lang/sem/am
@@ -1,4 +1,4 @@
-name amharic
+name Amharic
language am
status testing
diff --git a/espeak-ng-data/lang/sem/ar b/espeak-ng-data/lang/sem/ar
index b8865e4c..12185836 100644
--- a/espeak-ng-data/lang/sem/ar
+++ b/espeak-ng-data/lang/sem/ar
@@ -1,4 +1,4 @@
-name arabic
+name Arabic
language ar
phonemes ar
gender male
diff --git a/espeak-ng-data/lang/sem/mt b/espeak-ng-data/lang/sem/mt
index 175e3003..ea8a3fce 100644
--- a/espeak-ng-data/lang/sem/mt
+++ b/espeak-ng-data/lang/sem/mt
@@ -1,4 +1,4 @@
-name maltese
+name Maltese
language mt
status testing
diff --git a/espeak-ng-data/lang/sit/cmn b/espeak-ng-data/lang/sit/cmn
index 559a6403..14204747 100644
--- a/espeak-ng-data/lang/sit/cmn
+++ b/espeak-ng-data/lang/sit/cmn
@@ -1,4 +1,4 @@
-name Mandarin
+name Chinese (Mandarin)
language zh
gender male
words 1
@@ -29,4 +29,4 @@ dict_min 100000
//[en]: replace beginning w with v
//[zh]: w���v
-//replace 0 w v
\ No newline at end of file
+//replace 0 w v
diff --git a/espeak-ng-data/lang/sit/mni b/espeak-ng-data/lang/sit/mni
index bb83193b..da2cba12 100644
--- a/espeak-ng-data/lang/sit/mni
+++ b/espeak-ng-data/lang/sit/mni
@@ -1,2 +1,2 @@
-name manipuri
+name Manipuri
language mni
diff --git a/espeak-ng-data/lang/sit/my b/espeak-ng-data/lang/sit/my
index a7a37bab..5b2975e9 100644
--- a/espeak-ng-data/lang/sit/my
+++ b/espeak-ng-data/lang/sit/my
@@ -1,2 +1,2 @@
-name burmese
+name Burmese
language my
diff --git a/espeak-ng-data/lang/sit/yue b/espeak-ng-data/lang/sit/yue
index 8e2b8a7e..444124d8 100644
--- a/espeak-ng-data/lang/sit/yue
+++ b/espeak-ng-data/lang/sit/yue
@@ -1,4 +1,4 @@
-name cantonese
+name Chinese (Cantonese)
language zh-yue
language yue
language zhy
diff --git a/espeak-ng-data/lang/trk/az b/espeak-ng-data/lang/trk/az
index b337addb..fd9e4f33 100644
--- a/espeak-ng-data/lang/trk/az
+++ b/espeak-ng-data/lang/trk/az
@@ -1,4 +1,4 @@
-name azerbaijani
+name Azerbaijani
language az
status testing
diff --git a/espeak-ng-data/lang/trk/ky b/espeak-ng-data/lang/trk/ky
index a0a6dd61..c031449e 100644
--- a/espeak-ng-data/lang/trk/ky
+++ b/espeak-ng-data/lang/trk/ky
@@ -1,4 +1,4 @@
-name kyrgyz
+name Kyrgyz
language ky
tunes s3 c3 q3 e3
diff --git a/espeak-ng-data/lang/trk/tr b/espeak-ng-data/lang/trk/tr
index 4f1904e5..2507ae81 100644
--- a/espeak-ng-data/lang/trk/tr
+++ b/espeak-ng-data/lang/trk/tr
@@ -1,4 +1,4 @@
-name turkish
+name Turkish
language tr
gender male
diff --git a/espeak-ng-data/lang/trk/tt b/espeak-ng-data/lang/trk/tt
index 7989953e..a72d3500 100644
--- a/espeak-ng-data/lang/trk/tt
+++ b/espeak-ng-data/lang/trk/tt
@@ -1,3 +1,3 @@
-name tatar
+name Tatar
language tt
gender male
diff --git a/espeak-ng-data/lang/und/und-fonipa b/espeak-ng-data/lang/und/und-fonipa
index b1d63645..26e081ba 100644
--- a/espeak-ng-data/lang/und/und-fonipa
+++ b/espeak-ng-data/lang/und/und-fonipa
@@ -1,4 +1,4 @@
-name ipa
+name Phonetics (International Phonetic Alphabet)
language ipa
status testing
diff --git a/espeak-ng-data/lang/urj/et b/espeak-ng-data/lang/urj/et
index 6caf78ce..f46df5e3 100644
--- a/espeak-ng-data/lang/urj/et
+++ b/espeak-ng-data/lang/urj/et
@@ -1,3 +1,3 @@
-name estonian
+name Estonian
language et
diff --git a/espeak-ng-data/lang/urj/fi b/espeak-ng-data/lang/urj/fi
index 6e11c931..d5966fab 100644
--- a/espeak-ng-data/lang/urj/fi
+++ b/espeak-ng-data/lang/urj/fi
@@ -1,4 +1,4 @@
-name finnish
+name Finnish
language fi
gender male
diff --git a/espeak-ng-data/lang/urj/hu b/espeak-ng-data/lang/urj/hu
index 25d78c05..00d40320 100644
--- a/espeak-ng-data/lang/urj/hu
+++ b/espeak-ng-data/lang/urj/hu
@@ -1,4 +1,4 @@
-name hungarian
+name Hungarian
language hu
gender male
option bracket 0 0
diff --git a/espeak-ng-data/lang/zls/bg b/espeak-ng-data/lang/zls/bg
index c3842ca7..870c0424 100644
--- a/espeak-ng-data/lang/zls/bg
+++ b/espeak-ng-data/lang/zls/bg
@@ -1,5 +1,5 @@
-name bulgarian
+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
+stressLength 180 170 200 200 200 200 210 220
diff --git a/espeak-ng-data/lang/zls/bs b/espeak-ng-data/lang/zls/bs
index eadd7073..d19f6ec9 100644
--- a/espeak-ng-data/lang/zls/bs
+++ b/espeak-ng-data/lang/zls/bs
@@ -1,4 +1,4 @@
-name bosnian
+name Bosnian
language bs
phonemes hr
dictionary hbs
diff --git a/espeak-ng-data/lang/zls/cs b/espeak-ng-data/lang/zls/cs
index 1c2992dd..db2b4c3e 100644
--- a/espeak-ng-data/lang/zls/cs
+++ b/espeak-ng-data/lang/zls/cs
@@ -1,4 +1,4 @@
-name czech
+name Czech
language cs
gender male
diff --git a/espeak-ng-data/lang/zls/hr b/espeak-ng-data/lang/zls/hr
index d6811d3a..c821cbe0 100644
--- a/espeak-ng-data/lang/zls/hr
+++ b/espeak-ng-data/lang/zls/hr
@@ -1,4 +1,4 @@
-name croatian
+name Croatian
language hr
language hbs
gender male
diff --git a/espeak-ng-data/lang/zls/mk b/espeak-ng-data/lang/zls/mk
index 47a8398c..3eab6b4e 100644
--- a/espeak-ng-data/lang/zls/mk
+++ b/espeak-ng-data/lang/zls/mk
@@ -1,4 +1,4 @@
-name macedonian
+name Macedonian
language mk
gender male
diff --git a/espeak-ng-data/lang/zls/pl b/espeak-ng-data/lang/zls/pl
index 8fc65d4b..4e9c3bea 100644
--- a/espeak-ng-data/lang/zls/pl
+++ b/espeak-ng-data/lang/zls/pl
@@ -1,4 +1,4 @@
-name polish
+name Polish
language pl
gender male
diff --git a/espeak-ng-data/lang/zls/ru b/espeak-ng-data/lang/zls/ru
index 4136ab21..c38ac7be 100644
--- a/espeak-ng-data/lang/zls/ru
+++ b/espeak-ng-data/lang/zls/ru
@@ -1,4 +1,4 @@
-name russian
+name Russian
language ru
gender male
diff --git a/espeak-ng-data/lang/zls/sk b/espeak-ng-data/lang/zls/sk
index 026363f6..461a3c43 100644
--- a/espeak-ng-data/lang/zls/sk
+++ b/espeak-ng-data/lang/zls/sk
@@ -1,4 +1,4 @@
-name slovak
+name Slovak
language sk
gender male
diff --git a/espeak-ng-data/lang/zls/sl b/espeak-ng-data/lang/zls/sl
index 4001ef2a..b7bf01f2 100644
--- a/espeak-ng-data/lang/zls/sl
+++ b/espeak-ng-data/lang/zls/sl
@@ -1,4 +1,4 @@
-name slovenian
+name Slovenian
language sl
status testing
diff --git a/espeak-ng-data/lang/zls/sr b/espeak-ng-data/lang/zls/sr
index a7a8223d..50c78abb 100644
--- a/espeak-ng-data/lang/zls/sr
+++ b/espeak-ng-data/lang/zls/sr
@@ -1,4 +1,4 @@
-name serbian
+name Serbian
language sr
gender male
dictionary hbs