diff options
| author | 2011-08-15 10:24:49 -0700 | |
|---|---|---|
| committer | 2011-08-15 10:24:49 -0700 | |
| commit | b3faa42f4951f485427d57d7300282e6791b38da (patch) | |
| tree | 090d2921f4b4e466433889e77aba005e8daf98d4 | |
| parent | d53944b7e6cae3fe4e1b7e890c2baaea5c8bb3a3 (diff) | |
| parent | 605a11463114ed7c6dd4d696fa03958c3685dc3c (diff) | |
Merge "Move date format strings to donottranslate.xml and add locale overrides."
| -rw-r--r-- | packages/SystemUI/res/values-bg/donottranslate.xml | 24 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-hu/donottranslate.xml | 24 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-ja/donottranslate.xml | 24 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-ko/donottranslate.xml | 24 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-lt/donottranslate.xml | 24 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-tr/donottranslate.xml | 24 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-zh-rCN/donottranslate.xml | 24 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-zh-rTW/donottranslate.xml | 24 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/donottranslate.xml | 24 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 4 |
10 files changed, 216 insertions, 4 deletions
diff --git a/packages/SystemUI/res/values-bg/donottranslate.xml b/packages/SystemUI/res/values-bg/donottranslate.xml new file mode 100644 index 000000000000..dcf434db111b --- /dev/null +++ b/packages/SystemUI/res/values-bg/donottranslate.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For formatting day of week and date in DateView. Day of week precedes date by default, + but this may be overridden on a per-locale basis if necessary. --> + <string name="status_bar_date_formatter">%2$s\n%1$s</string> + +</resources> diff --git a/packages/SystemUI/res/values-hu/donottranslate.xml b/packages/SystemUI/res/values-hu/donottranslate.xml new file mode 100644 index 000000000000..dcf434db111b --- /dev/null +++ b/packages/SystemUI/res/values-hu/donottranslate.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For formatting day of week and date in DateView. Day of week precedes date by default, + but this may be overridden on a per-locale basis if necessary. --> + <string name="status_bar_date_formatter">%2$s\n%1$s</string> + +</resources> diff --git a/packages/SystemUI/res/values-ja/donottranslate.xml b/packages/SystemUI/res/values-ja/donottranslate.xml new file mode 100644 index 000000000000..dcf434db111b --- /dev/null +++ b/packages/SystemUI/res/values-ja/donottranslate.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For formatting day of week and date in DateView. Day of week precedes date by default, + but this may be overridden on a per-locale basis if necessary. --> + <string name="status_bar_date_formatter">%2$s\n%1$s</string> + +</resources> diff --git a/packages/SystemUI/res/values-ko/donottranslate.xml b/packages/SystemUI/res/values-ko/donottranslate.xml new file mode 100644 index 000000000000..dcf434db111b --- /dev/null +++ b/packages/SystemUI/res/values-ko/donottranslate.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For formatting day of week and date in DateView. Day of week precedes date by default, + but this may be overridden on a per-locale basis if necessary. --> + <string name="status_bar_date_formatter">%2$s\n%1$s</string> + +</resources> diff --git a/packages/SystemUI/res/values-lt/donottranslate.xml b/packages/SystemUI/res/values-lt/donottranslate.xml new file mode 100644 index 000000000000..dcf434db111b --- /dev/null +++ b/packages/SystemUI/res/values-lt/donottranslate.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For formatting day of week and date in DateView. Day of week precedes date by default, + but this may be overridden on a per-locale basis if necessary. --> + <string name="status_bar_date_formatter">%2$s\n%1$s</string> + +</resources> diff --git a/packages/SystemUI/res/values-tr/donottranslate.xml b/packages/SystemUI/res/values-tr/donottranslate.xml new file mode 100644 index 000000000000..dcf434db111b --- /dev/null +++ b/packages/SystemUI/res/values-tr/donottranslate.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For formatting day of week and date in DateView. Day of week precedes date by default, + but this may be overridden on a per-locale basis if necessary. --> + <string name="status_bar_date_formatter">%2$s\n%1$s</string> + +</resources> diff --git a/packages/SystemUI/res/values-zh-rCN/donottranslate.xml b/packages/SystemUI/res/values-zh-rCN/donottranslate.xml new file mode 100644 index 000000000000..dcf434db111b --- /dev/null +++ b/packages/SystemUI/res/values-zh-rCN/donottranslate.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For formatting day of week and date in DateView. Day of week precedes date by default, + but this may be overridden on a per-locale basis if necessary. --> + <string name="status_bar_date_formatter">%2$s\n%1$s</string> + +</resources> diff --git a/packages/SystemUI/res/values-zh-rTW/donottranslate.xml b/packages/SystemUI/res/values-zh-rTW/donottranslate.xml new file mode 100644 index 000000000000..dcf434db111b --- /dev/null +++ b/packages/SystemUI/res/values-zh-rTW/donottranslate.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For formatting day of week and date in DateView. Day of week precedes date by default, + but this may be overridden on a per-locale basis if necessary. --> + <string name="status_bar_date_formatter">%2$s\n%1$s</string> + +</resources> diff --git a/packages/SystemUI/res/values/donottranslate.xml b/packages/SystemUI/res/values/donottranslate.xml new file mode 100644 index 000000000000..c25a5b7e2ff3 --- /dev/null +++ b/packages/SystemUI/res/values/donottranslate.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- For formatting day of week and date in DateView. Day of week precedes date by default, + but this may be overridden on a per-locale basis if necessary. --> + <string name="status_bar_date_formatter">%1$s\n%2$s</string> + +</resources> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 03b82fd0516b..7779703a0e7e 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -41,10 +41,6 @@ <!-- Title shown in recents popup for inspecting an application's properties --> <string name="status_bar_recent_inspect_item_title">Inspect</string> - <!-- For formatting day of week and date in DateView. Day of week precedes date by default, - but this may be overridden on a per-locale basis if necessary. --> - <string name="status_bar_date_formatter">%1$s\n%2$s</string> - <!-- The label in the bar at the top of the status bar when there are no notifications showing. [CHAR LIMIT=40]--> <string name="status_bar_no_notifications_title">No notifications</string> |