[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[vikrama]

The following commit has been merged in the upstream branch:
commit 037af5cbffad7082b56367b8ebb06c5ef216e084
Author: vikrama <vikrama at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Wed Jun 23 22:16:53 2010 +0000

    Change another string to a resource.
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1459 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
index 948aa45..f18282d 100644
--- a/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
+++ b/android/src/com/google/zxing/client/android/wifi/WifiActivity.java
@@ -82,7 +82,7 @@ public class WifiActivity extends Activity  {
   }
 
   private WifiConfiguration changeNetworkCommon(NetworkSetting input){
-    statusView.setText("Creating settings...");
+    statusView.setText(R.string.wifi_creating_network);
     Log.d(TAG, "Adding new configuration: \nSSID: " + input.getSsid() + "\nType: " + input.getNetworkType());
     WifiConfiguration config = new WifiConfiguration();
 

-- 
Multi-format 1D/2D barcode image processing library