mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc fixes from Lachezar

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2385 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-08-07 14:48:35 +00:00
parent 3faf91672e
commit 35d81298a0
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/res/values-bg/strings.xml
View file

@ -54,13 +54,13 @@
<string name="history_clear_one_history_text">Изчисти</string> <string name="history_clear_one_history_text">Изчисти</string>
<string name="history_clear_text">Изчисти историята</string> <string name="history_clear_text">Изчисти историята</string>
<string name="history_email_title">История на Баркод Скенера</string> <string name="history_email_title">История на Баркод Скенера</string>
<string name="history_empty">Празен</string> <string name="history_empty">Празно</string>
<string name="history_empty_detail">Не баркод сканиране са записани още</string> <string name="history_empty_detail">Няма сканирани и записани бар-кодове все още</string>
<string name="history_send">Изпрати историята</string> <string name="history_send">Изпрати историята</string>
<string name="history_title">История</string> <string name="history_title">История</string>
<string name="menu_about">Относно</string> <string name="menu_about">Относно</string>
<string name="menu_encode_mecard">Използвайте MECARD</string> <string name="menu_encode_mecard">Използвай MECARD формат</string>
<string name="menu_encode_vcard">Използвайте vCard</string> <string name="menu_encode_vcard">Използвай vCard формат</string>
<string name="menu_help">Помощ</string> <string name="menu_help">Помощ</string>
<string name="menu_history">История</string> <string name="menu_history">История</string>
<string name="menu_settings">Настройки</string> <string name="menu_settings">Настройки</string>
@ -99,14 +99,14 @@
<string name="preferences_bulk_mode_summary">Сканирай и запомняй множество баркодове без прекъсване</string> <string name="preferences_bulk_mode_summary">Сканирай и запомняй множество баркодове без прекъсване</string>
<string name="preferences_bulk_mode_title">Масово сканиране</string> <string name="preferences_bulk_mode_title">Масово сканиране</string>
<string name="preferences_copy_to_clipboard_title">Копиране в клипборда</string> <string name="preferences_copy_to_clipboard_title">Копиране в клипборда</string>
<string name="preferences_custom_product_search_summary" formatted="false">Използвайте: %s = съдържанието,%f = форматa, %t = тип</string> <string name="preferences_custom_product_search_summary" formatted="false">Използвайте: %s за съдържанието,%f за форматa, %t за типа</string>
<string name="preferences_custom_product_search_title">Потребителски адрес за търсене</string> <string name="preferences_custom_product_search_title">Потребителски адрес за търсене</string>
<string name="preferences_decode_1D_title">1D Баркодове</string> <string name="preferences_decode_1D_title">1D Баркодове</string>
<string name="preferences_decode_Data_Matrix_title">Data Matrix</string> <string name="preferences_decode_Data_Matrix_title">Data Matrix</string>
<string name="preferences_decode_QR_title">QR Баркодове</string> <string name="preferences_decode_QR_title">QR Баркодове</string>
<string name="preferences_device_bug_workarounds_title">Заобикаляне на устройствата за грешки</string> <string name="preferences_device_bug_workarounds_title">Заобикаляне на проблеми</string>
<string name="preferences_disable_continuous_focus_summary">Използвайте само стандартен режим фокус</string> <string name="preferences_disable_continuous_focus_summary">Използване само на стандартен режим за фокусиране</string>
<string name="preferences_disable_continuous_focus_title">Няма непрекъснато фокус</string> <string name="preferences_disable_continuous_focus_title">Без непрекъснат фокус</string>
<string name="preferences_front_light_summary">Подобрява четенето при лошо осветление, но предизвиква отблясъци. Само за някои модели.</string> <string name="preferences_front_light_summary">Подобрява четенето при лошо осветление, но предизвиква отблясъци. Само за някои модели.</string>
<string name="preferences_front_light_title">Използвай фенерче</string> <string name="preferences_front_light_title">Използвай фенерче</string>
<string name="preferences_general_title">Общи настройки</string> <string name="preferences_general_title">Общи настройки</string>

2
android/src/com/google/zxing/client/android/common/executor/DefaultAsyncTaskExecInterface.java
View file

@ -26,7 +26,7 @@ public final class DefaultAsyncTaskExecInterface implements AsyncTaskExecInterfa
@Override @Override
public <T> void execute(AsyncTask<T,?,?> task, T... args) { public <T> void execute(AsyncTask<T,?,?> task, T... args) {
task.execute(); task.execute(args);
} }
} }

8
android/src/com/google/zxing/client/android/encode/EncodeActivity.java
View file

@ -20,6 +20,7 @@ import android.view.Display;
import android.view.MenuInflater; import android.view.MenuInflater;
import android.view.WindowManager; import android.view.WindowManager;
import com.google.zxing.WriterException; import com.google.zxing.WriterException;
import com.google.zxing.client.android.Contents;
import com.google.zxing.client.android.FinishListener; import com.google.zxing.client.android.FinishListener;
import com.google.zxing.client.android.Intents; import com.google.zxing.client.android.Intents;
import com.google.zxing.client.android.R; import com.google.zxing.client.android.R;
@ -81,8 +82,13 @@ public final class EncodeActivity extends Activity {
menuInflater.inflate(R.menu.encode, menu); menuInflater.inflate(R.menu.encode, menu);
boolean useVcard = qrCodeEncoder != null && qrCodeEncoder.isUseVCard(); boolean useVcard = qrCodeEncoder != null && qrCodeEncoder.isUseVCard();
int encodeNameResource = useVcard ? R.string.menu_encode_mecard : R.string.menu_encode_vcard; int encodeNameResource = useVcard ? R.string.menu_encode_mecard : R.string.menu_encode_vcard;
MenuItem encodeItem = menu.getItem(1); MenuItem encodeItem = menu.findItem(R.id.menu_encode);
encodeItem.setTitle(encodeNameResource); encodeItem.setTitle(encodeNameResource);
Intent intent = getIntent();
if (intent != null) {
String type = intent.getStringExtra(Intents.Encode.TYPE);
encodeItem.setVisible(Contents.Type.CONTACT.equals(type));
}
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);
} }