diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index af63274..a6e69a7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -78,7 +78,7 @@
     <string name="menu_displayGroup">"Gruppe anzeigen"</string>
     <string name="syncGroupPreference">"Sync-Gruppen bearb."</string>
     <string name="importFromSim">"Kontakte importieren"</string>
-    <string name="send_to_voicemail_checkbox">"Anrufe direkt an Mailbox senden"</string>
+    <string name="send_to_voicemail_checkbox">"Anrufe direkt an Voicemail senden"</string>
     <string name="send_to_voicemail_view">"Anrufe werden direkt an Mailbox gesendet"</string>
     <string name="default_ringtone">"Standard"</string>
     <string name="addPicture">"Symbol hinzufügen"</string>
@@ -128,18 +128,18 @@
     <string name="private_num">"Private Nummer"</string>
     <string name="payphone">"Münztelefon"</string>
     <string name="dialerKeyboardHintText">"Mit Tastatur wählen"</string>
-    <string name="dialerDialpadHintText">"Nummer wählen"</string>
+    <string name="dialerDialpadHintText">"Zus. Nummer wählen"</string>
     <string name="simContacts_emptyLoading">"Ladevorgang von SIM-Karte läuft..."</string>
     <string name="simContacts_title">"Kontakte auf SIM-Karte"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synchronisieren Sie Ihre Google-Kontakte!"</font>" "\n"Nach der Synchronisierung stehen Ihnen Ihre Kontakte überall zur Verfügung."</string>
-    <string name="noContactsHelpText">"Es sind keine Kontakte vorhanden."\n\n"Drücken Sie zum Hinzufügen von Kontakten die "<font fgcolor="#ffffffff"><b>"Menütaste"</b></font>" und wählen Sie Folgendes aus:"\n\n" "<li><font fgcolor="#ffffffff"><b></b>"Neuer Kontakt"</font>\n", um einen neuen Kontakt zu erstellen"</li>\n<li>" "<font fgcolor="#ffffffff"><b></b></font>"Kontakte importieren"\n</li>", um Kontakte von Ihrer SIM-Karte hinzuzufügen"</string>
-    <string name="noContactsHelpTextWithSync">"Sie haben keine Kontakte."\n\n"Drücken Sie zum Hinzufügen die "<font fgcolor="#ffffffff"><b>"Menütaste"</b></font>" und wählen Sie"\n\n<li><font fgcolor="#ffffffff"><b>"Synchronisierungsgruppen bearbeiten"</b></font>", um Kontakte mit einem neuen oder bestehenden Google-Konto zu synchronisieren,"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Neuer Kontakt"</b></font>", um einen Kontakt neu zu erstellen, "\n</li>\n<li><font fgcolor="#ffffffff"><b>"Kontakte importieren"</b></font>", um Kontakte von Ihrer SIM-Karte hinzuzufügen."\n</li></string>
+    <string name="noContactsHelpText">"Es sind keine Kontakte vorhanden."\n\n"Drücken Sie zum Hinzufügen von Kontakten auf "<font fgcolor="#ffffffff"><b>"Menü"</b></font>" und wählen Sie Folgendes aus:"\n\n"        "<li><font fgcolor="#ffffffff"><b></b>"Neuer Kontakt"</font>\n", um einen neuen Kontakt zu erstellen"</li>\n<li>"        "<font fgcolor="#ffffffff"><b></b></font>"Kontakte importieren"\n</li>", um Kontakte von Ihrer SIM-Karte hinzuzufügen"</string>
+    <string name="noContactsHelpTextWithSync">"Sie haben keine Kontakte."\n\n"Drücken Sie zum Hinzufügen die "<font fgcolor="#ffffffff"><b>"Menütaste"</b></font>" und wählen Sie"\n\n"        "<li><font fgcolor="#ffffffff"><b>"Synchronisierungsgruppen bearbeiten"</b></font>", um Kontakte mit einem neuen oder bestehenden Google-Konto zu synchronisieren,"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Neuer Kontakt"</b></font>", um einen Kontakt neu zu erstellen, "\n</li>\n"        "<li><font fgcolor="#ffffffff"><b>"Kontakte importieren"</b></font>", um Kontakte von Ihrer SIM-Karte hinzuzufügen."\n</li></string>
     <string name="seclectSyncGroups_title">"Zu synchronisierende Gruppen auswählen"</string>
     <string name="liveFolder_all_label">"Alle Kontakte"</string>
     <string name="liveFolder_favorites_label">"Markiert"</string>
-    <string name="liveFolder_phones_label">"Nummern"</string>
+    <string name="liveFolder_phones_label">"Telefone"</string>
     <string name="dialer_useDtmfDialpad">"Telefontastatur verwenden"</string>
-    <string name="dialer_returnToInCallScreen">"Zurück zum aktuellen Anruf"</string>
+    <string name="dialer_returnToInCallScreen">"Zurück zum Anruf läuft"</string>
     <string name="dialer_addAnotherCall">"Anruf hinzufügen"</string>
     <string name="callDetailTitle">"Anrufdetails"</string>
     <string name="toast_call_detail_error">"Details für den angeforderten Anruf konnten nicht gelesen werden."</string>
@@ -155,11 +155,11 @@
     <string name="add_more_items">"Weitere Elemente hinzufügen"</string>
     <string name="actionCall">"<xliff:g id="TYPE">%s</xliff:g> anrufen"</string>
     <string name="actionEmail">"E-Mail an <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionText">"Textnachricht an <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionText">"Text an <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionChat">"Chat mit <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionMap">"<xliff:g id="TYPE">%s</xliff:g>-Adresse anzeigen"</string>
     <string name="actionIncomingCall">"Eingehende Anrufe"</string>
-    <string name="detailIncomingCallsGoToVoicemail">"Wird direkt an Mailbox weitergeleitet"</string>
+    <string name="detailIncomingCallsGoToVoicemail">"Wird direkt an Voicemail weitergeleitet"</string>
     <string name="detailsRingtone">"Eingestellt auf <xliff:g id="RINGTONE_NAME">%s</xliff:g>"</string>
     <string name="callBack">"Rückruf"</string>
     <string name="callAgain">"Erneut anrufen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ac4f853..d779093 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -128,17 +128,17 @@
     <string name="private_num">"Número privado"</string>
     <string name="payphone">"Teléfono público"</string>
     <string name="dialerKeyboardHintText">"Utilizar teclado para marcar"</string>
-    <string name="dialerDialpadHintText">"Añadir llamada"</string>
+    <string name="dialerDialpadHintText">"Marcar para añadir una llamada"</string>
     <string name="simContacts_emptyLoading">"Cargando desde tarjeta SIM…"</string>
     <string name="simContacts_title">"Contactos de tarjeta SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Sincroniza tus contactos de Google"</font>" "\n"Después de sincronizarlos con tu teléfono, podrás acceder a tus contactos desde cualquier lugar."</string>
-    <string name="noContactsHelpText">"No tienes ningún contacto."\n\n"Si quieres añadir alguno, pulsa la tecla "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" y selecciona:"\n\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para añadir un contacto manualmente"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar contactos"</b></font>" para añadirlos desde tu tarjeta SIM"\n</li></string>
-    <string name="noContactsHelpTextWithSync">"No tienes ningún contacto."\n\n"Si quieres añadir alguno, pulsa la tecla de menú"<font fgcolor="#ffffffff"><b></b></font>" y selecciona:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Editar grupos de sincronización"</b></font>" para añadirlos desde una cuenta de Google nueva o ya existente"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para añadir un contacto manualmente"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Importar contactos"</b></font>" para añadirlos desde la tarjeta SIM"\n</li></string>
+    <string name="noContactsHelpText">"No tienes ningún contacto."\n\n"Si quieres añadir alguno, pulsa la tecla de menú"<font fgcolor="#ffffffff"><b></b></font>" y selecciona:"\n\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para añadir un contacto manualmente"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar contactos"</b></font>" para añadirlos desde tu tarjeta SIM"\n</li></string>
+    <string name="noContactsHelpTextWithSync">"No tienes ningún contacto."\n\n"Si quieres añadir alguno, pulsa la tecla de menú"<font fgcolor="#ffffffff"><b></b></font>" y selecciona:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Editar grupos de sincronización"</b></font>" para añadirlos desde una cuenta de Google nueva o ya existente"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nuevo contacto"</b></font>" para añadir un contacto manualmente"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Importar contactos"</b></font>" para añadirlos desde la tarjeta SIM"\n</li></string>
     <string name="seclectSyncGroups_title">"Seleccionar grupos para la sincronización"</string>
     <string name="liveFolder_all_label">"Todos los contactos"</string>
     <string name="liveFolder_favorites_label">"Destacados"</string>
     <string name="liveFolder_phones_label">"Teléfonos"</string>
-    <string name="dialer_useDtmfDialpad">"Usar teclado táctil"</string>
+    <string name="dialer_useDtmfDialpad">"Usar el teclado de tonos"</string>
     <string name="dialer_returnToInCallScreen">"Volver a la llamada en curso"</string>
     <string name="dialer_addAnotherCall">"Añadir llamada"</string>
     <string name="callDetailTitle">"Detalles de la llamada"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6c63c49..97a122c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -43,7 +43,7 @@
     <string name="deleteConfirmation_title">"Supprimer"</string>
     <string name="deleteConfirmation">"Ce contact sera supprimé."</string>
     <string name="menu_done">"OK"</string>
-    <string name="menu_doNotSave">"Annuler"</string>
+    <string name="menu_doNotSave">"Rétablir"</string>
     <string name="editContact_title_edit">"Modifier le contact"</string>
     <string name="editContact_title_insert">"Nouveau contact"</string>
     <string name="menu_addItem">"Plus d\'infos"</string>
@@ -53,7 +53,7 @@
     <string name="ghostData_name">"Nom et prénom"</string>
     <string name="ghostData_phonetic_name">"Nom phonétique"</string>
     <string name="ghostData_company">"Société"</string>
-    <string name="ghostData_title">"Poste"</string>
+    <string name="ghostData_title">"Position"</string>
     <string name="ghostData_im">"Nom du compte"</string>
     <string name="ghostData_notes">"Mon commentaire"</string>
     <string name="ghostData_phone">"Numéro téléphone"</string>
@@ -78,8 +78,8 @@
     <string name="menu_displayGroup">"Afficher les groupes"</string>
     <string name="syncGroupPreference">"Param. sync. groupes"</string>
     <string name="importFromSim">"Importer des contacts"</string>
-    <string name="send_to_voicemail_checkbox">"Renvoyer les appels directement vers la messagerie vocale."</string>
-    <string name="send_to_voicemail_view">"Les appels sont renvoyés directement vers la messagerie vocale."</string>
+    <string name="send_to_voicemail_checkbox">"Renvoyer les appels directement vers la boîte vocale."</string>
+    <string name="send_to_voicemail_view">"Les appels sont renvoyés directement vers la boîte vocale."</string>
     <string name="default_ringtone">"Par défaut"</string>
     <string name="addPicture">"Ajouter une icône"</string>
     <string name="removePicture">"Supprimer l\'icône"</string>
@@ -119,21 +119,21 @@
     <string name="recentCalls_callNumber">"Appeler <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="recentCalls_editNumberBeforeCall">"Modifier le numéro avant d\'effectuer l\'appel"</string>
     <string name="recentCalls_addToContact">"Ajouter aux contacts"</string>
-    <string name="recentCalls_removeFromRecentList">"Supprimer du journal d\'appels"</string>
+    <string name="recentCalls_removeFromRecentList">"Supprimer de la liste des appels"</string>
     <string name="recentCalls_deleteAll">"Effacer tous les appels"</string>
     <string name="recentCalls_empty">"Aucun appel."</string>
-    <string name="imei">"Code IMEI"</string>
-    <string name="voicemail">"Messagerie vocale"</string>
+    <string name="imei">"IMEI"</string>
+    <string name="voicemail">"Boîte vocale"</string>
     <string name="unknown">"Inconnu"</string>
     <string name="private_num">"Numéro privée"</string>
     <string name="payphone">"Cabine téléphonique"</string>
     <string name="dialerKeyboardHintText">"Utilisez le clavier pour composer le numéro"</string>
-    <string name="dialerDialpadHintText">"Composer"</string>
+    <string name="dialerDialpadHintText">"Composer le numéro pour ajouter un appel"</string>
     <string name="simContacts_emptyLoading">"Chargement depuis la carte SIM..."</string>
     <string name="simContacts_title">"Contacts de carte SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synchronisez vos contacts Google !"</font>" "\n"Vos contacts seront disponibles, où que vous soyez, dès que vous aurez synchronisé votre téléphone."</string>
-    <string name="noContactsHelpText">"Vous n\'avez aucun contact."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un nouveau contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer des contacts"</b></font>" pour ajouter des contacts à partir de votre carte SIM."\n</li></string>
-    <string name="noContactsHelpTextWithSync">"Vous n\'avez aucun contact."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Param. sync. groupes"</b></font>" pour ajouter un contact à partir d\'un nouveau compte Google ou d\'un compte existant ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un nouveau contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer des contacts"</b></font>" pour ajouter des contacts à partir de votre carte SIM."\n</li></string>
+    <string name="noContactsHelpText">"Vous n\'avez aucun contact."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact de toutes pièces ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer des contacts"</b></font>" pour ajouter des contacts à partir de votre carte SIM."\n</li></string>
+    <string name="noContactsHelpTextWithSync">"Vous n\'avez aucun contact."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Param. sync. groupes"</b></font>" pour ajouter un contact à partir d\'un nouveau compte Google ou d\'un compte existant ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact de toutes pièces ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer des contacts"</b></font>" pour ajouter des contacts à partir de votre carte SIM."\n</li></string>
     <string name="seclectSyncGroups_title">"Sélectionner les groupes à synchroniser"</string>
     <string name="liveFolder_all_label">"Tous les contacts"</string>
     <string name="liveFolder_favorites_label">"Suivis"</string>
@@ -155,8 +155,8 @@
     <string name="add_more_items">"Ajouter d\'autres éléments"</string>
     <string name="actionCall">"Appeler <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionEmail">"Envoyer un e-mail à <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionText">"Envoyer un SMS (<xliff:g id="TYPE">%s</xliff:g>)"</string>
-    <string name="actionChat">"Chatter via <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionText">"Envoyer un SMS à <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionChat">"Chatter à l\'aide de <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionMap">"Afficher l\'adresse <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionIncomingCall">"Appels entrants"</string>
     <string name="detailIncomingCallsGoToVoicemail">"Seront envoyés directement en tant que message vocal"</string>
@@ -164,7 +164,7 @@
     <string name="callBack">"Rappeler"</string>
     <string name="callAgain">"Renouveler l\'appel"</string>
     <string name="returnCall">"Rappeler"</string>
-    <string name="callDetailsDurationFormat">"<xliff:g id="MINUTES">%s</xliff:g> mn <xliff:g id="SECONDS">%s</xliff:g> s"</string>
+    <string name="callDetailsDurationFormat">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> s"</string>
     <string name="favoritesFrquentSeparator">"Fréquemment appelés"</string>
     <string name="add_contact_dlg_title">"Ajouter un contact"</string>
     <string name="add_contact_dlg_message_fmt">"Ajouter \"<xliff:g id="EMAIL">%s</xliff:g>\" aux contacts ?"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 15fa11f..611e818 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -128,7 +128,7 @@
     <string name="private_num">"Numero privato"</string>
     <string name="payphone">"Telefono a monete"</string>
     <string name="dialerKeyboardHintText">"Usa la tastiera"</string>
-    <string name="dialerDialpadHintText">"Componi per aggiungere chiamata"</string>
+    <string name="dialerDialpadHintText">"Componi per aggiungere una chiamata"</string>
     <string name="simContacts_emptyLoading">"Caricamento da SIM..."</string>
     <string name="simContacts_title">"Contatti SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Sincronizza i tuoi contatti Google."</font>" "\n"Dopo la sincronizzazione con il telefono, i tuoi contatti saranno sempre a tua disposizione."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d7cb510..b97c9f6 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -128,7 +128,7 @@
     <string name="private_num">"非通知"</string>
     <string name="payphone">"公衆電話発信"</string>
     <string name="dialerKeyboardHintText">"キーボードで番号を入力してください"</string>
-    <string name="dialerDialpadHintText">"ダイヤルして追加"</string>
+    <string name="dialerDialpadHintText">"ダイヤルして通話追加"</string>
     <string name="simContacts_emptyLoading">"SIMカードから読み取り中..."</string>
     <string name="simContacts_title">"SIMカードの連絡先"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Googleアカウントの連絡先同期"</font>" "\n"Googleサービスで使っている連絡先をこの携帯電話でも使えるようになります。"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5aaa0e8..3964100 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -26,7 +26,8 @@
     <string name="editContactDescription">"Rediger kontakt"</string>
     <string name="insertContactDescription">"Opprett kontakt"</string>
     <string name="searchHint">"Søk i kontakter"</string>
-    <string name="menu_search">"Søk"</string>
+    <!-- no translation found for menu_search (9147752853603483719) -->
+    <skip />
     <string name="menu_newContact">"Ny kontakt"</string>
     <string name="menu_viewContact">"Se på kontakt"</string>
     <string name="menu_callNumber">"Ring <xliff:g id="NAME">%s</xliff:g>"</string>
@@ -92,7 +93,8 @@
     <string name="syncAllGroups">"Synkroniser alle kontakter"</string>
     <string name="groupNameMyContacts">"Mine kontakter"</string>
     <string name="groupNameWithPhones">"Kontakter med telefonnummer"</string>
-    <string name="starredInAndroid">"Stjernemerket i Android"</string>
+    <!-- no translation found for starredInAndroid (6495527538140213440) -->
+    <skip />
     <string name="contactCreatedToast">"Kontakt opprettet."</string>
     <string name="contactSavedToast">"Kontakt lagret."</string>
     <string name="listSeparatorCallNumber">"Ring nummer"</string>
@@ -126,7 +128,8 @@
     <string name="voicemail">"Telefonsvarer"</string>
     <string name="unknown">"Ukjent"</string>
     <string name="private_num">"Skjult nummer"</string>
-    <string name="payphone">"Telefonkiosk"</string>
+    <!-- no translation found for payphone (4864313342828942922) -->
+    <skip />
     <string name="dialerKeyboardHintText">"Bruk tastaturet for å ringe"</string>
     <string name="dialerDialpadHintText">"Ring for å legge til en samtale"</string>
     <string name="simContacts_emptyLoading">"Henter fra SIM-kort…"</string>
@@ -165,7 +168,10 @@
     <string name="callAgain">"Ring på nytt"</string>
     <string name="returnCall">"Ring tilbake"</string>
     <string name="callDetailsDurationFormat">"<xliff:g id="MINUTES">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
-    <string name="favoritesFrquentSeparator">"Ofte ringt"</string>
-    <string name="add_contact_dlg_title">"Legg til kontakt"</string>
-    <string name="add_contact_dlg_message_fmt">"Legg til \"<xliff:g id="EMAIL">%s</xliff:g>\" som kontakt?"</string>
+    <!-- no translation found for favoritesFrquentSeparator (5007070838253932139) -->
+    <skip />
+    <!-- no translation found for add_contact_dlg_title (2789046541229846116) -->
+    <skip />
+    <!-- no translation found for add_contact_dlg_message_fmt (7986472669444326576) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a2939df..c4d38e1 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -108,10 +108,10 @@
     <string name="listSeparatorOtherInformation">"Overige informatie"</string>
     <string name="listSeparatorOtherInformation_edit">"Andere opties"</string>
     <string name="listSeparatorMore_edit">"Meer"</string>
-    <string name="contactsIconLabel">"Contact"</string>
-    <string name="contactsFavoritesLabel">"Favoriet"</string>
+    <string name="contactsIconLabel">"Contacten"</string>
+    <string name="contactsFavoritesLabel">"Favorieten"</string>
     <string name="dialerIconLabel">"Telefoon"</string>
-    <string name="recentCallsIconLabel">"Gesprek"</string>
+    <string name="recentCallsIconLabel">"Gesprekken"</string>
     <string name="liveFolderAll">"Alle contacten"</string>
     <string name="liveFolderFavorites">"Contacten met ster"</string>
     <string name="liveFolderPhone">"Contacten met telefoonnummers"</string>
@@ -133,7 +133,7 @@
     <string name="simContacts_title">"Contacten op SIM-kaart"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Synchroniseer uw Google-contacten!"</font>" "\n"Zodra uw telefoon is gesynchroniseerd, heeft u uw contacten altijd ter beschikking."</string>
     <string name="noContactsHelpText">"U heeft geen contacten."\n\n"Als u contacten wilt toevoegen, drukt u op "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" en selecteert u:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Nieuw contact"</b></font>" om een nieuw contact te maken"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacten importeren"</b></font>" om contacten vanaf uw SIM-kaart toe te voegen"\n</li></string>
-    <string name="noContactsHelpTextWithSync">"U heeft geen contacten."\n\n"Als u contacten wilt toevoegen, klikt u op "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" en selecteert u:"\n\n<li><font fgcolor="#ffffffff"><b>"\'Synchronisatiegroepen bewerken\'"</b></font>" om contacten toe te voegen uit een nieuw of bestaand Google-account"\n</li>\n" "<li><font fgcolor="#ffffffff"><b>"\'Nieuw contact\'"</b></font>" om een geheel nieuw contact te maken"\n</li>\n" "<li><font fgcolor="#ffffffff"><b>"\'Contacten importeren\'"</b></font>" om contacten te importeren vanaf uw SIM-kaart"\n</li></string>
+    <string name="noContactsHelpTextWithSync">"U heeft geen contacten."\n\n"Als u contacten wilt toevoegen, klikt u op "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" en selecteert u:"\n\n<li><font fgcolor="#ffffffff"><b>"\'Synchronisatiegroepen bewerken\'"</b></font>" om contacten toe te voegen uit een nieuw of bestaand Google-account"\n</li>\n" "<li><font fgcolor="#ffffffff"><b>"\'Nieuw contact\'"</b></font>" om een geheel nieuw contact te maken"\n</li>\n" "<li><font fgcolor="#ffffffff"><b>"\'Contacten importeren\'"</b></font>" om contact te importeren vanaf uw SIM-kaart"\n</li></string>
     <string name="seclectSyncGroups_title">"Groepen selecteren om te synchroniseren"</string>
     <string name="liveFolder_all_label">"Alle contacten"</string>
     <string name="liveFolder_favorites_label">"Met ster"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0eff427..d99948e 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -36,8 +36,8 @@
     <string name="menu_editContact">"Edytuj kontakt"</string>
     <string name="menu_deleteContact">"Usuń kontakt"</string>
     <string name="menu_call">"Zadzwoń"</string>
-    <string name="menu_sendSMS">"Wyślij SMS/MMS"</string>
-    <string name="menu_sendEmail">"Wyślij e-mail"</string>
+    <string name="menu_sendSMS">"Wyślij wiadomość SMS/MMS"</string>
+    <string name="menu_sendEmail">"Wyślij wiadomość e-mail"</string>
     <string name="menu_viewAddress">"Pokaż adres na mapie"</string>
     <string name="menu_makeDefaultNumber">"Ustaw ten numer jako domyślny"</string>
     <string name="deleteConfirmation_title">"Usuń"</string>
@@ -53,8 +53,8 @@
     <string name="ghostData_name">"Imię i nazwisko"</string>
     <string name="ghostData_phonetic_name">"Nazwisko (fonetycznie)"</string>
     <string name="ghostData_company">"Firma"</string>
-    <string name="ghostData_title">"Stanowisko"</string>
-    <string name="ghostData_im">"Nazwa na czacie"</string>
+    <string name="ghostData_title">"Pozycja"</string>
+    <string name="ghostData_im">"Nazwa w komunikatorze"</string>
     <string name="ghostData_notes">"Moja notatka"</string>
     <string name="ghostData_phone">"Numer telefonu"</string>
     <string name="ghostData_email">"Adres e-mail"</string>
@@ -83,8 +83,8 @@
     <string name="default_ringtone">"Domyślny"</string>
     <string name="addPicture">"Dodaj ikonę"</string>
     <string name="removePicture">"Usuń ikonę"</string>
-    <string name="noContacts">"Brak kontaktów"</string>
-    <string name="noContactsWithPhoneNumbers">"Brak kontaktów z numerami telefonów"</string>
+    <string name="noContacts">"Brak kontaktów."</string>
+    <string name="noContactsWithPhoneNumbers">"Brak kontaktów z numerami telefonów."</string>
     <string name="noFavorites">"Brak ulubionych"</string>
     <string name="select_group_title">"Grupy"</string>
     <string name="groupEmpty">"Grupa „<xliff:g id="GROUPNAME">%s</xliff:g>” jest pusta."</string>
@@ -97,10 +97,10 @@
     <string name="contactSavedToast">"Kontakt został zapisany."</string>
     <string name="listSeparatorCallNumber">"Wybierz numer"</string>
     <string name="listSeparatorCallNumber_edit">"Numery telefonów"</string>
-    <string name="listSeparatorSendSmsMms">"Wyślij SMS/MMS"</string>
-    <string name="listSeparatorSendEmail">"Wyślij e-mail"</string>
+    <string name="listSeparatorSendSmsMms">"Wyślij wiadomość SMS/MMS"</string>
+    <string name="listSeparatorSendEmail">"Wyślij wiadomość e-mail"</string>
     <string name="listSeparatorSendEmail_edit">"Adresy e-mail"</string>
-    <string name="listSeparatorSendIm">"Wyślij wiadomość czatu"</string>
+    <string name="listSeparatorSendIm">"Wyślij wiadomość błyskawiczną"</string>
     <string name="listSeparatorSendIm_edit">"Adresy czatu"</string>
     <string name="listSeparatorMapAddress">"Pokaż adres na mapie"</string>
     <string name="listSeparatorMapAddress_edit">"Adresy pocztowe"</string>
@@ -113,9 +113,9 @@
     <string name="dialerIconLabel">"Telefon"</string>
     <string name="recentCallsIconLabel">"Rejestr"</string>
     <string name="liveFolderAll">"Wszystkie kontakty"</string>
-    <string name="liveFolderFavorites">"Kontakty z gwiazdką"</string>
+    <string name="liveFolderFavorites">"Kontakty oznaczone gwiazdką"</string>
     <string name="liveFolderPhone">"Kontakty z numerami telefonów"</string>
-    <string name="menu_sendTextMessage">"Wyślij SMS"</string>
+    <string name="menu_sendTextMessage">"Wyślij wiadomość SMS"</string>
     <string name="recentCalls_callNumber">"Zadzwoń do kontaktu <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="recentCalls_editNumberBeforeCall">"Edytuj numer przed nawiązaniem połączenia"</string>
     <string name="recentCalls_addToContact">"Dodaj do kontaktów"</string>
@@ -128,7 +128,7 @@
     <string name="private_num">"Numer prywatny"</string>
     <string name="payphone">"Telefon płatny"</string>
     <string name="dialerKeyboardHintText">"Wybierz numer za pomocą klawiatury"</string>
-    <string name="dialerDialpadHintText">"Dodaj nowe poł."</string>
+    <string name="dialerDialpadHintText">"Wybierz numer, aby dodać połączenie"</string>
     <string name="simContacts_emptyLoading">"Wczytywanie z karty SIM…"</string>
     <string name="simContacts_title">"Kontakty z karty SIM"</string>
     <string name="contactsSyncPlug"><font fgcolor="#ffffffff">"Zsynchronizuj kontakty Google!"</font>" "\n"Po zsynchronizowaniu telefonu zawsze będziesz mieć kontakty pod ręką."</string>
@@ -153,10 +153,10 @@
     <string name="header_actions">"Czynności"</string>
     <string name="ringtone_spinner">"Dźwięk dzwonka: <xliff:g id="RINGTONE">%1$s</xliff:g>"</string>
     <string name="add_more_items">"Dodaj więcej elementów"</string>
-    <string name="actionCall">"Połącz: <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionEmail">"Wyślij e-mail: <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionText">"Wyślij SMS: <xliff:g id="TYPE">%s</xliff:g>"</string>
-    <string name="actionChat">"Czatuj przez <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionCall">"Zadzwoń na numer: <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionEmail">"Wyślij wiadomość e-mail na adres: <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionText">"Wyślij tekst do: <xliff:g id="TYPE">%s</xliff:g>"</string>
+    <string name="actionChat">"Porozmawiaj na czacie <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionMap">"Wyświetl adres: <xliff:g id="TYPE">%s</xliff:g>"</string>
     <string name="actionIncomingCall">"Połączenia przychodzące"</string>
     <string name="detailIncomingCallsGoToVoicemail">"Zostaną wysłane bezpośrednio na pocztę głosową"</string>
diff --git a/src/com/android/contacts/SpecialCharSequenceMgr.java b/src/com/android/contacts/SpecialCharSequenceMgr.java
index 38bc93d..999e141 100644
--- a/src/com/android/contacts/SpecialCharSequenceMgr.java
+++ b/src/com/android/contacts/SpecialCharSequenceMgr.java
@@ -154,7 +154,7 @@
                 sc.progressDialog.show();
 
                 // run the query.
-                handler.startQuery(ADN_QUERY_TOKEN, sc, Uri.parse("content://sim/adn"),
+                handler.startQuery(ADN_QUERY_TOKEN, sc, Uri.parse("content://icc/adn"),
                         new String[]{ADN_PHONE_NUMBER_COLUMN_NAME}, null, null, null);
                 return true;
             } catch (NumberFormatException ex) {
@@ -179,8 +179,16 @@
 
     static boolean handleIMEIDisplay(Context context, String input, boolean useSystemWindow) {
         if (input.equals(MMI_IMEI_DISPLAY)) {
-            showIMEIPanel(context, useSystemWindow);
-            return true;
+            int networkType = ((TelephonyManager)context.getSystemService(
+                    Context.TELEPHONY_SERVICE)).getNetworkType();
+            // check for GSM
+            if(networkType == TelephonyManager.NETWORK_TYPE_GPRS || 
+                    networkType == TelephonyManager.NETWORK_TYPE_EDGE || 
+                    networkType == TelephonyManager.NETWORK_TYPE_UMTS ) { 
+
+                showIMEIPanel(context, useSystemWindow); 
+                return true;
+            }
         }
 
         return false;