diff options
| author | Scott Main <smain@google.com> | 2012-01-31 08:39:36 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-31 08:39:36 -0800 |
| commit | 34260ad79ede2ed35cc9859095b778f194b9650b (patch) | |
| tree | 23319d745c27edb350dfc78cb8e9e07c69a38953 /docs | |
| parent | 8bfeb10f98125706d8bb7afa1067ca563e741540 (diff) | |
| parent | b16965cf65309114cea0e197822d0410fc4de4b0 (diff) | |
| download | frameworks_base-34260ad79ede2ed35cc9859095b778f194b9650b.zip frameworks_base-34260ad79ede2ed35cc9859095b778f194b9650b.tar.gz frameworks_base-34260ad79ede2ed35cc9859095b778f194b9650b.tar.bz2 | |
Merge "docs: fix locale name; South Africa is local en_ZA external issue 23133" into ics-mr1
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/sdk/android-2.3.3.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/android-2.3.4.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/android-2.3.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/android-3.0.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/android-3.1.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/android-4.0.3.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/android-4.0.jd | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/docs/html/sdk/android-2.3.3.jd b/docs/html/sdk/android-2.3.3.jd index 7a5b044..023e2e4 100644 --- a/docs/html/sdk/android-2.3.3.jd +++ b/docs/html/sdk/android-2.3.3.jd @@ -336,7 +336,7 @@ descriptor).</p> <li>English, New Zealand (en_NZ)</li> <li>English, Singapore(en_SG)</li> <li>English, US (en_US)</li> -<li>English, Zimbabwe (en_ZA)</li> +<li>English, South Africa (en_ZA)</li> <li>Spanish (es_ES)</li> <li>Spanish, US (es_US)</li> <li>Finnish, Finland (fi_FI)</li> diff --git a/docs/html/sdk/android-2.3.4.jd b/docs/html/sdk/android-2.3.4.jd index 4cb44b9..eeaa69a 100644 --- a/docs/html/sdk/android-2.3.4.jd +++ b/docs/html/sdk/android-2.3.4.jd @@ -296,7 +296,7 @@ descriptor).</p> <li>English, New Zealand (en_NZ)</li> <li>English, Singapore(en_SG)</li> <li>English, US (en_US)</li> -<li>English, Zimbabwe (en_ZA)</li> +<li>English, South Africa (en_ZA)</li> <li>Spanish (es_ES)</li> <li>Spanish, US (es_US)</li> <li>Finnish, Finland (fi_FI)</li> diff --git a/docs/html/sdk/android-2.3.jd b/docs/html/sdk/android-2.3.jd index e7aa0fa..fc4f5aa 100644 --- a/docs/html/sdk/android-2.3.jd +++ b/docs/html/sdk/android-2.3.jd @@ -859,7 +859,7 @@ descriptor).</p> <li>English, New Zealand (en_NZ)</li> <li>English, Singapore(en_SG)</li> <li>English, US (en_US)</li> -<li>English, Zimbabwe (en_ZA)</li> +<li>English, South Africa (en_ZA)</li> <li>Spanish (es_ES)</li> <li>Spanish, US (es_US)</li> <li>Finnish, Finland (fi_FI)</li> diff --git a/docs/html/sdk/android-3.0.jd b/docs/html/sdk/android-3.0.jd index 96b92d9..49fefee 100644 --- a/docs/html/sdk/android-3.0.jd +++ b/docs/html/sdk/android-3.0.jd @@ -1119,7 +1119,7 @@ descriptor).</p> <li>English, New Zealand (en_NZ)</li> <li>English, Singapore(en_SG)</li> <li>English, US (en_US)</li> -<li>English, Zimbabwe (en_ZA)</li> +<li>English, South Africa (en_ZA)</li> <li>Spanish (es_ES)</li> <li>Spanish, US (es_US)</li> <li>Finnish, Finland (fi_FI)</li> diff --git a/docs/html/sdk/android-3.1.jd b/docs/html/sdk/android-3.1.jd index 78f265d..b9cf969 100644 --- a/docs/html/sdk/android-3.1.jd +++ b/docs/html/sdk/android-3.1.jd @@ -1040,7 +1040,7 @@ descriptor).</p> <li>English, New Zealand (en_NZ)</li> <li>English, Singapore(en_SG)</li> <li>English, US (en_US)</li> -<li>English, Zimbabwe (en_ZA)</li> +<li>English, South Africa (en_ZA)</li> <li>Spanish (es_ES)</li> <li>Spanish, US (es_US)</li> <li>Finnish, Finland (fi_FI)</li> diff --git a/docs/html/sdk/android-4.0.3.jd b/docs/html/sdk/android-4.0.3.jd index 1fca8df..809c83c 100644 --- a/docs/html/sdk/android-4.0.3.jd +++ b/docs/html/sdk/android-4.0.3.jd @@ -435,7 +435,7 @@ image are listed below (with <em>language</em>_<em>country/region</em> locale de <li>English, New Zealand (en_NZ)</li> <li>English, Singapore(en_SG)</li> <li>English, US (en_US)</li> -<li>English, Zimbabwe (en_ZA)</li> +<li>English, South Africa (en_ZA)</li> <li>Spanish (es_ES)</li> <li>Spanish, US (es_US)</li> <li>Finnish, Finland (fi_FI)</li> diff --git a/docs/html/sdk/android-4.0.jd b/docs/html/sdk/android-4.0.jd index 5f55947..2cad86b 100644 --- a/docs/html/sdk/android-4.0.jd +++ b/docs/html/sdk/android-4.0.jd @@ -1963,7 +1963,7 @@ image are listed below (with <em>language</em>_<em>country/region</em> locale de <li>English, New Zealand (en_NZ)</li> <li>English, Singapore(en_SG)</li> <li>English, US (en_US)</li> -<li>English, Zimbabwe (en_ZA)</li> +<li>English, South Africa (en_ZA)</li> <li>Spanish (es_ES)</li> <li>Spanish, US (es_US)</li> <li>Finnish, Finland (fi_FI)</li> |