diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 17:28:57 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-10 17:28:57 -0400 |
commit | e8f0603eb631ecef5f41105711f4afdea8c6d8d8 (patch) | |
tree | 99316f7714445149ec5d973aff2e06e2233f0b99 /core | |
parent | 5b61bea7aba93fc812991116fbbf9c4dbccb4890 (diff) | |
parent | 477e3be424133570441c5c424e625ab02f25466f (diff) | |
download | frameworks_base-e8f0603eb631ecef5f41105711f4afdea8c6d8d8.zip frameworks_base-e8f0603eb631ecef5f41105711f4afdea8c6d8d8.tar.gz frameworks_base-e8f0603eb631ecef5f41105711f4afdea8c6d8d8.tar.bz2 |
Merge change 24567 into eclair
* changes:
Fix issue #1943927: need notification in status bar when adb is active
Diffstat (limited to 'core')
-rw-r--r-- | core/res/res/values/strings.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 250612f..1107e43 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -1848,7 +1848,7 @@ <!-- Title of notification shown when ADB is actively connected to the phone. --> <string name="adb_active_notification_title">USB debugging connected</string> <!-- Message of notification shown when ADB is actively connected to the phone. --> - <string name="adb_active_notification_message">A computer is connected to your phone.</string> + <string name="adb_active_notification_message">Select to disable USB debugging.</string> <!-- Used to replace %s in urls retreived from the signin server with locales. For Some --> <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a --> @@ -1858,7 +1858,7 @@ <string name="locale_replacement">""</string> <!-- Title of the pop-up dialog in which the user switches input method components. --> - <string name="select_input_method">Select Input Method</string> + <string name="select_input_method">Select input method</string> <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string> <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string> |