summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-07-13 17:06:00 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-07-13 17:06:00 -0700
commitb2a16b9202f6daa609d152ffc2fd273088fbb1ac (patch)
tree3599d4fac162e0a69d6d67852a4c1e66875e35ed /res/values
parentfc567c2665da9d093bf3dd6868b7618f96c83183 (diff)
parentea819b07fa9e17fcd17e0384626ee6a47bc0ecd6 (diff)
downloadpackages_apps_Settings-b2a16b9202f6daa609d152ffc2fd273088fbb1ac.zip
packages_apps_Settings-b2a16b9202f6daa609d152ffc2fd273088fbb1ac.tar.gz
packages_apps_Settings-b2a16b9202f6daa609d152ffc2fd273088fbb1ac.tar.bz2
am ea819b07: Merge "Implement issue #6819955: Add button to take bug report." into jb-dev
* commit 'ea819b07fa9e17fcd17e0384626ee6a47bc0ecd6': Implement issue #6819955: Add button to take bug report.
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2d7fc44..bca1f3e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3380,6 +3380,16 @@
<!-- Summary text of the "automatic restore" setting -->
<string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string>
+ <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+ <string name="bugreport_title">Take bug report</string>
+ <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+ <string name="bugreport_message">This will collect information about your
+ current device state, to send as an e-mail message. It will take a little
+ time from starting the bug report until it is ready to be sent; please be
+ patient.</string>
+ <!-- Button in bugreport dialog to confirm starting the report [CHAR LIMIT=NONE] -->
+ <string name="report">Report</string>
+
<!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
<string name="local_backup_password_title">Desktop backup password</string>
<!-- Summary text of the "local backup password" setting when the user has not supplied a password -->