[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809
vikrama
vikrama at 59b500cc-1b3d-0410-9834-0bbf25fbcc57
Wed Aug 4 01:32:23 UTC 2010
The following commit has been merged in the upstream branch:
commit 9b8bacfc3ca275c7be783f02fb093b93793037a7
Author: vikrama <vikrama at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Wed Jun 23 22:26:43 2010 +0000
Connected, turned into a resource
git-svn-id: http://zxing.googlecode.com/svn/trunk@1460 59b500cc-1b3d-0410-9834-0bbf25fbcc57
diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 53c0cfa..282b070 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">إصدار ماسح الرمز الشريطي</string>
<string name="wa_name">التكوين اللاسلك</string>
<string name="wifi_changing_network">تغيير الشبكة</string>
+ <string name="wifi_connected">متصل</string>
<string name="wifi_creating_network">إنشاء شبكة</string>
<string name="wifi_modifying_network">تعديل شبكة</string>
<string name="wifi_ssid_missing">اسم الشبكة مفقود</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index ec07200..ebad2d1 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Barcode Scanner v</string>
<string name="wa_name">Bezdrátová konfigurace</string>
<string name="wifi_changing_network">Změna síť</string>
+ <string name="wifi_connected">Připojeno</string>
<string name="wifi_creating_network">Vytvoření sítě</string>
<string name="wifi_modifying_network">Úprava sítě</string>
<string name="wifi_ssid_missing">Název sítě chybí</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index c248741..4fd447c 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Barcode Scanner v</string>
<string name="wa_name">Wifi-forbindelse</string>
<string name="wifi_changing_network">Ændring Network</string>
+ <string name="wifi_connected">Connected</string>
<string name="wifi_creating_network">Oprettelse af netværk</string>
<string name="wifi_modifying_network">Ændring Network</string>
<string name="wifi_ssid_missing">Netværk navn mangler</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 2de5fc1..5611682 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -123,6 +123,7 @@
<string name="wa_name">Wifi konfiguration</string>
<string name="zxing_url">http://code.google.com/p/zxing</string>
<string name="wifi_changing_network">Ändern der Netzwerkeinstellungen</string>
+ <string name="wifi_connected">Verbunden</string>
<string name="wifi_creating_network">Erstellen Network</string>
<string name="wifi_modifying_network">Ändern Network</string>
<string name="wifi_ssid_missing">Netzwerk-Name fehlt</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index bec26fc..4e2124d 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Escáner de código de barras v</string>
<string name="wa_name">Configuración de la red</string>
<string name="wifi_changing_network">Cambio de la red</string>
+ <string name="wifi_connected">Conectado</string>
<string name="wifi_creating_network">Creación de la Red</string>
<string name="wifi_modifying_network">Modificación de la Red</string>
<string name="wifi_ssid_missing">Nombre de la red desaparecidas</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index cc7015d..7cdde77 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Viivakoodin lukija v</string>
<string name="wa_name">Langattoman yhteyden</string>
<string name="wifi_changing_network">Vaihtaminen Verkko</string>
+ <string name="wifi_connected">Kytketty</string>
<string name="wifi_creating_network">Luominen verkoston</string>
<string name="wifi_modifying_network">Muuttaminen Verkko</string>
<string name="wifi_ssid_missing">Verkon nimi puuttuu</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index c5048f6..1f0ebfe 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Barcode Scanner v</string>
<string name="wa_name">Configuration du réseau</string>
<string name="wifi_changing_network">Changement de réseau</string>
+ <string name="wifi_connected">Lié</string>
<string name="wifi_creating_network">Création d\u0026#39;un réseau</string>
<string name="wifi_modifying_network">Modification du réseau</string>
<string name="wifi_ssid_missing">Le nom du réseau disparus</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 763cb08..98da326 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Barcode Scanner v</string>
<string name="wa_name">Hálózati konfiguráció</string>
<string name="wifi_changing_network">Változó Hálózat</string>
+ <string name="wifi_connected">Összefüggő</string>
<string name="wifi_creating_network">Hálózat létrehozása</string>
<string name="wifi_modifying_network">Módosítása Hálózat</string>
<string name="wifi_ssid_missing">A hálózat neve hiányzik</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 4f9d8b6..3ed38c7 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Scansione codice a barre v</string>
<string name="wa_name">Configurazione di rete</string>
<string name="wifi_changing_network">Cambiare Network</string>
+ <string name="wifi_connected">Collegato</string>
<string name="wifi_creating_network">Creazione di rete</string>
<string name="wifi_modifying_network">Modifica della rete</string>
<string name="wifi_ssid_missing">Nome della rete mancante</string>
diff --git a/android/res/values-ja-rJP/strings.xml b/android/res/values-ja-rJP/strings.xml
index 3c202df..822b4be 100644
--- a/android/res/values-ja-rJP/strings.xml
+++ b/android/res/values-ja-rJP/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">>QRコードスキャナー v</string>
<string name="wa_name">ネットワーク構成</string>
<string name="wifi_changing_network">ネットワークを変更する</string>
+ <string name="wifi_connected">接続</string>
<string name="wifi_creating_network">作成ネットワーク</string>
<string name="wifi_modifying_network">ネットワークを変更する</string>
<string name="wifi_ssid_missing">ネットワーク名を欠いて</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index ee387dd..541f666 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Barcode Scanner v</string>
<string name="wa_name">Netwerkconfiguratie</string>
<string name="wifi_changing_network">Veranderen van Netwerk</string>
+ <string name="wifi_connected">Aangesloten</string>
<string name="wifi_creating_network">Creating Network</string>
<string name="wifi_modifying_network">Het wijzigen van Netwerk</string>
<string name="wifi_ssid_missing">Netwerk naam ontbreekt</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 1d794a2..fe86873 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Skaner Kodów Paskowych v</string>
<string name="wa_name">Konfiguracja sieci</string>
<string name="wifi_changing_network">Zmiana sieci</string>
+ <string name="wifi_connected">Połączony</string>
<string name="wifi_creating_network">Tworzenie sieci</string>
<string name="wifi_modifying_network">Modyfikowanie sieci</string>
<string name="wifi_ssid_missing">Nazwa sieci brakuje</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 7100fa1..5073721 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Scanner de código barras v</string>
<string name="wa_name">Configuração de rede</string>
<string name="wifi_changing_network">Mudar Rede</string>
+ <string name="wifi_connected">Ligado</string>
<string name="wifi_creating_network">Criação da rede</string>
<string name="wifi_modifying_network">Modificando Rede</string>
<string name="wifi_ssid_missing">Nome da rede em falta</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index e9228a5..67f2e2d 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Сканер штрих-кодов версии </string>
<string name="wa_name">конфигурации сети</string>
<string name="wifi_changing_network">Изменение сети</string>
+ <string name="wifi_connected">Связанный</string>
<string name="wifi_creating_network">Создание сети</string>
<string name="wifi_modifying_network">Изменение сети</string>
<string name="wifi_ssid_missing">Сеть отсутствует имя</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index b2bb5a6..2cbd629 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">Barcode Scanner v</string>
<string name="wa_name">Nätverkskonfiguration</string>
<string name="wifi_changing_network">Ändra Network</string>
+ <string name="wifi_connected">Ansluten</string>
<string name="wifi_creating_network">Skapa nätverk</string>
<string name="wifi_modifying_network">Modifiera nätverk</string>
<string name="wifi_ssid_missing">Nätverksnamn saknas</string>
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index 21f7187..95be73a 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">条码扫描器</string>
<string name="wa_name">网络配置</string>
<string name="wifi_changing_network">不断变化的网络</string>
+ <string name="wifi_connected">连接的</string>
<string name="wifi_creating_network">创建网络</string>
<string name="wifi_modifying_network">修改网络</string>
<string name="wifi_ssid_missing">网络实名失踪</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index fe0f7b5..d6e6247 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -122,6 +122,7 @@
<string name="title_about">條碼掃描器</string>
<string name="wa_name">網絡配置</string>
<string name="wifi_changing_network">不斷變化的網絡</string>
+ <string name="wifi_connected">連接的</string>
<string name="wifi_creating_network">創建網絡</string>
<string name="wifi_modifying_network">修改網絡</string>
<string name="wifi_ssid_missing">網絡實名失踪</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index da3200a..f19f8dc 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -122,6 +122,7 @@
<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>
diff --git a/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java b/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java
index c42852b..167bb27 100644
--- a/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java
+++ b/android/src/com/google/zxing/client/android/wifi/ConnectedReceiver.java
@@ -24,6 +24,8 @@ import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.widget.TextView;
+import com.google.zxing.client.android.R;
+
/**
* Get a broadcast when the network is connected, and kill the activity.
*/
@@ -46,7 +48,7 @@ final class ConnectedReceiver extends BroadcastReceiver {
if (i.getTypeName().contentEquals("WIFI")){
NetworkInfo.State state = i.getState();
if (state == NetworkInfo.State.CONNECTED){
- statusView.setText("Connected!");
+ statusView.setText(R.string.wifi_connected);
Runnable delayKill = new Killer(parent);
delayKill.run();
}
--
Multi-format 1D/2D barcode image processing library
More information about the Pkg-google-commits
mailing list