X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=android%2Fres%2Fvalues%2Fstrings.xml;h=47f2b9aeae32a4b31e522fb2a6f1d3a2abbee567;hp=68fcf95303ae884dbe62c52240e25764907af87b;hb=73bf85ccc1e4b58fac273ecf043104f3fb9fb28e;hpb=c3f08c66acaa0eab6529e5caffe2ac0e2a8e9093

diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 68fcf953..47f2b9ae 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (C) 2008 ZXing authors
+ Copyright (C) 2010 ZXing authors
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  limitations under the License.
  -->
 <resources>
-  <string name="app_picker_name">Applications</string>
   <string name="app_name">Barcode Scanner</string>
+  <string name="app_picker_name">Applications</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>
@@ -34,8 +34,8 @@
   <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 contents</string>
   <string name="button_read_book">Browse book</string>
+  <string name="button_search_book_contents">Search contents</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>
@@ -52,10 +52,14 @@
   <string name="contents_phone">Phone number</string>
   <string name="contents_sms">SMS address</string>
   <string name="contents_text">Plain text</string>
+  <string name="history_clear_text">Clear history</string>
+  <string name="history_email_title">Barcode Scanner history</string>
+  <string name="history_send">Send history</string>
+  <string name="history_title">History</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_settings">Settings</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>
@@ -63,14 +67,13 @@
   <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_meta">Metadata</string>
   <string name="msg_default_mms_subject">Hi</string>
-  <string name="msg_default_meta">Metadata</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_default_time">Time</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_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>
@@ -80,27 +83,28 @@
   <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_searching_book">Searching book\u2026</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 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="msg_unmount_usb">Sorry, the SD card is not accessible.</string>
   <string name="preferences_actions_title">When a barcode is found\u2026</string>
+  <string name="preferences_bulk_mode_summary">Scan and save many barcodes continuously</string>
+  <string name="preferences_bulk_mode_title">Bulk scan mode</string>
   <string name="preferences_copy_to_clipboard_title">Copy to clipboard</string>
+  <string name="preferences_custom_product_search_summary">Use %s as a placeholder for the product ID, and %f for format</string>
+  <string name="preferences_custom_product_search_title">Custom search URL</string>
   <string name="preferences_decode_1D_title">Decode 1D barcodes</string>
   <string name="preferences_decode_QR_title">Decode QR Codes</string>
+  <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare. Does not work on all phones.</string>
+  <string name="preferences_front_light_title">Use front light</string>
   <string name="preferences_general_title">General settings</string>
   <string name="preferences_name">Settings</string>
   <string name="preferences_play_beep_title">Beep</string>
-  <string name="preferences_vibrate_title">Vibrate</string>
-  <string name="preferences_front_light_title">Use front light</string>
-  <string name="preferences_front_light_summary">Improves scanning in low light on some phones, but may cause glare</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_bulk_mode_title">Bulk scan mode</string>
-  <string name="preferences_bulk_mode_summary">Scan and save many barcodes continuously</string>
+  <string name="preferences_scanning_title">When scanning for barcodes\u2026</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>
   <string name="result_email_address">Found email address</string>
@@ -109,16 +113,21 @@
   <string name="result_product">Found product</string>
   <string name="result_sms">Found SMS address</string>
   <string name="result_tel">Found phone number</string>
-  <string name="result_uri">Found URL</string>
   <string name="result_text">Found plain text</string>
+  <string name="result_uri">Found URL</string>
   <string name="result_wifi">Found Wifi Configuration</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="wa_name">Wifi Connection</string>
   <string name="title_about">Barcode Scanner v</string>
+  <string name="wa_name">Wifi Connection</string>
+  <string name="wifi_changing_network">Changing Network</string>
+  <string name="wifi_connected">Connected</string>
+  <string name="wifi_creating_network">Creating Network</string>
+  <string name="wifi_modifying_network">Modifying Network</string>
+  <string name="wifi_ssid_missing">Network name missing</string>
+  <string name="wifi_type_incorrect">Network type incorrect</string>
+  <string name="wifi_connect_failed">Network connection failed</string>  
+  <string name="wifi_ssid_label">Network Name</string>
+  <string name="wifi_type_label">Type</string>
   <string name="zxing_url">http://code.google.com/p/zxing</string>
 </resources>