am da4092ba: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'da4092baa3ea8ec719f374f9567cc07cdfe48c55' into eclair-mr2
* commit 'da4092baa3ea8ec719f374f9567cc07cdfe48c55':
Import revised translations. DO NOT MERGE
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 89c24f2..1b5d30e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,6 +41,13 @@
<data android:mimeType="image/*" />
<data android:mimeType="video/*" />
<data android:mimeType="audio/*" />
+ <data android:mimeType="text/plain" />
+ <data android:mimeType="text/html" />
+ <data android:mimeType="application/zip" />
+ <data android:mimeType="application/vnd.ms-excel" />
+ <data android:mimeType="application/msword" />
+ <data android:mimeType="application/vnd.ms-powerpoint" />
+ <data android:mimeType="application/pdf" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" />
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a8b800b..ae1ef24 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -42,7 +42,7 @@
<string name="notification_sending" msgid="3118149961355869912">"Sdílení Bluetooth: Odesílání souboru %1$s"</string>
<string name="notification_sending_multi" msgid="8217177886303103438">"Sdílení Bluetooth: Odesílání souboru"</string>
<string name="notification_sent" msgid="6345048674000520702">"Sdílení Bluetooth: Soubor %1$s byl odeslán"</string>
- <string name="notification_sent_complete" msgid="302943281067557969">"Dokončeno 100 %"</string>
+ <string name="notification_sent_complete" msgid="302943281067557969">"Dokončeno 100%"</string>
<string name="notification_sent_fail" msgid="6632995333466325127">"Sdílení Bluetooth: Soubor %1$s nebyl odeslán"</string>
<string name="download_title" msgid="3353228219772092586">"Přenos souborů"</string>
<string name="download_line1" msgid="3470164761579278582">"Z: „%1$s“"</string>
diff --git a/res/values-cs/strings_pbap.xml b/res/values-cs/strings_pbap.xml
index aac3bce..6c7c102 100644
--- a/res/values-cs/strings_pbap.xml
+++ b/res/values-cs/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Vždy povoleno?"</string>
<string name="defaultname" msgid="4821590500649090078">"Sada handsfree do auta"</string>
<string name="unknownName" msgid="2841414754740600042">"Neznámý název"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Mé jméno"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 54fa758..787552b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -38,7 +38,7 @@
<string name="notification_receiving" msgid="3938472603351415139">"Deling med Bluetooth: Modtager %1$s"</string>
<string name="notification_received" msgid="7594846429703561009">"Deling med Bluetooth: Modtog %1$s"</string>
<string name="notification_received_complete" msgid="8126908549148704724">"100 % fuldført"</string>
- <string name="notification_received_fail" msgid="2017422835194149214">"Deling med Bluetooth: Filen %1$s blev ikke modtaget"</string>
+ <string name="notification_received_fail" msgid="2017422835194149214">"Deling med Bluetooth: Fil %1$s blev ikke modtaget"</string>
<string name="notification_sending" msgid="3118149961355869912">"Deling med Bluetooth: Sender %1$s"</string>
<string name="notification_sending_multi" msgid="8217177886303103438">"Deling med Bluetooth: Sender fil"</string>
<string name="notification_sent" msgid="6345048674000520702">"Deling med Bluetooth: Sendt %1$s"</string>
@@ -87,7 +87,7 @@
<string name="bt_sm_3_1" msgid="1658443268226611198">"\"%1$s\" forsøgte at sende %2$s filer til dig."</string>
<string name="bt_sm_3_2" msgid="1234428166130208088">"Dog kan denne enhed kun modtage én fil ad gangen. Bed afsenderen om at sende de resterende %1$s filer enkeltvis."</string>
<string name="bt_tf_1" msgid="3566606437748689505">"\"%1$s\" er ikke tilgængelig."</string>
- <string name="bt_tf_2" msgid="7165797096754450809">"Kan ikke parre med \"%1$s\"."</string>
+ <string name="bt_tf_2" msgid="7165797096754450809">"Kan ikke forbinde med \"%1$s\"."</string>
<string name="bt_tf_3" msgid="6899456362281219699">"Forbindelsen blev afbrudt."</string>
<string name="bt_tf_4" msgid="9083752106925339573">"\"%1$s\" understøtter ikke filoverførsler."</string>
<string name="bt_tf_5" msgid="2971780974433771152">"\"%1$s\" kan ikke acceptere %2$s"</string>
@@ -95,9 +95,9 @@
<string name="bt_tf_7" msgid="2160754176051707109">"Filen kunne ikke sendes."</string>
<string name="bt_tf_8" msgid="8284960065910226862">"Filen kunne ikke modtages."</string>
<string name="bt_tf_10" msgid="8612767267070143708">"Låst hukommelseskort. Du skal låse hukommelseskortet op for at gemme filerne."</string>
- <string name="bt_tf_12" msgid="1976542340333268388">"Der overføres en fil til en anden enhed. Vent et øjeblik……"</string>
+ <string name="bt_tf_12" msgid="1976542340333268388">"En fil overføres til en anden enhed. Vent et øjeblik……"</string>
<string name="bt_tf_13" msgid="8604795873559730409">"Bluetooth er optaget lige nu. Deaktiver en anden Bluetooth- funktion, og prøv igen."</string>
- <string name="status_pending" msgid="7446884326084324082">"Filoverførslen er ikke påbegyndt"</string>
+ <string name="status_pending" msgid="7446884326084324082">"Filoverførsel er ikke påbegyndt"</string>
<string name="status_running" msgid="2695810336448055064">"Filoverførslen er i gang"</string>
<string name="status_success" msgid="2268261336330060663">"Filoverførslen blev gennemført"</string>
<string name="status_not_accept" msgid="149046562468006301">"Telefonen kan ikke håndtere denne type indhold"</string>
diff --git a/res/values-da/strings_pbap.xml b/res/values-da/strings_pbap.xml
index d36f475..8bc069c 100644
--- a/res/values-da/strings_pbap.xml
+++ b/res/values-da/strings_pbap.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pbap_app_name" msgid="6916507166414341324">"Bluetooth Pbap"</string>
- <string name="pbap_acceptance_dialog_title" msgid="4606773169019619760">"%1$s vil gerne have adgang til dine kontakter og opkaldsoversigt. Vil du give %2$s adgang?"</string>
+ <string name="pbap_acceptance_dialog_title" msgid="4606773169019619760">"%1$s vil gerne have adgang til dine kontaktpersoner og opkaldsoversigt. Vil du give %2$s adgang?"</string>
<string name="pbap_acceptance_dialog_header" msgid="5456473921987026974">"Adgang til telefonbog"</string>
<string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Indtast sessionsnøgle til %1$s"</string>
<string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth-sessionsnøgle kræves"</string>
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Altid tilladt?"</string>
<string name="defaultname" msgid="4821590500649090078">"Bilsæt"</string>
<string name="unknownName" msgid="2841414754740600042">"Ukendt navn"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Mit navn"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-de/strings_pbap.xml b/res/values-de/strings_pbap.xml
index 9938596..20a8317 100644
--- a/res/values-de/strings_pbap.xml
+++ b/res/values-de/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Immer erlaubt?"</string>
<string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
<string name="unknownName" msgid="2841414754740600042">"Unbekannter Name"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Mein Name"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-el/strings_pbap.xml b/res/values-el/strings_pbap.xml
index 93c879a..9bed105 100644
--- a/res/values-el/strings_pbap.xml
+++ b/res/values-el/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Να επιτρέπεται πάντα;"</string>
<string name="defaultname" msgid="4821590500649090078">"Κιτ αυτοκινήτου"</string>
<string name="unknownName" msgid="2841414754740600042">"Άγνωστο όνομα"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Το όνομα μου"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-es-rUS/strings_pbap.xml b/res/values-es-rUS/strings_pbap.xml
index 392a281..cc26881 100644
--- a/res/values-es-rUS/strings_pbap.xml
+++ b/res/values-es-rUS/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"¿Permitir siempre?"</string>
<string name="defaultname" msgid="4821590500649090078">"Kit de automóvil"</string>
<string name="unknownName" msgid="2841414754740600042">"Nombre desconocido"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Mi nombre"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-es/strings_pbap.xml b/res/values-es/strings_pbap.xml
index cd62bdf..6fd8fcd 100644
--- a/res/values-es/strings_pbap.xml
+++ b/res/values-es/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"¿Permitir siempre?"</string>
<string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
<string name="unknownName" msgid="2841414754740600042">"Nombre desconocido"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Mi nombre"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-fr/strings_pbap.xml b/res/values-fr/strings_pbap.xml
index 1175bc9..7a5ad16 100644
--- a/res/values-fr/strings_pbap.xml
+++ b/res/values-fr/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Toujours autorisé ?"</string>
<string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
<string name="unknownName" msgid="2841414754740600042">"Nom inconnu"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Mon nom"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d49a866..1cf4955 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -108,5 +108,5 @@
<string name="status_connection_error" msgid="7695388111375688873">"Errore di connessione"</string>
<string name="status_protocol_error" msgid="8898902951085043597">"La richiesta non può essere gestita correttamente"</string>
<string name="status_unknown_error" msgid="7441602228720350817">"Errore sconosciuto"</string>
- <string name="btopp_live_folder" msgid="7967791481444474554">"Ricezione Bluetooth avvenuta"</string>
+ <string name="btopp_live_folder" msgid="7967791481444474554">"Ricezione·Bluetooth·avvenuta"</string>
</resources>
diff --git a/res/values-it/strings_pbap.xml b/res/values-it/strings_pbap.xml
index 2e8f2c6..03c876c 100644
--- a/res/values-it/strings_pbap.xml
+++ b/res/values-it/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Sempre consentito?"</string>
<string name="defaultname" msgid="4821590500649090078">"Kit auto"</string>
<string name="unknownName" msgid="2841414754740600042">"Nome sconosciuto"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Il mio nome"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-ja/strings_pbap.xml b/res/values-ja/strings_pbap.xml
index 2bb4245..c63ff5a 100644
--- a/res/values-ja/strings_pbap.xml
+++ b/res/values-ja/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"常に許可しますか？"</string>
<string name="defaultname" msgid="4821590500649090078">"カーキット"</string>
<string name="unknownName" msgid="2841414754740600042">"不明な名前"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"名前"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-ko/strings_pbap.xml b/res/values-ko/strings_pbap.xml
index 133fed6..3bd357f 100644
--- a/res/values-ko/strings_pbap.xml
+++ b/res/values-ko/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"항상 허용하시겠습니까?"</string>
<string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
<string name="unknownName" msgid="2841414754740600042">"알 수 없는 이름"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"내 이름"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-nb/strings_pbap.xml b/res/values-nb/strings_pbap.xml
index 142728a..5711e9b 100644
--- a/res/values-nb/strings_pbap.xml
+++ b/res/values-nb/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Alltid tillatt?"</string>
<string name="defaultname" msgid="4821590500649090078">"Bilsett"</string>
<string name="unknownName" msgid="2841414754740600042">"Ukjent navn"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Navnet mitt"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-nl/strings_pbap.xml b/res/values-nl/strings_pbap.xml
index 50d9671..7cebd01 100644
--- a/res/values-nl/strings_pbap.xml
+++ b/res/values-nl/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Altijd toestaan?"</string>
<string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
<string name="unknownName" msgid="2841414754740600042">"Onbekende naam"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Mijn naam"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-pl/strings_pbap.xml b/res/values-pl/strings_pbap.xml
index 2b49315..e4aa66b 100644
--- a/res/values-pl/strings_pbap.xml
+++ b/res/values-pl/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Zawsze zezwalać?"</string>
<string name="defaultname" msgid="4821590500649090078">"Zestaw samochodowy"</string>
<string name="unknownName" msgid="2841414754740600042">"Nieznana nazwa"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Moja nazwa"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-pt-rPT/strings_pbap.xml b/res/values-pt-rPT/strings_pbap.xml
index ddf1bf1..50807bd 100644
--- a/res/values-pt-rPT/strings_pbap.xml
+++ b/res/values-pt-rPT/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Sempre permitido?"</string>
<string name="defaultname" msgid="4821590500649090078">"Kit para carro"</string>
<string name="unknownName" msgid="2841414754740600042">"Nome desconhecido"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"O meu nome"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-pt/strings_pbap.xml b/res/values-pt/strings_pbap.xml
index 020e9f8..1900509 100644
--- a/res/values-pt/strings_pbap.xml
+++ b/res/values-pt/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Sempre permitir?"</string>
<string name="defaultname" msgid="4821590500649090078">"Kit para carro"</string>
<string name="unknownName" msgid="2841414754740600042">"Nome desconhecido"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Meu nome"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-ru/strings_pbap.xml b/res/values-ru/strings_pbap.xml
index 873fd95..bd99eae 100644
--- a/res/values-ru/strings_pbap.xml
+++ b/res/values-ru/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Всегда разрешать?"</string>
<string name="defaultname" msgid="4821590500649090078">"Автомобильный комплект"</string>
<string name="unknownName" msgid="2841414754740600042">"Неизвестное имя"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Мое название"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-sv/strings_pbap.xml b/res/values-sv/strings_pbap.xml
index 4cbb64a..44dc04c 100644
--- a/res/values-sv/strings_pbap.xml
+++ b/res/values-sv/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Vill du alltid tillåta?"</string>
<string name="defaultname" msgid="4821590500649090078">"Bilsats"</string>
<string name="unknownName" msgid="2841414754740600042">"Okänt namn"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Mitt namn"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-sv/test_strings.xml b/res/values-sv/test_strings.xml
index 2bfcdbe..8109190 100644
--- a/res/values-sv/test_strings.xml
+++ b/res/values-sv/test_strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="hello" msgid="1740533743008967039">"Hello World, TestActivity"</string>
- <string name="app_name" msgid="1203877025577761792">"Bluetooth-delning"</string>
+ <string name="app_name" msgid="1203877025577761792">"Bluetooth -delning"</string>
<string name="insert_record" msgid="1450997173838378132">"Infoga post"</string>
<string name="update_record" msgid="2480425402384910635">"Bekräfta post"</string>
<string name="ack_record" msgid="6716152390978472184">"Bekräftelsepost"</string>
diff --git a/res/values-tr/strings_pbap.xml b/res/values-tr/strings_pbap.xml
index 289e1a1..1f1becf 100644
--- a/res/values-tr/strings_pbap.xml
+++ b/res/values-tr/strings_pbap.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pbap_app_name" msgid="6916507166414341324">"Bluetooth Pbap"</string>
- <string name="pbap_acceptance_dialog_title" msgid="4606773169019619760">"%1$s kişilerinize ve çağrı geçmişinize erişmek istiyor. Şuna erişim izni verilsin mi?: %2$s"</string>
+ <string name="pbap_acceptance_dialog_title" msgid="4606773169019619760">"%1$s kişilerinize ve arama geçmişinize erişmek istiyor. Şuna erişim izni verilsin mi?: %2$s"</string>
<string name="pbap_acceptance_dialog_header" msgid="5456473921987026974">"Telefon Rehberine Erişim"</string>
<string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"%1$s için oturum anahtarını yazın"</string>
<string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth oturum anahtarı gerekiyor"</string>
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"Her zaman izin verilsin mi?"</string>
<string name="defaultname" msgid="4821590500649090078">"Araç Kiti"</string>
<string name="unknownName" msgid="2841414754740600042">"Bilinmeyen ad"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"Adım"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 1e6c25f..2f16402 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -82,7 +82,7 @@
<string name="bt_toast_5" msgid="3481598201604043629">"正在向“%2$s”发送 %1$s 个文件"</string>
<string name="bt_toast_6" msgid="4157809141200418519">"已停止向“%1$s”发送文件"</string>
<string name="bt_toast_7" msgid="5720877534395506413">"已停止向“%2$s”发送 %1$s 个文件"</string>
- <string name="bt_sm_2_1" msgid="6625813581585502551">"SD 卡存储空间不足，无法保存来自“%1$s”的文件"</string>
+ <string name="bt_sm_2_1" msgid="6625813581585502551">"SD 卡空间不足，无法保存来自“%1$s”的文件"</string>
<string name="bt_sm_2_2" msgid="2697023602119073395">"所需空间：%1$s"</string>
<string name="bt_sm_3_1" msgid="1658443268226611198">"“%1$s”曾尝试向您发送 %2$s 个文件。"</string>
<string name="bt_sm_3_2" msgid="1234428166130208088">"但是，该设备一次只能接收一个文件。请让对方逐个发送其余的 %1$s 个文件。"</string>
diff --git a/res/values-zh-rCN/strings_pbap.xml b/res/values-zh-rCN/strings_pbap.xml
index e9903b2..a29ee39 100644
--- a/res/values-zh-rCN/strings_pbap.xml
+++ b/res/values-zh-rCN/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"始终允许吗？"</string>
<string name="defaultname" msgid="4821590500649090078">"Carkit"</string>
<string name="unknownName" msgid="2841414754740600042">"未知名称"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"我的名字"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/res/values-zh-rTW/strings_pbap.xml b/res/values-zh-rTW/strings_pbap.xml
index e1f4da0..a090979 100644
--- a/res/values-zh-rTW/strings_pbap.xml
+++ b/res/values-zh-rTW/strings_pbap.xml
@@ -35,6 +35,7 @@
<string name="alwaysallowed" msgid="1912976993660130849">"永遠允許？"</string>
<string name="defaultname" msgid="4821590500649090078">"車用套件"</string>
<string name="unknownName" msgid="2841414754740600042">"未知的名稱"</string>
- <string name="localPhoneName" msgid="2349001318925409159">"我的名稱"</string>
+ <!-- no translation found for localPhoneName (2349001318925409159) -->
+ <skip />
<string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
</resources>
diff --git a/src/com/android/bluetooth/opp/Constants.java b/src/com/android/bluetooth/opp/Constants.java
index c701920..69b86b1 100644
--- a/src/com/android/bluetooth/opp/Constants.java
+++ b/src/com/android/bluetooth/opp/Constants.java
@@ -116,6 +116,11 @@
"audio/*",
"text/plain",
"text/html",
+ "application/zip",
+ "application/vnd.ms-excel",
+ "application/msword",
+ "application/vnd.ms-powerpoint",
+ "application/pdf",
};
/**
diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
index f16ce13..634bef8 100644
--- a/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
@@ -86,7 +86,7 @@
private static final int PHONE_LABEL_COLUMN_INDEX = 2;
- private static final int PHOEN_NUMBER_COLUMN_INDEX = 3;
+ private static final int PHONE_NUMBER_COLUMN_INDEX = 3;
private static final int CONTACTS_DISPLAY_NAME_COLUMN_INDEX = 4;
@@ -250,7 +250,7 @@
if (phoneCursor != null) {
for (phoneCursor.moveToFirst(); !phoneCursor.isAfterLast(); phoneCursor
.moveToNext()) {
- String number = phoneCursor.getString(PHOEN_NUMBER_COLUMN_INDEX);
+ String number = phoneCursor.getString(PHONE_NUMBER_COLUMN_INDEX);
if (TextUtils.isEmpty(number)) {
number = mContext.getString(R.string.defaultnumber);
}
@@ -428,23 +428,17 @@
VCardComposer composer = null;
try {
// Currently only support Generic Vcard 2.1 and 3.0
- final int vcardType;
+ int vcardType;
if (vcardType21) {
- vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC;
+ vcardType = VCardConfig.VCARD_TYPE_V21_GENERIC_UTF8;
} else {
- vcardType = VCardConfig.VCARD_TYPE_V30_GENERIC;
+ vcardType = VCardConfig.VCARD_TYPE_V30_GENERIC_UTF8;
}
- final boolean careHandlerErrors = true;
- final boolean needPhoto = false; //We disable photo for the time being
- final boolean isCallLogComposer = !isContacts;
-
- composer = new VCardComposer(mContext, vcardType, careHandlerErrors, isCallLogComposer,
- needPhoto);
-
+ composer = new VCardComposer(mContext, vcardType, true);
composer.addHandler(new HandlerForStringBuffer(op, ownerVCard));
-
- if (!composer.init(selection, null)) {
+ final Uri contentUri = (isContacts ? Contacts.CONTENT_URI : CallLog.Calls.CONTENT_URI);
+ if (!composer.init(contentUri, selection, null, null)) {
return ResponseCodes.OBEX_HTTP_INTERNAL_ERROR;
}