X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=android%2Fres%2Fvalues%2Fstrings.xml;h=4faec4fe7d4c0f382af4a740660558293893fe18;hb=dfd8c1e623514366161858e9fc22c9a85009a298;hp=286d7635a9eb896ac88e3f01fd65cb5bd20e454d;hpb=a48f3a059a3838500650f73151134167176d5579;p=zxing.git

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 286d7635..4faec4fe 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -15,9 +15,9 @@
  limitations under the License.
  -->
 <resources>
+  <string name="app_picker_name">Applications</string>
   <string name="app_name">Barcode Scanner</string>
   <string name="bookmark_picker_name">Bookmarks</string>
-
   <string name="button_add_calendar">Add to calendar</string>
   <string name="button_add_contact">Add contact</string>
   <string name="button_back">Back</string>
@@ -29,47 +29,49 @@
   <string name="button_done">Done</string>
   <string name="button_email">Send email</string>
   <string name="button_get_directions">Get directions</string>
+  <string name="button_google_shopper">Google Shopper</string>
   <string name="button_mms">Send MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Open browser</string>
   <string name="button_product_search">Product Search</string>
-  <string name="button_search_book_contents">Search book contents</string>
+  <string name="button_search_book_contents">Search contents</string>
   <string name="button_read_book">Browse book</string>
-  <string name="button_share_bookmark">Share bookmark</string>
+  <string name="button_share_app">Application</string>
+  <string name="button_share_bookmark">Bookmark</string>
   <string name="button_share_by_email">Share via email</string>
   <string name="button_share_by_sms">Share via SMS</string>
-  <string name="button_share_clipboard">Share clipboard</string>
-  <string name="button_share_contact">Share contact</string>
+  <string name="button_share_clipboard">Clipboard</string>
+  <string name="button_share_contact">Contact</string>
   <string name="button_show_map">Show map</string>
   <string name="button_sms">Send SMS</string>
   <string name="button_web_search">Web search</string>
-
   <string name="contents_contact">Contact info</string>
   <string name="contents_email">Email address</string>
   <string name="contents_location">Geographic coordinates</string>
   <string name="contents_phone">Phone number</string>
   <string name="contents_sms">SMS address</string>
   <string name="contents_text">Plain text</string>
-
   <string name="menu_about">About</string>
   <string name="menu_help">Help</string>
   <string name="menu_settings">Settings</string>
   <string name="menu_history">History</string>
   <string name="menu_share">Share</string>
-
   <string name="msg_about">Based on the open source ZXing Barcode Library</string>
+  <string name="msg_buggy">This device has known bugs that cause barcode scanning problems. For more information, visit http://code.google.com/p/zxing/wiki/FrequentlyAskedQuestions</string>
+  <string name="msg_camera_framework_bug">Sorry, the Android camera encountered a problem. You may need to restart the device.</string>
   <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 scan it.
-  </string>
+  <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_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_intent_failed">Sorry, the requested application could not be launched.
-    The barcode contents may be invalid.</string>
+  <string name="msg_google_shopper_missing">Google Shopper is not installed</string>
+  <string name="msg_install_google_shopper">Google Shopper combines barcode scanning with prices, reviews and more without opening the browser. Would you like to try it?</string>
+  <string name="msg_intent_failed">Sorry, the requested application could not be launched. The barcode contents may be invalid.</string>
+  <string name="msg_loading_apps">Loading list of applications\u2026</string>
+  <string name="msg_not_our_results">You are leaving this application. The search results you will see are not related to this application.</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>
@@ -77,10 +79,8 @@
   <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 by displaying a barcode on
-    your screen and scanning it with another 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 to clipboard</string>
   <string name="preferences_decode_1D_title">Decode 1D barcodes</string>
@@ -91,9 +91,7 @@
   <string name="preferences_vibrate_title">Vibrate</string>
   <string name="preferences_result_title">Result settings</string>
   <string name="preferences_custom_product_search_title">Custom search URL</string>
-  <string name="preferences_custom_product_search_summary">Use %s as a placeholder for the product
-    ID</string>
-
+  <string name="preferences_custom_product_search_summary">Use %s as a placeholder for the product ID</string>
   <string name="result_address_book">Found contact info</string>
   <string name="result_calendar">Found calendar event</string>
   <string name="result_email_address">Found email address</string>
@@ -104,14 +102,12 @@
   <string name="result_tel">Found phone number</string>
   <string name="result_text">Found plain text</string>
   <string name="result_uri">Found URL</string>
-
   <string name="history_title">History</string>
   <string name="history_clear_text">Clear history</string>
-
+  <string name="history_send">Send history</string>
+  <string name="history_email_title">Barcode Scanner history</string>
   <string name="sbc_name">Google Book Search</string>
   <string name="share_name">Share via barcode</string>
-
   <string name="title_about">Barcode Scanner v</string>
-
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>