diff options
| author | Adrian Roos <roosa@google.com> | 2014-01-15 02:40:11 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 02:40:11 -0800 |
| commit | 3d2d6e32c47e24f1bb9f96eb456554d96338e358 (patch) | |
| tree | 4bc36b62b4994f8b9110efbb9d0914199168e886 /res | |
| parent | b733218c53b260bc6c9a3703a39d356152890ca0 (diff) | |
| parent | 33778ec01983646a7941c9b274618126cf1f464e (diff) | |
| download | android_packages_apps_Trebuchet-3d2d6e32c47e24f1bb9f96eb456554d96338e358.tar.gz android_packages_apps_Trebuchet-3d2d6e32c47e24f1bb9f96eb456554d96338e358.tar.bz2 android_packages_apps_Trebuchet-3d2d6e32c47e24f1bb9f96eb456554d96338e358.zip | |
am 33778ec0: Merge "Replace "hotseat" with "Favorites tray" in user visible strings." into jb-ub-now-kermit
* commit '33778ec01983646a7941c9b274618126cf1f464e':
Replace "hotseat" with "Favorites tray" in user visible strings.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 66bd36fb0..2c6306a56 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -85,9 +85,9 @@ s --> <!-- Error message when user has filled a home screen --> <string name="out_of_space">No more room on this Home screen.</string> <!-- Error message when user has filled the hotseat --> - <string name="hotseat_out_of_space">No more room on the hotseat.</string> + <string name="hotseat_out_of_space">No more room in the Favorites tray</string> <!-- Error message when user tries to drop an invalid item on the hotseat --> - <string name="invalid_hotseat_item">This widget is too large for the hotseat.</string> + <string name="invalid_hotseat_item">This widget is too large for the Favorites tray</string> <!-- Message displayed when a shortcut is created by an external application --> <string name="shortcut_installed">Shortcut \"<xliff:g id="name" example="Browser">%s</xliff:g>\" created.</string> <!-- Message displayed when a shortcut is uninstalled by an external application --> |