Merge branch 'froyo' into froyo-release
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index df122cb..8cd353d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -92,7 +92,7 @@
<string name="menu_displayGroup" msgid="5655505437727616553">"表示オプション"</string>
<string name="displayGroups" msgid="2278964020773993336">"表示オプション"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"ボイスメールに自動転送する"</string>
- <string name="default_ringtone" msgid="9099988849649827972">"端末既定"</string>
+ <string name="default_ringtone" msgid="9099988849649827972">"プリセット着信音"</string>
<string name="changePicture" msgid="2943329047610967714">"アイコンを変更"</string>
<string name="removePicture" msgid="3041230993155966350">"アイコンを削除"</string>
<string name="noContacts" msgid="8579310973261953559">"連絡先がありません。"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6e0ebee..1bb66db 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -168,7 +168,7 @@
<string name="liveFolder_phones_label" msgid="1709786878793436245">"Телефоны"</string>
<string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Использовать тональный набор"</string>
<string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"Вернуться к ожидающему вызову"</string>
- <string name="dialer_addAnotherCall" msgid="4205688819890074468">"Добавить вызов"</string>
+ <string name="dialer_addAnotherCall" msgid="4205688819890074468">"Доб. вызов"</string>
<string name="callDetailTitle" msgid="5340227785196217938">"Сведения о вызове"</string>
<string name="toast_call_detail_error" msgid="7200975244804730096">"Не удается получить сведения о вызове."</string>
<string name="type_incoming" msgid="6502076603836088532">"Входящий вызов"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 041440a..31e64c3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -512,7 +512,7 @@
<string name="returnCall">Return call</string>
<!-- A nicely formatted call duration displayed when viewing call details. For example "42 mins 28 secs" -->
- <string name="callDetailsDurationFormat"><xliff:g id="minutes" example="42">%s</xliff:g> mins <xliff:g id="seconds" example="28">%s</xliff:g> secs</string>
+ <string name="callDetailsDurationFormat"><xliff:g id="minutes" example="42">%1$s</xliff:g> mins <xliff:g id="seconds" example="28">%2$s</xliff:g> secs</string>
<!-- A list separator for the Favorites tab indicating that items below it are frequently contacted contacts rather than starred contacts -->
<string name="favoritesFrquentSeparator">Frequently contacted</string>
@@ -730,7 +730,7 @@
<!-- The message shown while reading a vCard file/entry. The first argument is like
"Reading VCard" or "Reading VCard files" and the second is the display name of the current
data being parsed -->
- <string name="progress_shower_message"><xliff:g id="action" example="Reading VCard">%s</xliff:g>\n<xliff:g id="filename" example="foo.vcf">%s</xliff:g></string>
+ <string name="progress_shower_message"><xliff:g id="action" example="Reading VCard">%1$s</xliff:g>\n<xliff:g id="filename" example="foo.vcf">%2$s</xliff:g></string>
<!-- Dialog title shown when reading VCard data -->
<string name="reading_vcard_title">Reading vCard</string>
@@ -742,10 +742,10 @@
<string name="reading_vcard_failed_title">Reading of vCard data has failed</string>
<!-- Message while reading one vCard file "(current number) of (total number) contacts" The order of "current number" and "total number" cannot be changed (like "total: (total number), current: (current number)")-->
- <string name="reading_vcard_contacts"><xliff:g id="current_number">%s</xliff:g> of <xliff:g id="total_number">%s</xliff:g> contacts</string>
+ <string name="reading_vcard_contacts"><xliff:g id="current_number">%1$s</xliff:g> of <xliff:g id="total_number">%2$s</xliff:g> contacts</string>
<!-- Message while reading multiple vCard files "(current number) of (total number) files" The order of "current number" and "total number" cannot be changed (like "total: (total number), current: (current number)")-->
- <string name="reading_vcard_files"><xliff:g id="current_number">%s</xliff:g> of <xliff:g id="total_number">%s</xliff:g> files</string>
+ <string name="reading_vcard_files"><xliff:g id="current_number">%1$s</xliff:g> of <xliff:g id="total_number">%2$s</xliff:g> files</string>
<!-- Dialog title shown when a user confirms whether he/she export Contact data -->
<string name="confirm_export_title">Confirm export</string>
@@ -803,10 +803,10 @@
<!-- The failed reason shown when vCard importer/exporter could not open the file
specified by a user. The file name should be in the message. -->
- <string name="fail_reason_could_not_open_file">Could not open \"<xliff:g id="file_name">%s</xliff:g>\": <xliff:g id="exact_reason">%s</xliff:g></string>
+ <string name="fail_reason_could_not_open_file">Could not open \"<xliff:g id="file_name">%1$s</xliff:g>\": <xliff:g id="exact_reason">%2$s</xliff:g></string>
<!-- Message in progress bar while exporting contact list to a file "(current number) of (total number) contacts" The order of "current number" and "total number" cannot be changed (like "total: (total number), current: (current number)")-->
- <string name="exporting_contact_list_progress"><xliff:g id="current_number">%s</xliff:g> of <xliff:g id="total_number">%s</xliff:g> contacts</string>
+ <string name="exporting_contact_list_progress"><xliff:g id="current_number">%1$s</xliff:g> of <xliff:g id="total_number">%2$s</xliff:g> contacts</string>
<!-- The string used to describe Contacts as a searchable item within system search settings. -->
<string name="search_settings_description">Names of your contacts</string>