Merge "Properly implement requestIdToMessageId map" into ub-gmail-ur14-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a20f808..a083487 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,7 +28,7 @@
<uses-permission android:name="android.permission.NFC" />
<!-- This needs to be present when we are doing unbundled releases. -->
- <uses-sdk android:targetSdkVersion="19" android:minSdkVersion="14" />
+ <uses-sdk android:targetSdkVersion="21" android:minSdkVersion="14" />
<application
android:icon="@mipmap/ic_launcher_mail"
diff --git a/assets/script.js b/assets/script.js
index 497bffa..c629654 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -734,6 +734,7 @@
msg = block.firstChild;
}
parent.removeChild(block);
+ disablePostForms();
measurePositions();
}
@@ -756,6 +757,7 @@
msgContentDiv.innerHTML = window.mail.getMessageBody(id);
processNewMessageBody(msgContentDiv);
}
+ disablePostForms();
measurePositions();
}
@@ -766,9 +768,29 @@
var body = msg.children[0]; // toss the outer div, it was just to render innerHTML into
document.body.insertBefore(body, document.getElementById("conversation-footer"));
processNewMessageBody(body.querySelector(".mail-message-content"));
+ disablePostForms();
measurePositions();
}
+function disablePostForms() {
+ var forms = document.getElementsByTagName('FORM');
+ var i;
+ var j;
+ var elements;
+
+ for (i = 0; i < forms.length; ++i) {
+ if (forms[i].method.toUpperCase() === 'POST') {
+ forms[i].onsubmit = function() {
+ alert(MSG_FORMS_ARE_DISABLED);
+ return false;
+ }
+ elements = forms[i].elements;
+ for (j = 0; j < elements.length; ++j) {
+ elements[j].readOnly = true;
+ }
+ }
+ }
+}
// END Java->JavaScript handlers
// Do this first to ensure that the readiness signal comes through,
@@ -783,5 +805,5 @@
if (!RUNNING_KITKAT_OR_LATER) {
restoreScrollPosition();
}
+disablePostForms();
measurePositions();
-
diff --git a/res/drawable-hdpi/ic_warning_56dp.png b/res/drawable-hdpi/ic_warning_56dp.png
new file mode 100644
index 0000000..20a20e3
--- /dev/null
+++ b/res/drawable-hdpi/ic_warning_56dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_warning_56dp.png b/res/drawable-mdpi/ic_warning_56dp.png
new file mode 100644
index 0000000..6479994
--- /dev/null
+++ b/res/drawable-mdpi/ic_warning_56dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_warning_56dp.png b/res/drawable-xhdpi/ic_warning_56dp.png
new file mode 100644
index 0000000..e2000ee
--- /dev/null
+++ b/res/drawable-xhdpi/ic_warning_56dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_warning_56dp.png b/res/drawable-xxhdpi/ic_warning_56dp.png
new file mode 100644
index 0000000..85db289
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_warning_56dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_warning_56dp.png b/res/drawable-xxxhdpi/ic_warning_56dp.png
new file mode 100644
index 0000000..65bc0fb
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_warning_56dp.png
Binary files differ
diff --git a/res/layout-sw600dp/mail_toolbar_view.xml b/res/layout-sw600dp/mail_toolbar_view.xml
index bef17f9..f014999 100644
--- a/res/layout-sw600dp/mail_toolbar_view.xml
+++ b/res/layout-sw600dp/mail_toolbar_view.xml
@@ -22,6 +22,7 @@
android:id="@+id/mail_toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ app:contentInsetStart="@dimen/action_bar_content_inset_start"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" >
@@ -45,6 +46,7 @@
android:layout_width="56dp"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
+ android:contentDescription="@string/menu_search"
android:scaleType="center"
android:src="@drawable/ic_menu_search" />
diff --git a/res/layout/conversation_footer.xml b/res/layout/conversation_footer.xml
index edd270a..0306216 100644
--- a/res/layout/conversation_footer.xml
+++ b/res/layout/conversation_footer.xml
@@ -19,7 +19,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content"
+ android:layout_marginTop="24dp" >
<include layout="@layout/conversation_view_border" />
@@ -55,7 +56,7 @@
<View
android:layout_width="match_parent"
- android:layout_height="16dp"
+ android:layout_height="48dp"
android:background="@color/conversation_view_item_background_color" />
</com.android.mail.browse.ConversationFooterView>
\ No newline at end of file
diff --git a/res/layout/conversation_list.xml b/res/layout/conversation_list.xml
index 64f8fde..a9eeb18 100644
--- a/res/layout/conversation_list.xml
+++ b/res/layout/conversation_list.xml
@@ -37,6 +37,8 @@
<!-- Offset by height of undo bar and action bar -->
<include layout="@layout/conversation_list_empty_view" />
+ <include layout="@layout/security_hold_view" />
+
<com.android.mail.ui.SwipeableListView
android:id="@+id/conversation_list_view"
android:layout_width="match_parent"
diff --git a/res/layout/custom_from_item.xml b/res/layout/custom_from_item.xml
deleted file mode 100644
index c793142..0000000
--- a/res/layout/custom_from_item.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2011 Google Inc.
- Licensed to The Android Open Source Project.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <TextView
- android:id="@+id/spinner_account_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAlignment="viewStart"
- style="@style/ComposeFromTextViewStyle" />
-
- <TextView
- android:id="@+id/spinner_account_address"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textAlignment="viewStart"
- style="@style/SpinnerAccountAddressStyle" />
-
- <ImageView
- android:src="@drawable/ic_expand_more_24dp"
- style="@style/ComposeFieldButton" />
-
-</LinearLayout>
diff --git a/res/layout/folder_list.xml b/res/layout/folder_list.xml
index 239dea7..6cca4e0 100644
--- a/res/layout/folder_list.xml
+++ b/res/layout/folder_list.xml
@@ -50,6 +50,7 @@
android:layout_width="match_parent"
android:layout_height="56dp"
android:src="@drawable/ic_ellipsis_24dp"
+ android:contentDescription="@string/drawer_open"
style="@style/MiniDrawerFolderStyle" />
<Space
diff --git a/res/layout/folder_list_header.xml b/res/layout/folder_list_header.xml
index 407ad9e..7a73569 100644
--- a/res/layout/folder_list_header.xml
+++ b/res/layout/folder_list_header.xml
@@ -37,7 +37,6 @@
android:gravity="bottom"
android:ellipsize="end"
android:singleLine="true"
- android:textAllCaps="true"
android:textColor="@color/folder_list_heading_text_color"
android:paddingLeft="@dimen/folder_list_heading_padding_side"
android:paddingRight="@dimen/folder_list_heading_padding_side"
diff --git a/res/layout/from_item.xml b/res/layout/from_item.xml
index 027d1a6..b20e9a3 100644
--- a/res/layout/from_item.xml
+++ b/res/layout/from_item.xml
@@ -20,11 +20,17 @@
android:layout_height="match_parent">
<TextView
+ android:id="@+id/spinner_account_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAlignment="viewStart"
+ style="@style/SpinnerAccountNameStyle" />
+
+ <TextView
android:id="@+id/spinner_account_address"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:singleLine="true"
android:textAlignment="viewStart"
style="@style/ComposeFromTextViewStyle" />
diff --git a/res/layout/mail_actionbar_searchview.xml b/res/layout/mail_actionbar_searchview.xml
index 85f4c72..7a253b6 100644
--- a/res/layout/mail_actionbar_searchview.xml
+++ b/res/layout/mail_actionbar_searchview.xml
@@ -29,8 +29,7 @@
android:layout_width="@dimen/search_leading_button_width"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
- android:paddingLeft="@dimen/search_button_padding"
- android:paddingRight="@dimen/search_button_padding"
+ android:contentDescription="@string/search_back_desc"
android:scaleType="center"
android:src="@drawable/ic_arrow_back_24dp_with_rtl" />
@@ -44,6 +43,7 @@
android:hint="@string/search_hint"
android:imeOptions="actionSearch|flagNoExtractUi"
android:inputType="text|textNoSuggestions"
+ android:nextFocusDown="@+id/search_overlay_suggestion_list"
android:paddingLeft="@dimen/search_main_text_padding"
android:paddingRight="@dimen/search_main_text_padding"
android:singleLine="true"
@@ -57,9 +57,6 @@
android:layout_width="@dimen/search_ending_button_width"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
- android:paddingLeft="@dimen/search_button_padding"
- android:paddingRight="@dimen/search_button_padding"
- android:scaleType="center"
- android:src="@drawable/ic_mic_24dp" />
+ android:scaleType="center" />
</com.android.mail.ui.MaterialSearchActionView>
\ No newline at end of file
diff --git a/res/layout/mail_toolbar_view.xml b/res/layout/mail_toolbar_view.xml
index 961e89c..78a5172 100644
--- a/res/layout/mail_toolbar_view.xml
+++ b/res/layout/mail_toolbar_view.xml
@@ -21,5 +21,6 @@
android:id="@+id/mail_toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ app:contentInsetStart="@dimen/action_bar_content_inset_start"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
\ No newline at end of file
diff --git a/res/layout/one_pane_activity.xml b/res/layout/one_pane_activity.xml
index c76beed..ef0464b 100644
--- a/res/layout/one_pane_activity.xml
+++ b/res/layout/one_pane_activity.xml
@@ -33,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foregroundGravity="fill_horizontal|top"
- android:foreground="?android:attr/windowContentOverlay" >
+ android:foreground="?android:attr/windowContentOverlay">
<FrameLayout
android:id="@+id/content_pane"
diff --git a/res/layout/quoted_text.xml b/res/layout/quoted_text.xml
index 4bde415..a422caa 100644
--- a/res/layout/quoted_text.xml
+++ b/res/layout/quoted_text.xml
@@ -52,7 +52,7 @@
android:background="?android:attr/selectableItemBackground"
android:text="@string/respond_inline"
android:textAllCaps="true"
- android:textColor="@color/respond_inline_color"
+ android:textColor="@color/text_color_blue"
android:textSize="14sp" />
</LinearLayout>
diff --git a/res/layout/search_suggestion_item.xml b/res/layout/search_suggestion_item.xml
index c53f426..6f03117 100644
--- a/res/layout/search_suggestion_item.xml
+++ b/res/layout/search_suggestion_item.xml
@@ -26,8 +26,6 @@
android:id="@+id/search_overlay_item_icon"
android:layout_width="@dimen/search_leading_button_width"
android:layout_height="wrap_content"
- android:paddingLeft="@dimen/search_button_padding"
- android:paddingRight="@dimen/search_button_padding"
android:scaleType="center" />
<TextView
diff --git a/res/layout/search_suggestion_list.xml b/res/layout/search_suggestion_list.xml
index 8bfebf5..3f4bed0 100644
--- a/res/layout/search_suggestion_list.xml
+++ b/res/layout/search_suggestion_list.xml
@@ -29,7 +29,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
- android:divider="@null" />
+ android:divider="@null"
+ android:nextFocusUp="@+id/search_actionbar_query_text" />
<!-- Scrim to fade the background -->
<View
diff --git a/res/layout/security_hold_view.xml b/res/layout/security_hold_view.xml
new file mode 100644
index 0000000..5716642
--- /dev/null
+++ b/res/layout/security_hold_view.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 Google Inc.
+ Licensed to The Android Open Source Project.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/security_hold_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical"
+ android:visibility="invisible" >
+
+ <ImageView
+ android:id="@+id/security_hold_icon"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:src="@drawable/ic_warning_56dp"/>
+
+ <TextView
+ android:id="@+id/security_hold_text"
+ android:fontFamily="sans-serif-light"
+ android:gravity="center"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_marginTop="20dp"
+ android:maxWidth="@dimen/security_hold_text_width"
+ android:textAllCaps="true"
+ android:textColor="#212121"
+ android:textSize="@dimen/security_hold_view_text_size"/>
+
+ <TextView
+ android:id="@+id/security_hold_button"
+ android:fontFamily="sans-serif-light"
+ android:gravity="center"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_marginTop="60dp"
+ android:text="@string/update_security_text"
+ android:textColor="@color/text_color_blue"
+ android:textSize="@dimen/security_hold_view_text_size"/>
+
+</LinearLayout>
diff --git a/res/layout/super_collapsed_block.xml b/res/layout/super_collapsed_block.xml
index a68f7b5..281d198 100644
--- a/res/layout/super_collapsed_block.xml
+++ b/res/layout/super_collapsed_block.xml
@@ -33,13 +33,13 @@
<View
android:layout_width="match_parent"
- android:layout_height="1dp"
+ android:layout_height="@dimen/divider_height"
android:background="@color/conversation_view_border_color"/>
<View
android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_marginTop="8dp"
+ android:layout_height="@dimen/divider_height"
+ android:layout_marginTop="4dp"
android:background="@color/conversation_view_border_color"/>
</LinearLayout>
diff --git a/res/layout/two_pane_activity.xml b/res/layout/two_pane_activity.xml
index ca11599..3b9ef33 100644
--- a/res/layout/two_pane_activity.xml
+++ b/res/layout/two_pane_activity.xml
@@ -26,14 +26,14 @@
<!-- Main content -->
<FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:foreground="?android:attr/windowContentOverlay">
<com.android.mail.ui.TwoPaneLayout
android:id="@+id/two_pane_activity"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foregroundGravity="fill_horizontal|top"
- android:foreground="?android:attr/windowContentOverlay"
android:background="@color/tablet_background_gray">
<FrameLayout
diff --git a/res/raw/template_conversation_lower.html b/res/raw/template_conversation_lower.html
index d4b59fc..4e76f34 100644
--- a/res/raw/template_conversation_lower.html
+++ b/res/raw/template_conversation_lower.html
@@ -13,6 +13,7 @@
var ENABLE_MUNGE_TABLES = %s;
var ENABLE_MUNGE_IMAGES = %s;
var RUNNING_KITKAT_OR_LATER = %s;
+ var MSG_FORMS_ARE_DISABLED = '%s';
</script>
<script type="text/javascript" src="file:///android_asset/script.js"></script>
</html>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f61c4a2..b54ce9f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Kon nie lêer aanheg nie."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Toestemming is vir die aanhegsel geweier."</string>
<string name="recipient_needed" msgid="319816879398937214">"Voeg ten minste een ontvanger by."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Ontvangerfout"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Stuur boodskap?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Daar is geen teks in die boodskaponderwerp nie."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Daar is geen teks in die boodskaplyf nie."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Stuur hierdie boodskap?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-lêer"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Voorskou"</string>
<string name="save_attachment" msgid="375685179032130033">"Stoor"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Kanselleer"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Maak oop"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installeer"</string>
<string name="download_again" msgid="8195787340878328119">"Laai weer af"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Inligting"</string>
<string name="no_application_found" msgid="7309485680354949680">"Geen program kan hierdie aanhegsel vir bekyking oopmaak nie."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Stuur e-pos"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Kaart"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Deel skakel"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Hulp"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Stuur terugvoer"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> oor <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> op <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> oor <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> om <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"gesprek gelees"</string>
@@ -183,8 +174,8 @@
<item quantity="other" msgid="664292592683692920">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> as strooipos gerapporteer"</item>
</plurals>
<plurals name="conversation_not_spam">
- <item quantity="one" msgid="3680479171846552641">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> as strooipos gerapporteer"</item>
- <item quantity="other" msgid="6351739502184556635">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> as strooipos gerapporteer"</item>
+ <item quantity="one" msgid="3680479171846552641">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> gerapporteer as nie strooipos nie"</item>
+ <item quantity="other" msgid="6351739502184556635">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> gerapporteer as nie strooipos nie"</item>
</plurals>
<plurals name="conversation_not_important">
<item quantity="one" msgid="7432667428974709669">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> gemerk as nie belangrik nie"</item>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ouer boodskappe"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Laai tans <xliff:g id="COUNT">%1$d</xliff:g> ouer boodskappe"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Van:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Antwoord aan:"</string>
<string name="to_heading" msgid="3495203282540398336">"Aan: "</string>
@@ -478,4 +466,6 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Algemene instellings"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Instellings"</string>
<string name="overflow_description" msgid="7886090597023240426">"Nog opsies"</string>
+ <string name="security_hold_required_text" msgid="6619955920101834286">"Beveiligingsopdatering word vereis vir <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
+ <string name="update_security_text" msgid="3527335757205741077">"Opdateer nou"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ea14a9c..c7948c8 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ፋይል ማያያዝ አልተቻለም።"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"ለዓባሪው ፍቃድ ተከልክሏል።"</string>
<string name="recipient_needed" msgid="319816879398937214">"ቢያንስ አንድ ተቀባይ አክል።"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"የተቀባይ ስህተት"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"መልዕክት ይላከ?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"በመልዕክቱ ርዕሰ ጕዳይ ውስጥ ምንም ጹሁፍ የለም።"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"በመልዕክቱ የመጻፊያ አካል ውስጥ ምንም ጹሁፍ የለም።"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"ይህ መልዕክት ይላክ?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ፋይል"</string>
<string name="preview_attachment" msgid="6265457626086113833">"ቅድመ-ዕይታ"</string>
<string name="save_attachment" msgid="375685179032130033">"አስቀምጥ"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"ይቅር"</string>
- <string name="open_attachment" msgid="6100396056314739761">"ክፈት"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ጫን"</string>
<string name="download_again" msgid="8195787340878328119">"እንደገና አውርድ"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"መረጃ"</string>
<string name="no_application_found" msgid="7309485680354949680">"ይህንን አባሪ ለማየት ምንም መተግበሪያ ሊከፍት አይችልም።"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ኢሜይል ላክ"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"ካርታ"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"አገናኝ አጋራ"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"እገዛ"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"ግብረ-መልስ ላክ"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> ስለ<xliff:g id="SUBJECT">%3$s</xliff:g>፣ <xliff:g id="SNIPPET">%4$s</xliff:g> በ<xliff:g id="DATE">%5$s</xliff:g> ላይ፣ <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> ስለ<xliff:g id="SUBJECT">%3$s</xliff:g>፣ <xliff:g id="SNIPPET">%4$s</xliff:g> በ<xliff:g id="TIME">%5$s</xliff:g> ላይ፣ <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"የተነበበ ውይይት"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> የቆዩ መልዕክቶች"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> የቆዩ መልዕክቶችን በመጫን ላይ"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"ከ፦"</string>
<string name="replyto_heading" msgid="8275255318292059079">"መልስ ለ፦"</string>
<string name="to_heading" msgid="3495203282540398336">"ለ፦ "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"አጠቃላይ ቅንብሮች"</string>
<string name="activity_preferences" msgid="8966077432517613292">"ቅንብሮች"</string>
<string name="overflow_description" msgid="7886090597023240426">"ተጨማሪ አማራጮች"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d50636e..ba8165a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"تعذر إرفاق الملف."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"تم رفض الإذن الخاص بالمرفق."</string>
<string name="recipient_needed" msgid="319816879398937214">"أضف مستلمًا واحدًا على الأقل."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"خطأ في المستلم"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"هل تريد إرسال الرسالة؟"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"لا يحتوي موضوع الرسالة على نص."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"لا تحتوي الرسالة على نص."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"هل تريد إرسال هذه الرسالة؟"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"ملف <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"معاينة"</string>
<string name="save_attachment" msgid="375685179032130033">"حفظ"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"إلغاء"</string>
- <string name="open_attachment" msgid="6100396056314739761">"فتح"</string>
- <string name="install_attachment" msgid="8119470822958087928">"تثبيت"</string>
<string name="download_again" msgid="8195787340878328119">"تنزيل مرة أخرى"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"معلومات"</string>
<string name="no_application_found" msgid="7309485680354949680">"ليس هناك تطبيق يمكنه فتح هذا المرفق لمشاهدته"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"إرسال رسالة إلكترونية"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"خريطة"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"مشاركة الرابط"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"مساعدة"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"إرسال تعليقات"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> بشأن <xliff:g id="SUBJECT">%3$s</xliff:g>، <xliff:g id="SNIPPET">%4$s</xliff:g> في <xliff:g id="DATE">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> بشأن <xliff:g id="SUBJECT">%3$s</xliff:g>، <xliff:g id="SNIPPET">%4$s</xliff:g> في <xliff:g id="TIME">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"تمت قراءة المحادثة"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"الرسائل القديمة: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"جارٍ تحميل <xliff:g id="COUNT">%1$d</xliff:g> من الرسائل القديمة"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"من:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"جهة الرد:"</string>
<string name="to_heading" msgid="3495203282540398336">"إلى: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"الإعدادات العامة"</string>
<string name="activity_preferences" msgid="8966077432517613292">"الإعدادات"</string>
<string name="overflow_description" msgid="7886090597023240426">"خيارات أخرى"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e1d85b8..fb28ecf 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Файлът не можа да бъде прикачен."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"За прикачения файл бе отказано разрешение."</string>
<string name="recipient_needed" msgid="319816879398937214">"Добавете поне един получател."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Грешка при получателя"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Да се изпрати ли съобщението?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Не сте въвели тема на съобщението."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Съобщението е празно. Не сте въвели нищо."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Да се изпрати ли това съобщение?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> файл"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Визуал."</string>
<string name="save_attachment" msgid="375685179032130033">"Запазване"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Отказ"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Отваряне"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Инсталация"</string>
<string name="download_again" msgid="8195787340878328119">"Повторно изтегляне"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Информация"</string>
<string name="no_application_found" msgid="7309485680354949680">"Няма приложение, с което този прикачен файл може да се отвори и прегледа."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Изпращане на имейл"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Карта"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Споделяне на връзката"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Помощ"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Изпратете отзиви"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> относно „<xliff:g id="SUBJECT">%3$s</xliff:g>“: „<xliff:g id="SNIPPET">%4$s</xliff:g>“ на <xliff:g id="DATE">%5$s</xliff:g> – <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> относно „<xliff:g id="SUBJECT">%3$s</xliff:g>“: „<xliff:g id="SNIPPET">%4$s</xliff:g>“ в <xliff:g id="TIME">%5$s</xliff:g> – <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"кореспонденцията е прочетена"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> по-стари съобщения"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Зареждат се <xliff:g id="COUNT">%1$d</xliff:g> по-стари съобщения"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"От:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Отг. до:"</string>
<string name="to_heading" msgid="3495203282540398336">"До: "</string>
@@ -478,4 +466,6 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Общи настройки"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Настройки"</string>
<string name="overflow_description" msgid="7886090597023240426">"Още опции"</string>
+ <string name="security_hold_required_text" msgid="6619955920101834286">"За <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> се изисква актуализация на защитата"</string>
+ <string name="update_security_text" msgid="3527335757205741077">"актуализиране сега"</string>
</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 41e0127..d54fe63 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ফাইল সংযুক্ত করা যায়নি।"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"এই সংযুক্তিটির জন্য অনুমতি অস্বীকৃত৷"</string>
<string name="recipient_needed" msgid="319816879398937214">"কমপক্ষে একজন প্রাপককে জুড়ুন।"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"প্রাপক ত্রুটি"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"বার্তা পাঠাবেন?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"বার্তার বিষয়ে কোনো পাঠ্য নেই।"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"বার্তার মূল অংশে কোনো পাঠ্য নেই।"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"এই বার্তাটি পাঠাবেন?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ফাইল"</string>
<string name="preview_attachment" msgid="6265457626086113833">"পূর্বরূপ"</string>
<string name="save_attachment" msgid="375685179032130033">"সংরক্ষণ করুন"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"বাতিল করুন"</string>
- <string name="open_attachment" msgid="6100396056314739761">"খুলুন"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ইনস্টল করুন"</string>
<string name="download_again" msgid="8195787340878328119">"আবার ডাউনলোড করুন"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"তথ্য"</string>
<string name="no_application_found" msgid="7309485680354949680">"কোনো অ্যাপ্লিকেশনই এই সংযুক্তিটিকে দেখার জন্য খুলতে পারছে না।"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ইমেল পাঠান"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"মানচিত্র"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"লিঙ্ক ভাগ করুন"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"সহায়তা"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"প্রতিক্রিয়া পাঠান"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> সম্পর্কে, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g> এ, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> সম্পর্কে, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g> এ, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"কথোপকথন পঠন"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g>টি পুরোনো বার্তা"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g>টি অপেক্ষাকৃত পুরানো বার্তা লোড হচ্ছে"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"প্রেরক:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"একে-উত্তর দিন:"</string>
<string name="to_heading" msgid="3495203282540398336">"প্রতি: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"সাধারণ সেটিংস"</string>
<string name="activity_preferences" msgid="8966077432517613292">"সেটিংস"</string>
<string name="overflow_description" msgid="7886090597023240426">"আরো বিকল্প"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 49b5dde..2587674 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"No s\'ha pogut adjuntar el fitxer."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"S\'ha denegat el permís per al fitxer adjunt."</string>
<string name="recipient_needed" msgid="319816879398937214">"Afegeix com a mínim un destinatari."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Error de destinatari"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Vols enviar el missatge?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"No hi ha text en l\'assumpte del missatge."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"No hi ha text al cos del missatge."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Vols enviar aquest missatge?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Fitxer <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Previsual."</string>
<string name="save_attachment" msgid="375685179032130033">"Desa"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Cancel·la"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Obre"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instal·la"</string>
<string name="download_again" msgid="8195787340878328119">"Torna-ho a baixar"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informació"</string>
<string name="no_application_found" msgid="7309485680354949680">"No hi ha cap aplicació que pugui obrir aquest fitxer adjunt per a la visualització."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Envia un correu"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Comparteix l\'enllaç"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Ajuda"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Envia comentaris"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> el dia <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> a les <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversa llegida"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> missatges anteriors"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"S\'estan carregant <xliff:g id="COUNT">%1$d</xliff:g> missatges antics."</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"De:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Respon a:"</string>
<string name="to_heading" msgid="3495203282540398336">"Per a: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Configuració general"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Configuració"</string>
<string name="overflow_description" msgid="7886090597023240426">"Més opcions"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ae49426..f27f073 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Soubor se nepodařilo připojit jako přílohu."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Pro přílohu bylo zamítnuto oprávnění."</string>
<string name="recipient_needed" msgid="319816879398937214">"Přidejte alespoň jednoho příjemce."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Chyba příjemce"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Odeslat zprávu?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"V předmětu zprávy není žádný text."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"V těle zprávy není žádný text."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Odeslat tuto zprávu?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Soubor <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Náhled"</string>
<string name="save_attachment" msgid="375685179032130033">"Uložit"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Zrušit"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Otevřít"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instalovat"</string>
<string name="download_again" msgid="8195787340878328119">"Stáhnout znovu"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informace"</string>
<string name="no_application_found" msgid="7309485680354949680">"Tuto přílohu nelze zobrazit v žádné dostupné aplikaci."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Odeslat e-mail"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Sdílet odkaz"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Nápověda"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Odeslat zpětnou vazbu"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> – <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>, dne <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> – <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>, v <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"Konverzace byla přečtena."</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Starší zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Načítání <xliff:g id="COUNT">%1$d</xliff:g> starších zpráv"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Od:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Odpovědět:"</string>
<string name="to_heading" msgid="3495203282540398336">"Komu: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Obecná nastavení"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Nastavení"</string>
<string name="overflow_description" msgid="7886090597023240426">"Další možnosti"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 074870d..e013e6d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Filen kunne ikke vedhæftes."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Tilladelse nægtet for den vedhæftede fil."</string>
<string name="recipient_needed" msgid="319816879398937214">"Tilføj mindst én modtager."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Fejl i modtager"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Vil du sende meddelelsen?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Der er ingen tekst i meddelelsens emne."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Der er ingen tekst i selve meddelelsen."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Vil du sende denne meddelelse?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-fil"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Vis eks."</string>
<string name="save_attachment" msgid="375685179032130033">"Gem"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Annuller"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Åbn"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installer"</string>
<string name="download_again" msgid="8195787340878328119">"Download igen"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Oplysninger"</string>
<string name="no_application_found" msgid="7309485680354949680">"Der er ikke nogen app, der kan åbne og vise denne vedhæftede fil."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Send e-mail"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Kort"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Del link"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Hjælp"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Send feedback"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> om <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> den <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> om <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kl. <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"samtalen er læst"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ældre meddelelser"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> ældre meddelelser indlæses"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Fra:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Svar til:"</string>
<string name="to_heading" msgid="3495203282540398336">"Til: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Generelle indstillinger"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Indstillinger"</string>
<string name="overflow_description" msgid="7886090597023240426">"Flere muligheder"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e594045..29ccdc5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Die Datei konnte nicht hinzugefügt werden."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Der Zugriff auf den Anhang wurde verweigert."</string>
<string name="recipient_needed" msgid="319816879398937214">"Fügen Sie mindestens einen Empfänger hinzu."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Fehler beim Empfänger"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Nachricht senden?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Die Betreffzeile der E-Mail ist leer."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Die E-Mail ist leer."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Nachricht senden?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-Datei"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Vorschau"</string>
<string name="save_attachment" msgid="375685179032130033">"Speichern"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Abbrechen"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Öffnen"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installieren"</string>
<string name="download_again" msgid="8195787340878328119">"Erneut herunterladen"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Info"</string>
<string name="no_application_found" msgid="7309485680354949680">"Dieser Anhang kann von keiner App zum Anzeigen geöffnet werden."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"E-Mail senden"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Karte"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Link teilen"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Hilfe"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Feedback geben"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> über <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> am <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> über <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> um <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"Konversation gelesen"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ältere Nachrichten"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> ältere Nachrichten werden geladen."</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Von:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Antwort:"</string>
<string name="to_heading" msgid="3495203282540398336">"An: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Allgemeine Einstellungen"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Einstellungen"</string>
<string name="overflow_description" msgid="7886090597023240426">"Weitere Optionen"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 9817e38..e82a50d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Δεν ήταν δυνατή η επισύναψη του αρχείου."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Δεν έχετε δικαίωμα πρόσβασης στο συνημμένο."</string>
<string name="recipient_needed" msgid="319816879398937214">"Προσθέστε τουλάχιστον έναν παραλήπτη."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Σφάλμα παραλήπτη"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Αποστολή μηνύματος;"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Το θέμα του μηνύματος δεν περιέχει κείμενο."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Το κύριο μέρος του μηνύματος δεν περιέχει κείμενο."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Αποστολή του μηνύματος;"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Αρχείο <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Προεπισκ."</string>
<string name="save_attachment" msgid="375685179032130033">"Αποθήκευση"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Ακύρωση"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Άνοιγμα"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Εγκατάστ."</string>
<string name="download_again" msgid="8195787340878328119">"Λήψη ξανά"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Πληροφορίες"</string>
<string name="no_application_found" msgid="7309485680354949680">"Δεν υπάρχει εφαρμογή για το άνοιγμα αυτού του συνημμένου για προβολή."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Χάρτης"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Κοινή χρήση συνδέσμου"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Βοήθεια"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Αποστολή σχολίων"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> σχετικά με <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> στις <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> σχετικά με <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> στις <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"αναγνωσμένη συνομιλία"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> παλαιότερα μηνύματα"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Φόρτωση <xliff:g id="COUNT">%1$d</xliff:g> παλαιότερων μηνυμάτων"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Από:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Απάντ. σε:"</string>
<string name="to_heading" msgid="3495203282540398336">"Προς: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Γενικές ρυθμίσεις"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Ρυθμίσεις"</string>
<string name="overflow_description" msgid="7886090597023240426">"Περισσότερες επιλογές"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f370b36..3968d3c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Unable to attach file."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Permission denied for the attachment."</string>
<string name="recipient_needed" msgid="319816879398937214">"Add at least one recipient."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Recipient error"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Send message?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"There\'s no text in the message subject."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"There\'s no text in the message body."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Send this message?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> File"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Preview"</string>
<string name="save_attachment" msgid="375685179032130033">"Save"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Cancel"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Open"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Install"</string>
<string name="download_again" msgid="8195787340878328119">"Download again"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Info"</string>
<string name="no_application_found" msgid="7309485680354949680">"No app can open this attachment for viewing."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Send email"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Map"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Share link"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Help"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Send feedback"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> on <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> at <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversation read"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Loading <xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"From:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Reply to:"</string>
<string name="to_heading" msgid="3495203282540398336">"To: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"General settings"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Settings"</string>
<string name="overflow_description" msgid="7886090597023240426">"More options"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index f370b36..3968d3c 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Unable to attach file."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Permission denied for the attachment."</string>
<string name="recipient_needed" msgid="319816879398937214">"Add at least one recipient."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Recipient error"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Send message?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"There\'s no text in the message subject."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"There\'s no text in the message body."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Send this message?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> File"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Preview"</string>
<string name="save_attachment" msgid="375685179032130033">"Save"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Cancel"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Open"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Install"</string>
<string name="download_again" msgid="8195787340878328119">"Download again"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Info"</string>
<string name="no_application_found" msgid="7309485680354949680">"No app can open this attachment for viewing."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Send email"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Map"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Share link"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Help"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Send feedback"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> on <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> about <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> at <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversation read"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Loading <xliff:g id="COUNT">%1$d</xliff:g> older messages"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"From:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Reply to:"</string>
<string name="to_heading" msgid="3495203282540398336">"To: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"General settings"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Settings"</string>
<string name="overflow_description" msgid="7886090597023240426">"More options"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c64c4ac..351a2a7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"No se pudo adjuntar el archivo."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Se denegó el permiso para el archivo adjunto."</string>
<string name="recipient_needed" msgid="319816879398937214">"Agrega al menos un destinatario."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Error de destinatario"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"¿Deseas enviar este mensaje?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"El asunto del mensaje está vacío."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"El cuerpo del mensaje está vacío."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"¿Deseas enviar este mensaje?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Archivo <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Vista prev"</string>
<string name="save_attachment" msgid="375685179032130033">"Guardar"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Cancelar"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Abrir"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instalar"</string>
<string name="download_again" msgid="8195787340878328119">"Volver a descargar"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Info"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ninguna aplicación puede abrir este archivo adjunto para su visualización."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Enviar correo"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Compartir vínculo"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Ayuda"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar comentario"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> el <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> a la hora <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversación leída"</string>
@@ -183,8 +174,8 @@
<item quantity="other" msgid="664292592683692920">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> informadas como spam"</item>
</plurals>
<plurals name="conversation_not_spam">
- <item quantity="one" msgid="3680479171846552641">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> marcada como deseada"</item>
- <item quantity="other" msgid="6351739502184556635">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> marcadas como deseadas"</item>
+ <item quantity="one" msgid="3680479171846552641">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> no es spam"</item>
+ <item quantity="other" msgid="6351739502184556635">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> no son spam"</item>
</plurals>
<plurals name="conversation_not_important">
<item quantity="one" msgid="7432667428974709669">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> marcada como no importante"</item>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes antiguos"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Cargando <xliff:g id="COUNT">%1$d</xliff:g> mensajes más antiguos"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"De:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Responder a:"</string>
<string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Configuración general"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Configuración"</string>
<string name="overflow_description" msgid="7886090597023240426">"Más opciones"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2198c02..3463adc 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"No se ha podido adjuntar el archivo."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Se ha denegado el permiso para el archivo adjunto."</string>
<string name="recipient_needed" msgid="319816879398937214">"Añade al menos un destinatario."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Error de destinatario"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"¿Quieres enviar el mensaje?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"El asunto del mensaje está vacío."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"El cuerpo del mensaje está vacío."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"¿Quieres enviar este mensaje?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Archivo <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Vista previa"</string>
<string name="save_attachment" msgid="375685179032130033">"Guardar"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Cancelar"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Abrir"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instalar"</string>
<string name="download_again" msgid="8195787340878328119">"Volver a descargar"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Información"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ninguna aplicación puede abrir este archivo adjunto."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Enviar correo"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Compartir enlace"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Ayuda"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar sugerencias"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> el <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> a las <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversación leída"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes antiguos"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Cargando <xliff:g id="COUNT">%1$d</xliff:g> mensajes anteriores"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"De:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Responder a:"</string>
<string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -478,4 +466,6 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Ajustes generales"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Ajustes"</string>
<string name="overflow_description" msgid="7886090597023240426">"Más opciones"</string>
+ <string name="security_hold_required_text" msgid="6619955920101834286">"<xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> tiene pendiente una actualización de seguridad"</string>
+ <string name="update_security_text" msgid="3527335757205741077">"actualizar ahora"</string>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index c9ddc57..017c7ef 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Faili ei saanud manustada."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Manuse loast keelduti."</string>
<string name="recipient_needed" msgid="319816879398937214">"Lisage vähemalt üks saaja."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Saaja viga"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Kas soovite sõnumi saata?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Sõnumi teemas pole teksti."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Sõnumi sisus pole teksti."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Kas soovite selle sõnumi saata?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-fail"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Eelvaade"</string>
<string name="save_attachment" msgid="375685179032130033">"Salvesta"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Tühista"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Ava"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installi"</string>
<string name="download_again" msgid="8195787340878328119">"Laadi uuesti alla"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Teave"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ükski rakendus ei saa seda manust vaatamiseks avada."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Saada meil"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Kaart"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Jaga linki"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Abi"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Tagasiside saatmine"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"Osalejale <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> teemal <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kuupäeval <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"Osalejale <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> teemal <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kell <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"loetud vestlus"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> vanemat sõnumit"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> vanema kirja laadimine"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Saatja:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Vasta:"</string>
<string name="to_heading" msgid="3495203282540398336">"Saaja: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Üldseaded"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Seaded"</string>
<string name="overflow_description" msgid="7886090597023240426">"Rohkem valikuid"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index 6ae3a1c..735d3cb 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Ezin izan da fitxategia erantsi."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Eranskinerako baimena ukatu da."</string>
<string name="recipient_needed" msgid="319816879398937214">"Gehitu gutxienez hartzaile bat."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Hartzailearen errorea"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Mezua bidali nahi duzu?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Ez dago testurik mezuaren gaian."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Ez dago testurik mezuaren gorputzean."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Mezua bidali nahi duzu?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> fitxategia"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Aurreikusi"</string>
<string name="save_attachment" msgid="375685179032130033">"Gorde"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Utzi"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Ireki"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instalatu"</string>
<string name="download_again" msgid="8195787340878328119">"Deskargatu berriro"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informazioa"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ez dago eranskina erakuts dezakeen aplikaziorik."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Bidali mezu elektronikoa"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Partekatu esteka"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Laguntza"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Bidali iritzia"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"Jasotzailea: <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>. Gaia: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="DATE">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"Jasotzailea: <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>. Gaia: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="TIME">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"elkarrizketa irakurri duzu"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mezu zaharrago"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> mezu zaharrago kargatzen"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Igorlea:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Erantzun honi:"</string>
<string name="to_heading" msgid="3495203282540398336">"Hartzailea: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Ezarpen orokorrak"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Ezarpenak"</string>
<string name="overflow_description" msgid="7886090597023240426">"Aukera gehiago"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b56a0be..df56e3e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"پیوست فایل انجام نشد."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"مجوز برای این پیوست رد شد."</string>
<string name="recipient_needed" msgid="319816879398937214">"حداقل یک گیرنده اضافه کنید."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"خطای گیرنده"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"پیام ارسال شود؟"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"نوشتاری در موضوع پیام وجود ندارد."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"نوشتاری در بدنه پیام وجود ندارد."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"این پیام ارسال شود؟"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"فایل <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"پیشنمایش"</string>
<string name="save_attachment" msgid="375685179032130033">"ذخیره"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"لغو"</string>
- <string name="open_attachment" msgid="6100396056314739761">"باز کردن"</string>
- <string name="install_attachment" msgid="8119470822958087928">"نصب"</string>
<string name="download_again" msgid="8195787340878328119">"دانلود دوباره"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"اطلاعات"</string>
<string name="no_application_found" msgid="7309485680354949680">"هیچ برنامهای نمیتواند این پیوست را جهت مشاهده باز کند."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ارسال ایمیل"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"نقشه"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"اشتراکگذاری پیوند"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"راهنمایی"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"ارسال بازخورد"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> درباره <xliff:g id="SUBJECT">%3$s</xliff:g>، <xliff:g id="SNIPPET">%4$s</xliff:g> در تاریخ <xliff:g id="DATE">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> درباره <xliff:g id="SUBJECT">%3$s</xliff:g>، <xliff:g id="SNIPPET">%4$s</xliff:g> ساعت <xliff:g id="TIME">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"مکالمه خوانده شده است"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> پیام قدیمیتر"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"در حال بارگیری <xliff:g id="COUNT">%1$d</xliff:g> پیام قدیمیتر"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"از:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"پاسخ به:"</string>
<string name="to_heading" msgid="3495203282540398336">"به: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"تنظیمات کلی"</string>
<string name="activity_preferences" msgid="8966077432517613292">"تنظیمات"</string>
<string name="overflow_description" msgid="7886090597023240426">"گزینههای بیشتر"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8977bbb..6692473 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Tiedostoa ei voi liittää."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Liitteen käyttöoikeus hylättiin."</string>
<string name="recipient_needed" msgid="319816879398937214">"Lisää vähintään yksi vastaanottaja."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Vastaanottajavirhe"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Lähetetäänkö viesti?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Viestin aiherivillä ei ole tekstiä."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Viestin runko-osassa ei ole tekstiä."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Lähetetäänkö viesti?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-tiedosto"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Esikatselu"</string>
<string name="save_attachment" msgid="375685179032130033">"Tallenna"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Peruuta"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Avaa"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Asenna"</string>
<string name="download_again" msgid="8195787340878328119">"Lataa uudelleen"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Tiedot"</string>
<string name="no_application_found" msgid="7309485680354949680">"Tämän liitetiedoston katseluun sopivaa sovellusta ei ole asennettu."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Lähetä sähköposti"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Kartta"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Jaa linkki"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Ohje"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Lähetä palautetta"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> aiheesta <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> päiväys <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> aiheesta <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kello <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"keskustelu on luettu"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> vanhempaa viestiä"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Ladataan <xliff:g id="COUNT">%1$d</xliff:g> vanhempaa viestiä"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Lähettäjä:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Vastausos.:"</string>
<string name="to_heading" msgid="3495203282540398336">"Vast.ott.: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Yleiset asetukset"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Asetukset"</string>
<string name="overflow_description" msgid="7886090597023240426">"Lisäasetukset"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 1f898f9..43206af 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Impossible de joindre le fichier."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Autorisation refusée pour la pièce jointe."</string>
<string name="recipient_needed" msgid="319816879398937214">"Vous devez indiquer au moins un destinataire."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erreur de destinataire"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Envoyer le message?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"L\'objet du message est vide."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Le corps du message est vide."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Envoyer ce message ?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Fichier <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Aperçu"</string>
<string name="save_attachment" msgid="375685179032130033">"Enregistrer"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Annuler"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Ouvrir"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installer"</string>
<string name="download_again" msgid="8195787340878328119">"Retélécharger"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Renseignements"</string>
<string name="no_application_found" msgid="7309485680354949680">"Aucune application ne peut ouvrir cette pièce jointe."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Envoyer un courriel"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Carte"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Partager le lien"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Aide"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Envoyer un commentaire"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> à propos de <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> le <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> à propos de <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> à <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversation lue"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> messages plus anciens"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Chargement de <xliff:g id="COUNT">%1$d</xliff:g> messages plus anciens en cours..."</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Langue source :"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Répondre à :"</string>
<string name="to_heading" msgid="3495203282540398336">"À : "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Paramètres généraux"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Paramètres"</string>
<string name="overflow_description" msgid="7886090597023240426">"Plus d\'options"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5e5ec22..2e14ee0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Impossible de joindre le fichier."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Autorisation refusée pour la pièce jointe."</string>
<string name="recipient_needed" msgid="319816879398937214">"Ajoutez au moins un destinataire."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erreur de destinataire"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Envoyer le message ?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"L\'objet du message est vide."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Le corps du message est vide."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Envoyer ce message ?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Fichier <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Prévisualiser"</string>
<string name="save_attachment" msgid="375685179032130033">"Enregistrer"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Annuler"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Ouvrir"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installer"</string>
<string name="download_again" msgid="8195787340878328119">"Retélécharger"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Infos"</string>
<string name="no_application_found" msgid="7309485680354949680">"Aucune application ne peut ouvrir cette pièce jointe."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Envoyer un e-mail"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Carte"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Partager le lien"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Aide"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Envoyer des commentaires"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> à propos de \"<xliff:g id="SUBJECT">%3$s</xliff:g>\", <xliff:g id="SNIPPET">%4$s</xliff:g> le <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> à propos de \"<xliff:g id="SUBJECT">%3$s</xliff:g>\", <xliff:g id="SNIPPET">%4$s</xliff:g> à <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversation lue"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> messages plus anciens"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Chargement de <xliff:g id="COUNT">%1$d</xliff:g> messages plus anciens en cours..."</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"De :"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Adresse de réponse :"</string>
<string name="to_heading" msgid="3495203282540398336">"À : "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Paramètres généraux"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Paramètres"</string>
<string name="overflow_description" msgid="7886090597023240426">"Autres options"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 2f659f9..7a2c1c6 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Non se puido anexar o ficheiro."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Permiso denegado para o anexo."</string>
<string name="recipient_needed" msgid="319816879398937214">"Engade polo menos un destinatario."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erro de destinatario"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Enviar mensaxe?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Non hai texto no asunto da mensaxe."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Non hai texto no corpo da mensaxe."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Enviar esta mensaxe?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Ficheiro <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Vista previa"</string>
<string name="save_attachment" msgid="375685179032130033">"Gardar"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Cancelar"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Abrir"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instalar"</string>
<string name="download_again" msgid="8195787340878328119">"Descargar de novo"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Información"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ningunha aplicación pode abrir este anexo para visualizalo."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Enviar correo electrónico"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Compartir a ligazón"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Axuda"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar comentarios"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> acerca de <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> o <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> acerca de <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ás <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversa lida"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensaxes máis antigas"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Cargando <xliff:g id="COUNT">%1$d</xliff:g> mensaxes máis antigas"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"De:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Responder a:"</string>
<string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Configuración xeral"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Configuración"</string>
<string name="overflow_description" msgid="7886090597023240426">"Máis opcións"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7ec824e..27de99c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -46,10 +46,8 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"फ़ाइल अनुलग्न नहीं की जा सकी."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"अटैचमेंट के लिए अनुमति अस्वीकृत."</string>
<string name="recipient_needed" msgid="319816879398937214">"कम से कम एक प्राप्तकर्ता जोड़ें."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"प्राप्तकर्ता त्रुटि"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"संदेश भेजें?"</string>
- <string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"संदेश के विषय में कोई पाठ नहीं है."</string>
- <string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"संदेश के मुख्य भाग में कोई पाठ नहीं है."</string>
+ <string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"संदेश के विषय में कोई लेख नहीं है."</string>
+ <string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"संदेश के मुख्य भाग में कोई लेख नहीं है."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"यह संदेश भेजें?"</string>
<string name="message_discarded" msgid="6792661321962262024">"संदेश छोड़ दिया गया."</string>
<string name="signature" msgid="3172144541947408374">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
@@ -86,8 +84,8 @@
<string name="mark_not_important" msgid="3342258155408116917">"महत्वपूर्ण नहीं चिह्नित करें"</string>
<string name="add_cc_label" msgid="2249679001141195213">"Cc/Bcc जोड़ें"</string>
<string name="add_bcc_label" msgid="963745641238037813">"Bcc जोड़ें"</string>
- <string name="quoted_text" msgid="977782904293216533">"उद्धरित पाठ शामिल करें"</string>
- <string name="quoted_text_label" msgid="2296807722849923934">"उद्धरित पाठ"</string>
+ <string name="quoted_text" msgid="977782904293216533">"उद्धरित लेख शामिल करें"</string>
+ <string name="quoted_text_label" msgid="2296807722849923934">"उद्धरित लेख"</string>
<string name="respond_inline" msgid="6609746292081928078">"इनलाइन प्रतिसाद दें"</string>
<string name="bytes" msgid="651011686747499628">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
<string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> KB"</string>
@@ -95,7 +93,7 @@
<string name="attachment_image" msgid="6375306026208274564">"चित्र"</string>
<string name="attachment_video" msgid="7119476472603939848">"वीडियो"</string>
<string name="attachment_audio" msgid="7097658089301809284">"ऑडियो"</string>
- <string name="attachment_text" msgid="3485853714965922173">"पाठ"</string>
+ <string name="attachment_text" msgid="3485853714965922173">"लेख"</string>
<string name="attachment_application_msword" msgid="2110108876623152162">"दस्तावेज़"</string>
<string name="attachment_application_vnd_ms_powerpoint" msgid="425353008963359230">"प्रस्तुति"</string>
<string name="attachment_application_vnd_ms_excel" msgid="5585781311136609103">"स्प्रैडशीट"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> फ़ाइल"</string>
<string name="preview_attachment" msgid="6265457626086113833">"पूर्वावलोकन"</string>
<string name="save_attachment" msgid="375685179032130033">"सहेजें"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"रद्द करें"</string>
- <string name="open_attachment" msgid="6100396056314739761">"खोलें"</string>
- <string name="install_attachment" msgid="8119470822958087928">"इंस्टॉल"</string>
<string name="download_again" msgid="8195787340878328119">"पुनः डाउनलोड करें"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"जानकारी"</string>
<string name="no_application_found" msgid="7309485680354949680">"कोई भी ऐप्स इस अटैचमेंट को देखने के लिए नहीं खोल सकता."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ईमेल भेजें"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"नक्शा"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"लिंक साझा करें"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"सहायता"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"सुझाव भेजें"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="SUBJECT">%3$s</xliff:g> के बारे में <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="DATE">%5$s</xliff:g> पर <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="SUBJECT">%3$s</xliff:g> के बारे में <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="TIME">%5$s</xliff:g> पर <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"वार्तालाप पढ़ा गया"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> पुराने संदेश"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> पुराने संदेश लोड हो रहा हैं"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"प्रेषक:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"उत्तर पता:"</string>
<string name="to_heading" msgid="3495203282540398336">"प्रति: "</string>
@@ -244,8 +232,8 @@
<string name="message_saved" msgid="3291655042310241793">"संदेश ड्राफ़्ट के रूप में सहेजा गया."</string>
<string name="sending_message" msgid="2487846954946637084">"संदेश भेज रहा है..."</string>
<string name="invalid_recipient" msgid="9157434699389936584">"<xliff:g id="WRONGEMAIL">%s</xliff:g> पता अमान्य है."</string>
- <string name="show_elided" msgid="3456154624105704327">"उद्धृत पाठ दिखाएं"</string>
- <string name="hide_elided" msgid="5768235486834692733">"▼ उद्धृत पाठ छिपाएं"</string>
+ <string name="show_elided" msgid="3456154624105704327">"उद्धृत लेख दिखाएं"</string>
+ <string name="hide_elided" msgid="5768235486834692733">"▼ उद्धृत लेख छिपाएं"</string>
<string name="message_invite_title" msgid="5985161025144867256">"कैलेंडर आमंत्रण"</string>
<string name="message_invite_calendar_view" msgid="9181966650840809197">"कैलेंडर में देखें"</string>
<string name="message_invite_label_attending" msgid="4194264767870003397">"जा रहे हैं?"</string>
@@ -288,7 +276,7 @@
<string name="search_hint" msgid="7060626585689391003">"खोजें"</string>
<!-- no translation found for search_results_loaded (1784879343458807514) -->
<skip />
- <string name="voice_search_not_supported" msgid="8493517060419469738">"इस उपकरण पर ध्वनि खोज सुविधा उपलब्ध नहीं है."</string>
+ <string name="voice_search_not_supported" msgid="8493517060419469738">"इस डिवाइस पर ध्वनि खोज सुविधा उपलब्ध नहीं है."</string>
<string name="network_error" msgid="5931164247644972255">"कोई कनेक्शन नहीं"</string>
<string name="retry" msgid="916102442074217293">"पुन: प्रयास करें"</string>
<string name="load_more" msgid="8702691358453560575">"अधिक लोड करें"</string>
@@ -311,8 +299,8 @@
<string name="report" msgid="4318141326014579036">"रिपोर्ट करें"</string>
<string name="show" msgid="2874876876336599985">"दिखाएं"</string>
<string name="sync_error" msgid="1795794969006241678">"समन्वयित नहीं किया जा सका."</string>
- <string name="sync_error_message" msgid="4182644657243736635">"आपके उपकरण में समन्वयित करने के लिए पर्याप्त संग्रहण स्थान नहीं है."</string>
- <string name="storage" msgid="4783683938444150638">"संग्रहण"</string>
+ <string name="sync_error_message" msgid="4182644657243736635">"आपके डिवाइस में समन्वयित करने के लिए पर्याप्त मेमोरी स्थान नहीं है."</string>
+ <string name="storage" msgid="4783683938444150638">"मेमोरी"</string>
<string name="senders_split_token" msgid="6549228851819460081">", "</string>
<string name="draft_count_format" msgid="9122583199850209286">" (<xliff:g id="COUNT">%1$s</xliff:g>)"</string>
<string name="all_folders_heading" msgid="9023770187629170967">"सभी फ़ोल्डर"</string>
@@ -372,10 +360,10 @@
<string name="preference_swipe_description" msgid="3036560323237015010">"बातचीत की सूची में"</string>
<string name="preference_sender_image_title" msgid="7890813537985591865">"प्रेषक का चित्र"</string>
<string name="preference_sender_image_description" msgid="3586817690132199889">"बातचीत सूची में नाम के पास दिखाएं"</string>
- <string name="empty_trash" msgid="3385937024924728399">"मिटाया हुआ रिक्त करें"</string>
- <string name="empty_spam" msgid="2911988289997281371">"स्पैम रिक्त करें"</string>
- <string name="empty_trash_dialog_title" msgid="2104898489663621508">"मिटाया हुआ रिक्त करें?"</string>
- <string name="empty_spam_dialog_title" msgid="1130319045917820569">"अनचाहा रिक्त करें?"</string>
+ <string name="empty_trash" msgid="3385937024924728399">"मिटाया हुआ खाली करें"</string>
+ <string name="empty_spam" msgid="2911988289997281371">"स्पैम खाली करें"</string>
+ <string name="empty_trash_dialog_title" msgid="2104898489663621508">"मिटाया हुआ खाली करें?"</string>
+ <string name="empty_spam_dialog_title" msgid="1130319045917820569">"अनचाहा खाली करें?"</string>
<plurals name="empty_folder_dialog_message">
<item quantity="one" msgid="3315412388217832914">"<xliff:g id="COUNT">%1$d</xliff:g> संदेश स्थायी रूप हटा दिया जाएगा."</item>
<item quantity="other" msgid="263840304486020101">"<xliff:g id="COUNT">%1$d</xliff:g> संदेश स्थायी रूप से हटा दिए जाएंगे."</item>
@@ -391,7 +379,7 @@
<string name="account_sync_off" msgid="5720018952998097061">"खाता समन्वयन बंद है. <a href=\'http://www.example.com\'>खाता सेटिंग</a> में चालू करें"</string>
<string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="OUTBOX">%2$s</xliff:g> में <xliff:g id="NUMBER">%1$s</xliff:g> अप्रेषित"</string>
<string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"स्वत:-समन्वयन चालू करें?"</string>
- <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"आपके द्वारा न केवल Gmail में, बल्कि सभी ऐप्स और खातों में किए जाने वाले बदलाव, वेब, आपके अन्य उपकरणों, और आपके <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> के बीच समन्वयित किए जाएंगे."</string>
+ <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"आपके द्वारा न केवल Gmail में, बल्कि सभी ऐप्स और खातों में किए जाने वाले बदलाव, वेब, आपके अन्य डिवाइस, और आपके <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> के बीच समन्वयित किए जाएंगे."</string>
<string name="phone" msgid="4142617042507912053">"फ़ोन"</string>
<string name="tablet" msgid="4593581125469224791">"टेबलेट"</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="7239160845196929866">"चालू करें"</string>
@@ -406,7 +394,7 @@
<string name="date_message_received_print" msgid="4168417403884350040">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g> पर"</string>
<string name="draft_to_heading" msgid="7370121943946205024">"इनके लिए ड्राफ़्ट:"</string>
<string name="draft_heading" msgid="7032951343184552800">"ड्राफ़्ट"</string>
- <string name="quoted_text_hidden_print" msgid="5256754205675159141">"उद्धृत पाठ छिपा दिया गया है"</string>
+ <string name="quoted_text_hidden_print" msgid="5256754205675159141">"उद्धृत लेख छिपा दिया गया है"</string>
<plurals name="num_attachments">
<item quantity="one" msgid="5494465717267988888">"<xliff:g id="COUNT">%1$d</xliff:g> अटैचमेंट"</item>
<item quantity="other" msgid="5422167728480739361">"<xliff:g id="COUNT">%1$d</xliff:g> अटैचमेंट"</item>
@@ -455,7 +443,7 @@
<string name="reply_choice_frowning_face" msgid="6260338807944002651">":("</string>
<string name="preference_header_action_confirmations" msgid="3922674681156121948">"कार्रवाई पुष्टिकरण"</string>
<string name="preference_confirm_before_delete_title" msgid="7563587174619033835">"हटाने से पहले पुष्टि करें"</string>
- <string name="preference_confirm_before_archive_title" msgid="7318645995655875718">"संग्रहण से पहले पुष्टि करें"</string>
+ <string name="preference_confirm_before_archive_title" msgid="7318645995655875718">"मेमोरी से पहले पुष्टि करें"</string>
<string name="preference_confirm_before_send_title" msgid="4136585783513077039">"भेजने से पहले पुष्टि करें"</string>
<string name="preferences_conversation_mode_title" msgid="389352009651720838">"संदेशों को स्वत: फ़िट करें"</string>
<string name="preferences_conversation_mode_summary" msgid="5730999743867653106">"स्क्रीन पर फ़िट होने के लिए संदेशों को सिकोड़ें"</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"सामान्य सेटिंग"</string>
<string name="activity_preferences" msgid="8966077432517613292">"सेटिंग"</string>
<string name="overflow_description" msgid="7886090597023240426">"और विकल्प"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6f1e74c..6d95b73 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Nije moguće priložiti datoteku."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Dozvola za privitak odbijena je."</string>
<string name="recipient_needed" msgid="319816879398937214">"Dodajte barem jednog primatelja."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Pogreška primatelja"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Poslati poruku?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Nema teksta u predmetu poruke."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Nema teksta u tijelu poruke."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Poslati ovu poruku?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> datoteka"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Pregled"</string>
<string name="save_attachment" msgid="375685179032130033">"Spremi"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Odustani"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Otvori"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instaliraj"</string>
<string name="download_again" msgid="8195787340878328119">"Preuzmi ponovo"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informacije"</string>
<string name="no_application_found" msgid="7309485680354949680">"Nijedna aplikacija ne može otvoriti i prikazati ovaj privitak."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Pošalji e-poštu"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Karta"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Dijeli vezu"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Pomoć"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Pošaljite povratne informacije"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> o temi <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> dana <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> o temi <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> u <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"razgovor je pročitan"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Broj starijih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Učitavanje <xliff:g id="COUNT">%1$d</xliff:g> starijih poruka"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Šalje:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Prima:"</string>
<string name="to_heading" msgid="3495203282540398336">"Prima: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Opće postavke"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Postavke"</string>
<string name="overflow_description" msgid="7886090597023240426">"Dodatne opcije"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3476712..d86eeec 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"A fájlt nem lehet csatolni."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"A mellékletre vonatkozó jogosultság le van tiltva."</string>
<string name="recipient_needed" msgid="319816879398937214">"Vegyen fel legalább egy címzettet."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Hiba a címzettnél"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Elküldi az üzenetet?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Nincs szöveg az üzenet tárgyában."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Nincs szöveg az üzenet törzsében."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Elküldi az üzenetet?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> fájl"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Előnézet"</string>
<string name="save_attachment" msgid="375685179032130033">"Mentés"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Mégse"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Megnyitás"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Telepítés"</string>
<string name="download_again" msgid="8195787340878328119">"Letöltés újra"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Információ"</string>
<string name="no_application_found" msgid="7309485680354949680">"Egyetlen alkalmazás sem tudja megjeleníteni ezt a mellékletet."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"E-mail küldése"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Térkép"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Link megosztása"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Súgó"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Visszajelzés"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> a következővel kapcsolatban: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ezen a napon: <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> a következővel kapcsolatban: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ekkor: <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"beszélgetés elolvasva"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> régebbi üzenet"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> korábbi üzenet betöltése"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Feladó:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Válaszcím:"</string>
<string name="to_heading" msgid="3495203282540398336">"Címzett: "</string>
@@ -478,4 +466,6 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Általános beállítások"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Beállítások"</string>
<string name="overflow_description" msgid="7886090597023240426">"További lehetőségek"</string>
+ <string name="security_hold_required_text" msgid="6619955920101834286">"Biztonsági frissítés szükséges a következőhöz: <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
+ <string name="update_security_text" msgid="3527335757205741077">"frissítés most"</string>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index aa6c58c..11107e2 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Ֆայլը կցել չհաջողվեց:"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Այս ֆայլը կցելու թույլտվություն չունեք:"</string>
<string name="recipient_needed" msgid="319816879398937214">"Ավելացնել առնվազն մեկ ստացող:"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Ստացողի սխալ"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Ուղարկե՞լ հաղորդագրությունը:"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Հաղորդագրության վերնագրում տեքստ չկա:"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Հաղորդագրության գրվածքում տեքստ չկա:"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Ու՞ղարկել այս հաղորդագրությունը"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> Ֆայլ"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Նախադիտում"</string>
<string name="save_attachment" msgid="375685179032130033">"Պահել"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Չեղարկել"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Բացել"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Տեղադրել"</string>
<string name="download_again" msgid="8195787340878328119">"Ներբեռնել կրկին"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Տեղեկություններ"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ոչ մի հավելված չի կարող բացել այս կցորդը դիտման համար:"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Ուղարկել նամակ"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Քարտեզ"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Տարածել հղումը"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Օգնություն"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Ուղարկել կարծիք"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>-ի մասին, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>-ին, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>-ի <xliff:g id="SUBJECT">%3$s</xliff:g> մասին, <xliff:g id="SNIPPET">%4$s</xliff:g> ժամը <xliff:g id="TIME">%5$s</xliff:g>-ին, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"խոսակցությունը ընթերցված է"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ավելի հին հաղորդագրություն"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Բեռնվում է <xliff:g id="COUNT">%1$d</xliff:g> հին հաղորդագրություն"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Ուղարկող`"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Պատասխանել"</string>
<string name="to_heading" msgid="3495203282540398336">"Ստացող՝ "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Ընդհանուր կարգավորումներ"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Կարգավորումներ"</string>
<string name="overflow_description" msgid="7886090597023240426">"Հավելյալ ընտրանքներ"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 3197a5d..9a1c4e8 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Tidak dapat melampirkan file."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Izin ditolak untuk lampiran tersebut."</string>
<string name="recipient_needed" msgid="319816879398937214">"Tambahkan setidaknya satu penerima."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Kesalahan penerima"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Kirim pesan?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Tidak ada teks dalam subjek pesan."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Tidak ada teks dalam badan pesan."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Kirim pesan ini?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"File <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Pratinjau"</string>
<string name="save_attachment" msgid="375685179032130033">"Simpan"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Batal"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Buka"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Pasang"</string>
<string name="download_again" msgid="8195787340878328119">"Unduh lagi"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Info"</string>
<string name="no_application_found" msgid="7309485680354949680">"Tidak ada apl yang dapat membuka lampiran ini untuk ditampilkan."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Kirim email"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Peta"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Bagikan tautan"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Bantuan"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Kirim masukan"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> tentang <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pada tanggal <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> tentang <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pukul <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"percakapan telah dibaca"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> pesan lebih lama"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Memuat <xliff:g id="COUNT">%1$d</xliff:g> pesan lebih lama"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Dari:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Balas-ke:"</string>
<string name="to_heading" msgid="3495203282540398336">"Kepada: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Setelan umum"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Setelan"</string>
<string name="overflow_description" msgid="7886090597023240426">"Opsi lainnya"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index f0cb329..465d332 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Ekki var hægt að hengja skrána við."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Heimild neitað fyrir viðhengið."</string>
<string name="recipient_needed" msgid="319816879398937214">"Bættu að minnsta kosti einum viðtakanda við."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Villa í viðtakanda"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Senda skeyti?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Enginn texti er í efnislínu skeytisins."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Enginn texti er í meginmáli skeytisins."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Senda þetta skeyti?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-skrá"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Forskoða"</string>
<string name="save_attachment" msgid="375685179032130033">"Vista"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Hætta við"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Opna"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Setja upp"</string>
<string name="download_again" msgid="8195787340878328119">"Sækja aftur"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Upplýsingar"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ekkert forrit getur opnað þetta viðhengi til að skoða það."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Senda tölvupóst"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Kort"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Deila tengli"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Hjálp"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Senda ábendingu"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> um <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> um <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> klukkan <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"samtal lesið"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> eldri skeyti"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Hleður <xliff:g id="COUNT">%1$d</xliff:g> eldri skeyti"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Frá:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Svarnetfang:"</string>
<string name="to_heading" msgid="3495203282540398336">"Til: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Almennar stillingar"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Stillingar"</string>
<string name="overflow_description" msgid="7886090597023240426">"Fleiri valkostir"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5c79960..d3c7842 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Impossibile allegare il file."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Autorizzazione negata per l\'allegato."</string>
<string name="recipient_needed" msgid="319816879398937214">"Aggiungi almeno un destinatario."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Errore destinatario"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Inviare il messaggio?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Nessun testo presente nell\'oggetto del messaggio."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Nessun testo presente nel corpo del messaggio."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Inviare il messaggio?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"File <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Anteprima"</string>
<string name="save_attachment" msgid="375685179032130033">"Salva"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Annulla"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Apri"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installa"</string>
<string name="download_again" msgid="8195787340878328119">"Scarica di nuovo"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informazioni"</string>
<string name="no_application_found" msgid="7309485680354949680">"Nessuna applicazione può aprire questo allegato per la visualizzazione."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Invia email"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mappa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Condividi link"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Guida"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Invia feedback"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> in merito a <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> in data <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> in merito a <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> alle <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversazione letta"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> messaggi meno recenti"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Caricamento di <xliff:g id="COUNT">%1$d</xliff:g> messaggi meno recenti in corso..."</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Da:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Rispondi a:"</string>
<string name="to_heading" msgid="3495203282540398336">"A: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Impostazioni generali"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Impostazioni"</string>
<string name="overflow_description" msgid="7886090597023240426">"Altre opzioni"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ca36ac6..c06b560 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"לא ניתן היה לצרף קובץ."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"ההרשאה נדחתה עבור הקובץ המצורף."</string>
<string name="recipient_needed" msgid="319816879398937214">"הוסף לפחות נמען אחד."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"שגיאת נמען"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"האם לשלוח את ההודעה?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"אין טקסט בנושא ההודעה."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"אין טקסט בגוף ההודעה."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"האם לשלוח הודעה זו?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"קובץ <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"תצוגה מקדימה"</string>
<string name="save_attachment" msgid="375685179032130033">"שמור"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"בטל"</string>
- <string name="open_attachment" msgid="6100396056314739761">"פתח"</string>
- <string name="install_attachment" msgid="8119470822958087928">"התקן"</string>
<string name="download_again" msgid="8195787340878328119">"הורד שוב"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"מידע"</string>
<string name="no_application_found" msgid="7309485680354949680">"אין יישום שיכול לפתוח קובץ מצורף זה לצורך הצגה."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"שלח דוא\"ל"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"מפה"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"שתף קישור"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"עזרה"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"שלח משוב"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> על <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> בתאריך <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> על <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> בשעה <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"השיחה נקראה"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות ישנות יותר"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"טוען <xliff:g id="COUNT">%1$d</xliff:g> הודעות ישנות יותר"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"מ:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"השב ל:"</string>
<string name="to_heading" msgid="3495203282540398336">"אל: "</string>
@@ -478,4 +466,6 @@
<string name="general_preferences_title" msgid="4212138728220418162">"הגדרות כלליות"</string>
<string name="activity_preferences" msgid="8966077432517613292">"הגדרות"</string>
<string name="overflow_description" msgid="7886090597023240426">"אפשרויות נוספות"</string>
+ <string name="security_hold_required_text" msgid="6619955920101834286">"נדרש עדכון אבטחה עבור <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
+ <string name="update_security_text" msgid="3527335757205741077">"עדכן עכשיו"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e51b2b7..257844f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ファイルを添付できませんでした。"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"添付ファイルが許可されませんでした。"</string>
<string name="recipient_needed" msgid="319816879398937214">"宛先を入力してください。"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"宛先エラー"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"メッセージの送信"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"メールの件名が入力されていません。"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"メールの本文が入力されていません。"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"このメールを送信しますか？"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>ファイル"</string>
<string name="preview_attachment" msgid="6265457626086113833">"プレビュー"</string>
<string name="save_attachment" msgid="375685179032130033">"保存"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"キャンセル"</string>
- <string name="open_attachment" msgid="6100396056314739761">"開く"</string>
- <string name="install_attachment" msgid="8119470822958087928">"インストール"</string>
<string name="download_again" msgid="8195787340878328119">"再ダウンロード"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"情報"</string>
<string name="no_application_found" msgid="7309485680354949680">"この添付ファイルを開いて表示できるアプリはありません。"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"メールを送信"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"地図"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"リンクを共有"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"ヘルプ"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"ご意見、ご感想"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>が<xliff:g id="DATE">%5$s</xliff:g>に<xliff:g id="SUBJECT">%3$s</xliff:g>について送信。抜粋: <xliff:g id="SNIPPET">%4$s</xliff:g>（<xliff:g id="READSTATE">%6$s</xliff:g>）"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>が<xliff:g id="TIME">%5$s</xliff:g>に<xliff:g id="SUBJECT">%3$s</xliff:g>について送信。抜粋: <xliff:g id="SNIPPET">%4$s</xliff:g>（<xliff:g id="READSTATE">%6$s</xliff:g>）"</string>
<string name="read_string" msgid="5495929677508576520">"既読のスレッド"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"これ以前のメッセージ<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> 件の古いメッセージを読み込んでいます"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"From:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"返信先:"</string>
<string name="to_heading" msgid="3495203282540398336">"To: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"全般設定"</string>
<string name="activity_preferences" msgid="8966077432517613292">"設定"</string>
<string name="overflow_description" msgid="7886090597023240426">"その他のオプション"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 77b536e..6c2ed07 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ფაილის მიბმა ვერ მოხერხდა."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"დანართის ნებართვა უარყოფილია."</string>
<string name="recipient_needed" msgid="319816879398937214">"დაამატეთ ერთი ადრესატი მაინც."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"მიმღების შეცდომა"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"გავგზავნო წერილი?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"შეტყობინების თემა ცარიელია."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"შეტყობინების ტექსტი ცარიელია."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"გაიგზავნოს ეს შეტყობინება?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ფაილი"</string>
<string name="preview_attachment" msgid="6265457626086113833">"გადახედვა"</string>
<string name="save_attachment" msgid="375685179032130033">"შენახვა"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"გაუქმება"</string>
- <string name="open_attachment" msgid="6100396056314739761">"გახსნა"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ინსტალაცია"</string>
<string name="download_again" msgid="8195787340878328119">"ხელახლა ჩამოტვირთვა"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"ინფო"</string>
<string name="no_application_found" msgid="7309485680354949680">"ამ დანართის გახსნა არ შეუძლია არცერთ აპს."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ელფოსტის გაგზავნა"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"რუკა"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"ბმულის გაზიარება"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"დახმარება"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"უკუკავშირი"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g>-ის შესახებ, <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="DATE">%5$s</xliff:g>-ში, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g>-ის შესახებ, <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="TIME">%5$s</xliff:g>-ში, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"მიმოწერა წაკითხულია"</string>
@@ -206,8 +197,8 @@
<string name="archived" msgid="6283673603512713022">"დაარქივებული"</string>
<string name="folder_removed" msgid="5656281444688183676">"წაშლილია <xliff:g id="FOLDERNAME">%1$s</xliff:g>-დან"</string>
<plurals name="conversation_folder_changed">
- <item quantity="one" msgid="7787126147584620603">"შეცვლილი საქაღალდე"</item>
- <item quantity="other" msgid="6307772984911017972">"შეცვლილი საქაღალდეები"</item>
+ <item quantity="one" msgid="7787126147584620603">"შეიცვალა საქაღალდე"</item>
+ <item quantity="other" msgid="6307772984911017972">"შეიცვალა საქაღალდეები"</item>
</plurals>
<string name="conversation_folder_moved" msgid="6475872337373081683">"გადატანილია <xliff:g id="FOLDERNAME">%1$s</xliff:g>-ში"</string>
<string name="search_results_header" msgid="1529438451150580188">"შედეგები"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ძველი შეტყობინება"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"მიმდინარეობს <xliff:g id="COUNT">%1$d</xliff:g> ძველი წერილის ჩამოტვირთვა"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"გამგზავნი:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"პასუხი:"</string>
<string name="to_heading" msgid="3495203282540398336">"მიმღები: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"ძირითადი პარამეტრები"</string>
<string name="activity_preferences" msgid="8966077432517613292">"პარამეტრები"</string>
<string name="overflow_description" msgid="7886090597023240426">"დამატებითი პარამეტრები"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 5fc775d..61d6084 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -49,8 +49,6 @@
<!-- no translation found for attachment_permission_denied (2274397783497640486) -->
<skip />
<string name="recipient_needed" msgid="319816879398937214">"Кемінде бір алушыны қосыңыз."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Алушы қатесі"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Хабарды жіберу қажет пе?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Хабар тақырыбында мәтін жоқ."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Хабардың негізгі мәтінінде мәтін жоқ."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Бұл хабарды жіберу қажет пе?"</string>
@@ -107,9 +105,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> файлы"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Алдын ала қарау"</string>
<string name="save_attachment" msgid="375685179032130033">"Сақтау"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Бас тарту"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Ашу"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Орнату"</string>
<string name="download_again" msgid="8195787340878328119">"Қайта жүктеу"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Ақпарат"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ешбір қолданба бұл тіркемені көру үшін аша алмайды."</string>
@@ -133,10 +128,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Электрондық хабар жіберу"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Карта"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Сілтемені бөлісу"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Анықтама"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Пікір жіберу"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g> туралы, <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="DATE">%5$s</xliff:g> күні, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="SUBJECT">%3$s</xliff:g> туралы, <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="TIME">%5$s</xliff:g> уақытында, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"сөйлесім оқылды"</string>
@@ -211,7 +202,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ескі хабар"</item>
</plurals>
- <!-- no translation found for super_collapsed_loading_content_description:other (678491885491918982) -->
<string name="from_heading" msgid="48290556829713090">"Кімнен:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Жауап беру:"</string>
<string name="to_heading" msgid="3495203282540398336">"Кімге: "</string>
@@ -462,4 +452,8 @@
<string name="activity_preferences" msgid="8966077432517613292">"Параметрлер"</string>
<!-- no translation found for overflow_description (7886090597023240426) -->
<skip />
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index a9b09d0..76d5ea1 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"មិនអាចភ្ជាប់ឯកសារបានទេ។"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"សិទ្ធិត្រូវបានបដិសេធសម្រាប់ឯកសារភ្ជាប់នេះ។"</string>
<string name="recipient_needed" msgid="319816879398937214">"បន្ថែមអ្នកទទួលយ៉ាងហោចណាស់ម្នាក់។"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"កំហុសអ្នកទទួល"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"ផ្ញើសារ?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"មិនមានអត្ថបទនៅក្នុងប្រធានបទសារឡើយ។"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"មិនមានអក្សរនៅក្នុងតួសារទេ។"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"ផ្ញើសារនេះ?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"ឯកសារ <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"មើលជាមុន"</string>
<string name="save_attachment" msgid="375685179032130033">"រក្សាទុក"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"បោះបង់"</string>
- <string name="open_attachment" msgid="6100396056314739761">"បើក"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ដំឡើង"</string>
<string name="download_again" msgid="8195787340878328119">"ទាញយកម្ដងទៀត"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"ព័ត៌មាន"</string>
<string name="no_application_found" msgid="7309485680354949680">"គ្មានកម្មវិធីអាចបើកឯកសារភ្ជាប់នេះដើម្បីមើលឡើយ។"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ផ្ញើអ៊ីមែល"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"ផែនទី"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"ចែករំលែកតំណ"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"ជំនួយ"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"ផ្ញើមតិប្រតិកម្ម"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> អំពី <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> នៅ <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> អំពី <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> នៅម៉ោង <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"អានការសន្ទនា"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"សារចាស់ជាង <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"កំពុងផ្ទុកសារចាស់ៗ <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"ពី៖"</string>
<string name="replyto_heading" msgid="8275255318292059079">"ឆ្លើយតបទៅ៖"</string>
<string name="to_heading" msgid="3495203282540398336">"ទៅ៖ "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"ការកំណត់ទូទៅ"</string>
<string name="activity_preferences" msgid="8966077432517613292">"កំណត់"</string>
<string name="overflow_description" msgid="7886090597023240426">"ជម្រើសច្រើនទៀត"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 23de01d..5491873 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ಫೈಲ್ ಅನ್ನು ಲಗತ್ತಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"ಲಗತ್ತಿಗಾಗಿ ಅನುಮತಿಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ."</string>
<string name="recipient_needed" msgid="319816879398937214">"ಕನಿಷ್ಠ ಒಬ್ಬ ಸ್ವೀಕೃತದಾರರನ್ನಾದರೂ ಸೇರಿಸಿ"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"ಸ್ವೀಕರಿಸುವವರ ದೋಷ"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"ಸಂದೇಶ ಕಳುಹಿಸುವುದೇ?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"ಸಂದೇಶದ ವಿಷಯದಲ್ಲಿ ಯಾವುದೇ ಪಠ್ಯವಿಲ್ಲ."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"ಸಂದೇಶದ ಮುಖ್ಯಪಠ್ಯದಲ್ಲಿ ಯಾವುದೇ ಪಠ್ಯವಿಲ್ಲ."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"ಈ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸುವುದೇ?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ಫೈಲ್"</string>
<string name="preview_attachment" msgid="6265457626086113833">"ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
<string name="save_attachment" msgid="375685179032130033">"ಉಳಿಸು"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"ರದ್ದು"</string>
- <string name="open_attachment" msgid="6100396056314739761">"ತೆರೆದಿದೆ"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ಸ್ಥಾಪಿಸು"</string>
<string name="download_again" msgid="8195787340878328119">"ಮರು ಡೌನ್ಲೋಡ್ ಮಾಡಿ"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"ಮಾಹಿತಿ"</string>
<string name="no_application_found" msgid="7309485680354949680">"ವೀಕ್ಷಣೆಗಾಗಿ ಈ ಲಗತ್ತನ್ನು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ಇಮೇಲ್ ಕಳುಹಿಸಿ"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"ಮ್ಯಾಪ್"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"ಲಿಂಕ್ ಹಂಚಿರಿ"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"ಸಹಾಯ"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g> ರಂದು <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ಕುರಿತು"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g> ಗೆ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ಕುರಿತು"</string>
<string name="read_string" msgid="5495929677508576520">"ಸಂವಾದವನ್ನು ಓದಿದೆ"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ಹಳೆಯ ಸಂದೇಶಗಳು"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"ಇವರಿಂದ:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"ಇದಕ್ಕೆ-ಪ್ರತ್ಯುತ್ತರಿಸಿ"</string>
<string name="to_heading" msgid="3495203282540398336">"ಗೆ: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="activity_preferences" msgid="8966077432517613292">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="overflow_description" msgid="7886090597023240426">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5b30ba3..62b090e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"파일을 첨부할 수 없습니다."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"첨부파일에 대한 권한이 거부되었습니다."</string>
<string name="recipient_needed" msgid="319816879398937214">"받는 사람을 한 명 이상 추가하세요."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"수신자 오류"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"메일을 전송하시겠습니까?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"메일 제목에 텍스트가 없습니다."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"메일 본문에 텍스트가 없습니다."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"메시지를 보내시겠습니까?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> 파일"</string>
<string name="preview_attachment" msgid="6265457626086113833">"미리보기"</string>
<string name="save_attachment" msgid="375685179032130033">"저장"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"취소"</string>
- <string name="open_attachment" msgid="6100396056314739761">"열기"</string>
- <string name="install_attachment" msgid="8119470822958087928">"설치"</string>
<string name="download_again" msgid="8195787340878328119">"다시 다운로드"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"정보"</string>
<string name="no_application_found" msgid="7309485680354949680">"이 첨부파일을 열어서 볼 수 있는 앱이 없습니다."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"이메일 보내기"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"지도"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"링크 공유"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"도움말"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"의견 보내기"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"받는사람: <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, 제목 및 내용: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>, 날짜: <xliff:g id="DATE">%5$s</xliff:g>, 읽기 상태: <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"받는사람: <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, 제목 및 내용: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>, 시간: <xliff:g id="TIME">%5$s</xliff:g>, 읽기 상태: <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"대화 읽음"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"이전 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"이전 메일 <xliff:g id="COUNT">%1$d</xliff:g>개 로드 중"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"보낸사람:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"답장:"</string>
<string name="to_heading" msgid="3495203282540398336">"받는사람: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"일반 설정"</string>
<string name="activity_preferences" msgid="8966077432517613292">"설정"</string>
<string name="overflow_description" msgid="7886090597023240426">"옵션 더보기"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index d15f7f0..e60aac8 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -49,8 +49,6 @@
<!-- no translation found for attachment_permission_denied (2274397783497640486) -->
<skip />
<string name="recipient_needed" msgid="319816879398937214">"Жок дегенде бир алуучуну кошуңуз."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Алуучунун катасы"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Билдирүү жөнөтүлсүнбү?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Билдирүүнүн темасы жок."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Билдирүүнүн тексти жок."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Бул билдирүү жөнөтүлсүнбү?"</string>
@@ -107,9 +105,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> Файл"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Алдын ала көрүү"</string>
<string name="save_attachment" msgid="375685179032130033">"Сактоо"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Жокко чгр."</string>
- <string name="open_attachment" msgid="6100396056314739761">"Ачуу"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Орнотуу"</string>
<string name="download_again" msgid="8195787340878328119">"Кайра жүктөп алуу"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Маалымат"</string>
<string name="no_application_found" msgid="7309485680354949680">"Бул тиркемени бир дагы колдонмо ачып көрсөтө албайт."</string>
@@ -133,10 +128,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Электрондук билдирүү жөнөтүү"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Карта"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Шилтеме бөлүшүү"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Жардам"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Жооп иретинде пикир жөнөтүү"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> тууралуу <xliff:g id="DATE">%5$s</xliff:g>, күнү <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> тууралуу саат <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"маек окулган"</string>
@@ -211,7 +202,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> мурунку билдирүү"</item>
</plurals>
- <!-- no translation found for super_collapsed_loading_content_description:other (678491885491918982) -->
<string name="from_heading" msgid="48290556829713090">"Кимден:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Төмөнкүгө жооп:"</string>
<string name="to_heading" msgid="3495203282540398336">"Кимге: "</string>
@@ -462,4 +452,8 @@
<string name="activity_preferences" msgid="8966077432517613292">"Жөндөөлөр"</string>
<!-- no translation found for overflow_description (7886090597023240426) -->
<skip />
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ldrtl/styles-ldrtl.xml b/res/values-ldrtl/styles-ldrtl.xml
index 254bf68..f94abea 100644
--- a/res/values-ldrtl/styles-ldrtl.xml
+++ b/res/values-ldrtl/styles-ldrtl.xml
@@ -322,8 +322,8 @@
</style>
<!-- END Conversation list styles -->
- <style name="SpinnerAccountAddressStyle" parent="ComposeFromTextViewStyle">
- <item name="android:paddingStart">@dimen/custom_from_inner_padding</item>
+ <style name="SpinnerAccountNameStyle" parent="ComposeFromTextViewStyle">
+ <item name="android:paddingEnd">@dimen/custom_from_inner_padding</item>
</style>
<style name="AbstractComposeAreaWithRtl" parent="@style/AbstractComposeArea">
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 981eba2..2833135 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ບໍ່ສາມາດແນບໄຟລ໌ໄດ້."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"ການອະນຸຍາດຖືກປະຕິເສດສຳລັບໄຟລ໌ແນບນີ້"</string>
<string name="recipient_needed" msgid="319816879398937214">"ເພີ່ມຢ່າງຫນ້ອຍນຶ່ງຜູ່ຮັບ."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"ຂໍ້ຜິດພາດຜູ່ຮັບ"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"ສົ່ງອີເມວບໍ່?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"ບໍ່ມີອີເມວຢູ່ໃນພາກສ່ວນຊື່ເລື່ອງ."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"ບໍ່ມີອີເມວຢູ່ໃນພາກສ່ວນເນື້ອໃນ."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"ຕ້ອງການສົ່ງຂໍ້ຄວາມນີ້ບໍ່?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ໄຟລ໌"</string>
<string name="preview_attachment" msgid="6265457626086113833">"ຕົວຢ່າງ"</string>
<string name="save_attachment" msgid="375685179032130033">"ບັນທຶກ"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"ຍົກເລີກ"</string>
- <string name="open_attachment" msgid="6100396056314739761">"ເປີດ"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ຕິດຕັ້ງ"</string>
<string name="download_again" msgid="8195787340878328119">"ດາວໂຫລດອີກເທື່ອ"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"ຂໍ້ມູນ"</string>
<string name="no_application_found" msgid="7309485680354949680">"ບໍ່ມີແອັບຯໃດສາມາດເປີດເບິ່ງໄຟລ໌ແນບນີ້ໄດ້."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ສົ່ງອີເມວ"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"ແຜນທີ່"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"ແບ່ງປັນລິ້ງ"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"ຊ່ວຍເຫລືອ"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"ສົ່ງຄຳຕິຊົມ"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> ກ່ຽວກັບ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ເມື່ອ <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> ກ່ຽວກັບ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ເມື່ອ <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"ອ່ານການສົນທະນາແລ້ວ"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຄວາມເກົ່າ"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"ກຳລັງໂຫລດ <xliff:g id="COUNT">%1$d</xliff:g> ຂໍ້ຄວາມທີ່ເກົ່າກວ່າ"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"ຈາກ:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"ຕອບກັບຫາ:"</string>
<string name="to_heading" msgid="3495203282540398336">"ເຖິງ: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"ການຕັ້ງຄ່າທົ່ວໄປ"</string>
<string name="activity_preferences" msgid="8966077432517613292">"ການຕັ້ງຄ່າ"</string>
<string name="overflow_description" msgid="7886090597023240426">"ໂຕເລືອກເພີ່ມເຕີມ"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index cec3168..8992993 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Nepavyko pridėti failo."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Priedo leidimas uždraustas."</string>
<string name="recipient_needed" msgid="319816879398937214">"Pridėkite bent vieną gavėją."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Gavėjo klaida"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Siųsti pranešimą?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Pranešimo temoje nėra teksto."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Pranešimo turinyje nėra teksto."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Siųsti šį pranešimą?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> failas"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Peržiūrėti"</string>
<string name="save_attachment" msgid="375685179032130033">"Išsaugoti"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Atšaukti"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Atidaryti"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Įdiegti"</string>
<string name="download_again" msgid="8195787340878328119">"Atsisiųsti dar kartą"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informacija"</string>
<string name="no_application_found" msgid="7309485680354949680">"Nėra programos, kuria būtų galima atidaryti ir peržiūrėti šį priedą."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Siųsti el. laišką"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Žemėlapis"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Bendrinti nuorodą"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Pagalba"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Siųsti atsiliepimus"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> apie „<xliff:g id="SUBJECT">%3$s</xliff:g>“, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="DATE">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> apie „<xliff:g id="SUBJECT">%3$s</xliff:g>“, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="TIME">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"pokalbis perskaitytas"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Senesnių pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Įkeliama senesnių pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Nuo:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Atsakyti:"</string>
<string name="to_heading" msgid="3495203282540398336">"Kam: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Bendrieji nustatymai"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Nustatymai"</string>
<string name="overflow_description" msgid="7886090597023240426">"Daugiau parinkčių"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d85ea13..b4170bb 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Nevarēja pievienot failu."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Pielikuma atļauja ir noraidīta."</string>
<string name="recipient_needed" msgid="319816879398937214">"Pievienojiet vismaz vienu adresātu."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Adresāta kļūda"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Vai sūtīt ziņojumu?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Nav ziņojuma temata."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Nav ziņojuma pamatteksta."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Vai sūtīt šo ziņojumu?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> fails"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Priekšsk."</string>
<string name="save_attachment" msgid="375685179032130033">"Saglabāt"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Atcelt"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Atvērt"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instalēt"</string>
<string name="download_again" msgid="8195787340878328119">"Lejupielādēt vēlreiz"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informācija"</string>
<string name="no_application_found" msgid="7309485680354949680">"Nevienā lietotnē nevar atvērt šo pielikumu, lai to skatītu."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Sūtīt e-pasta ziņojumu"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Karte"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Kopīgot saiti"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Palīdzība"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Sūtīt atsauksmes"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> par šādu tematu: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (<xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>)"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> par šādu tematu <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (plkst. <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>)"</string>
<string name="read_string" msgid="5495929677508576520">"saruna ir izlasīta"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> vecāki ziņojumi"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Notiek <xliff:g id="COUNT">%1$d</xliff:g> vecāku ziņojumu ielāde"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"No:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Atbildēt:"</string>
<string name="to_heading" msgid="3495203282540398336">"Kam: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Vispārīgie iestatījumi"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Iestatījumi"</string>
<string name="overflow_description" msgid="7886090597023240426">"Vairāk iespēju"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 73324f5..f8d9e4e 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -49,8 +49,6 @@
<!-- no translation found for attachment_permission_denied (2274397783497640486) -->
<skip />
<string name="recipient_needed" msgid="319816879398937214">"Додај најмалку еден примач."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Грешка на примач"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Испрати порака?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Нема текст во предметот на пораката."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Нема текст во телото на пораката."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Испрати ја оваа порака?"</string>
@@ -107,9 +105,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> Датотека"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Преглед"</string>
<string name="save_attachment" msgid="375685179032130033">"Зачувај"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Откажи"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Отвори"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Инсталирај"</string>
<string name="download_again" msgid="8195787340878328119">"Преземи повторно"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Информации"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ниедна апликација не може да го отвори овој прилог за прикажување."</string>
@@ -133,10 +128,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Испрати е-пошта"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Карта"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Сподели врска"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Помош"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Испраќај повратни информации"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> за <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> на <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> за <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> во <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"разговорот е прочитан"</string>
@@ -211,7 +202,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> постари пораки"</item>
</plurals>
- <!-- no translation found for super_collapsed_loading_content_description:other (678491885491918982) -->
<string name="from_heading" msgid="48290556829713090">"Од:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Одговори на:"</string>
<string name="to_heading" msgid="3495203282540398336">"До: "</string>
@@ -462,4 +452,8 @@
<string name="activity_preferences" msgid="8966077432517613292">"Поставки"</string>
<!-- no translation found for overflow_description (7886090597023240426) -->
<skip />
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 057413f..4b52754 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ഫയൽ അറ്റാച്ചുചെയ്യാനായില്ല."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"അറ്റാച്ചുമെന്റിനായുള്ള അനുമതി നിരസിച്ചു."</string>
<string name="recipient_needed" msgid="319816879398937214">"ഒരു സ്വീകർത്താവിനെയെങ്കിലും ചേർക്കുക."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"സ്വീകർത്താവിന്റെ ഭാഗത്തെ പിശക്"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"സന്ദേശം അയയ്ക്കണോ?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"സന്ദേശ വിഷയത്തിൽ ടെക്സ്റ്റ് ഒന്നുമില്ല."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"സന്ദേശ ബോഡിയിൽ ടെക്സ്റ്റ് ഒന്നുമില്ല."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"ഈ സന്ദേശം അയയ്ക്കണോ?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ഫയൽ"</string>
<string name="preview_attachment" msgid="6265457626086113833">"പ്രിവ്യൂ നടത്തുക"</string>
<string name="save_attachment" msgid="375685179032130033">"സംരക്ഷിക്കുക"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"റദ്ദാക്കുക"</string>
- <string name="open_attachment" msgid="6100396056314739761">"തുറക്കുക"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ഇന്സ്റ്റാളുചെയ്യുക"</string>
<string name="download_again" msgid="8195787340878328119">"വീണ്ടും ഡൗൺലോഡുചെയ്യുക"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"വിവരം"</string>
<string name="no_application_found" msgid="7309485680354949680">"അപ്ലിക്കേഷനുകൾക്കൊന്നും ഈ അറ്റാച്ചുമെന്റ് കാണുന്നതിനായി തുറക്കാനാകില്ല."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ഇമെയിൽ അയയ്ക്കുക"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"മാപ്പ്"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"ലിങ്ക് പങ്കിടുക"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"സഹായം"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"ഫീഡ്ബാക്ക് അയയ്ക്കുക"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="DATE">%5$s</xliff:g>-ന് <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> എന്നതിനെക്കുറിച്ച് <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> എന്നതിനെക്കുറിച്ചുള്ള <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g>, <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>-ന്"</string>
<string name="read_string" msgid="5495929677508576520">"സംഭാഷണം വായിച്ചു"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> പഴയ സന്ദേശങ്ങൾ"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> പഴയ സന്ദേശങ്ങൾ ലോഡുചെയ്യുന്നു"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"അയച്ചയാൾ:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"ഇതിലേക്ക് മറുപടി അയയ്ക്കുക:"</string>
<string name="to_heading" msgid="3495203282540398336">"സ്വീകർത്താവ്: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"പൊതുക്രമീകരണങ്ങൾ"</string>
<string name="activity_preferences" msgid="8966077432517613292">"ക്രമീകരണങ്ങൾ"</string>
<string name="overflow_description" msgid="7886090597023240426">"കൂടുതൽ ഓപ്ഷനുകൾ"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 07df586..5f87e1a 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Файлыг хавсаргаж чадсангүй."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Хавсралтын зөвшөөрөл өгөөгүй."</string>
<string name="recipient_needed" msgid="319816879398937214">"Ядаж нэг хүлээн авагч нэмнэ үү."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Хүлээн авагчийн алдаа"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Зурвас илгээх үү?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Зурвасын гарчигт текст байхгүй байна."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Зурвасын их биед текст байхгүй байна."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Энэ зурвасыг илгээх үү?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> Файл"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Урдьчилж харах"</string>
<string name="save_attachment" msgid="375685179032130033">"Хадгалах"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Цуцлах"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Нээх"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Суулгах"</string>
<string name="download_again" msgid="8195787340878328119">"Дахин татах"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Мэдээлэл"</string>
<string name="no_application_found" msgid="7309485680354949680">"Энэ хавсралтыг нээж харуулах апп байхгүй байна."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Имэйл илгээх"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Газрын зураг"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Холбоос хуваалцах"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Тусламж"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Санал хүсэл илгээх"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>-н тухай, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>-д, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g>-н тухай, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g>-д, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"харилцааг уншсан"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> хуучин мессежүүд"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Хуучин <xliff:g id="COUNT">%1$d</xliff:g> зурвас ачаалж байна"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Хэнээс:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Хариу илгээх:"</string>
<string name="to_heading" msgid="3495203282540398336">"Хэнд: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Ерөнхий тохиргоо"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Тохиргоо"</string>
<string name="overflow_description" msgid="7886090597023240426">"Илүү сонголтууд"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index b724054..3976389 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"फाईल संलग्न करू शकलो नाही."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"संलग्नकासाठी परवानगी नाकारली."</string>
<string name="recipient_needed" msgid="319816879398937214">"किमान एक प्राप्तकर्ता जोडा."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"प्राप्तकर्ता त्रुटी"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"संदेश पाठवायचा?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"संदेश विषयात कोणताही मजकूर नाहीये."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"संदेशाच्या मुख्य भागात कोणताही मजकूर नाहीये."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"हा संदेश पाठवायचा?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> फाईल"</string>
<string name="preview_attachment" msgid="6265457626086113833">"पूर्वावलोकन"</string>
<string name="save_attachment" msgid="375685179032130033">"जतन करा"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"रद्द करा"</string>
- <string name="open_attachment" msgid="6100396056314739761">"उघडा"</string>
- <string name="install_attachment" msgid="8119470822958087928">"स्थापित करा"</string>
<string name="download_again" msgid="8195787340878328119">"पुन्हा डाउनलोड करा"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"माहिती"</string>
<string name="no_application_found" msgid="7309485680354949680">"पाहण्यासाठी कोणताही अॅप हे संलग्नक उघडू शकत नाही."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ईमेल पाठवा"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"नकाशा"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"दुवा सामायिक करा"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"मदत"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"अभिप्राय पाठवा"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> विषयी, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g> रोजी, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> विषयी, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g> वाजता, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"संभाषण वाचले"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> जुने संदेश"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> जुने संदेश लोड करत आहे"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"प्रेषक:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"यांना-प्रत्युत्तर द्या:"</string>
<string name="to_heading" msgid="3495203282540398336">"प्रति: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"सामान्य सेटिंग्ज"</string>
<string name="activity_preferences" msgid="8966077432517613292">"सेटिंग्ज"</string>
<string name="overflow_description" msgid="7886090597023240426">"अधिक पर्याय"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index acc0747..d632828 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Tidak dapat melampirkan fail."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Kebenaran ditolak untuk lampiran."</string>
<string name="recipient_needed" msgid="319816879398937214">"Tambahkan sekurang-kurangnya satu penerima."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Ralat penerima"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Hantar mesej?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Tiada teks dalam subjek mesej."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Tiada teks dalam badan mesej."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Hantar mesej ini?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Fail <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Pratonton"</string>
<string name="save_attachment" msgid="375685179032130033">"Simpan"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Batal"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Buka"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Pasang"</string>
<string name="download_again" msgid="8195787340878328119">"Muat turun lagi"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Maklumat"</string>
<string name="no_application_found" msgid="7309485680354949680">"Tiada apl boleh membuka lampiran ini untuk tontonan."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Hantar e-mel"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Peta"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Kongsi pautan"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Bantuan"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Hantar maklum balas"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> mengenai <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pada <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> mengenai <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pada <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"perbualan telah dibaca"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mesej lebih lama"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Memuatkan <xliff:g id="COUNT">%1$d</xliff:g> mesej lama"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Daripada:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Balas-kpd:"</string>
<string name="to_heading" msgid="3495203282540398336">"Kepada: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Tetapan umum"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Tetapan"</string>
<string name="overflow_description" msgid="7886090597023240426">"Lagi pilihan"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index ff96b53..6f84eea 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ဖိုင်ကို မပူးတွဲနိုင်ခဲ့ပါ။"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"ပူးတွဲချက် အတွက် ခွင့်ပြုချက်ကို ငြင်းပယ်လိုက်သည်။"</string>
<string name="recipient_needed" msgid="319816879398937214">"လက်ခံသူ အနည်းဆုံး တစ်ဦးကို ထည့်ပါ။"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"ရရှိသူ အမှား"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"စာကို ပို့ရမလား?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"စာ အကြောင်းအရာ ထဲတွင် စာသား မရှိ။"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"စာ ကိုယ်ထည် ထဲတွင် စာသား မရှိ။"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"ဤ စာကို ပို့မလား?"</string>
@@ -104,9 +102,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ဖိုင်"</string>
<string name="preview_attachment" msgid="6265457626086113833">"အစမ်းကြည့်မှု"</string>
<string name="save_attachment" msgid="375685179032130033">"သိမ်းဆည်း"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"ပယ်ဖျက်ရန်"</string>
- <string name="open_attachment" msgid="6100396056314739761">"ဖွင့်ရန်"</string>
- <string name="install_attachment" msgid="8119470822958087928">"တပ်ဆင်ရန်"</string>
<string name="download_again" msgid="8195787340878328119">"ဒေါင်းလုဒ် ထပ်လုပ"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"အင်ဖို"</string>
<string name="no_application_found" msgid="7309485680354949680">"မည်သည့်appကမှ ဤပူးတွဲမှုကို ကြည့်ရှုရန် မဖွင့်နိုင်။"</string>
@@ -130,10 +125,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"အီးမေးလ် ပို့ရန်"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"မြေပုံ"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"လင့်ကို မျှဝေရန်"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"အကူအညီ"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"တုံ့ပြန်ချက် ပို့ရန်"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> က <xliff:g id="SUBJECT">%3$s</xliff:g>၊ <xliff:g id="SNIPPET">%4$s</xliff:g> အကြောင်း <xliff:g id="DATE">%5$s</xliff:g>၊ <xliff:g id="READSTATE">%6$s</xliff:g> မှာ"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> က <xliff:g id="SUBJECT">%3$s</xliff:g>၊ <xliff:g id="SNIPPET">%4$s</xliff:g> အကြောင်း<xliff:g id="TIME">%5$s</xliff:g>၊ <xliff:g id="READSTATE">%6$s</xliff:g> မှာ"</string>
<string name="read_string" msgid="5495929677508576520">"စကားဝိုင်းကို ဖတ်ပြီး"</string>
@@ -227,9 +218,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"စာ အဟောင်း <xliff:g id="COUNT">%1$d</xliff:g> ခု"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"ပိုဟောင်းသော စာ <xliff:g id="COUNT">%1$d</xliff:g>ခုကို တင်ပေးနေ"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"မှ:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"သို့ ဖြေကြားရန်:"</string>
<string name="to_heading" msgid="3495203282540398336">"သို့: "</string>
@@ -479,4 +467,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"အထွေထွေ ဆက်တင်များ"</string>
<string name="activity_preferences" msgid="8966077432517613292">"ဆက်တင်များ"</string>
<string name="overflow_description" msgid="7886090597023240426">"နောက်ထပ် ရွေးစရာများ"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index db79aeb..0742c8e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Kunne ikke legge ved fil."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Vedlegget ble ikke tillatt."</string>
<string name="recipient_needed" msgid="319816879398937214">"Legg til minst én mottaker."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Mottakerfeil"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Vil du sende e-posten?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Det er ingen tekst i e-postens emne."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Det er ingen tekst i e-posten."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Vil du sende denne e-posten?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-fil"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Forhåndsvisning"</string>
<string name="save_attachment" msgid="375685179032130033">"Lagre"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Avbryt"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Åpne"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installer"</string>
<string name="download_again" msgid="8195787340878328119">"Last ned på nytt"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informasjon"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ingen apper kan åpne dette vedlegget slik at du kan se det."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Send e-post"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Kart"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Del link"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Hjelp"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Send tilbakemelding"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> angående <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> den <xliff:g id="DATE">%5$s</xliff:g> – <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> angående <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kl. <xliff:g id="TIME">%5$s</xliff:g> – <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"samtalen er lest"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> eldre e-poster"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Laster inn <xliff:g id="COUNT">%1$d</xliff:g> eldre e-poster"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Fra:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Svar til:"</string>
<string name="to_heading" msgid="3495203282540398336">"Til: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Generelle innstillinger"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Innstillinger"</string>
<string name="overflow_description" msgid="7886090597023240426">"Flere alternativer"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index d1ff287..6940cb3 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"फाइल संलग्न गर्न सकेन।"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"संलग्नकको लागि अनुमति अस्वीकृत।"</string>
<string name="recipient_needed" msgid="319816879398937214">"कम्तिमा पनि एउटा प्राप्तकर्ता थप्नुहोस्।"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"प्राप्तकर्ता त्रुटि"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"सन्देश पठाउनुहुन्छ?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"सन्देशको विषयमा कुनै पाठ छैन।"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"सन्देशको मूख्य भागमा कुनै पाठ छैन।"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"यस सन्देश पठाउने हो?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> फाइल"</string>
<string name="preview_attachment" msgid="6265457626086113833">"पूर्वावलोकन"</string>
<string name="save_attachment" msgid="375685179032130033">"सुरक्षित गर्नुहोस्"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"रद्द गर्नुहोस्।"</string>
- <string name="open_attachment" msgid="6100396056314739761">"खोल्नुहोस्"</string>
- <string name="install_attachment" msgid="8119470822958087928">"स्थापना गर्नुहोस्"</string>
<string name="download_again" msgid="8195787340878328119">"पुन: डाउनलोड गर्नुहोस्"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"जानकारी"</string>
<string name="no_application_found" msgid="7309485680354949680">"कुनै अनुप्रयोगले हेर्नको लागि यो संलग्नकलाई खोल्न सक्दैन।"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"इमेल पठाउनुहोस्"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"नक्शा"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"लिङ्क साझेदारी गर्नुहोस्"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"मद्दत गर्नुहोस्"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"प्रतिक्रिया पठाउनुहोस्"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g> बारेमा <xliff:g id="SUBJECT">%3$s</xliff:g> , <xliff:g id="SNIPPET">%4$s</xliff:g> यस <xliff:g id="DATE">%5$s</xliff:g> , <xliff:g id="READSTATE">%6$s</xliff:g>मा"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g> बारेमा <xliff:g id="SUBJECT">%3$s</xliff:g> , <xliff:g id="SNIPPET">%4$s</xliff:g> यस<xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>मा"</string>
<string name="read_string" msgid="5495929677508576520">"कुराकानी पढाई"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> पुरानो सन्देश"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> पुराना सन्देशहरू लोड गरिँदै"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"प्रेषक:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"यसमा जवाफ पठाउनुहोस्:"</string>
<string name="to_heading" msgid="3495203282540398336">"प्रापक: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"साधारण सेटिङहरू"</string>
<string name="activity_preferences" msgid="8966077432517613292">"सेटिङ्स"</string>
<string name="overflow_description" msgid="7886090597023240426">"अरु विकल्पहरु"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 20e011f..2a5d935 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Kan bestand niet bijvoegen."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Toestemming geweigerd voor de bijlage."</string>
<string name="recipient_needed" msgid="319816879398937214">"Voeg ten minste één ontvanger toe."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Fout met ontvanger"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Bericht verzenden?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Het berichtonderwerp bevat geen tekst."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Het bericht bevat geen tekst."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Dit bericht verzenden?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-bestand"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Voorbeeld"</string>
<string name="save_attachment" msgid="375685179032130033">"Opslaan"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Annuleren"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Openen"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installeren"</string>
<string name="download_again" msgid="8195787340878328119">"Opnieuw downloaden"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Info"</string>
<string name="no_application_found" msgid="7309485680354949680">"Er is geen app die deze bijlage kan openen voor weergave."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"E-mail verzenden"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Kaart"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Link delen"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Help"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Feedback verzenden"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> over <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> op <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> over <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> om <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversatie gelezen"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> oudere berichten"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> oudere berichten laden"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Van:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Antwoord:"</string>
<string name="to_heading" msgid="3495203282540398336">"Aan: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Algemene instellingen"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Instellingen"</string>
<string name="overflow_description" msgid="7886090597023240426">"Meer opties"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e2614a7..11d42d0 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Nie można załączyć pliku."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Nie zezwolono na załączenie tego pliku."</string>
<string name="recipient_needed" msgid="319816879398937214">"Dodaj co najmniej jednego odbiorcę."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Błąd odbiorcy"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Wysłać wiadomość?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Brak tekstu w temacie wiadomości."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Brak tekstu w treści wiadomości."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Wysłać tę wiadomość?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Plik <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Podgląd"</string>
<string name="save_attachment" msgid="375685179032130033">"Zapisz"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Anuluj"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Otwórz"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Zainstaluj"</string>
<string name="download_again" msgid="8195787340878328119">"Pobierz ponownie"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informacje"</string>
<string name="no_application_found" msgid="7309485680354949680">"Brak aplikacji do otwarcia załącznika."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Wyślij e-maila"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Udostępnij link"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Pomoc"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Prześlij opinię"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> na temat <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> w dniu <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> na temat <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> o <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"wątek został przeczytany"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Starsze wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Ładowanie <xliff:g id="COUNT">%1$d</xliff:g> starszych wiadomości"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Od:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Odp. do:"</string>
<string name="to_heading" msgid="3495203282540398336">"Do: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Ustawienia ogólne"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Ustawienia"</string>
<string name="overflow_description" msgid="7886090597023240426">"Więcej opcji"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3651233..1e35cf8 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Não foi possível anexar o ficheiro."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Autorização negada para o anexo."</string>
<string name="recipient_needed" msgid="319816879398937214">"Adicione, pelo menos, um destinatário."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erro do destinatário"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Enviar mensagem?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Não existe texto no assunto da mensagem."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Não existe texto no corpo da mensagem."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Enviar esta mensagem?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Ficheiro <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Pré-vis."</string>
<string name="save_attachment" msgid="375685179032130033">"Guardar"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Cancelar"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Abrir"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instalar"</string>
<string name="download_again" msgid="8195787340878328119">"Transferir novamente"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informações"</string>
<string name="no_application_found" msgid="7309485680354949680">"Nenhuma aplicação pode abrir este anexo para visualização."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Enviar email"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Partilhar link"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Ajuda"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar comentários"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> a <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> às <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversa lida"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"A carregar <xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"De:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Responder a:"</string>
<string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Definições gerais"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Definições"</string>
<string name="overflow_description" msgid="7886090597023240426">"Mais opções"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 00c7abc..b4bd5ca 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Não foi possível anexar o arquivo."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Permissão negada para o anexo."</string>
<string name="recipient_needed" msgid="319816879398937214">"Adicione pelo menos um destinatário."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Erro de destinatário"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Enviar mensagem?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Não há texto no assunto da mensagem."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Não há texto no corpo da mensagem."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Enviar esta mensagem?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Arquivo <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Visualizar"</string>
<string name="save_attachment" msgid="375685179032130033">"Salvar"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Cancelar"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Abrir"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instalar"</string>
<string name="download_again" msgid="8195787340878328119">"Fazer novo download"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informações"</string>
<string name="no_application_found" msgid="7309485680354949680">"Nenhum aplicativo pode abrir este anexo para visualização."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Enviar e-mail"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Compartilhar link"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Ajuda"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Enviar comentários"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> em <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> sobre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> às <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversa lida"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Carregando <xliff:g id="COUNT">%1$d</xliff:g> mensagens mais antigas"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"De:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Res. para:"</string>
<string name="to_heading" msgid="3495203282540398336">"Para: "</string>
@@ -478,4 +466,6 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Configurações gerais"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Configurações"</string>
<string name="overflow_description" msgid="7886090597023240426">"Mais opções"</string>
+ <string name="security_hold_required_text" msgid="6619955920101834286">"Atualização de segurança necessária para <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
+ <string name="update_security_text" msgid="3527335757205741077">"atualizar agora"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 14ad6eb..4596961 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Nu s-a putut ataşa fişierul."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"S-a refuzat accesul la atașament."</string>
<string name="recipient_needed" msgid="319816879398937214">"Adăugaţi cel puţin un destinatar."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Eroare destinatar"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Trimiteţi mesajul?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Nu există text în subiectul mesajului."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Nu există text în corpul mesajului."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Trimiteţi acest mesaj?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Fişier <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Previzual."</string>
<string name="save_attachment" msgid="375685179032130033">"Salvaţi"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Anulaţi"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Deschideți"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Instalaţi"</string>
<string name="download_again" msgid="8195787340878328119">"Descărcaţi din nou"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informaţii"</string>
<string name="no_application_found" msgid="7309485680354949680">"Nu există o aplicaţie care să poată deschide acest ataşament pentru vizualizare."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Trimiteţi e-mail"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Hartă"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Distribuiţi linkul"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Ajutor"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Trimiteţi feedback"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> despre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> pe data de <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> despre <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> la <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"conversație citită"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje mai vechi"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Se încarcă <xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje mai vechi"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"De la:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Răsp. la:"</string>
<string name="to_heading" msgid="3495203282540398336">"Către: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Setările generale"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Setări"</string>
<string name="overflow_description" msgid="7886090597023240426">"Mai multe opțiuni"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 261bf0f..1d2bbdd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Не удалось прикрепить файл."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"У вас нет прав на прикрепление этого файла"</string>
<string name="recipient_needed" msgid="319816879398937214">"Укажите получателя."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Ошибка"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Отправить сообщение?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Укажите тему."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Введите текст сообщения."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Отправить это сообщение?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Файл <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Просмотр"</string>
<string name="save_attachment" msgid="375685179032130033">"Сохранить"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Отмена"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Открыть"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Установить"</string>
<string name="download_again" msgid="8195787340878328119">"Скачать ещё раз"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Справка"</string>
<string name="no_application_found" msgid="7309485680354949680">"Файл не поддерживается вашими приложениями."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Отправить письмо"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Карта"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Отправить ссылку"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Справка"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Отправить отзыв"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g>: <xliff:g id="PARTICIPANT">%2$s</xliff:g>. Тема: <xliff:g id="SUBJECT">%3$s</xliff:g>. Фрагмент: <xliff:g id="SNIPPET">%4$s</xliff:g>. <xliff:g id="READSTATE">%6$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>."</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g>: <xliff:g id="PARTICIPANT">%2$s</xliff:g>. Тема: <xliff:g id="SUBJECT">%3$s</xliff:g>. Фрагмент: <xliff:g id="SNIPPET">%4$s</xliff:g>. <xliff:g id="READSTATE">%6$s</xliff:g> в <xliff:g id="TIME">%5$s</xliff:g>."</string>
<string name="read_string" msgid="5495929677508576520">"прочитано"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Старых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Загрузка более старых сообщений (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"От:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Ответить:"</string>
<string name="to_heading" msgid="3495203282540398336">"Кому: "</string>
@@ -298,7 +286,7 @@
<string name="wait_for_sync_title" msgid="4577632826912823075">"Синхронизация…"</string>
<string name="not_synced_title" msgid="3600180500934086346">"Аккаунт не синхронизирован"</string>
<string name="wait_for_manual_sync_body" msgid="2823149409451003378">"В этом аккаунте не настроена автоматическая синхронизация.\nВыберите "<b>"Настройки синхронизации"</b>", чтобы включить ее, или "<b>"Синхронизировать сейчас"</b>", чтобы синхронизировать почту один раз."</string>
- <string name="manual_sync" msgid="2271479734895537848">"Синхр."</string>
+ <string name="manual_sync" msgid="2271479734895537848">"Синхронизировать"</string>
<string name="change_sync_settings" msgid="3615852118397055361">"Настройки синхронизации"</string>
<string name="photo_load_failed" msgid="577471721679146999">"Не удалось загрузить фото"</string>
<string name="cant_move_or_change_labels" msgid="4155490583610926755">"Не удалось переместить сообщения, так как они находятся в разных аккаунтах."</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Общие настройки"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Настройки"</string>
<string name="overflow_description" msgid="7886090597023240426">"Дополнительно"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 1b468d3..3ee8f8d 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ගොනුව ඇමිණිමට නොහැකි විය."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"ඇමිණුම සඳහා අවසරය ප්රතික්ෂේප කරන ලදි."</string>
<string name="recipient_needed" msgid="319816879398937214">"අඩු තරමේ එක් ලබන්නෙක් එක් කරන්න."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"ලබන්නාගේ දෝෂයකි"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"පණිවිඩය යවන්නද?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"පණිවිඩ කාරණාවේ පෙළ නොමැත."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"පණිවිඩ බොඩියේ පෙළ නොමැත."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"මෙම පණිවිඩය යවන්නද?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ගොනුව"</string>
<string name="preview_attachment" msgid="6265457626086113833">"පූර්ව දර්ශනය"</string>
<string name="save_attachment" msgid="375685179032130033">"සුරකින්න"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"අවලංගු කරන්න"</string>
- <string name="open_attachment" msgid="6100396056314739761">"විවෘත කරන්න"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ස්ථාපනය"</string>
<string name="download_again" msgid="8195787340878328119">"නැවත බාගැනීම කරන්න"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"තොරතුරු"</string>
<string name="no_application_found" msgid="7309485680354949680">"නැරඹීම සඳහා මෙම ඇමුණුම කිසිදු යෙදුමකට විවෘත කළ නොහැක."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ඊ-තැපෑල යවන්න"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"සිතියම"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"සබැඳුම බෙදාගන්න"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"සහාය"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"ප්රතිපෝෂණ යවන්න"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="SUBJECT">%3$s</xliff:g> <xliff:g id="SNIPPET">%4$s</xliff:g> පිළිබඳව, <xliff:g id="DATE">%5$s</xliff:g> <xliff:g id="READSTATE">%6$s</xliff:g> දින, <xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="SUBJECT">%3$s</xliff:g> <xliff:g id="SNIPPET">%4$s</xliff:g> පිළිබඳව, <xliff:g id="TIME">%5$s</xliff:g> <xliff:g id="READSTATE">%6$s</xliff:g> ට, <xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"සංවාදය කියවයි"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"පැරණි පණිවිඩ <xliff:g id="COUNT">%1$d</xliff:g> ක්"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"පැරණි පණිවිඩ <xliff:g id="COUNT">%1$d</xliff:g> පූරණය කරමින්"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"වෙතින්:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"පිළිතුරු යවන්නේ"</string>
<string name="to_heading" msgid="3495203282540398336">"වෙත: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"සාමාන්ය සැකසීම්"</string>
<string name="activity_preferences" msgid="8966077432517613292">"සැකසීම්"</string>
<string name="overflow_description" msgid="7886090597023240426">"තවත් විකල්ප"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 563680a..15c8d43 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Súbor sa nepodarilo pripojiť."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Prístup k prílohe bol odmietnutý"</string>
<string name="recipient_needed" msgid="319816879398937214">"Pridajte aspoň jedného príjemcu."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Chyba príjemcu"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Chcete túto správu odoslať?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"V predmete správy nie je žiaden text."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"V tele správy nie je žiaden text."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Chcete odoslať túto správu?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Súbor <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Ukážka"</string>
<string name="save_attachment" msgid="375685179032130033">"Uložiť"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Zrušiť"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Otvoriť"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Inštalovať"</string>
<string name="download_again" msgid="8195787340878328119">"Stiahnuť znova"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informácie"</string>
<string name="no_application_found" msgid="7309485680354949680">"Žiadna aplikácia nemôže otvoriť ani zobraziť túto prílohu."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Poslať e-mail"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Zdieľať odkaz"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Pomocník"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Odoslať spätnú väzbu"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> – <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> – <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> o <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"konverzácia bola prečítaná"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Počet starších správ: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Načítavajú sa staršie správy (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Od:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Odpovedať:"</string>
<string name="to_heading" msgid="3495203282540398336">"Komu: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Všeobecné nastavenia"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Nastavenia"</string>
<string name="overflow_description" msgid="7886090597023240426">"Viac možností"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9d9535e..d067caf 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Datoteke ni bilo mogoče pripeti."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Ni dovoljeno za prilogo."</string>
<string name="recipient_needed" msgid="319816879398937214">"Dodajte vsaj enega prejemnika."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Napaka prejemnika"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Želite poslati sporočilo?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Zadeva sporočila je prazna."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"V telesu sporočila ni besedila."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Želite poslati to sporočilo?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Datoteka <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Predogled"</string>
<string name="save_attachment" msgid="375685179032130033">"Shrani"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Prekliči"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Odpri"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Namesti"</string>
<string name="download_again" msgid="8195787340878328119">"Znova prenesi"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Informacije"</string>
<string name="no_application_found" msgid="7309485680354949680">"Priloge si ni mogoče ogledati z nobeno aplikacijo."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Pošlji e-pošto"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Zemljevid"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Deli povezavo z drugimi"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Pomoč"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Pošljite povratne informacije"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> o zadevi <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> dne <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> o zadevi <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ob <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"pogovor je bil prebran"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Št. starejših sporočil: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Nalaganje starejših sporočil (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Od:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Odgovori:"</string>
<string name="to_heading" msgid="3495203282540398336">"Za: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Splošne nastavitve"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Nastavitve"</string>
<string name="overflow_description" msgid="7886090597023240426">"Več možnosti"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 529f084..01c85be 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Није могуће приложити датотеку."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Дозвола је одбијена за прилог."</string>
<string name="recipient_needed" msgid="319816879398937214">"Додајте најмање једног примаоца."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Грешка примаоца"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Желите ли да пошаљете поруку?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Нема текста у наслову поруке."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Нема текста у самој поруци."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Желите ли да пошаљете ову поруку?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> датотека"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Прикажи"</string>
<string name="save_attachment" msgid="375685179032130033">"Сачувај"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Откажи"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Отвори"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Инсталирај"</string>
<string name="download_again" msgid="8195787340878328119">"Преузми поново"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Информације"</string>
<string name="no_application_found" msgid="7309485680354949680">"Ниједна апликација не може да отвори овај прилог за прегледање."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Пошаљи имејл"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Мапа"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Дели линк"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Помоћ"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Пошаљи повратне информације"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> на тему <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> на тему <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> у <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"преписка је прочитана"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Старијих порука: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Учитавају се старије поруке (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Од:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Одговор на:"</string>
<string name="to_heading" msgid="3495203282540398336">"Коме: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Општа подешавања"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Подешавања"</string>
<string name="overflow_description" msgid="7886090597023240426">"Још опција"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5f601fa..daad1da 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Det gick inte att bifoga filen."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Behörighet nekad för fastsättning."</string>
<string name="recipient_needed" msgid="319816879398937214">"Lägg till minst en mottagare."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Mottagningsfel"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Skicka meddelande?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Det finns inget ämne för meddelandet."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Det finns ingen text i meddelandet."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Vill du skicka det här meddelandet?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>-fil"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Förhandsgranska"</string>
<string name="save_attachment" msgid="375685179032130033">"Spara"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Avbryt"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Öppna"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Installera"</string>
<string name="download_again" msgid="8195787340878328119">"Hämta igen"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Info"</string>
<string name="no_application_found" msgid="7309485680354949680">"Det finns inga appar som kan öppna och visa bilagan."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Skicka e-post"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Karta"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Dela länk"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Hjälp"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Skicka feedback"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> om <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> den <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> om <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> kl. <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"konversationen är läst"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> äldre meddelanden"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Läser in <xliff:g id="COUNT">%1$d</xliff:g> äldre meddelanden"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Från:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Svara till:"</string>
<string name="to_heading" msgid="3495203282540398336">"Till: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Allmänna inställningar"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Inställningar"</string>
<string name="overflow_description" msgid="7886090597023240426">"Fler alternativ"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 714ba8c..c5b6dbc 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Haikuweza kuambatisha faili."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Ruhusa ya kiambatisho imekatazwa."</string>
<string name="recipient_needed" msgid="319816879398937214">"Ongeza angalau mpokeaji mmoja."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Hitilafu ya mpokeaji"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Tuma ujumbe?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Hakuna maandishi katika kichwa cha ujumbe."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Hakuna maandishi katika kiini cha ujumbe."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Ungependa kuutuma ujumbe huu?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Faili <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Hakiki"</string>
<string name="save_attachment" msgid="375685179032130033">"Hifadhi"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Ghairi"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Imefunguliwa"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Sakinisha"</string>
<string name="download_again" msgid="8195787340878328119">"Pakua tena"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Maelezo"</string>
<string name="no_application_found" msgid="7309485680354949680">"Hakuna programu inayoweza kufungua kiambatisho hiki ili kitazamwe."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Tuma barua pepe"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Ramani"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Shiriki kiungo"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Usaidizi"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Tuma maoni"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g> kuhusu <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> tarehe <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g> <xliff:g id="PARTICIPANT">%2$s</xliff:g> kuhusu <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> saa <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"mazungumzo yamesomwa"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> wa zamani"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Inapakia ujumbe <xliff:g id="COUNT">%1$d</xliff:g> wa awali"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Kutoka:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Jibu-kwa:"</string>
<string name="to_heading" msgid="3495203282540398336">"Kwa: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Mipangilio ya jumla"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Mipangilio"</string>
<string name="overflow_description" msgid="7886090597023240426">"Chaguo zaidi"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-sw600dp-port/styles.xml b/res/values-sw600dp-port/styles.xml
index 257e86c..29016fa 100644
--- a/res/values-sw600dp-port/styles.xml
+++ b/res/values-sw600dp-port/styles.xml
@@ -25,5 +25,6 @@
<item name="android:paddingTop">@dimen/two_pane_tl_top</item>
<item name="android:paddingBottom">@dimen/two_pane_tl_top</item>
<item name="android:clipToPadding">false</item>
+ <item name="android:divider">@null</item>
</style>
</resources>
diff --git a/res/values-sw600dp/colors.xml b/res/values-sw600dp/colors.xml
index e18b293..ddd1dee 100644
--- a/res/values-sw600dp/colors.xml
+++ b/res/values-sw600dp/colors.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="conversation_view_item_background_color">@android:color/white</color>
<color name="folder_list_divider_color">#b2b2b2</color>
</resources>
\ No newline at end of file
diff --git a/res/values-sw600dp/dimen.xml b/res/values-sw600dp/dimen.xml
index 56201a6..550e444 100644
--- a/res/values-sw600dp/dimen.xml
+++ b/res/values-sw600dp/dimen.xml
@@ -19,7 +19,7 @@
<dimen name="conversation_message_content_margin_side">32dp</dimen>
<dimen name="conversation_view_margin_side">24dp</dimen>
<dimen name="conversation_view_snack_bar_margin">16dp</dimen>
- <dimen name="conversation_header_padding_side">24dp</dimen>
+ <dimen name="conversation_header_padding_side">36dp</dimen>
<dimen name="conversation_header_star_size">55dp</dimen>
<dimen name="conversation_border_margin_side">24dp</dimen>
@@ -54,4 +54,6 @@
<dimen name="empty_view_space">16dip</dimen>
<dimen name="chip_wrapper_start_padding">64dp</dimen>
+
+ <dimen name="action_bar_content_inset_start">60dp</dimen>
</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 0a8b869..2a5d61e4 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"கோப்பை இணைக்க முடியவில்லை."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"இணைப்பிற்கான அனுமதி மறுக்கப்பட்டது."</string>
<string name="recipient_needed" msgid="319816879398937214">"குறைந்தது ஒரு பெறுநரையாவது சேர்க்க வேண்டும்."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"பெறுநர் பிழை"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"செய்தியை அனுப்பவா?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"செய்தித் தலைப்பில் எந்த உரையும் இல்லை."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"செய்திப் பகுதியில் எந்த உரையும் இல்லை."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"இந்தச் செய்தியை அனுப்பவா?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> கோப்பு"</string>
<string name="preview_attachment" msgid="6265457626086113833">"மாதிரிக்காட்சி"</string>
<string name="save_attachment" msgid="375685179032130033">"சேமி"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"ரத்துசெய்"</string>
- <string name="open_attachment" msgid="6100396056314739761">"திற"</string>
- <string name="install_attachment" msgid="8119470822958087928">"நிறுவு"</string>
<string name="download_again" msgid="8195787340878328119">"மீண்டும் பதிவிறக்கு"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"தகவல்"</string>
<string name="no_application_found" msgid="7309485680354949680">"பார்ப்பதற்கு, இந்த இணைப்பை எந்தப் பயன்பாட்டாலும் திறக்க முடியாது."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"மின்னஞ்சல் அனுப்பு"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"வரைபடம்"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"இணைப்பைப் பகிர்"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"உதவி"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"கருத்தை அனுப்பு"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> குறித்து <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> அன்று <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> குறித்து <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> க்கு அனுப்பிய <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"உரையாடல் படிக்கப்பட்டது"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> பழைய செய்திகள்"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> பழைய செய்திகளை ஏற்றுகிறது"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"அனுப்புநர்:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"பதிலளிக்கவேண்டியது:"</string>
<string name="to_heading" msgid="3495203282540398336">"பெறுநர்: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"பொது அமைப்புகள்"</string>
<string name="activity_preferences" msgid="8966077432517613292">"அமைப்புகள்"</string>
<string name="overflow_description" msgid="7886090597023240426">"மேலும் விருப்பங்கள்"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 2d20c28..67b55d4 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ఫైల్ను జోడించడం సాధ్యపడలేదు."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"జోడింపుకి అనుమతి నిరాకరించబడింది."</string>
<string name="recipient_needed" msgid="319816879398937214">"కనీసం ఒక స్వీకర్తను జోడించండి."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"స్వీకర్త లోపం"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"సందేశం పంపాలా?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"సందేశ విషయంలో వచనం ఏదీ లేదు."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"సందేశ విషయంలో వచనం ఏదీ లేదు."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"ఈ సందేశం పంపాలా?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ఫైల్"</string>
<string name="preview_attachment" msgid="6265457626086113833">"పరిదృశ్యం"</string>
<string name="save_attachment" msgid="375685179032130033">"సేవ్ చేయి"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"రద్దు చేయి"</string>
- <string name="open_attachment" msgid="6100396056314739761">"తెరువు"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ఇన్స్టాల్ చేయి"</string>
<string name="download_again" msgid="8195787340878328119">"మళ్లీ డౌన్లోడ్ చేయి"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"సమాచారం"</string>
<string name="no_application_found" msgid="7309485680354949680">"ఈ జోడింపును వీక్షించడం కోసం తెరవగల అనువర్తనం ఏదీ లేదు."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ఇమెయిల్ పంపు"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"మ్యాప్"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"లింక్ను భాగస్వామ్యం చేయి"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"సహాయం"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"అభిప్రాయం పంపండి"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> గురించి, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>న, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> గురించి, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="TIME">%5$s</xliff:g>కి, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"సంభాషణ చదవబడింది"</string>
@@ -171,8 +162,8 @@
<string name="getting_messages" msgid="8403333791332403244">"మీ సందేశాలను పొందుతోంది"</string>
<string name="undo" msgid="8256285267701059609">"చర్యరద్దు చేయి"</string>
<plurals name="conversation_unstarred">
- <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> సంభాషణకు నక్షత్రం గుర్తు తీసివేస్తోంది"</item>
- <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> సంభాషణలకు నక్షత్రం గుర్తు తీసివేస్తోంది"</item>
+ <item quantity="one" msgid="1701235480675303125">"<xliff:g id="COUNT">%1$d</xliff:g> సంభాషణకు నక్షత్రం తీసివేస్తోంది"</item>
+ <item quantity="other" msgid="1154441830432477256">"<xliff:g id="COUNT">%1$d</xliff:g> సంభాషణలకు నక్షత్రం తీసివేస్తోంది"</item>
</plurals>
<plurals name="conversation_muted">
<item quantity="one" msgid="3622533556738049499">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> మ్యూట్ చేయబడింది"</item>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> పాత సందేశాలు"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> పాత సందేశాలను లోడ్ చేస్తోంది"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"వీరి నుండి:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"వీరికి ప్రత్యుత్తరం:"</string>
<string name="to_heading" msgid="3495203282540398336">"వీరికి: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"సాధారణ సెట్టింగ్లు"</string>
<string name="activity_preferences" msgid="8966077432517613292">"సెట్టింగ్లు"</string>
<string name="overflow_description" msgid="7886090597023240426">"మరిన్ని ఎంపికలు"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0f4b55b..320e460 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"ไม่สามารถแนบไฟล์"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"ระบบปฏิเสธสิทธิ์ในไฟล์แนบ"</string>
<string name="recipient_needed" msgid="319816879398937214">"เพิ่มผู้รับอย่างน้อยหนึ่งราย"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"พบข้อผิดพลาดกับผู้รับ"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"ส่งข้อความหรือไม่"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"ไม่มีหัวเรื่องข้อความ"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"ไม่มีเนื้อหาข้อความ"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"ส่งข้อความนี้หรือไม่"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"ไฟล์ <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"ดูตัวอย่าง"</string>
<string name="save_attachment" msgid="375685179032130033">"บันทึก"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"ยกเลิก"</string>
- <string name="open_attachment" msgid="6100396056314739761">"เปิด"</string>
- <string name="install_attachment" msgid="8119470822958087928">"ติดตั้ง"</string>
<string name="download_again" msgid="8195787340878328119">"ดาวน์โหลดอีกครั้ง"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"ข้อมูล"</string>
<string name="no_application_found" msgid="7309485680354949680">"ไม่มีแอปที่สามารถเปิดดูไฟล์แนบนี้ได้"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ส่งอีเมล"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"แผนที่"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"แชร์ลิงก์"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"ความช่วยเหลือ"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"ส่งความคิดเห็น"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> เกี่ยวกับ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> วันที่ <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> เกี่ยวกับ <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> เวลา <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"อ่านการสนทนาแล้ว"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความเก่า"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"กำลังโหลดข้อความเก่า <xliff:g id="COUNT">%1$d</xliff:g> รายการ"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"จาก:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"ตอบกลับ:"</string>
<string name="to_heading" msgid="3495203282540398336">"ถึง: "</string>
@@ -412,10 +400,10 @@
<item quantity="other" msgid="5422167728480739361">"<xliff:g id="COUNT">%1$d</xliff:g> ไฟล์แนบ"</item>
</plurals>
<string name="no_subject" msgid="5622708348540036959">"(ไม่มีหัวเรื่อง)"</string>
- <string name="vacation_responder" msgid="5570132559074523806">"โปรแกรมช่วยตอบอีเมลขณะพักร้อน"</string>
- <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"โปรแกรมช่วยตอบอีเมลขณะพักร้อน"</string>
+ <string name="vacation_responder" msgid="5570132559074523806">"การช่วยตอบอีเมลอัตโนมัติ"</string>
+ <string name="preferences_vacation_responder_title" msgid="2268482117730576123">"การช่วยตอบอีเมลอัตโนมัติ"</string>
<string name="vacation_responder_body_hint_text" msgid="9087613123105158494">"ข้อความ"</string>
- <string name="send_to_contacts_text" msgid="124432913980620545">"ส่งไปยังที่อยู่ติดต่อของฉันเท่านั้น"</string>
+ <string name="send_to_contacts_text" msgid="124432913980620545">"ส่งไปยังรายชื่อติดต่อของฉันเท่านั้น"</string>
<string name="send_to_domain_text" msgid="5064559546745918393">"ส่งไปยัง <xliff:g id="DOMAIN">%1$s</xliff:g> เท่านั้น"</string>
<string name="pick_start_date_title" msgid="2274665037355224165">"เริ่ม"</string>
<string name="pick_end_date_title" msgid="733396083649496600">"สิ้นสุด (ไม่บังคับ)"</string>
@@ -424,8 +412,8 @@
<string name="custom_date" msgid="5794846334232367838">"กำหนดเอง"</string>
<string name="date_none" msgid="1061426502665431412">"ไม่มี"</string>
<string name="discard_changes" msgid="5699760550972324746">"ยกเลิกการเปลี่ยนแปลงหรือไม่"</string>
- <string name="vacation_responder_changes_saved" msgid="91448817268121249">"บันทึกการเปลี่ยนแปลงโปรแกรมช่วยตอบอีเมลขณะพักร้อนแล้ว"</string>
- <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"ยกเลิกการเปลี่ยนแปลงโปรแกรมช่วยตอบอีเมลขณะพักร้อน"</string>
+ <string name="vacation_responder_changes_saved" msgid="91448817268121249">"บันทึกการเปลี่ยนแปลงการช่วยตอบอีเมลอัตโนมัติแล้ว"</string>
+ <string name="vacation_responder_changes_discarded" msgid="21756037735539983">"ยกเลิกการเปลี่ยนแปลงการช่วยตอบอีเมลอัตโนมัติ"</string>
<string name="vacation_responder_off" msgid="4429909341193366667">"ปิด"</string>
<string name="vacation_responder_on" msgid="4913238379320882449">"เปิด ตั้งแต่ <xliff:g id="DATE">%1$s</xliff:g>"</string>
<string name="vacation_responder_on_with_end_date" msgid="4360941815371475955">"เปิด ตั้งแต่ <xliff:g id="START_DATE">%1$s</xliff:g> ถึง <xliff:g id="END_DATE">%2$s</xliff:g>"</string>
@@ -478,4 +466,6 @@
<string name="general_preferences_title" msgid="4212138728220418162">"การตั้งค่าทั่วไป"</string>
<string name="activity_preferences" msgid="8966077432517613292">"การตั้งค่า"</string>
<string name="overflow_description" msgid="7886090597023240426">"ตัวเลือกเพิ่มเติม"</string>
+ <string name="security_hold_required_text" msgid="6619955920101834286">"<xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g> ต้องทำการอัปเดตด้านความปลอดภัย"</string>
+ <string name="update_security_text" msgid="3527335757205741077">"อัปเดตเลย"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 99f858a..8bdd029 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Hindi mai-attach ang file."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Tinanggihan ang pahintulot para sa attachment."</string>
<string name="recipient_needed" msgid="319816879398937214">"Magdagdag ng hindi bababa sa isang recipient."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Error ng recipient"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Ipadala ang mensahe?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Walang teksto sa paksa ng mensahe."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Walang teksto sa nilalaman ng mensahe."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Ipadala ang mensaheng ito?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> File"</string>
<string name="preview_attachment" msgid="6265457626086113833">"I-preview"</string>
<string name="save_attachment" msgid="375685179032130033">"I-save"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Kanselahin"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Buksan"</string>
- <string name="install_attachment" msgid="8119470822958087928">"I-install"</string>
<string name="download_again" msgid="8195787340878328119">"I-download muli"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Impormasyon"</string>
<string name="no_application_found" msgid="7309485680354949680">"Walang app na makakapagbukas sa attachment na ito para sa pagtingin."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Ipadala ang email"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Mapa"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Ibahagi ang link"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Tulong"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Magpadala ng feedback"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"Si <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> tungkol sa <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> noong <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"Si <xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> tungkol sa <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ng <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"pag-uusap na nabasa na"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> (na) mas lumang mensahe"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Nilo-load ang <xliff:g id="COUNT">%1$d</xliff:g> (na) mas lumang mensahe"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Mula kay:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Tugon kay:"</string>
<string name="to_heading" msgid="3495203282540398336">"Sa/Kay: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Mga pangkalahatang setting"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Mga Setting"</string>
<string name="overflow_description" msgid="7886090597023240426">"Higit pang mga opsyon"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b4be7c8..7a12f57 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Dosya eklenemedi."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Ek için izin reddedildi."</string>
<string name="recipient_needed" msgid="319816879398937214">"En az bir alıcı ekleyin."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Alıcı hatası"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"İleti gönderilsin mi?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"İletinin konusunda metin yok."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"İleti gövdesinde metin yok."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Bu ileti gönderilsin mi?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> Dosyası"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Önizle"</string>
<string name="save_attachment" msgid="375685179032130033">"Kaydet"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"İptal"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Aç"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Yükle"</string>
<string name="download_again" msgid="8195787340878328119">"Tekrar indir"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Bilgi"</string>
<string name="no_application_found" msgid="7309485680354949680">"Bu eki görüntülemek için açacak uygulama yok."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"E-posta gönder"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Harita"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Bağlantıyı paylaş"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Yardım"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Görüş bildir"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> adlı katılımcıya <xliff:g id="DATE">%5$s</xliff:g> tarihinde gönderilen <xliff:g id="SUBJECT">%3$s</xliff:g> konulu ve <xliff:g id="READSTATE">%6$s</xliff:g> durumda olan iletinin bir bölümü: <xliff:g id="SNIPPET">%4$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, konu: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> (saat: <xliff:g id="TIME">%5$s</xliff:g>), <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"ileti dizisi okundu"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> eski ileti"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> eski ileti yükleniyor"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Gönderen:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Yanıt Adresi:"</string>
<string name="to_heading" msgid="3495203282540398336">"Alıcı: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Genel ayarlar"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Ayarlar"</string>
<string name="overflow_description" msgid="7886090597023240426">"Diğer seçenekler"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d0d2746..834f71f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Не вдалося вкласти файл."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Відмовлено в доступі до вкладеного файлу."</string>
<string name="recipient_needed" msgid="319816879398937214">"Додайте принаймні одного отримувача."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Помилка отримувача"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Надіслати повідомлення?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"У темі повідомлення немає тексту."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"У тілі повідомлення немає тексту."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Надіслати це повідомлення?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Файл <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Перегляд"</string>
<string name="save_attachment" msgid="375685179032130033">"Зберегти"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Скасувати"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Відкрити"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Установити"</string>
<string name="download_again" msgid="8195787340878328119">"Завантажити знову"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Інформація"</string>
<string name="no_application_found" msgid="7309485680354949680">"Немає програми, щоб відкрити цей вкладений файл для перегляду."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Надіслати електронний лист"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Карта"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Поділитися посиланням"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Довідка"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Надіслати відгук"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, тема: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>, тема: <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> о <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"бесіду прочитано"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"Попередні повідомлення: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Завантаження старих повідомлень (<xliff:g id="COUNT">%1$d</xliff:g>)"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Від:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Відпов.:"</string>
<string name="to_heading" msgid="3495203282540398336">"Кому: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Загальні налаштування"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Налаштування"</string>
<string name="overflow_description" msgid="7886090597023240426">"Інші варіанти"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 1cb0b7a..c03d5e5 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"فائل منسلک نہیں کی جاسکی۔"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"منسلکہ کیلئے اجازت مسترد کر دی گئی۔"</string>
<string name="recipient_needed" msgid="319816879398937214">"کم از کم ایک وصول کنندہ شامل کریں۔"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"وصول کنندہ کی خرابی"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"پیغام بھیجیں؟"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"پیغام کے موضوع میں کوئی متن نہیں ہے۔"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"پیغام کے نفس مضمون میں کوئی متن نہیں ہے۔"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"یہ پیغام بھیجیں؟"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> فائل"</string>
<string name="preview_attachment" msgid="6265457626086113833">"پیش منظر"</string>
<string name="save_attachment" msgid="375685179032130033">"محفوظ کریں"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"منسوخ کریں"</string>
- <string name="open_attachment" msgid="6100396056314739761">"کھولیں"</string>
- <string name="install_attachment" msgid="8119470822958087928">"انسٹال کریں"</string>
<string name="download_again" msgid="8195787340878328119">"دوبارہ ڈاؤن لوڈ کریں"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"معلومات"</string>
<string name="no_application_found" msgid="7309485680354949680">"کوئی بھی ایپلیکیشن اس منسلکہ کو دیکھنے کیلئے نہیں کھول سکتی۔"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"ای میل بھیجیں"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"نقشہ"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"لنک کا اشتراک کریں"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"مدد"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"تاثرات بھیجیں"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> کے بارے میں، <xliff:g id="SNIPPET">%4$s</xliff:g> بتاریخ <xliff:g id="DATE">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> <xliff:g id="SUBJECT">%3$s</xliff:g> کے بارے میں، <xliff:g id="SNIPPET">%4$s</xliff:g> بوقت <xliff:g id="TIME">%5$s</xliff:g>، <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"گفتگو پڑھ لی گئی"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> قدیم تر پیغامات"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"<xliff:g id="COUNT">%1$d</xliff:g> پرانے پیغامات لوڈ ہو رہے ہیں"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"منجانب:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"جواب دیں بنام:"</string>
<string name="to_heading" msgid="3495203282540398336">"بنام: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"عام ترتیبات"</string>
<string name="activity_preferences" msgid="8966077432517613292">"ترتیبات"</string>
<string name="overflow_description" msgid="7886090597023240426">"مزید اختیارات"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index bf8826c..7b21639 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -49,8 +49,6 @@
<!-- no translation found for attachment_permission_denied (2274397783497640486) -->
<skip />
<string name="recipient_needed" msgid="319816879398937214">"Kamida bitta qabul qiluvchini ko‘rsating."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Qabul qiluvchi bilan bog‘liq xatolik"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Xabar yuborilsinmi?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Xabar mavzusini ko‘rsating."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Xabar matni bo‘m-bo‘sh."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Ushbu xabar yuborilsinmi?"</string>
@@ -107,9 +105,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> fayl"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Oldindan ko‘rish"</string>
<string name="save_attachment" msgid="375685179032130033">"Saqlash"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Bekor qilish"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Ochish"</string>
- <string name="install_attachment" msgid="8119470822958087928">"O‘rnatish"</string>
<string name="download_again" msgid="8195787340878328119">"Qayta yuklab olish"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Ma’lumot"</string>
<string name="no_application_found" msgid="7309485680354949680">"O‘rnatilgan ilovalardan hech biri biriktirma faylini o‘cha olmaydi."</string>
@@ -133,10 +128,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"E-pochta xabarini yuborish"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Xarita"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Link ulashish"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Yordam"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Fikr va mulohaza yuborish"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g>: <xliff:g id="PARTICIPANT">%2$s</xliff:g>. Mavzu: <xliff:g id="SUBJECT">%3$s</xliff:g>. Lavha: <xliff:g id="SNIPPET">%4$s</xliff:g>. <xliff:g id="READSTATE">%6$s</xliff:g>: <xliff:g id="DATE">%5$s</xliff:g>."</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g>: <xliff:g id="PARTICIPANT">%2$s</xliff:g>. Mavzu: <xliff:g id="SUBJECT">%3$s</xliff:g>. Lavha: <xliff:g id="SNIPPET">%4$s</xliff:g>. <xliff:g id="READSTATE">%6$s</xliff:g>: <xliff:g id="TIME">%5$s</xliff:g>."</string>
<string name="read_string" msgid="5495929677508576520">"suhbat o‘qilgan"</string>
@@ -211,7 +202,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> ta eski xabar"</item>
</plurals>
- <!-- no translation found for super_collapsed_loading_content_description:other (678491885491918982) -->
<string name="from_heading" msgid="48290556829713090">"Kimdan:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Javob berish:"</string>
<string name="to_heading" msgid="3495203282540398336">"Kimga: "</string>
@@ -462,4 +452,8 @@
<string name="activity_preferences" msgid="8966077432517613292">"Sozlamalar"</string>
<!-- no translation found for overflow_description (7886090597023240426) -->
<skip />
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index 012a0c7..323c23d 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -42,4 +42,12 @@
<style name="BorderlessBackground">
<item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
</style>
+
+ <style name="NotificationPrimaryText">
+ <item name="android:textColor">@color/text_color_black</item>
+ </style>
+
+ <style name="NotificationSecondaryText">
+ <item name="android:textColor">@color/text_color_grey</item>
+ </style>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c6d9436..d0c5393 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Không thể đính kèm tệp."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Quyền bị từ chối cho tệp đính kèm."</string>
<string name="recipient_needed" msgid="319816879398937214">"Thêm ít nhất một người nhận."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Lỗi người nhận"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Gửi tin nhắn?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Không có văn bản nào trong chủ đề thư."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Không có văn bản nào trong phần nội dung thư."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Gửi tin nhắn này?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Tệp <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Xem trước"</string>
<string name="save_attachment" msgid="375685179032130033">"Lưu"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Hủy"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Mở"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Cài đặt"</string>
<string name="download_again" msgid="8195787340878328119">"Tải xuống lại"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Thông tin"</string>
<string name="no_application_found" msgid="7309485680354949680">"Không ứng dụng nào mở được tệp đính kèm này để xem."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Gửi email"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Bản đồ"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Chia sẻ liên kết"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Trợ giúp"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Gửi phản hồi"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> về <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> vào <xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> về <xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> lúc <xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"cuộc trò chuyện đã đọc"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> thư cũ hơn"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Đang tải <xliff:g id="COUNT">%1$d</xliff:g> thư cũ hơn"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Từ:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Trả lời"</string>
<string name="to_heading" msgid="3495203282540398336">"Tới: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Cài đặt chung"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Cài đặt"</string>
<string name="overflow_description" msgid="7886090597023240426">"Tùy chọn khác"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ce6a42e..4e9230d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"无法附加文件。"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"没有权限添加附件。"</string>
<string name="recipient_needed" msgid="319816879398937214">"请至少添加一位收件人。"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"收件人出错"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"要发送邮件吗？"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"邮件主题中没有文字。"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"邮件正文中没有文字。"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"要发送此邮件吗？"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> 文件"</string>
<string name="preview_attachment" msgid="6265457626086113833">"预览"</string>
<string name="save_attachment" msgid="375685179032130033">"保存"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"取消"</string>
- <string name="open_attachment" msgid="6100396056314739761">"打开"</string>
- <string name="install_attachment" msgid="8119470822958087928">"安装"</string>
<string name="download_again" msgid="8195787340878328119">"再次下载"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"信息"</string>
<string name="no_application_found" msgid="7309485680354949680">"无应用可打开此附件，因此无法查看。"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"发送电子邮件"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"地图"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"分享链接"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"帮助"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"发送反馈"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>；主题为<xliff:g id="SUBJECT">%3$s</xliff:g>；<xliff:g id="SNIPPET">%4$s</xliff:g>；<xliff:g id="DATE">%5$s</xliff:g>；<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>；主题为<xliff:g id="SUBJECT">%3$s</xliff:g>；<xliff:g id="SNIPPET">%4$s</xliff:g>；<xliff:g id="TIME">%5$s</xliff:g>；<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"已读会话"</string>
@@ -171,8 +162,8 @@
<string name="getting_messages" msgid="8403333791332403244">"正在获取您的邮件"</string>
<string name="undo" msgid="8256285267701059609">"撤消"</string>
<plurals name="conversation_unstarred">
- <item quantity="one" msgid="1701235480675303125">"正在删除<xliff:g id="COUNT">%1$d</xliff:g>个会话的星标"</item>
- <item quantity="other" msgid="1154441830432477256">"正在删除<xliff:g id="COUNT">%1$d</xliff:g>个会话的星标"</item>
+ <item quantity="one" msgid="1701235480675303125">"正在取消<xliff:g id="COUNT">%1$d</xliff:g>个会话的星标"</item>
+ <item quantity="other" msgid="1154441830432477256">"正在取消<xliff:g id="COUNT">%1$d</xliff:g>个会话的星标"</item>
</plurals>
<plurals name="conversation_muted">
<item quantity="one" msgid="3622533556738049499">"已忽略<b><xliff:g id="COUNT">%1$d</xliff:g></b>个会话"</item>
@@ -183,8 +174,8 @@
<item quantity="other" msgid="664292592683692920">"已将<b><xliff:g id="COUNT">%1$d</xliff:g></b>个会话举报为垃圾邮件"</item>
</plurals>
<plurals name="conversation_not_spam">
- <item quantity="one" msgid="3680479171846552641">"已将<b><xliff:g id="COUNT">%1$d</xliff:g></b>个会话标记为非垃圾邮件"</item>
- <item quantity="other" msgid="6351739502184556635">"已将<b><xliff:g id="COUNT">%1$d</xliff:g></b>个会话标记为非垃圾邮件"</item>
+ <item quantity="one" msgid="3680479171846552641">"已将<b><xliff:g id="COUNT">%1$d</xliff:g></b>个会话列为非垃圾邮件"</item>
+ <item quantity="other" msgid="6351739502184556635">"已将<b><xliff:g id="COUNT">%1$d</xliff:g></b>个会话列为非垃圾邮件"</item>
</plurals>
<plurals name="conversation_not_important">
<item quantity="one" msgid="7432667428974709669">"已将<b><xliff:g id="COUNT">%1$d</xliff:g></b>个会话标记为不重要"</item>
@@ -214,8 +205,8 @@
<string name="search_unsupported" msgid="2873920566477359177">"此帐户不支持搜索。"</string>
<string name="add_label" msgid="3285338046038610902">"添加文件夹"</string>
<plurals name="new_incoming_messages">
- <item quantity="one" msgid="1532079301006372605">"有<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</item>
- <item quantity="other" msgid="4085982174357328926">"有<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</item>
+ <item quantity="one" msgid="1532079301006372605">"<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</item>
+ <item quantity="other" msgid="4085982174357328926">"<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</item>
</plurals>
<string name="date_and_view_details" msgid="2952994746916149969">"<xliff:g id="DATE">%1$s</xliff:g><a href=\'http://www.example.com\'>查看详情</a>"</string>
<string name="hide_details" msgid="8018801050702453314">"隐藏详细信息"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g>封较早的邮件"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"正在加载<xliff:g id="COUNT">%1$d</xliff:g>封较早的邮件"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"发件人："</string>
<string name="replyto_heading" msgid="8275255318292059079">"回复："</string>
<string name="to_heading" msgid="3495203282540398336">"收件人： "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"常规设置"</string>
<string name="activity_preferences" msgid="8966077432517613292">"设置"</string>
<string name="overflow_description" msgid="7886090597023240426">"更多选项"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e38660e..ec74d39 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"無法附加檔案。"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"權限被拒，無法加入附件。"</string>
<string name="recipient_needed" msgid="319816879398937214">"請至少加入一名收件者。"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"收件者錯誤"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"傳送郵件？"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"郵件主旨中沒有文字。"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"郵件內文中沒有文字。"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"傳送這封郵件？"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> 檔案"</string>
<string name="preview_attachment" msgid="6265457626086113833">"預覽"</string>
<string name="save_attachment" msgid="375685179032130033">"儲存"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"取消"</string>
- <string name="open_attachment" msgid="6100396056314739761">"開啟"</string>
- <string name="install_attachment" msgid="8119470822958087928">"安裝"</string>
<string name="download_again" msgid="8195787340878328119">"重新下載"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"資訊"</string>
<string name="no_application_found" msgid="7309485680354949680">"沒有應用程式可開啟這個附件以供檢視。"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"發送電郵"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"地圖"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"分享連結"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"說明"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"傳送意見"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g>：<xliff:g id="PARTICIPANT">%2$s</xliff:g>，主旨：<xliff:g id="SUBJECT">%3$s</xliff:g>，訊息摘錄：<xliff:g id="SNIPPET">%4$s</xliff:g>，日期：<xliff:g id="DATE">%5$s</xliff:g>，閱讀狀態：<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g>：<xliff:g id="PARTICIPANT">%2$s</xliff:g>，主旨：<xliff:g id="SUBJECT">%3$s</xliff:g>，訊息摘錄：<xliff:g id="SNIPPET">%4$s</xliff:g>，時間：<xliff:g id="TIME">%5$s</xliff:g>，閱讀狀態：<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"已讀取對話群組"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> 封較舊的郵件"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"正在載入 <xliff:g id="COUNT">%1$d</xliff:g> 封較舊的郵件"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"寄件者："</string>
<string name="replyto_heading" msgid="8275255318292059079">"回覆："</string>
<string name="to_heading" msgid="3495203282540398336">"收件者： "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"一般設定"</string>
<string name="activity_preferences" msgid="8966077432517613292">"設定"</string>
<string name="overflow_description" msgid="7886090597023240426">"更多選項"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3407411..4bd10de 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"無法附加檔案。"</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"權限遭拒，無法加入附件。"</string>
<string name="recipient_needed" msgid="319816879398937214">"請至少新增一位收件者。"</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"收件者錯誤"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"傳送郵件？"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"這封郵件沒有主旨。"</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"這封郵件沒有內文。"</string>
<string name="confirm_send_message" msgid="6211518590166222735">"傳送這封郵件？"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"<xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> 檔案"</string>
<string name="preview_attachment" msgid="6265457626086113833">"預覽"</string>
<string name="save_attachment" msgid="375685179032130033">"儲存"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"取消"</string>
- <string name="open_attachment" msgid="6100396056314739761">"開啟"</string>
- <string name="install_attachment" msgid="8119470822958087928">"安裝"</string>
<string name="download_again" msgid="8195787340878328119">"重新下載"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"資訊"</string>
<string name="no_application_found" msgid="7309485680354949680">"沒有應用程式可開啟這個附件供您檢視。"</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"傳送電子郵件"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"地圖"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"分享連結"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"說明"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"提供意見"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g>：<xliff:g id="PARTICIPANT">%2$s</xliff:g>、主旨：<xliff:g id="SUBJECT">%3$s</xliff:g>、摘要：<xliff:g id="SNIPPET">%4$s</xliff:g>、日期：<xliff:g id="DATE">%5$s</xliff:g>、閱讀狀態：<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g>：主題為<xliff:g id="SUBJECT">%3$s</xliff:g>；<xliff:g id="SNIPPET">%4$s</xliff:g>；<xliff:g id="TIME">%5$s</xliff:g>；<xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"已閱讀的會話群組"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> 封較舊的郵件"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"正在載入 <xliff:g id="COUNT">%1$d</xliff:g> 封較舊的郵件"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"寄件者："</string>
<string name="replyto_heading" msgid="8275255318292059079">"回覆："</string>
<string name="to_heading" msgid="3495203282540398336">"收件者： "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"一般設定"</string>
<string name="activity_preferences" msgid="8966077432517613292">"設定"</string>
<string name="overflow_description" msgid="7886090597023240426">"更多選項"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 47b7ff5..b0c33fa 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -46,8 +46,6 @@
<string name="generic_attachment_problem" msgid="4683974765387240723">"Ayikwazi ukunamathelisa ifayela."</string>
<string name="attachment_permission_denied" msgid="2274397783497640486">"Imvume inqatshelwe kokunamathiselwe."</string>
<string name="recipient_needed" msgid="319816879398937214">"Ngeza okungenani umamukeli oyedwa."</string>
- <string name="recipient_error_dialog_title" msgid="760741480291963706">"Iphutha Lomamukeli"</string>
- <string name="confirm_send_title" msgid="4664971589247101530">"Thumela umlayezo?"</string>
<string name="confirm_send_message_with_no_subject" msgid="1442628074022609987">"Awukho umbhalo esihlokweni somlayezo."</string>
<string name="confirm_send_message_with_no_body" msgid="3329355318700201516">"Awukho umbhalo emzimbeni walomlayezo."</string>
<string name="confirm_send_message" msgid="6211518590166222735">"Thumela lo mlayezo?"</string>
@@ -103,9 +101,6 @@
<string name="attachment_unknown" msgid="3360536730101083926">"Ifayela <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="preview_attachment" msgid="6265457626086113833">"Buka kuqala"</string>
<string name="save_attachment" msgid="375685179032130033">"Londoloza"</string>
- <string name="cancel_attachment" msgid="6900093625792891122">"Khansela"</string>
- <string name="open_attachment" msgid="6100396056314739761">"Vula"</string>
- <string name="install_attachment" msgid="8119470822958087928">"Faka"</string>
<string name="download_again" msgid="8195787340878328119">"Landa futhi"</string>
<string name="more_info_attachment" msgid="2899691682394864507">"Imininingwane"</string>
<string name="no_application_found" msgid="7309485680354949680">"Alukho uhlelo lokusebenza olungavula lokhu okunamathiselwe ukuze kubukwe."</string>
@@ -129,10 +124,6 @@
<string name="contextmenu_send_mail" msgid="3834654593200105396">"Thumela i-imeyili"</string>
<string name="contextmenu_map" msgid="5118951927399465521">"Imephu"</string>
<string name="contextmenu_sharelink" msgid="8670940060477758709">"Yabelana ngesixhumanisi"</string>
- <string name="contextmenu_help" msgid="4209674157707873384">"Usizo"</string>
- <string name="contextmenu_feedback" msgid="8319100902136337085">"Thumela impendulo"</string>
- <!-- no translation found for num_selected (7990204488812654380) -->
- <skip />
<string name="content_description" msgid="854320355052962069">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> mayelana ne-<xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ngomhla ka-<xliff:g id="DATE">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="content_description_today" msgid="1634422834354116955">"<xliff:g id="TOHEADER">%1$s</xliff:g><xliff:g id="PARTICIPANT">%2$s</xliff:g> mayelana ne-<xliff:g id="SUBJECT">%3$s</xliff:g>, <xliff:g id="SNIPPET">%4$s</xliff:g> ngo-<xliff:g id="TIME">%5$s</xliff:g>, <xliff:g id="READSTATE">%6$s</xliff:g>"</string>
<string name="read_string" msgid="5495929677508576520">"inkulumo efundiwe"</string>
@@ -226,9 +217,6 @@
<plurals name="show_messages_read">
<item quantity="other" msgid="5285673397387128129">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emidala"</item>
</plurals>
- <plurals name="super_collapsed_loading_content_description">
- <item quantity="other" msgid="678491885491918982">"Ilayisha imilayezo emidala engu-<xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
<string name="from_heading" msgid="48290556829713090">"Kusuka:"</string>
<string name="replyto_heading" msgid="8275255318292059079">"Phendula-ku:"</string>
<string name="to_heading" msgid="3495203282540398336">"Ku: "</string>
@@ -478,4 +466,8 @@
<string name="general_preferences_title" msgid="4212138728220418162">"Izilungiselelo ezijwayelekile"</string>
<string name="activity_preferences" msgid="8966077432517613292">"Izilungiselelo"</string>
<string name="overflow_description" msgid="7886090597023240426">"Okunye ongakhetha kukho"</string>
+ <!-- no translation found for security_hold_required_text (6619955920101834286) -->
+ <skip />
+ <!-- no translation found for update_security_text (3527335757205741077) -->
+ <skip />
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index ccfbb09..aa76131 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,14 +16,15 @@
limitations under the License.
-->
<resources>
+ <color name="text_color_medium_grey">#9e9e9e</color>
<color name="text_color_grey">#757575</color>
<color name="text_color_black">#212121</color>
- <color name="accent_blue">#00bfd8</color>
+ <color name="accent_blue">#4285f4</color>
<color name="text_color_blue">@color/accent_blue</color>
<color name="text_color_draft_red">#da4336</color>
+ <color name="text_color_hint_grey">#949494</color>
<color name="gray_text_color">#777777</color>
<color name="dark_gray_text_color">#58585b</color>
- <color name="light_gray_text_color">#b5b5b5</color>
<color name="light_gray">#cccccc</color>
<!-- if you want to make something blue, please try to use THIS blue -->
<color name="mail_app_blue">@android:color/holo_blue_light</color>
@@ -50,7 +51,7 @@
<!-- Folder List/Drawer colors -->
<color name="account_item_selected_text_color">@color/mail_app_blue</color>
- <color name="folder_list_heading_text_color">@color/light_gray</color>
+ <color name="folder_list_heading_text_color">@color/text_color_medium_grey</color>
<color name="list_background_color">@android:color/white</color>
<!-- overridden in sw600dp -->
<color name="folder_list_divider_color">@color/divider_color</color>
@@ -58,12 +59,11 @@
<!-- Compose colors -->
<color name="compose_label_text">@color/text_color_grey</color>
<color name="compose_user_text">@color/text_color_black</color>
- <color name="compose_label_hint">@color/light_gray</color>
+ <color name="compose_label_hint">@color/text_color_hint_grey</color>
<color name="compose_divider_color">@color/light_gray</color>
<!-- Must match the quoted_text_background_color_string -->
<color name="compose_background_color">@android:color/white</color>
<string name="quoted_text_font_color_string" translatable="false">@color/text_color_grey</string>
- <color name="respond_inline_color">#00bfd8</color>
<color name="conv_header_add_label_text">@android:color/black</color>
<color name="conv_header_add_label_background">#eeeeee</color>
@@ -72,11 +72,11 @@
<color name="conversation_view_border_color">@color/divider_color</color>
<color name="conversation_view_background_color">#f5f5f5</color>
<!-- Overridden on tablet to give a white background -->
- <color name="conversation_view_item_background_color">@color/conversation_view_background_color</color>
+ <color name="conversation_view_item_background_color">@android:color/white</color>
<color name="conversation_view_text_color_light">@color/text_color_grey</color>
<color name="conversation_view_text_color_dark">@color/text_color_black</color>
<color name="conversation_view_text_color_link_blue">@color/text_color_blue</color>
- <color name="conversation_view_footer_text_color">#999999</color>
+ <color name="conversation_view_footer_text_color">#a7a7a7</color>
<!-- Widget colors -->
<color name="widget_header_bg_color">#da4336</color>
@@ -85,7 +85,7 @@
<!-- Color of the semi-transparent shadow box on attachment tiles -->
<color name="attachment_tile_shadow_box_color">#7F000000</color>
<!-- Color of the subtitle message in the attachment tile -->
- <color name="attachment_tile_subtitle_color">#999999</color>
+ <color name="attachment_tile_subtitle_color">@color/text_color_hint_grey</color>
<color name="attachment_image_background_color">#E5E5E5</color>
<!-- Color of the parent folders and dividers for hierarchical folder descriptions in the move to folder -->
@@ -168,8 +168,8 @@
<color name="actionbar_color">@color/mail_orange</color>
<color name="statusbar_color">@color/statusbar_orange</color>
- <!-- TODO: get real color from UX -->
- <color name="action_mode_background">#9b9b9b</color>
+ <color name="action_mode_background">@color/text_color_grey</color>
+ <color name="action_mode_statusbar_color">#616161</color>
<color name="snack_bar_background_color">#323232</color>
<color name="snack_bar_action_text_color">#f4b400</color>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 791a8ab..f071ea4 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -147,8 +147,7 @@
<dimen name="widget_senders_padding_end">16dip</dimen>
<dimen name="widget_attachment_padding_end">8dp</dimen>
- <dimen name="search_leading_button_width">72dp</dimen>
- <dimen name="search_button_padding">16dp</dimen>
+ <dimen name="search_leading_button_width">56dp</dimen>
<dimen name="search_main_text_padding">16dp</dimen>
<dimen name="search_ending_button_width">56dp</dimen>
<dimen name="search_suggestion_padding">16dp</dimen>
@@ -223,4 +222,8 @@
<dimen name="account_item_name_start_padding">16dp</dimen>
<dimen name="account_item_name_end_padding">8dp</dimen>
+
+ <dimen name="action_bar_content_inset_start">72dp</dimen>
+ <dimen name="security_hold_text_width">240dp</dimen>
+ <dimen name="security_hold_view_text_size">18sp</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 25e4923..0cf62c3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -225,6 +225,8 @@
<string name="download_again">Download again</string>
<!-- A supplemental option on attachments for apps to override. This string intentionally blank here. [CHAR LIMIT=20] -->
<string name="attachment_extra_option1" translatable="false"></string>
+ <!-- Remove this attachment [CHAR LIMIT=50] -->
+ <string name="remove_attachment_desc">Remove attachment <xliff:g id="attachmentName">%s</xliff:g></string>
<!-- Dialog box title [CHAR LIMIT=30] -->
<string name="more_info_attachment">Info</string>
<!-- Dialog box message, displayed when we could not view an attachment. [CHAR LIMIT=200]-->
@@ -425,6 +427,8 @@
<string name="search_results_header">Results</string>
<!-- Toast shown when the user taps the search hard key when viewing an account that does not support search [CHAR LIMIT=100] -->
<string name="search_unsupported">Search is not supported on this account.</string>
+ <!-- Accessibility description for the search suggestion item [CHAR LIMIT=100] -->
+ <string name="search_suggestion_desc">Suggestion: <xliff:g id="suggestion">%s</xliff:g></string>
<!-- Conversation view -->
<!-- Text anchor for control to add / change labels on a conversation when
@@ -587,6 +591,12 @@
<string name="search_results_loaded"><xliff:g id="searchCount">%1$d</xliff:g></string>
<!-- Voice search is not supported on this device [CHAR LIMIT=100] -->
<string name="voice_search_not_supported">Voice search is not supported on this device.</string>
+ <!-- Description of the back button [CHAR LIMIT=100] -->
+ <string name="search_back_desc">Close search</string>
+ <!-- Description of the voice icon [CHAR LIMIT=100] -->
+ <string name="search_voice_desc">Start voice search</string>
+ <!-- Description of the clear icon (clears the current input text in the search bar) [CHAR LIMIT=100] -->
+ <string name="search_clear_desc">Clear search text</string>
<!-- Shown in conversation list footer when application cannot make a connection [CHAR LIMIT=20]-->
<string name="network_error">No connection</string>
@@ -1131,4 +1141,12 @@
<string name="overflow_description">More options</string>
<string name="user_agent_format" translatable="false">%1$s AndroidUnifiedEmail/%2$s</string>
+
+ <!-- Text when there is a security hold on an account that needs to be accepted. The email address param takes the for "abc@xyz.com" -->
+ <string name="security_hold_required_text">Security update required for <xliff:g id="email_address">%1$s</xliff:g></string>
+
+ <!-- Text to go to the dialog to accept the security hold -->
+ <string name="update_security_text">update now</string>
+ <!-- Shown when user submits a form. [CHAR LIMIT=40] -->
+ <string name="forms_are_disabled">Forms are disabled in Gmail</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 003941c..d0a48f5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -246,6 +246,7 @@
<!-- Undo bar styles -->
<style name="UndoTextStyle">
<item name="android:background">?android:attr/selectableItemBackground</item>
+ <item name="android:focusable">true</item>
<item name="android:paddingLeft">@dimen/undo_text_padding</item>
<item name="android:paddingRight">@dimen/undo_text_padding</item>
<item name="android:text">@string/undo</item>
@@ -271,6 +272,7 @@
</style>
<style name="ConversationSubjectStyle">
+ <item name="android:lineSpacingExtra">4sp</item>
<item name="android:textColor">@color/conversation_view_text_color_dark</item>
<item name="android:textSize">@dimen/conversation_header_font_size</item>
</style>
@@ -464,6 +466,18 @@
<item name="android:textColor">@android:color/white</item>
</style>
+ <style name="ActionBarTextAppearanceLargeStyle" parent="@android:style/TextAppearance.Holo.Widget.PopupMenu.Large">
+ <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+ </style>
+
+ <style name="ActionBarTextAppearanceSmallStyle" parent="@android:style/TextAppearance.Holo.Widget.PopupMenu.Small">
+ <item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+ </style>
+
+ <style name="ActionBarDividerlessListViewStyle" parent="@android:style/Widget.Holo.ListView">
+ <item name="android:divider">@null</item>
+ </style>
+
<style name="WaitFragmentTitleBase" parent="@android:style/Widget.Holo.TextView" />
<style name="WaitFragmentTitle" parent="@style/WaitFragmentTitleBase">
@@ -924,8 +938,8 @@
<item name="android:textStyle">bold</item>
</style>
- <style name="SpinnerAccountAddressStyle" parent="ComposeFromTextViewStyle">
- <item name="android:paddingLeft">@dimen/custom_from_inner_padding</item>
+ <style name="SpinnerAccountNameStyle" parent="ComposeFromTextViewStyle">
+ <item name="android:paddingRight">@dimen/custom_from_inner_padding</item>
</style>
<style name="FolderTeaserUnreadCountTextStyle">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 5ba608d..a48e407 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -2,12 +2,20 @@
<resources>
<style name="UnifiedEmailTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/ActionBarStyle</item>
+ <item name="android:actionBarWidgetTheme">@style/ActionBarWidgetTheme</item>
<item name="android:actionModeBackground">@color/action_mode_background</item>
<item name="android:actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item>
<item name="android:listViewWhiteStyle">@android:style/Widget.Holo.Light.ListView</item>
</style>
+ <style name="ActionBarWidgetTheme" parent="@android:style/Theme.Holo">
+ <item name="android:dropDownListViewStyle">@style/ActionBarDividerlessListViewStyle</item>
+ <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.ListPopupWindow</item>
+ <item name="android:textAppearanceLargePopupMenu">@style/ActionBarTextAppearanceLargeStyle</item>
+ <item name="android:textAppearanceSmallPopupMenu">@style/ActionBarTextAppearanceSmallStyle</item>
+ </style>
+
<style name="UnifiedEmailTheme.Appcompat" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="actionModeBackground">@color/action_mode_background</item>
<item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle.Appcompat</item>
diff --git a/src/com/android/mail/MailIntentService.java b/src/com/android/mail/MailIntentService.java
index 6c4c3cf..3fef7b3 100644
--- a/src/com/android/mail/MailIntentService.java
+++ b/src/com/android/mail/MailIntentService.java
@@ -21,7 +21,7 @@
import android.net.Uri;
import com.android.mail.analytics.Analytics;
-import com.android.mail.photo.ContactPhotoFetcher;
+import com.android.mail.photo.ContactFetcher;
import com.android.mail.providers.Account;
import com.android.mail.providers.Folder;
import com.android.mail.utils.FolderUri;
@@ -74,7 +74,7 @@
if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
NotificationUtils.cancelAndResendNotificationsOnLocaleChange(
- this, getContactPhotoFetcher());
+ this, getContactFetcher());
} else if (ACTION_CLEAR_NEW_MAIL_NOTIFICATIONS.equals(action)) {
final Account account = intent.getParcelableExtra(Utils.EXTRA_ACCOUNT);
final Folder folder = intent.getParcelableExtra(Utils.EXTRA_FOLDER);
@@ -87,7 +87,7 @@
final Uri folderUri = intent.getParcelableExtra(Utils.EXTRA_FOLDER_URI);
NotificationUtils.resendNotifications(this, false, accountUri,
- new FolderUri(folderUri), getContactPhotoFetcher());
+ new FolderUri(folderUri), getContactFetcher());
} else if (ACTION_RESEND_NOTIFICATIONS_WEAR.equals(action)) {
final Account account = intent.getParcelableExtra(Utils.EXTRA_ACCOUNT);
final Folder folder = intent.getParcelableExtra(Utils.EXTRA_FOLDER);
@@ -97,7 +97,7 @@
// when user replies to a conversation remotely from a Wear device.
NotificationUtils.markConversationAsReadAndSeen(this, conversationUri);
NotificationUtils.resendNotifications(this, false, account.uri,
- folder.folderUri, getContactPhotoFetcher());
+ folder.folderUri, getContactFetcher());
} else if (ACTION_SEND_SET_NEW_EMAIL_INDICATOR.equals(action)) {
final int unreadCount = intent.getIntExtra(NotificationUtils.EXTRA_UNREAD_COUNT, 0);
final int unseenCount = intent.getIntExtra(NotificationUtils.EXTRA_UNSEEN_COUNT, 0);
@@ -107,7 +107,7 @@
intent.getBooleanExtra(NotificationUtils.EXTRA_GET_ATTENTION, false);
NotificationUtils.setNewEmailIndicator(this, unreadCount, unseenCount,
- account, folder, getAttention, getContactPhotoFetcher());
+ account, folder, getAttention, getContactFetcher());
} else if (Intent.ACTION_DEVICE_STORAGE_LOW.equals(action)) {
// The storage_low state is recorded centrally even though
// no handler might be present to change application state
@@ -125,11 +125,11 @@
}
/**
- * Derived classes should override this method if they wish to provide their
- * own photo loading behavior separate from the ContactProvider-based default.
- * The default behavior of this method returns null.
+ * Derived classes should override this method if they wish to provide their own contact loading
+ * behavior separate from the ContactProvider-based default, primarily contact photo and contact
+ * lookup uri fetching. The default behavior of this method returns null.
*/
- public ContactPhotoFetcher getContactPhotoFetcher() {
+ public ContactFetcher getContactFetcher() {
return null;
}
}
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 3aa93c5..028c3e1 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -67,6 +67,7 @@
import com.android.mail.bitmap.CheckableContactFlipDrawable;
import com.android.mail.bitmap.ContactDrawable;
import com.android.mail.perf.Timer;
+import com.android.mail.providers.Account;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
import com.android.mail.providers.UIProvider;
@@ -77,7 +78,6 @@
import com.android.mail.ui.ControllableActivity;
import com.android.mail.ui.ConversationCheckedSet;
import com.android.mail.ui.ConversationSetObserver;
-import com.android.mail.ui.DividedImageCanvas.InvalidateCallback;
import com.android.mail.ui.FolderDisplayer;
import com.android.mail.ui.SwipeableItemView;
import com.android.mail.ui.SwipeableListView;
@@ -89,12 +89,11 @@
import com.android.mail.utils.ViewUtils;
import com.google.common.annotations.VisibleForTesting;
-import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
public class ConversationItemView extends View
- implements SwipeableItemView, ToggleableItem, InvalidateCallback, ConversationSetObserver,
+ implements SwipeableItemView, ToggleableItem, ConversationSetObserver,
BadgeSpan.BadgeSpanDimensions {
// Timer.
@@ -109,6 +108,8 @@
private static final String PERF_TAG_CALCULATE_COORDINATES = "CCHV.coordinates";
private static final String LOG_TAG = LogTag.getLogTag();
+ private static final Typeface SANS_SERIF_BOLD = Typeface.create("sans-serif", Typeface.BOLD);
+
private static final Typeface SANS_SERIF_LIGHT = Typeface.create("sans-serif-light",
Typeface.NORMAL);
@@ -182,7 +183,7 @@
private final Context mContext;
- public ConversationItemViewModel mHeader;
+ private ConversationItemViewModel mHeader;
private boolean mDownEvent;
private boolean mChecked = false;
private ConversationCheckedSet mCheckedConversationSet;
@@ -192,7 +193,7 @@
private boolean mDividerEnabled;
private AnimatedAdapter mAdapter;
private float mAnimatedHeightFraction = 1.0f;
- private final String mAccount;
+ private final Account mAccount;
private ControllableActivity mActivity;
private final TextView mSendersTextView;
private final TextView mSubjectTextView;
@@ -510,7 +511,7 @@
}
}
- public ConversationItemView(Context context, String account) {
+ public ConversationItemView(Context context, Account account) {
super(context);
Utils.traceBeginSection("CIVC constructor");
setClickable(true);
@@ -638,8 +639,8 @@
final boolean swipeEnabled, final boolean importanceMarkersEnabled,
final boolean showChevronsEnabled, final AnimatedAdapter adapter) {
Utils.traceBeginSection("CIVC.bind");
- bind(ConversationItemViewModel.forConversation(mAccount, conversation), activity,
- null /* conversationItemAreaClickListener */,
+ bind(ConversationItemViewModel.forConversation(mAccount.getEmailAddress(), conversation),
+ activity, null /* conversationItemAreaClickListener */,
set, folder, checkboxOrSenderImage, swipeEnabled, importanceMarkersEnabled,
showChevronsEnabled, adapter, -1 /* backgroundOverrideResId */,
null /* photoBitmap */, false /* useFullMargins */, true /* mDividerEnabled */);
@@ -678,8 +679,7 @@
final boolean newlyBound = header.conversation.id != mHeader.conversation.id;
// If this was previously bound to a different conversation, remove any contact photo
// manager requests.
- if (newlyBound || (mHeader.displayableNames != null && !mHeader
- .displayableNames.equals(header.displayableNames))) {
+ if (newlyBound || (!mHeader.displayableNames.equals(header.displayableNames))) {
mSendersImageView.getContactDrawable().unbind();
}
@@ -949,18 +949,20 @@
.createMessageInfo(context, mHeader.conversation, true);
int maxChars = ConversationItemViewCoordinates.getSendersLength(context,
mCoordinates.getMode(), mHeader.conversation.hasAttachments);
- mHeader.displayableEmails = new ArrayList<String>();
- mHeader.displayableNames = new ArrayList<String>();
- mHeader.styledNames = new ArrayList<SpannableString>();
+
+ mHeader.mSenderAvatarModel.clear();
+ mHeader.displayableNames.clear();
+ mHeader.styledNames.clear();
SendersView.format(context, mHeader.conversation.conversationInfo,
mHeader.messageInfoString.toString(), maxChars, mHeader.styledNames,
- mHeader.displayableNames, mHeader.displayableEmails, mAccount,
- mDisplayedFolder.shouldShowRecipients(), true);
+ mHeader.displayableNames, mHeader.mSenderAvatarModel,
+ mAccount.getEmailAddress(), mDisplayedFolder.shouldShowRecipients(), true);
- if (mHeader.displayableEmails.isEmpty() && mHeader.hasDraftMessage) {
- mHeader.displayableEmails.add(mAccount);
- mHeader.displayableNames.add(mAccount);
+ if (mHeader.mSenderAvatarModel.isNotPopulated() && mHeader.hasDraftMessage) {
+ mHeader.mSenderAvatarModel.populate(mAccount.getDisplayName(),
+ mAccount.getEmailAddress());
+ mHeader.displayableNames.add(mAccount.getDisplayName());
}
// If we have displayable senders, load their thumbnails
@@ -994,8 +996,7 @@
// is immutable.
private void loadImages() {
if (mGadgetMode != ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO
- || mHeader.displayableEmails == null
- || mHeader.displayableEmails.isEmpty()) {
+ || mHeader.mSenderAvatarModel.isNotPopulated()) {
return;
}
if (mCoordinates.contactImagesWidth <= 0 || mCoordinates.contactImagesHeight <= 0) {
@@ -1013,7 +1014,8 @@
final ContactDrawable drawable = mSendersImageView.getContactDrawable();
drawable.setDecodeDimensions(mCoordinates.contactImagesWidth,
mCoordinates.contactImagesHeight);
- drawable.bind(mHeader.displayableNames.get(0), mHeader.displayableEmails.get(0));
+ drawable.bind(mHeader.mSenderAvatarModel.getName(),
+ mHeader.mSenderAvatarModel.getEmailAddress());
Utils.traceEndSection();
}
@@ -1424,7 +1426,7 @@
// Date.
sPaint.setTextSize(mCoordinates.dateFontSize);
- sPaint.setTypeface(isUnread ? Typeface.SANS_SERIF : SANS_SERIF_LIGHT);
+ sPaint.setTypeface(isUnread ? SANS_SERIF_BOLD : SANS_SERIF_LIGHT);
sPaint.setColor(isUnread ? sDateTextColorUnread : sDateTextColorRead);
drawText(canvas, mHeader.dateText, mDateX, mCoordinates.dateYBaseline, sPaint);
@@ -1933,7 +1935,7 @@
return sScrollSlop;
}
- public String getAccount() {
- return mAccount;
+ public String getAccountEmailAddress() {
+ return mAccount.getEmailAddress();
}
}
diff --git a/src/com/android/mail/browse/ConversationItemViewModel.java b/src/com/android/mail/browse/ConversationItemViewModel.java
index cc30d85..84cf59a 100644
--- a/src/com/android/mail/browse/ConversationItemViewModel.java
+++ b/src/com/android/mail/browse/ConversationItemViewModel.java
@@ -24,7 +24,6 @@
import android.text.StaticLayout;
import android.text.TextUtils;
import android.text.format.DateUtils;
-import android.text.style.CharacterStyle;
import android.util.LruCache;
import android.util.Pair;
@@ -119,21 +118,20 @@
private String mContentDescription;
/**
- * Email addresses corresponding to the senders/recipients that will be displayed on the top
- * line; used to generate the conversation icon.
+ * The email address and name of the sender whose avatar will be drawn as a conversation icon.
*/
- public ArrayList<String> displayableEmails;
+ public final SenderAvatarModel mSenderAvatarModel = new SenderAvatarModel();
/**
* Display names corresponding to the email address for the senders/recipients that will be
* displayed on the top line.
*/
- public ArrayList<String> displayableNames;
+ public final ArrayList<String> displayableNames = new ArrayList<>();
/**
* A styled version of the {@link #displayableNames} to be displayed on the top line.
*/
- public ArrayList<SpannableString> styledNames;
+ public final ArrayList<SpannableString> styledNames = new ArrayList<>();
/**
* Returns the view model for a conversation. If the model doesn't exist for this conversation
@@ -318,4 +316,45 @@
sConversationHeaderMap.evictAll();
}
}
+
+ /**
+ * This mutable model stores the name and email address of the sender for whom an avatar will
+ * be drawn as the conversation icon.
+ */
+ public static final class SenderAvatarModel {
+ private String mEmailAddress;
+ private String mName;
+
+ public String getEmailAddress() {
+ return mEmailAddress;
+ }
+
+ public String getName() {
+ return mName;
+ }
+
+ /**
+ * Removes the name and email address of the participant of this avatar.
+ */
+ public void clear() {
+ populate(null, null);
+ }
+
+ /**
+ * @param name the name of the participant of this avatar
+ * @param emailAddress the email address of the participant of this avatar
+ */
+ public void populate(String name, String emailAddress) {
+ mName = name;
+ mEmailAddress = emailAddress;
+ }
+
+ /**
+ * @return <tt>true</tt> if this model does not yet contain enough data to produce an
+ * avatar image; <tt>false</tt> otherwise
+ */
+ public boolean isNotPopulated() {
+ return mEmailAddress == null;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/com/android/mail/browse/SendersView.java b/src/com/android/mail/browse/SendersView.java
index 3f05ab5..734a59a 100644
--- a/src/com/android/mail/browse/SendersView.java
+++ b/src/com/android/mail/browse/SendersView.java
@@ -36,15 +36,19 @@
import com.android.mail.providers.ConversationInfo;
import com.android.mail.providers.ParticipantInfo;
import com.android.mail.providers.UIProvider;
-import com.android.mail.ui.DividedImageCanvas;
import com.android.mail.utils.ObjectCache;
import com.google.common.base.Objects;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
public class SendersView {
+ /** The maximum number of senders to display for a given conversation */
+ private static final int MAX_SENDER_COUNT = 4;
+
private static final Integer DOES_NOT_EXIST = -5;
// FIXME(ath): make all of these statics instance variables, and have callers hold onto this
// instance as long as appropriate (e.g. activity lifetime).
@@ -220,12 +224,13 @@
public static void format(Context context, ConversationInfo conversationInfo,
String messageInfo, int maxChars, ArrayList<SpannableString> styledSenders,
- ArrayList<String> displayableSenderNames, ArrayList<String> displayableSenderEmails,
+ ArrayList<String> displayableSenderNames,
+ ConversationItemViewModel.SenderAvatarModel senderAvatarModel,
String account, final boolean showToHeader, final boolean resourceCachingRequired) {
try {
getSenderResources(context, resourceCachingRequired);
format(context, conversationInfo, messageInfo, maxChars, styledSenders,
- displayableSenderNames, displayableSenderEmails, account,
+ displayableSenderNames, senderAvatarModel, account,
sUnreadStyleSpan, sReadStyleSpan, showToHeader, resourceCachingRequired);
} finally {
if (!resourceCachingRequired) {
@@ -236,14 +241,15 @@
public static void format(Context context, ConversationInfo conversationInfo,
String messageInfo, int maxChars, ArrayList<SpannableString> styledSenders,
- ArrayList<String> displayableSenderNames, ArrayList<String> displayableSenderEmails,
+ ArrayList<String> displayableSenderNames,
+ ConversationItemViewModel.SenderAvatarModel senderAvatarModel,
String account, final TextAppearanceSpan notificationUnreadStyleSpan,
final CharacterStyle notificationReadStyleSpan, final boolean showToHeader,
final boolean resourceCachingRequired) {
try {
getSenderResources(context, resourceCachingRequired);
handlePriority(maxChars, messageInfo, conversationInfo, styledSenders,
- displayableSenderNames, displayableSenderEmails, account,
+ displayableSenderNames, senderAvatarModel, account,
notificationUnreadStyleSpan, notificationReadStyleSpan, showToHeader);
} finally {
if (!resourceCachingRequired) {
@@ -254,10 +260,12 @@
private static void handlePriority(int maxChars, String messageInfoString,
ConversationInfo conversationInfo, ArrayList<SpannableString> styledSenders,
- ArrayList<String> displayableSenderNames, ArrayList<String> displayableSenderEmails,
+ ArrayList<String> displayableSenderNames,
+ ConversationItemViewModel.SenderAvatarModel senderAvatarModel,
String account, final TextAppearanceSpan unreadStyleSpan,
final CharacterStyle readStyleSpan, final boolean showToHeader) {
- boolean shouldAddPhotos = displayableSenderEmails != null;
+ final boolean shouldSelectSenders = displayableSenderNames != null;
+ final boolean shouldSelectAvatar = senderAvatarModel != null;
int maxPriorityToInclude = -1; // inclusive
int numCharsUsed = messageInfoString.length(); // draft, number drafts,
// count
@@ -297,18 +305,15 @@
} finally {
PRIORITY_LENGTH_MAP_CACHE.release(priorityToLength);
}
- // We want to include this entry if
- // 1) The onlyShowUnread flags is not set
- // 2) The above flag is set, and the message is unread
- ParticipantInfo currentParticipant;
+
SpannableString spannableDisplay;
- CharacterStyle style;
boolean appendedElided = false;
- Map<String, Integer> displayHash = Maps.newHashMap();
- String firstDisplayableSenderEmail = null;
- String firstDisplayableSender = null;
+ final Map<String, Integer> displayHash = Maps.newHashMap();
+ final List<String> senderEmails = Lists.newArrayListWithExpectedSize(MAX_SENDER_COUNT);
+ String firstSenderEmail = null;
+ String firstSenderName = null;
for (int i = 0; i < conversationInfo.participantInfos.size(); i++) {
- currentParticipant = conversationInfo.participantInfos.get(i);
+ final ParticipantInfo currentParticipant = conversationInfo.participantInfos.get(i);
final String currentEmail = currentParticipant.email;
final String currentName = currentParticipant.name;
@@ -323,8 +328,8 @@
}
final int priority = currentParticipant.priority;
- style = CharacterStyle.wrap(currentParticipant.readConversation ? readStyleSpan :
- unreadStyleSpan);
+ final CharacterStyle style = CharacterStyle.wrap(currentParticipant.readConversation ?
+ readStyleSpan : unreadStyleSpan);
if (priority <= maxPriorityToInclude) {
spannableDisplay = new SpannableString(sBidiFormatter.unicodeWrap(nameString));
// Don't duplicate senders; leave the first instance, unless the
@@ -340,8 +345,8 @@
&& oldPos < styledSenders.size()) {
// Remove the old one!
styledSenders.set(oldPos, null);
- if (shouldAddPhotos && !TextUtils.isEmpty(currentEmail)) {
- displayableSenderEmails.remove(currentEmail);
+ if (shouldSelectSenders && !TextUtils.isEmpty(currentEmail)) {
+ senderEmails.remove(currentEmail);
displayableSenderNames.remove(currentName);
}
}
@@ -357,38 +362,67 @@
styledSenders.add(spannableDisplay);
}
}
- if (shouldAddPhotos) {
- String senderEmail = TextUtils.isEmpty(currentName) ?
- account :
- TextUtils.isEmpty(currentEmail) ? currentName : currentEmail;
+
+ final String senderEmail = TextUtils.isEmpty(currentName) ? account :
+ TextUtils.isEmpty(currentEmail) ? currentName : currentEmail;
+
+ if (shouldSelectSenders) {
if (i == 0) {
// Always add the first sender!
- firstDisplayableSenderEmail = senderEmail;
- firstDisplayableSender = currentName;
+ firstSenderEmail = senderEmail;
+ firstSenderName = currentName;
} else {
- if (!Objects.equal(firstDisplayableSenderEmail, senderEmail)) {
- int indexOf = displayableSenderEmails.indexOf(senderEmail);
+ if (!Objects.equal(firstSenderEmail, senderEmail)) {
+ int indexOf = senderEmails.indexOf(senderEmail);
if (indexOf > -1) {
- displayableSenderEmails.remove(indexOf);
+ senderEmails.remove(indexOf);
displayableSenderNames.remove(indexOf);
}
- displayableSenderEmails.add(senderEmail);
+ senderEmails.add(senderEmail);
displayableSenderNames.add(currentName);
- if (displayableSenderEmails.size() > DividedImageCanvas.MAX_DIVISIONS) {
- displayableSenderEmails.remove(0);
+ if (senderEmails.size() > MAX_SENDER_COUNT) {
+ senderEmails.remove(0);
displayableSenderNames.remove(0);
}
}
}
}
+
+ // if the corresponding message from this participant is unread and no sender avatar
+ // is yet chosen, choose this one
+ if (shouldSelectAvatar && senderAvatarModel.isNotPopulated() &&
+ !currentParticipant.readConversation) {
+ senderAvatarModel.populate(currentName, senderEmail);
+ }
}
- if (shouldAddPhotos && !TextUtils.isEmpty(firstDisplayableSenderEmail)) {
- if (displayableSenderEmails.size() < DividedImageCanvas.MAX_DIVISIONS) {
- displayableSenderEmails.add(0, firstDisplayableSenderEmail);
- displayableSenderNames.add(0, firstDisplayableSender);
+
+ // always add the first sender to the display
+ if (shouldSelectSenders && !TextUtils.isEmpty(firstSenderEmail)) {
+ if (displayableSenderNames.size() < MAX_SENDER_COUNT) {
+ displayableSenderNames.add(0, firstSenderName);
} else {
- displayableSenderEmails.set(0, firstDisplayableSenderEmail);
- displayableSenderNames.set(0, firstDisplayableSender);
+ displayableSenderNames.set(0, firstSenderName);
+ }
+ }
+
+ // if all messages in the thread were read, we must search for an appropriate avatar
+ if (shouldSelectAvatar && senderAvatarModel.isNotPopulated() &&
+ !conversationInfo.participantInfos.isEmpty()) {
+
+ // search for the last sender that is not the current account
+ for (int i = conversationInfo.participantInfos.size() - 1; i >= 0; i--) {
+ final ParticipantInfo participant = conversationInfo.participantInfos.get(i);
+ if (!TextUtils.isEmpty(participant.name)) {
+ senderAvatarModel.populate(participant.name, participant.email);
+ break;
+ }
+ }
+
+ // if we still don't have an avatar, the account is emailing itself; use the last sender
+ if (senderAvatarModel.isNotPopulated()) {
+ final int lastIndex = conversationInfo.participantInfos.size() - 1;
+ final ParticipantInfo lastSender = conversationInfo.participantInfos.get(lastIndex);
+ senderAvatarModel.populate(lastSender.name, lastSender.email);
}
}
}
diff --git a/src/com/android/mail/browse/SwipeableConversationItemView.java b/src/com/android/mail/browse/SwipeableConversationItemView.java
index a08c028..866653a 100644
--- a/src/com/android/mail/browse/SwipeableConversationItemView.java
+++ b/src/com/android/mail/browse/SwipeableConversationItemView.java
@@ -23,6 +23,7 @@
import android.widget.FrameLayout;
import android.widget.ListView;
+import com.android.mail.providers.Account;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
import com.android.mail.providers.UIProvider;
@@ -34,7 +35,7 @@
private final ConversationItemView mConversationItemView;
- public SwipeableConversationItemView(Context context, String account) {
+ public SwipeableConversationItemView(Context context, Account account) {
super(context);
mConversationItemView = new ConversationItemView(context, account);
addView(mConversationItemView);
diff --git a/src/com/android/mail/compose/AttachmentComposeView.java b/src/com/android/mail/compose/AttachmentComposeView.java
index 2c4198c..89216e1 100644
--- a/src/com/android/mail/compose/AttachmentComposeView.java
+++ b/src/com/android/mail/compose/AttachmentComposeView.java
@@ -60,8 +60,10 @@
@Override
public void addDeleteListener(OnClickListener clickListener) {
- ImageButton deleteButton = (ImageButton) findViewById(R.id.remove_attachment);
+ final ImageButton deleteButton = (ImageButton) findViewById(R.id.remove_attachment);
deleteButton.setOnClickListener(clickListener);
+ deleteButton.setContentDescription(getResources().getString(R.string.remove_attachment_desc,
+ mAttachment.getName()));
}
private void populateAttachmentData(Context context) {
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 46855d5..ef0355d 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -51,6 +51,7 @@
import android.support.v4.app.RemoteInput;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
+import android.support.v7.view.ActionMode;
import android.text.Editable;
import android.text.Html;
import android.text.SpanWatcher;
@@ -69,6 +70,7 @@
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
+import android.view.Window;
import android.view.inputmethod.BaseInputConnection;
import android.view.inputmethod.EditorInfo;
import android.widget.ArrayAdapter;
@@ -2359,7 +2361,7 @@
: (Intent.ACTION_SEND.equals(action)
|| Intent.ACTION_SEND_MULTIPLE.equals(action)
|| Intent.ACTION_SENDTO.equals(action)
- || shouldSave()));
+ || isDraftDirty()));
final MenuItem helpItem = menu.findItem(R.id.help_info_menu_item);
final MenuItem sendFeedbackItem = menu.findItem(R.id.feedback_menu_item);
@@ -2823,14 +2825,14 @@
*/
public void updateSaveUi() {
if (mSave != null) {
- mSave.setEnabled((shouldSave() && !isBlank()));
+ mSave.setEnabled((isDraftDirty() && !isBlank()));
}
}
/**
- * Returns true if we need to save the current draft.
+ * Returns true if the current draft is modified from the version we previously saved.
*/
- private boolean shouldSave() {
+ private boolean isDraftDirty() {
synchronized (mDraftLock) {
// The message should only be saved if:
// It hasn't been sent AND
@@ -3669,9 +3671,15 @@
}
private void doDiscard() {
- final DialogFragment frag = new DiscardConfirmDialogFragment();
- frag.show(getFragmentManager(), "discard confirm");
+ // Only need to ask for confirmation if the draft is in a dirty state.
+ if (isDraftDirty()) {
+ final DialogFragment frag = new DiscardConfirmDialogFragment();
+ frag.show(getFragmentManager(), "discard confirm");
+ } else {
+ doDiscardWithoutConfirmation();
+ }
}
+
/**
* Effectively discard the current message.
*
@@ -3713,7 +3721,7 @@
return;
}
- if (shouldSave()) {
+ if (isDraftDirty()) {
doSave(!mAddingAttachment /* show toast */);
}
}
@@ -3969,4 +3977,30 @@
mBodyView.addTextChangedListener(ComposeActivity.this);
}
}
+
+ @SuppressLint("NewApi")
+ @Override
+ public void onSupportActionModeStarted(ActionMode mode) {
+ super.onSupportActionModeStarted(mode);
+ if (Utils.isRunningLOrLater()) {
+ final Window window = getWindow();
+ if (window != null) {
+ window.setStatusBarColor(
+ getResources().getColor(R.color.action_mode_statusbar_color));
+ }
+ }
+ }
+
+ @SuppressLint("NewApi")
+ @Override
+ public void onSupportActionModeFinished(ActionMode mode) {
+ super.onSupportActionModeFinished(mode);
+ if (Utils.isRunningLOrLater()) {
+ final Window window = getWindow();
+ if (window != null) {
+ window.setStatusBarColor(
+ getResources().getColor(R.color.statusbar_color));
+ }
+ }
+ }
}
diff --git a/src/com/android/mail/compose/FromAddressSpinnerAdapter.java b/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
index a719c10..0d6804d 100644
--- a/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
+++ b/src/com/android/mail/compose/FromAddressSpinnerAdapter.java
@@ -36,16 +36,8 @@
* @author mindyp@google.com
*/
public class FromAddressSpinnerAdapter extends ArrayAdapter<ReplyFromAccount> {
- private static final int FROM = 0;
- private static final int CUSTOM_FROM = 1;
private static String sFormatString;
- public static int REAL_ACCOUNT = 2;
-
- public static int ACCOUNT_DISPLAY = 0;
-
- public static int ACCOUNT_ADDRESS = 1;
-
private LayoutInflater mInflater;
public FromAddressSpinnerAdapter(Context context) {
@@ -62,27 +54,19 @@
}
@Override
- public int getViewTypeCount() {
- // FROM and CUSTOM_FROM
- return 2;
- }
-
- @Override
- public int getItemViewType(int pos) {
- return getItem(pos).isCustomFrom ? CUSTOM_FROM : FROM;
- }
-
- @Override
public View getView(int position, View convertView, ViewGroup parent) {
- ReplyFromAccount fromItem = getItem(position);
- int res = fromItem.isCustomFrom ? R.layout.custom_from_item : R.layout.from_item;
- View fromEntry = convertView == null ? getInflater().inflate(res, null) : convertView;
+ final ReplyFromAccount fromItem = getItem(position);
+ final View fromEntry = convertView == null ?
+ getInflater().inflate(R.layout.from_item, null) : convertView;
+ final TextView nameView = (TextView) fromEntry.findViewById(R.id.spinner_account_name);
if (fromItem.isCustomFrom) {
- ((TextView) fromEntry.findViewById(R.id.spinner_account_name)).setText(fromItem.name);
+ nameView.setText(fromItem.name);
+ nameView.setVisibility(View.VISIBLE);
((TextView) fromEntry.findViewById(R.id.spinner_account_address))
.setText(formatAddress(fromItem.address));
} else {
+ nameView.setVisibility(View.GONE);
((TextView) fromEntry.findViewById(R.id.spinner_account_address))
.setText(fromItem.address);
}
@@ -91,10 +75,10 @@
@Override
public View getDropDownView(int position, View convertView, ViewGroup parent) {
- ReplyFromAccount fromItem = getItem(position);
- int res = fromItem.isCustomFrom ? R.layout.custom_from_dropdown_item
+ final ReplyFromAccount fromItem = getItem(position);
+ final int res = fromItem.isCustomFrom ? R.layout.custom_from_dropdown_item
: R.layout.from_dropdown_item;
- View fromEntry = getInflater().inflate(res, null);
+ final View fromEntry = getInflater().inflate(res, null);
if (fromItem.isCustomFrom) {
((TextView) fromEntry.findViewById(R.id.spinner_account_name)).setText(fromItem.name);
((TextView) fromEntry.findViewById(R.id.spinner_account_address))
diff --git a/src/com/android/mail/photo/ContactPhotoFetcher.java b/src/com/android/mail/photo/ContactFetcher.java
similarity index 80%
rename from src/com/android/mail/photo/ContactPhotoFetcher.java
rename to src/com/android/mail/photo/ContactFetcher.java
index 2bb03ca..b571251 100644
--- a/src/com/android/mail/photo/ContactPhotoFetcher.java
+++ b/src/com/android/mail/photo/ContactFetcher.java
@@ -17,12 +17,19 @@
package com.android.mail.photo;
import android.content.Context;
+import android.net.Uri;
import com.android.mail.utils.NotificationUtils;
-public interface ContactPhotoFetcher {
+/**
+ * Interface for retrieving contact details for senders (given an account name).
+ */
+public interface ContactFetcher {
+
NotificationUtils.ContactIconInfo getContactPhoto(
Context context, String accountName, String senderAddress,
int idealIconWidth, int idealIconHeight,
int idealWearableBgWidth, int idealWearableBgHeight);
+
+ public Uri getContactLookupUri(Context context, String accountName, String senderAddress);
}
diff --git a/src/com/android/mail/providers/Account.java b/src/com/android/mail/providers/Account.java
index 9a389f9..5a53225 100644
--- a/src/com/android/mail/providers/Account.java
+++ b/src/com/android/mail/providers/Account.java
@@ -233,6 +233,16 @@
public final String settingsFragmentClass;
/**
+ * Nonzero value indicates that this account is on a security hold.
+ */
+ public final int securityHold;
+
+ /**
+ * Uri to launch the account security activity.
+ */
+ public final String accountSecurityUri;
+
+ /**
* Transient cache of parsed {@link #accountFromAddresses}, plus an entry for the main account
* address.
*/
@@ -285,6 +295,8 @@
json.put(AccountColumns.SYNC_AUTHORITY, syncAuthority);
json.put(AccountColumns.QUICK_RESPONSE_URI, quickResponseUri);
json.put(AccountColumns.SETTINGS_FRAGMENT_CLASS, settingsFragmentClass);
+ json.put(AccountColumns.SECURITY_HOLD, securityHold);
+ json.put(AccountColumns.ACCOUNT_SECURITY_URI, accountSecurityUri);
if (settings != null) {
json.put(SETTINGS_KEY, settings.toJSON());
}
@@ -417,6 +429,8 @@
syncAuthority = json.optString(AccountColumns.SYNC_AUTHORITY);
quickResponseUri = Utils.getValidUri(json.optString(AccountColumns.QUICK_RESPONSE_URI));
settingsFragmentClass = json.optString(AccountColumns.SETTINGS_FRAGMENT_CLASS, "");
+ securityHold = json.optInt(AccountColumns.SECURITY_HOLD);
+ accountSecurityUri = json.optString(AccountColumns.ACCOUNT_SECURITY_URI);
final Settings jsonSettings = Settings.newInstance(json.optJSONObject(SETTINGS_KEY));
if (jsonSettings != null) {
@@ -499,6 +513,13 @@
cursor.getColumnIndex(AccountColumns.QUICK_RESPONSE_URI)));
settingsFragmentClass = cursor.getString(cursor.getColumnIndex(
AccountColumns.SETTINGS_FRAGMENT_CLASS));
+ final int securityHoldIndex = cursor.getColumnIndex(AccountColumns.SECURITY_HOLD);
+ securityHold = (securityHoldIndex >= 0 ?
+ cursor.getInt(cursor.getColumnIndex(AccountColumns.SECURITY_HOLD)) : 0);
+ final int accountSecurityIndex =
+ cursor.getColumnIndex(AccountColumns.ACCOUNT_SECURITY_URI);
+ accountSecurityUri = (accountSecurityIndex >= 0 ?
+ cursor.getString(accountSecurityIndex) : "");
settings = new Settings(cursor);
}
@@ -608,6 +629,8 @@
}
quickResponseUri = in.readParcelable(null);
settingsFragmentClass = in.readString();
+ securityHold = in.readInt();
+ accountSecurityUri = in.readString();
final int hasSettings = in.readInt();
if (hasSettings == 0) {
LogUtils.e(LOG_TAG, new Throwable(), "Unexpected null settings in Account(Parcel)");
@@ -652,6 +675,8 @@
dest.writeString(syncAuthority);
dest.writeParcelable(quickResponseUri, 0);
dest.writeString(settingsFragmentClass);
+ dest.writeInt(securityHold);
+ dest.writeString(accountSecurityUri);
if (settings == null) {
LogUtils.e(LOG_TAG, "unexpected null settings object in writeToParcel");
dest.writeInt(0);
@@ -716,6 +741,8 @@
Objects.equal(syncAuthority, other.syncAuthority) &&
Objects.equal(quickResponseUri, other.quickResponseUri) &&
Objects.equal(settingsFragmentClass, other.settingsFragmentClass) &&
+ Objects.equal(securityHold, other.securityHold) &&
+ Objects.equal(accountSecurityUri, other.accountSecurityUri) &&
Objects.equal(settings, other.settings);
}
@@ -768,7 +795,9 @@
updateSettingsUri,
enableMessageTransforms,
syncAuthority,
- quickResponseUri);
+ quickResponseUri,
+ securityHold,
+ accountSecurityUri);
}
/**
@@ -930,6 +959,8 @@
map.put(AccountColumns.SYNC_AUTHORITY, syncAuthority);
map.put(AccountColumns.QUICK_RESPONSE_URI, quickResponseUri);
map.put(AccountColumns.SETTINGS_FRAGMENT_CLASS, settingsFragmentClass);
+ map.put(AccountColumns.SECURITY_HOLD, securityHold);
+ map.put(AccountColumns.ACCOUNT_SECURITY_URI, accountSecurityUri);
settings.getValueMap(map);
return map;
diff --git a/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java b/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java
index 05667c7..e3f8809 100644
--- a/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java
+++ b/src/com/android/mail/providers/SearchRecentSuggestionsProvider.java
@@ -24,11 +24,8 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
-import android.os.SystemClock;
-import android.text.TextUtils;
import com.android.mail.R;
-import com.android.mail.utils.LogUtils;
import java.util.ArrayList;
@@ -40,9 +37,17 @@
// general database configuration and tables
private SQLiteOpenHelper mOpenHelper;
- private static final String sDatabaseName = "suggestions.db";
- private static final String sSuggestions = "suggestions";
- private static final String ORDER_BY = "date DESC";
+ private static final String DATABASE_NAME = "suggestions.db";
+ private static final String SUGGESTIONS_TABLE = "suggestions";
+
+ private static final String QUERY =
+ " SELECT _id" +
+ " , display1 AS " + SearchManager.SUGGEST_COLUMN_TEXT_1 +
+ " , ? || query AS " + SearchManager.SUGGEST_COLUMN_QUERY +
+ " , ? AS " + SearchManager.SUGGEST_COLUMN_ICON_1 +
+ " FROM " + SUGGESTIONS_TABLE +
+ " WHERE display1 LIKE ?" +
+ " ORDER BY date DESC";
// Table of database versions. Don't forget to update!
// NOTE: These version values are shifted left 8 bits (x 256) in order to create space for
@@ -56,14 +61,18 @@
private static final int DATABASE_VERSION_2 = 2 * 256;
private static final int DATABASE_VERSION_3 = 3 * 256;
- private String mSuggestSuggestionClause;
- private String[] mSuggestionProjection;
+ private String mHistoricalIcon;
protected final Context mContext;
+ private ArrayList<String> mFullQueryTerms;
public SearchRecentSuggestionsProvider(Context context) {
mContext = context;
mOpenHelper = new DatabaseHelper(mContext, DATABASE_VERSION);
+
+ // The URI of the icon that we will include on every suggestion here.
+ mHistoricalIcon = ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
+ + mContext.getPackageName() + "/" + R.drawable.ic_history_24dp;
}
public void cleanup() {
@@ -79,19 +88,18 @@
*/
private static class DatabaseHelper extends SQLiteOpenHelper {
public DatabaseHelper(Context context, int newVersion) {
- super(context, sDatabaseName, null, newVersion);
+ super(context, DATABASE_NAME, null, newVersion);
}
@Override
public void onCreate(SQLiteDatabase db) {
- StringBuilder builder = new StringBuilder();
- builder.append("CREATE TABLE suggestions (" +
+ final String create = "CREATE TABLE suggestions (" +
"_id INTEGER PRIMARY KEY" +
",display1 TEXT UNIQUE ON CONFLICT REPLACE" +
",query TEXT" +
",date LONG" +
- ");");
- db.execSQL(builder.toString());
+ ");";
+ db.execSQL(create);
}
@Override
@@ -109,56 +117,6 @@
}
/**
- * In order to use this class, you must extend it, and call this setup function from your
- * constructor. In your application or activities, you must provide the same values when
- * you create the {@link android.provider.SearchRecentSuggestions} helper.
- */
- protected void setupSuggestions() {
- // The URI of the icon that we will include on every suggestion here.
- final String historicalIcon = ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
- + mContext.getPackageName() + "/" + R.drawable.ic_history_24dp;
-
- mSuggestSuggestionClause = "display1 LIKE ?";
- mSuggestionProjection = new String [] {
- "_id",
- "display1 AS " + SearchManager.SUGGEST_COLUMN_TEXT_1,
- "query AS " + SearchManager.SUGGEST_COLUMN_QUERY,
- "'" + historicalIcon + "' AS " + SearchManager.SUGGEST_COLUMN_ICON_1
- };
- }
-
- private ArrayList<String> mFullQueryTerms;
-
- /**
- * Copy the projection, and change the query field alone.
- * @param selectionArgs
- * @return projection
- */
- private String[] createProjection(String[] selectionArgs) {
- String[] newProjection = new String[mSuggestionProjection.length];
- String queryAs;
- int fullSize = (mFullQueryTerms != null) ? mFullQueryTerms.size() : 0;
- if (fullSize > 0) {
- String realQuery = "'";
- for (int i = 0; i < fullSize; i++) {
- realQuery+= mFullQueryTerms.get(i);
- if (i < fullSize -1) {
- realQuery += QUERY_TOKEN_SEPARATOR;
- }
- }
- queryAs = realQuery + " ' || query AS " + SearchManager.SUGGEST_COLUMN_QUERY;
- } else {
- queryAs = "query AS " + SearchManager.SUGGEST_COLUMN_QUERY;
- }
- for (int i = 0; i < mSuggestionProjection.length; i++) {
- newProjection[i] = mSuggestionProjection[i];
- }
- // Assumes that newProjection[length-2] is the query field.
- newProjection[mSuggestionProjection.length - 2] = queryAs;
- return newProjection;
- }
-
- /**
* Set the other query terms to be included in the user's query.
* These are in addition to what is being looked up for suggestions.
* @param terms
@@ -167,26 +125,19 @@
mFullQueryTerms = terms;
}
- // TODO: Confirm no injection attacks here, or rewrite.
- public Cursor query(String[] projection, String selection, String[] selectionArgs,
- String sortOrder) {
+ public Cursor query(String query) {
SQLiteDatabase db = mOpenHelper.getReadableDatabase();
- // special case for actual suggestions (from search manager)
- String suggestSelection;
- String[] myArgs;
- if (TextUtils.isEmpty(selectionArgs[0])) {
- suggestSelection = null;
- myArgs = null;
- } else {
- String like = "%" + selectionArgs[0] + "%";
- myArgs = new String[] { like };
- suggestSelection = mSuggestSuggestionClause;
+ final StringBuilder builder = new StringBuilder();
+ if (mFullQueryTerms != null) {
+ for (String token : mFullQueryTerms) {
+ builder.append(token).append(QUERY_TOKEN_SEPARATOR);
+ }
}
- // Suggestions are always performed with the default sort order
- Cursor c = db.query(sSuggestions, createProjection(selectionArgs), suggestSelection, myArgs,
- null, null, ORDER_BY, null);
- return c;
+
+ final String[] args = new String[] {builder.toString(), mHistoricalIcon, "%" + query + "%"};
+
+ return db.rawQuery(QUERY, args);
}
/**
@@ -200,11 +151,11 @@
values.put("query", query);
values.put("date", System.currentTimeMillis());
// Note: This table has on-conflict-replace semantics, so insert() may actually replace()
- db.insert(sSuggestions, null, values);
+ db.insert(SUGGESTIONS_TABLE, null, values);
}
public void clearHistory() {
SQLiteDatabase db = mOpenHelper.getReadableDatabase();
- db.delete(sSuggestions, null, null);
+ db.delete(SUGGESTIONS_TABLE, null, null);
}
}
\ No newline at end of file
diff --git a/src/com/android/mail/providers/SuggestionsProvider.java b/src/com/android/mail/providers/SuggestionsProvider.java
index 07ffe6e..f7468df 100644
--- a/src/com/android/mail/providers/SuggestionsProvider.java
+++ b/src/com/android/mail/providers/SuggestionsProvider.java
@@ -60,13 +60,10 @@
public SuggestionsProvider(Context context) {
super(context);
- setupSuggestions();
}
@Override
- public Cursor query(String[] projection, String selection, String[] selectionArgs,
- String sortOrder) {
- String query = selectionArgs[0];
+ public Cursor query(String query) {
MergeCursor mergeCursor = null;
synchronized (mTermsLock) {
@@ -96,7 +93,7 @@
ArrayList<Cursor> cursors = new ArrayList<Cursor>();
// Pass query; at this point it is either the last term OR the
// only term.
- cursors.add(super.query(projection, selection, new String[] { query }, sortOrder));
+ cursors.add(super.query(query));
if (query.length() >= MIN_QUERY_LENGTH_FOR_CONTACTS) {
cursors.add(new ContactsCursor().query(query));
@@ -154,8 +151,8 @@
final StringBuilder query = new StringBuilder();
if (mFullQueryTerms != null) {
synchronized (mTermsLock) {
- for (int i = 0, size = mFullQueryTerms.size(); i < size; i++) {
- query.append(mFullQueryTerms.get(i)).append(QUERY_TOKEN_SEPARATOR);
+ for (String token : mFullQueryTerms) {
+ query.append(token).append(QUERY_TOKEN_SEPARATOR);
}
}
}
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index b618804..ff021f8 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -199,6 +199,8 @@
.put(AccountColumns.SettingsColumns.MOVE_TO_INBOX, String.class)
.put(AccountColumns.SettingsColumns.SHOW_IMAGES, Integer.class)
.put(AccountColumns.SettingsColumns.WELCOME_TOUR_SHOWN_VERSION, Integer.class)
+ .put(AccountColumns.SECURITY_HOLD, Integer.class)
+ .put(AccountColumns.ACCOUNT_SECURITY_URI, String.class)
.build();
public static final Map<String, Class<?>> ACCOUNTS_COLUMNS =
@@ -527,6 +529,14 @@
* Fragment class name for account settings
*/
public static final String SETTINGS_FRAGMENT_CLASS = "settingsFragmentClass";
+ /**
+ * Whether this account is on a security hold
+ */
+ public static final String SECURITY_HOLD = "securityHold";
+ /**
+ * Uri to access the account security activity.
+ */
+ public static final String ACCOUNT_SECURITY_URI = "accountSecurityUri";
public static final class SettingsColumns {
/**
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index dce5949..431b06c 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -50,6 +50,7 @@
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarDrawerToggle;
+import android.text.TextUtils;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.Menu;
@@ -449,6 +450,9 @@
* or account */
private static final int CHANGE_NAVIGATION_REQUEST_CODE = 3;
+ /** Code returned from voice search intent */
+ public static final int VOICE_SEARCH_REQUEST_CODE = 4;
+
public static final String EXTRA_FOLDER = "extra-folder";
public static final String EXTRA_ACCOUNT = "extra-account";
@@ -1129,7 +1133,7 @@
}
}
break;
- case MaterialSearchViewController.VOICE_SEARCH_REQUEST_CODE:
+ case VOICE_SEARCH_REQUEST_CODE:
if (resultCode == Activity.RESULT_OK) {
final ArrayList<String> matches = data.getStringArrayListExtra(
RecognizerIntent.EXTRA_RESULTS);
@@ -1158,6 +1162,8 @@
@Override
public void onConversationListVisibilityChanged(boolean visible) {
+ mFloatingComposeButton.setVisibility(visible ? View.VISIBLE : View.GONE);
+
informCursorVisiblity(visible);
commitAutoAdvanceOperation();
@@ -1981,6 +1987,17 @@
// is seeing the "your mail will appear shortly" message)
return;
}
+
+ // TODO: remove me after experiment b/17508768
+ final String id = android.provider.Settings.Secure.getString(
+ mActivity.getContentResolver(), android.provider.Settings.Secure.ANDROID_ID);
+ if (!TextUtils.isEmpty(id)) {
+ final long longId = Long.parseLong(
+ Character.toString(id.charAt(id.length() - 1)), 16 /* hex */);
+ Analytics.getInstance().sendEvent("battery_experiment", "refresh",
+ longId % 2 == 0 ? "even" : "odd", 1);
+ }
+
convList.showSyncStatusBar();
if (mAsyncRefreshTask != null) {
@@ -2193,23 +2210,12 @@
protected abstract void resetActionBarIcon();
/**
- * When should the compose button be visible
- */
- protected boolean isComposeVisible(int mode) {
- return mode == ViewMode.CONVERSATION_LIST;
- }
-
- /**
* {@inheritDoc} Subclasses must override this to listen to mode changes
* from the ViewMode. Subclasses <b>must</b> call the parent's
* onViewModeChanged since the parent will handle common state changes.
*/
@Override
public void onViewModeChanged(int newMode) {
- // The floating action compose button is only visible in the conversation/search lists
- final int composeVisible = isComposeVisible(newMode) ? View.VISIBLE : View.GONE;
- mFloatingComposeButton.setVisibility(composeVisible);
-
// When we step away from the conversation mode, we don't have a current conversation
// anymore. Let's blank it out so clients calling getCurrentConversation are not misled.
if (!ViewMode.isConversationMode(newMode)) {
@@ -2761,7 +2767,7 @@
// 1. current account is already set and is in allAccounts:
// 1a. It has changed -> load the updated account.
- // 2b. It is unchanged -> no-op
+ // 1b. It is unchanged -> no-op
// 2. current account is set and is not in allAccounts -> pick first (acct was deleted?)
// 3. saved preference has an account -> pick that one
// 4. otherwise just pick first
@@ -3606,7 +3612,6 @@
mAccountObservers.notifyChanged();
}
perhapsEnterWaitMode();
- perhapsStartWelcomeTour();
} else {
LogUtils.e(LOG_TAG, "Got update for account: %s with current account:"
+ " %s", updatedAccount.uri, mAccount.uri);
@@ -3626,39 +3631,6 @@
}
/**
- * Loads the preference that tells whether the welcome tour should be displayed,
- * and calls the callback with this value.
- * For this to function, the account must have been synced.
- */
- private void perhapsStartWelcomeTour() {
- new AsyncTask<Void, Void, Boolean>() {
- @Override
- protected Boolean doInBackground(Void... params) {
- if (mActivity.wasLatestWelcomeTourShownOnDeviceForAllAccounts()) {
- // No need to go through the WelcomeStateLoader machinery.
- return false;
- }
- return true;
- }
-
- @Override
- protected void onPostExecute(Boolean result) {
- if (result) {
- if (mAccount != null && mAccount.isAccountReady()) {
- LoaderManager.LoaderCallbacks<?> welcomeLoaderCallbacks =
- mActivity.getWelcomeCallbacks();
- if (welcomeLoaderCallbacks != null) {
- // The callback is responsible for showing the tour when appropriate.
- mActivity.getLoaderManager().initLoader(LOADER_WELCOME_TOUR_ACCOUNTS,
- Bundle.EMPTY, welcomeLoaderCallbacks);
- }
- }
- }
- }
- }.execute();
- }
-
- /**
* Updates controller state based on search results and shows first conversation if required.
*/
private void perhapsShowFirstSearchResult() {
diff --git a/src/com/android/mail/ui/AbstractConversationViewFragment.java b/src/com/android/mail/ui/AbstractConversationViewFragment.java
index f2122f1..bf2e998 100644
--- a/src/com/android/mail/ui/AbstractConversationViewFragment.java
+++ b/src/com/android/mail/ui/AbstractConversationViewFragment.java
@@ -26,6 +26,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
+import android.support.annotation.Nullable;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
@@ -278,7 +279,7 @@
}
@Override
- public MessageCursor getMessageCursor() {
+ public @Nullable MessageCursor getMessageCursor() {
return mCursor;
}
diff --git a/src/com/android/mail/ui/AccountLoadCallbacks.java b/src/com/android/mail/ui/AccountLoadCallbacks.java
index 323cbfe..f8a3e50 100644
--- a/src/com/android/mail/ui/AccountLoadCallbacks.java
+++ b/src/com/android/mail/ui/AccountLoadCallbacks.java
@@ -38,8 +38,7 @@
public Loader<ObjectCursor<Account>> onCreateLoader(int id, Bundle args) {
final String[] projection = UIProvider.ACCOUNTS_PROJECTION;
final CursorCreator<Account> factory = Account.FACTORY;
- return new ObjectCursorLoader<Account>(
- mContext, mAccountUri, projection, factory);
+ return new ObjectCursorLoader<Account>(mContext, mAccountUri, projection, factory);
}
@Override
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 30aa36c..b2fec88 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -371,7 +371,7 @@
public View createConversationItemView(SwipeableConversationItemView view, Context context,
Conversation conv) {
if (view == null) {
- view = new SwipeableConversationItemView(context, mAccount.getEmailAddress());
+ view = new SwipeableConversationItemView(context, mAccount);
}
view.bind(conv, mActivity, mBatchConversations, mFolder, getCheckboxSetting(),
mSwipeEnabled, mImportanceMarkersEnabled, mShowChevronsEnabled, this);
@@ -764,7 +764,7 @@
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
- return new SwipeableConversationItemView(context, mAccount.getEmailAddress());
+ return new SwipeableConversationItemView(context, mAccount);
}
@Override
diff --git a/src/com/android/mail/ui/AttachmentTile.java b/src/com/android/mail/ui/AttachmentTile.java
index 3fc8dc5..da1a4b9 100644
--- a/src/com/android/mail/ui/AttachmentTile.java
+++ b/src/com/android/mail/ui/AttachmentTile.java
@@ -94,7 +94,7 @@
protected void onLayout(boolean changed, int l, int t, int r, int b) {
super.onLayout(changed, l, t, r, b);
- ThumbnailLoadTask.setupThumbnailPreview(this, mAttachment, null);
+ ThumbnailLoadTask.setupThumbnailPreview(mAttachmentPreviewCache, this, mAttachment, null);
}
public Attachment getAttachment() {
@@ -136,7 +136,8 @@
updateSubtitleText();
}
- ThumbnailLoadTask.setupThumbnailPreview(this, attachment, prevAttachment);
+ ThumbnailLoadTask.setupThumbnailPreview(mAttachmentPreviewCache, this, attachment,
+ prevAttachment);
}
private void updateSubtitleText() {
@@ -153,7 +154,7 @@
@Override
public void setThumbnailToDefault() {
- Bitmap cachedPreview = mAttachmentPreviewCache.get(mAttachment);
+ final Bitmap cachedPreview = mAttachmentPreviewCache.get(mAttachment);
if (cachedPreview != null) {
setThumbnail(cachedPreview);
return;
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index bf6895c..4e2c818 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -21,8 +21,10 @@
import android.app.Activity;
import android.app.Fragment;
import android.app.LoaderManager;
+import android.content.Intent;
import android.content.res.Resources;
import android.database.DataSetObserver;
+import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Parcelable;
@@ -78,7 +80,7 @@
*/
public final class ConversationListFragment extends Fragment implements
OnItemLongClickListener, ModeChangeListener, ListItemSwipedListener, OnRefreshListener,
- SwipeListener, OnKeyListener, AdapterView.OnItemClickListener {
+ SwipeListener, OnKeyListener, AdapterView.OnItemClickListener, View.OnClickListener {
/** Key used to pass data to {@link ConversationListFragment}. */
private static final String CONVERSATION_LIST_KEY = "conversation-list";
/** Key used to keep track of the scroll state of the list. */
@@ -135,6 +137,9 @@
private ConversationListFooterView mFooterView;
private ConversationListEmptyView mEmptyView;
+ private View mSecurityHoldView;
+ private TextView mSecurityHoldText;
+ private View mSecurityHoldButton;
private View mLoadingView;
private ErrorListener mErrorListener;
private FolderObserver mFolderObserver;
@@ -170,6 +175,15 @@
mListView.setVisibility(View.VISIBLE);
mEmptyView.setVisibility(View.INVISIBLE);
mLoadingView.setVisibility(View.INVISIBLE);
+ mSecurityHoldView.setVisibility(View.INVISIBLE);
+ }
+
+ private void showSecurityHoldView() {
+ mListView.setVisibility(View.INVISIBLE);
+ mEmptyView.setVisibility(View.INVISIBLE);
+ mLoadingView.setVisibility(View.INVISIBLE);
+ setupSecurityHoldView();
+ mSecurityHoldView.setVisibility(View.VISIBLE);
}
private void showEmptyView() {
@@ -178,12 +192,19 @@
mListView.setVisibility(View.INVISIBLE);
mEmptyView.setVisibility(View.VISIBLE);
mLoadingView.setVisibility(View.INVISIBLE);
+ mSecurityHoldView.setVisibility(View.INVISIBLE);
}
private void showLoadingView() {
mListView.setVisibility(View.INVISIBLE);
mEmptyView.setVisibility(View.INVISIBLE);
mLoadingView.setVisibility(View.VISIBLE);
+ mSecurityHoldView.setVisibility(View.INVISIBLE);
+ }
+
+ private void setupSecurityHoldView() {
+ mSecurityHoldText.setText(getString(R.string.security_hold_required_text,
+ mAccount.getDisplayName()));
}
private final Runnable mLoadingViewRunnable = new FragmentRunnable("LoadingRunnable", this) {
@@ -457,6 +478,10 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
View rootView = inflater.inflate(R.layout.conversation_list, null);
mEmptyView = (ConversationListEmptyView) rootView.findViewById(R.id.empty_view);
+ mSecurityHoldView = rootView.findViewById(R.id.security_hold_view);
+ mSecurityHoldText = (TextView)rootView.findViewById(R.id.security_hold_text);
+ mSecurityHoldButton = rootView.findViewById(R.id.security_hold_button);
+ mSecurityHoldButton.setOnClickListener(this);
mLoadingView = rootView.findViewById(R.id.background_view);
mLoadingView.setVisibility(View.GONE);
mLoadingView.findViewById(R.id.loading_progress).setVisibility(View.VISIBLE);
@@ -746,10 +771,10 @@
return isScrolling;
}
- private void clearChoicesAndActivated() {
+ protected void clearChoicesAndActivated() {
final int currentChecked = mListView.getCheckedItemPosition();
if (currentChecked != ListView.INVALID_POSITION) {
- mListView.setItemChecked(mListView.getCheckedItemPosition(), false);
+ mListView.setItemChecked(currentChecked, false);
}
}
@@ -822,19 +847,9 @@
}
final int position = cursorPosition + mListAdapter.getPositionOffset(cursorPosition);
-
setRawActivated(position, different);
}
- public void clearActivated() {
- if (mListView.getChoiceMode() == ListView.CHOICE_MODE_SINGLE) {
- final int pos = mListView.getCheckedItemPosition();
- if (pos >= 0) {
- mListView.setItemChecked(pos, false);
- }
- }
- }
-
/**
* Sets the activated conversation to the position given here.
* @param position The position of the item in the list
@@ -960,7 +975,9 @@
// Even though cursor might be empty, the list adapter might have teasers/footers.
// So we check the list adapter count if the cursor is fully/partially loaded.
- if (mListAdapter.getCount() == 0) {
+ if (mAccount.securityHold != 0) {
+ showSecurityHoldView();
+ } else if (mListAdapter.getCount() == 0) {
showEmptyView();
} else {
showListView();
@@ -1245,4 +1262,12 @@
mListView.setNextFocusRightId(mNextFocusStartId);
}
}
+
+ public void onClick(View view) {
+ if (view == mSecurityHoldButton) {
+ final String accountSecurityUri = mAccount.accountSecurityUri;
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(accountSecurityUri));
+ startActivity(intent);
+ }
+ }
}
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index cdaa262..3e68841 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -29,6 +29,7 @@
import android.os.Bundle;
import android.os.SystemClock;
import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
import android.support.v4.text.BidiFormatter;
import android.support.v4.util.ArrayMap;
import android.text.TextUtils;
@@ -131,6 +132,9 @@
*/
private final int LOAD_WAIT_UNTIL_VISIBLE = 2;
+ // Default scroll distance when the user tries to scroll with up/down
+ private final int DEFAULT_VERTICAL_SCROLL_DISTANCE_PX = 50;
+
// Keyboard navigation
private KeyboardNavigationController mNavigationController;
// Since we manually control navigation for most of the conversation view due to problems
@@ -416,7 +420,7 @@
@Override
public boolean onConsoleMessage(ConsoleMessage consoleMessage) {
if (consoleMessage.messageLevel() == ConsoleMessage.MessageLevel.ERROR) {
- LogUtils.wtf(LOG_TAG, "JS: %s (%s:%d) f=%s", consoleMessage.message(),
+ LogUtils.e(LOG_TAG, "JS: %s (%s:%d) f=%s", consoleMessage.message(),
consoleMessage.sourceId(), consoleMessage.lineNumber(),
ConversationViewFragment.this);
} else {
@@ -1013,9 +1017,13 @@
mWebView.getSettings().setBlockNetworkImage(false);
final Address sender = getAddress(senderRawAddress);
+ if (sender == null) {
+ // Don't need to unblock any images
+ return;
+ }
final MessageCursor cursor = getMessageCursor();
- final List<String> messageDomIds = new ArrayList<String>();
+ final List<String> messageDomIds = new ArrayList<>();
int pos = -1;
while (cursor.moveToPosition(++pos)) {
@@ -1090,7 +1098,7 @@
return positions;
}
- protected Address getAddress(String rawFrom) {
+ protected @Nullable Address getAddress(String rawFrom) {
return Utils.getAddress(mAddressCache, rawFrom);
}
@@ -1140,8 +1148,12 @@
if (domMessageId == null) {
return null;
}
+ final MessageCursor messageCursor = getMessageCursor();
+ if (messageCursor == null) {
+ return null;
+ }
final String messageId = mTemplates.getMessageIdForDomId(domMessageId);
- return getMessageCursor().getMessageForId(Long.parseLong(messageId));
+ return messageCursor.getMessageForId(Long.parseLong(messageId));
}
/**
@@ -1207,24 +1219,25 @@
// We manually handle up/down navigation through the overlay items because the
// system's default isn't optimal for two-pane landscape since it's not a real list.
- final View next = mConversationContainer.getNextOverlayView(
- mOriginalKeyedView, isDown);
+ final View next = mConversationContainer.getNextOverlayView(mOriginalKeyedView,
+ isDown);
if (next != null) {
- if (isActionUp) {
- // Make sure that v is in view
- final int[] coords = new int[2];
- next.getLocationOnScreen(coords);
- final int bottom = coords[1] + next.getHeight();
- if (bottom > mMaxScreenHeight) {
- mWebView.scrollBy(0, bottom - mMaxScreenHeight);
- } else if (coords[1] < mTopOfVisibleScreen) {
- mWebView.scrollBy(0, coords[1] - mTopOfVisibleScreen);
+ focusAndScrollToView(next);
+ } else if (!isActionUp) {
+ // Scroll in the direction of the arrow if next view isn't found.
+ final int currentY = mWebView.getScrollY();
+ if (isUp && currentY > 0) {
+ mWebView.scrollBy(0,
+ -Math.min(currentY, DEFAULT_VERTICAL_SCROLL_DISTANCE_PX));
+ } else if (isDown) {
+ final int webviewEnd = (int) (mWebView.getContentHeight() *
+ mWebView.getScale());
+ final int currentEnd = currentY + mWebView.getHeight();
+ if (currentEnd < webviewEnd) {
+ mWebView.scrollBy(0, Math.min(webviewEnd - currentEnd,
+ DEFAULT_VERTICAL_SCROLL_DISTANCE_PX));
}
- next.requestFocus();
}
- } else {
- // If the next view cannot be reached, let's scroll in the direction of the key.
- mTopmostOverlay.requestFocus();
}
return true;
}
@@ -1247,6 +1260,19 @@
return false;
}
+ private void focusAndScrollToView(View v) {
+ // Make sure that v is in view
+ final int[] coords = new int[2];
+ v.getLocationOnScreen(coords);
+ final int bottom = coords[1] + v.getHeight();
+ if (bottom > mMaxScreenHeight) {
+ mWebView.scrollBy(0, bottom - mMaxScreenHeight);
+ } else if (coords[1] < mTopOfVisibleScreen) {
+ mWebView.scrollBy(0, coords[1] - mTopOfVisibleScreen);
+ }
+ v.requestFocus();
+ }
+
public class ConversationWebViewClient extends AbstractConversationWebViewClient {
public ConversationWebViewClient(Account account) {
super(account);
@@ -1397,7 +1423,13 @@
while (cursor.moveToPosition(++pos)) {
final ConversationMessage msg = cursor.getMessage();
if (TextUtils.equals(domId, mTemplates.getMessageDomId(msg))) {
- return getAddress(msg.getFrom()).getAddress();
+ final Address address = getAddress(msg.getFrom());
+ if (address != null) {
+ return address.getAddress();
+ } else {
+ // Fall through to return an empty string
+ break;
+ }
}
}
diff --git a/src/com/android/mail/ui/DividedImageCanvas.java b/src/com/android/mail/ui/DividedImageCanvas.java
deleted file mode 100644
index 274327e..0000000
--- a/src/com/android/mail/ui/DividedImageCanvas.java
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mail.ui;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PorterDuff.Mode;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-
-import com.android.mail.R;
-import com.android.mail.utils.Utils;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * DividedImageCanvas creates a canvas that can display into a minimum of 1
- * and maximum of 4 images. As images are added, they
- * are laid out according to the following algorithm:
- * 1 Image: Draw the bitmap filling the entire canvas.
- * 2 Images: Draw 2 bitmaps split vertically down the middle.
- * 3 Images: Draw 3 bitmaps: the first takes up all vertical space; the 2nd and 3rd are stacked in
- * the second vertical position.
- * 4 Images: Divide the Canvas into 4 equal quadrants and draws 1 bitmap in each.
- */
-public class DividedImageCanvas implements ImageCanvas {
- public static final int MAX_DIVISIONS = 4;
-
- private final Map<String, Integer> mDivisionMap = Maps
- .newHashMapWithExpectedSize(MAX_DIVISIONS);
- private Bitmap mDividedBitmap;
- private Canvas mCanvas;
- private int mWidth;
- private int mHeight;
-
- private final Context mContext;
- private final InvalidateCallback mCallback;
- private final ArrayList<Bitmap> mDivisionImages = new ArrayList<Bitmap>(MAX_DIVISIONS);
-
- /**
- * Ignore any request to draw final output when not yet ready. This prevents partially drawn
- * canvases from appearing.
- */
- private boolean mBitmapValid = false;
-
- private int mGeneration;
-
- private static final Paint sPaint = new Paint();
- private static final Paint sClearPaint = new Paint();
- private static final Rect sSrc = new Rect();
- private static final Rect sDest = new Rect();
-
- private static int sDividerLineWidth = -1;
- private static int sDividerColor;
-
- static {
- sClearPaint.setXfermode(new PorterDuffXfermode(Mode.CLEAR));
- }
-
- public DividedImageCanvas(Context context, InvalidateCallback callback) {
- mContext = context;
- mCallback = callback;
- setupDividerLines();
- }
-
- /**
- * Get application context for this object.
- */
- public Context getContext() {
- return mContext;
- }
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder("{");
- sb.append(super.toString());
- sb.append(" mDivisionMap=");
- sb.append(mDivisionMap);
- sb.append(" mDivisionImages=");
- sb.append(mDivisionImages);
- sb.append(" mWidth=");
- sb.append(mWidth);
- sb.append(" mHeight=");
- sb.append(mHeight);
- sb.append("}");
- return sb.toString();
- }
-
- /**
- * Set the id associated with each quadrant. The quadrants are laid out:
- * TopLeft, TopRight, Bottom Left, Bottom Right
- * @param keys
- */
- public void setDivisionIds(List<Object> keys) {
- if (keys.size() > MAX_DIVISIONS) {
- throw new IllegalArgumentException("too many divisionIds: " + keys);
- }
-
- boolean needClear = getDivisionCount() != keys.size();
- if (!needClear) {
- for (int i = 0; i < keys.size(); i++) {
- String divisionId = transformKeyToDivisionId(keys.get(i));
- // different item or different place
- if (!mDivisionMap.containsKey(divisionId) || mDivisionMap.get(divisionId) != i) {
- needClear = true;
- break;
- }
- }
- }
-
- if (needClear) {
- mDivisionMap.clear();
- mDivisionImages.clear();
- int i = 0;
- for (Object key : keys) {
- String divisionId = transformKeyToDivisionId(key);
- mDivisionMap.put(divisionId, i);
- mDivisionImages.add(null);
- i++;
- }
- }
- }
-
- private void draw(Bitmap b, int left, int top, int right, int bottom) {
- if (b != null) {
- // Some times we load taller images compared to the destination rect on the canvas
- int srcTop = 0;
- int srcBottom = b.getHeight();
- int destHeight = bottom - top;
- if (b.getHeight() > bottom - top) {
- srcTop = b.getHeight() / 2 - destHeight/2;
- srcBottom = b.getHeight() / 2 + destHeight/2;
- }
-
-// todo:markwei do not scale very small bitmaps
- // l t r b
- sSrc.set(0, srcTop, b.getWidth(), srcBottom);
- sDest.set(left, top, right, bottom);
- mCanvas.drawRect(sDest, sClearPaint);
- mCanvas.drawBitmap(b, sSrc, sDest, sPaint);
- } else {
- // clear
- mCanvas.drawRect(left, top, right, bottom, sClearPaint);
- }
- }
-
- /**
- * Get the desired dimensions and scale for the bitmap to be placed in the
- * location corresponding to id. Caller must allocate the Dimensions object.
- * @param key
- * @param outDim a {@link ImageCanvas.Dimensions} object to write results into
- */
- @Override
- public void getDesiredDimensions(Object key, Dimensions outDim) {
- Utils.traceBeginSection("get desired dimensions");
- int w = 0, h = 0;
- float scale = 0;
- final Integer pos = mDivisionMap.get(transformKeyToDivisionId(key));
- if (pos != null && pos >= 0) {
- final int size = mDivisionMap.size();
- switch (size) {
- case 0:
- break;
- case 1:
- w = mWidth;
- h = mHeight;
- scale = Dimensions.SCALE_ONE;
- break;
- case 2:
- w = mWidth / 2;
- h = mHeight;
- scale = Dimensions.SCALE_HALF;
- break;
- case 3:
- switch (pos) {
- case 0:
- w = mWidth / 2;
- h = mHeight;
- scale = Dimensions.SCALE_HALF;
- break;
- default:
- w = mWidth / 2;
- h = mHeight / 2;
- scale = Dimensions.SCALE_QUARTER;
- }
- break;
- case 4:
- w = mWidth / 2;
- h = mHeight / 2;
- scale = Dimensions.SCALE_QUARTER;
- break;
- }
- }
- outDim.width = w;
- outDim.height = h;
- outDim.scale = scale;
- Utils.traceEndSection();
- }
-
- @Override
- public void drawImage(Bitmap b, Object key) {
- addDivisionImage(b, key);
- }
-
- /**
- * Add a bitmap to this view in the quadrant matching its id.
- * @param b Bitmap
- * @param key Id to look for that was previously set in setDivisionIds.
- */
- public void addDivisionImage(Bitmap b, Object key) {
- if (b != null) {
- addOrClearDivisionImage(b, key);
- }
- }
-
- public void clearDivisionImage(Object key) {
- addOrClearDivisionImage(null, key);
- }
- private void addOrClearDivisionImage(Bitmap b, Object key) {
- Utils.traceBeginSection("add or clear division image");
- final Integer pos = mDivisionMap.get(transformKeyToDivisionId(key));
- if (pos != null && pos >= 0) {
- mDivisionImages.set(pos, b);
- boolean complete = false;
- final int width = mWidth;
- final int height = mHeight;
- // Different layouts depending on count.
- final int size = mDivisionMap.size();
- switch (size) {
- case 0:
- // Do nothing.
- break;
- case 1:
- // Draw the bitmap filling the entire canvas.
- draw(mDivisionImages.get(0), 0, 0, width, height);
- complete = true;
- break;
- case 2:
- // Draw 2 bitmaps split vertically down the middle
- switch (pos) {
- case 0:
- draw(mDivisionImages.get(0), 0, 0, width / 2, height);
- break;
- case 1:
- draw(mDivisionImages.get(1), width / 2, 0, width, height);
- break;
- }
- complete = mDivisionImages.get(0) != null && mDivisionImages.get(1) != null
- || isPartialBitmapComplete();
- if (complete) {
- // Draw dividers
- drawVerticalDivider(width, height);
- }
- break;
- case 3:
- // Draw 3 bitmaps: the first takes up all vertical
- // space, the 2nd and 3rd are stacked in the second vertical
- // position.
- switch (pos) {
- case 0:
- draw(mDivisionImages.get(0), 0, 0, width / 2, height);
- break;
- case 1:
- draw(mDivisionImages.get(1), width / 2, 0, width, height / 2);
- break;
- case 2:
- draw(mDivisionImages.get(2), width / 2, height / 2, width, height);
- break;
- }
- complete = mDivisionImages.get(0) != null && mDivisionImages.get(1) != null
- && mDivisionImages.get(2) != null || isPartialBitmapComplete();
- if (complete) {
- // Draw dividers
- drawVerticalDivider(width, height);
- drawHorizontalDivider(width / 2, height / 2, width, height / 2);
- }
- break;
- default:
- // Draw all 4 bitmaps in a grid
- switch (pos) {
- case 0:
- draw(mDivisionImages.get(0), 0, 0, width / 2, height / 2);
- break;
- case 1:
- draw(mDivisionImages.get(1), width / 2, 0, width, height / 2);
- break;
- case 2:
- draw(mDivisionImages.get(2), 0, height / 2, width / 2, height);
- break;
- case 3:
- draw(mDivisionImages.get(3), width / 2, height / 2, width, height);
- break;
- }
- complete = mDivisionImages.get(0) != null && mDivisionImages.get(1) != null
- && mDivisionImages.get(2) != null && mDivisionImages.get(3) != null
- || isPartialBitmapComplete();
- if (complete) {
- // Draw dividers
- drawVerticalDivider(width, height);
- drawHorizontalDivider(0, height / 2, width, height / 2);
- }
- break;
- }
- // Create the new image bitmap.
- if (complete) {
- mBitmapValid = true;
- mCallback.invalidate();
- }
- }
- Utils.traceEndSection();
- }
-
- public boolean hasImageFor(Object key) {
- final Integer pos = mDivisionMap.get(transformKeyToDivisionId(key));
- return pos != null && mDivisionImages.get(pos) != null;
- }
-
- private void setupDividerLines() {
- if (sDividerLineWidth == -1) {
- Resources res = getContext().getResources();
- sDividerLineWidth = res
- .getDimensionPixelSize(R.dimen.tile_divider_width);
- sDividerColor = res.getColor(R.color.tile_divider_color);
- }
- }
-
- private static void setupPaint() {
- sPaint.setStrokeWidth(sDividerLineWidth);
- sPaint.setColor(sDividerColor);
- }
-
- protected void drawVerticalDivider(int width, int height) {
- int x1 = width / 2, y1 = 0, x2 = width/2, y2 = height;
- setupPaint();
- mCanvas.drawLine(x1, y1, x2, y2, sPaint);
- }
-
- protected void drawHorizontalDivider(int x1, int y1, int x2, int y2) {
- setupPaint();
- mCanvas.drawLine(x1, y1, x2, y2, sPaint);
- }
-
- protected boolean isPartialBitmapComplete() {
- return false;
- }
-
- protected String transformKeyToDivisionId(Object key) {
- return key.toString();
- }
-
- /**
- * Draw the contents of the DividedImageCanvas to the supplied canvas.
- */
- public void draw(Canvas canvas) {
- if (mDividedBitmap != null && mBitmapValid) {
- canvas.drawBitmap(mDividedBitmap, 0, 0, null);
- }
- }
-
- /**
- * Draw the contents of the DividedImageCanvas to the supplied canvas.
- */
- public void draw(final Canvas canvas, final Matrix matrix) {
- if (mDividedBitmap != null && mBitmapValid) {
- canvas.drawBitmap(mDividedBitmap, matrix, null);
- }
- }
-
- @Override
- public void reset() {
- if (mCanvas != null && mDividedBitmap != null) {
- mBitmapValid = false;
- }
- mDivisionMap.clear();
- mDivisionImages.clear();
- mGeneration++;
- }
-
- @Override
- public int getGeneration() {
- return mGeneration;
- }
-
- /**
- * Set the width and height of the canvas.
- * @param width
- * @param height
- */
- public void setDimensions(int width, int height) {
- Utils.traceBeginSection("set dimensions");
- if (mWidth == width && mHeight == height) {
- Utils.traceEndSection();
- return;
- }
-
- mWidth = width;
- mHeight = height;
-
- mDividedBitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
- mCanvas = new Canvas(mDividedBitmap);
-
- for (int i = 0; i < getDivisionCount(); i++) {
- mDivisionImages.set(i, null);
- }
- mBitmapValid = false;
- Utils.traceEndSection();
- }
-
- /**
- * Get the resulting canvas width.
- */
- public int getWidth() {
- return mWidth;
- }
-
- /**
- * Get the resulting canvas height.
- */
- public int getHeight() {
- return mHeight;
- }
-
- /**
- * The class that will provided the canvas to which the DividedImageCanvas
- * should render its contents must implement this interface.
- */
- public interface InvalidateCallback {
- public void invalidate();
- }
-
- public int getDivisionCount() {
- return mDivisionMap.size();
- }
-
- /**
- * Get the division ids currently associated with this DivisionImageCanvas.
- */
- public ArrayList<String> getDivisionIds() {
- return Lists.newArrayList(mDivisionMap.keySet());
- }
-}
diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index af6d5de..590e5ec 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java
@@ -25,6 +25,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.widget.DrawerLayout;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -1718,6 +1719,11 @@
public void setAccount(Account acct) {
mAccount = acct;
mDrawable.bind(mAccount.getSenderName(), mAccount.getEmailAddress());
+ String contentDescription = mAccount.getDisplayName();
+ if (TextUtils.isEmpty(contentDescription)) {
+ contentDescription = mAccount.getEmailAddress();
+ }
+ view.setContentDescription(contentDescription);
}
@Override
diff --git a/src/com/android/mail/ui/HtmlConversationTemplates.java b/src/com/android/mail/ui/HtmlConversationTemplates.java
index 33aa505..124cb83 100644
--- a/src/com/android/mail/ui/HtmlConversationTemplates.java
+++ b/src/com/android/mail/ui/HtmlConversationTemplates.java
@@ -204,7 +204,8 @@
mContext.getString(R.string.hide_elided),
showElided, docBaseUri, conversationBaseUri, viewportWidth, webviewWidth,
enableContentReadySignal, normalizeMessageWidths,
- enableMungeTables, enableMungeImages, Utils.isRunningKitkatOrLater());
+ enableMungeTables, enableMungeImages, Utils.isRunningKitkatOrLater(),
+ mContext.getString(R.string.forms_are_disabled));
mInProgress = false;
diff --git a/src/com/android/mail/ui/MailActivity.java b/src/com/android/mail/ui/MailActivity.java
index f213eda..bcba078 100644
--- a/src/com/android/mail/ui/MailActivity.java
+++ b/src/com/android/mail/ui/MailActivity.java
@@ -17,8 +17,8 @@
package com.android.mail.ui;
+import android.annotation.SuppressLint;
import android.app.Dialog;
-import android.app.LoaderManager;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@@ -29,11 +29,13 @@
import android.nfc.NfcEvent;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
+import android.support.v7.view.ActionMode;
import android.support.v7.widget.Toolbar;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
+import android.view.Window;
import android.view.accessibility.AccessibilityManager;
import com.android.bitmap.BitmapCache;
@@ -490,29 +492,29 @@
return new SuggestionsProvider(this);
}
- /**
- * Returns the loader callback that can create a
- * {@link AbstractActivityController#LOADER_WELCOME_TOUR_ACCOUNTS} followed by a
- * {@link AbstractActivityController#LOADER_WELCOME_TOUR} which determines whether the welcome
- * tour should be displayed.
- *
- * The base implementation returns {@code null} and subclasses should return an actual
- * implementation if they want to be invoked at appropriate time.
- */
- public LoaderManager.LoaderCallbacks<?> getWelcomeCallbacks() {
- return null;
+ @SuppressLint("NewApi")
+ @Override
+ public void onSupportActionModeStarted(ActionMode mode) {
+ super.onSupportActionModeStarted(mode);
+ if (Utils.isRunningLOrLater()) {
+ final Window window = getWindow();
+ if (window != null) {
+ window.setStatusBarColor(
+ getResources().getColor(R.color.action_mode_statusbar_color));
+ }
+ }
}
- /**
- * Returns whether the latest version of the welcome tour was shown on this device.
- * <p>
- * The base implementation returns {@code true} and applications that implement a welcome tour
- * should override this method in order to optimize
- * {@link AbstractActivityController#perhapsStartWelcomeTour()}.
- *
- * @return Whether the latest version of the welcome tour was shown.
- */
- public boolean wasLatestWelcomeTourShownOnDeviceForAllAccounts() {
- return true;
+ @SuppressLint("NewApi")
+ @Override
+ public void onSupportActionModeFinished(ActionMode mode) {
+ super.onSupportActionModeFinished(mode);
+ if (Utils.isRunningLOrLater()) {
+ final Window window = getWindow();
+ if (window != null) {
+ window.setStatusBarColor(
+ getResources().getColor(R.color.statusbar_color));
+ }
+ }
}
}
diff --git a/src/com/android/mail/ui/MaterialSearchActionView.java b/src/com/android/mail/ui/MaterialSearchActionView.java
index 03f6a54..1b131e0 100644
--- a/src/com/android/mail/ui/MaterialSearchActionView.java
+++ b/src/com/android/mail/ui/MaterialSearchActionView.java
@@ -18,10 +18,14 @@
package com.android.mail.ui;
import android.content.Context;
+import android.content.res.Resources;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.AttributeSet;
+import android.view.ActionMode;
import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
@@ -87,8 +91,43 @@
mQueryText.setOnClickListener(this);
mQueryText.setOnEditorActionListener(this);
mQueryText.setOnKeyListener(this);
+ // Disable CAB for search edittext
+ mQueryText.setCustomSelectionActionModeCallback(new ActionMode.Callback() {
+ @Override
+ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+ return false;
+ }
+
+ @Override
+ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
+ return false;
+ }
+
+ @Override
+ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
+ return false;
+ }
+
+ @Override
+ public void onDestroyActionMode(ActionMode mode) {
+ }
+ });
mEndingButton = (ImageView) findViewById(R.id.search_actionbar_ending_button);
mEndingButton.setOnClickListener(this);
+ setupEndingButton(mQueryText.getText());
+ }
+
+ private void setupEndingButton(CharSequence currentText) {
+ final Resources res = getResources();
+ if (!mSupportVoice || currentText.length() > 0) {
+ mShowingClose = true;
+ mEndingButton.setImageResource(R.drawable.ic_close_24dp);
+ mEndingButton.setContentDescription(res.getString(R.string.search_clear_desc));
+ } else {
+ mShowingClose = false;
+ mEndingButton.setImageResource(R.drawable.ic_mic_24dp);
+ mEndingButton.setContentDescription(res.getString(R.string.search_voice_desc));
+ }
}
@Override
@@ -99,13 +138,7 @@
@Override
public void onTextChanged(CharSequence charSequence, int i, int i2, int i3) {
mController.onQueryTextChanged(charSequence.toString());
- if (!mSupportVoice || charSequence.length() > 0) {
- mShowingClose = true;
- mEndingButton.setImageResource(R.drawable.ic_close_24dp);
- } else {
- mShowingClose = false;
- mEndingButton.setImageResource(R.drawable.ic_mic_24dp);
- }
+ setupEndingButton(charSequence);
}
@Override
diff --git a/src/com/android/mail/ui/MaterialSearchSuggestionsList.java b/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
index ae89a04..e40d42f 100644
--- a/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
+++ b/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
@@ -49,8 +49,6 @@
private List<SuggestionItem> mSuggestions = Lists.newArrayList();
private String mQuery;
- private View mDummyHolder;
- private ListView mListView;
private MaterialSearchViewListAdapter mAdapter;
private QuerySuggestionsTask mQueryTask;
@@ -83,14 +81,14 @@
protected void onFinishInflate() {
super.onFinishInflate();
- mListView = (ListView) findViewById(R.id.search_overlay_suggestion_list);
- mListView.setOnItemClickListener(this);
- mDummyHolder = findViewById(R.id.search_overlay_scrim);
- mDummyHolder.setOnClickListener(this);
+ final ListView listView = (ListView) findViewById(R.id.search_overlay_suggestion_list);
+ listView.setOnItemClickListener(this);
+ final View dummyHolder = findViewById(R.id.search_overlay_scrim);
+ dummyHolder.setOnClickListener(this);
// set up the adapter
mAdapter = new MaterialSearchViewListAdapter(getContext(), R.layout.search_suggestion_item);
- mListView.setAdapter(mAdapter);
+ listView.setAdapter(mAdapter);
}
@Override
@@ -125,8 +123,7 @@
Cursor c = null;
final List<SuggestionItem> result = Lists.newArrayList();
try {
- c = mSuggestionsProvider.query(null, "query LIKE ?",
- new String[] { query }, null);
+ c = mSuggestionsProvider.query(query);
if (c != null && c.moveToFirst()) {
final int textIndex = c.getColumnIndex(SearchManager.SUGGEST_COLUMN_QUERY);
@@ -210,8 +207,11 @@
}
final SuggestionItem item = mSuggestions.get(position);
- ((TextView) convertView.findViewById(R.id.search_overlay_item_text))
- .setText(item.suggestion);
+ final TextView text =
+ (TextView) convertView.findViewById(R.id.search_overlay_item_text);
+ text.setText(item.suggestion);
+ text.setContentDescription(getResources().getString(R.string.search_suggestion_desc,
+ item.suggestion));
((ImageView) convertView.findViewById(R.id.search_overlay_item_icon))
.setImageURI(item.icon);
diff --git a/src/com/android/mail/ui/MaterialSearchViewController.java b/src/com/android/mail/ui/MaterialSearchViewController.java
index 4e5b5a4..5014e19 100644
--- a/src/com/android/mail/ui/MaterialSearchViewController.java
+++ b/src/com/android/mail/ui/MaterialSearchViewController.java
@@ -47,9 +47,6 @@
// we have to show the search actionbar on top while the user is not interacting with it.
public static final int SEARCH_VIEW_STATE_ONLY_ACTIONBAR = 2;
- /** Code returned from voice search intent */
- public static final int VOICE_SEARCH_REQUEST_CODE = 4;
-
private static final String EXTRA_VIEW_STATE = "extraSearchViewControllerViewState";
private final MailActivity mActivity;
@@ -185,7 +182,8 @@
// Some devices do not support the voice-to-speech functionality.
try {
- mActivity.startActivityForResult(intent, VOICE_SEARCH_REQUEST_CODE);
+ mActivity.startActivityForResult(intent,
+ AbstractActivityController.VOICE_SEARCH_REQUEST_CODE);
} catch (ActivityNotFoundException e) {
final String toast =
mActivity.getResources().getString(R.string.voice_search_not_supported);
diff --git a/src/com/android/mail/ui/MiniDrawerView.java b/src/com/android/mail/ui/MiniDrawerView.java
index 656fc27..7aaac12 100644
--- a/src/com/android/mail/ui/MiniDrawerView.java
+++ b/src/com/android/mail/ui/MiniDrawerView.java
@@ -133,6 +133,7 @@
final ImageView iv = (ImageView) mInflater.inflate(
R.layout.mini_drawer_folder_item, this, false /* attachToRoot */);
iv.setTag(new FolderItem(f, iv));
+ iv.setContentDescription(f.name);
addView(iv, 1 + numInboxes);
numInboxes++;
}
diff --git a/src/com/android/mail/ui/SwipeableListView.java b/src/com/android/mail/ui/SwipeableListView.java
index df501c4..a3549c8 100644
--- a/src/com/android/mail/ui/SwipeableListView.java
+++ b/src/com/android/mail/ui/SwipeableListView.java
@@ -360,17 +360,9 @@
@Override
public boolean performItemClick(View view, int pos, long id) {
- final int previousPosition = getCheckedItemPosition();
- final boolean checkedSetEmpty = mConvCheckedSet.isEmpty();
-
// Superclass method modifies the selection set
final boolean handled = super.performItemClick(view, pos, id);
- // If we are in CAB mode then a click shouldn't
- // activate the new item, it should only add it to the selection set
- if (!checkedSetEmpty && previousPosition != -1) {
- setItemChecked(previousPosition, true);
- }
// Commit any existing destructive actions when the user selects a
// conversation to view.
commitDestructiveActions(true);
diff --git a/src/com/android/mail/ui/ThumbnailLoadTask.java b/src/com/android/mail/ui/ThumbnailLoadTask.java
index 71e2cc2..3709eee 100644
--- a/src/com/android/mail/ui/ThumbnailLoadTask.java
+++ b/src/com/android/mail/ui/ThumbnailLoadTask.java
@@ -48,8 +48,17 @@
private final int mWidth;
private final int mHeight;
- public static void setupThumbnailPreview(final AttachmentBitmapHolder holder,
- final Attachment attachment, final Attachment prevAttachment) {
+ public static void setupThumbnailPreview(AttachmentTile.AttachmentPreviewCache cache,
+ AttachmentBitmapHolder holder, Attachment attachment, Attachment prevAttachment) {
+ // Check cache first
+ if (cache != null) {
+ final Bitmap cached = cache.get(attachment);
+ if (cached != null) {
+ holder.setThumbnail(cached);
+ return;
+ }
+ }
+
final int width = holder.getThumbnailWidth();
final int height = holder.getThumbnailHeight();
if (attachment == null || width == 0 || height == 0
@@ -60,7 +69,7 @@
final Uri thumbnailUri = attachment.thumbnailUri;
final Uri contentUri = attachment.contentUri;
- final Uri uri = (prevAttachment == null) ? null : prevAttachment.getIdentifierUri();
+ final Uri uri = attachment.getIdentifierUri();
final Uri prevUri = (prevAttachment == null) ? null : prevAttachment.getIdentifierUri();
// begin loading a thumbnail if this is an image and either the thumbnail or the original
// content is ready (and different from any existing image)
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 999270e..71d73d6 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -358,12 +358,6 @@
}
}
- @Override
- protected boolean isComposeVisible(int mode) {
- return super.isComposeVisible(mode) ||
- (mIsTabletLandscape && mode == ViewMode.CONVERSATION);
- }
-
/**
* Enable or disable the CAB mode based on the visibility of the conversation list fragment.
*/
@@ -474,7 +468,7 @@
final ConversationListFragment convList = getConversationListFragment();
if (convList != null && conversation != null) {
if (mCurrentConversationJustPeeking) {
- convList.clearActivated();
+ convList.clearChoicesAndActivated();
} else {
convList.setActivated(conversation.position, different);
}
diff --git a/src/com/android/mail/ui/TwoPaneLayout.java b/src/com/android/mail/ui/TwoPaneLayout.java
index 8b175fd..c4f612e 100644
--- a/src/com/android/mail/ui/TwoPaneLayout.java
+++ b/src/com/android/mail/ui/TwoPaneLayout.java
@@ -17,6 +17,8 @@
package com.android.mail.ui;
+import java.util.List;
+
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.TimeInterpolator;
@@ -35,6 +37,7 @@
import com.android.mail.utils.Utils;
import com.android.mail.utils.ViewUtils;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Lists;
/**
* This is a custom layout that manages the possible views of Gmail's large screen (read: tablet)
@@ -82,10 +85,15 @@
*/
private int mCurrentMode = ViewMode.UNKNOWN;
/**
- * This mode represents the current positions of the three panes. This is split out from the
- * current mode to give context to state transitions.
+ * This is a copy of {@link #mCurrentMode} that layout/positioning/animating code uses to
+ * compare to the 'new' current mode, to avoid unnecessarily calculation.
*/
private int mPositionedMode = ViewMode.UNKNOWN;
+ /**
+ * Similar to {@link #mPositionedMode}; this is the value of {@link #isDrawerOpen()} from the
+ * last time layout ran, so we know not to run layout again if this hasn't changed.
+ */
+ private boolean mPositionedIsDrawerOpen;
private TwoPaneController mController;
private LayoutListener mListener;
@@ -99,16 +107,16 @@
private View mFloatingActionButton;
private int mFloatingActionButtonEndMargin;
- private int mPrevComposeEdgeX = -1;
+
+ private final List<Runnable> mTransitionCompleteJobs = Lists.newArrayList();
+
+ private final PaneAnimationListener mPaneAnimationListener = new PaneAnimationListener();
public static final int MISCELLANEOUS_VIEW_ID = R.id.miscellaneous_pane;
- private final Runnable mTransitionCompleteRunnable = new Runnable() {
- @Override
- public void run() {
- onTransitionComplete();
- }
- };
+ public interface ConversationListLayoutListener {
+ void onConversationListLayout(int xEnd, boolean drawerOpen);
+ }
public TwoPaneLayout(Context context) {
this(context, null);
@@ -176,8 +184,15 @@
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
LogUtils.d(Utils.VIEW_DEBUGGING_TAG, "TPL(%s).onLayout()", this);
- positionPanes(getMeasuredWidth());
super.onLayout(changed, l, t, r, b);
+ // Position/animate the panes only if the layout has truly changed in a way that affects
+ // their positioning (e.g. mode change or drawer state change).
+ // And do so only after the normal layout has happened to give children their positions,
+ // in case they depend on them (e.g. if they call child.getWidth()).
+ if (changed || mPositionedMode != mCurrentMode
+ || isDrawerOpen() != mPositionedIsDrawerOpen) {
+ positionPanes(getMeasuredWidth());
+ }
}
/**
@@ -204,15 +219,11 @@
*/
private void positionPanes(int width) {
final boolean isRtl = ViewUtils.isViewRtl(this);
- // Always reset the FAB position to previous X (in case of rotation)
- if (mPrevComposeEdgeX >= 0) {
- mFloatingActionButton.setX(computeFloatingActionButtonX(mPrevComposeEdgeX, isRtl));
- mFloatingActions.setVisibility(VISIBLE);
- }
+ final boolean isDrawerOpen = isDrawerOpen();
final int convX, listX, foldersX;
- final int foldersW = isDrawerOpen() ? mDrawerWidthOpen : mDrawerWidthMini;
+ final int foldersW = isDrawerOpen ? mDrawerWidthOpen : mDrawerWidthMini;
final int listW = getPaneWidth(mListView);
boolean cvOnScreen = true;
@@ -254,33 +265,29 @@
}
}
+ // manually set FAB position the first time so it doesn't animate to its initial position
+ if (mFloatingActions.getVisibility() != VISIBLE && mCurrentMode != ViewMode.UNKNOWN) {
+ mFloatingActionButton.setX(computeFloatingActionButtonX(isRtl ? listX : convX, isRtl));
+ mFloatingActions.setVisibility(VISIBLE);
+ }
+
animatePanes(foldersX, listX, convX, isRtl);
// For views that are not on the screen, let's set their visibility for accessibility.
final boolean folderVisible = isRtl ?
foldersX + mFoldersView.getWidth() >= 0 : foldersX >= 0;
final boolean listVisible = isRtl ? listX + mListView.getWidth() >= 0 : listX >= 0;
- mFoldersView.setVisibility(folderVisible ? VISIBLE : INVISIBLE);
- mListView.setVisibility(listVisible ? VISIBLE : INVISIBLE);
- mConversationView.setVisibility(cvOnScreen ? VISIBLE : INVISIBLE);
- mMiscellaneousView.setVisibility(cvOnScreen ? VISIBLE : INVISIBLE);
+ adjustPaneVisibility(folderVisible, listVisible, cvOnScreen);
if (mConversationListLayoutListener != null) {
mConversationListLayoutListener.onConversationListLayout(
- isRtl ? listX : convX, isDrawerOpen());
+ isRtl ? listX : convX, isDrawerOpen);
}
mPositionedMode = mCurrentMode;
- mPrevComposeEdgeX = isRtl ? listX : convX;
+ mPositionedIsDrawerOpen = isDrawerOpen;
}
- private final AnimatorListenerAdapter mPaneAnimationListener = new AnimatorListenerAdapter() {
- @Override
- public void onAnimationEnd(Animator animation) {
- onTransitionComplete();
- }
- };
-
private void animatePanes(int foldersX, int listX, int convX, boolean isRtl) {
// If positioning has not yet happened, we don't need to animate panes into place.
// This happens on first layout, rotate, and when jumping straight to a conversation from
@@ -293,7 +300,7 @@
// listeners need to know that the "transition" is complete, even if one is not run.
// defer notifying listeners because we're in a layout pass, and they might do layout.
- post(mTransitionCompleteRunnable);
+ post(mPaneAnimationListener);
return;
}
@@ -304,9 +311,7 @@
}
mFoldersView.animate().x(foldersX);
- mListView.animate()
- .x(listX)
- .setListener(mPaneAnimationListener);
+ mListView.animate().x(listX).setListener(mPaneAnimationListener);
mFloatingActionButton.animate()
.x(computeFloatingActionButtonX(isRtl ? listX : convX, isRtl));
@@ -327,6 +332,41 @@
}
}
+ /**
+ * Adjusts the visibility of each pane before and after a transition. After the transition,
+ * any invisible panes should be marked invisible. But visible panes should not wait for the
+ * transition to finish-- they should be marked visible immediately.
+ *
+ */
+ private void adjustPaneVisibility(final boolean folderVisible, final boolean listVisible,
+ final boolean cvVisible) {
+ applyPaneVisibility(VISIBLE, folderVisible, listVisible, cvVisible);
+ mTransitionCompleteJobs.add(new Runnable() {
+ @Override
+ public void run() {
+ applyPaneVisibility(INVISIBLE, !folderVisible, !listVisible, !cvVisible);
+ }
+ });
+ }
+
+ private void applyPaneVisibility(int visibility, boolean applyToFolders, boolean applyToList,
+ boolean applyToCV) {
+ if (applyToFolders) {
+ mFoldersView.setVisibility(visibility);
+ }
+ if (applyToList) {
+ mListView.setVisibility(visibility);
+ }
+ if (applyToCV) {
+ if (mConversationView.getVisibility() != GONE) {
+ mConversationView.setVisibility(visibility);
+ }
+ if (mMiscellaneousView.getVisibility() != GONE) {
+ mMiscellaneousView.setVisibility(visibility);
+ }
+ }
+ }
+
private void onTransitionComplete() {
if (mController.isDestroyed()) {
// quit early if the hosting activity was destroyed before the animation finished
@@ -334,6 +374,11 @@
return;
}
+ for (Runnable job : mTransitionCompleteJobs) {
+ job.run();
+ }
+ mTransitionCompleteJobs.clear();
+
switch (mCurrentMode) {
case ViewMode.CONVERSATION:
case ViewMode.SEARCH_RESULTS_CONVERSATION:
@@ -435,6 +480,12 @@
mController.disablePagerUpdates();
}
+ // notify of list visibility change up-front when going to list mode
+ // (so the transition runs with the full TL in view)
+ if (newMode == ViewMode.CONVERSATION_LIST) {
+ dispatchConversationListVisibilityChange(true);
+ }
+
mCurrentMode = newMode;
LogUtils.i(LOG_TAG, "onViewModeChanged(%d)", newMode);
@@ -479,7 +530,18 @@
mConversationListLayoutListener = listener;
}
- public interface ConversationListLayoutListener {
- void onConversationListLayout(int xEnd, boolean drawerOpen);
+ private class PaneAnimationListener extends AnimatorListenerAdapter implements Runnable {
+
+ @Override
+ public void run() {
+ onTransitionComplete();
+ }
+
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ onTransitionComplete();
+ }
+
}
+
}
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 0b19005..3c61f78 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -50,7 +50,7 @@
import com.android.mail.browse.ConversationItemView;
import com.android.mail.browse.MessageCursor;
import com.android.mail.browse.SendersView;
-import com.android.mail.photo.ContactPhotoFetcher;
+import com.android.mail.photo.ContactFetcher;
import com.android.mail.photomanager.LetterTileProvider;
import com.android.mail.preferences.AccountPreferences;
import com.android.mail.preferences.FolderPreferences;
@@ -340,10 +340,10 @@
* This happens when locale changes.
**/
public static void cancelAndResendNotificationsOnLocaleChange(
- Context context, final ContactPhotoFetcher photoFetcher) {
+ Context context, final ContactFetcher contactFetcher) {
LogUtils.d(LOG_TAG, "cancelAndResendNotificationsOnLocaleChange");
sBidiFormatter = BidiFormatter.getInstance();
- resendNotifications(context, true, null, null, photoFetcher);
+ resendNotifications(context, true, null, null, contactFetcher);
}
/**
@@ -363,7 +363,7 @@
*/
public static void resendNotifications(Context context, final boolean cancelExisting,
final Uri accountUri, final FolderUri folderUri,
- final ContactPhotoFetcher photoFetcher) {
+ final ContactFetcher contactFetcher) {
LogUtils.d(LOG_TAG, "resendNotifications ");
if (cancelExisting) {
@@ -396,7 +396,7 @@
NotificationActionUtils.sUndoNotifications.get(notificationId);
if (undoableAction == null) {
validateNotifications(context, folder, notification.account, true,
- false, notification, photoFetcher);
+ false, notification, contactFetcher);
} else {
// Create an undo notification
NotificationActionUtils.createUndoNotification(context, undoableAction);
@@ -490,7 +490,7 @@
*/
public static void setNewEmailIndicator(Context context, final int unreadCount,
final int unseenCount, final Account account, final Folder folder,
- final boolean getAttention, final ContactPhotoFetcher photoFetcher) {
+ final boolean getAttention, final ContactFetcher contactFetcher) {
LogUtils.d(LOG_TAG, "setNewEmailIndicator unreadCount = %d, unseenCount = %d, account = %s,"
+ " folder = %s, getAttention = %b", unreadCount, unseenCount,
account.getEmailAddress(), folder.folderUri, getAttention);
@@ -533,7 +533,7 @@
if (NotificationActionUtils.sUndoNotifications.get(notificationId) == null) {
validateNotifications(context, folder, account, getAttention, ignoreUnobtrusiveSetting,
- key, photoFetcher);
+ key, contactFetcher);
}
}
@@ -542,7 +542,7 @@
*/
private static void validateNotifications(Context context, final Folder folder,
final Account account, boolean getAttention, boolean ignoreUnobtrusiveSetting,
- NotificationKey key, final ContactPhotoFetcher photoFetcher) {
+ NotificationKey key, final ContactFetcher contactFetcher) {
NotificationManagerCompat nm = NotificationManagerCompat.from(context);
@@ -717,7 +717,7 @@
configureLatestEventInfoFromConversation(context, account, folderPreferences,
notification, wearableExtender, msgNotifications, notificationId,
cursor, clickIntent, notificationIntent, unreadCount, unseenCount,
- folder, when, photoFetcher);
+ folder, when, contactFetcher);
eventInfoConfigured = true;
}
}
@@ -961,13 +961,13 @@
private static void configureLatestEventInfoFromConversation(final Context context,
final Account account, final FolderPreferences folderPreferences,
- final NotificationCompat.Builder notification,
+ final NotificationCompat.Builder notificationBuilder,
final NotificationCompat.WearableExtender wearableExtender,
final Map<Integer, NotificationBuilders> msgNotifications,
final int summaryNotificationId, final Cursor conversationCursor,
final PendingIntent clickIntent, final Intent notificationIntent,
final int unreadCount, final int unseenCount,
- final Folder folder, final long when, final ContactPhotoFetcher photoFetcher) {
+ final Folder folder, final long when, final ContactFetcher contactFetcher) {
final Resources res = context.getResources();
final String notificationAccountDisplayName = account.getDisplayName();
final String notificationAccountEmail = account.getEmailAddress();
@@ -992,7 +992,7 @@
notificationTicker = newMessagesString;
// The title of the notification is the new messages string
- notification.setContentTitle(newMessagesString);
+ notificationBuilder.setContentTitle(newMessagesString);
// TODO(skennedy) Can we remove this check?
if (com.android.mail.utils.Utils.isRunningJellybeanOrLater()) {
@@ -1001,15 +1001,17 @@
R.integer.max_num_notification_digest_items);
// The body of the notification is the account name, or the label name.
- notification.setSubText(
+ notificationBuilder.setSubText(
isInbox ? notificationAccountDisplayName : notificationLabelName);
final NotificationCompat.InboxStyle digest =
- new NotificationCompat.InboxStyle(notification);
+ new NotificationCompat.InboxStyle(notificationBuilder);
// Group by account and folder
final String notificationGroupKey = createGroupKey(account, folder);
- notification.setGroup(notificationGroupKey).setGroupSummary(true);
+ // Track all senders to later tag them along with the digest notification
+ final HashSet<String> sendersList = new HashSet<String>();
+ notificationBuilder.setGroup(notificationGroupKey).setGroupSummary(true);
ConfigResult firstResult = null;
int numDigestItems = 0;
@@ -1039,13 +1041,14 @@
fromAddress = "";
}
from = getDisplayableSender(fromAddress);
+ sendersList.add(getSenderAddress(fromAddress));
}
while (messageCursor.moveToPosition(messageCursor.getPosition() - 1)) {
final Message message = messageCursor.getMessage();
if (!message.read &&
!fromAddress.contentEquals(message.getFrom())) {
multipleUnreadThread = true;
- break;
+ sendersList.add(getSenderAddress(message.getFrom()));
}
}
final SpannableStringBuilder sendersBuilder;
@@ -1107,7 +1110,7 @@
conversationCursor, notificationIntent, folder, when, res,
notificationAccountDisplayName, notificationAccountEmail,
isInbox, notificationLabelName, conversationNotificationId,
- photoFetcher);
+ contactFetcher);
msgNotifications.put(conversationNotificationId,
NotificationBuilders.of(conversationNotif,
conversationWearExtender));
@@ -1126,6 +1129,10 @@
}
} while (numDigestItems <= maxNumDigestItems && conversationCursor.moveToNext());
+ // Tag main digest notification with the senders
+ tagNotificationsWithPeople(context, notificationBuilder, sendersList,
+ account.getAccountManagerAccount().name, contactFetcher);
+
if (firstResult != null && firstResult.contactIconInfo != null) {
wearableExtender.setBackground(firstResult.contactIconInfo.wearableBg);
} else {
@@ -1134,7 +1141,7 @@
}
} else {
// The body of the notification is the account name, or the label name.
- notification.setContentText(
+ notificationBuilder.setContentText(
isInbox ? notificationAccountDisplayName : notificationLabelName);
}
} else {
@@ -1145,10 +1152,10 @@
seekToLatestUnreadConversation(conversationCursor);
final ConfigResult result = configureNotifForOneConversation(context, account,
- folderPreferences, notification, wearableExtender, conversationCursor,
+ folderPreferences, notificationBuilder, wearableExtender, conversationCursor,
notificationIntent, folder, when, res, notificationAccountDisplayName,
notificationAccountEmail, isInbox, notificationLabelName,
- summaryNotificationId, photoFetcher);
+ summaryNotificationId, contactFetcher);
notificationTicker = result.notificationTicker;
if (result.contactIconInfo != null) {
@@ -1167,15 +1174,15 @@
if (notificationTicker != null) {
// If we didn't generate a notification ticker, it will default to account name
- notification.setTicker(notificationTicker);
+ notificationBuilder.setTicker(notificationTicker);
}
// Set the number in the notification
if (unreadCount > 1) {
- notification.setNumber(unreadCount);
+ notificationBuilder.setNumber(unreadCount);
}
- notification.setContentIntent(clickIntent);
+ notificationBuilder.setContentIntent(clickIntent);
}
/**
@@ -1184,17 +1191,19 @@
*/
private static ConfigResult configureNotifForOneConversation(Context context,
Account account, FolderPreferences folderPreferences,
- NotificationCompat.Builder notification,
+ NotificationCompat.Builder notificationBuilder,
NotificationCompat.WearableExtender wearExtender, Cursor conversationCursor,
Intent notificationIntent, Folder folder, long when, Resources res,
String notificationAccountDisplayName, String notificationAccountEmail,
boolean isInbox, String notificationLabelName, int notificationId,
- final ContactPhotoFetcher photoFetcher) {
+ final ContactFetcher contactFetcher) {
final ConfigResult result = new ConfigResult();
final Conversation conversation = new Conversation(conversationCursor);
+ // Set of all unique senders for unseen messages
+ final HashSet<String> sendersList = new HashSet<String>();
Cursor cursor = null;
MessageCursor messageCursor = null;
boolean multipleUnseenThread = false;
@@ -1220,8 +1229,9 @@
from = getDisplayableSender(fromAddress);
result.contactIconInfo = getContactIcon(
context, account.getAccountManagerAccount().name, from,
- getSenderAddress(fromAddress), folder, photoFetcher);
- notification.setLargeIcon(result.contactIconInfo.icon);
+ getSenderAddress(fromAddress), folder, contactFetcher);
+ sendersList.add(getSenderAddress(fromAddress));
+ notificationBuilder.setLargeIcon(result.contactIconInfo.icon);
}
// Assume that the last message in this conversation is unread
@@ -1231,6 +1241,7 @@
final boolean unseen = !message.seen;
if (unseen) {
firstUnseenMessagePos = messageCursor.getPosition();
+ sendersList.add(getSenderAddress(message.getFrom()));
if (!multipleUnseenThread
&& !fromAddress.contentEquals(message.getFrom())) {
multipleUnseenThread = true;
@@ -1252,28 +1263,28 @@
context, conversationCursor, sendersLength,
notificationAccountEmail);
- notification.setContentTitle(sendersBuilder);
+ notificationBuilder.setContentTitle(sendersBuilder);
// For a single new conversation, the ticker is based on the sender's name.
result.notificationTicker = sendersBuilder.toString();
} else {
from = getWrappedFromString(from);
// The title of a single message the sender.
- notification.setContentTitle(from);
+ notificationBuilder.setContentTitle(from);
// For a single new conversation, the ticker is based on the sender's name.
result.notificationTicker = from;
}
// The notification content will be the subject of the conversation.
- notification.setContentText(getSingleMessageLittleText(context, subject));
+ notificationBuilder.setContentText(getSingleMessageLittleText(context, subject));
// The notification subtext will be the subject of the conversation for inbox
// notifications, or will based on the the label name for user label
// notifications.
- notification.setSubText(isInbox ?
+ notificationBuilder.setSubText(isInbox ?
notificationAccountDisplayName : notificationLabelName);
final NotificationCompat.BigTextStyle bigText =
- new NotificationCompat.BigTextStyle(notification);
+ new NotificationCompat.BigTextStyle(notificationBuilder);
// Seek the message cursor to the first unread message
final Message message;
@@ -1290,7 +1301,7 @@
folderPreferences.getNotificationActions(account);
NotificationActionUtils.addNotificationActions(context, notificationIntent,
- notification, wearExtender, account, conversation, message,
+ notificationBuilder, wearExtender, account, conversation, message,
folder, notificationId, when, notificationActions);
}
} else {
@@ -1298,18 +1309,21 @@
// The title of a single conversation notification is built from both the sender
// and subject of the new message.
- notification.setContentTitle(
+ notificationBuilder.setContentTitle(
getSingleMessageNotificationTitle(context, from, subject));
// The notification content will be the subject of the conversation for inbox
// notifications, or will based on the the label name for user label
// notifications.
- notification.setContentText(
+ notificationBuilder.setContentText(
isInbox ? notificationAccountDisplayName : notificationLabelName);
// For a single new conversation, the ticker is based on the sender's name.
result.notificationTicker = from;
}
+
+ tagNotificationsWithPeople(context, notificationBuilder, sendersList,
+ account.getAccountManagerAccount().name, contactFetcher);
} finally {
if (messageCursor != null) {
messageCursor.close();
@@ -1321,6 +1335,88 @@
return result;
}
+ /**
+ * Iterates through all senders, retrieves contact lookup Uris for each sender, and tags the
+ * given notification with these Uris
+ * @param context
+ * @param notificationBuilder
+ * @param sendersList List of unique senders to be tagged with the conversation
+ * @param accountName
+ * @param contactFetcher Implementation of ContactLookupUriFetcher (null by default)
+ */
+ private static void tagNotificationsWithPeople(Context context,
+ NotificationCompat.Builder notificationBuilder, HashSet<String> sendersList,
+ String accountName, ContactFetcher contactFetcher) {
+ // If there is a ContactLookupUriFetcher, go through all unique senders
+ // in the combined notification and add each one as a person.
+ if (contactFetcher != null) {
+ for (final String sender : sendersList) {
+ final Uri contactLookupUri =
+ contactFetcher.getContactLookupUri(context,
+ accountName, sender);
+
+ if (contactLookupUri != null) {
+ notificationBuilder.addPerson(contactLookupUri.toString());
+ }
+ }
+
+ // If implementation for the fetcher is not provided, rely on the ContentResolver
+ // to query for contacts and tag the notification
+ } else {
+ findAndTagContacts(context, sendersList, notificationBuilder);
+ }
+ }
+
+ /**
+ * Queries for contact id and lookup key to tag the notification with Person objects
+ * based on the addresses given.
+ * @param context
+ * @param addresses set of addresses to tag the single notification with
+ * @param notificationBuilder
+ */
+ private static void findAndTagContacts(Context context,
+ HashSet<String> addresses, NotificationCompat.Builder notificationBuilder) {
+ final ArrayList<String> whereArgs = new ArrayList<String>(addresses);
+ final StringBuilder whereBuilder = new StringBuilder();
+ final String[] questionMarks = new String[addresses.size()];
+
+ Arrays.fill(questionMarks, "?");
+ whereBuilder.append(Email.DATA1 + " IN (").
+ append(TextUtils.join(",", questionMarks)).
+ append(")");
+
+ final ContentResolver resolver = context.getContentResolver();
+ final Cursor c = resolver.query(Email.CONTENT_URI,
+ new String[] {Email.CONTACT_ID, ContactsContract.Contacts.LOOKUP_KEY},
+ whereBuilder.toString(),
+ whereArgs.toArray(new String[0]), null);
+
+ if (c == null) {
+ // No query results - no contacts to tag
+ return;
+ }
+
+ final int contactIdCol = c.getColumnIndex(Email.CONTACT_ID);
+ final int lookupKeyCol = c.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY);
+
+ try {
+ while (c.moveToNext()) {
+ c.getString(lookupKeyCol);
+
+ // Get lookup uri based on id and lookup key
+ final Uri contactLookupUri = ContactsContract.Contacts.getLookupUri(
+ c.getLong(contactIdCol), c.getString(lookupKeyCol));
+
+ // Add Person if uri is found
+ if (contactLookupUri != null) {
+ notificationBuilder.addPerson(contactLookupUri.toString());
+ }
+ }
+ } finally {
+ c.close();
+ }
+ }
+
private static String getWrappedFromString(String from) {
if (from == null) {
LogUtils.e(LOG_TAG, "null from string in getWrappedFromString");
@@ -1653,7 +1749,7 @@
private static ContactIconInfo getContactIcon(final Context context, String accountName,
final String displayName, final String senderAddress, final Folder folder,
- final ContactPhotoFetcher photoFetcher) {
+ final ContactFetcher contactFetcher) {
if (Looper.myLooper() == Looper.getMainLooper()) {
throw new IllegalStateException(
"getContactIcon should not be called on the main thread.");
@@ -1674,8 +1770,8 @@
final int idealWearableBgHeight =
res.getDimensionPixelSize(R.dimen.wearable_background_height);
- if (photoFetcher != null) {
- contactIconInfo = photoFetcher.getContactPhoto(context, accountName,
+ if (contactFetcher != null) {
+ contactIconInfo = contactFetcher.getContactPhoto(context, accountName,
senderAddress, idealIconWidth, idealIconHeight, idealWearableBgWidth,
idealWearableBgHeight);
} else {
diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index fdbfefa..b3bdd7e 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -35,6 +35,7 @@
import android.os.Build;
import android.os.Bundle;
import android.provider.Browser;
+import android.support.annotation.Nullable;
import android.support.v4.text.TextUtilsCompat;
import android.support.v4.view.ViewCompat;
import android.text.SpannableString;
@@ -1048,7 +1049,7 @@
return -1;
}
- public static Address getAddress(Map<String, Address> cache, String emailStr) {
+ public static @Nullable Address getAddress(Map<String, Address> cache, String emailStr) {
Address addr;
synchronized (cache) {
addr = cache.get(emailStr);
diff --git a/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java b/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java
index bd96de0..dc293e1 100644
--- a/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java
+++ b/src/com/android/mail/widget/WidgetConversationListItemViewBuilder.java
@@ -125,8 +125,8 @@
/*
* Add size, color and style to a given text
*/
- private static CharSequence addStyle(CharSequence text, int size, int color) {
- SpannableStringBuilder builder = new SpannableStringBuilder(text);
+ private static SpannableStringBuilder addStyle(CharSequence text, int size, int color) {
+ final SpannableStringBuilder builder = new SpannableStringBuilder(text);
builder.setSpan(
new AbsoluteSizeSpan(size), 0, text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
if (color != 0) {
@@ -152,7 +152,11 @@
// Add style to date
final int dateColor = isUnread ? DATE_TEXT_COLOR_UNREAD : DATE_TEXT_COLOR_READ;
- final CharSequence styledDate = addStyle(date, dateFontSize, dateColor);
+ final SpannableStringBuilder dateBuilder = addStyle(date, dateFontSize, dateColor);
+ if (isUnread) {
+ dateBuilder.setSpan(new StyleSpan(Typeface.BOLD), 0, date.length(),
+ Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ }
subject = Conversation.getSubjectForDisplay(context, null /* badgeText */, subject);
final SpannableStringBuilder subjectBuilder = new SpannableStringBuilder(subject);
@@ -180,7 +184,7 @@
final RemoteViews remoteViews = new RemoteViews(
context.getPackageName(), R.layout.widget_conversation_list_item);
remoteViews.setTextViewText(R.id.widget_senders, senders);
- remoteViews.setTextViewText(R.id.widget_date, styledDate);
+ remoteViews.setTextViewText(R.id.widget_date, dateBuilder);
remoteViews.setTextViewText(R.id.widget_subject, styledSubject);
remoteViews.setTextViewText(R.id.widget_snippet, styledSnippet);
if (paperclipBitmap != null) {
diff --git a/tests/src/com/android/mail/browse/SendersFormattingTests.java b/tests/src/com/android/mail/browse/SendersFormattingTests.java
index ecec4df..c55e03b 100644
--- a/tests/src/com/android/mail/browse/SendersFormattingTests.java
+++ b/tests/src/com/android/mail/browse/SendersFormattingTests.java
@@ -112,4 +112,98 @@
assertEquals(before.firstUnreadSnippet, after.firstUnreadSnippet);
assertEquals(before.lastSnippet, after.lastSnippet);
}
+
+ public void testSenderAvatarIsSenderOfFirstUnreadMessage() {
+ final ConversationInfo conv = createConversationInfo();
+ conv.addParticipant(new ParticipantInfo("a", "a@a.com", 0, true));
+ conv.addParticipant(new ParticipantInfo("b", "b@b.com", 0, false));
+ conv.addParticipant(new ParticipantInfo("c", "c@c.com", 0, false));
+
+ final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+ final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+ final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+ new ConversationItemViewModel.SenderAvatarModel();
+
+ SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+ senderAvatarModel, null, false, false);
+
+ assertEquals("b@b.com", senderAvatarModel.getEmailAddress());
+ assertEquals("b", senderAvatarModel.getName());
+ }
+
+ public void testSenderAvatarIsLastSenderIfAllMessagesAreRead() {
+ final ConversationInfo conv = createConversationInfo();
+ conv.addParticipant(new ParticipantInfo("a", "a@a.com", 0, true));
+ conv.addParticipant(new ParticipantInfo("b", "b@b.com", 0, true));
+ conv.addParticipant(new ParticipantInfo("c", "c@c.com", 0, true));
+
+ final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+ final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+ final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+ new ConversationItemViewModel.SenderAvatarModel();
+
+ SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+ senderAvatarModel, null, false, false);
+
+ assertEquals("c@c.com", senderAvatarModel.getEmailAddress());
+ assertEquals("c", senderAvatarModel.getName());
+ }
+
+ public void testSenderAvatarIsLastSenderThatIsNotTheCurrentAccountIfAllMessagesAreRead() {
+ final ConversationInfo conv = createConversationInfo();
+ conv.addParticipant(new ParticipantInfo("a", "a@a.com", 0, true));
+ conv.addParticipant(new ParticipantInfo("b", "b@b.com", 0, true));
+ // empty name indicates it is the current account
+ conv.addParticipant(new ParticipantInfo("", "c@c.com", 0, true));
+
+ final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+ final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+ final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+ new ConversationItemViewModel.SenderAvatarModel();
+
+ SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+ senderAvatarModel, null, false, false);
+
+ assertEquals("b@b.com", senderAvatarModel.getEmailAddress());
+ assertEquals("b", senderAvatarModel.getName());
+ }
+
+ public void testSenderAvatarIsCurrentAccountIfAllSendersAreCurrentAccount() {
+ final ConversationInfo conv = createConversationInfo();
+ // empty name indicates it is the current account
+ conv.addParticipant(new ParticipantInfo("", "a@a.com", 0, true));
+
+ final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+ final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+ final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+ new ConversationItemViewModel.SenderAvatarModel();
+
+ SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+ senderAvatarModel, null, false, false);
+
+ assertEquals("a@a.com", senderAvatarModel.getEmailAddress());
+ assertEquals("", senderAvatarModel.getName());
+ }
+
+ /**
+ * Two senders in a thread should be kept distinct if they have unique email addresses, even if
+ * they happen to share the same name.
+ */
+ public void testSenderNamesWhenNamesMatchButEmailAddressesDiffer() {
+ final ConversationInfo conv = createConversationInfo();
+ conv.addParticipant(new ParticipantInfo("Andrew", "aholmes@awesome.com", 0, true));
+ conv.addParticipant(new ParticipantInfo("Andrew", "ajohnson@wicked.com", 0, true));
+
+ final ArrayList<SpannableString> styledSenders = Lists.newArrayList();
+ final ArrayList<String> displayableSenderNames = Lists.newArrayList();
+ final ConversationItemViewModel.SenderAvatarModel senderAvatarModel =
+ new ConversationItemViewModel.SenderAvatarModel();
+
+ SendersView.format(getContext(), conv, "", 100, styledSenders, displayableSenderNames,
+ senderAvatarModel, null, false, false);
+
+ assertEquals(2, displayableSenderNames.size());
+ assertEquals("Andrew", displayableSenderNames.get(0));
+ assertEquals("Andrew", displayableSenderNames.get(1));
+ }
}
\ No newline at end of file
