diff options
| author | Winson Chung <winsonc@google.com> | 2010-09-28 09:39:16 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2010-09-28 09:39:16 -0700 |
| commit | d0cca08e4f025963dc192d23d635d9cb0f3c4cd0 (patch) | |
| tree | e3abb7c40b406c9e37c00cac122a8a9ac04ae1be /res/values/strings.xml | |
| parent | 58c64bc48ff7bae8658360ab8501b8520554511d (diff) | |
| parent | 7ad0141905fffe5bc359581fd3001abb10d3b730 (diff) | |
| download | android_packages_apps_Trebuchet-d0cca08e4f025963dc192d23d635d9cb0f3c4cd0.tar.gz android_packages_apps_Trebuchet-d0cca08e4f025963dc192d23d635d9cb0f3c4cd0.tar.bz2 android_packages_apps_Trebuchet-d0cca08e4f025963dc192d23d635d9cb0f3c4cd0.zip | |
resolved conflicts for merge of 7ad01419 to master
Change-Id: Idcbb2ffd6f0b72610dc06fc07695e3546f80da70
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 04aea8745..98de9db2a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -128,6 +128,8 @@ <skip /> <!-- Verb, menu item used to add an item on the desktop --> <string name="menu_add">Add</string> + <!-- Menu item used to manage installed applications --> + <string name="menu_manage_apps">Manage Apps</string> <!-- Noun, menu item used to set the desktop's wallpaper --> <string name="menu_wallpaper">Wallpaper</string> <!-- Verb, menu item used to initiate global search --> |