diff options
author | Marco Brohet <therbom@gmail.com> | 2014-01-29 18:58:54 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-01-29 18:58:54 +0000 |
commit | 737176bd4d269d55b5b691249ad1bf4aa8a09e1c (patch) | |
tree | 7c3cb2304cfc119b0b023166f02cc42469eba0a8 /res/values | |
parent | 80f5983135e8341be62436311daf1d3a5e0d7af9 (diff) | |
parent | b1dfec3ea0a05803b123c68e93c1843faf7972e4 (diff) | |
download | android_packages_apps_Trebuchet-737176bd4d269d55b5b691249ad1bf4aa8a09e1c.tar.gz android_packages_apps_Trebuchet-737176bd4d269d55b5b691249ad1bf4aa8a09e1c.tar.bz2 android_packages_apps_Trebuchet-737176bd4d269d55b5b691249ad1bf4aa8a09e1c.zip |
Merge "Trebuchet: CS translation" into cm-11.0
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/cm_arrays.xml | 21 | ||||
-rw-r--r-- | res/values/cm_strings.xml | 19 |
2 files changed, 35 insertions, 5 deletions
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml index 5d614ab2d..502b7a65c 100644 --- a/res/values/cm_arrays.xml +++ b/res/values/cm_arrays.xml @@ -1,11 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The CyanogenMod 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> <string-array name="preferences_interface_general_icons_text_font_family_entries"> <item>Regular</item> <item>Light</item> <item>Condensed</item> </string-array> - <string-array name="preferences_interface_general_icons_text_font_family_values"> + <string-array name="preferences_interface_general_icons_text_font_family_values" translatable="false"> <item>sans-serif</item> <item>sans-serif-light</item> <item>sans-serif-condensed</item> @@ -27,7 +42,7 @@ <item>Carousel</item> <item>Overview</item> </string-array> - <string-array name="transition_effect_values"> + <string-array name="transition_effect_values" translatable="false"> <item>none</item> <item>zoom-in</item> <item>zoom-out</item> @@ -43,4 +58,4 @@ <item>carousel</item> <item>overview</item> </string-array> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 952f5c288..2bf0b4389 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -1,9 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2014 The CyanogenMod 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> <!-- Application name --> - <string name="cm_application_name">Trebuchet</string> + <string name="cm_application_name" translatable="false">Trebuchet</string> <!-- App copyright --> - <string name="application_copyright">Copyright \u00A9 2014 The CyanogenMod Project</string> + <string name="application_copyright" translatable="false">Copyright \u00A9 2014 The CyanogenMod Project</string> <!-- App version --> <string name="application_version" translatable="false">1.0</string> |