X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fres%2Fvalues%2Fstrings.xml;h=25b2f9e4b28d03baefcc122483fdd4a36544cf63;hb=8071bf75293c05a8ee667b2d1263278ce48b9d94;hp=ce2c0b7f73d6639f28e26c1ac284c140538c6e92;hpb=18d377b63fd95ecf328199f36da6f8fc259d3d08;p=zxing.git

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index ce2c0b7f..25b2f9e4 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -20,10 +20,12 @@
 
   <string name="button_add_calendar">Add event to calendar</string>
   <string name="button_add_contact">Add contact</string>
+  <string name="button_back">Back</string>
   <string name="button_book_search">Open Book Search</string>
   <string name="button_cancel">Cancel</string>
   <string name="button_clipboard_empty">Clipboard empty</string>
   <string name="button_dial">Dial number</string>
+  <string name="button_done">Done</string>
   <string name="button_email">Send email</string>
   <string name="button_get_directions">Get directions</string>
   <string name="button_mms">Send MMS</string>
@@ -56,33 +58,32 @@
   <string name="msg_default_contents">Contents</string>
   <string name="msg_default_format">Format</string>
   <string name="msg_default_mms_subject">Hi</string>
-  <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to read it.
+  <string name="msg_default_status">Place a barcode inside the viewfinder rectangle to scan it.
   </string>
   <string name="msg_default_type">Type</string>
   <string name="msg_encode_barcode_failed">Could not generate the requested barcode.</string>
   <string name="msg_encode_contents_failed">Could not encode a barcode from the data provided.
   </string>
   <string name="msg_encode_in_progress">Generating a barcode\u2026</string>
-  <string name="msg_help">Barcode Scanner continuously scans the viewfinder rectangle, so there\'s
-    no need to press the shutter button. If you\'re having trouble, make sure to hold the phone
-    steady. If the camera is unable to focus, try moving further back from the barcode.
-  </string>
+  <string name="msg_sbc_book_not_searchable">Sorry, this book is not searchable.</string>
   <string name="msg_sbc_failed">Sorry, the search encountered a problem.</string>
   <string name="msg_sbc_no_page_returned">No page returned</string>
   <string name="msg_sbc_page">Page</string>
   <string name="msg_sbc_snippet_unavailable">Snippet not available</string>
   <string name="msg_sbc_unknown_page">Unknown page</string>
   <string name="msg_sbc_searching_book">Searching book\u2026</string>
-  <string name="msg_share_explanation">You can share data with a friend by displaying a barcode on
-    your screen, and letting them scan it with their phone.</string>
+  <string name="msg_share_explanation">You can share data by displaying a barcode on
+    your screen and scanning it with another phone.</string>
   <string name="msg_share_subject_line">Here\'s the contents of a barcode I scanned</string>
 
+  <string name="preferences_actions_title">When a barcode is found\u2026</string>
+  <string name="preferences_copy_to_clipboard_title">Copy contents to clipboard</string>
   <string name="preferences_decode_1D_title">Decode 1D barcodes</string>
   <string name="preferences_decode_QR_title">Decode QR Codes</string>
   <string name="preferences_general_title">General settings</string>
   <string name="preferences_name">Settings</string>
-  <string name="preferences_play_beep_title">Beep when a barcode is found</string>
-  <string name="preferences_sounds_title">Sounds</string>
+  <string name="preferences_play_beep_title">Beep</string>
+  <string name="preferences_vibrate_title">Vibrate</string>
 
   <string name="result_address_book">Found contact info</string>
   <string name="result_calendar">Found calendar event</string>
@@ -99,7 +100,6 @@
   <string name="share_name">Share via barcode</string>
 
   <string name="title_about">About Barcode Scanner</string>
-  <string name="title_help">Help</string>
 
   <string name="zxing_url">http://code.google.com/p/zxing</string>
   <string name="zxing_user_agent">ZXing-Android/1.1</string>