diff options
| author | Winson Chung <winsonc@google.com> | 2011-06-01 12:35:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-01 12:35:55 -0700 |
| commit | 5cf73001ae38d7ba7e911327764f04b95ed84921 (patch) | |
| tree | 4b3b33ace4175bacae6422af5692418cb4881553 /res | |
| parent | 62ddd762cec472b2890dbf8e1b5228cb1696e129 (diff) | |
| parent | 4179b4e048dd019daca053dc3a7eddf6c464b08b (diff) | |
| download | android_packages_apps_Trebuchet-5cf73001ae38d7ba7e911327764f04b95ed84921.tar.gz android_packages_apps_Trebuchet-5cf73001ae38d7ba7e911327764f04b95ed84921.tar.bz2 android_packages_apps_Trebuchet-5cf73001ae38d7ba7e911327764f04b95ed84921.zip | |
Merge "Fixing translateable attribute in strings, and click-through in AppsCustomize."
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 32e649d25..eb6558208 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,16 +21,16 @@ <!-- Manifest configuration. --> <skip /> <!-- Do not translate. android:sharedUserId of this application. --> - <string name="sharedUserId" translate="false"><xliff:g id="x"></xliff:g></string> + <string name="sharedUserId" translatable="false"><xliff:g id="x"></xliff:g></string> <!-- Do not translate. android:process of this application. --> - <string name="process" translate="false"><xliff:g id="x"></xliff:g></string> + <string name="process" translatable="false"><xliff:g id="x"></xliff:g></string> <!-- Do not translate. We wish to prioritize the Wallpaper and Live Wallpaper pickers, but because they are in a different package, we need to reference the component in a non language-dependent way. If the Live Wallpaper picker component name changes this will have to be updated as well. --> - <string name="live_wallpaper_picker_package_name" translate="false">com.android.wallpaper.livepicker</string> - <string name="live_wallpaper_picker_class_name" translate="false">com.android.wallpaper.livepicker.LiveWallpaperActivity</string> + <string name="live_wallpaper_picker_package_name" translatable="false">com.android.wallpaper.livepicker</string> + <string name="live_wallpaper_picker_class_name" translatable="false">com.android.wallpaper.livepicker.LiveWallpaperActivity</string> <!-- General --> <skip /> |