am 2d1100b9: Merge "Adjust space below line on dialpad." into lmp-preview-dev
* commit '2d1100b988383a68248ba0444164056898217602':
Adjust space below line on dialpad.
diff --git a/res-common/values-el/strings.xml b/res-common/values-el/strings.xml
index 9666310..91602df 100644
--- a/res-common/values-el/strings.xml
+++ b/res-common/values-el/strings.xml
@@ -220,10 +220,10 @@
<string name="scanning_sdcard_failed_message" product="default" msgid="1409798274361146091">"Δεν ήταν δυνατή η σάρωση της κάρτας SD. (Αιτία: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="progress_notifier_message" msgid="359931715339778107">"Εισαγωγή <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="export_to_sdcard" product="default" msgid="3665618085563543169">"Εξαγωγή στο χώρο αποθ."</string>
- <string name="share_visible_contacts" msgid="2150662668080757107">"Κοινοποίηση ορατών επαφών"</string>
+ <string name="share_visible_contacts" msgid="2150662668080757107">"Κοινή χρήση ορατών επαφών"</string>
<string name="dialog_import_export" msgid="1125776851100740858">"Εισαγωγή/Εξαγωγή επαφών"</string>
<string name="dialog_import" msgid="5177004290082451296">"Εισαγωγή επαφών"</string>
- <string name="share_error" msgid="665756457151793108">"Δεν είναι δυνατή η κοινοποίηση αυτής της επαφής."</string>
+ <string name="share_error" msgid="665756457151793108">"Δεν είναι δυνατή η κοινή χρήση αυτής της επαφής."</string>
<string name="menu_search" msgid="7464453023659824700">"Αναζήτηση"</string>
<string name="menu_contacts_filter" msgid="586356478145511794">"Επαφές για προβολή"</string>
<string name="activity_title_contacts_filter" msgid="7689519428197855166">"Επαφές για προβολή"</string>
diff --git a/res-common/values-km-rKH/strings.xml b/res-common/values-km-rKH/strings.xml
index 0011f60..453a4d8 100644
--- a/res-common/values-km-rKH/strings.xml
+++ b/res-common/values-km-rKH/strings.xml
@@ -139,8 +139,8 @@
<string name="chat_gtalk" msgid="6043734883347741789">"ជជែកដោយប្រើ Google Talk"</string>
<string name="chat_icq" msgid="7538190395602030726">"ជជែកដោយប្រើ ICQ"</string>
<string name="chat_jabber" msgid="4525546665986350869">"ជជែកដោយប្រើ Jabber"</string>
- <string name="chat" msgid="6297650784873558837">"ជជែក"</string>
- <string name="description_minus_button" msgid="2142439445814730827">"លុប"</string>
+ <string name="chat" msgid="6297650784873558837">"ជជែក"</string>
+ <string name="description_minus_button" msgid="2142439445814730827">"លុប"</string>
<string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"ពង្រីក ឬបង្រួមវាលឈ្មោះ"</string>
<string name="list_filter_all_accounts" msgid="4265359896628915784">"ទំនាក់ទំនងទាំងអស់"</string>
<string name="list_filter_all_starred" msgid="9060325494254507806">"បានដាក់ផ្កាយ"</string>
@@ -154,7 +154,7 @@
<string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"ការលុប \"<xliff:g id="GROUP">%s</xliff:g>\" ចេញពីសមកាលកម្មវាក៏នឹងលុបទំនាក់ទំនងដែលមិននៅក្នុងក្រុមចេញពីសមកាលកម្មផងដែរ។"</string>
<string name="savingDisplayGroups" msgid="6863012138107446030">"កំពុងរក្សាទុកជម្រើសបង្ហាញ..."</string>
<string name="menu_done" msgid="32470053723443112">"រួចរាល់"</string>
- <string name="menu_doNotSave" msgid="6012426160993364871">"បោះបង់"</string>
+ <string name="menu_doNotSave" msgid="6012426160993364871">"បោះបង់"</string>
<string name="listAllContactsInAccount" msgid="755499980092808715">"ទំនាក់ទំនងនៅក្នុង <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="listCustomView" msgid="1915154113477432033">"ទំនាក់ទំនងក្នុងទិដ្ឋភាពផ្ទាល់ខ្លួន"</string>
<string name="listSingleContact" msgid="8525131203887307088">"ទំនាក់ទំនងទោល"</string>
diff --git a/res-common/values-land/integers.xml b/res-common/values-land/integers.xml
index e0d1e05..8ddef80 100644
--- a/res-common/values-land/integers.xml
+++ b/res-common/values-land/integers.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
<resources>
- <integer name="contact_tile_column_count_in_favorites">4</integer>
+ <integer name="contact_tile_column_count_in_favorites">3</integer>
<!-- The number of characters in the snippet before we need to tokenize and ellipse. -->
<integer name="snippet_length_before_tokenize">60</integer>
diff --git a/res-common/values-vi/strings.xml b/res-common/values-vi/strings.xml
index 2f3e548..691a0ae 100644
--- a/res-common/values-vi/strings.xml
+++ b/res-common/values-vi/strings.xml
@@ -66,7 +66,7 @@
<string name="status_available" msgid="4832569677396634846">"Có mặt"</string>
<string name="status_away" msgid="6267905184545881094">"Đã ra ngoài"</string>
<string name="status_busy" msgid="7111912905211403545">"Bận"</string>
- <string name="contactsList" msgid="7140022347217602605">"Danh sách liên hệ"</string>
+ <string name="contactsList" msgid="7140022347217602605">"Danh bạ"</string>
<string name="local_invisible_directory" msgid="8934840494825588347">"Khác"</string>
<string name="directory_search_label" msgid="4484648822765516947">"Thư mục"</string>
<string name="local_search_label" msgid="9094584931063745728">"Tất cả người liên hệ"</string>
@@ -190,7 +190,7 @@
<string name="exporting_contact_failed_message" msgid="3922498776695333328">"Không xuất được dữ liệu liên hệ.\nLý do: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="no_sdcard_message" product="nosdcard" msgid="5131553549320038333">"Không tìm thấy bộ nhớ nào."</string>
<string name="no_sdcard_message" product="default" msgid="3246805937562594626">"Không tìm thấy thẻ SD nào."</string>
- <string name="confirm_export_message" msgid="7234189779260525384">"Danh sách liên hệ của bạn sẽ được xuất sang tệp: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
+ <string name="confirm_export_message" msgid="7234189779260525384">"Danh bạ của bạn sẽ được xuất sang tệp: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="importing_vcard_description" msgid="7206609625359484356">"Đang nhập <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="reading_vcard_failed_title" msgid="4360989450476024034">"Không thể đọc dữ liệu vCard"</string>
<string name="reading_vcard_canceled_title" msgid="1290217818311955708">"Thao tác đọc dữ liệu vCard bị hủy"</string>
@@ -225,7 +225,7 @@
<string name="dialog_import" msgid="5177004290082451296">"Nhập danh bạ"</string>
<string name="share_error" msgid="665756457151793108">"Không thể chia sẻ liên hệ này."</string>
<string name="menu_search" msgid="7464453023659824700">"Tìm kiếm"</string>
- <string name="menu_contacts_filter" msgid="586356478145511794">"Danh sách liên hệ để hiển thị"</string>
+ <string name="menu_contacts_filter" msgid="586356478145511794">"Danh bạ để hiển thị"</string>
<string name="activity_title_contacts_filter" msgid="7689519428197855166">"DS liên hệ để hiển thị"</string>
<string name="custom_list_filter" msgid="582616656313514803">"Xác định chế độ xem tùy chỉnh"</string>
<string name="hint_findContacts" msgid="28151707326753522">"Tìm địa chỉ liên hệ"</string>
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index 9ff5bad..5bc73f6 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -102,6 +102,10 @@
<!-- Padding to be applied to the bottom of lists to make space for the floating action
button -->
<dimen name="floating_action_button_list_bottom_padding">88dp</dimen>
+ <!-- Right margin of the floating action button -->
+ <dimen name="floating_action_button_margin_right">16dp</dimen>
+ <!-- Bottom margin of the floating action button -->
+ <dimen name="floating_action_button_margin_bottom">16dp</dimen>
<!-- Height of the selection indicator of a tab. -->
<dimen name="tab_selected_underline_height">3dp</dimen>
diff --git a/res-common/values/strings.xml b/res-common/values/strings.xml
index 0346d4e..3f195ad 100644
--- a/res-common/values/strings.xml
+++ b/res-common/values/strings.xml
@@ -736,6 +736,7 @@
-->
<string name="description_delete_button">backspace</string>
+ <!-- String describing the button used to add a plus (+) symbol to the dialpad -->
<string name="description_image_button_plus">plus</string>
<!-- String describing the Voicemail ImageButton