diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 69718b72a..22848a2bc 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">إشارات مرجعية</string>
   <string name="button_add_calendar">إضافة إلى التقويم</string>
   <string name="button_add_contact">إضافة جهة اتصال</string>
-  <string name="button_back">السابق</string>
   <string name="button_book_search">بحث في الكتب</string>
   <string name="button_cancel">إلغاء</string>
   <string name="button_custom_product_search">بحث مخصص</string>
   <string name="button_dial">طلب رقم</string>
-  <string name="button_done">تم</string>
   <string name="button_email">إرسال بريد</string>
   <string name="button_get_directions">معرفة الاتجاهات</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index e8af217b5..02074d583 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Отметки</string>
   <string name="button_add_calendar">Добави в календар</string>
   <string name="button_add_contact">Добави контакт</string>
-  <string name="button_back">Обратно</string>
   <string name="button_book_search">Търси Книга</string>
   <string name="button_cancel">Отказ</string>
   <string name="button_custom_product_search">Потребителско търсене</string>
   <string name="button_dial">Набери телефон</string>
-  <string name="button_done">Готово</string>
   <string name="button_email">Изпрати поща</string>
   <string name="button_get_directions">Навигация</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index 245b0ce3f..1b04a8552 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Adreces d\'interès</string>
   <string name="button_add_calendar">Afegeix a l\'agenda</string>
   <string name="button_add_contact">Afegeix el contact</string>
-  <string name="button_back">Enrere</string>
   <string name="button_book_search">Cerca el llibre</string>
   <string name="button_cancel">Cancel·la</string>
   <string name="button_custom_product_search">Cerca personalitzada</string>
   <string name="button_dial">Marca el número</string>
-  <string name="button_done">Fet</string>
   <string name="button_email">Envia un correu electrònic</string>
   <string name="button_get_directions">Obté direccions</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 509a62eb7..bc89edbb6 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Záložky</string>
   <string name="button_add_calendar">Přidat do kalendáře</string>
   <string name="button_add_contact">Přidat kontakt</string>
-  <string name="button_back">Zpět</string>
   <string name="button_book_search">Hledat knihu</string>
   <string name="button_cancel">Zrušit</string>
   <string name="button_custom_product_search">Vlastní vyhledávání</string>
   <string name="button_dial">Číselník</string>
-  <string name="button_done">Hotovo</string>
   <string name="button_email">Poslat emailem</string>
   <string name="button_get_directions">Získat nastavení</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 86294afc9..e9bb9aba2 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Bogmærker</string>
   <string name="button_add_calendar">Tilføj til kalendar</string>
   <string name="button_add_contact">Tilføj kontaktperson</string>
-  <string name="button_back">Tilbage</string>
   <string name="button_book_search">Bogsøgning</string>
   <string name="button_cancel">Annullér</string>
   <string name="button_custom_product_search">Brugerdefineret søgning</string>
   <string name="button_dial">Ring til nummeret</string>
-  <string name="button_done">Færdig</string>
   <string name="button_email">Send e-mail</string>
   <string name="button_get_directions">Få kørselsanvisninger</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 9bf575a91..13fa962f3 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Lesezeichen</string>
   <string name="button_add_calendar">Termin hinzufügen</string>
   <string name="button_add_contact">Kontakt hinzufügen</string>
-  <string name="button_back">Zurück</string>
   <string name="button_book_search">Büchersuche</string>
   <string name="button_cancel">Abbruch</string>
   <string name="button_custom_product_search">Benutzersuche</string>
   <string name="button_dial">Nummer wählen</string>
-  <string name="button_done">Fertig</string>
   <string name="button_email">E-Mail senden</string>
   <string name="button_get_directions">Route berechnen</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 8af09c749..7314715fd 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Σελιδοδείκτες</string>
   <string name="button_add_calendar">Προσθήκη στο ημερολόγιο</string>
   <string name="button_add_contact">Προσθήκη στις επαφές</string>
-  <string name="button_back">Πίσω</string>
   <string name="button_book_search">Αναζήτηση βιβλίων</string>
   <string name="button_cancel">Ακύρωση</string>
   <string name="button_custom_product_search">Σύνθετη αναζήτηση</string>
   <string name="button_dial">Κλήση αριθμού</string>
-  <string name="button_done">Έγινε</string>
   <string name="button_email">Αποστολή email</string>
   <string name="button_get_directions">Λάβετε κατευθύνσεις</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 72e184d6b..87b05176a 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Marcadores</string>
   <string name="button_add_calendar">Añadir al calendario</string>
   <string name="button_add_contact">Añadir contacto</string>
-  <string name="button_back">Regresar</string>
   <string name="button_book_search">Búsqueda de libros</string>
   <string name="button_cancel">Cancelar</string>
   <string name="button_custom_product_search">Búsqueda personalizada</string>
   <string name="button_dial">Marcar número</string>
-  <string name="button_done">Terminar</string>
   <string name="button_email">Enviar correo electrónico</string>
   <string name="button_get_directions">Obtener direcciones</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 0d43c4b55..89935edd1 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Laster-markak</string>
   <string name="button_add_calendar">Gehitu egutegian</string>
   <string name="button_add_contact">Gehitu kontaktua</string>
-  <string name="button_back">Atzera</string>
   <string name="button_book_search">Bilatu liburua</string>
   <string name="button_cancel">Utzi</string>
   <string name="button_custom_product_search">Bilaketa pertsonalizatua</string>
   <string name="button_dial">Markatu zenbakia</string>
-  <string name="button_done">Eginda</string>
   <string name="button_email">Bidali e-posta</string>
   <string name="button_get_directions">Lortu jarraibideak</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 420e54aa7..eed9118fb 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Kirjanmerkit</string>
   <string name="button_add_calendar">Lisää kalenteriin</string>
   <string name="button_add_contact">Lisää yhteystieto</string>
-  <string name="button_back">Takaisin</string>
   <string name="button_book_search">Kirjahaku</string>
   <string name="button_cancel">Peruuta</string>
   <string name="button_custom_product_search">Mukautettu haku</string>
   <string name="button_dial">Soita numeroon</string>
-  <string name="button_done">Valmis</string>
   <string name="button_email">Lähetä sähköpostia</string>
   <string name="button_get_directions">Hae ajo-ohjeet</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 78173f58d..f05e42d5b 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Marque-pages</string>
   <string name="button_add_calendar">Ajouter à l\'agenda</string>
   <string name="button_add_contact">Ajouter un contact</string>
-  <string name="button_back">Retour</string>
   <string name="button_book_search">Recherche de livres</string>
   <string name="button_cancel">Annuler</string>
   <string name="button_custom_product_search">Recherche personnalisée</string>
   <string name="button_dial">Composer numéro</string>
-  <string name="button_done">Terminé</string>
   <string name="button_email">Envoyer email</string>
   <string name="button_get_directions">Itinéraire</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-he/strings.xml b/android/res/values-he/strings.xml
index 4912c52b3..f4ef1e8cb 100755
--- a/android/res/values-he/strings.xml
+++ b/android/res/values-he/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">סימניות</string>
   <string name="button_add_calendar">הוסף ללוח שנה</string>
   <string name="button_add_contact">הוספת איש קשר</string>
-  <string name="button_back">חזרה</string>
   <string name="button_book_search">חיפוש ספר</string>
   <string name="button_cancel">ביטול</string>
   <string name="button_custom_product_search">חיפוש מותאם אישית</string>
   <string name="button_dial">חייג מספר</string>
-  <string name="button_done">סיים</string>
   <string name="button_email">שלח דואר אלקטרוני</string>
   <string name="button_get_directions">קבל הוראות הגעה</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-hi/strings.xml b/android/res/values-hi/strings.xml
index 1db31b59a..860d219e4 100644
--- a/android/res/values-hi/strings.xml
+++ b/android/res/values-hi/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">बुकमार्क्स</string>
   <string name="button_add_calendar">कैलेंडर के लिए जोड़ें</string>
   <string name="button_add_contact">संपर्क जोड़ें</string>
-  <string name="button_back">वापस</string>
   <string name="button_book_search">पुस्तक खोज</string>
   <string name="button_cancel">रद्द करना</string>
   <string name="button_custom_product_search">कस्टम खोज</string>
   <string name="button_dial">डायल नंबर</string>
-  <string name="button_done">ठीक है</string>
   <string name="button_email">ईमेल भेजें</string>
   <string name="button_get_directions">निर्देश प्राप्त करें</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 1474aee8e..03a484239 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Könyvjelzők</string>
   <string name="button_add_calendar">Hozzáadás a naptárhoz</string>
   <string name="button_add_contact">Névjegy hozzáadása</string>
-  <string name="button_back">Vissza</string>
   <string name="button_book_search">Könyv keresése</string>
   <string name="button_cancel">Mégse</string>
   <string name="button_custom_product_search">Egyedi keresés</string>
   <string name="button_dial">Telefonszám tárcsázása</string>
-  <string name="button_done">Kész</string>
   <string name="button_email">E-mail küldése</string>
   <string name="button_get_directions">Útvonaltervezés</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-id/strings.xml b/android/res/values-id/strings.xml
index 269cf1923..7af80ff59 100644
--- a/android/res/values-id/strings.xml
+++ b/android/res/values-id/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Bookmarks</string>
   <string name="button_add_calendar">Tambah ke kalendar</string>
   <string name="button_add_contact">Tambah kontak</string>
-  <string name="button_back">Kembali</string>
   <string name="button_book_search">Cari Buku</string>
   <string name="button_cancel">Batal</string>
   <string name="button_custom_product_search">Pencarian kustom</string>
   <string name="button_dial">Panggil nomor</string>
-  <string name="button_done">Selesai</string>
   <string name="button_email">Kirim surel</string>
   <string name="button_get_directions">Dapatkan petunjuk arah</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index 053e0fd7d..0fde12bca 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Segnalibri</string>
   <string name="button_add_calendar">Aggiungi al calendario</string>
   <string name="button_add_contact">Aggiungi ai contatti</string>
-  <string name="button_back">Indietro</string>
   <string name="button_book_search">Cerca libro</string>
   <string name="button_cancel">Annulla</string>
   <string name="button_custom_product_search">Ricerca personalizzata</string>
   <string name="button_dial">Componi numero</string>
-  <string name="button_done">Fatto</string>
   <string name="button_email">Invia email</string>
   <string name="button_get_directions">Ottieni indirizzi</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index 4912c52b3..f4ef1e8cb 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">סימניות</string>
   <string name="button_add_calendar">הוסף ללוח שנה</string>
   <string name="button_add_contact">הוספת איש קשר</string>
-  <string name="button_back">חזרה</string>
   <string name="button_book_search">חיפוש ספר</string>
   <string name="button_cancel">ביטול</string>
   <string name="button_custom_product_search">חיפוש מותאם אישית</string>
   <string name="button_dial">חייג מספר</string>
-  <string name="button_done">סיים</string>
   <string name="button_email">שלח דואר אלקטרוני</string>
   <string name="button_get_directions">קבל הוראות הגעה</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index f88dbb83e..595980055 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">ブックマーク</string>
   <string name="button_add_calendar">予定を追加</string>
   <string name="button_add_contact">連絡先を追加</string>
-  <string name="button_back">戻る</string>
   <string name="button_book_search">書籍を検索</string>
   <string name="button_cancel">キャンセル</string>
   <string name="button_custom_product_search">カスタムサーチ</string>
   <string name="button_dial">電話をかける</string>
-  <string name="button_done">完了</string>
   <string name="button_email">メールの送信</string>
   <string name="button_get_directions">経路を検索</string>
   <string name="button_google_shopper">Google Shopper</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index d259fd768..42cf094da 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">즐겨찾기</string>
   <string name="button_add_calendar">일정에 추가하기</string>
   <string name="button_add_contact">연락처에 추가하기</string>
-  <string name="button_back">뒤로</string>
   <string name="button_book_search">책 검색</string>
   <string name="button_cancel">취소</string>
   <string name="button_custom_product_search">사용자 지정 검색</string>
   <string name="button_dial">전화 걸기</string>
-  <string name="button_done">완료</string>
   <string name="button_email">이메일 보내기</string>
   <string name="button_get_directions">방향을 찾기</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index 4a727377b..216a6bf09 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Bladwijzers</string>
   <string name="button_add_calendar">Toevoegen aan agenda</string>
   <string name="button_add_contact">Toevoegen aan contactpersonen</string>
-  <string name="button_back">Terug</string>
   <string name="button_book_search">Boeken zoeken</string>
   <string name="button_cancel">Annuleren</string>
   <string name="button_custom_product_search">Aangepast zoeken</string>
   <string name="button_dial">Nummer bellen</string>
-  <string name="button_done">Gereed</string>
   <string name="button_email">E-mail versturen</string>
   <string name="button_get_directions">Routebeschrijving opvragen</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index 9f7d688fc..e3955f7b5 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Zakładki</string>
   <string name="button_add_calendar">Dodaj do kalendarza</string>
   <string name="button_add_contact">Dodaj kontakt</string>
-  <string name="button_back">Wstecz</string>
   <string name="button_book_search">Szukaj książek</string>
   <string name="button_cancel">Anuluj</string>
   <string name="button_custom_product_search">Wyszukiwanie indywidualne</string>
   <string name="button_dial">Zadzwoń</string>
-  <string name="button_done">Gotowe</string>
   <string name="button_email">Wyślij email</string>
   <string name="button_get_directions">Wskazówki</string>
   <string name="button_google_shopper">Sklep</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 0111ac9fb..6dc94116d 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Favoritos</string>
   <string name="button_add_calendar">Adicionar ao calendário</string>
   <string name="button_add_contact">Adicionar contacto</string>
-  <string name="button_back">Voltar</string>
   <string name="button_book_search">Procurar livro</string>
   <string name="button_cancel">Cancelar</string>
   <string name="button_custom_product_search">Pesquisa Personalizada</string>
   <string name="button_dial">Marcar número</string>
-  <string name="button_done">Feito</string>
   <string name="button_email">Enviar e-mail</string>
   <string name="button_get_directions">Obter direcções</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 413f0a970..e2aee9d36 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Nume însemnare</string>
   <string name="button_add_calendar">Adaugă în calendar</string>
   <string name="button_add_contact">Adaugă contact</string>
-  <string name="button_back">Înapoi</string>
   <string name="button_book_search">Caută carte</string>
   <string name="button_cancel">Renunță</string>
   <string name="button_custom_product_search">Căutare personalizată</string>
   <string name="button_dial">Telefonează la numărul</string>
-  <string name="button_done">Realizat</string>
   <string name="button_email">Trimite e-mail</string>
   <string name="button_get_directions">Descarcă indicații</string>
   <string name="button_google_shopper">Cumpărător Google</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index a96e07efe..6984aaeb2 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Закладки</string>
   <string name="button_add_calendar">Добавить в календарь</string>
   <string name="button_add_contact">Добавить контакт</string>
-  <string name="button_back">Назад</string>
   <string name="button_book_search">Поиск книги</string>
   <string name="button_cancel">Отмена</string>
   <string name="button_custom_product_search">Пользовательский поиск</string>
   <string name="button_dial">Набрать номер</string>
-  <string name="button_done">Готово</string>
   <string name="button_email">Отправить e-mail</string>
   <string name="button_get_directions">Проложить маршрут</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 448d1be02..fefc7d8e1 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Záložky</string>
   <string name="button_add_calendar">Pridať do kalendára</string>
   <string name="button_add_contact">Pridať kontakt</string>
-  <string name="button_back">Späť</string>
   <string name="button_book_search">Hľadať knihu</string>
   <string name="button_cancel">Zrušiť</string>
   <string name="button_custom_product_search">Prispôsobené vyhľadávanie</string>
   <string name="button_dial">Vytočiť číslo</string>
-  <string name="button_done">Hotovo</string>
   <string name="button_email">Poslať e-mail</string>
   <string name="button_get_directions">Získať pokyny</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-sl/strings.xml b/android/res/values-sl/strings.xml
index 2c64bbadc..4808b6378 100644
--- a/android/res/values-sl/strings.xml
+++ b/android/res/values-sl/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Zaznamki</string>
   <string name="button_add_calendar">Dodaj v koledar</string>
   <string name="button_add_contact">Dodaj kontakt</string>
-  <string name="button_back">Nazaj</string>
   <string name="button_book_search">Išči knjigo</string>
   <string name="button_cancel">Prekliči</string>
   <string name="button_custom_product_search">Iskanje po meri</string>
   <string name="button_dial">Pokliči številko</string>
-  <string name="button_done">Končano</string>
   <string name="button_email">Pošlji e-mail</string>
   <string name="button_get_directions">Dobi smer</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 62165bae2..843155d31 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Bokmärken</string>
   <string name="button_add_calendar">Lägg till i kalender</string>
   <string name="button_add_contact">Lägg till kontakt</string>
-  <string name="button_back">Tillbaka</string>
   <string name="button_book_search">Boksökning</string>
   <string name="button_cancel">Avbryt</string>
   <string name="button_custom_product_search">Anpassad sökning</string>
   <string name="button_dial">Slå nummer</string>
-  <string name="button_done">Klar</string>
   <string name="button_email">Skicka e-post</string>
   <string name="button_get_directions">Få anvisningar</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index b55a729a7..e19a66334 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Yer imleri</string>
   <string name="button_add_calendar">Takvime ekle</string>
   <string name="button_add_contact">Kişi ekle</string>
-  <string name="button_back">Geri</string>
   <string name="button_book_search">Kitap Arama</string>
   <string name="button_cancel">İptal</string>
   <string name="button_custom_product_search">Özel arama</string>
   <string name="button_dial">Numaraya çağrı</string>
-  <string name="button_done">Tamam</string>
   <string name="button_email">Email gönder</string>
   <string name="button_get_directions">Yön bilgisi al</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index 8ba8c6def..ea6a28231 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">Закладки</string>
   <string name="button_add_calendar">Додати в календар</string>
   <string name="button_add_contact">Додати контакт</string>
-  <string name="button_back">Назад</string>
   <string name="button_book_search">Пошук книги</string>
   <string name="button_cancel">Відміна</string>
   <string name="button_custom_product_search">Користувацький пошук</string>
   <string name="button_dial">Набрати номер</string>
-  <string name="button_done">Готово</string>
   <string name="button_email">Відправити e-mail</string>
   <string name="button_get_directions">Прокласти маршрут</string>
   <string name="button_google_shopper">Shopper</string>
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index da85245e0..61c6ddac3 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">书签</string>
   <string name="button_add_calendar">添加事件至日历</string>
   <string name="button_add_contact">添加联系人</string>
-  <string name="button_back">返回</string>
   <string name="button_book_search">打开图书搜索</string>
   <string name="button_cancel">取消</string>
   <string name="button_custom_product_search">自定义搜索</string>
   <string name="button_dial">拨号</string>
-  <string name="button_done">完成</string>
   <string name="button_email">发送email</string>
   <string name="button_get_directions">获取地址</string>
   <string name="button_google_shopper">Google 购物</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index f6f5d72b7..15f2f936d 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -20,12 +20,10 @@
   <string name="bookmark_picker_name">書籤</string>
   <string name="button_add_calendar">加入事件至日曆</string>
   <string name="button_add_contact">加入聯絡人</string>
-  <string name="button_back">返回</string>
   <string name="button_book_search">打開圖書搜索</string>
   <string name="button_cancel">取消</string>
   <string name="button_custom_product_search">自定義搜索</string>
   <string name="button_dial">撥號</string>
-  <string name="button_done">完成</string>
   <string name="button_email">發送電子郵件</string>
   <string name="button_get_directions">路線規劃</string>
   <string name="button_google_shopper">Google 購物</string>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index cdc48c21e..11a0625db 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -20,12 +20,10 @@
   <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>
   <string name="button_book_search">Book Search</string>
   <string name="button_cancel">Cancel</string>
   <string name="button_custom_product_search">Custom search</string>
   <string name="button_dial">Dial number</string>
-  <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">Shopper</string>
diff --git a/androidtest/src/com/google/zxing/client/androidtest/BenchmarkActivity.java b/androidtest/src/com/google/zxing/client/androidtest/BenchmarkActivity.java
index 5f5e5029e..719c2ea1f 100755
--- a/androidtest/src/com/google/zxing/client/androidtest/BenchmarkActivity.java
+++ b/androidtest/src/com/google/zxing/client/androidtest/BenchmarkActivity.java
@@ -51,6 +51,7 @@ public final class BenchmarkActivity extends Activity {
     @Override
     public void handleMessage(Message message) {
       if (message.what == R.id.benchmark_done) {
+        @SuppressWarnings("unchecked")
         Iterable<BenchmarkItem> items = (Iterable<BenchmarkItem>) message.obj;
         int count = 0;
         int time = 0;