diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-10-11 08:27:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-11 08:27:50 -0700 |
| commit | 1c8a5734ce669e72ae2c64327e7e0ee15f54d722 (patch) | |
| tree | b216f1ecc2a2d6405f17cef0273d8e3b4c05c1d6 /res | |
| parent | a038e71dcb422a75d8a8da74a15d31e7cf64219a (diff) | |
| parent | 74c697c7102c66c37f1588201750236234f20b12 (diff) | |
| download | android_packages_apps_Trebuchet-1c8a5734ce669e72ae2c64327e7e0ee15f54d722.tar.gz android_packages_apps_Trebuchet-1c8a5734ce669e72ae2c64327e7e0ee15f54d722.tar.bz2 android_packages_apps_Trebuchet-1c8a5734ce669e72ae2c64327e7e0ee15f54d722.zip | |
am 74c697c7: am 80d64c28: am dfe0c293: Merge "Add entries for string resources that appear in clings" into jb-mr1-dev
* commit '74c697c7102c66c37f1588201750236234f20b12':
Add entries for string resources that appear in clings
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 19d363c7d..04e45ae01 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -261,4 +261,17 @@ s --> <string name="folder_renamed">Folder renamed to <xliff:g id="name" example="Games">%1$s</xliff:g></string> <!-- Folder name format --> <string name="folder_name_format">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g></string> + + <!-- Strings used in device overlays --> + + <!-- Clings --> + <!-- Dummy string [CHAR_LIMIT=40] --> + <add-resource type="string" name="custom_workspace_cling_title_1"/> + <!-- Dummy string [CHAR_LIMIT=60] --> + <add-resource type="string" name="custom_workspace_cling_description_1"/> + <!-- Dummy string [CHAR_LIMIT=40] --> + <add-resource type="string" name="custom_workspace_cling_title_2"/> + <!-- Dummy string [CHAR_LIMIT=60] --> + <add-resource type="string" name="custom_workspace_cling_description_2"/> + </resources> |