Merge branch 'master' of https://github.com/espeak-ng/espeak-ng

docs/languages.md

 | `inc`       | `mr`              | Indic                 | Marathi                     |                        |
 | `azc`       | `nci`             | Uto-Aztecan           | Nahuatl                     | Classical              |
 | `inc`       | `ne`              | Indic                 | Nepali                      |                        |
-| `gmq`       | `no`; `nb`        | North Germanic        | Norwegian                   |                        |
+| `gmq`       | `nb`              | North Germanic        | Norwegian Bokmål            |                        |
 | `inc`       | `or`              | Indic                 | Oriya                       |                        |
 | `cus`       | `om`              | Cushitic              | Oromo                       |                        |
 | `roa`       | `pap`             | Romance               | Papiamento                  |                        |
 | `und`       | `und-fonipa`      |                       | Phonemes<sup>[3]</sup>      | IPA                    |
 | `zls`       | `pl`              | South Slavic          | Polish                      |                        |
 | `roa`       | `pt-BR`           | Romance               | Portuguese                  | Brazillian             |
-| `roa`       | `pt-PT`           | Romance               | Portuguese                  | Portugal               |
+| `roa`       | `pt`              | Romance               | Portuguese                  | Portugal               |
 | `inc`       | `pa`              | Indic                 | Punjabi                     |                        |
 | `roa`       | `ro`              | Romance               | Romanian                    |                        |
 | `zls`       | `ru`              | South Slavic          | Russian                     |                        |

espeak-ng-data/lang/gmq/no → espeak-ng-data/lang/gmq/nb

-name Norwegian
-language no
+name Norwegian Bokmål
 language nb
+language no
 
 intonation 4

espeak-ng-data/lang/ine/hy

 name Armenian (East Armenia)
 language hy
+language hy-arevela

espeak-ng-data/lang/roa/pt-PT → espeak-ng-data/lang/roa/pt

 name Portuguese (Portugal)
+language pt
 language pt-pt
-language pt 6
 phonemes pt-pt
 
 dictrules 1

espeak-ng-data/lang/roa/pt-BR

 name Portuguese (Brazil)
 language pt-br
-language pt
+language pt 6
 
 dictrules 2
 stressLength 200 115 230 230 0 0 250 270

espeak-ng-data/lang/sit/cmn

 name Chinese (Mandarin)
+language cmn
+language zh-cmn
 language zh
 words 1
 pitch 80 118

espeak-ng-data/lang/sit/yue

 name Chinese (Cantonese)
-language zh-yue
 language yue
-language zhy
+language zh-yue
+language zh 8
 
 translator zhy
 phonemes zhy