diff options
| author | Eric Fischer <enf@google.com> | 2010-10-01 12:04:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 12:04:08 -0700 |
| commit | 25c52b70faceb24cade0f5480c372de3f47bdf79 (patch) | |
| tree | b8b761cfc2c9e64dd548c62f0440fb93ecfe2ecd /res | |
| parent | 3cda486cd23c3739d70681166979a3e0ea439ed3 (diff) | |
| parent | 340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74 (diff) | |
| download | packages_apps_settings-25c52b70faceb24cade0f5480c372de3f47bdf79.zip packages_apps_settings-25c52b70faceb24cade0f5480c372de3f47bdf79.tar.gz packages_apps_settings-25c52b70faceb24cade0f5480c372de3f47bdf79.tar.bz2 | |
am 340c5c42: Separate the Settings activity name into two different strings.
Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp
* commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74':
Separate the Settings activity name into two different strings.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index f1d25e3..fbf0e00 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -467,8 +467,10 @@ <!-- Button label for generic cancel action --> <string name="cancel">Cancel</string> - <!-- Main Settings screen title --> + <!-- Title of the Settings activity shown within the application itself. --> <string name="settings_label">Settings</string> + <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] --> + <string name="settings_label_launcher">Settings</string> <!-- Label for option to select a settings panel as a shortcut --> <string name="settings_shortcut">Settings</string> <!-- Wireless controls settings screen, setting check box label --> |