Skip to content

Commit 9118ebd

Browse files
aahillaahill
committed
merge conflict
2 parents 8028125 + 0361a93 commit 9118ebd

File tree

1 file changed

+49
-49
lines changed

1 file changed

+49
-49
lines changed

‎articles/cognitive-services/text-analytics/language-support.md

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,31 @@ ms.author: aahi
2121

2222
| Language | Language code | v2 support | v3 support | Starting v3 model version: | Notes |
2323
|:----------------------|:-------------:|:----------:|:----------:|:--------------------------:|-------------------:|
24-
| Chinese-Simplified | `zh-hans` | ✓ | ✓ | 10-01-2019 | `zh` also accepted |
25-
| Chinese-Traditional | `zh-hant` | | ✓ | 10-01-2019 | |
26-
| Danish* | `da` | ✓ | | | |
24+
| Chinese-Simplified | `zh-hans` | ✓ | ✓ | 2019-10-01 | `zh` also accepted |
25+
| Chinese-Traditional | `zh-hant` | | ✓ | 2019-10-01 | |
26+
| Danish | `da` | ✓ | | | |
2727
| Dutch | `nl` | ✓ | | | |
28-
| English | `en` | ✓ | ✓ | 10-01-2019 | |
28+
| English | `en` | ✓ | ✓ | 2019-10-01 | |
2929
| Finnish | `fi` | ✓ | | | |
30-
| French | `fr` | ✓ | ✓ | 10-01-2019 | |
31-
| German | `de` | ✓ | ✓ | 10-01-2019 | |
30+
| French | `fr` | ✓ | ✓ | 2019-10-01 | |
31+
| German | `de` | ✓ | ✓ | 2019-10-01 | |
3232
| Greek | `el` | ✓ | | | |
33-
| Italian | `it` | ✓ | ✓ | 10-01-2019 | |
34-
| Japanese | `ja` | ✓ | ✓ | 10-01-2019 | |
35-
| Korean | `ko` | | ✓ | 10-01-2019 | |
33+
| Italian | `it` | ✓ | ✓ | 2019-10-01 | |
34+
| Japanese | `ja` | ✓ | ✓ | 2019-10-01 | |
35+
| Korean | `ko` | | ✓ | 2019-10-01 | |
3636
| Norwegian (Bokmål) | `no` | ✓ | | | |
3737
| Polish | `pl` | ✓ | | | |
38-
| Portuguese (Portugal) | `pt-PT` | ✓ | ✓ | 10-01-2019 | `pt` also accepted |
38+
| Portuguese (Portugal) | `pt-PT` | ✓ | ✓ | 2019-10-01 | `pt` also accepted |
3939
| Russian | `ru` | ✓ | | | |
40-
| Spanish | `es` | ✓ | ✓ | 10-01-2019 | |
40+
| Spanish | `es` | ✓ | ✓ | 2019-10-01 | |
4141
| Swedish | `sv` | ✓ | | | |
4242
| Turkish | `tr` | ✓ | | | |
4343

4444
### Opinion mining (v3.1-preview only)
4545

4646
| Language | Language code | Starting with v3 model version: | Notes |
4747
|:----------------------|:-------------:|:------------------------------------:|-------------------:|
48-
| English | `en` | 04-01-2020 | |
48+
| English | `en` | 2020-04-01 | |
4949

5050

5151
#### [Named Entity Recognition (NER)](#tab/named-entity-recognition)
@@ -56,56 +56,56 @@ ms.author: aahi
5656
5757
| Language | Language code | v2.1 support | v3 support | Starting with v3 model version: | Notes |
5858
|:-----------------------|:-------------:|:----------:|:----------:|:-------------------------------:|:------------------:|
59-
| Arabic* | `ar` | ✓ | | | |
60-
| Czech* | `cs` | ✓ | | | |
59+
| Arabic | `ar` | ✓ | | | |
60+
| Czech | `cs` | ✓ | | | |
6161
| Chinese-Simplified | `zh-hans` | ✓ | | | `zh` also accepted |
62-
| Chinese-Traditional* | `zh-hant` | ✓ | | | |
63-
| Danish* | `da` | ✓ | | | |
64-
| Dutch* | `nl` | ✓ | | | |
65-
| English | `en` | ✓ | ✓ | 10-01-2019 | |
66-
| Finnish* | `fi` | ✓ | | | |
62+
| Chinese-Traditional | `zh-hant` | ✓ | | | |
63+
| Danish | `da` | ✓ | | | |
64+
| Dutch | `nl` | ✓ | | | |
65+
| English | `en` | ✓ | ✓ | 2019-10-01 | |
66+
| Finnish | `fi` | ✓ | | | |
6767
| French | `fr` | ✓ | | | |
6868
| German | `de` | ✓ | | | |
69-
| Hebrew* | `he` | ✓ | | | |
70-
| Hungarian* | `hu` | ✓ | | | |
71-
| Italian* | `it` | ✓ | | | |
72-
| Japanese* | `ja` | ✓ | | | |
73-
| Korean* | `ko` | ✓ | | | |
74-
| Norwegian (Bokmål)* | `no` | ✓ | | | `nb` also accepted |
75-
| Polish* | `pl` | ✓ | | | |
76-
| Portuguese (Portugal)* | `pt-PT` | ✓ | | | `pt` also accepted |
77-
| Portuguese (Brazil)* | `pt-BR` | ✓ | | | |
78-
| Russian* | `ru` | ✓ | | | |
79-
| Spanish* | `es` | ✓ | | | |
80-
| Swedish* | `sv` | ✓ | | | |
81-
| Turkish* | `tr` | ✓ | | | |
69+
| Hebrew | `he` | ✓ | | | |
70+
| Hungarian | `hu` | ✓ | | | |
71+
| Italian | `it` | ✓ | | | |
72+
| Japanese | `ja` | ✓ | | | |
73+
| Korean | `ko` | ✓ | | | |
74+
| Norwegian (Bokmål) | `no` | ✓ | | | `nb` also accepted |
75+
| Polish | `pl` | ✓ | | | |
76+
| Portuguese (Portugal) | `pt-PT` | ✓ | | | `pt` also accepted |
77+
| Portuguese (Brazil) | `pt-BR` | ✓ | | | |
78+
| Russian | `ru` | ✓ | | | |
79+
| Spanish | `es` | ✓ | | | |
80+
| Swedish | `sv` | ✓ | | | |
81+
| Turkish | `tr` | ✓ | | | |
8282

8383
#### [Key phrase extraction](#tab/key-phrase-extraction)
8484

8585
| Language | Language code | v2 support | v3 support | Available starting with v3 model version: | Notes |
8686
|:----------------------|:-------------:|:----------:|:----------:|:-----------------------------------------:|:------------------:|
87-
| Dutch | `nl` | ✓ | ✓ | 10-01-2019 | |
88-
| English | `en` | ✓ | ✓ | 10-01-2019 | |
89-
| Finnish | `fi` | ✓ | ✓ | 10-01-2019 | |
90-
| French | `fr` | ✓ | ✓ | 10-01-2019 | |
91-
| German | `de` | ✓ | ✓ | 10-01-2019 | |
92-
| Italian | `it` | ✓ | ✓ | 10-01-2019 | |
93-
| Japanese | `ja` | ✓ | ✓ | 10-01-2019 | |
94-
| Korean | `ko` | ✓ | ✓ | 10-01-2019 | |
95-
| Norwegian (Bokmål) | `no` | ✓ | ✓ | 10-01-2019 | `nb` also accepted |
96-
| Polish | `pl` | ✓ | ✓ | 10-01-2019 | |
97-
| Portuguese (Portugal) | `pt-PT` | ✓ | ✓ | 10-01-2019 | `pt` also accepted |
98-
| Portuguese (Brazil) | `pt-BR` | ✓ | ✓ | 10-01-2019 | |
99-
| Russian | `ru` | ✓ | ✓ | 10-01-2019 | |
100-
| Spanish | `es` | ✓ | ✓ | 10-01-2019 | |
101-
| Swedish | `sv` | ✓ | ✓ | 10-01-2019 | |
87+
| Dutch | `nl` | ✓ | ✓ | 2019-10-01 | |
88+
| English | `en` | ✓ | ✓ | 2019-10-01 | |
89+
| Finnish | `fi` | ✓ | ✓ | 2019-10-01 | |
90+
| French | `fr` | ✓ | ✓ | 2019-10-01 | |
91+
| German | `de` | ✓ | ✓ | 2019-10-01 | |
92+
| Italian | `it` | ✓ | ✓ | 2019-10-01 | |
93+
| Japanese | `ja` | ✓ | ✓ | 2019-10-01 | |
94+
| Korean | `ko` | ✓ | ✓ | 2019-10-01 | |
95+
| Norwegian (Bokmål) | `no` | ✓ | ✓ | 2019-10-01 | `nb` also accepted |
96+
| Polish | `pl` | ✓ | ✓ | 2019-10-01 | |
97+
| Portuguese (Portugal) | `pt-PT` | ✓ | ✓ | 2019-10-01 | `pt` also accepted |
98+
| Portuguese (Brazil) | `pt-BR` | ✓ | ✓ | 2019-10-01 | |
99+
| Russian | `ru` | ✓ | ✓ | 2019-10-01 | |
100+
| Spanish | `es` | ✓ | ✓ | 2019-10-01 | |
101+
| Swedish | `sv` | ✓ | ✓ | 2019-10-01 | |
102102

103103
#### [Entity linking](#tab/entity-linking)
104104

105105
| Language | Language code | v2 support | v3 support | Available starting with v3 model version: | Notes |
106106
|:---------|:-------------:|:----------:|:----------:|:-----------------------------------------:|:-----:|
107-
| English | `en` | ✓ | ✓ | 10-01-2019 | |
108-
| Spanish | `es` | ✓ | ✓ | 10-01-2019 | |
107+
| English | `en` | ✓ | ✓ | 2019-10-01 | |
108+
| Spanish | `es` | ✓ | ✓ | 2019-10-01 | |
109109

110110
#### [Language Detection](#tab/language-detection)
111111

0 commit comments

Comments
 (0)