diff options
| author | Adrian Roos <roosa@google.com> | 2014-01-15 01:58:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-15 01:58:15 +0000 |
| commit | 33778ec01983646a7941c9b274618126cf1f464e (patch) | |
| tree | e4b454238063d82dea40c8228a98355c268e1608 /res | |
| parent | c27a05132042149fdcc926aeebc1a284cece1aa4 (diff) | |
| parent | a0d5a040b84a4521819306bff0c5ddb5dc5300e1 (diff) | |
| download | android_packages_apps_Trebuchet-33778ec01983646a7941c9b274618126cf1f464e.tar.gz android_packages_apps_Trebuchet-33778ec01983646a7941c9b274618126cf1f464e.tar.bz2 android_packages_apps_Trebuchet-33778ec01983646a7941c9b274618126cf1f464e.zip | |
Merge "Replace "hotseat" with "Favorites tray" in user visible strings." into jb-ub-now-kermit
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 --> |