Merge "Swipe to refresh improvements" into jb-ub-mail-ur9
diff --git a/Android.mk b/Android.mk
index a1c9cb6..3c130fc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,6 +34,7 @@
LOCAL_STATIC_JAVA_LIBRARIES += android-common
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES += unified-email-analytics
LOCAL_SDK_VERSION := current
diff --git a/analytics/Android.mk b/analytics/Android.mk
new file mode 100644
index 0000000..9752f95
--- /dev/null
+++ b/analytics/Android.mk
@@ -0,0 +1,7 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
+ unified-email-analytics:libGoogleAnalyticsV2.jar
+
+include $(BUILD_MULTI_PREBUILT)
diff --git a/analytics/libGoogleAnalyticsV2.jar b/analytics/libGoogleAnalyticsV2.jar
new file mode 100755
index 0000000..48e1b1d
--- /dev/null
+++ b/analytics/libGoogleAnalyticsV2.jar
Binary files differ
diff --git a/assets/script.js b/assets/script.js
index 4632b26..d822535 100644
--- a/assets/script.js
+++ b/assets/script.js
@@ -261,6 +261,8 @@
if (!done) {
// OK, that wasn't enough. Find tables with widths and override their widths.
+ // Also ensure that any use of 'table-layout: fixed' is negated, since using
+ // that with 'width: auto' causes erratic table width.
nodes = ENABLE_MUNGE_TABLES ? el.querySelectorAll("table") : [];
touched = addClassToElements(nodes, shouldMungeTable, "munged",
actionLog);
diff --git a/res/color/account_item_text_color.xml b/res/color/account_item_text_color.xml
new file mode 100644
index 0000000..ee283b2
--- /dev/null
+++ b/res/color/account_item_text_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_selected="true" android:color="@color/account_item_selected_text_color" />
+ <item android:color="@color/dark_gray_text_color" />
+</selector>
diff --git a/res/color/folder_item_text_color.xml b/res/color/folder_item_text_color.xml
new file mode 100644
index 0000000..ab79a8d
--- /dev/null
+++ b/res/color/folder_item_text_color.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_activated="true" android:color="@android:color/white" />
+ <item android:color="@color/dark_gray_text_color" />
+</selector>
diff --git a/res/drawable-hdpi/btn_star_off_focused_email_holo_light.png b/res/drawable-hdpi/btn_star_off_focused_email_holo_light.png
deleted file mode 100644
index 7867116..0000000
--- a/res/drawable-hdpi/btn_star_off_focused_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png b/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png
deleted file mode 100644
index 5076fbf..0000000
--- a/res/drawable-hdpi/btn_star_off_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_off_pressed_email_holo_light.png b/res/drawable-hdpi/btn_star_off_pressed_email_holo_light.png
deleted file mode 100644
index f6a7aa6..0000000
--- a/res/drawable-hdpi/btn_star_off_pressed_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_focused_email_holo_light.png b/res/drawable-hdpi/btn_star_on_focused_email_holo_light.png
deleted file mode 100644
index 1c1d49a..0000000
--- a/res/drawable-hdpi/btn_star_on_focused_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png b/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png
deleted file mode 100644
index 3042cb7..0000000
--- a/res/drawable-hdpi/btn_star_on_normal_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/btn_star_on_pressed_email_holo_light.png b/res/drawable-hdpi/btn_star_on_pressed_email_holo_light.png
deleted file mode 100644
index f6a7aa6..0000000
--- a/res/drawable-hdpi/btn_star_on_pressed_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/drawer_shadow_tablet.9.png b/res/drawable-hdpi/drawer_shadow_tablet.9.png
index 294c591..89e114f 100644
--- a/res/drawable-hdpi/drawer_shadow_tablet.9.png
+++ b/res/drawable-hdpi/drawer_shadow_tablet.9.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_drawer_divider.9.png b/res/drawable-hdpi/ic_drawer_divider.9.png
new file mode 100644
index 0000000..fed618e
--- /dev/null
+++ b/res/drawable-hdpi/ic_drawer_divider.9.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_move_to_holo_light.png b/res/drawable-hdpi/ic_menu_move_to_holo_light.png
new file mode 100644
index 0000000..63d1186
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_move_to_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_menu_moveto_holo_light.png b/res/drawable-hdpi/ic_menu_moveto_holo_light.png
deleted file mode 100644
index 9ea69f4..0000000
--- a/res/drawable-hdpi/ic_menu_moveto_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_radiobutton.png b/res/drawable-hdpi/ic_radiobutton.png
new file mode 100644
index 0000000..e9acce9
--- /dev/null
+++ b/res/drawable-hdpi/ic_radiobutton.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_radiobutton_selected.png b/res/drawable-hdpi/ic_radiobutton_selected.png
new file mode 100644
index 0000000..8a9dca9
--- /dev/null
+++ b/res/drawable-hdpi/ic_radiobutton_selected.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_focused_email_holo_light.png b/res/drawable-mdpi/btn_star_off_focused_email_holo_light.png
deleted file mode 100644
index e6d3cc5..0000000
--- a/res/drawable-mdpi/btn_star_off_focused_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_off_pressed_email_holo_light.png b/res/drawable-mdpi/btn_star_off_pressed_email_holo_light.png
deleted file mode 100644
index ec7a335..0000000
--- a/res/drawable-mdpi/btn_star_off_pressed_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_focused_email_holo_light.png b/res/drawable-mdpi/btn_star_on_focused_email_holo_light.png
deleted file mode 100644
index b72dd87..0000000
--- a/res/drawable-mdpi/btn_star_on_focused_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/btn_star_on_pressed_email_holo_light.png b/res/drawable-mdpi/btn_star_on_pressed_email_holo_light.png
deleted file mode 100644
index ec7a335..0000000
--- a/res/drawable-mdpi/btn_star_on_pressed_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/drawer_shadow_tablet.9.png b/res/drawable-mdpi/drawer_shadow_tablet.9.png
index c798c84..ee25871 100644
--- a/res/drawable-mdpi/drawer_shadow_tablet.9.png
+++ b/res/drawable-mdpi/drawer_shadow_tablet.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_drawer_divider.9.png b/res/drawable-mdpi/ic_drawer_divider.9.png
new file mode 100644
index 0000000..8fe676a
--- /dev/null
+++ b/res/drawable-mdpi/ic_drawer_divider.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_move_to_holo_light.png b/res/drawable-mdpi/ic_menu_move_to_holo_light.png
new file mode 100644
index 0000000..3386449
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_move_to_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_moveto_holo_light.png b/res/drawable-mdpi/ic_menu_moveto_holo_light.png
deleted file mode 100644
index bced7e9..0000000
--- a/res/drawable-mdpi/ic_menu_moveto_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_radiobutton.png b/res/drawable-mdpi/ic_radiobutton.png
new file mode 100644
index 0000000..ab4d420
--- /dev/null
+++ b/res/drawable-mdpi/ic_radiobutton.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_radiobutton_selected.png b/res/drawable-mdpi/ic_radiobutton_selected.png
new file mode 100644
index 0000000..4180c72
--- /dev/null
+++ b/res/drawable-mdpi/ic_radiobutton_selected.png
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_focused_email_holo_light.png b/res/drawable-xhdpi/btn_star_off_focused_email_holo_light.png
deleted file mode 100644
index c1c5079..0000000
--- a/res/drawable-xhdpi/btn_star_off_focused_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_off_pressed_email_holo_light.png b/res/drawable-xhdpi/btn_star_off_pressed_email_holo_light.png
deleted file mode 100644
index b95297d..0000000
--- a/res/drawable-xhdpi/btn_star_off_pressed_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_focused_email_holo_light.png b/res/drawable-xhdpi/btn_star_on_focused_email_holo_light.png
deleted file mode 100644
index def5cbb..0000000
--- a/res/drawable-xhdpi/btn_star_on_focused_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/btn_star_on_pressed_email_holo_light.png b/res/drawable-xhdpi/btn_star_on_pressed_email_holo_light.png
deleted file mode 100644
index b95297d..0000000
--- a/res/drawable-xhdpi/btn_star_on_pressed_email_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/drawer_shadow_tablet.9.png b/res/drawable-xhdpi/drawer_shadow_tablet.9.png
index a83f9dc..e1733ff 100644
--- a/res/drawable-xhdpi/drawer_shadow_tablet.9.png
+++ b/res/drawable-xhdpi/drawer_shadow_tablet.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_drawer_divider.9.png b/res/drawable-xhdpi/ic_drawer_divider.9.png
new file mode 100644
index 0000000..05a53b4
--- /dev/null
+++ b/res/drawable-xhdpi/ic_drawer_divider.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_move_to_holo_light.png b/res/drawable-xhdpi/ic_menu_move_to_holo_light.png
new file mode 100644
index 0000000..5e712aa
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_move_to_holo_light.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_moveto_holo_light.png b/res/drawable-xhdpi/ic_menu_moveto_holo_light.png
deleted file mode 100644
index 5589410..0000000
--- a/res/drawable-xhdpi/ic_menu_moveto_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_radiobutton.png b/res/drawable-xhdpi/ic_radiobutton.png
new file mode 100644
index 0000000..d6cc830
--- /dev/null
+++ b/res/drawable-xhdpi/ic_radiobutton.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_radiobutton_selected.png b/res/drawable-xhdpi/ic_radiobutton_selected.png
new file mode 100644
index 0000000..05adaf9
--- /dev/null
+++ b/res/drawable-xhdpi/ic_radiobutton_selected.png
Binary files differ
diff --git a/res/drawable/account_item.xml b/res/drawable/account_item.xml
index 3d1d535..5b65b63 100644
--- a/res/drawable/account_item.xml
+++ b/res/drawable/account_item.xml
@@ -19,5 +19,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo" />
<item android:state_focused="true" android:drawable="@drawable/list_focused_holo" />
- <item android:drawable="@android:color/transparent" />
+ <item android:drawable="@drawable/ic_drawer_divider" />
</selector>
diff --git a/res/drawable/account_radio_button.xml b/res/drawable/account_radio_button.xml
new file mode 100644
index 0000000..d2c4073
--- /dev/null
+++ b/res/drawable/account_radio_button.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2013 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_selected="true" android:drawable="@drawable/ic_radiobutton_selected" />
+ <item android:drawable="@drawable/ic_radiobutton" />
+</selector>
diff --git a/res/drawable/folder_item.xml b/res/drawable/folder_item.xml
index 0324aa3..ef80e87 100644
--- a/res/drawable/folder_item.xml
+++ b/res/drawable/folder_item.xml
@@ -20,5 +20,5 @@
<item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo" />
<item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
<item android:state_focused="true" android:drawable="@drawable/list_focused_holo" />
- <item android:drawable="@android:color/transparent" />
+ <item android:drawable="@drawable/ic_drawer_divider" />
</selector>
diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml
index 9121b60..1781761 100644
--- a/res/layout/account_item.xml
+++ b/res/layout/account_item.xml
@@ -29,31 +29,41 @@
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" />
+ <ImageView
+ android:id="@+id/account_radio_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/account_item_left_margin"
+ android:src="@drawable/account_radio_button"
+ android:layout_centerVertical="true"/>
+
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_centerVertical="true"
- android:layout_alignParentLeft="true" >
+ android:layout_toRightOf="@id/account_radio_button"
+ android:layout_alignWithParentIfMissing="true"
+ android:layout_marginLeft="@dimen/account_item_left_margin"
+ android:layout_marginRight="@dimen/account_item_right_margin"
+ android:layout_centerVertical="true" >
<TextView
android:id="@+id/name"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
- android:layout_marginLeft="@dimen/account_item_left_margin"
android:layout_marginRight="@dimen/account_item_right_margin"
android:includeFontPadding="false"
android:singleLine="true"
android:ellipsize="end"
- android:textColor="@color/folder_item_text_color"
+ android:textColor="@color/account_item_text_color"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/unread"
style="@style/UnreadCount"
- android:layout_marginRight="@dimen/account_item_right_margin"
android:layout_alignWithParentIfMissing="true"
- android:layout_alignParentRight="true" />
+ android:layout_alignParentRight="true"
+ android:textColor="@color/account_item_text_color" />
</LinearLayout>
</com.android.mail.ui.AccountItemView>
diff --git a/res/layout/actionbar_legacy_title.xml b/res/layout/actionbar_legacy_title.xml
new file mode 100644
index 0000000..e91f81d
--- /dev/null
+++ b/res/layout/actionbar_legacy_title.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2013 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_height="match_parent"
+ android:id="@+id/legacy_title_container"
+ android:orientation="vertical"
+ android:gravity="center_vertical"
+ android:background="?android:attr/actionBarItemBackground"
+ style="@style/AccountSpinnerStyle" >
+ <TextView
+ android:id="@+id/legacy_title"
+ style="@style/AccountSpinnerAnchorTextPrimary"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:includeFontPadding="false"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <TextView
+ android:id="@+id/legacy_subtitle"
+ style="@style/AccountSpinnerAnchorTextSecondary"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:includeFontPadding="false"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+</LinearLayout>
diff --git a/res/layout/actionbar_view.xml b/res/layout/actionbar_view.xml
index c216d98..51c5868 100644
--- a/res/layout/actionbar_view.xml
+++ b/res/layout/actionbar_view.xml
@@ -17,11 +17,14 @@
-->
<!--
- The custom action bar view Gmail uses. This currently shows an unread count and a subject
- (in subject view). The folder name and account name are standard title/subtitle text.
+ The custom action bar view Gmail uses.
-->
<com.android.mail.ui.MailActionBarView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal" >
+
+ <!-- View to display the title on pre-MR 1.1 devices -->
+ <include layout="@layout/actionbar_legacy_title" />
+
</com.android.mail.ui.MailActionBarView>
diff --git a/res/layout/conversation_item_view_wide.xml b/res/layout/conversation_item_view_wide.xml
index e175bc0..91cd747 100644
--- a/res/layout/conversation_item_view_wide.xml
+++ b/res/layout/conversation_item_view_wide.xml
@@ -78,33 +78,37 @@
android:layout_marginRight="8dp"
android:src="@drawable/ic_badge_reply_holo_light" />
- <!-- for Gmail -->
- <ImageView
- android:id="@+id/personal_indicator"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="-1dp"
- android:layout_marginLeft="-2dp"
- android:layout_marginRight="2dp"
- android:src="@drawable/ic_email_caret_single" />
-
<TextView
android:id="@+id/senders"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_marginRight="27dp"
android:textSize="18sp"
android:lines="1"
android:includeFontPadding="false"
android:text="@string/long_string" />
+ <FrameLayout
+ android:layout_width="54dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical">
+
+ <!-- for Gmail -->
+ <ImageView
+ android:id="@+id/personal_indicator"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="8dp"
+ android:layout_gravity="right"
+ android:src="@drawable/ic_email_caret_single" />
+
+ </FrameLayout>
+
<TextView
android:id="@+id/subject"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
- android:layout_marginLeft="27dp"
android:lines="2"
android:textSize="14sp"
android:includeFontPadding="false"
diff --git a/res/layout/folder_item.xml b/res/layout/folder_item.xml
index 1dcbeb9..ae4890a 100644
--- a/res/layout/folder_item.xml
+++ b/res/layout/folder_item.xml
@@ -44,7 +44,6 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/folder_list_item_left_margin"
- android:layout_marginRight="4dp"
android:visibility="gone" />
<LinearLayout
@@ -75,7 +74,8 @@
style="@style/UnreadCount"
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentRight="true"
- android:layout_alignBaseline="@id/name" />
+ android:layout_alignBaseline="@id/name"
+ android:textColor="@color/folder_item_text_color" />
<TextView
android:id="@+id/unseen"
diff --git a/res/layout/folder_list.xml b/res/layout/folder_list.xml
index 517f041..2b01816 100644
--- a/res/layout/folder_list.xml
+++ b/res/layout/folder_list.xml
@@ -26,7 +26,5 @@
android:layout_height="match_parent"
android:cacheColorHint="@android:color/transparent"
android:drawSelectorOnTop="false"
- android:fadingEdge="none"
- android:divider="@color/folder_list_divider_color"
- android:dividerHeight="1dp" />
+ android:fadingEdge="none"/>
</com.android.mail.ui.FolderListLayout>
diff --git a/res/layout/folder_list_header.xml b/res/layout/folder_list_header.xml
index dbc3276..a600541 100644
--- a/res/layout/folder_list_header.xml
+++ b/res/layout/folder_list_header.xml
@@ -21,13 +21,13 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="40dp"
+ android:minHeight="44dp"
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_item_left_margin"
- android:paddingRight="@dimen/folder_list_item_right_margin"
+ android:paddingLeft="@dimen/folder_list_heading_padding_side"
+ android:paddingRight="@dimen/folder_list_heading_padding_side"
android:paddingBottom="@dimen/folder_list_heading_padding_bottom"
- android:background="@drawable/drawer_line" />
+ style="?android:attr/listSeparatorTextViewStyle" />
diff --git a/res/layout/one_pane_activity.xml b/res/layout/one_pane_activity.xml
index 901f6e4..b236819 100644
--- a/res/layout/one_pane_activity.xml
+++ b/res/layout/one_pane_activity.xml
@@ -20,17 +20,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <FrameLayout
- android:id="@+id/content_pane"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
- <include layout="@layout/conversation_pager" />
-
+ <!-- DrawerLayout current only supports one content view (b/8752191) -->
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
+ <FrameLayout
+ android:id="@+id/content_pane"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <include layout="@layout/conversation_pager" />
+
<com.android.mail.ui.ActionableToastBar
android:id="@+id/toast_bar"
style="@style/ToastBarStyle" />
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 91e325e..128f45a 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -67,7 +67,8 @@
android:id="@+id/widget_unread_count"
style="@style/UnreadCount"
android:layout_marginRight="12dip"
- android:textColor="#777777" />
+ android:textColor="#777777"
+ android:visibility="gone" />
<ImageButton
android:id="@+id/widget_compose"
android:layout_width="wrap_content"
diff --git a/res/menu-sw600dp/conversation_actions.xml b/res/menu-sw600dp-land/conversation_actions.xml
similarity index 97%
rename from res/menu-sw600dp/conversation_actions.xml
rename to res/menu-sw600dp-land/conversation_actions.xml
index 85d34c8..3855c22 100644
--- a/res/menu-sw600dp/conversation_actions.xml
+++ b/res/menu-sw600dp-land/conversation_actions.xml
@@ -70,20 +70,20 @@
android:showAsAction="ifRoom"
android:icon="@drawable/ic_menu_mark_unread_holo_light" />
+ <item
+ android:id="@+id/move_to"
+ android:title="@string/menu_move_to"
+ android:showAsAction="ifRoom"
+ android:icon="@drawable/ic_menu_move_to_holo_light" />
+
<!-- Always available -->
<item
android:id="@+id/change_folder"
android:title="@string/menu_change_folders"
- android:showAsAction="never"
+ android:showAsAction="ifRoom"
android:icon="@drawable/ic_menu_folders_holo_light" />
<item
- android:id="@+id/move_to"
- android:title="@string/menu_move_to"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_moveto_holo_light" />
-
- <item
android:id="@+id/mark_important"
android:showAsAction="never"
android:title="@string/mark_important" />
diff --git a/res/menu-sw600dp-port/conversation_actions.xml b/res/menu-sw600dp-port/conversation_actions.xml
deleted file mode 100644
index cda6c1b..0000000
--- a/res/menu-sw600dp-port/conversation_actions.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 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.
--->
-<!-- Action bar items for the tablet when viewing a conversation -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Depends on AccountCapabilities.ARCHIVE and
- FolderCapabilities.ARCHIVE. Only one of archive or
- remove_folder are shown, and they have the same drawable, so
- show the first one.
- -->
- <item
- android:id="@+id/archive"
- android:title="@string/archive"
- android:showAsAction="always"
- android:icon="@drawable/archive"
- android:alphabeticShortcut="@string/trigger_y_char" />
- <item
- android:id="@+id/remove_folder"
- android:title="@string/remove_folder"
- android:showAsAction="always"
- android:icon="@drawable/ic_remove_label"
- android:alphabeticShortcut="@string/trigger_y_char"
- android:visible="false" />
- <!-- Depends on FolderCapabilities.DELETE -->
- <item
- android:id="@+id/delete"
- android:title="@string/delete"
- android:showAsAction="always"
- android:icon="@drawable/trash" />
- <!-- Depends on the user viewing a draft label, and the above menu item not being shown -->
- <item
- android:id="@+id/discard_drafts"
- android:title="@string/discard_drafts"
- android:showAsAction="always"
- android:icon="@drawable/trash"
- android:visible="false" />
-
- <item
- android:id="@+id/inside_conversation_unread"
- android:title="@string/mark_unread"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_mark_unread_holo_light" />
-
- <!-- Always available -->
- <item
- android:id="@+id/change_folder"
- android:title="@string/menu_change_folders"
- android:showAsAction="ifRoom"
- android:icon="@drawable/ic_menu_folders_holo_light" />
-
- <item
- android:id="@+id/move_to"
- android:title="@string/menu_move_to"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_moveto_holo_light" />
-
- <item
- android:id="@+id/mark_important"
- android:showAsAction="never"
- android:title="@string/mark_important" />
-
- <item
- android:id="@+id/mark_not_important"
- android:showAsAction="never"
- android:title="@string/mark_not_important" />
-
- <item
- android:id="@+id/mute"
- android:title="@string/mute"
- android:showAsAction="never" />
-
- <item
- android:id="@+id/report_spam"
- android:title="@string/report_spam"
- android:showAsAction="never"/>
-
- <!-- Depends on AccountCapabilities.REPORT_SPAM -->
- <item
- android:id="@+id/mark_not_spam"
- android:title="@string/mark_not_spam"
- android:showAsAction="never"
- android:visible="false" />
-
- <!-- Depends on AccountCapabilities.REPORT_PHISHING -->
- <item
- android:id="@+id/report_phishing"
- android:title="@string/report_phishing"
- android:showAsAction="never"
- android:visible="false" />
-
- <item android:id="@+id/settings"
- android:title="@string/menu_settings"
- android:showAsAction="never" />
-
- <item
- android:id="@+id/feedback_menu_item"
- android:showAsAction="never"
- android:icon="@android:drawable/ic_menu_send"
- android:title="@string/feedback" />
-
- <item
- android:id="@+id/help_info_menu_item"
- android:showAsAction="never"
- android:icon="@android:drawable/ic_menu_help"
- android:title="@string/help_and_info" />
-
-</menu>
diff --git a/res/menu-sw600dp-port/conversation_list_search_results_actions.xml b/res/menu-sw600dp-port/conversation_list_search_results_actions.xml
deleted file mode 100644
index ba722e6..0000000
--- a/res/menu-sw600dp-port/conversation_list_search_results_actions.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2012 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.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:id="@+id/compose"
- android:title="@string/menu_compose"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_compose_normal_holo_light"
- android:alphabeticShortcut="@string/trigger_compose_char" />
-
- <item android:id="@+id/search"
- android:title="@string/menu_search"
- android:showAsAction="always|collapseActionView"
- android:icon="@drawable/ic_menu_search_holo_light"
- android:actionLayout="@layout/mail_actionbar_searchview" />
-
- <item android:id="@+id/refresh"
- android:title="@string/refresh"
- android:showAsAction="never"
- android:icon="@drawable/ic_menu_refresh_holo_light"
- android:alphabeticShortcut="@string/trigger_refresh_char" />
-
- <item android:id="@+id/settings"
- android:title="@string/menu_settings"
- android:showAsAction="never" />
-
- <item
- android:id="@+id/feedback_menu_item"
- android:icon="@android:drawable/ic_menu_send"
- android:showAsAction="never"
- android:title="@string/feedback" />
-
- <item
- android:id="@+id/help_info_menu_item"
- android:icon="@android:drawable/ic_menu_help"
- android:showAsAction="never"
- android:title="@string/help_and_info" />
-
-</menu>
diff --git a/res/menu-sw600dp/conversation_list_selection_actions_menu.xml b/res/menu-sw600dp/conversation_list_selection_actions_menu.xml
deleted file mode 100644
index a3f5b26..0000000
--- a/res/menu-sw600dp/conversation_list_selection_actions_menu.xml
+++ /dev/null
@@ -1,124 +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.
--->
-
-<!-- Menu for the action mode invoked when items are selected
- in the conversation list. Order is important! -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Depends on AccountCapabilities.ARCHIVE and
- FolderCapabilities.ARCHIVE. Only one of archive or
- remove_folder are shown, and they have the same drawable, so
- show the first one.
- -->
- <item
- android:id="@+id/archive"
- android:title="@string/archive"
- android:showAsAction="always"
- android:icon="@drawable/archive"
- android:alphabeticShortcut="@string/trigger_y_char"/>
- <item
- android:id="@+id/remove_folder"
- android:title="@string/remove_folder"
- android:showAsAction="always"
- android:icon="@drawable/ic_remove_label"
- android:alphabeticShortcut="@string/trigger_y_char"
- android:visible="false" />
-
- <!-- Depends on FolderCapabilities.DELETE -->
- <item
- android:id="@+id/delete"
- android:title="@string/delete"
- android:showAsAction="always"
- android:icon="@drawable/trash"/>
- <!-- Depends on the user viewing a draft label, and the above menu item not being shown -->
- <item
- android:id="@+id/discard_drafts"
- android:title="@string/discard_drafts"
- android:showAsAction="always"
- android:icon="@drawable/trash"
- android:visible="false" />
-
- <!-- Only one of mark read or mark unread is shown. Both of these are set as always. -->
- <item
- android:id="@+id/read"
- android:title="@string/mark_read"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_mark_read_holo_light" />
-
- <item
- android:id="@+id/unread"
- android:title="@string/mark_unread"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_mark_unread_holo_light" />
-
- <item
- android:id="@+id/change_folder"
- android:showAsAction="ifRoom"
- android:title="@string/menu_change_folders"
- android:icon="@drawable/ic_menu_folders_holo_light" />
-
- <item android:id="@+id/star"
- android:title="@string/add_star"
- android:showAsAction="never"
- android:icon="@drawable/ic_menu_star_holo_light" />
-
- <item android:id="@+id/remove_star"
- android:title="@string/remove_star"
- android:showAsAction="never"
- android:icon="@drawable/ic_menu_star_off_holo_light" />
-
- <item
- android:id="@+id/move_to"
- android:title="@string/menu_move_to"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_moveto_holo_light" />
-
- <item
- android:id="@+id/mark_important"
- android:title="@string/mark_important"
- android:showAsAction="never"
- android:icon="@drawable/ic_email_caret_double" />
-
- <item
- android:id="@+id/mark_not_important"
- android:title="@string/mark_not_important"
- android:showAsAction="never"
- android:icon="@drawable/ic_email_caret_single" />
-
- <!-- Availability based on account -->
- <item
- android:id="@+id/mute"
- android:title="@string/mute"
- android:showAsAction="never" />
-
- <!-- Availability based on account -->
- <item
- android:id="@+id/report_spam"
- android:title="@string/report_spam"
- android:showAsAction="never" />
- <!-- Availability based on account -->
- <item
- android:id="@+id/mark_not_spam"
- android:title="@string/mark_not_spam"
- android:showAsAction="never" />
- <!-- Availability based on account -->
- <item
- android:id="@+id/report_phishing"
- android:title="@string/report_phishing"
- android:showAsAction="never" />
-
-</menu>
diff --git a/res/menu/conversation_actions.xml b/res/menu/conversation_actions.xml
index 65f89d2..67279f7 100644
--- a/res/menu/conversation_actions.xml
+++ b/res/menu/conversation_actions.xml
@@ -60,6 +60,13 @@
<!-- Always available -->
<item
+ android:id="@+id/move_to"
+ android:title="@string/menu_move_to"
+ android:showAsAction="always"
+ android:icon="@drawable/ic_menu_move_to_holo_light" />
+
+ <!-- Always available -->
+ <item
android:id="@+id/change_folder"
android:title="@string/menu_change_folders"
android:showAsAction="ifRoom"
@@ -67,13 +74,6 @@
<!-- Always available -->
<item
- android:id="@+id/move_to"
- android:title="@string/menu_move_to"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_moveto_holo_light" />
-
- <!-- Always available -->
- <item
android:id="@+id/mark_important"
android:title="@string/mark_important"
android:icon="@drawable/ic_email_caret_double" />
diff --git a/res/menu/conversation_list_menu.xml b/res/menu/conversation_list_menu.xml
index e2483b5..99b9db2 100644
--- a/res/menu/conversation_list_menu.xml
+++ b/res/menu/conversation_list_menu.xml
@@ -20,16 +20,16 @@
<!-- Always available -->
<item android:id="@+id/compose"
android:title="@string/menu_compose"
- android:showAsAction="always"
+ android:showAsAction="ifRoom"
android:icon="@drawable/ic_menu_compose_normal_holo_light"
android:alphabeticShortcut="@string/trigger_compose_char" />
<!-- Available only for accounts with SERVER_SEARCH and in a folder
that supports FOLDER_SERVER_SEARCH -->
<item android:id="@+id/search" android:title="@string/menu_search"
- android:showAsAction="always|collapseActionView"
- android:icon="@drawable/ic_menu_search_holo_light"
- android:actionLayout="@layout/mail_actionbar_searchview" />
+ android:showAsAction="always|collapseActionView"
+ android:icon="@drawable/ic_menu_search_holo_light"
+ android:actionLayout="@layout/mail_actionbar_searchview" />
<!-- Available only in the trash folder, when the account supports emptying it -->
<item android:id="@+id/empty_trash"
diff --git a/res/menu/conversation_list_search_results_actions.xml b/res/menu/conversation_list_search_results_actions.xml
index ab699d3..15769c9 100644
--- a/res/menu/conversation_list_search_results_actions.xml
+++ b/res/menu/conversation_list_search_results_actions.xml
@@ -20,19 +20,19 @@
<item android:id="@+id/compose"
android:title="@string/menu_compose"
- android:showAsAction="always"
+ android:showAsAction="ifRoom"
android:icon="@drawable/ic_menu_compose_normal_holo_light"
android:alphabeticShortcut="@string/trigger_compose_char" />
<item android:id="@+id/search"
android:title="@string/menu_search"
- android:showAsAction="always|collapseActionView"
+ android:showAsAction="ifRoom|collapseActionView"
android:icon="@drawable/ic_menu_search_holo_light"
android:actionLayout="@layout/mail_actionbar_searchview" />
<item android:id="@+id/refresh"
android:title="@string/refresh"
- android:showAsAction="ifRoom"
+ android:showAsAction="never"
android:icon="@drawable/ic_menu_refresh_holo_light"
android:alphabeticShortcut="@string/trigger_refresh_char" />
diff --git a/res/menu/conversation_list_selection_actions_menu.xml b/res/menu/conversation_list_selection_actions_menu.xml
index 27a2aec..c8823ae 100644
--- a/res/menu/conversation_list_selection_actions_menu.xml
+++ b/res/menu/conversation_list_selection_actions_menu.xml
@@ -66,6 +66,11 @@
android:showAsAction="always"
android:icon="@drawable/ic_menu_mark_unread_holo_light" />
+ <item
+ android:id="@+id/move_to"
+ android:title="@string/menu_move_to"
+ android:showAsAction="ifRoom"
+ android:icon="@drawable/ic_menu_move_to_holo_light" />
<item
android:id="@+id/change_folder"
@@ -84,12 +89,6 @@
android:icon="@drawable/ic_menu_star_off_holo_light" />
<item
- android:id="@+id/move_to"
- android:title="@string/menu_move_to"
- android:showAsAction="always"
- android:icon="@drawable/ic_menu_moveto_holo_light" />
-
- <item
android:id="@+id/mark_important"
android:title="@string/mark_important"
android:showAsAction="never"
diff --git a/res/raw/template_conversation_upper.html b/res/raw/template_conversation_upper.html
index 6222762..cd448e3 100644
--- a/res/raw/template_conversation_upper.html
+++ b/res/raw/template_conversation_upper.html
@@ -29,6 +29,7 @@
}
table.munged {
width: auto !important;
+ table-layout: auto !important;
}
td.munged {
width: auto !important;
diff --git a/res/values-af-sw600dp/strings.xml b/res/values-af-sw600dp/strings.xml
index cb96dc1..606b670 100644
--- a/res/values-af-sw600dp/strings.xml
+++ b/res/values-af-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Bestuur vouers"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a8b6f11..2f11a74 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Verander vouers"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Skuif na"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Vouerinstellings"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Die oorspronklike weergawe van hierdie boodskap is gewysig om op hierdie skerm te kan pas.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Vouers"</string>
<string name="folder_list_more" msgid="537172187223133825">"Meer"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Meer rekeninge"</string>
@@ -280,7 +279,7 @@
<string name="ok" msgid="8339355733816891026">"OK"</string>
<string name="done" msgid="3079981801778027540">"Klaar"</string>
<string name="cancel" msgid="8762981157252199115">"Kanselleer"</string>
- <string name="clear" msgid="3184687982186479442">"Vee uit"</string>
+ <string name="clear" msgid="3184687982186479442">"Maak skoon"</string>
<string name="close" msgid="419945428844076406">"Maak toe"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Geen vouers is vir hierdie rekening opgestel nie."</string>
<string-array name="sync_status">
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Om gesprekke te sien, sinkroniseer hierdie vouer."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkroniseer vouer"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> ongeleesde boodskap"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> ongeleesde boodskappe"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ ongeleesde boodskappe"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> ongelees"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ ongelees"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Sien nog gesprekke"</string>
<string name="loading_conversation" msgid="489160038366067983">"Laai tans…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Kies rekening"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Krimp wye boodskappe om op jou skerm te pas en laat zoem toe. Om hierdie opsie af te skakel, gaan na Instellings > Algemene instellings."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Antwoord"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Antwoord almal"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Stuur aan"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Argiveer"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Verwyder etiket"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Vee uit"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Merk as gelees"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Geargiveer"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiket verwyder"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Uitgevee"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nie gestel nie"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskappe"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Stil"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Voorkeur ActionBar-items"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Kies tot <xliff:g id="MAX">%1$d</xliff:g> handelinge"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Etiket: argiveer/verwyder"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Konsepte: vee uit/gooi weg"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Merk as gelees/ongelees"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Ster: voeg by/verwyder"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Merk as (on)belangrik"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Gee aan as (nie) strooipos"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Verwyder handeling"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Vee gesprekke uit eerder as om te argiveer"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Sleep om te verwyder"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"In gespreklys"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Trek af om te verfris"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Kyk tans vir pos"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Maak asblik leeg"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Maak strooipos leeg"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Maak navigasielaai oop"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Maak navigasielaai toe"</string>
</resources>
diff --git a/res/values-am-sw600dp/strings.xml b/res/values-am-sw600dp/strings.xml
index 06c6cc6..56916ec 100644
--- a/res/values-am-sw600dp/strings.xml
+++ b/res/values-am-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ ካርቦን ቅጂ/ስውር ቅጂ"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ ስውር ቅጂ"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"አቃፊዎችን አስተዳድር"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7beae5d..341aa66 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"አቃፊዎችን ቀይር"</string>
<string name="menu_move_to" msgid="9138296669516358542">"አንቀሳቅስ ወደ"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"የአቃፊ ቅንብሮች"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(ይህ መልዕክት ከዚህ ማያ ገጽ ጋር እንዲመጣጠን ተብሎ ከመጀመሪያው ስሪት ተሻሽሏል።)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"አቃፊዎች"</string>
<string name="folder_list_more" msgid="537172187223133825">"ተጨማሪ"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"ተጨማሪ መለያዎች"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"ውይይቶችን ለማየት ይህንን እቃፊ አመሳስል።"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"አቃፊ አመሳስል"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> ያልተነበበ መልዕክት"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> ያልተነበቡ መልዕክቶች"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ ያልተነበቡ መልዕክቶች"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> ያልተነበቡ"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ ያልተነበቡ"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"ተጨማሪ ውይይቶችን ዕይ"</string>
<string name="loading_conversation" msgid="489160038366067983">"በመጫን ላይ…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"መለያ ምረጥ"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"ሰፊ መልዕክቶች ከማያ ገጽዎ ጋር እንዲመጣጠኑ እና ማጉላትን ለማስቻል ያሳንሷቸው። ይህን አማራጭ ለማጥፋት ወደ > አጠቃላይ ቅንብሮች ይሂዱ።"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"ምላሽ ይስጡ"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"ለሁሉም ምላሽ ይስጡ"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"ያስተላልፉ"</string>
<string name="notification_action_archive" msgid="81978513898440040">"በማህደር ያስቀምጡ"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"መለያ ስም ያስወግዱ"</string>
<string name="notification_action_delete" msgid="327773454111551791">"ይሰርዙ"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"መነበቡን ምልክት ያድርጉበት"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"በማህደር የተቀመጠ"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"መለያ ስም ተወግዷል"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"ተሰርዟል"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"አልተወሰነም"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክቶች"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"ፀጥታ"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"የተመረጡ የActionBar ንጥሎች"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"እስከ <xliff:g id="MAX">%1$d</xliff:g> እርምጃዎች ይምረጡ"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"መለያ ስም በማህደር አስቀምጥ/አስወግድ"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"ረቂቆችን ሰርዝ/አስወግድ"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"እንደተነበበ/እንዳልተነበበ ምልክት አድርግበት"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"ኮከብ አክል/አስወግድ"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"አስፈላጊ እንደሆነ/እንዳልሆነ ምልክት ያድርጉበት"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"አይፈለጌ መልዕክት (አለ)መሆኑን ሪፖርት አድርግ"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"እርምጃ አስወግድ"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"ውይይቶች በማህደር ከማስቀመጥ ይልቅ ሰርዝ"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"ለማስወገድ ያንሸራትቱ"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"በውይይት ዝርዝር ውስጥ"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"ለማደስ ወደ ታች ያንሸራትቱ"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"መልዕክት በማየት ላይ"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"መጣያውን አጽዳው"</string>
+ <string name="empty_spam" msgid="930744491746508050">"አይፈለጌ መልዕክትን አጽዳው"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"የአሰሳ መሣቢያውን ክፈት"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"የአሰሳ መሣቢያውን ዝጋ"</string>
</resources>
diff --git a/res/values-ar-sw600dp/strings.xml b/res/values-ar-sw600dp/strings.xml
index 92f4d9d..6f7ba9e 100644
--- a/res/values-ar-sw600dp/strings.xml
+++ b/res/values-ar-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ نسخة إلى/ مخفية"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ نسخة مخفية الوجهة"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"إدارة المجلدات"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a4e179c..eaf52ef 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"تغيير المجلدات"</string>
<string name="menu_move_to" msgid="9138296669516358542">"نقل إلى"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"إعدادات المجلدات"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(تم تعديل هذه الرسالة من إصدارها الأصلي لملاءمة هذه الشاشة.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"المجلدات"</string>
<string name="folder_list_more" msgid="537172187223133825">"المزيد"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"مزيد من الحسابات"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"لعرض المحادثات، عليك مزامنة هذا المجلد."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"مزامنة المجلد"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> رسالة غير مقروءة"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> من الرسائل غير المقروءة"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"أكثر من <xliff:g id="COUNT">%1$d</xliff:g> من الرسائل غير المقروءة"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> مقروءة"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"أكثر من <xliff:g id="COUNT">%1$d</xliff:g> غير مقروءة"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"عرض المزيد من المحادثات"</string>
<string name="loading_conversation" msgid="489160038366067983">"جارٍ التحميل…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"اختيار حساب"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"يمكنك تصغير الرسائل الكبيرة لتناسب شاشتك كما يمكنك السماح بالتكبير. لإيقاف هذا الخيار، انتقل إلى إعدادات > إعدادات عامة."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"رد"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"الرد على الكل"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"إعادة توجيه"</string>
<string name="notification_action_archive" msgid="81978513898440040">"وضع في الأرشيف"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"إزالة التصنيف"</string>
<string name="notification_action_delete" msgid="327773454111551791">"حذف"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"وضع علامة كـ \"مقروءة\""</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"تمت الأرشفة"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"تمت إزالة التصنيف"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"تم الحذف"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"لم يتم التعيين"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> من الرسائل الجديدة"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"صامت"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"عناصر شريط الإجراءات المفضلة"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"تحديد ما يصل إلى <xliff:g id="MAX">%1$d</xliff:g> من الإجراءات"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"أرشفة/إزالة تصنيف"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"حذف/إلغاء المسودات"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"وضع علامة كمقروءة/غير مقروءة"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"إضافة/إزالة نجمة"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"وضع علامة كمهمة/غير مهمة"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"إبلاغ أنها رسالة غير مرغوب فيها/ليست رسالة غير مرغوب فيها"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"إجراء الإزالة"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"حذف المحادثات بدلاً من وضعها في الأرشيف"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"تمرير سريع للإزالة"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"في قائمة المحادثات"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"التمرير لأسفل للتحديث"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"التحقق من وجود بريد"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"إفراغ المهملات"</string>
+ <string name="empty_spam" msgid="930744491746508050">"إفراغ مجلد الرسائل غير المرغوب فيها"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"فتح ساحب التنقل"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"إغلاق ساحب التنقل"</string>
</resources>
diff --git a/res/values-be-sw600dp/strings.xml b/res/values-be-sw600dp/strings.xml
index 9464eaa..d649b15 100644
--- a/res/values-be-sw600dp/strings.xml
+++ b/res/values-be-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Копія/УК"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ схаваная копія"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Кiраванне тэчкамі"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index bd65d42..216a693 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Змена тэчкі"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Перанесці ў"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Налады тэчкi"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Гэтае паведамленне было змененае ў параўнанні з арыгіналам, каб адпавядаць гэтаму экрану.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Тэчкі"</string>
<string name="folder_list_more" msgid="537172187223133825">"Яшчэ"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Больш уліковых запісаў"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Сінхр. гэту тэчку, каб прагл. разм."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Сінхранізацыя тэчкi"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"Непрачытаныя паведамленнi: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- <item quantity="other" msgid="4103064420707175144">"Непрачытаных паведамленняў: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Непрачытаных паведамленняў: <xliff:g id="COUNT">%1$d</xliff:g>."</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Непрачытаных: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Непрачытаных: больш за <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Глядзець iншыя размовы"</string>
<string name="loading_conversation" msgid="489160038366067983">"Загрузка..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Выберыце ўліковы запіс"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Звужвайце шырокiя паведамленнi ў адпаведнасці з вашым экранам і павелічвайце маштаб. Каб адключыць гэту опцыю, перайдзіце ў меню Налады > Агульныя налады."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Адказаць"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Адказаць усім"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Наперад"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Архіваваць"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Выдаліць цэтлік"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Выдаліць"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Пазначыць як прачытанае"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Заархiвавана"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Цэтлiк выдалены"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Выдалены"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Дзеянні не заданыя"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Новых паведамленняў: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Ціхі рэжым"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Пераважныя элементы ActionBar"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Максiмальная колькасць прыкладанняў для вашага выбару: <xliff:g id="MAX">%1$d</xliff:g>"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Архiваваць/выдаліць цэтлiк"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Выдаліць/адмяніць чарнавiкi"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Пазначыць прачытаныя/непрачытаныя"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Дадац/выдаліць зорку"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Пазначыць як важнае/няважнае"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Паведамiць, што гэта спам/не спам"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Выдаліць дзеянне"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Выдаляць, а не архіваваць размовы"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Правядзіце, каб выдалiць"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"У спісе гутарак"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Правядзіце ўніз, каб абнавіць"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Праверка пошты"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Ачысціць кошык"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Пусты спам"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Адкрыць скрыню навігацыі"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Закрыць скрыню навігацыі"</string>
</resources>
diff --git a/res/values-bg-sw600dp/strings.xml b/res/values-bg-sw600dp/strings.xml
index 9434a8d..1c9a6e3 100644
--- a/res/values-bg-sw600dp/strings.xml
+++ b/res/values-bg-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Як/Ск"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Ск"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Управление на папките"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9dad542..7c59538 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Промяна на папките"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Преместване във:"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Настройки за папките"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Това съобщение е променено от оригиналната си версия, за да се побере на екрана.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
<string name="folder_list_more" msgid="537172187223133825">"Още"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Още профили"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"За да видите кореспонденциите, синхронизирайте тази папка."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизиране на папката"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> непрочетено съобщение"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> непрочетени съобщения"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"над <xliff:g id="COUNT">%1$d</xliff:g> непрочетени съобщения"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> непрочетени"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"над <xliff:g id="COUNT">%1$d</xliff:g> непрочетени"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Преглед на още кореспонденции"</string>
<string name="loading_conversation" msgid="489160038366067983">"Зарежда се…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Изберете профил"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Намалете голямата ширина на съобщенията, за да се поберат на екрана ви, и разрешете увеличаването на мащаба. За да изключите тази опция, отворете „Настройки“ > „Общи настройки“."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Отговор"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Отговор до всички"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Препращане"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Архивиране"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Етикет: Премахване"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Изтриване"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Означ. като прочетено"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Архивирано"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Етикетът е премахнат"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Изтрито"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Незададени"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> нови съобщения"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Тих режим"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Предпочитани елементи в лентата за действие"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Изберете до <xliff:g id="MAX">%1$d</xliff:g> действия"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Архив./премахване на етикет"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Изтрив./отхвърл. на чернови"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Означ. като прочетено/непроч."</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Добавяне/премахване на звезда"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Означ. като важно (маловажно)"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Подав. на сигнал „(Не е) Спам“"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Действие при премахване"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Изтриване вместо архивиране на кореспонденциите"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Прекарайте пръст, за да премахнете"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"В списък с кореспонденции"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Прекарайте пръст надолу, за да опресните"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Проверява се за поща"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Изчистване на кошчето"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Изчистване на нежеланата поща"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Отваряне на чекмеджето за навигация"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Затваряне на чекмеджето за навигация"</string>
</resources>
diff --git a/res/values-ca-sw600dp/strings.xml b/res/values-ca-sw600dp/strings.xml
index 7836c54..1fa280e 100644
--- a/res/values-ca-sw600dp/strings.xml
+++ b/res/values-ca-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cco"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Cco"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Gestiona les carpetes"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index ad13d15..654b413 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Canvia les carpetes"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Mou a"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Configuració de la carpeta"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(La versió original d\'aquest missatge s\'ha modificat perquè s\'adapti a la pantalla.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Carpetes"</string>
<string name="folder_list_more" msgid="537172187223133825">"Més"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Més comptes"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Sincron. la carpeta per veure conv."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronitza la carpeta"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> missatge no llegit"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> missatges no llegits"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ missatges no llegits"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> no llegits"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Més de <xliff:g id="COUNT">%1$d</xliff:g> no llegits"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Visualitza més converses"</string>
<string name="loading_conversation" msgid="489160038366067983">"S\'està carregant…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Selecciona un compte"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Canvia la mida dels missatges perquè s\'ajustin a la pantalla i permet ampliar-los. Per desactivar aquesta opció, vés a Configuració > General."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Respon"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Respon a tots"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Reenvia"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arxiva"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Elimina l\'etiqueta"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Suprimeix"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Marca com a llegit"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arxivat"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiqueta eliminada"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Suprimit"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Sense definir"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> missatges nous"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silenci"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Elements preferits de la barra d\'accions"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selecciona <xliff:g id="MAX">%1$d</xliff:g> accions com a màxim"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arxiva/suprimeix una etiqueta"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Suprimeix/descarta esborranys"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Marca com a llegit/no llegit"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Afegeix/suprimeix una estrella"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Marca com a (no) important"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Indica que (no) és brossa"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Suprimeix l\'acció"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Suprimeix les converses en comptes d\'arxivar-les"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Fes lliscar el dit per suprimir"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"A la llista de converses"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fes lliscar el dit cap avall per actualitzar."</string>
<string name="checking_for_mail" msgid="2301797903350897130">"S\'està comprovant si hi ha correu."</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Buida la paperera"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Buida el correu brossa"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Obre el calaix de navegació"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Tanca el calaix de navegació"</string>
</resources>
diff --git a/res/values-cs-sw600dp/strings.xml b/res/values-cs-sw600dp/strings.xml
index c6df3f3..5417f66 100644
--- a/res/values-cs-sw600dp/strings.xml
+++ b/res/values-cs-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Kopie/skrytá"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Skrytá kopie"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Správa složek"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8c73d78..89207bf 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Změnit složky"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Přesunout do"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Nastavení složek"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Zpráva byla oproti původní verzi upravena tak, aby se vešla na tuto obrazovku.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Složky"</string>
<string name="folder_list_more" msgid="537172187223133825">"Další"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Další účty"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Chcete-li zobrazit konverzace, synchronizujte tuto složku."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovat složku"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">">%d"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> nepřečtená zpráva"</item>
- <item quantity="other" msgid="4103064420707175144">"Nepřečtené zprávy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Nepřečtené zprávy: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Nepřečteno: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Nepřečteno: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Zobrazit další konverzace"</string>
<string name="loading_conversation" msgid="489160038366067983">"Načítá se..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Výběr účtu"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Zmenšit široké zprávy, aby se vešly na obrazovku, a umožnit přiblížení. Chcete-li povolit tuto možnost, přejděte na Nastavení > Obecná nastavení."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Odpovědět"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Odpovědět všem"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Předat dál"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archivovat"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Odebrat štítek"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Smazat"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Označ. jako přečtené"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Archivováno"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Štítek odstraněn"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Smazáno"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nenastaveno"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Počet nových zpráv: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tichý režim"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Upřednostňované položky na panelu akcí"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Vyberte akce (maximálně <xliff:g id="MAX">%1$d</xliff:g>)"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivovat/odstranit štítek"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Smazat/zahodit koncepty"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Ozn. jako přečtené/nepřečtené"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Přidat/odebrat hvězdičku"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Označit jako (ne)důležité"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"(Ne)nahlásit jako spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Akce odstranění"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Konverzace mazat, a nikoliv archivovat"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Přejetím prstem odstranit"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"V seznamu konverzací"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Seznam aktualizujete posunutím dolů."</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Vysypat koš"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Vyprázdnit složku se spamem"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Otevřít navigační složku"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Zavřít navigační složku"</string>
</resources>
diff --git a/res/values-da-sw600dp/strings.xml b/res/values-da-sw600dp/strings.xml
index 501443b..b22d390 100644
--- a/res/values-da-sw600dp/strings.xml
+++ b/res/values-da-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Administrer mapper"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0c65100..895b9a4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Skift mapper"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Flyt til"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Indstillinger for mapper"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Denne meddelelse er blevet ændret i forhold til originalversionen, så den passer til denne skærm)."</string>
<string name="folder_list_title" msgid="4276644062440415214">"Mapper"</string>
<string name="folder_list_more" msgid="537172187223133825">"Flere"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Flere konti"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Synkroniser denne mappe for at se samtaler."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkroniser mappe"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> ulæst besked"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> ulæste beskeder"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Over <xliff:g id="COUNT">%1$d</xliff:g> ulæste beskeder"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> ulæste"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ ulæste"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Vis flere samtaler"</string>
<string name="loading_conversation" msgid="489160038366067983">"Indlæser…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Vælg konto"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Gør brede meddelelser mindre, så de passer til din skærm og for at gøre det muligt at zoome ind. Hvis du vil deaktivere denne indstilling, skal du gå til Indstillinger > Generelle indstillinger."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Svar"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Svar alle"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Videresend"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arkivér"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Fjern etiket"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Slet"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Markér som læst"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arkiveret"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiketten blev fjernet"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Slettet"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Endnu ikke angivet"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nye beskeder"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Lydløs"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Foretrukne Actionbar-elementer"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Vælg op til <xliff:g id="MAX">%1$d</xliff:g> handlinger"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arkivér/fjern etiket"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Slet/kassér kladder"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Markér som læst/ulæst"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Tilføj/fjern stjerne"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Markér som vigtig/ikke vigtig"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Rapportér (ikke) som spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Fjern handling"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Slet i stedet for at arkivere samtaler"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Stryg med fingeren for at fjerne"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"På samtaleliste"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Stryg ned for at opdatere"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Tjekker for e-mails"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Tøm papirkurv"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Tøm spammappe"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Åbn navigationsskuffen"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Luk navigationsskuffen"</string>
</resources>
diff --git a/res/values-de-sw600dp/strings.xml b/res/values-de-sw600dp/strings.xml
index 9329ebc..ef0f56a 100644
--- a/res/values-de-sw600dp/strings.xml
+++ b/res/values-de-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Ordner verwalten"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a4a67fc..092321f 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Ordner ändern"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Verschieben nach"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Ordnereinstellungen"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"Die Originalversion dieser Nachricht wurde an den Bildschirm angepasst."</string>
<string name="folder_list_title" msgid="4276644062440415214">"Ordner"</string>
<string name="folder_list_more" msgid="537172187223133825">"Mehr"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Weitere Konten"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Ordner synchronisieren, um Konversationen einzublenden"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Ordner synchronisieren"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> ungelesene Nachricht"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> ungelesene Nachrichten"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Über <xliff:g id="COUNT">%1$d</xliff:g> ungelesene Nachrichten"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> ungelesene"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Mindestens <xliff:g id="COUNT">%1$d</xliff:g> ungelesene"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Weitere Konversationen ansehen"</string>
<string name="loading_conversation" msgid="489160038366067983">"Wird geladen..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Konto auswählen"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Breite Nachrichten an Ihren Bildschirm anpassen und Heranzoomen ermöglichen. Um diese Option zu deaktivieren, rufen Sie \"Einstellungen\" > \"Allgemeine Einstellungen\" auf."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Antworten"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Allen antworten"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Weiterleiten"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archivieren"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Label entfernen"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Löschen"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Als gelesen markieren"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Archiviert"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label entfernt"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Gelöscht"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nicht definiert"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachrichten"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Lautlos"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Bevorzugte ActionBar-Elemente"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Bis zu <xliff:g id="MAX">%1$d</xliff:g> Aktionen auswählen"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Label archivieren/entfernen"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Entwürfe löschen"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Als gelesen/ungelesen markieren"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Markierung hinzuf./entf."</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Als (nicht) wichtig markieren"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"(Nicht) als Spam melden"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Aktion entfernen"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Konversationen lieber löschen als archivieren"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Zum Entfernen wischen"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"In einer Unterhaltungsliste"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Zum Aktualisieren nach unten wischen"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Nachrichten werden abgerufen..."</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Papierkorb leeren"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Spam-Ordner leeren"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Navigationsleiste öffnen"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Navigationsleiste schließen"</string>
</resources>
diff --git a/res/values-el-sw600dp/strings.xml b/res/values-el-sw600dp/strings.xml
index b21bd68..78f9398 100644
--- a/res/values-el-sw600dp/strings.xml
+++ b/res/values-el-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Κοιν./Κρ.κοιν."</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Κρυφή κοιν."</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Διαχείριση φακέλων"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e882a90..940f960 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Αλλαγή φακέλων"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Μετακίνηση σε"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Ρυθμίσεις φακέλων"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Αυτό το μήνυμα έχει τροποποιηθεί από την αρχική του έκδοση έτσι ώστε να προσαρμόζεται σε αυτήν την οθόνη.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Φάκελοι"</string>
<string name="folder_list_more" msgid="537172187223133825">"Περισσότερα"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Περισσότεροι λογαριασμοί"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Συγχρ. τον φάκελο για προβ. συνομ."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Συγχρονισμός φακέλου"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> μη αναγνωσμένα μηνύματα"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> μη αναγνωσμένα μηνύματα"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ μη αναγνωσμένα μηνύματα"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> αναγνωσμένα"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ μη αναγνωσμένα"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Προβολή περισσότερων συνομιλιών"</string>
<string name="loading_conversation" msgid="489160038366067983">"Φόρτωση..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Επιλογή λογαριασμού"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Συρρικνώστε τα μεγάλα μηνύματα για να χωράνε στην οθόνη και να είναι δυνατή η μεγέθυνσή τους. Για να απενεργοποιήσετε αυτήν την επιλογή, μεταβείτε στο μενού Ρυθμίσεις > Γενικές ρυθμίσεις."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Απάντηση"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Απάντηση σε όλους"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Προώθηση"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Αρχειοθέτηση"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Κατάργηση ετικέτας"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Διαγραφή"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Επισήμανση ως αναγν."</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Αρχειοθετημένο"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Η ετικέτα καταργήθηκε"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Διαγραμμένο"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Δεν έχει ρυθμιστεί"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> νέα μηνύματα"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Σίγαση"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Προτιμώμενα στοιχεία ActionBar"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Επιλέξτε έως και <xliff:g id="MAX">%1$d</xliff:g> ενέργειες"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Αρχειοθ./κατάργηση ετικέτας"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Διαγραφή/απόρριψη προχείρων"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Επισήμανση ως αναγν./μη αναγν."</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Προσθήκη/κατάργηση αστεριού"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Επισήμανση ως (μη) σημαντικού"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Αναφορά ως (μη) ανεπιθύμητου"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Κατάργηση ενέργειας"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Διαγραφή αντί για αρχειοθέτηση συνομιλιών"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Σύρετε για να καταργήσετε"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Στη λίστα συνομιλιών"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Σύρετε προς τα κάτω για ανανέωση"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Γίνεται έλεγχος για αλληλογραφία"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Άδειασμα κάδου απορριμάτων"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Άδειασμα ανεπιθύμητων"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Άνοιγμα συρταριού πλοήγησης"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Κλείσιμο συρταριού πλοήγησης"</string>
</resources>
diff --git a/res/values-en-rGB-sw600dp/strings.xml b/res/values-en-rGB-sw600dp/strings.xml
index 106589b..e3ef654 100644
--- a/res/values-en-rGB-sw600dp/strings.xml
+++ b/res/values-en-rGB-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Manage folders"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5fea63b..62eab8a 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Change folders"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Move to"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Folder settings"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(This message has been modified from its original version to fit this screen.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Folders"</string>
<string name="folder_list_more" msgid="537172187223133825">"More"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"More accounts"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"To view conversations, sync this folder."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sync Folder"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> unread message"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> unread messages"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ unread messages"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> unread"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ unread"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"View more conversations"</string>
<string name="loading_conversation" msgid="489160038366067983">"Loading…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Choose account"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Shrink wide messages to fit your screen and allow zooming in. To turn off this option, go to Settings > General settings."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Reply"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Reply all"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Forward"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archive"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Remove label"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Delete"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Mark as read"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Archived"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label Removed"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Deleted"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Not set"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silent"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Preferred ActionBar items"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Select up to <xliff:g id="MAX">%1$d</xliff:g> actions"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Archive/Remove Label"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Delete/Discard drafts"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Mark Read/Unread"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Add/Remove Star"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Mark (not) important"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Report not spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Remove action"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Delete rather than archive conversations"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Swipe to remove"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"In conversation list"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swipe down to refresh"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Checking for mail"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Empty trash"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Empty spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Open navigation drawer"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Close navigation drawer"</string>
</resources>
diff --git a/res/values-es-rUS-sw600dp/strings.xml b/res/values-es-rUS-sw600dp/strings.xml
index 30684ee..af059cf 100644
--- a/res/values-es-rUS-sw600dp/strings.xml
+++ b/res/values-es-rUS-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ CC/CCO"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ CCO"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Administrar carpetas"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7773027..4598baa 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Cambiar carpetas"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Mover a"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Configuración de carpetas"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"La versión original de este mensaje se modificó para que se ajuste a esta pantalla."</string>
<string name="folder_list_title" msgid="4276644062440415214">"Carpetas"</string>
<string name="folder_list_more" msgid="537172187223133825">"Más"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Más cuentas"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver conversaciones, sincroniza esta carpeta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar carpeta"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje sin leer"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes sin leer"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Más de <xliff:g id="COUNT">%1$d</xliff:g> mensajes sin leer"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes sin leer"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Más de <xliff:g id="COUNT">%1$d</xliff:g> mensajes sin leer"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Ver más conversaciones"</string>
<string name="loading_conversation" msgid="489160038366067983">"Cargando…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Seleccionar cuenta"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Reduce el tamaño de los mensajes más anchos para que se adapten a la pantalla y amplíalos para verlos más de cerca. Para desactivar esta opción, ve a Configuración > Configuración general."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Reenviar"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archivar"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Eliminar etiqueta"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Eliminar"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcar como leído"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Archivado"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiqueta eliminada"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Eliminado"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"No se estableció"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silencio"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Elementos preferidos de la barra de acciones"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Seleccionar hasta <xliff:g id="MAX">%1$d</xliff:g> acciones"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivar o eliminar etiqueta"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Eliminar o descartar borradores"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcar como leídos o no leídos"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Agregar o eliminar estrella"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Marcar como (no) importante"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Informar que (no) es spam"</string>
- <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslizar el dedo hacia abajo para actualizar"</string>
- <string name="checking_for_mail" msgid="2301797903350897130">"Comprobando si hay correo electrónico"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminar acción"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Eliminar en lugar de archivar conversaciones"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
<skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar para eliminar"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"En lista de conversaciones"</string>
+ <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Desliza el dedo hacia abajo para actualizar."</string>
+ <string name="checking_for_mail" msgid="2301797903350897130">"Comprobando si hay correo electrónico…"</string>
+ <string name="empty_trash" msgid="5042310780353359729">"Vaciar papelera"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Vaciar carpeta de spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Abrir panel de navegación"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Cerrar panel de navegación"</string>
</resources>
diff --git a/res/values-es-sw600dp/strings.xml b/res/values-es-sw600dp/strings.xml
index 3f578aa..211f830 100644
--- a/res/values-es-sw600dp/strings.xml
+++ b/res/values-es-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cco"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Cco"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Administrar carpetas"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 85065b3..8097c4f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Cambiar carpetas"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Mover a"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Ajustes de carpeta"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Se ha modificado la versión original de este mensaje para adaptarse a la pantalla)."</string>
<string name="folder_list_title" msgid="4276644062440415214">"Carpetas"</string>
<string name="folder_list_more" msgid="537172187223133825">"Más"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Más cuentas"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver conversaciones, sincroniza esta carpeta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar carpeta"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje no leído"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes no leídos"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Más de <xliff:g id="COUNT">%1$d</xliff:g> mensajes no leídos"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> no leídos"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Más de <xliff:g id="COUNT">%1$d</xliff:g> no leídos"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Ver más conversaciones"</string>
<string name="loading_conversation" msgid="489160038366067983">"Cargando..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Seleccionar cuenta"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Ajusta los mensajes grandes al tamaño de la pantalla y amplía la vista. Para desactivar esta opción, accede a Ajustes > Ajustes generales."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Reenviar"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archivar"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Eliminar etiqueta"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Eliminar"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcar como leído"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Archivado"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiqueta eliminada"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Eliminado"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"No definido"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silencio"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Elementos de barra de acción preferidos"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Seleccionar hasta <xliff:g id="MAX">%1$d</xliff:g> acciones"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivar/eliminar etiqueta"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Eliminar/descartar borradores"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcar como leído/no leído"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Añadir/eliminar estrella"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Marcar como (no) importante"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Informar de que (no) es spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminar acción"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Eliminar las conversaciones en lugar de archivarlas"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar para eliminar"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"En la lista de conversaciones"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslizar hacia abajo para actualizar"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Buscando correo electrónico..."</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Vaciar papelera"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Vaciar carpeta de spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Abrir control de navegación"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Cerrar control de navegación"</string>
</resources>
diff --git a/res/values-et-sw600dp/strings.xml b/res/values-et-sw600dp/strings.xml
index e313249..ff8af25 100644
--- a/res/values-et-sw600dp/strings.xml
+++ b/res/values-et-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ koopia/pimekoopia"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ pimekoopia"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Halda kaustu"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index eef4201..ae2a143 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Muuda kaustu"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Teisalda asukohta"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Kausta seaded"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Sõnumi algset versiooni muudeti, et see mahuks ekraanile.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Kaustad"</string>
<string name="folder_list_more" msgid="537172187223133825">"Rohkem"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Rohkem kontosid"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Meilivestl. vaatamis. sünkr. kaust."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sünkrooni kaust"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> lugemata sõnum"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> lugemata sõnumit"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ lugemata sõnumit"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> lugemata"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ lugemata"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Kuva rohkem meilivestlusi"</string>
<string name="loading_conversation" msgid="489160038366067983">"Laadimine …"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Konto valimine"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Laiade sõnumite kahandamine, nii et need mahuksid ekraanile ja suurendamise lubamine. Valiku sisselülitamiseks valige Seaded > Üldseaded."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Vasta"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Vasta kõigile"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Edasta"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arhiveeri"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Eemalda silt"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Kustuta"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Märgi loetuks"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhiveeritud"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Silt on eemaldatud"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Kustutatud"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Määramata"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> uut sõnumit"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Hääletu"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Eelistatud toiminguriba üksused"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Valige kuni <xliff:g id="MAX">%1$d</xliff:g> toimingut"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhiveeri/eemalda silt"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Kustuta mustandid / loobu mustanditest"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Märgi loetuks/lugemata"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Lisa/eemalda tärn"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Märgi (mitte)oluliseks"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Teata, et on/pole rämpspost(i)"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eemalda toiming"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Kustuta vestlused arhiveerimise asemel"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Pühkige eemaldamiseks"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Meilivestluste loendis"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Värskendamiseks pühkige alla"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"E-posti kontrollimine"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Tühjenda prügikast"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Tühjenda rämpspost"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Ava navigeerimissahtel"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Sule navigeerimissahtel"</string>
</resources>
diff --git a/res/values-fa-sw600dp/strings.xml b/res/values-fa-sw600dp/strings.xml
index dd0c14d..12c4b26 100644
--- a/res/values-fa-sw600dp/strings.xml
+++ b/res/values-fa-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ گیرندهٔ کپی/گیرنده مخفی"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ گیرنده مخفی"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"مدیریت پوشهها"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4e0682b..0feb125 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -39,7 +39,7 @@
<string name="forward_attribution" msgid="1498936339458535158">"---------- پیام باز ارسال شده ----------<br>فرستنده: <xliff:g id="FROM">%1$s</xliff:g><br>Date: <xliff:g id="DATE">%2$s</xliff:g><br>موضوع: <xliff:g id="SUBJECT">%3$s</xliff:g><br>گیرنده: <xliff:g id="TO">%4$s</xliff:g><br>"</string>
<string name="cc_attribution" msgid="374493748526504562">"Cc: <xliff:g id="CC">%1$s</xliff:g><br>"</string>
<string name="select_attachment_type" msgid="4711524151968942082">"انتخاب نوع پیوست"</string>
- <string name="too_large_to_attach_single" msgid="2996733972478212136">"فایل بیش از <xliff:g id="MAXSIZE">%1$s</xliff:g> قابل پیوست نمیباشد."</string>
+ <string name="too_large_to_attach_single" msgid="2996733972478212136">"فایل بیش از <xliff:g id="MAXSIZE">%1$s</xliff:g> قابل پیوست نیست."</string>
<string name="too_large_to_attach_multiple" msgid="5452547998184881210">"یک یا چند فایل پیوست نشده است. حداکثر ظرفیت <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
<string name="too_large_to_attach_additional" msgid="3366607594339390249">"فایل پیوست نشد. فراتر از حداکثر ظرفیت <xliff:g id="MAXSIZE">%1$s</xliff:g>."</string>
<string name="generic_attachment_problem" msgid="8775959340559458709">"پیوست فایل انجام نشد."</string>
@@ -76,7 +76,7 @@
<string name="menu_change_folders" msgid="1542713666608888717">"تغییر پوشهها"</string>
<string name="menu_move_to" msgid="9138296669516358542">"انتقال به"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"تنظیمات پوشه"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
<!-- no translation found for message_modified (2564340197585393687) -->
<skip />
@@ -295,11 +295,10 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"برای مشاهده مکالمات، این پوشه همگام شود."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"همگامسازی پوشه"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> پیام خوانده نشده"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> پیام خوانده نشده"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"بیش از <xliff:g id="COUNT">%1$d</xliff:g> پیام خوانده نشده"</string>
+ <!-- no translation found for actionbar_unread_messages (3805594795629836031) -->
+ <skip />
+ <!-- no translation found for actionbar_large_unread_count (2780005218279965391) -->
+ <skip />
<string name="view_more_conversations" msgid="3151067626309674344">"مشاهده مکالمات بیشتر"</string>
<string name="loading_conversation" msgid="489160038366067983">"در حال بارگیری..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"انتخاب حساب"</string>
@@ -371,15 +370,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"پیامهای گسترده را متناسب با صفحه شما کوچک میکند و امکان بزرگنمایی را بوجود میآورد. برای غیرفعال کردن این گزینه به تنظیمات > تنظیمات عمومی بروید."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"پاسخ"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"پاسخ به همه"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"بازارسال"</string>
<string name="notification_action_archive" msgid="81978513898440040">"آرشیو"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"حذف برچسب"</string>
<string name="notification_action_delete" msgid="327773454111551791">"حذف"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"علامت بعنوان خوانده"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"بایگانی شد"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"برچسب حذف شد"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"حذف شده"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"تنظیم نشده است"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,14 +384,16 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"بیصدا"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"موارد ActionBar دلخواه"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"حداکثر <xliff:g id="MAX">%1$d</xliff:g> عملکرد را انتخاب کنید"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"بایگانی/حذف برچسب"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"حذف/صرفنظر کردن از پیشنویسها"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"علامتگذاری به عنوان خوانده شده/خوانده نشده"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"افزودن/حذف ستاره"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"علامتگذاری به عنوان (غیر)مهم"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"گزارش به عنوان (غیر)هرزنامه"</string>
+ <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+ <skip />
+ <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"برای حذف انگشت خود را روی صفحه بکشید"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"در لیست مکالمه"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"برای بازخوانی، صفحه را با انگشت به سمت پایین بکشید"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"در حال بررسی برای ایمیل"</string>
<!-- no translation found for empty_trash (5042310780353359729) -->
diff --git a/res/values-fi-sw600dp/strings.xml b/res/values-fi-sw600dp/strings.xml
index a9f823a..a5e0659 100644
--- a/res/values-fi-sw600dp/strings.xml
+++ b/res/values-fi-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Kopio/piilokopio"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Piilokopio"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Hallinnoi kansioita"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index aee3587..dfeb2d5 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Vaihda kansiota"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Siirrä kansioon"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Kansion asetukset"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Tämä viesti on sovitettu alkuperäisversiosta tälle näytölle sopivaksi.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Kansiot"</string>
<string name="folder_list_more" msgid="537172187223133825">"Lisää"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Lisää tilejä"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Synkronoi tämä kansio, jos haluat tarkastella keskusteluja."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkronoi kansio"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> lukematon viesti"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> lukematonta viestiä"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ lukematonta viestiä"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> lukematonta"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Yli <xliff:g id="COUNT">%1$d</xliff:g> lukematonta"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Näytä lisää keskusteluita"</string>
<string name="loading_conversation" msgid="489160038366067983">"Ladataan…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Valitse tili"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Kutista leveät viestit ruutuun sopiviksi ja salli zoomaus. Voit poistaa tämän asetuksen käytöstä kohdassa Asetukset > Yleisasetukset."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Vastaa"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Vastaa kaikille"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Seuraava"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arkistoi"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Poista tunniste"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Poista"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Merkitse luetuksi"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arkistoitu"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Tunniste on poistettu"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Poistettu"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ei asetettu"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> uutta viestiä"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Äänetön"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Ensisijaiset ActionBar-kohteet"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Valitse korkeintaan <xliff:g id="MAX">%1$d</xliff:g> toimintoa"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arkistoi/poista tunniste"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Poista/hylkää luonnokset"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Merkitse luetuksi/lukemattom."</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Lisää/poista tähti"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Merkitse (ei-)tärkeäksi"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Merkitse (ei-)roskapostiksi"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Poista toiminto"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Poista keskustelut arkistoinnin sijaan"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Poista liu\'uttamalla sormea"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Keskusteluluettelossa"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Päivitä liu\'uttamalla alas"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Tarkistetaan sähköposteja"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Tyhjennä roskakori"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Tyhjennä roskaposti"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Avaa navigointipalkki"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Sulje navigointipalkki"</string>
</resources>
diff --git a/res/values-fr-sw600dp/strings.xml b/res/values-fr-sw600dp/strings.xml
index 5d13a8d..8bdfa8c 100644
--- a/res/values-fr-sw600dp/strings.xml
+++ b/res/values-fr-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cci"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Cci"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Gérer les dossiers"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 6b1fc16..32d128a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Modifier les dossiers"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Déplacer vers"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Paramètres des dossiers"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(La version originale de ce message a été modifiée afin de l\'adapter à cet écran.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Dossiers"</string>
<string name="folder_list_more" msgid="537172187223133825">"Plus"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Tous les comptes"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Pour afficher les conversations, synchronisez ce dossier."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchroniser le dossier"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> message non lu"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> message(s) non lu(s)"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Plus de <xliff:g id="COUNT">%1$d</xliff:g> messages non lus"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> non lus"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Plus de <xliff:g id="COUNT">%1$d</xliff:g> non lus"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Afficher d\'autres conversations"</string>
<string name="loading_conversation" msgid="489160038366067983">"Chargement en cours…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Sélectionner un compte"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Réduisez la taille des messages les plus larges de sorte qu\'ils soient ajustés à votre écran et autorisez les zooms avant. Pour désactiver cette option, sélectionnez Paramètres > Paramètres généraux."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Répondre"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Répondre à tous"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Transférer"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archiver"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Supprimer le libellé"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Supprimer"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Marquer comme lu"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Message archivé."</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Libellé supprimé."</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Message supprimé."</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Non défini"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g> : <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Mode silencieux"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Éléments favoris de la barre d\'actions"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Sélectionner <xliff:g id="MAX">%1$d</xliff:g> actions au maximum"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Archiver/Supprimer un libellé"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Supprimer des brouillons"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Marquer comme lu/non lu"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Ajouter/Supprimer une étoile"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Marquer comme important ou non"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Signaler comme spam/non-spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Supprimer"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Supprimer les conversations au lieu de les archiver"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Faire glisser l\'élément pour le supprimer"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Dans la liste des conversations"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Faire glisser le doigt vers le bas pour actualiser"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Vérification des e-mails en cours…"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Vider la corbeille"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Vider le spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Ouvrir le panneau de navigation"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Fermer le panneau de navigation"</string>
</resources>
diff --git a/res/values-hi-sw600dp/strings.xml b/res/values-hi-sw600dp/strings.xml
index 4b05a23..add56d0 100644
--- a/res/values-hi-sw600dp/strings.xml
+++ b/res/values-hi-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"Cc/Bcc जोड़ें"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"Bcc जोड़ें"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"फ़ोल्डर प्रबंधित करें"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 37c1d63..bcd6368 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"फ़ोल्डर बदलें"</string>
<string name="menu_move_to" msgid="9138296669516358542">"इसमें ले जाएं"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"फ़ोल्डर सेटिंग"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(इस संदेश को इस स्क्रीन में फ़िट करने के लिए इसके मूल संस्करण में बदलाव किया गया है.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"फ़ोल्डर"</string>
<string name="folder_list_more" msgid="537172187223133825">"अधिक"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"अधिक खाते"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"बातचीत देखने हेतु, फ़ोल्डर समन्वयित करें."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"फ़ोल्डर समन्वयित करें"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> अपठित संदेश"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> अपठित संदेश"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ अपठित संदेश"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> अपठित"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ अपठित"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"अधिक बातचीत देखें"</string>
<string name="loading_conversation" msgid="489160038366067983">"लोड हो रहा है…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"खाता चुनें"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"बड़े संदेशों को अपनी स्क्रीन में फ़िट करने के लिए उन्हें सिकोड़ें और ज़ूम इन करने दें. इस विकल्प को बंद करने के लिए, सेटिंग > सामान्य सेटिंग पर जाएं."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"जवाब दें"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"सभी को जवाब दें"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"अग्रेषित करें"</string>
<string name="notification_action_archive" msgid="81978513898440040">"संग्रहीत करें"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"लेबल निकालें"</string>
<string name="notification_action_delete" msgid="327773454111551791">"हटाएं"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"पठित चिह्नित करें"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"संग्रहीत"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"लेबल निकाल दिया गया"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"हटा दिया गया"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"सेट नहीं है"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> नए संदेश"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"मौन"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"पसंदीदा ActionBar आइटम"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"अधिकतम <xliff:g id="MAX">%1$d</xliff:g> क्रियाएं चुनें"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"लेबल संगृहीत करें/निकालें"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"ड्राफ़्ट हटाएं/खारिज करें"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"पठित/अपठित चिह्नित करें"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"तारा जोड़ें/निकालें"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"महत्वपूर्ण (नहीं) चिह्नित करें"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"स्पैम (नहीं) रिपोर्ट करें"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"निकालने की कार्यवाही"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"बातचीतों को संगृहीत करने के बजाए हटाएं"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"निकालने के लिए स्वाइप करें"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"बातचीत की सूची में"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"रीफ्रेश करने के लिए नीचे स्वाइप करें"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"मेल के लिए जांच की जा रही है"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"ट्रैश रिक्त करें"</string>
+ <string name="empty_spam" msgid="930744491746508050">"स्पैम रिक्त करें"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"नेविगेशन ड्रॉवर खोलें"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"नेविगेशन ड्रॉवर बंद करें"</string>
</resources>
diff --git a/res/values-hr-sw600dp/strings.xml b/res/values-hr-sw600dp/strings.xml
index 0e2a9aa..91e479f 100644
--- a/res/values-hr-sw600dp/strings.xml
+++ b/res/values-hr-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Kopija/skriv. kop."</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Skrivena kopija"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Upravljanje mapama"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 459bcc8..8c51387 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Promjena mapa"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Premjesti u/na"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Postavke mapa"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Izvorna verzija ove poruke izmijenjena je kako bi se prilagodila zaslonu.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Mape"</string>
<string name="folder_list_more" msgid="537172187223133825">"Više"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Više računa"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Za prikaz razgovora sinkronizirajte ovu mapu."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronizacija mape"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> nepročitana poruka"</item>
- <item quantity="other" msgid="4103064420707175144">"Nepročitanih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Nepročitanih poruka: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Nepročitano: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Nepročitano: više od <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Prikaži više razgovora"</string>
<string name="loading_conversation" msgid="489160038366067983">"Učitavanje…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Odabir računa"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Sažmite široke poruke kako bi se prilagodile zaslonu i omogućite povećavanje prikaza. Da biste isključili tu opciju, idite na Postavke > Opće postavke."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Odgovori"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Odgovori svima"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Proslijedi"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arhiva"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Ukloni oznaku"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Izbriši"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Označi pročitanim"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhivirano"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Oznaka je uklonjena"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Izbrisano"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nije postavljeno"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Novih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Bešumno"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Željene stavke trake radnje"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Odaberite najviše ovoliko radnji: <xliff:g id="MAX">%1$d</xliff:g>"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhiviraj/ukloni oznaku"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Izbriši/odbaci nacrte"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Označi pročitanim/nepročitanim"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Dodaj/ukloni zvjezdicu"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Označi kao (ne)važno"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Prijavi da (ni)je než. pošta"</string>
- <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Prijeđite prstom prema dolje za osvježivanje"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Uklanjanje radnje"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Brišite razgovore, nemojte ih arhivirati"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Prijeđite prstom da biste uklonili"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Na popisu razgovora"</string>
+ <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Prijeđite prstom prema dolje za osvježivanje"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Provjeravanje pošte"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Pražnjenje otpada"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Pražnjenje neželjenih sadržaja"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Otvaranje povlakača navigacije"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Zatvaranje povlakača navigacije"</string>
</resources>
diff --git a/res/values-hu-sw600dp/strings.xml b/res/values-hu-sw600dp/strings.xml
index baa3553..445918d 100644
--- a/res/values-hu-sw600dp/strings.xml
+++ b/res/values-hu-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Másolatmezők"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Titkos másolat"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Mappák kezelése"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 718908d..184deae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Mappaváltás"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Áthelyezés ide:"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Mappabeállítások"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Ez az üzenet az eredeti változat jelen képernyőhöz igazított verziója.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Mappák"</string>
<string name="folder_list_more" msgid="537172187223133825">"Több"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"További fiókok"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Beszélgetésekhez szinkr. a mappát."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Mappa szinkronizálása"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> olvasatlan üzenet"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> olvasatlan üzenet"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ olvasatlan üzenet"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> olvasatlan"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ olvasatlan"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"További beszélgetések megtekintése"</string>
<string name="loading_conversation" msgid="489160038366067983">"Betöltés..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Fiók kiválasztása"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Összenyomja a széles üzeneteket, és lehetővé teszi a nagyítást. A funkció kikapcsolásához válassza a Beállítások > Általános beállítások lehetőséget."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Válasz"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Válasz mindenkinek"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Továbbítás"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archiválás"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Címke eltávolítása"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Törlés"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Olvasott"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Archiválva"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Címke eltávolítva"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Törölve"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nincs megadva"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Néma"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Előnyben részesített elemek a műveleti sávon"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Legfeljebb <xliff:g id="MAX">%1$d</xliff:g> műveletet válasszon ki"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Címke archiválása/eltávolítása"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Vázlatok törlése/elvetése"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Megjelölés (nem) olvasottként"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Csillag hozzáad./eltávolítása"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Megjelölés (nem) fontosként"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Ez (nem) spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eltávolítási művelet"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"A beszélgetések törlése archiválás helyett"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Csúsztassa gyorsan az ujját az eltávolításhoz"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Beszélgetéslistában"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Frissítéshez húzza le"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"E-mail ellenőrzése"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Kuka ürítése"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Spam ürítése"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Navigációs fiók kinyitása"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Navigációs fiók bezárása"</string>
</resources>
diff --git a/res/values-in-sw600dp/strings.xml b/res/values-in-sw600dp/strings.xml
index d47205f..9f7e66d 100644
--- a/res/values-in-sw600dp/strings.xml
+++ b/res/values-in-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Kelola folder"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9098a3c..4e74f59 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Ganti folder"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Pindahkan ke"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Setelan folder"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Pesan ini telah diubah dari versi aslinya untuk menyesuaikan dengan layar.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Folder"</string>
<string name="folder_list_more" msgid="537172187223133825">"Lainnya"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Akun lainnya"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat percakapan, sinkronkan folder ini."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinkronkan Folder"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> pesan belum dibaca"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> pesan belum dibaca"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ pesan belum dibaca"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> belum dibaca"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ belum dibaca"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Lihat percakapan lainnya"</string>
<string name="loading_conversation" msgid="489160038366067983">"Memuat…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Pilih akun"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Mampatkan pesan yang lebar agar pas dengan layar Anda dan memungkinkan pembesaran. Untuk mematikan opsi ini, buka Setelan > Setelan umum."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Balas"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Balas ke semua"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Teruskan"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arsipkan"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Hapus label"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Hapus"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Tandai sudah dibaca"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Diarsipkan"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label Dihapus"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Dihapus"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Belum siap"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tidak Berbunyi"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Item BilahTindakan yang dipilih"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Pilih hingga <xliff:g id="MAX">%1$d</xliff:g> tindakan"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arsipkan/Hapus Label"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Hapus/Buang draf"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Tandai Dibaca/Belum Dibaca"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Tambah/Hapus Bintang"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Tandai sebagai (tidak) penting"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Laporkan sebagai (bukan) spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Hapus tindakan"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Hapus, bukan arsipkan percakapan"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Gesek untuk menghapus"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam daftar percakapan"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Gesek ke bawah untuk menyegarkan"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Memeriksa email"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Kosongkan sampah"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Kosongkan spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
</resources>
diff --git a/res/values-it-sw600dp/strings.xml b/res/values-it-sw600dp/strings.xml
index d26b1b6..184b872 100644
--- a/res/values-it-sw600dp/strings.xml
+++ b/res/values-it-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Ccn"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Ccn"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Gestisci cartelle"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index fd8b0ab..782bccd 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Cambia cartelle"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Sposta in"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Impostazioni cartella"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(La versione originale di questo messaggio è stata modificata per essere adattata allo schermo.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Cartelle"</string>
<string name="folder_list_more" msgid="537172187223133825">"Altre"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Altri account"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Per vedere conversazioni, sincronizza cartella."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizza cartella"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> messaggio da leggere"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> messaggi da leggere"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ messaggi da leggere"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> da leggere"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Più di <xliff:g id="COUNT">%1$d</xliff:g> da leggere"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Visualizza altre conversazioni"</string>
<string name="loading_conversation" msgid="489160038366067983">"Caricamento…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Scegli account"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Restringi i messaggi larghi per adattarli allo schermo e consenti lo zoom in avanti. Per disattivare questa opzione, vai a Impostazioni > Impostazioni generali."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Rispondi"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Rispondi a tutti"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Inoltra"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archivia"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Rimuovi etichetta"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Elimina"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Segna come già letto"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Archiviato"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etichetta rimossa"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Eliminato"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Non impostata"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nuovi messaggi"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silenzioso"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Voci preferite della barra delle azioni"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Seleziona fino a <xliff:g id="MAX">%1$d</xliff:g> azioni"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivia/Rimuovi etichetta"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Elimina/Annulla bozze"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Segna come letto/da leggere"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Aggiungi a/Rimuovi da Speciali"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Segna come non importante"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Segnala come (non) spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Azione rimozione"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Elimina anziché archiviare le conversazioni"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Fai scorrere per rimuovere"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"In elenco di conversazioni"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fai scorrere verso il basso per aggiornare"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Controllo della posta"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Cestino vuoto"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Cartella spam vuota"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Apri cassetto navigazione"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Chiudi cassetto navigazione"</string>
</resources>
diff --git a/res/values-iw-sw600dp/strings.xml b/res/values-iw-sw600dp/strings.xml
index 59cc741..002b67a 100644
--- a/res/values-iw-sw600dp/strings.xml
+++ b/res/values-iw-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ עותק/עותק מוסתר"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ עותק מוסתר"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"ניהול תיקיות"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e1b05d5..f62088a 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"שנה תיקיות"</string>
<string name="menu_move_to" msgid="9138296669516358542">"העבר אל"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"הגדרות תיקיה"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(ההודעה הזו שונתה מגרסתה המקורית כדי שתתאים למסך הזה.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"תיקיות"</string>
<string name="folder_list_more" msgid="537172187223133825">"עוד"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"עוד חשבונות"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"כדי להציג שיחות, סנכרן תיקיה זו."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"סנכרן תיקיה"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"הודעה <xliff:g id="COUNT">%1$d</xliff:g> שלא נקראה"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות שלא נקראו"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ הודעות שלא נקראו"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> לא נקראו"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ לא נקראו"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"הצג שיחות נוספות"</string>
<string name="loading_conversation" msgid="489160038366067983">"טוען…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"בחר חשבון"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"כווץ הודעות רחבות כדי שיתאימו למסך וכדי לאפשר שינוי של מרחק התצוגה. כדי לכבות אפשרות זו, עבור אל \'הגדרות\' > \'הגדרות כלליות\'."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"השב"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"השב לכולם"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"העבר"</string>
<string name="notification_action_archive" msgid="81978513898440040">"שלח לארכיון"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"הסר תווית"</string>
<string name="notification_action_delete" msgid="327773454111551791">"מחק"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"סמן כנקראה"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"הועברה לארכיון"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"התווית הוסרה"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"נמחקה"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"לא מוגדר"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות חדשות"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"שקט"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"פריטים מועדפים בסרגל הפעולות"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"בחר עד <xliff:g id="MAX">%1$d</xliff:g> פעולות"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"העבר לארכיון/הסר תווית"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"מחק טיוטות"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"סמן כנקרא/לא נקרא"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"הוסף/הסר כוכב"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"סמן כ(לא) חשוב"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"דווח כ(לא) דואר זבל"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"פעולת הסרה"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"מחק הודעות במקום להעביר אותן לארכיון"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"החלק כדי להסיר"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"ברשימת השיחות"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"החלק מטה לביצוע רענון"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"בודק אם יש דואר"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"רוקן את האשפה"</string>
+ <string name="empty_spam" msgid="930744491746508050">"רוקן את הספאם"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"פתח את חלונית הניווט"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"סגור את חלונית הניווט"</string>
</resources>
diff --git a/res/values-ja-sw600dp/strings.xml b/res/values-ja-sw600dp/strings.xml
index f2028c8..6c71bcf 100644
--- a/res/values-ja-sw600dp/strings.xml
+++ b/res/values-ja-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"Cc/Bccを追加"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"Bccを追加"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"フォルダを管理"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index cf6fa27..150c79d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"フォルダを変更"</string>
<string name="menu_move_to" msgid="9138296669516358542">"移動"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"フォルダの設定"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"（このメッセージは、画面に合わせて元のバージョンから変更されています。）"</string>
<string name="folder_list_title" msgid="4276644062440415214">"フォルダ"</string>
<string name="folder_list_more" msgid="537172187223133825">"その他"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"その他のアカウント"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"スレッドを表示するには、このフォルダを同期します。"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"フォルダを同期"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d超"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"未読メッセージ<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
- <item quantity="other" msgid="4103064420707175144">"未読メッセージ<xliff:g id="COUNT">%1$d</xliff:g>件"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"未読メッセージ<xliff:g id="COUNT">%1$d</xliff:g>件以上"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g>件の未読"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>件以上の未読"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"他のスレッドを見る"</string>
<string name="loading_conversation" msgid="489160038366067983">"読み込んでいます..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"アカウントを選択"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"横長のメッセージが画面に合わせて自動で調整され、拡大することもできます。このオプションをオフにするには、[設定] > [全般設定]を選択します。"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"返信"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"全員に返信"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"転送"</string>
<string name="notification_action_archive" msgid="81978513898440040">"アーカイブ"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"ラベルを削除"</string>
<string name="notification_action_delete" msgid="327773454111551791">"削除"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"既読にする"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"アーカイブ済み"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"ラベル削除済み"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"削除済み"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"未設定"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"マナーモード"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"ActionBarの優先アイテム"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"最大<xliff:g id="MAX">%1$d</xliff:g>個の操作を選択"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"ラベルをアーカイブ/削除"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"下書きを削除/破棄"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"既読/未読にする"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"スターを付ける/外す"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"重要マークを付ける（外す）"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"迷惑メール（でないこと）を報告"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"操作を除外する"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"スレッドをアーカイブせずに削除する"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"スワイプして削除"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"スレッドリスト内"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"下にスワイプして更新"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"メールを確認しています"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"ゴミ箱を空にする"</string>
+ <string name="empty_spam" msgid="930744491746508050">"迷惑メールフォルダを空にする"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"ナビゲーションドロワーを開く"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"ナビゲーションドロワーを閉じる"</string>
</resources>
diff --git a/res/values-ko-sw600dp/strings.xml b/res/values-ko-sw600dp/strings.xml
index 08bf76d..bc64231 100644
--- a/res/values-ko-sw600dp/strings.xml
+++ b/res/values-ko-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ 참조/숨은참조"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ 숨은참조"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"폴더 관리"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e8fe4b7..4944886 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"폴더 변경"</string>
<string name="menu_move_to" msgid="9138296669516358542">"이동"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"폴더 설정"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(이 메일은 원본 버전을 화면에 맞게 수정한 것입니다.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"폴더"</string>
<string name="folder_list_more" msgid="537172187223133825">"더보기"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"계정 더보기"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"대화를 보려면 폴더를 동기화하세요."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"폴더 동기화"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"읽지 않은 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>
- <item quantity="other" msgid="4103064420707175144">"읽지 않은 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"읽지 않은 메일이 <xliff:g id="COUNT">%1$d</xliff:g>개 이상 있음"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"읽지 않은 메일 <xliff:g id="COUNT">%1$d</xliff:g>개"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>개 이상 읽지 않음"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"대화 더보기"</string>
<string name="loading_conversation" msgid="489160038366067983">"로드 중…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"계정 선택"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"메일의 너비가 화면에 맞도록 크기를 축소하고, 확대 기능을 지원합니다. 이 옵션을 사용 중지하려면 설정 > 일반 설정으로 이동합니다."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"답장"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"전체답장"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"전달"</string>
<string name="notification_action_archive" msgid="81978513898440040">"보관처리"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"라벨 삭제"</string>
<string name="notification_action_delete" msgid="327773454111551791">"삭제"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"읽음으로 표시"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"보관처리됨"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"라벨 삭제됨"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"삭제됨"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"설정되지 않음"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"새 메시지 <xliff:g id="COUNT">%1$d</xliff:g>개"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"무음"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"기본 ActionBar 항목"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"액션을 최대 <xliff:g id="MAX">%1$d</xliff:g>개까지 선택"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"라벨 보관처리/삭제"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"임시보관 메일 삭제/취소"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"읽음/읽지 않음 표시"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"별표 추가/삭제"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"중요/중요하지 않음으로 표시"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"스팸 신고/해제"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"삭제 작업"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"대화를 보관처리하지 않고 삭제"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"스와이프하여 삭제"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"대화 목록"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"아래로 스와이프하여 새로고침"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"메일 확인 중"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"휴지통 비우기"</string>
+ <string name="empty_spam" msgid="930744491746508050">"스팸 비우기"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"내비게이션 폴더 열기"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"내비게이션 폴더 닫기"</string>
</resources>
diff --git a/res/values-lt-sw600dp/strings.xml b/res/values-lt-sw600dp/strings.xml
index 8cff8f5..841014f 100644
--- a/res/values-lt-sw600dp/strings.xml
+++ b/res/values-lt-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ kop. / nemat. kop."</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ nematomoji kopija"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Tvarkyti aplankus"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e1e3c4f..a19391a 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Keisti aplankus"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Perkelti į"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Aplankų nustatymai"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Pranešimo originalas pakeistas, kad tilptų į ekraną.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Aplankai"</string>
<string name="folder_list_more" msgid="537172187223133825">"Daugiau"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Daugiau paskyrų"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Jei norite perž. pok., sinchr. apl."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinchronizuoti aplanką"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"Neperskaitytų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- <item quantity="other" msgid="4103064420707175144">"Neperskaitytų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Nepersk. praneš.: daugiau nei <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Neskaitytų: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Neskaitytų: <xliff:g id="COUNT">%1$d</xliff:g> ir daugiau"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Peržiūrėti daugiau pokalbių"</string>
<string name="loading_conversation" msgid="489160038366067983">"Įkeliama..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Pasirinkti paskyrą"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Sumažinkite plačius pranešimus, kad jie tilptų jūsų ekrane, ir įgalinkite mastelio keitimą. Jei norite išjungti šią parinktį, eikite į „Nustatymai“ > „Bendrieji nustatymai“."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Atsakyti"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Atsakyti visiems"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Persiųsti"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archyvuoti"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Pašalinti etiketę"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Ištrinti"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Žymėti raudonai"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Suarchyvuota"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiketė pašalinta"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Ištrinta"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nenustatyta"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tylus"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Pageidaujami veiksmų juostos elementai"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Pasirinkite iki <xliff:g id="MAX">%1$d</xliff:g> veiksm."</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Archyvuoti / pašalinti etiketę"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Ištrinti / išmesti juodr."</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Pažym. kaip skait. / neskait."</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Pridėti / pašalinti žvaigždutę"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Pažymėti kaip (ne)svarbų"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Praneš., kad tai (ne)šlamštas"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Pašalinti veiksmą"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Pokalbius ištrinti, o ne archyvuoti"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Jei norite pašalinti, perbraukite"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Pokalbių sąraše"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Perbraukite žemyn, kad atnaujintumėte"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Ieškoma laiškų"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Išvalyti šiukšliadėžę"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Išvalyti šlamšto aplanką"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Atidaryti naršymo juostą"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Uždaryti naršymo juostą"</string>
</resources>
diff --git a/res/values-lv-sw600dp/strings.xml b/res/values-lv-sw600dp/strings.xml
index ff1294d..477137a 100644
--- a/res/values-lv-sw600dp/strings.xml
+++ b/res/values-lv-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Kopija/diskr. kop."</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Diskrētā kopija"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Pārvaldīt mapes"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index fb7b28a..d23575e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Mainīt mapes"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Pārvietot uz:"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Mapju iestatījumi"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Šī ziņojuma sākotnējā versija tika pārveidota, lai tas ietilptu šajā ekrānā.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Mapes"</string>
<string name="folder_list_more" msgid="537172187223133825">"Vairāk"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Citi konti"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Lai skat. sarunas, sinhr. šo mapi."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinhronizēt mapi"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> nelasīts ziņojums"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> nelasīti ziņojumi"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Nelasīti ziņojumi: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> nelasīti"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Vairāk nekā <xliff:g id="COUNT">%1$d</xliff:g> nelasīti"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Skatīt citas sarunas"</string>
<string name="loading_conversation" msgid="489160038366067983">"Notiek ielāde..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Izvēlēties kontu"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Samaziniet ziņojumu lielumu, lai ietilpinātu tos ekrānā, un atļaujiet tuvināšanu. Lai izslēgtu šo opciju, dodieties uz izvēlni Iestatījumi > Vispārīgi iestatījumi."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Atbildēt"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Atbildēt visiem"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Pārsūtīt"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arhivēt"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Noņemt iezīmi"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Dzēst"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Atzīmēt kā izlasītu"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhivēts"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Iezīme noņemta"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Dzēsts"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nav iestatīts"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> jauni ziņojumi"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Klusums"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Vajadzīgie darbību joslas vienumi"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Atlasiet ne vairāk kā <xliff:g id="MAX">%1$d</xliff:g> darbības"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhivēt/noņemt iezīmi"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Dzēst/nerādīt melnrakstus"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Atzīmēt kā lasītu/nelasītu"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Pievienot/noņemt zvaigznīti"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Atzīmēt kā svarīgu/nesvarīgu"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Ziņot, ka tā ir/nav mēstule"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Noņemšanas darbība"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Dzēst, nevis arhivēt sarunas"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Vilkt, lai noņemtu"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Sarunu sarakstā"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Lai atsvaidzinātu, velciet uz leju."</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Notiek e-pasta pārbaude"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Iztukšot atkritni"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Iztukšot mēstuļu mapi"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Atvērt navigācijas paneli"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Aizvērt navigācijas paneli"</string>
</resources>
diff --git a/res/values-ms-sw600dp/strings.xml b/res/values-ms-sw600dp/strings.xml
index d42374f..1be957b 100644
--- a/res/values-ms-sw600dp/strings.xml
+++ b/res/values-ms-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Sk/Skt"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Skt"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Urus folder"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 64d233a..9a6b55e 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Tukar folder"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Alih ke"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Tetapan folder"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Mesej ini telah diubah suai dari versi asal agar muat dalam skrin ini.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Folder"</string>
<string name="folder_list_more" msgid="537172187223133825">"Lagi"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Lagi akaun"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat perbualan, segerakkan folder ini."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Segerak Folder"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> mesej belum dibaca"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> mesej belum dibaca"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ mesej belum dibaca"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> belum dibaca"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ belum dibaca"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Lihat lagi perbualan"</string>
<string name="loading_conversation" msgid="489160038366067983">"Memuatkan…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Pilih akaun"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Mengecutkan mesej lebar agar muat pada skrin anda dan membenarkan zum masuk. Untuk mematikan pilihan ini sila pergi ke Tetapan > Tetapan umum."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Balas"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Balas kepada semua"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Kirim semula"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arkib"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Alih keluar label"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Padam"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Tandakan dibaca"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Diarkibkan"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label Dialih Keluar"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Dipadamkan"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Tidak ditetapkan"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mesej baharu"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Senyap"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Item ActionBar pilihan"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Pilih sehingga <xliff:g id="MAX">%1$d</xliff:g> tindakan"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arkibkan/Alih Keluar Label"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Padam/Buang draf"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Tandakan Dibaca/Belum Dibaca"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Tambah/Alih Keluar Bintang"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Tandakan (tidak) penting"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Laporkan (bukan) spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Alih keluar tindakan"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Padam bukannya arkibkan perbualan"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Leret untuk mengalih keluar"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam senarai perbualan"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Leret ke bawah untuk memuat semula"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Menyemak mel"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Kosongkan tong sampah"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Kosongkan spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
</resources>
diff --git a/res/values-nb-sw600dp/strings.xml b/res/values-nb-sw600dp/strings.xml
index 3a1123f..8f12052 100644
--- a/res/values-nb-sw600dp/strings.xml
+++ b/res/values-nb-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Kopi/blindkopi"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Blindkopi"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Administrer mapper"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9388994..cbac769 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Endre mapper"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Flytt til"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Mappeinnstillinger"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Denne e-posten har blitt endret fra den opprinnelige versjonen slik at den passer denne skjermen.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Mapper"</string>
<string name="folder_list_more" msgid="537172187223133825">"Mer"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Flere kontoer"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Synkroniser denne mappen for å se samtaler."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkroniser mappen"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> ulest e-post"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> uleste e-poster"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ uleste e-poster"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> uleste"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ uleste"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Se flere samtaler"</string>
<string name="loading_conversation" msgid="489160038366067983">"Laster inn …"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Velg konto"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Krymp brede e-poster slik at de tilpasses skjermen din og tillat zooming. Gå til Innstillinger > Generelle innstillinger for å deaktivere dette alternativet."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Svar"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Svar alle"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Videresend"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arkivér"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Fjern etikett"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Slett"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Merk som lest"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arkivert"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiketten er fjernet"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Slettet"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ikke angitt"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nye e-poster"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Stille"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Foretrukne handlingsrad-elementer"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Velg inntil <xliff:g id="MAX">%1$d</xliff:g> handlinger"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Lagre eller fjern etikett"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Slett eller forkast utkast"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Merk som lest eller ulest"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Legg til eller fjern stjerne"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Merk som uviktig"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Rapportér som ikke-nettsøppel"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Handling for fjerning"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Slett samtaler i stedet for å arkivere dem"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Sveip for å fjerne"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"I samtalelister"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Sveip ned for å laste inn på nytt"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Ser etter e-post"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Tøm papirkurven"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Tøm nettsøppel"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Åpne navigasjonsskuffen"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Lukk navigasjonsskuffen"</string>
</resources>
diff --git a/res/values-nl-sw600dp/strings.xml b/res/values-nl-sw600dp/strings.xml
index 00b23ba..7f7634f 100644
--- a/res/values-nl-sw600dp/strings.xml
+++ b/res/values-nl-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Mappen beheren"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b7e1523..46c566f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Mappen wijzigen"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Verplaatsen naar"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Mapinstellingen"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Dit bericht is een aangepaste versie van het oorspronkelijke bericht, zodat het op het scherm past.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Mappen"</string>
<string name="folder_list_more" msgid="537172187223133825">"Meer"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Meer accounts"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Synchroniseer deze map om conversaties weer te geven."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Map synchroniseren"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> ongelezen bericht"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> ongelezen berichten"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ ongelezen berichten"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> ongelezen"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Meer dan <xliff:g id="COUNT">%1$d</xliff:g> ongelezen"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Meer conversaties bekijken"</string>
<string name="loading_conversation" msgid="489160038366067983">"Laden..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Account kiezen"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Verklein brede berichten tot ze op uw scherm passen en sta inzoomen toe. Als u deze optie wilt uitschakelen, gaat u naar \'Instellingen > Algemene instellingen\'."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Beantwoorden"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Allen beantwoorden"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Doorsturen"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archiveren"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Label verwijderen"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Verwijderen"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Markeren als gelezen"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Gearchiveerd"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Label verwijderd"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Verwijderd"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Niet ingesteld"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nieuwe berichten"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Stil"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Voorkeursitems voor actiebalk"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selecteer maximaal <xliff:g id="MAX">%1$d</xliff:g> acties"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Label archiveren/verwijderen"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Concepten verwijderen/weggooien"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Markeren als gelezen/ongelezen"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Ster toevoegen/verwijderen"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Markeren als (niet) belangrijk"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Melden dat dit (geen) spam is"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Verwijderen"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Conversaties verwijderen in plaats van deze te archiveren"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Vegen om te verwijderen"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"In conversatielijst"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Veeg omlaag om te vernieuwen"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Controleren op e-mail"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Prullenbak leegmaken"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Spammap leegmaken"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Navigatielade openen"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Navigatielade sluiten"</string>
</resources>
diff --git a/res/values-pl-sw600dp/strings.xml b/res/values-pl-sw600dp/strings.xml
index e1aff5c..25937f0 100644
--- a/res/values-pl-sw600dp/strings.xml
+++ b/res/values-pl-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ DW/UDW"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ UDW"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Zarządzaj folderami"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f22e7bb..baefb53 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Zmień foldery"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Przenieś do"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Ustawienia folderów"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Ta wiadomość została dopasowana do ekranu i wygląda inaczej niż w wersji oryginalnej)."</string>
<string name="folder_list_title" msgid="4276644062440415214">"Foldery"</string>
<string name="folder_list_more" msgid="537172187223133825">"Więcej"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Więcej kont"</string>
@@ -293,11 +292,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Aby wyświetlić rozmowy, zsynchronizuj ten folder."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizuj folder"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> nieprzeczytana wiadomość"</item>
- <item quantity="other" msgid="4103064420707175144">"Nieprzeczytane wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Nieprzeczytane wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Nieprzeczytane: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Nieprzeczytane: ponad <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Wyświetl więcej rozmów"</string>
<string name="loading_conversation" msgid="489160038366067983">"Wczytuję…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Wybierz konto"</string>
@@ -369,15 +365,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Zmniejsz wiadomości zajmujące dużo miejsca w poziomie, by pasowały do ekranu, i zezwól na powiększanie. Aby wyłączyć tę opcję, wybierz kolejno Ustawienia > Ustawienia ogólne."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Odpowiedz"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Odpowiedz wszystkim"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Przekaż dalej"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archiwizuj"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Usuń etykietę"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Usuń"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Oznacz jako przeczytane"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Zarchiwizowano"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etykieta usunięta"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Usunięto"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nie ustawiono"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -386,22 +379,18 @@
<string name="new_messages" msgid="4419173946074516420">"Nowe wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Cichy"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Preferowane elementy na pasku akcji"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Wybierz nie więcej niż <xliff:g id="MAX">%1$d</xliff:g> czynności"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Zarchiwizuj/usuń etykietę"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Usuń/odrzuć wersje robocze"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Oznacz jako (nie)przeczytane"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Dodaj/usuń gwiazdkę"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Oznacz jako (nie)ważne"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Zgłoś jako (nie)spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Usuń czynność"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Usuwaj wątki, zamiast je archiwizować"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Przesuń palcem, by usunąć"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Na liście wątków"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Przesuń w dół, by odświeżyć"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Sprawdzam pocztę"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Opróżnij kosz"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Opróżnij spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Otwórz szufladę nawigacji"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Zamknij szufladę nawigacji"</string>
</resources>
diff --git a/res/values-pt-rPT-sw600dp/strings.xml b/res/values-pt-rPT-sw600dp/strings.xml
index 45f8a19..97cd49c 100644
--- a/res/values-pt-rPT-sw600dp/strings.xml
+++ b/res/values-pt-rPT-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Gerir pastas"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 2e241c9..46e9059 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Alterar pastas"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Mover para"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Definições da pasta"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Esta mensagem foi modificada a partir da sua versão original para ser ajustada a este ecrã.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Pastas"</string>
<string name="folder_list_more" msgid="537172187223133825">"Mais"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Mais contas"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver as conversas, sincronize esta pasta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar Pasta"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> mensagem não lida"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens não lidas"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ mensagens não lidas"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> não lidas"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ não lidas"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Ver mais conversas"</string>
<string name="loading_conversation" msgid="489160038366067983">"A carregar…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Selecionar conta"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Encolha mensagens compridas para que se ajustem ao ecrã e possa ampliá-las. Para desligar esta opção, aceda a Definições > Definições gerais."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Encaminhar"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arquivo"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Remover marcador"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Eliminar"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcar como lida"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arquivada"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Marcador Removido"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Eliminado"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Não definido"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens novas"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silencioso"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Itens ActionBar preferidos"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selecione até <xliff:g id="MAX">%1$d</xliff:g> ações"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arquivar/Remover Marcador"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Eliminar/Rejeitar rascunhos"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcar como Lido/Não Lido"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Adicionar/Remover Estrela"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Marcar como (não) importante"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Informar de que (não) é spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Remover ação"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Eliminar conversas em vez de as arquivar"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar rapidamente para remover"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize rapidamente para baixo para atualizar"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"A verificar a existência de correio"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Esvaziar caixote do lixo"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Esvaziar spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Abrir separador de navegação"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Fechar separador de navegação"</string>
</resources>
diff --git a/res/values-pt-sw600dp/strings.xml b/res/values-pt-sw600dp/strings.xml
index 54bdcfe..a54fe13 100644
--- a/res/values-pt-sw600dp/strings.xml
+++ b/res/values-pt-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cco"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Cco"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Gerenciar pastas"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index abeb988..5472348 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Alterar pastas"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Mover para"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Configurações de pastas"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(A versão original desta mensagem foi modificada para caber nesta tela.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Pastas"</string>
<string name="folder_list_more" msgid="537172187223133825">"Mais"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Mais contas"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver as conversações, sincronize esta pasta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar pasta"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> mensagem não lida"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens não lidas"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ mensagens não lidas"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> não lidas"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ não lidas"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Ver mais conversas"</string>
<string name="loading_conversation" msgid="489160038366067983">"Carregando…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Escolher conta"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Reduz mensagens largas para que caibam na tela e permite aumentar zoom. Para desativar esta opção, vá para \"Configurações\" > \"Configurações gerais\"."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Encaminhar"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arquivar"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Remover marcador"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Excluir"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcar como lida"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arquivada"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Marcador removido"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Excluída"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Não definido"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> novas mensagens"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silencioso"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Itens preferenciais da ActionBar"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selecione até <xliff:g id="MAX">%1$d</xliff:g> ações"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arquivar/Remover marcador"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Excluir/Descartar rascunhos"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcar como lida/não lida"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Adicionar/Remover estrela"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Marcar como não importante"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Não é spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ação de remoção"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Excluir conversas em vez de arquivá-las"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Deslize para remover"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize para baixo para atualizar"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Verificando e-mail"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Esvaziar lixeira"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Spam vazio"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Abrir gaveta de navegação"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Fechar gaveta de navegação"</string>
</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index b451925..ff399a0 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -127,7 +127,7 @@
<skip />
<!-- no translation found for menu_manage_folders (6755623004628177492) -->
<skip />
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
<!-- no translation found for message_modified (2564340197585393687) -->
<skip />
@@ -453,9 +453,9 @@
<skip />
<!-- no translation found for widget_large_unread_count (5668393672379294516) -->
<skip />
- <!-- no translation found for actionbar_unread_messages:one (8470063623338548501) -->
- <!-- no translation found for actionbar_unread_messages:other (4103064420707175144) -->
- <!-- no translation found for actionbar_large_unread_count (7593808085708037562) -->
+ <!-- no translation found for actionbar_unread_messages (3805594795629836031) -->
+ <skip />
+ <!-- no translation found for actionbar_large_unread_count (2780005218279965391) -->
<skip />
<!-- no translation found for view_more_conversations (3151067626309674344) -->
<skip />
@@ -570,24 +570,18 @@
<skip />
<!-- no translation found for notification_action_reply_all (20020468410400912) -->
<skip />
- <!-- no translation found for notification_action_forward (7252777659544972497) -->
- <skip />
<!-- no translation found for notification_action_archive (81978513898440040) -->
<skip />
<!-- no translation found for notification_action_remove_label (5852730267411032291) -->
<skip />
<!-- no translation found for notification_action_delete (327773454111551791) -->
<skip />
- <!-- no translation found for notification_action_mark_read (4351952818740163225) -->
- <skip />
<!-- no translation found for notification_action_undo_archive (7280710366587361219) -->
<skip />
<!-- no translation found for notification_action_undo_remove_label (1425192858683932457) -->
<skip />
<!-- no translation found for notification_action_undo_delete (3105611327110905438) -->
<skip />
- <!-- no translation found for notification_action_preference_summary_not_set (8168109255072452703) -->
- <skip />
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -600,21 +594,17 @@
<skip />
<!-- no translation found for silent_ringtone (5856834572357761687) -->
<skip />
- <!-- no translation found for preference_preferred_actionbar_items (1494873630787823560) -->
+ <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
<skip />
- <!-- no translation found for preference_preferred_actionbar_items_dialog_title (7547680637775341220) -->
+ <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
<skip />
- <!-- no translation found for action_archive_remove_label (2373265427931131215) -->
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
- <!-- no translation found for action_delete_discard_drafts (3398268725115377135) -->
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
<skip />
- <!-- no translation found for action_mark_read_unread (3532210270682619853) -->
+ <!-- no translation found for preference_swipe_title (807579971507624260) -->
<skip />
- <!-- no translation found for action_add_remove_star (6658875981206117895) -->
- <skip />
- <!-- no translation found for action_mark_not_important (7097443517025742878) -->
- <skip />
- <!-- no translation found for action_report_not_spam (7491310680850552208) -->
+ <!-- no translation found for preference_swipe_description (5132683510510041028) -->
<skip />
<!-- no translation found for swipe_down_to_refresh (6401908905820786227) -->
<skip />
diff --git a/res/values-ro-sw600dp/strings.xml b/res/values-ro-sw600dp/strings.xml
index 18f4285..52c0d71 100644
--- a/res/values-ro-sw600dp/strings.xml
+++ b/res/values-ro-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Gestionaţi dosarele"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ca5f5a5..99a9ae1 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Modificaţi dosarele"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Mutați în"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Setări pentru dosare"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Acest mesaj a fost modificat față de versiunea sa inițială, pentru a se potrivi în acest ecran.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Dosare"</string>
<string name="folder_list_more" msgid="537172187223133825">"Mai multe"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Mai multe conturi"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Pentru a afişa conversaţiile, sincronizaţi acest dosar."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizaţi dosarul"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> mesaj necitit"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> mesaje necitite"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Peste <xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje necitite"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> necitite"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Peste <xliff:g id="COUNT">%1$d</xliff:g> necitite"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Afişaţi mai multe conversaţii"</string>
<string name="loading_conversation" msgid="489160038366067983">"Se încarcă…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Alegeţi un cont"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Micşoraţi dimensiunea mesajelor late pentru ca acestea să încapă pe ecran şi să le puteţi mări. Pentru a dezactiva această opţiune, accesaţi Setări > Setări generale."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Răspundeți"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Răspundeți tuturor"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Redirecționați"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arhivați"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Eliminați eticheta"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Ștergeți"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Marcați ca citit"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhivat"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Eticheta a fost eliminată"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Șters"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nesetat"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje noi"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silențios"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Elemente preferate în Bara de acțiuni"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Selectați până la <xliff:g id="MAX">%1$d</xliff:g> (de) acțiuni"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhivați/eliminați o etichetă"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Ștergeți mesajele nefinalizate"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Marcați drept citit/necitit"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Adăugați/eliminați o stea"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Marcați ca (ne)important"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Semnalați ca „(Nu) este spam”"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminați"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Ștergeți, nu arhivați conversațiile"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Glisați pentru a elimina"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"În lista de conversații"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Glisați în jos pentru actualizare"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Se verifică e-mailurile"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Goliți coșul de gunoi"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Ștergeți mesajele spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Deschideți panoul de navigare"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Închideți panoul de navigare"</string>
</resources>
diff --git a/res/values-ru-sw600dp/strings.xml b/res/values-ru-sw600dp/strings.xml
index 35d6f4d..0b004e8 100644
--- a/res/values-ru-sw600dp/strings.xml
+++ b/res/values-ru-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"Копия"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"Скрытая копия"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Управление папками"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index fffd0d6..0fafcf8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Изменить папки"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Переместить в"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Настройки папок"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"Сообщение было изменено, чтобы оно поместилось на экране."</string>
<string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
<string name="folder_list_more" msgid="537172187223133825">"Ещё"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Ещё аккаунты"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Для просмотра цепочек писем синхронизируйте эту папку."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизировать папку"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"Непрочитанных сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- <item quantity="other" msgid="4103064420707175144">"Непрочитанных сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Непрочитанных сообщений: ><xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Непрочитанных сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Непрочитанных сообщений: > <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Другие цепочки писем"</string>
<string name="loading_conversation" msgid="489160038366067983">"Загрузка..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Выбрать аккаунт"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Окно просмотра писем меняется в соответствии с размером экрана. Чтобы отключить функцию, перейдите в раздел \"Общие настройки\"."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Ответить"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Ответить всем"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Переслать"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Архивировать"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Удалить ярлык"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Удалить"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Прочитано"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Отправлено в архив"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Ярлык удален"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Удалено"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Не задано"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Новых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Без звука"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Элементы на панели действий"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Выберите элементы (не больше <xliff:g id="MAX">%1$d</xliff:g>)"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Архивировать/удалить ярлык"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Удалить черновики"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Пометить как прочитанное/непрочитанное"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Добавить/удалить пометку"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Отметить как важное/неважное"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Спам/не спам"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Действия при удалении"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Удалять цепочки, не архивируя"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Удаление при смахивании"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"В списке цепочек"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Пролистните вниз, чтобы обновить"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Проверка почты…"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Очистить корзину"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Удалить спам"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Открыть панель навигации"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Закрыть панель навигации"</string>
</resources>
diff --git a/res/values-sk-sw600dp/strings.xml b/res/values-sk-sw600dp/strings.xml
index b56691c..424036d 100644
--- a/res/values-sk-sw600dp/strings.xml
+++ b/res/values-sk-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ kópia/skr.kópia"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ skrytá kópia"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Správa priečinkov"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 5e37c5a..4031bfd 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Zmeniť priečinky"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Presunúť do"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Nastavenia priečinka"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Táto správa bola oproti pôvodnej verzii upravená tak, aby sa vošla na túto obrazovku.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Priečinky"</string>
<string name="folder_list_more" msgid="537172187223133825">"Ďalšie"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Ďalšie účty"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Zobr. konverz., synchr. priečinok."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synchronizovať priečinok"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> neprečítaná správa"</item>
- <item quantity="other" msgid="4103064420707175144">"Neprečítané správy: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Neprečítané správy: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Počet neprečítaných správ: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ neprečítaných správ"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Zobraziť ďalšie konverzácie"</string>
<string name="loading_conversation" msgid="489160038366067983">"Prebieha načítavanie..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Vybrať účet"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Zmenšite široké správy, aby sa vošli na obrazovku, a umožnite približovanie. Ak chcete povoliť túto možnosť, prejdite na možnosť Nastavenia > Všeobecné nastavenia."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Odpovedať"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Odpovedať všetkým"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Poslať ďalej"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Archivovať"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Odstrániť menovku"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Odstrániť"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Ozn. ako prečítané"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Archivované"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Menovka bola odstránená"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Odstránené"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Nenastavené"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Počet nových správ: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tichý režim"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Uprednostňované položky panela akcií"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Akcie: vyberte maximálne <xliff:g id="MAX">%1$d</xliff:g>"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Archivovať/odstrániť menovku"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Odstrániť/zahodiť koncepty"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Označiť ako (ne)prečítané"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Pridať/odstrániť hviezdičku"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Označiť ako (ne)dôležité"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"(Ne)nahlásiť ako spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Akcia odstránenia"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Konverzácie skôr odstrániť než archivovať"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Odstrániť posunutím"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"V zozname konverzácií"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Potiahnutím nadol obnovte"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Vyprázdniť kôš"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Vyprázdniť priečinok s nevyžiadanou poštou"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Otvoriť priečinok s navigáciou"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Zavrieť priečinok s navigáciou"</string>
</resources>
diff --git a/res/values-sl-sw600dp/strings.xml b/res/values-sl-sw600dp/strings.xml
index 57dabcd..373ce61 100644
--- a/res/values-sl-sw600dp/strings.xml
+++ b/res/values-sl-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Kp/Skp"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Skp"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Upravljanje map"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ba8730a..a114661 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Spremenite mape"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Premakni v"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Nastavitve mape"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(To sporočilo je bilo zaradi prilagajanja temu zaslonu spremenjeno iz prvotne oblike.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Mape"</string>
<string name="folder_list_more" msgid="537172187223133825">"Več"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Več računov"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Če si želite ogledati pogovore, sinhronizirajte to mapo."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sinhroniziranje mape"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> neprebrano sporočilo"</item>
- <item quantity="other" msgid="4103064420707175144">"Št. neprebranih sporočil: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Št. nepreb. sporočil: več kot <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Št. neprebranih: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Št. neprebranih: več kot <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Oglejte si več pogovorov"</string>
<string name="loading_conversation" msgid="489160038366067983">"Nalaganje ..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Izberite račun"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Skrčite dolga sporočila, da se prilegajo zaslonu, in dovolite povečavo. To možnost lahko izklopite v Nastavitve > Splošne nastavitve."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Odgovori"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Odgovori vsem"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Posreduj"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arhiviraj"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Odstrani oznako"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Izbriši"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Označi kot prebrano"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arhivirano"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Oznaka odstranjena"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Izbrisano"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ni nastavljeno"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Št. novih sporočil: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tiho"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Prednostni elementi za ActionBar"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Izberete lahko največ toliko dejanj: <xliff:g id="MAX">%1$d</xliff:g>"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arhiviraj/odstrani oznako"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Izbriši/zavrzi osnutke"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Označi kot prebrano/neprebrano"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Dodaj/odstrani zvezdico"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Označi kot (ne)pomembno"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Ni/je vsiljena pošta"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Dejanje odstranitve"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Brisanje pogovorov, ne arhiviranje"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Povlecite za odstranitev"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Na seznamu pogovorov"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Za osvežitev povlecite navzdol"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Preverjanje pošte"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Izprazni smetnjak"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Izprazni mapo z vsiljeno pošto"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Odpri predal za navigacijo"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Zapri predal za navigacijo"</string>
</resources>
diff --git a/res/values-sr-sw600dp/strings.xml b/res/values-sr-sw600dp/strings.xml
index 79c1129..f15015f 100644
--- a/res/values-sr-sw600dp/strings.xml
+++ b/res/values-sr-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Управљај директоријумима"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e8f8039..038850c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Промени директоријуме"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Премести у"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Подешавања директоријума"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Оригинална верзија ове поруке је измењена да би се уклопила на овај екран.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Директоријуми"</string>
<string name="folder_list_more" msgid="537172187223133825">"Још"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Још налога"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Да бисте прегледали преписке, синхронизујте директоријум."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронизуј директоријум"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> непрочитана порука"</item>
- <item quantity="other" msgid="4103064420707175144">"Непрочитаних порука: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ непрочитаних порука"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Непрочитаних: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Непрочитаних: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Прикажи још преписки"</string>
<string name="loading_conversation" msgid="489160038366067983">"Учитавање..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Избор налога"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Смањите широке поруке да би се уклопиле у екран и омогућите увећавање. Да бисте искључили ову опцију, идите на Подешавања > Општа подешавања."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Одговори"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Одговори свима"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Проследи"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Архивирај"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Уклони ознаку"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Избриши"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Означи као прочитано"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Архивирано"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Ознака је уклоњена"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Избрисано"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Није подешено"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Нових порука: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Нечујно"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Жељене ставке са траке за радње"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Избор радњи (највише <xliff:g id="MAX">%1$d</xliff:g>)"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Архивирај/уклони ознаку"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Избриши/одбаци недовршене"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Означи као прочитано/непрочит."</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Додај/уклони звездицу"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Означи као (не)важно"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Пријави као (не)пожељно"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Радња уклањања"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Брисање уместо архивирања преписки"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Превуците да бисте уклонили"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"На листи преписки"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Листајте надоле да бисте освежили"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Проверавање поште"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Пражњење директоријума за отпад"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Пражњење директоријума са непожељним порукама"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Отвори фиоку за навигацију"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Затвори фиоку за навигацију"</string>
</resources>
diff --git a/res/values-sv-sw600dp/strings.xml b/res/values-sv-sw600dp/strings.xml
index 14ee2da..ded8271 100644
--- a/res/values-sv-sw600dp/strings.xml
+++ b/res/values-sv-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+kopia/heml kop"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Hemlig kopia"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Hantera mappar"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5e0b94d..d39c5dc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Byt mapp"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Flytta till"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Mappinställningar"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Det här meddelandet har ändrats jämfört med originalversionen så att det passar skärmen.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Mappar"</string>
<string name="folder_list_more" msgid="537172187223133825">"Fler"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Fler konton"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Synka för att visa konversationer."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkronisera mappen"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> oläst meddelande"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> olästa meddelanden"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Mer än <xliff:g id="COUNT">%1$d</xliff:g> olästa meddelanden"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> olästa"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Mer än <xliff:g id="COUNT">%1$d</xliff:g> olästa"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Visa fler konversationer"</string>
<string name="loading_conversation" msgid="489160038366067983">"Läser in …"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Välj konto"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Gör stora meddelanden mindre så att de får plats på skärmen och möjliggör inzoomning. Om du vill stänga av det här alternativet öppnar du Inställningar > Allmänna inställningar."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Svara"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Svara alla"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Vidarebefordra"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arkivera"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Ta bort etikett"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Ta bort"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Markera som läst"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arkiverat"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiketten har tagits bort"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Borttaget"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Har inte angetts"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tyst"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Önskade ActionBar-objekt"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Välj upp till <xliff:g id="MAX">%1$d</xliff:g> åtgärder"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Arkivera/ta bort etikett"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Ta bort/släng utkast"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Markera som läst/oläst"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Lägg till/ta bort stjärna"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Inte viktigt"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Inte skräppost"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ta bort åtgärd"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Ta bort i stället för att arkivera samtal"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Ta bort genom att dra"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"I konversationslista"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Dra nedåt om du vill uppdatera"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Söker efter e-post"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Töm papperskorgen"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Töm skräppostmappen"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Öppna navigeringsmenyn"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Stäng navigeringsmenyn"</string>
</resources>
diff --git a/res/values-sw-sw600dp/strings.xml b/res/values-sw-sw600dp/strings.xml
index 6a2953c..742a036 100644
--- a/res/values-sw-sw600dp/strings.xml
+++ b/res/values-sw-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Nakala kwa/Nakala fiche kwa"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Nakala fiche kwa"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Dhibiti folda"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 17b0f05..065a716 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Badilisha folda"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Hamisha hadi"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Mipangilio ya folda"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Ujumbe huu umerekebishwa kutoka kwa toleo lake asili ili kutoshea kwenye skrini hii.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Folda"</string>
<string name="folder_list_more" msgid="537172187223133825">"Zaidi"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Akaunti zaidi"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Ili kuona mazungumzo, sawazisha folda hii."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sawazisha Folda"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> haujasomwa"</item>
- <item quantity="other" msgid="4103064420707175144">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> haujasomwa"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> zaidi usiosomwa"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Zisizosomwa<xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Zisizosomwa <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Ona mazungumzo zaidi"</string>
<string name="loading_conversation" msgid="489160038366067983">"Inapakia…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Chagua akaunti"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Kunja ujumbe mpana ili utoshee kwenye skrini yako na uruhusu ukuzaji karibu. Ili kuzima chaguo hili, nenda kwenye Mipangilio > mipagilio ya Jumla."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Jibu"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Jibu wote"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Sambaza"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Kumbukumbu"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Ondoa lebo"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Futa"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Tia alama kuwa imesomwa"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Imewekwa kwenye kumbukumbu"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Lebo Imeondolewa"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Imefutwa"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Haijawekwa"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Kimya"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Vipengee vya ActionBar vinavyopendelewa"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Chagua hadi vitendo <xliff:g id="MAX">%1$d</xliff:g>"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Weka kwenye kumbukumbu/Ondoa Lebo"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Futa/Tupa rasimu"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Tia alama Soma/Hazijasomwa"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Ongeza/Ondoa Nyota"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Tia alama kuwa (siyo) muhimu"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Ripoti kuwa (siyo) barua taka"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ondoa kitendo"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Futa badala ya kuweka kwenye kumbukumbu za mazungumzo"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Papasa ili kuondoa"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Katika orodha ya mazungumzo"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Papasa kwa kasi kwenda chini ili kuonyesha upya"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Inaangalia barua pepe"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Safisha tupio"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Safisha barua taka"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Fungua menyu ya kichoraji"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Funga menyu ya kichoraji"</string>
</resources>
diff --git a/res/values-sw600dp/strings.xml b/res/values-sw600dp/strings.xml
index 1b1c0d5..77c90fb 100644
--- a/res/values-sw600dp/strings.xml
+++ b/res/values-sw600dp/strings.xml
@@ -22,4 +22,6 @@
<string name="add_bcc_label">+ Bcc</string>
<!-- Menu item: manages the folders for this account. [CHAR LIMIT = 30] -->
<string name="menu_manage_folders">Manage folders</string>
+ <!-- Settings screen, Reply to all default setting summary [CHAR LIMIT=70] -->
+ <string name="preferences_default_reply_all_summary">Use as default for replies to message notifications</string>
</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index b214843..216327e 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -46,5 +46,5 @@
<item name="android:layout_width">match_parent</item>
</style>
- <style name="ShortcutWidgetTheme" parent="@android:style/Theme.Holo.Dialog.MinWidth"/>
+ <style name="ShortcutWidgetTheme" parent="@android:style/Theme.Holo.Light.Dialog.MinWidth"/>
</resources>
diff --git a/res/values-th-sw600dp/strings.xml b/res/values-th-sw600dp/strings.xml
index b82b570..471a3a4 100644
--- a/res/values-th-sw600dp/strings.xml
+++ b/res/values-th-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ สำเนา/สำเนาลับ"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ สำเนาลับ"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"จัดการโฟลเดอร์"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b64132d..956d9e0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"เปลี่ยนโฟลเดอร์"</string>
<string name="menu_move_to" msgid="9138296669516358542">"ย้ายไปที่"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"การตั้งค่าโฟลเดอร์"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(ข้อความนี้ได้รับการแก้ไขจากเวอร์ชันต้นฉบับเพื่อให้พอดีกับหน้าจอนี้)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"โฟลเดอร์"</string>
<string name="folder_list_more" msgid="537172187223133825">"เพิ่มเติม"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"บัญชีอื่นๆ"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"ในการดูการสนทนา ให้ซิงค์โฟลเดอร์นี้"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"ซิงค์โฟลเดอร์"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"ยังไม่ได้อ่าน <xliff:g id="COUNT">%1$d</xliff:g> ข้อความ"</item>
- <item quantity="other" msgid="4103064420707175144">"ยังไม่ได้อ่าน <xliff:g id="COUNT">%1$d</xliff:g> ข้อความ"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"ยังไม่ได้อ่าน <xliff:g id="COUNT">%1$d</xliff:g>+ ข้อความ"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"ยังไม่ได้อ่าน <xliff:g id="COUNT">%1$d</xliff:g> ข้อความ"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"ยังไม่ได้อ่านมากกว่า <xliff:g id="COUNT">%1$d</xliff:g> ข้อความ"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"ดูการสนทนาเพิ่มเติม"</string>
<string name="loading_conversation" msgid="489160038366067983">"กำลังโหลด…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"เลือกบัญชี"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"หดข้อความที่ยาวให้พอดีกับหน้าจอของคุณและอนุญาตให้ขยายได้ หากต้องการปิดตัวเลือกนี้ ให้ไปที่การตั้งค่า > การตั้งค่าทั่วไป"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"ตอบ"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"ตอบทั้งหมด"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"ส่งต่อ"</string>
<string name="notification_action_archive" msgid="81978513898440040">"เก็บถาวร"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"ลบป้ายกำกับ"</string>
<string name="notification_action_delete" msgid="327773454111551791">"ลบ"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"อ่านแล้ว"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"เก็บถาวรแล้ว"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"ลบป้ายกำกับแล้ว"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"ลบแล้ว"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"ไม่ได้ตั้งค่า"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"เงียบ"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"รายการ ActionBar ที่ต้องการ"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"เลือกการทำงานได้สูงสุด <xliff:g id="MAX">%1$d</xliff:g> รายการ"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"เก็บถาวร/นำป้ายกำกับออก"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"ลบ/ยกเลิกข้อความร่าง"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"ทำเครื่องหมายว่าอ่านแล้ว/ยังไม่ได้อ่าน"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"เพิ่ม/นำดาวออก"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"ทำเครื่องหมายว่า (ไม่) สำคัญ"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"รายงานว่า (ไม่ใช่) สแปม"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"ลบการทำงาน"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"ลบการสนทนาแทนการเก็บถาวร"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"กวาดนิ้วเพื่อนำออก"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"ในรายการการสนทนา"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"กวาดลงเพื่อรีเฟรช"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"กำลังตรวจดูจดหมาย"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"ลบทุกอย่างในถังขยะ"</string>
+ <string name="empty_spam" msgid="930744491746508050">"ลบทุกอย่างในสแปม"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"เปิดช่องการนำทาง"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"ปิดช่องการนำทาง"</string>
</resources>
diff --git a/res/values-tl-sw600dp/strings.xml b/res/values-tl-sw600dp/strings.xml
index bca1893..2a95d52 100644
--- a/res/values-tl-sw600dp/strings.xml
+++ b/res/values-tl-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Pamahalaan ang mga folder"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 303ce3f..bbbbe61 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Baguhin ang mga folder"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Ilipat sa"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Mga setting ng folder"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Binago ang mensaheng ito mula sa orihinal nitong bersyon upang magkasya sa screen na ito.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Mga Folder"</string>
<string name="folder_list_more" msgid="537172187223133825">"Higit pa"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Higit pang mga account"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para tingin pag-uusap, sync folder."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"I-sync ang Folder"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> hindi pa nababasang mensahe"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> hindi pa nababasang mensahe"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ hindi pa nababasang mensahe"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> (na) hindi pa nababasa"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ na hindi pa nababasa"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Tumingin ng higit pang pag-uusap"</string>
<string name="loading_conversation" msgid="489160038366067983">"Naglo-load…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Pumili ng account"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Paliitin ang malalapad na mensahe upang magkasya sa iyong screen at payagan ang pag-zoom in. Upang i-off ang pagpipiliang ito, pumunta sa Mga Setting > Mga pangkalahatang setting."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Tumugon"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Tumugon sa lahat"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Ipasa"</string>
<string name="notification_action_archive" msgid="81978513898440040">"I-archive"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Alisin ang label"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Tanggalin"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Markahang nabasa na"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Na-archive"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Inalis ang Label"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Tinanggal"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Hindi nakatakda"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> (na) bagong mensahe"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Naka-silent"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Mga gustong item sa ActionBar"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Pumili ng hanggang <xliff:g id="MAX">%1$d</xliff:g> (na) pagkilos"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"I-archive/Alisin ang Label"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Tanggalin/Itapon ang mga draft"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Markahang Nabasa/Di pa nabasa"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Magdagdag/Mag-alis ng Star"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Markahang (hindi) mahalaga"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Iulat na (hindi) spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Alisin ang pagkilos"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Tanggalin sa halip na i-archive ang mga pag-uusap"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Mag-swipe upang alisin"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Sa listahan ng pag-uusap"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Mag-swipe pababa upang mag-refresh"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Tumitingin ng mail"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Alisan ng laman ang basurahan"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Alisan ng laman ang spam"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Buksan ang drawer ng nabigasyon"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Isara ang drawer ng nabigasyon"</string>
</resources>
diff --git a/res/values-tr-sw600dp/strings.xml b/res/values-tr-sw600dp/strings.xml
index 3730c61..f8e6581 100644
--- a/res/values-tr-sw600dp/strings.xml
+++ b/res/values-tr-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Klasörleri yönet"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index df612d0..96d7fe0 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Klasörleri değiştir"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Taşı"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Klasör ayarları"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Bu ileti, bu ekrana sığacak şekilde orijinalinden farklı hale getirilmiştir.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Klasörler"</string>
<string name="folder_list_more" msgid="537172187223133825">"Diğer"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Diğer hesaplar"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"İleti dizilerini görüntülemek için bu klasörü senk edin."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Klasörü Senkronize Et"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> okunmamış ileti"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> okunmamış ileti"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ okunmamış ileti"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> tane okunmadı"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ tane okunmadı"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Diğer ileti dizilerini görüntüle"</string>
<string name="loading_conversation" msgid="489160038366067983">"Yükleniyor..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Hesap seç"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Uzun iletileri ekranınıza sığdırmak için küçültün ve yakınlaştırmaya izin verin. Bu seçeneği kapatmak için Ayarlar > Genel ayarlar seçeneğine gidin."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Yanıtla"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Tümünü yanıtla"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Yönlendir"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Arşivle"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Etiketi kaldır"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Sil"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Okundu olarak işaretle"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Arşivlendi"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Etiket Kaldırıldı"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Silindi"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ayarlanmadı"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> yeni ileti"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Sessiz"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Tercih edilen İşlem Çubuğu öğeleri"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"En çok <xliff:g id="MAX">%1$d</xliff:g> işlem seçin"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Etiketi Arşivle/Kaldır"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Taslakları Sil"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Okundu/Okunmadı olarak işaretle"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Yıldız Ekle/Kaldır"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Önemli/önemsiz olarak işaretle"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Spam olduğunu/olmadığını bildir"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Kaldırma işlemi"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"İleti dizilerini arşivlemek yerine silin"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Kaldırmak için hızlıca kaydırın"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"İleti dizisi listesinde"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Yenilemek için aşağı hızlıca kaydırın"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Posta kontrol ediliyor"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Çöp kutusunu boşalt"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Spam klasörünü boşalt"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Gezinme menüsünü aç"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Gezinme menüsünü kapat"</string>
</resources>
diff --git a/res/values-uk-sw600dp/strings.xml b/res/values-uk-sw600dp/strings.xml
index 3e38813..c80e798 100644
--- a/res/values-uk-sw600dp/strings.xml
+++ b/res/values-uk-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Копія/прихована"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Прихована копія"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Керувати папками"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 9c8271e..5007280 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Змінити папки"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Перемістити в"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Налаштування папки"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Вигляд цього повідомлення змінено відповідно до розміру екрана.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
<string name="folder_list_more" msgid="537172187223133825">"Інші"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Інші облікові записи"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Щоб переглядати бесіди, синхронізуйте цю папку."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Синхронізувати папку"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"Непрочитаних повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- <item quantity="other" msgid="4103064420707175144">"Непрочитаних повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"Непрочитаних повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"Не прочитано: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"Не прочитано: <xliff:g id="COUNT">%1$d</xliff:g>+"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Переглянути інші бесіди"</string>
<string name="loading_conversation" msgid="489160038366067983">"Завантаження…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Вибрати обліковий запис"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Великі повідомлення змінюються відповідно до розміру екрана, а також їх можна наближати. Щоб вимкнути цей параметр, перейдіть у Налаштування > Загальні налаштування."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Відповісти"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Відповісти всім"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Переслати"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Архівувати"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Вилучити мітку"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Видалити"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Позначити як прочитане"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Архів"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Мітку вилучено"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Видалено"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Не встановлено"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"Нових повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Без звуку"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Вибрані параметри панелі дій"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Виберіть щонайбільше стільки дій: <xliff:g id="MAX">%1$d</xliff:g>"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Додати/зняти мітку"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Видалити/відхилити чернетки"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Позначити як прочит./непрочит."</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Додати/зняти зірочку"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Позначити як (не)важливе"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Позначити, що це (не) спам"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Вилучити дію"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Видаляйте, а не архівуйте бесіди"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Проведіть пальцем, щоб вилучити"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"У списку бесід"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Проведіть пальцем униз, щоб оновити"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Перевірка пошти"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Очистити кошик"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Очистити папку для спаму"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Висунути навігаційну панель"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Сховати навігаційну панель"</string>
</resources>
diff --git a/res/values-vi-sw600dp/strings.xml b/res/values-vi-sw600dp/strings.xml
index 0b7e58c..a55d608 100644
--- a/res/values-vi-sw600dp/strings.xml
+++ b/res/values-vi-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Quản lý thư mục"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e5162f9..70828dd 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Thay đổi thư mục"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Di chuyển tới"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Cài đặt thư mục"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Thư này đã được sửa đổi từ phiên bản gốc để vừa với màn hình này)."</string>
<string name="folder_list_title" msgid="4276644062440415214">"Thư mục"</string>
<string name="folder_list_more" msgid="537172187223133825">"Thêm"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Tài khoản khác"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Để xem các cuộc hội thoại, hãy đồng bộ hóa thư mục này."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Đồng bộ hóa thư mục"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> thư chưa đọc"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> thư chưa đọc"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ thư chưa đọc"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> chưa đọc"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ chưa đọc"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Xem các cuộc hội thoại khác"</string>
<string name="loading_conversation" msgid="489160038366067983">"Đang tải…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Chọn tài khoản"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Co tin nhắn rộng cho vừa với màn hình và cho phép phóng to. Để tắt tùy chọn này, đi tới Cài đặt > Cài đặt chung."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Trả lời"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Trả lời tất cả"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Chuyển tiếp"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Lưu trữ"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Xóa nhãn"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Xóa"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Đánh dấu là đã đọc"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Đã lưu trữ"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Đã xóa nhãn"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Đã xóa"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Chưa được đặt"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> tin nhắn mới"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Im lặng"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Mục được ưa thích trên thanh tác vụ"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Chọn tối đa <xliff:g id="MAX">%1$d</xliff:g> tác vụ"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Lưu trữ/xóa nhãn"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Xóa/hủy thư nháp"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Đánh dấu là đã đọc/chưa đọc"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Thêm/xóa dấu sao"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Đánh dấu là (không) quan trọng"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Báo cáo (không phải) spam"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Xóa tác vụ"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Xóa chứ không lưu trữ cuộc hội thoại"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Vuốt để xóa"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Trong danh sách cuộc hội thoại"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Vuốt xuống để làm mới"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Đang kiểm tra thư"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Thùng rác trống"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Spam trống"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Mở ngăn kéo điều hướng"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Đóng ngăn kéo điều hướng"</string>
</resources>
diff --git a/res/values-zh-rCN-sw600dp/strings.xml b/res/values-zh-rCN-sw600dp/strings.xml
index 2d8ecfa..e78dbb7 100644
--- a/res/values-zh-rCN-sw600dp/strings.xml
+++ b/res/values-zh-rCN-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ 抄送/密送"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ 密送"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"管理文件夹"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 803c646..dec2ecb 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"更改文件夹"</string>
<string name="menu_move_to" msgid="9138296669516358542">"移至"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"文件夹设置"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"（系统已对此邮件的原始版本进行了调整，使其适合此屏幕的大小。）"</string>
<string name="folder_list_title" msgid="4276644062440415214">"文件夹"</string>
<string name="folder_list_more" msgid="537172187223133825">"更多"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"更多帐户"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"要查看会话，请同步此文件夹。"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步文件夹"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g>封未读邮件"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g>封未读邮件"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"超过<xliff:g id="COUNT">%1$d</xliff:g>封未读邮件"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g>封未读邮件"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"超过<xliff:g id="COUNT">%1$d</xliff:g>封未读邮件"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"查看更多会话"</string>
<string name="loading_conversation" msgid="489160038366067983">"正在加载..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"选择帐户"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"缩小过宽的邮件内容，使其适应屏幕大小。您还可以自行放大邮件内容以使其更易阅读。要关闭此选项，请转到“设置”>“常规设置”。"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"回复"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"全部回复"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"转发"</string>
<string name="notification_action_archive" msgid="81978513898440040">"归档"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"删除标签"</string>
<string name="notification_action_delete" msgid="327773454111551791">"删除"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"标为已读"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"已归档"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"已删除标签"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"已删除"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"未设置"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"静音"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"首选操作栏项"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"最多可选择<xliff:g id="MAX">%1$d</xliff:g>项操作"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"归档/移除标签"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"删除/舍弃草稿"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"标为已读/未读"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"添加/删除星标"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"标为（不）重要"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"举报（非）垃圾邮件"</string>
- <string name="swipe_down_to_refresh" msgid="6401908905820786227">"向下滑动即可刷新"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"删除操作"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"删除（而不是归档）会话"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"滑动即可删除"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"在会话列表中"</string>
+ <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下拉即可刷新"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"正在检查邮件"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"清空已删除邮件"</string>
+ <string name="empty_spam" msgid="930744491746508050">"清空垃圾邮件"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"打开抽屉式导航"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"关闭抽屉式导航"</string>
</resources>
diff --git a/res/values-zh-rTW-sw600dp/strings.xml b/res/values-zh-rTW-sw600dp/strings.xml
index 8dec7e3..402b6c8 100644
--- a/res/values-zh-rTW-sw600dp/strings.xml
+++ b/res/values-zh-rTW-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"新增副本/密件副本"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"新增密件副本"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"管理資料夾"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 84b10ca..7aa4584 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"變更資料夾"</string>
<string name="menu_move_to" msgid="9138296669516358542">"移至"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"資料夾設定"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(這封郵件的原始版本已經過修改，調整為符合這個畫面的版本。)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"資料夾"</string>
<string name="folder_list_more" msgid="537172187223133825">"更多"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"更多帳戶"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"如要查看會話群組，請同步處理這個資料夾。"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步處理資料夾"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> 封未讀郵件"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> 封未讀郵件"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"超過 <xliff:g id="COUNT">%1$d</xliff:g> 封未讀郵件"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> 封未讀郵件"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"超過 <xliff:g id="COUNT">%1$d</xliff:g> 封未讀郵件"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"查看更多會話群組"</string>
<string name="loading_conversation" msgid="489160038366067983">"載入中…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"選擇帳戶"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"根據螢幕大小縮小寬版郵件，並可讓您放大畫面。如要關閉這個選項，請前往 [設定] > [一般設定]。"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"回覆"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"回覆所有人"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"轉寄"</string>
<string name="notification_action_archive" msgid="81978513898440040">"封存"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"移除標籤"</string>
<string name="notification_action_delete" msgid="327773454111551791">"刪除"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"標示為已讀"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"已封存"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"已移除標籤"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"已刪除"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"未設定"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"靜音"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"偏好的動作列項目"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"選取動作 (最多可選取 <xliff:g id="MAX">%1$d</xliff:g> 項)"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"封存/移除標籤"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"刪除/捨棄草稿"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"標示為已讀/未讀"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"加上/移除星號"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"標示為重要/不重要"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"回報垃圾郵件/非垃圾郵件"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"移除動作"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"刪除會話群組，而不要進行封存"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"滑動即可移除"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"在會話群組清單中"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"向下滑動即可重新整理"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"正在檢查郵件"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"清空垃圾筒"</string>
+ <string name="empty_spam" msgid="930744491746508050">"清空垃圾郵件"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"開啟導覽列"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"關閉導覽列"</string>
</resources>
diff --git a/res/values-zu-sw600dp/strings.xml b/res/values-zu-sw600dp/strings.xml
index cc04e64..9c6eb1a 100644
--- a/res/values-zu-sw600dp/strings.xml
+++ b/res/values-zu-sw600dp/strings.xml
@@ -21,4 +21,6 @@
<string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
<string name="menu_manage_folders" msgid="7574962882483466700">"Phatha amafolda"</string>
+ <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
+ <skip />
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7556bad..85206c2 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -76,10 +76,9 @@
<string name="menu_change_folders" msgid="1542713666608888717">"Shintsha amafolda"</string>
<string name="menu_move_to" msgid="9138296669516358542">"Hambisa ku-"</string>
<string name="menu_manage_folders" msgid="6755623004628177492">"Izilungiselelo zefolda"</string>
- <!-- no translation found for menu_show_original (7645904330201725804) -->
+ <!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(Lo mlayezo ulungisiwe kusukela kunguqulo wayo wangempela ukuze ulingane nalesi sikrini)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"Amafolda"</string>
<string name="folder_list_more" msgid="537172187223133825">"Okuningi"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Ama-akhawunti amaningi"</string>
@@ -295,11 +294,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"Ukuze ubuke izingxoxo, vumelanisa le folda."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Vumelanisa ifolda"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <plurals name="actionbar_unread_messages">
- <item quantity="one" msgid="8470063623338548501">"<xliff:g id="COUNT">%1$d</xliff:g> umlayezo ongafundiwe"</item>
- <item quantity="other" msgid="4103064420707175144">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo engafundiwe"</item>
- </plurals>
- <string name="actionbar_large_unread_count" msgid="7593808085708037562">"<xliff:g id="COUNT">%1$d</xliff:g>+ imilayezo engafundiwe"</string>
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> akufundiwe"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ akufundiwe"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Buka izingxoxo ezengeziwe"</string>
<string name="loading_conversation" msgid="489160038366067983">"Iyalayisha…"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Khetha i-akhawunti"</string>
@@ -371,15 +367,12 @@
<string name="auto_fit_messages_dialog_message" msgid="4039164951892949801">"Shwabanisa imilayezo ebanzi ukuze ilingane isikrini sakho futhi ivumele ukusondezwa kwesithombe. Ukuze uvale lokhu kukhetha hamba kuzilungiselelo > izilungiselelo ezijwayelekile."</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Phendula"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Phendula konke"</string>
- <string name="notification_action_forward" msgid="7252777659544972497">"Dlulisela phambili"</string>
<string name="notification_action_archive" msgid="81978513898440040">"Faka kungobo yomlando"</string>
<string name="notification_action_remove_label" msgid="5852730267411032291">"Khipha ilebula"</string>
<string name="notification_action_delete" msgid="327773454111551791">"Susa"</string>
- <string name="notification_action_mark_read" msgid="4351952818740163225">"Maka njengokufundiwe"</string>
<string name="notification_action_undo_archive" msgid="7280710366587361219">"Okufakwe kungobo yomlando"</string>
<string name="notification_action_undo_remove_label" msgid="1425192858683932457">"Ilebula isusiwe"</string>
<string name="notification_action_undo_delete" msgid="3105611327110905438">"Kususiwe"</string>
- <string name="notification_action_preference_summary_not_set" msgid="8168109255072452703">"Ayisethiwe"</string>
<string name="veiled_address" msgid="1209670815434513191"></string>
<string name="veiled_alternate_text" msgid="7370933826442034211"></string>
<string name="veiled_alternate_text_unknown_person" msgid="5132515097905273819"></string>
@@ -388,22 +381,18 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emisha"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Thulile"</string>
- <string name="preference_preferred_actionbar_items" msgid="1494873630787823560">"Izinto ze-ActionBar ezincanyelwayo"</string>
- <string name="preference_preferred_actionbar_items_dialog_title" msgid="7547680637775341220">"Khetha kuze kufinyelela kuzenzo ezingu-<xliff:g id="MAX">%1$d</xliff:g>"</string>
- <string name="action_archive_remove_label" msgid="2373265427931131215">"Faka kungobo yomlando/susa ilebula"</string>
- <string name="action_delete_discard_drafts" msgid="3398268725115377135">"Susa/lahla okusalungiswa"</string>
- <string name="action_mark_read_unread" msgid="3532210270682619853">"Maka okufundiwe/okungafundiwe"</string>
- <string name="action_add_remove_star" msgid="6658875981206117895">"Engeza/susa inkanyezi"</string>
- <string name="action_mark_not_important" msgid="7097443517025742878">"Maka (okungabalulekile)"</string>
- <string name="action_report_not_spam" msgid="7491310680850552208">"Bika (okungekona) ugaxekile"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Susa isenzo"</string>
+ <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Susa kunokuthi ufake kungobo yomlando izingxoxo"</string>
+ <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
+ <skip />
+ <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
+ <skip />
+ <string name="preference_swipe_title" msgid="807579971507624260">"Swayipha ukuze ususe"</string>
+ <string name="preference_swipe_description" msgid="5132683510510041028">"Ohlwini lengxoxo"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swayiphela phansi ukuze uqale kabusha"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Ihlolela imeyili"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"Udoti ongenalutho"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Ugaxekile ongenalutho"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Vula ukuzulazula kwekhabethe"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Vala ukuzulazula kwekhabethe"</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9a3c9b1..8cff43d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,15 +17,16 @@
-->
<resources>
<color name="gray_text_color">#777777</color>
+ <color name="dark_gray_text_color">#58585b</color>
<!-- Conversation List Item Colors -->
<color name="default_text_color">#ff000000</color>
- <color name="subject_text_color_unread">#58585b</color>
+ <color name="subject_text_color_unread">@color/dark_gray_text_color</color>
<color name="snippet_text_color_unread">#777777</color>
- <color name="senders_text_color_unread">@color/subject_text_color_unread</color>
+ <color name="senders_text_color_unread">@color/dark_gray_text_color</color>
<color name="subject_text_color_read">@color/subject_text_color_unread</color>
<color name="snippet_text_color_read">@color/snippet_text_color_unread</color>
<color name="senders_text_color_read">@color/senders_text_color_unread</color>
- <color name="date_text_color">@color/subject_text_color_unread</color>
+ <color name="date_text_color">@color/dark_gray_text_color</color>
<color name="message_info_text_color">@color/gray_text_color</color>
<color name="subject_text_color">#333333</color>
<color name="drafts">#ff990000</color>
@@ -35,17 +36,15 @@
<color name="swiped_bg_color">#ff999999</color>
<color name="holo_light_background_color">#ffe8e8e8</color>
<!-- Keep the following two colors in sync with LabelColorUtils.DEFAULT_COLORS (UnifiedGmail) -->
- <color name="default_folder_background_color">#f1f5ec</color>
- <color name="default_folder_foreground_color">#006633</color>
+ <color name="default_folder_background_color">#dddddd</color>
+ <color name="default_folder_foreground_color">@color/gray_text_color</color>
<!-- Folder List/Drawer colors -->
<color name="drawer_background_dim">#66000000</color>
- <color name="folder_list_divider_color">#424242</color>
- <color name="folder_list_heading_text_color">#808080</color>
- <color name="account_item_heading_text_color">@color/gray_text_color</color>
- <color name="account_item_heading_background">@color/gray_text_color</color>
- <color name="list_background_color">#30302f</color>
- <color name="folder_item_text_color">@android:color/white</color>
+ <color name="account_item_selected_text_color">#35b4e3</color>
+ <color name="folder_list_divider_color">@color/gray_text_color</color>
+ <color name="folder_list_heading_text_color">@color/dark_gray_text_color</color>
+ <color name="list_background_color">#eeeeee</color>
<color name="unread_count_color">#aaaaaa</color>
<!-- Compose colors -->
@@ -87,13 +86,14 @@
<!-- Make sure to also update LetterTileProvider#NUM_OF_TILE_COLORS when adding or removing colors -->
<array name="letter_tile_colors">
- <item>#d66161</item>
- <item>#da8b60</item>
- <item>#cf9443</item>
- <item>#bcab45</item>
- <item>#5e9a6c</item>
- <item>#537788</item>
- <item>#316f94</item>
+ <item>#f16364</item>
+ <item>#f58559</item>
+ <item>#f9a43e</item>
+ <item>#e4c62e</item>
+ <item>#67bf74</item>
+ <item>#59a2be</item>
+ <item>#2093cd</item>
+ <item>#ad62a7</item>
</array>
<color name="letter_tile_default_color">#d66161</color>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index c6aae5e..289212c 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -61,19 +61,21 @@
<dimen name="message_header_inner_side_padding">8dip</dimen>
<dimen name="attachment_toast_yoffset">-100dip</dimen>
<dimen name="spinner_frame_width">196dip</dimen>
- <dimen name="folder_list_heading_padding_side">8dp</dimen>
- <dimen name="folder_list_heading_padding_bottom">4dp</dimen>
- <dimen name="folder_list_item_left_margin">16dp</dimen>
- <dimen name="folder_list_item_right_margin">16dp</dimen>
- <dimen name="folder_swatch_height">5dip</dimen>
+ <dimen name="folder_list_heading_padding_side">16dp</dimen>
+ <dimen name="folder_list_heading_padding_bottom">3dp</dimen>
+ <dimen name="folder_list_item_left_margin">7dp</dimen>
+ <dimen name="folder_list_item_right_margin">8dp</dimen>
+ <!-- Let's try to keep this consistent with color_block_height above, unless there's a good reason not to. -->
+ <dimen name="folder_swatch_height">6dip</dimen>
<dimen name="folder_list_popup_width">200dip</dimen>
<dimen name="folder_list_folder_color_width">36dip</dimen>
<dimen name="folder_list_item_minimum_height">48dip</dimen>
- <dimen name="account_item_left_margin">16dp</dimen>
- <dimen name="account_item_right_margin">16dp</dimen>
+ <dimen name="account_item_left_margin">14dp</dimen>
+ <dimen name="account_item_right_margin">8dp</dimen>
<dimen name="account_item_minimum_height">48dip</dimen>
<dimen name="account_item_swatch_height">8dip</dimen>
<dimen name="account_item_folder_color_width">36dip</dimen>
+ <dimen name="account_radio_button_length">16dp</dimen>
<dimen name="widget_senders_font_size">18sp</dimen>
<dimen name="widget_subject_font_size">14sp</dimen>
<dimen name="widget_date_font_size">12sp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7b7113d..0759db9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -165,8 +165,8 @@
<string name="report_rendering_improvement_desc" translatable="false">
This message looks good.
</string>
- <!-- Menu item text to show the original version of an email conversation, before message manipulation [CHAR LIMIT=30] -->
- <string name="menu_show_original">Show original</string>
+ <!-- Menu item text to show the original version of an email conversation, before message manipulation [CHAR LIMIT=25] -->
+ <string name="menu_show_original">Revert auto-sizing</string>
<!-- After message manipulation, this small disclaimer text appears above a re-formatted message [CHAR LIMIT=200] -->
<string name="message_modified">(This message has been modified from its original version to fit this screen.)</string>
<!-- Title for the Folder list screen. [CHAR LIMIT = 30] -->
@@ -359,6 +359,8 @@
<string name="me">me</string>
<!-- List item to open folders view in account dropdown [CHAR LIMIT=50] -->
<string name="show_all_folders">Show all folders</string>
+ <!-- Header for list of inboxes in the drawer (Inbox, Priority) [CHAR LIMIT=50] -->
+ <string name="inbox_folders_heading">Inbox</string>
<plurals name="confirm_delete_conversation">
<!-- Dialog message to confirm deletion of one conversation -->
@@ -452,7 +454,7 @@
<string name="archived">Archived</string>
<!-- Displayed when swiping away a single conversation to remove the currently displayed folder [CHAR LIMIT=80] -->
<string name="folder_removed">Removed from <xliff:g id="folderName">%1$s</xliff:g></string>
-
+
<plurals name="conversation_folder_changed">
<!-- Displayed while adding and removing folders to a single conversation. [CHAR LIMIT=100] -->
<item quantity="one">Changed folder.</item>
@@ -844,8 +846,29 @@
<!-- Settings screen, preference name for archive vs. delete [CHAR LIMIT=50] -->
<string name="preference_archive_vs_delete_title">Remove action</string>
- <!-- Settings screen, preference description for archive vs. delete [CHAR LIMIT=200] -->
- <string name="preference_archive_vs_delete_text">Delete rather than archive conversations</string>
+ <!-- Options to select from for whether to have archive or delete as the remove action [CHAR LIMIT=50] -->
+ <string-array name="prefEntries_archive_vs_delete">
+ <item>Archive conversations</item>
+ <item>Delete conversations</item>
+ </string-array>
+ <!-- Description of currently selected option of whether to use archive or delete as remove action [CHAR LIMIT=200] -->
+ <string-array name="prefSummaries_archive_vs_delete_summary">
+ <item>Archive rather than delete conversations</item>
+ <item>Delete rather than archive conversations</item>
+ </string-array>
+ <string-array translatable="false" name="prefValues_archive_vs_delete">
+ <item>archive</item>
+ <item>delete</item>
+ </string-array>
+ <!-- Dialog title for the choosing whether to use archive or delete as remove action [CHAR LIMIT=150] -->
+ <string name="prefDialogTitle_archive_vs_delete">Remove action</string>
+ <!-- The default value -->
+ <string translatable="false" name="prefDefault_archive_vs_delete">archive</string>
+
+ <!-- Settings screen, Reply to all default setting title [CHAR LIMIT=30] -->
+ <string name="preferences_default_reply_all_title">Reply all</string>
+ <!-- Settings screen, Reply to all default setting summary [CHAR LIMIT=70] -->
+ <string name="preferences_default_reply_all_summary">Use as default for message replies</string>
<!-- Preference name for swipe action [CHAR LIMIT=100]-->
<string name="preference_swipe_title">Swipe to remove</string>
@@ -859,7 +882,7 @@
<!-- In conversation list, when user has triggered a sync via a downward swipe,
this text is displayed in the action bar for a brief moment to
- indicate that a sync is in progress. [CHAR LIMIT=60] -->
+ indicate that a sync is in progress. [CHAR LIMIT=60] -->
<string name="checking_for_mail">Checking for mail</string>
<!-- Conversation list screen overflow menu in trash folder [CHAR LIMIT=50] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0ccca3d..9fafa2d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -150,13 +150,14 @@
<!-- End Compose styles -->
<style name="UnreadCount">
- <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_width">44dp</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:layout_marginLeft">8dip</item>
+ <item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:includeFontPadding">false</item>
<item name="android:textSize">14sp</item>
- <item name="android:textColor">@color/unread_count_color</item>
+ <item name="android:paddingTop">4dp</item>
+ <item name="android:paddingBottom">4dp</item>
</style>
<style name="UnreadCountActionBarBase" parent="UnreadCount">
@@ -178,20 +179,16 @@
</style>
<style name="UnseenCount">
- <item name="android:layout_width">wrap_content</item>
+ <item name="android:layout_width">44dp</item>
<item name="android:layout_height">wrap_content</item>
- <item name="android:layout_marginLeft">8dip</item>
- <item name="android:minWidth">42dp</item>
+ <item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:includeFontPadding">false</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textStyle">bold</item>
- <item name="android:paddingLeft">4dp</item>
- <item name="android:paddingRight">4dp</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">4dp</item>
- <item name="android:gravity">center</item>
</style>
<!-- No change in the default case. -->
@@ -393,7 +390,7 @@
<item name="android:layout_marginTop">16dip</item>
</style>
- <style name="ShortcutWidgetTheme" parent="@android:style/Theme.Holo.DialogWhenLarge"/>
+ <style name="ShortcutWidgetTheme" parent="@android:style/Theme.Holo.Light.DialogWhenLarge"/>
<style name="ComposeTheme" parent="@android:style/Theme.Holo.Light">
<item name="android:colorBackground">@android:color/white</item>
diff --git a/src/com/android/mail/MailIntentService.java b/src/com/android/mail/MailIntentService.java
index 503f385..7f04392 100644
--- a/src/com/android/mail/MailIntentService.java
+++ b/src/com/android/mail/MailIntentService.java
@@ -62,7 +62,7 @@
final String action = intent.getAction();
if (Intent.ACTION_LOCALE_CHANGED.equals(action)) {
- handleLocaleChanged();
+ NotificationUtils.cancelAndResendNotifications(this);
} 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);
@@ -91,9 +91,4 @@
final Intent intent = new Intent(ACTION_BACKUP_DATA_CHANGED);
context.startService(intent);
}
-
- private void handleLocaleChanged() {
- // Cancel all notifications. The correct ones will be recreated when the app starts back up
- NotificationUtils.cancelAndResendNotifications(this);
- }
}
diff --git a/src/com/android/mail/adapter/DrawerItem.java b/src/com/android/mail/adapter/DrawerItem.java
index 49e12fa..a372fdc 100644
--- a/src/com/android/mail/adapter/DrawerItem.java
+++ b/src/com/android/mail/adapter/DrawerItem.java
@@ -42,7 +42,7 @@
public final Account mAccount;
public final int mResource;
/** True if the drawer item represents the current account, false otherwise */
- public final boolean mIsCurrentAccount;
+ public boolean mIsSelected;
/** Either {@link #VIEW_ACCOUNT}, {@link #VIEW_FOLDER} or {@link #VIEW_HEADER} */
public final int mType;
/** A normal folder, also a child, if a parent is specified. */
@@ -123,7 +123,7 @@
mFolderType = folderType;
mAccount = account;
mResource = resource;
- mIsCurrentAccount = isCurrentAccount;
+ mIsSelected = isCurrentAccount;
mInflater = LayoutInflater.from(activity.getActivityContext());
mType = type;
mPosition = position;
@@ -320,7 +320,7 @@
accountItemView =
(AccountItemView) mInflater.inflate(R.layout.account_item, null, false);
}
- accountItemView.bind(mAccount, mIsCurrentAccount, mResource);
+ accountItemView.bind(mAccount, mIsSelected, mResource);
View v = accountItemView.findViewById(R.id.account_graphic);
v.setBackgroundColor(mAccount.color);
return accountItemView;
diff --git a/src/com/android/mail/browse/ConversationCursor.java b/src/com/android/mail/browse/ConversationCursor.java
index cd547ee..aa6d671 100644
--- a/src/com/android/mail/browse/ConversationCursor.java
+++ b/src/com/android/mail/browse/ConversationCursor.java
@@ -136,7 +136,8 @@
private boolean mInitialConversationLimit = false;
/** A list of mostly-dead items */
private final List<Conversation> mMostlyDead = Lists.newArrayList();
- /** A list of items pending removal from a notification action. These may be undone later. */
+ /** A list of items pending removal from a notification action. These may be undone later.
+ * Note: only modify on UI thread. */
private final Set<Conversation> mNotificationTempDeleted = Sets.newHashSet();
/** The name of the loader */
private final String mName;
@@ -2015,22 +2016,26 @@
}
private void resetNotificationActions() {
- final boolean changed = !mNotificationTempDeleted.isEmpty();
+ // Needs to be on the UI thread because it updates the ConversationCursor's internal
+ // state which violates assumptions about how the ListView works and how
+ // the ConversationViewPager works if performed off of the UI thread.
+ // Also, prevents ConcurrentModificationExceptions on mNotificationTempDeleted.
+ mMainThreadHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ final boolean changed = !mNotificationTempDeleted.isEmpty();
- for (final Conversation conversation : mNotificationTempDeleted) {
- sProvider.undeleteLocal(conversation.uri, this);
- }
+ for (final Conversation conversation : mNotificationTempDeleted) {
+ sProvider.undeleteLocal(conversation.uri, ConversationCursor.this);
+ }
- mNotificationTempDeleted.clear();
+ mNotificationTempDeleted.clear();
- if (changed) {
- mMainThreadHandler.post(new Runnable() {
- @Override
- public void run() {
+ if (changed) {
notifyDataChanged();
}
- });
- }
+ }
+ });
}
/**
@@ -2038,63 +2043,77 @@
* "Undo" action is available, we do not want to show the conversation in the list.
*/
public void handleNotificationActions() {
- final SparseArrayCompat<NotificationAction> undoNotifications =
- NotificationActionUtils.sUndoNotifications;
+ // Needs to be on the UI thread because it updates the ConversationCursor's internal
+ // state which violates assumptions about how the ListView works and how
+ // the ConversationViewPager works if performed off of the UI thread.
+ // Also, prevents ConcurrentModificationExceptions on mNotificationTempDeleted.
+ mMainThreadHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ final SparseArrayCompat<NotificationAction> undoNotifications =
+ NotificationActionUtils.sUndoNotifications;
+ final Set<Conversation> undoneConversations =
+ NotificationActionUtils.sUndoneConversations;
- final Set<Conversation> undoConversations =
- Sets.newHashSetWithExpectedSize(undoNotifications.size());
+ final Set<Conversation> undoConversations =
+ Sets.newHashSetWithExpectedSize(undoNotifications.size());
- boolean changed = false;
+ boolean changed = false;
- for (int i = 0; i < undoNotifications.size(); i++) {
- final NotificationAction notificationAction =
- undoNotifications.get(undoNotifications.keyAt(i));
+ for (int i = 0; i < undoNotifications.size(); i++) {
+ final NotificationAction notificationAction =
+ undoNotifications.get(undoNotifications.keyAt(i));
- // We only care about notifications that were for this folder or if the action was
- // delete
- final Folder folder = notificationAction.getFolder();
- final boolean deleteAction =
- notificationAction.getNotificationActionType() == NotificationActionType.DELETE;
+ // We only care about notifications that were for this folder
+ // or if the action was delete
+ final Folder folder = notificationAction.getFolder();
+ final boolean deleteAction = notificationAction.getNotificationActionType()
+ == NotificationActionType.DELETE;
- if (folder.conversationListUri.equals(qUri) || deleteAction) {
- // We only care about destructive actions
- if (notificationAction.getNotificationActionType().getIsDestructive()) {
- final Conversation conversation = notificationAction.getConversation();
+ if (folder.conversationListUri.equals(qUri) || deleteAction) {
+ // We only care about destructive actions
+ if (notificationAction.getNotificationActionType().getIsDestructive()) {
+ final Conversation conversation = notificationAction.getConversation();
- undoConversations.add(conversation);
+ undoConversations.add(conversation);
- if (!mNotificationTempDeleted.contains(conversation)) {
- sProvider.deleteLocal(conversation.uri, this);
- mNotificationTempDeleted.add(conversation);
+ if (!mNotificationTempDeleted.contains(conversation)) {
+ sProvider.deleteLocal(conversation.uri, ConversationCursor.this);
+ mNotificationTempDeleted.add(conversation);
+
+ changed = true;
+ }
+ }
+ }
+ }
+
+ // Remove any conversations from the temporary deleted state
+ // if they no longer have an undo notification
+ final Iterator<Conversation> iterator = mNotificationTempDeleted.iterator();
+ while (iterator.hasNext()) {
+ final Conversation conversation = iterator.next();
+
+ if (!undoConversations.contains(conversation)) {
+ // We should only be un-deleting local cursor edits
+ // if the notification was undone rather than just
+ // disappearing because the internal cursor
+ // gets updated when the undo goes away via timeout which
+ // will update everything properly.
+ if (undoneConversations.contains(conversation)) {
+ sProvider.undeleteLocal(conversation.uri, ConversationCursor.this);
+ undoneConversations.remove(conversation);
+ }
+ iterator.remove();
changed = true;
}
}
- }
- }
- // Remove any conversations from the temporary deleted state if they no longer have an undo
- // notification
- final Iterator<Conversation> iterator = mNotificationTempDeleted.iterator();
- while (iterator.hasNext()) {
- final Conversation conversation = iterator.next();
-
- if (!undoConversations.contains(conversation)) {
- sProvider.undeleteLocal(conversation.uri, this);
- iterator.remove();
-
- changed = true;
- }
- }
-
- if (changed) {
- mMainThreadHandler.post(new Runnable() {
- @Override
- public void run() {
+ if (changed) {
notifyDataChanged();
}
- });
- }
+ }
+ });
}
@Override
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 7b0c06e..49d6a5d 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -84,7 +84,12 @@
import com.android.mail.utils.Utils;
import com.google.common.annotations.VisibleForTesting;
+// TODO(pwestbro): References to non AOSP code should be moved out of UnifiedEmail
+import com.google.analytics.tracking.android.EasyTracker;
+import com.google.analytics.tracking.android.Tracker;
+
import java.util.ArrayList;
+import java.util.List;
public class ConversationItemView extends View implements SwipeableItemView, ToggleableItem,
InvalidateCallback {
@@ -100,9 +105,17 @@
private static final String PERF_TAG_CALCULATE_COORDINATES = "CCHV.coordinates";
private static final String LOG_TAG = LogTag.getLogTag();
+ // Analytics string values
+ private static final String CONV_ITEM_VIEW_CATEGORY = "ConversationItemView";
+ private static final String CONTACT_PHOTO_ACTION = "ContactPhoto";
+ private static final String NUM_PHOTOS_LABEL = "num_photos";
+ private static final String CUSTOM_DIMEN_ACCOUNT_TYPE_GOOGLE_COM = "account_type_google_com";
+ private static final String CUSTOM_DIMEN_ACCOUNT_TYPE_NON_GOOGLE_COM
+ = "account_type_non_google_com";
+ private static final boolean REPORT_ANALYTICS = true;
+
+
// Static bitmaps.
- private static Bitmap CHECKMARK_OFF;
- private static Bitmap CHECKMARK_ON;
private static Bitmap STAR_OFF;
private static Bitmap STAR_ON;
private static Bitmap ATTACHMENT;
@@ -135,6 +148,9 @@
private static TextPaint sPaint = new TextPaint();
private static TextPaint sFoldersPaint = new TextPaint();
+ private static Tracker sConversationItemViewTracker;
+
+
// Backgrounds for different states.
private final SparseArray<Drawable> mBackgrounds = new SparseArray<Drawable>();
@@ -152,6 +168,9 @@
/** Whether we are on a tablet device or not */
private final boolean mTabletDevice;
+ /** Whether we have reported analytics for this view */
+ private boolean mReportedStats = false;
+
@VisibleForTesting
ConversationItemViewCoordinates mCoordinates;
@@ -161,10 +180,9 @@
public ConversationItemViewModel mHeader;
private boolean mDownEvent;
- private boolean mChecked = false;
+ private boolean mSelected = false;
private ConversationSelectionSet mSelectedConversationSet;
private Folder mDisplayedFolder;
- private boolean mCheckboxesEnabled;
private boolean mStarEnabled;
private boolean mSwipeEnabled;
private int mLastTouchX;
@@ -175,7 +193,7 @@
private ControllableActivity mActivity;
private final TextView mSubjectTextView;
private final TextView mSendersTextView;
- private boolean mConvListPhotosEnabled;
+ private int mGadgetMode;
private final DividedImageCanvas mContactImagesHolder;
private int mAttachmentPreviewMode;
private final DividedImageCanvas mAttachmentPreviewsCanvas;
@@ -345,12 +363,8 @@
mTabletDevice = Utils.useTabletUI(res);
mAccount = account;
- if (CHECKMARK_OFF == null) {
+ if (STAR_OFF == null) {
// Initialize static bitmaps.
- CHECKMARK_OFF = BitmapFactory.decodeResource(res,
- R.drawable.btn_check_off_normal_holo_light);
- CHECKMARK_ON = BitmapFactory.decodeResource(res,
- R.drawable.btn_check_on_normal_holo_light);
STAR_OFF = BitmapFactory.decodeResource(res,
R.drawable.btn_star_off_normal_email_holo_light);
STAR_ON = BitmapFactory.decodeResource(res,
@@ -399,8 +413,14 @@
sFoldersLeftPadding = res.getDimensionPixelOffset(R.dimen.folders_left_padding);
sContactPhotoManager = ContactPhotoManager.createContactPhotoManager(context);
sAttachmentPreviewsManager = ContactPhotoManager.createContactPhotoManager(context);
+
+ if (REPORT_ANALYTICS) {
+ EasyTracker.getInstance().setContext(context);
+ sConversationItemViewTracker = EasyTracker.getTracker();
+ }
}
+
mSendersTextView = new TextView(mContext);
mSendersTextView.setEllipsize(TextUtils.TruncateAt.END);
mSendersTextView.setIncludeFontPadding(false);
@@ -420,6 +440,44 @@
mCoordinates.contactImagesX + mCoordinates.contactImagesWidth,
mCoordinates.contactImagesY + mCoordinates.contactImagesHeight);
}
+
+ @Override
+ public void onImagesResolved() {
+ if (REPORT_ANALYTICS && !mReportedStats) {
+ final int numTiles = mContactImagesHolder.getDivisionCount();
+ final List<String> photoKeys = mContactImagesHolder.getDivisionIds();
+ int numPhotos = 0;
+ for (final String photoKey : photoKeys) {
+ final Boolean isResolved =
+ mContactImagesHolder.imageResolved(photoKey);
+ if (isResolved != null && isResolved) {
+ numPhotos++;
+ }
+ }
+
+ // Number of subtiles
+ sConversationItemViewTracker.setCustomMetric(1, (long)numTiles);
+ // Number of resolved photos
+ sConversationItemViewTracker.setCustomMetric(2, (long)numPhotos);
+ // Number of letter subtiles
+ sConversationItemViewTracker.setCustomMetric(3, (long)(numTiles - numPhotos));
+ final String accountTypeCustomDimen = mAccount.endsWith("google.com") ?
+ CUSTOM_DIMEN_ACCOUNT_TYPE_GOOGLE_COM :
+ CUSTOM_DIMEN_ACCOUNT_TYPE_NON_GOOGLE_COM;
+ sConversationItemViewTracker.setCustomDimension(3, accountTypeCustomDimen);
+ // This is a hack. Ideally this would check the folder object to determine if it
+ // is the primary section
+ final String isPrimarySection =
+ TextUtils.equals(mDisplayedFolder.persistentId, "^sq_ig_i_personal") ?
+ "primary" : "not_primary";
+ sConversationItemViewTracker.setCustomDimension(4, isPrimarySection);
+
+ sConversationItemViewTracker.sendEvent(CONV_ITEM_VIEW_CATEGORY,
+ CONTACT_PHOTO_ACTION, NUM_PHOTOS_LABEL, (long)numTiles);
+
+ mReportedStats = true;
+ }
+ }
});
mAttachmentPreviewsCanvas = new DividedImageCanvas(context, this);
}
@@ -459,11 +517,10 @@
mActivity = activity;
mSelectedConversationSet = set;
mDisplayedFolder = folder;
- mCheckboxesEnabled = (checkboxOrSenderImage == ConversationListIcon.CHECKBOX);
- mConvListPhotosEnabled = (checkboxOrSenderImage == ConversationListIcon.SENDER_IMAGE);
mStarEnabled = folder != null && !folder.isTrash();
mSwipeEnabled = swipeEnabled;
mAdapter = adapter;
+ mReportedStats = false;
if (mHeader.conversation.getAttachmentsCount() == 0) {
mAttachmentPreviewMode = ConversationItemViewCoordinates.ATTACHMENT_PREVIEW_NONE;
} else {
@@ -472,13 +529,10 @@
: ConversationItemViewCoordinates.ATTACHMENT_PREVIEW_TALL;
}
- final int gadgetMode;
- if (mConvListPhotosEnabled) {
- gadgetMode = ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO;
- } else if (mCheckboxesEnabled) {
- gadgetMode = ConversationItemViewCoordinates.GADGET_CHECKBOX;
+ if (checkboxOrSenderImage == ConversationListIcon.SENDER_IMAGE) {
+ mGadgetMode = ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO;
} else {
- gadgetMode = ConversationItemViewCoordinates.GADGET_NONE;
+ mGadgetMode = ConversationItemViewCoordinates.GADGET_NONE;
}
// Initialize folder displayer.
@@ -502,7 +556,7 @@
mHeader.conversation.dateMs);
mConfig = new ConversationItemViewCoordinates.Config()
- .withGadget(gadgetMode)
+ .withGadget(mGadgetMode)
.withAttachmentPreviews(mAttachmentPreviewMode);
if (header.folderDisplayer.hasVisibleFolders()) {
mConfig.showFolders();
@@ -647,9 +701,9 @@
startTimer(PERF_TAG_CALCULATE_TEXTS_BITMAPS);
if (mSelectedConversationSet != null) {
- mChecked = mSelectedConversationSet.contains(mHeader.conversation);
+ mSelected = mSelectedConversationSet.contains(mHeader.conversation);
}
- mHeader.checkboxVisible = mCheckboxesEnabled && !mConvListPhotosEnabled;
+ mHeader.gadgetMode = mGadgetMode;
final boolean isUnread = mHeader.unread;
updateBackground(isUnread);
@@ -659,6 +713,7 @@
// Parse senders fragments.
if (mHeader.conversation.conversationInfo != null) {
+ // This is Gmail
Context context = getContext();
mHeader.messageInfoString = SendersView
.createMessageInfo(context, mHeader.conversation, true);
@@ -675,7 +730,16 @@
// If we have displayable senders, load their thumbnails
loadSenderImages();
} else {
+ // This is Email
SendersView.formatSenders(mHeader, getContext(), true);
+ if (mHeader.conversation.senders != null) {
+ mHeader.displayableSenderEmails = new ArrayList<String>();
+ mHeader.displayableSenderEmails.add(mHeader.conversation.senders);
+ mHeader.displayableSenderNames = new ArrayList<String>();
+ // Does Email have display name for sender?
+ mHeader.displayableSenderNames.add(mHeader.conversation.senders);
+ loadSenderImages();
+ }
}
if (mAttachmentPreviewMode != ConversationItemViewCoordinates.ATTACHMENT_PREVIEW_NONE) {
@@ -706,7 +770,8 @@
// FIXME(ath): maybe move this to bind(). the only dependency on layout is on tile W/H, which
// is immutable.
private void loadSenderImages() {
- if (mConvListPhotosEnabled && mHeader.displayableSenderEmails != null
+ if (mGadgetMode == ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO
+ && mHeader.displayableSenderEmails != null
&& mHeader.displayableSenderEmails.size() > 0) {
if (mCoordinates.contactImagesWidth <= 0 || mCoordinates.contactImagesHeight <= 0) {
LogUtils.w(LOG_TAG,
@@ -717,11 +782,12 @@
mContactImagesHolder.setDimensions(mCoordinates.contactImagesWidth,
mCoordinates.contactImagesHeight);
mContactImagesHolder.setDivisionIds(mHeader.displayableSenderEmails);
- int size = mHeader.displayableSenderEmails.size();
+ final int size = mHeader.displayableSenderEmails.size();
+ final int numTiles = Math.min(DividedImageCanvas.MAX_DIVISIONS, size);
String emailAddress;
- for (int i = 0; i < DividedImageCanvas.MAX_DIVISIONS && i < size; i++) {
+ for (int i = 0; i < numTiles; i++) {
emailAddress = mHeader.displayableSenderEmails.get(i);
- PhotoIdentifier photoIdentifier = new ContactIdentifier(
+ final PhotoIdentifier photoIdentifier = new ContactIdentifier(
mHeader.displayableSenderNames.get(i), emailAddress, i);
sContactPhotoManager.loadThumbnail(photoIdentifier, mContactImagesHolder);
}
@@ -1102,16 +1168,12 @@
@Override
protected void onDraw(Canvas canvas) {
- // Check mark.
- if (mConvListPhotosEnabled) {
+ // Contact photo
+ if (mGadgetMode == ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO) {
canvas.save();
drawContactImages(canvas);
canvas.restore();
- } else if (mHeader.checkboxVisible) {
- Bitmap checkmark = mChecked ? CHECKMARK_ON : CHECKMARK_OFF;
- canvas.drawBitmap(checkmark, mCoordinates.checkmarkX, mCoordinates.checkmarkY, sPaint);
}
-
// Senders.
boolean isUnread = mHeader.unread;
// Old style senders; apply text colors/ sizes/ styling.
@@ -1238,13 +1300,13 @@
final int background;
if (isUnread) {
if (isListOnTablet) {
- if (mChecked) {
+ if (mSelected) {
background = R.drawable.list_conversation_wide_unread_selected_holo;
} else {
background = R.drawable.conversation_wide_unread_selector;
}
} else {
- if (mChecked) {
+ if (mSelected) {
background = getCheckedActivatedBackground();
} else {
background = R.drawable.conversation_unread_selector;
@@ -1252,13 +1314,13 @@
}
} else {
if (isListOnTablet) {
- if (mChecked) {
+ if (mSelected) {
background = R.drawable.list_conversation_wide_read_selected_holo;
} else {
background = R.drawable.conversation_wide_read_selector;
}
} else {
- if (mChecked) {
+ if (mSelected) {
background = getCheckedActivatedBackground();
} else {
background = R.drawable.conversation_read_selector;
@@ -1281,22 +1343,23 @@
* drag, if drag is enabled.
*/
@Override
- public void toggleCheckMarkOrBeginDrag() {
+ public void toggleSelectedStateOrBeginDrag() {
ViewMode mode = mActivity.getViewMode();
- if (!mTabletDevice || !mode.isListMode()) {
- toggleCheckMark();
- } else {
+ if (mTabletDevice && mode.isListMode()) {
beginDragMode();
+ } else {
+ toggleSelectedState();
}
}
- private void toggleCheckMark() {
+ @Override
+ public void toggleSelectedState() {
if (mHeader != null && mHeader.conversation != null) {
- mChecked = !mChecked;
+ mSelected = !mSelected;
Conversation conv = mHeader.conversation;
// Set the list position of this item in the conversation
SwipeableListView listView = getListView();
- conv.position = mChecked && listView != null ? listView.getPositionForView(this)
+ conv.position = mSelected && listView != null ? listView.getPositionForView(this)
: Conversation.NO_POSITION;
if (mSelectedConversationSet != null) {
mSelectedConversationSet.toggle(conv);
@@ -1328,9 +1391,10 @@
}
}
- private boolean isTouchInCheckmark(float x, float y) {
+ private boolean isTouchInContactPhoto(float x) {
// Everything before senders and include a touch slop.
- return mHeader.checkboxVisible && x < mCoordinates.sendersX + sTouchSlop;
+ return (mHeader.gadgetMode == ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO
+ && x < mCoordinates.sendersX + sTouchSlop);
}
private boolean isTouchInStar(float x, float y) {
@@ -1360,7 +1424,7 @@
mLastTouchY = y;
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
- if (isTouchInCheckmark(x, y) || isTouchInStar(x, y)) {
+ if (isTouchInContactPhoto(x) || isTouchInStar(x, y)) {
mDownEvent = true;
handled = true;
}
@@ -1372,9 +1436,9 @@
case MotionEvent.ACTION_UP:
if (mDownEvent) {
- if (isTouchInCheckmark(x, y)) {
+ if (isTouchInContactPhoto(x)) {
// Touch on the check mark
- toggleCheckMark();
+ toggleSelectedState();
} else if (isTouchInStar(x, y)) {
// Touch on the star
toggleStar();
@@ -1405,17 +1469,17 @@
}
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
- if (isTouchInCheckmark(x, y) || isTouchInStar(x, y)) {
+ if (isTouchInContactPhoto(x) || isTouchInStar(x, y)) {
mDownEvent = true;
return true;
}
break;
case MotionEvent.ACTION_UP:
if (mDownEvent) {
- if (isTouchInCheckmark(x, y)) {
+ if (isTouchInContactPhoto(x)) {
// Touch on the check mark
mDownEvent = false;
- toggleCheckMark();
+ toggleSelectedState();
return true;
} else if (isTouchInStar(x, y)) {
// Touch on the star
@@ -1567,8 +1631,8 @@
return;
}
// If this is already checked, don't bother unchecking it!
- if (!mChecked) {
- toggleCheckMark();
+ if (!mSelected) {
+ toggleSelectedState();
}
// Clip data has form: [conversations_uri, conversationId1,
@@ -1653,4 +1717,9 @@
public float getMinAllowScrollDistance() {
return sScrollSlop;
}
+
+ @Override
+ public void onImagesResolved() {
+ // Do nothing
+ }
}
diff --git a/src/com/android/mail/browse/ConversationItemViewModel.java b/src/com/android/mail/browse/ConversationItemViewModel.java
index fa31bde..d83ce74 100644
--- a/src/com/android/mail/browse/ConversationItemViewModel.java
+++ b/src/com/android/mail/browse/ConversationItemViewModel.java
@@ -97,7 +97,7 @@
public long maxMessageId;
- public boolean checkboxVisible;
+ public int gadgetMode;
public Conversation conversation;
@@ -156,7 +156,6 @@
ConversationItemViewModel header = ConversationItemViewModel.forConversationId(account,
conv.id);
if (conv != null) {
- header.checkboxVisible = true;
header.conversation = conv;
header.unread = !conv.read;
header.hasBeenForwarded =
@@ -229,7 +228,7 @@
* Returns the layout hashcode to compare to see if the layout state has changed.
*/
private int getLayoutHashCode() {
- return Objects.hashCode(mDataHashCode, viewWidth, standardScaledDimen, checkboxVisible);
+ return Objects.hashCode(mDataHashCode, viewWidth, standardScaledDimen, gadgetMode);
}
private Object getConvInfo() {
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index e24f851..d0a23e2 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -493,13 +493,15 @@
private static Address getAddress(Map<String, Address> cache, String emailStr) {
Address addr = null;
- if (cache != null) {
- addr = cache.get(emailStr);
- }
- if (addr == null) {
- addr = Address.getEmailAddress(emailStr);
+ synchronized (cache) {
if (cache != null) {
- cache.put(emailStr, addr);
+ addr = cache.get(emailStr);
+ }
+ if (addr == null) {
+ addr = Address.getEmailAddress(emailStr);
+ if (cache != null) {
+ cache.put(emailStr, addr);
+ }
}
}
return addr;
diff --git a/src/com/android/mail/browse/SwipeableConversationItemView.java b/src/com/android/mail/browse/SwipeableConversationItemView.java
index 5b08e4a..27730cc 100644
--- a/src/com/android/mail/browse/SwipeableConversationItemView.java
+++ b/src/com/android/mail/browse/SwipeableConversationItemView.java
@@ -32,7 +32,7 @@
public class SwipeableConversationItemView extends FrameLayout implements ToggleableItem {
- private ConversationItemView mConversationItemView;
+ private final ConversationItemView mConversationItemView;
public SwipeableConversationItemView(Context context, String account) {
super(context);
@@ -81,9 +81,16 @@
}
@Override
- public void toggleCheckMarkOrBeginDrag() {
+ public void toggleSelectedStateOrBeginDrag() {
if (mConversationItemView != null) {
- mConversationItemView.toggleCheckMarkOrBeginDrag();
+ mConversationItemView.toggleSelectedStateOrBeginDrag();
+ }
+ }
+
+ @Override
+ public void toggleSelectedState() {
+ if (mConversationItemView != null) {
+ mConversationItemView.toggleSelectedState();
}
}
}
diff --git a/src/com/android/mail/browse/ToggleableItem.java b/src/com/android/mail/browse/ToggleableItem.java
index e1aae9e..2b7e739 100644
--- a/src/com/android/mail/browse/ToggleableItem.java
+++ b/src/com/android/mail/browse/ToggleableItem.java
@@ -18,5 +18,6 @@
package com.android.mail.browse;
public interface ToggleableItem {
- void toggleCheckMarkOrBeginDrag();
+ void toggleSelectedStateOrBeginDrag();
+ void toggleSelectedState();
}
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index b4b32a9..3ee79f7 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -705,7 +705,10 @@
@Override
public final void onRestoreInstanceState(Bundle savedInstanceState) {
- clearChangeListeners();
+ final boolean hasAccounts = mAccounts != null && mAccounts.length > 0;
+ if (hasAccounts) {
+ clearChangeListeners();
+ }
super.onRestoreInstanceState(savedInstanceState);
if (savedInstanceState != null) {
if (savedInstanceState.containsKey(EXTRA_FOCUS_SELECTION_START)) {
@@ -720,7 +723,9 @@
}
}
}
- initChangeListeners();
+ if (hasAccounts) {
+ initChangeListeners();
+ }
}
@Override
@@ -1013,8 +1018,11 @@
mVideoAttachmentsButton.setOnClickListener(this);
}
mTo = (RecipientEditTextView) findViewById(R.id.to);
+ mTo.setTokenizer(new Rfc822Tokenizer());
mCc = (RecipientEditTextView) findViewById(R.id.cc);
+ mCc.setTokenizer(new Rfc822Tokenizer());
mBcc = (RecipientEditTextView) findViewById(R.id.bcc);
+ mBcc.setTokenizer(new Rfc822Tokenizer());
// TODO: add special chips text change watchers before adding
// this as a text changed watcher to the to, cc, bcc fields.
mSubject = (TextView) findViewById(R.id.subject);
@@ -1290,9 +1298,8 @@
// Since URLDecode.decode changes + into ' ', and + is a valid
// email character, we need to find/ replace these ourselves before
// decoding.
- String replacePlus = s.replace("+", "%2B");
try {
- return URLDecoder.decode(replacePlus, UTF8_ENCODING_NAME);
+ return URLDecoder.decode(replacePlus(s), UTF8_ENCODING_NAME);
} catch (IllegalArgumentException e) {
if (LogUtils.isLoggable(LOG_TAG, LogUtils.VERBOSE)) {
LogUtils.e(LOG_TAG, "%s while decoding '%s'", e.getMessage(), s);
@@ -1304,6 +1311,17 @@
}
/**
+ * Replaces all occurrences of '+' with "%2B", to prevent URLDecode.decode from
+ * changing '+' into ' '
+ *
+ * @param toReplace Input string
+ * @return The string with all "+" characters replaced with "%2B"
+ */
+ private String replacePlus(String toReplace) {
+ return toReplace.replace("+", "%2B");
+ }
+
+ /**
* Initialize the compose view from a String representing a mailTo uri.
* @param mailToString The uri as a string.
*/
@@ -1344,7 +1362,8 @@
List<String> subject = uri.getQueryParameters("subject");
if (subject.size() > 0) {
try {
- mSubject.setText(URLDecoder.decode(subject.get(0), UTF8_ENCODING_NAME));
+ mSubject.setText(URLDecoder.decode(replacePlus(subject.get(0)),
+ UTF8_ENCODING_NAME));
} catch (UnsupportedEncodingException e) {
LogUtils.e(LOG_TAG, "%s while decoding subject '%s'",
e.getMessage(), subject);
@@ -1354,7 +1373,7 @@
List<String> body = uri.getQueryParameters("body");
if (body.size() > 0) {
try {
- setBody(URLDecoder.decode(body.get(0), UTF8_ENCODING_NAME),
+ setBody(URLDecoder.decode(replacePlus(body.get(0)), UTF8_ENCODING_NAME),
true /* with signature */);
} catch (UnsupportedEncodingException e) {
LogUtils.e(LOG_TAG, "%s while decoding body '%s'", e.getMessage(), body);
@@ -1736,7 +1755,6 @@
private void setupRecipients(RecipientEditTextView view) {
view.setAdapter(new RecipientAdapter(this, mAccount));
- view.setTokenizer(new Rfc822Tokenizer());
if (mValidator == null) {
final String accountName = mAccount.name;
int offset = accountName.indexOf("@") + 1;
diff --git a/src/com/android/mail/photomanager/LetterTileProvider.java b/src/com/android/mail/photomanager/LetterTileProvider.java
index dd0dd75..57b8b55 100644
--- a/src/com/android/mail/photomanager/LetterTileProvider.java
+++ b/src/com/android/mail/photomanager/LetterTileProvider.java
@@ -66,7 +66,7 @@
private static final int POSSIBLE_BITMAP_SIZES = 3;
// This should match the total number of colors defined in colors.xml for letter_tile_color
- private static final int NUM_OF_TILE_COLORS = 7;
+ private static final int NUM_OF_TILE_COLORS = 8;
public LetterTileProvider(Context context) {
final Resources res = context.getResources();
@@ -94,8 +94,13 @@
ContactIdentifier contactIdentifier = (ContactIdentifier) id;
DividedImageCanvas dividedImageView = (DividedImageCanvas) view;
- String displayName = contactIdentifier.name;
- String address = contactIdentifier.emailAddress;
+ final String displayName = contactIdentifier.name;
+ final String address = contactIdentifier.emailAddress;
+
+ // don't apply again if existing letter is there (and valid)
+ if (dividedImageView.hasImageFor(address)) {
+ return;
+ }
Bitmap bitmap = null;
final String display = !TextUtils.isEmpty(displayName) ? displayName : address;
@@ -122,7 +127,7 @@
} else {
bitmap = getBitmap(mDims, true /* getDefault */);
}
- dividedImageView.addDivisionImage(bitmap, address);
+ dividedImageView.addDivisionImage(bitmap, address, false);
}
private static boolean isEnglishLetterOrDigit(char c) {
diff --git a/src/com/android/mail/photomanager/PhotoManager.java b/src/com/android/mail/photomanager/PhotoManager.java
index 7c42ddf..c23ce04 100644
--- a/src/com/android/mail/photomanager/PhotoManager.java
+++ b/src/com/android/mail/photomanager/PhotoManager.java
@@ -39,7 +39,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -255,7 +254,7 @@
request,
Thread.currentThread());
- boolean loaded = loadCachedPhoto(request, false);
+ final boolean loaded = loadCachedPhoto(request, false);
if (loaded) {
if (DEBUG) LogUtils.v(TAG, "image request, cache hit. request queue size=%s",
mPendingRequests.size());
@@ -415,12 +414,16 @@
private void processLoadedImages() {
final List<Long> toRemove = Lists.newArrayList();
for (Long hash : mPendingRequests.keySet()) {
- Request request = mPendingRequests.get(hash);
- boolean loaded = loadCachedPhoto(request, true);
+ final Request request = mPendingRequests.get(hash);
+ final boolean loaded = loadCachedPhoto(request, true);
if (loaded) {
toRemove.add(hash);
}
+ // We want to call onCachedImageLoaded in all cases here, as when loaded is false,
+ // loadCachedPhoto will attempt to reload the letter tile.
+ request.getView().onCachedImageLoaded();
}
+
for (Long key : toRemove) {
mPendingRequests.remove(key);
}
@@ -965,7 +968,8 @@
// This can legitimately happen when an ImageCanvas is reused and re-purposed to
// house a new set of images (e.g. by ListView recycling).
// Ignore this now-stale request.
- LogUtils.d(TAG, "ImageCanvas skipping applyDefaultImage; no longer contains" +
+ if (DEBUG) LogUtils.d(TAG,
+ "ImageCanvas skipping applyDefaultImage; no longer contains" +
" item=%s canvas=%s", key, mView);
return;
}
diff --git a/src/com/android/mail/preferences/BasePreferenceMigrator.java b/src/com/android/mail/preferences/BasePreferenceMigrator.java
index 0e0b766..5cddda8 100644
--- a/src/com/android/mail/preferences/BasePreferenceMigrator.java
+++ b/src/com/android/mail/preferences/BasePreferenceMigrator.java
@@ -28,12 +28,15 @@
/** If <code>true</code>, we have not attempted a migration since the app started. */
private static final AtomicBoolean sMigrationNecessary = new AtomicBoolean(true);
- public final void performMigration(
+ public final boolean performMigration(
final Context context, final int oldVersion, final int newVersion) {
// Ensure we only run this once
if (sMigrationNecessary.getAndSet(false)) {
migrate(context, oldVersion, newVersion);
+ return true;
}
+
+ return false;
}
/**
diff --git a/src/com/android/mail/preferences/MailPrefs.java b/src/com/android/mail/preferences/MailPrefs.java
index fe0596c..ff4e0f8 100644
--- a/src/com/android/mail/preferences/MailPrefs.java
+++ b/src/com/android/mail/preferences/MailPrefs.java
@@ -54,10 +54,6 @@
*/
public static final String DEFAULT_REPLY_ALL = "default-reply-all";
/**
- * A preference for storing most recently used accounts (ordered list or URIs)
- */
- public static final String RECENT_ACCOUNTS = "recent-account-uris";
- /**
* A boolean that, if <code>true</code>, means we should allow conversation list swiping
*/
public static final String CONVERSATION_LIST_SWIPE = "conversation-list-swipe";
@@ -120,7 +116,7 @@
@Override
protected void setMigrationComplete() {
- getEditor().putInt(PreferenceKeys.MIGRATED_VERSION, CURRENT_VERSION_NUMBER).apply();
+ getEditor().putInt(PreferenceKeys.MIGRATED_VERSION, CURRENT_VERSION_NUMBER).commit();
}
public boolean isWidgetConfigured(int appWidgetId) {
@@ -161,24 +157,6 @@
}
/**
- * Return a list of URIs corresponding to the most recently used accounts
- *
- * @return uris of accounts from least recently used to most recently used
- */
- public String getRecentAccountUris() {
- return getSharedPreferences().getString(PreferenceKeys.RECENT_ACCOUNTS,
- "");
- }
-
- /**
- * Take in an ArrayList of account URIs that are in order from least recently
- * used to most recently used, and save it as prefs.
- */
- public void setRecentAccountUris(String accountUris) {
- getEditor().putString(PreferenceKeys.RECENT_ACCOUNTS, accountUris).apply();
- }
-
- /**
* Gets a boolean indicating whether delete is preferred over archive.
*/
public boolean getPreferDelete() {
diff --git a/src/com/android/mail/preferences/VersionedPrefs.java b/src/com/android/mail/preferences/VersionedPrefs.java
index 2a20f91..b5dd9c9 100644
--- a/src/com/android/mail/preferences/VersionedPrefs.java
+++ b/src/com/android/mail/preferences/VersionedPrefs.java
@@ -68,9 +68,12 @@
setCurrentVersion(CURRENT_VERSION_NUMBER);
if (!hasMigrationCompleted()) {
- new PreferenceMigrator().performMigration(context, oldVersion, CURRENT_VERSION_NUMBER);
+ final boolean migrationComplete = new PreferenceMigrator()
+ .performMigration(context, oldVersion, CURRENT_VERSION_NUMBER);
- setMigrationComplete();
+ if (migrationComplete) {
+ setMigrationComplete();
+ }
}
}
@@ -119,6 +122,13 @@
}
/**
+ * Commits all pending changes to the preferences.
+ */
+ public void commit() {
+ getEditor().commit();
+ }
+
+ /**
* Upgrades the {@link SharedPreferences} file.
*
* @param oldVersion The current version
diff --git a/src/com/android/mail/providers/Settings.java b/src/com/android/mail/providers/Settings.java
index 33f3871..9a8fddd 100644
--- a/src/com/android/mail/providers/Settings.java
+++ b/src/com/android/mail/providers/Settings.java
@@ -22,7 +22,7 @@
import android.os.Parcelable;
import android.text.TextUtils;
-import com.android.mail.providers.UIProvider.AccountColumns;
+import com.android.mail.providers.UIProvider.AccountColumns.SettingsColumns;
import com.android.mail.providers.UIProvider.AutoAdvance;
import com.android.mail.providers.UIProvider.ConversationListIcon;
import com.android.mail.providers.UIProvider.DefaultReplyBehavior;
@@ -101,7 +101,7 @@
messageTextSize = MessageTextSize.NORMAL;
snapHeaders = SnapHeaderValue.ALWAYS;
replyBehavior = DefaultReplyBehavior.REPLY;
- convListIcon = ConversationListIcon.CHECKBOX;
+ convListIcon = ConversationListIcon.SENDER_IMAGE;
confirmDelete = false;
confirmArchive = false;
confirmSend = false;
@@ -138,81 +138,58 @@
}
public Settings(Cursor cursor) {
- signature = cursor.getString(
- cursor.getColumnIndex(UIProvider.AccountColumns.SettingsColumns.SIGNATURE));
- mAutoAdvance = cursor.getInt(
- cursor.getColumnIndex(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE));
- messageTextSize = cursor.getInt(
- cursor.getColumnIndex(UIProvider.AccountColumns.SettingsColumns.MESSAGE_TEXT_SIZE));
- snapHeaders = cursor.getInt(
- cursor.getColumnIndex(UIProvider.AccountColumns.SettingsColumns.SNAP_HEADERS));
- replyBehavior = cursor.getInt(
- cursor.getColumnIndex(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR));
- convListIcon = cursor.getInt(cursor.getColumnIndex(
- UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON));
- confirmDelete = cursor.getInt(cursor.getColumnIndex(
- UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)) != 0;
- confirmArchive = cursor.getInt(cursor.getColumnIndex(
- UIProvider.AccountColumns.SettingsColumns.CONFIRM_ARCHIVE)) != 0;
- confirmSend = cursor.getInt(
- cursor.getColumnIndex(UIProvider.AccountColumns.SettingsColumns.CONFIRM_SEND)) != 0;
- defaultInbox = Utils.getValidUri(cursor.getString(
- cursor.getColumnIndex(UIProvider.AccountColumns.SettingsColumns.DEFAULT_INBOX)));
- defaultInboxName = cursor.getString(cursor.getColumnIndex(
- UIProvider.AccountColumns.SettingsColumns.DEFAULT_INBOX_NAME));
- forceReplyFromDefault = cursor.getInt(cursor.getColumnIndex(
- UIProvider.AccountColumns.SettingsColumns.FORCE_REPLY_FROM_DEFAULT)) != 0;
- maxAttachmentSize = cursor.getInt(cursor.getColumnIndex(
- UIProvider.AccountColumns.SettingsColumns.MAX_ATTACHMENT_SIZE));
- swipe = cursor.getInt(
- cursor.getColumnIndex(UIProvider.AccountColumns.SettingsColumns.SWIPE));
- priorityArrowsEnabled = cursor.getInt(cursor.getColumnIndex(
- UIProvider.AccountColumns.SettingsColumns.PRIORITY_ARROWS_ENABLED)) != 0;
- setupIntentUri = Utils.getValidUri(cursor.getString(
- cursor.getColumnIndex(UIProvider.AccountColumns.SettingsColumns.SETUP_INTENT_URI)));
- conversationViewMode = cursor.getInt(cursor.getColumnIndex(
- UIProvider.AccountColumns.SettingsColumns.CONVERSATION_VIEW_MODE));
- veiledAddressPattern = cursor.getString(cursor.getColumnIndex(
- UIProvider.AccountColumns.SettingsColumns.VEILED_ADDRESS_PATTERN));
+ signature = cursor.getString(cursor.getColumnIndex(SettingsColumns.SIGNATURE));
+ mAutoAdvance = cursor.getInt(cursor.getColumnIndex(SettingsColumns.AUTO_ADVANCE));
+ messageTextSize = cursor.getInt(cursor.getColumnIndex(SettingsColumns.MESSAGE_TEXT_SIZE));
+ snapHeaders = cursor.getInt(cursor.getColumnIndex(SettingsColumns.SNAP_HEADERS));
+ replyBehavior = cursor.getInt(cursor.getColumnIndex(SettingsColumns.REPLY_BEHAVIOR));
+ convListIcon = cursor.getInt(cursor.getColumnIndex(SettingsColumns.CONV_LIST_ICON));
+ confirmDelete = cursor.getInt(cursor.getColumnIndex(SettingsColumns.CONFIRM_DELETE)) != 0;
+ confirmArchive = cursor.getInt(cursor.getColumnIndex(SettingsColumns.CONFIRM_ARCHIVE)) != 0;
+ confirmSend = cursor.getInt(cursor.getColumnIndex(SettingsColumns.CONFIRM_SEND)) != 0;
+ defaultInbox = Utils.getValidUri(
+ cursor.getString(cursor.getColumnIndex(SettingsColumns.DEFAULT_INBOX)));
+ defaultInboxName =
+ cursor.getString(cursor.getColumnIndex(SettingsColumns.DEFAULT_INBOX_NAME));
+ forceReplyFromDefault = cursor.getInt(
+ cursor.getColumnIndex(SettingsColumns.FORCE_REPLY_FROM_DEFAULT)) != 0;
+ maxAttachmentSize =
+ cursor.getInt(cursor.getColumnIndex(SettingsColumns.MAX_ATTACHMENT_SIZE));
+ swipe = cursor.getInt(cursor.getColumnIndex(SettingsColumns.SWIPE));
+ priorityArrowsEnabled = cursor.getInt(
+ cursor.getColumnIndex(SettingsColumns.PRIORITY_ARROWS_ENABLED)) != 0;
+ setupIntentUri = Utils.getValidUri(
+ cursor.getString(cursor.getColumnIndex(SettingsColumns.SETUP_INTENT_URI)));
+ conversationViewMode =
+ cursor.getInt(cursor.getColumnIndex(SettingsColumns.CONVERSATION_VIEW_MODE));
+ veiledAddressPattern =
+ cursor.getString(cursor.getColumnIndex(SettingsColumns.VEILED_ADDRESS_PATTERN));
}
private Settings(JSONObject json) {
- signature = json.optString(AccountColumns.SettingsColumns.SIGNATURE, sDefault.signature);
- mAutoAdvance = json.optInt(AccountColumns.SettingsColumns.AUTO_ADVANCE,
- sDefault.getAutoAdvanceSetting());
- messageTextSize = json.optInt(AccountColumns.SettingsColumns.MESSAGE_TEXT_SIZE,
- sDefault.messageTextSize);
- snapHeaders = json.optInt(AccountColumns.SettingsColumns.SNAP_HEADERS,
- sDefault.snapHeaders);
- replyBehavior = json.optInt(AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
- sDefault.replyBehavior);
- convListIcon = json.optInt(AccountColumns.SettingsColumns.CONV_LIST_ICON,
- sDefault.convListIcon);
- confirmDelete = json.optBoolean(AccountColumns.SettingsColumns.CONFIRM_DELETE,
- sDefault.confirmDelete);
- confirmArchive = json.optBoolean(AccountColumns.SettingsColumns.CONFIRM_ARCHIVE,
- sDefault.confirmArchive);
- confirmSend = json.optBoolean(AccountColumns.SettingsColumns.CONFIRM_SEND,
- sDefault.confirmSend);
- defaultInbox = Utils.getValidUri(
- json.optString(AccountColumns.SettingsColumns.DEFAULT_INBOX));
- defaultInboxName = json.optString(AccountColumns.SettingsColumns.DEFAULT_INBOX_NAME,
+ signature = json.optString(SettingsColumns.SIGNATURE, sDefault.signature);
+ mAutoAdvance = json.optInt(SettingsColumns.AUTO_ADVANCE, sDefault.getAutoAdvanceSetting());
+ messageTextSize = json.optInt(SettingsColumns.MESSAGE_TEXT_SIZE, sDefault.messageTextSize);
+ snapHeaders = json.optInt(SettingsColumns.SNAP_HEADERS, sDefault.snapHeaders);
+ replyBehavior = json.optInt(SettingsColumns.REPLY_BEHAVIOR, sDefault.replyBehavior);
+ convListIcon = json.optInt(SettingsColumns.CONV_LIST_ICON, sDefault.convListIcon);
+ confirmDelete = json.optBoolean(SettingsColumns.CONFIRM_DELETE, sDefault.confirmDelete);
+ confirmArchive = json.optBoolean(SettingsColumns.CONFIRM_ARCHIVE, sDefault.confirmArchive);
+ confirmSend = json.optBoolean(SettingsColumns.CONFIRM_SEND, sDefault.confirmSend);
+ defaultInbox = Utils.getValidUri( json.optString(SettingsColumns.DEFAULT_INBOX));
+ defaultInboxName = json.optString(SettingsColumns.DEFAULT_INBOX_NAME,
sDefault.defaultInboxName);
- forceReplyFromDefault =
- json.optBoolean(AccountColumns.SettingsColumns.FORCE_REPLY_FROM_DEFAULT,
- sDefault.forceReplyFromDefault);
- maxAttachmentSize = json.optInt(AccountColumns.SettingsColumns.MAX_ATTACHMENT_SIZE,
- sDefault.maxAttachmentSize);
- swipe = json.optInt(AccountColumns.SettingsColumns.SWIPE, sDefault.swipe);
- priorityArrowsEnabled =
- json.optBoolean(AccountColumns.SettingsColumns.PRIORITY_ARROWS_ENABLED,
- sDefault.priorityArrowsEnabled);
- setupIntentUri = Utils.getValidUri(
- json.optString(AccountColumns.SettingsColumns.SETUP_INTENT_URI));
- conversationViewMode = json.optInt(AccountColumns.SettingsColumns.CONVERSATION_VIEW_MODE,
+ forceReplyFromDefault = json.optBoolean(SettingsColumns.FORCE_REPLY_FROM_DEFAULT,
+ sDefault.forceReplyFromDefault);
+ maxAttachmentSize =
+ json.optInt(SettingsColumns.MAX_ATTACHMENT_SIZE, sDefault.maxAttachmentSize);
+ swipe = json.optInt(SettingsColumns.SWIPE, sDefault.swipe);
+ priorityArrowsEnabled = json.optBoolean(SettingsColumns.PRIORITY_ARROWS_ENABLED,
+ sDefault.priorityArrowsEnabled);
+ setupIntentUri = Utils.getValidUri(json.optString(SettingsColumns.SETUP_INTENT_URI));
+ conversationViewMode = json.optInt(SettingsColumns.CONVERSATION_VIEW_MODE,
UIProvider.ConversationViewMode.UNDEFINED);
- veiledAddressPattern =
- json.optString(AccountColumns.SettingsColumns.VEILED_ADDRESS_PATTERN, null);
+ veiledAddressPattern = json.optString(SettingsColumns.VEILED_ADDRESS_PATTERN, null);
}
/**
@@ -235,29 +212,26 @@
public synchronized JSONObject toJSON() {
final JSONObject json = new JSONObject();
try {
- json.put(AccountColumns.SettingsColumns.SIGNATURE,
- getNonNull(signature, sDefault.signature));
- json.put(AccountColumns.SettingsColumns.AUTO_ADVANCE, getAutoAdvanceSetting());
- json.put(AccountColumns.SettingsColumns.MESSAGE_TEXT_SIZE, messageTextSize);
- json.put(AccountColumns.SettingsColumns.SNAP_HEADERS, snapHeaders);
- json.put(AccountColumns.SettingsColumns.REPLY_BEHAVIOR, replyBehavior);
- json.put(AccountColumns.SettingsColumns.CONV_LIST_ICON, convListIcon);
- json.put(AccountColumns.SettingsColumns.CONFIRM_DELETE, confirmDelete);
- json.put(AccountColumns.SettingsColumns.CONFIRM_ARCHIVE, confirmArchive);
- json.put(AccountColumns.SettingsColumns.CONFIRM_SEND, confirmSend);
- json.put(AccountColumns.SettingsColumns.DEFAULT_INBOX,
+ json.put(SettingsColumns.SIGNATURE, getNonNull(signature, sDefault.signature));
+ json.put(SettingsColumns.AUTO_ADVANCE, getAutoAdvanceSetting());
+ json.put(SettingsColumns.MESSAGE_TEXT_SIZE, messageTextSize);
+ json.put(SettingsColumns.SNAP_HEADERS, snapHeaders);
+ json.put(SettingsColumns.REPLY_BEHAVIOR, replyBehavior);
+ json.put(SettingsColumns.CONV_LIST_ICON, convListIcon);
+ json.put(SettingsColumns.CONFIRM_DELETE, confirmDelete);
+ json.put(SettingsColumns.CONFIRM_ARCHIVE, confirmArchive);
+ json.put(SettingsColumns.CONFIRM_SEND, confirmSend);
+ json.put(SettingsColumns.DEFAULT_INBOX,
getNonNull(defaultInbox, sDefault.defaultInbox));
- json.put(AccountColumns.SettingsColumns.DEFAULT_INBOX_NAME,
+ json.put(SettingsColumns.DEFAULT_INBOX_NAME,
getNonNull(defaultInboxName, sDefault.defaultInboxName));
- json.put(AccountColumns.SettingsColumns.FORCE_REPLY_FROM_DEFAULT,
- forceReplyFromDefault);
- json.put(AccountColumns.SettingsColumns.MAX_ATTACHMENT_SIZE,
- maxAttachmentSize);
- json.put(AccountColumns.SettingsColumns.SWIPE, swipe);
- json.put(AccountColumns.SettingsColumns.PRIORITY_ARROWS_ENABLED, priorityArrowsEnabled);
- json.put(AccountColumns.SettingsColumns.SETUP_INTENT_URI, setupIntentUri);
- json.put(AccountColumns.SettingsColumns.CONVERSATION_VIEW_MODE, conversationViewMode);
- json.put(AccountColumns.SettingsColumns.VEILED_ADDRESS_PATTERN, veiledAddressPattern);
+ json.put(SettingsColumns.FORCE_REPLY_FROM_DEFAULT, forceReplyFromDefault);
+ json.put(SettingsColumns.MAX_ATTACHMENT_SIZE, maxAttachmentSize);
+ json.put(SettingsColumns.SWIPE, swipe);
+ json.put(SettingsColumns.PRIORITY_ARROWS_ENABLED, priorityArrowsEnabled);
+ json.put(SettingsColumns.SETUP_INTENT_URI, setupIntentUri);
+ json.put(SettingsColumns.CONVERSATION_VIEW_MODE, conversationViewMode);
+ json.put(SettingsColumns.VEILED_ADDRESS_PATTERN, veiledAddressPattern);
} catch (JSONException e) {
LogUtils.wtf(LOG_TAG, e, "Could not serialize settings");
}
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 63bf84e..878bfd4 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -375,7 +375,7 @@
* TODO: When we want to support a heterogeneous set of account types, this value may need
* to be moved to a global content provider.
*/
- public static String SETTINGS_INTENT_URI = "accountSettingsIntentUri";
+ public static final String SETTINGS_INTENT_URI = "accountSettingsIntentUri";
/**
* Uri for VIEW intent that will cause the help screens for this account type to be
@@ -383,7 +383,7 @@
* TODO: When we want to support a heterogeneous set of account types, this value may need
* to be moved to a global content provider.
*/
- public static String HELP_INTENT_URI = "helpIntentUri";
+ public static final String HELP_INTENT_URI = "helpIntentUri";
/**
* Uri for VIEW intent that will cause the send feedback for this account type to be
@@ -391,7 +391,7 @@
* TODO: When we want to support a heterogeneous set of account types, this value may need
* to be moved to a global content provider.
*/
- public static String SEND_FEEDBACK_INTENT_URI = "sendFeedbackIntentUri";
+ public static final String SEND_FEEDBACK_INTENT_URI = "sendFeedbackIntentUri";
/**
* Uri for VIEW intent that will cause the user to be prompted for authentication for
@@ -399,7 +399,7 @@
* handle this intent are expected to return {@link android.app.Activity#RESULT_OK} if the
* user successfully authenticated.
*/
- public static String REAUTHENTICATION_INTENT_URI = "reauthenticationUri";
+ public static final String REAUTHENTICATION_INTENT_URI = "reauthenticationUri";
/**
* This int column contains the current sync status of the account (the logical AND of the
@@ -743,6 +743,13 @@
* from this folder.
*/
public static final int ALLOWS_REMOVE_CONVERSATION = 0x4000;
+
+ /**
+ * The flag indicates that the user has the ability to move conversations to or from this
+ * Folder in the same operation as other Folder changes (usually through
+ * {@link com.android.mail.ui.MultiFoldersSelectionDialog}).
+ */
+ public static final int MULTI_MOVE = 0x8000;
}
public static final class FolderColumns {
@@ -763,16 +770,16 @@
* This int column represents the capabilities of the folder specified by
* FolderCapabilities flags.
*/
- public static String CAPABILITIES = "capabilities";
+ public static final String CAPABILITIES = "capabilities";
/**
* This int column represents whether or not this folder has any
* child folders.
*/
- public static String HAS_CHILDREN = "hasChildren";
+ public static final String HAS_CHILDREN = "hasChildren";
/**
* This int column represents how large the sync window is.
*/
- public static String SYNC_WINDOW = "syncWindow";
+ public static final String SYNC_WINDOW = "syncWindow";
/**
* This string column contains the content provider uri to return the
* list of conversations for this folder.
@@ -994,41 +1001,41 @@
* This int column contains the number of messages in this conversation.
* For unthreaded, this will always be 1.
*/
- public static String NUM_MESSAGES = "numMessages";
+ public static final String NUM_MESSAGES = "numMessages";
/**
* This int column contains the number of drafts associated with this
* conversation.
*/
- public static String NUM_DRAFTS = "numDrafts";
+ public static final String NUM_DRAFTS = "numDrafts";
/**
* This int column contains the state of drafts and replies associated
* with this conversation. Use ConversationSendingState to interpret
* this field.
*/
- public static String SENDING_STATE = "sendingState";
+ public static final String SENDING_STATE = "sendingState";
/**
* This int column contains the priority of this conversation. Use
* ConversationPriority to interpret this field.
*/
- public static String PRIORITY = "priority";
+ public static final String PRIORITY = "priority";
/**
* This int column indicates whether the conversation has been read
*/
- public static String READ = "read";
+ public static final String READ = "read";
/**
* This int column indicates whether the conversation has been seen
*/
- public static String SEEN = "seen";
+ public static final String SEEN = "seen";
/**
* This int column indicates whether the conversation has been starred
*/
- public static String STARRED = "starred";
+ public static final String STARRED = "starred";
/**
* This blob column contains the marshalled form of a Parceled
@@ -1525,17 +1532,17 @@
/**
* This boolean column indicates whether the message has been read
*/
- public static String READ = "read";
+ public static final String READ = "read";
/**
* This boolean column indicates whether the message has been seen
*/
- public static String SEEN = "seen";
+ public static final String SEEN = "seen";
/**
* This boolean column indicates whether the message has been starred
*/
- public static String STARRED = "starred";
+ public static final String STARRED = "starred";
/**
* This integer column represents the offset in the message of quoted
@@ -1968,10 +1975,9 @@
}
/**
- * Setting for whether to show checkboxes or sender image in conversation list.
+ * Setting for whether to show sender images in conversation list.
*/
public static final class ConversationListIcon {
- public static final int CHECKBOX = 0;
public static final int SENDER_IMAGE = 1;
public static final int NONE = 2;
public static final int DEFAULT = 1; // Default to show sender image
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index c5eb54d..ea2e82e 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -165,7 +165,6 @@
protected final Context mContext;
private final FragmentManager mFragmentManager;
protected final RecentFolderList mRecentFolderList;
- private final RecentAccountsList mRecentAccountList;
protected ConversationListContext mConvListContext;
protected Conversation mCurrentConversation;
/**
@@ -354,7 +353,6 @@
mViewMode = viewMode;
mContext = activity.getApplicationContext();
mRecentFolderList = new RecentFolderList(mContext);
- mRecentAccountList = new RecentAccountsList(mContext);
mTracker = new ConversationPositionTracker(this);
// Allow the fragment to observe changes to its own selection set. No other object is
// aware of the selected set.
@@ -628,7 +626,7 @@
* is no drawer.
*/
@Override
- public void closeDrawerForNewList() {
+ public void closeDrawer(final boolean hasNewFolderOrAccount) {
mDrawerObservers.notifyChanged();
}
@@ -1121,7 +1119,9 @@
}
private void emptyFolder() {
- mConversationListCursor.emptyFolder();
+ if (mConversationListCursor != null) {
+ mConversationListCursor.emptyFolder();
+ }
}
/**
@@ -1759,8 +1759,6 @@
LogUtils.w(LOG_TAG, new Error(), "AAC ignoring account with null settings.");
return;
}
- mRecentAccountList.touchAccount(mAccount);
- mAllAccounts = mRecentAccountList.getSorted(mAllAccounts);
mAccountObservers.notifyChanged();
perhapsEnterWaitMode();
}
@@ -2212,7 +2210,7 @@
// Whether we have updated the current account or not, we need to update the list of
// accounts in the ActionBar.
- mAllAccounts = mRecentAccountList.getSorted(allAccounts);
+ mAllAccounts = allAccounts;
mAllAccountObservers.notifyChanged();
return (allAccounts.length > 0);
}
diff --git a/src/com/android/mail/ui/AbstractConversationViewFragment.java b/src/com/android/mail/ui/AbstractConversationViewFragment.java
index a81a2ca..61d54d0 100644
--- a/src/com/android/mail/ui/AbstractConversationViewFragment.java
+++ b/src/com/android/mail/ui/AbstractConversationViewFragment.java
@@ -69,9 +69,10 @@
import com.android.mail.utils.LogUtils;
import com.android.mail.utils.Utils;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -97,7 +98,14 @@
protected Folder mFolder;
protected String mBaseUri;
protected Account mAccount;
- protected final Map<String, Address> mAddressCache = Maps.newHashMap();
+ /**
+ * Cache of email address strings to parsed Address objects.
+ * <p>
+ * Remember to synchronize on the map when reading or writing to this cache, because some
+ * instances use it off the UI thread (e.g. from WebView).
+ */
+ protected final Map<String, Address> mAddressCache = Collections.synchronizedMap(
+ new HashMap<String, Address>());
private MessageCursor mCursor;
private Context mContext;
/**
diff --git a/src/com/android/mail/ui/AccountController.java b/src/com/android/mail/ui/AccountController.java
index 951a9bc..32465c8 100644
--- a/src/com/android/mail/ui/AccountController.java
+++ b/src/com/android/mail/ui/AccountController.java
@@ -92,6 +92,8 @@
/**
* When the {@link FolderListFragment} has a new account ready for changing to,
* close the drawer and then wait for {@link DataSetObservable#notifyChanged()}.
+ * @param hasNewFolderOrAccount true if we need to load conversations for a different folder
+ * or account, false otherwise.
*/
- void closeDrawerForNewList();
+ void closeDrawer(boolean hasNewFolderOrAccount);
}
diff --git a/src/com/android/mail/ui/AccountItemView.java b/src/com/android/mail/ui/AccountItemView.java
index 0c6214e..7e8edee 100644
--- a/src/com/android/mail/ui/AccountItemView.java
+++ b/src/com/android/mail/ui/AccountItemView.java
@@ -17,6 +17,7 @@
import com.android.mail.R;
+import android.widget.ImageView;
import android.widget.TextView;
import com.android.mail.providers.Account;
@@ -34,6 +35,7 @@
public class AccountItemView extends RelativeLayout {
private TextView mAccountTextView;
private TextView mUnreadCountTextView;
+ private ImageView mSelectedButton;
public AccountItemView(Context context) {
super(context);
@@ -52,12 +54,13 @@
super.onFinishInflate();
mAccountTextView = (TextView)findViewById(R.id.name);
mUnreadCountTextView = (TextView)findViewById(R.id.unread);
+ mSelectedButton = (ImageView)findViewById(R.id.account_radio_button);
}
/**
- * Sets the account name and draws the unread count. If the account is the current account,
- * the unread count is hidden and the account item is given the focused background to
- * partially highlight it.
+ * Sets the account name and draws the unread count. Depending on the account state (current or
+ * unused), the colors and drawables will change through the call to setSelected for each
+ * necessary element.
*
* @param account account whose name will be displayed
* @param isCurrentAccount true if the account is the one in use, false otherwise
@@ -66,13 +69,9 @@
public void bind(final Account account, final boolean isCurrentAccount, final int count) {
mAccountTextView.setText(account.name);
setUnreadCount(count);
-
- if(isCurrentAccount) {
- mUnreadCountTextView.setVisibility(View.GONE);
- setBackgroundResource(R.drawable.list_focused_holo);
- } else {
- setBackgroundResource(0);
- }
+ mUnreadCountTextView.setSelected(isCurrentAccount);
+ mAccountTextView.setSelected(isCurrentAccount);
+ mSelectedButton.setSelected(isCurrentAccount);
}
/**
diff --git a/src/com/android/mail/ui/ActivityController.java b/src/com/android/mail/ui/ActivityController.java
index 38babfa..d2f36e0 100644
--- a/src/com/android/mail/ui/ActivityController.java
+++ b/src/com/android/mail/ui/ActivityController.java
@@ -296,4 +296,10 @@
* Called when Accessibility is enabled or disabled.
*/
void onAccessibilityStateChanged();
+
+ /**
+ * Called to determine if the drawer is enabled for this controller/activity instance.
+ * Note: the value returned should not change for this controller instance.
+ */
+ boolean isDrawerEnabled();
}
diff --git a/src/com/android/mail/ui/AddableFolderSelectorAdapter.java b/src/com/android/mail/ui/AddableFolderSelectorAdapter.java
index 9aafd22..fd76eaf 100644
--- a/src/com/android/mail/ui/AddableFolderSelectorAdapter.java
+++ b/src/com/android/mail/ui/AddableFolderSelectorAdapter.java
@@ -34,14 +34,31 @@
super(context, folders, initiallySelected, layout, header);
}
- public static Cursor filterFolders(Cursor folderCursor) {
+ public static Cursor filterFolders(final Cursor folderCursor,
+ final Set<Integer> excludedTypes) {
final int projectionSize = UIProvider.FOLDERS_PROJECTION.length;
final MatrixCursor cursor =
new MatrixCursorWithCachedColumns(UIProvider.FOLDERS_PROJECTION);
- Object[] folder = new Object[projectionSize];
+ final Object[] folder = new Object[projectionSize];
if (folderCursor.moveToFirst()) {
do {
- int type = folderCursor.getInt(UIProvider.FOLDER_TYPE_COLUMN);
+ final int type = folderCursor.getInt(UIProvider.FOLDER_TYPE_COLUMN);
+
+ if (excludedTypes != null) {
+ boolean exclude = false;
+
+ for (final int excludedType : excludedTypes) {
+ if (Folder.isType(type, excludedType)) {
+ exclude = true;
+ break;
+ }
+ }
+
+ if (exclude) {
+ continue;
+ }
+ }
+
if (Folder.isType(type, UIProvider.FolderType.INBOX)
|| Folder.isType(type, UIProvider.FolderType.DEFAULT)) {
folder[UIProvider.FOLDER_ID_COLUMN] = folderCursor
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 7470f7c..98e1159 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -499,7 +499,7 @@
if (!(view instanceof ConversationItemView)) {
return false;
}
- ((ConversationItemView) view).toggleCheckMarkOrBeginDrag();
+ ((ConversationItemView) view).toggleSelectedStateOrBeginDrag();
return true;
}
@@ -528,11 +528,11 @@
if (!(view instanceof ToggleableItem)) {
return;
}
- boolean showCheckboxes = (mAccount.settings.convListIcon ==
- ConversationListIcon.CHECKBOX);
- if (!showCheckboxes && !mSelectedSet.isEmpty()) {
+ boolean showSenderImage = (mAccount.settings.convListIcon ==
+ ConversationListIcon.SENDER_IMAGE);
+ if (!showSenderImage && !mSelectedSet.isEmpty()) {
ToggleableItem v = (ToggleableItem) view;
- v.toggleCheckMarkOrBeginDrag();
+ v.toggleSelectedState();
} else {
viewConversation(position);
}
@@ -798,6 +798,7 @@
}
mListView.setSwipeAction(action);
}
+ mListView.setCurrentAccount(mAccount);
mListView.setCurrentFolder(mFolder);
}
@@ -851,7 +852,7 @@
}
private void checkSyncStatus() {
- if (mFolder.isSyncInProgress()) {
+ if (mFolder != null && mFolder.isSyncInProgress()) {
// Still syncing, ignore
} else {
// Finished syncing:
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 8d32f46..dae1ac1 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -73,6 +73,7 @@
import com.android.mail.utils.LogTag;
import com.android.mail.utils.LogUtils;
import com.android.mail.utils.Utils;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -922,10 +923,13 @@
}
private Address getAddress(String rawFrom) {
- Address addr = mAddressCache.get(rawFrom);
- if (addr == null) {
- addr = Address.getEmailAddress(rawFrom);
- mAddressCache.put(rawFrom, addr);
+ Address addr;
+ synchronized (mAddressCache) {
+ addr = mAddressCache.get(rawFrom);
+ if (addr == null) {
+ addr = Address.getEmailAddress(rawFrom);
+ mAddressCache.put(rawFrom, addr);
+ }
}
return addr;
}
@@ -993,7 +997,11 @@
}
final Set<String> emailAddresses = Sets.newHashSet();
- for (Address addr : mAddressCache.values()) {
+ final List<Address> cacheCopy;
+ synchronized (mAddressCache) {
+ cacheCopy = ImmutableList.copyOf(mAddressCache.values());
+ }
+ for (Address addr : cacheCopy) {
emailAddresses.add(addr.getAddress());
}
ContactLoaderCallbacks callbacks = getContactInfoSource();
@@ -1089,6 +1097,31 @@
@SuppressWarnings("unused")
@JavascriptInterface
+ public String getMessageSender(String domId) {
+ try {
+ final MessageCursor cursor = getMessageCursor();
+ if (!mViewsCreated || cursor == null) {
+ return "";
+ }
+
+ int pos = -1;
+ while (cursor.moveToPosition(++pos)) {
+ final ConversationMessage msg = cursor.getMessage();
+ if (TextUtils.equals(domId, mTemplates.getMessageDomId(msg))) {
+ return getAddress(msg.getFrom()).getAddress();
+ }
+ }
+
+ return "";
+
+ } catch (Throwable t) {
+ LogUtils.e(LOG_TAG, t, "Error in MailJsBridge.getMessageSender");
+ return "";
+ }
+ }
+
+ @SuppressWarnings("unused")
+ @JavascriptInterface
public void onContentReady() {
getHandler().post(new FragmentRunnable("onContentReady") {
@Override
diff --git a/src/com/android/mail/ui/DividedImageCanvas.java b/src/com/android/mail/ui/DividedImageCanvas.java
index 5204ce1..b441aba 100644
--- a/src/com/android/mail/ui/DividedImageCanvas.java
+++ b/src/com/android/mail/ui/DividedImageCanvas.java
@@ -55,6 +55,8 @@
private final Context mContext;
private final InvalidateCallback mCallback;
private final ArrayList<Bitmap> mDivisionImages = new ArrayList<Bitmap>(MAX_DIVISIONS);
+ private final ArrayList<Boolean> mImageStatusList = new ArrayList<Boolean>(MAX_DIVISIONS);
+ private int mNumCachedImagesLoaded = 0;
/**
* Ignore any request to draw final output when not yet ready. This prevents partially drawn
@@ -110,10 +112,13 @@
}
mDivisionMap.clear();
mDivisionImages.clear();
+ mImageStatusList.clear();
+ mNumCachedImagesLoaded = 0;
int i = 0;
for (String id : divisionIds) {
mDivisionMap.put(id, i);
mDivisionImages.add(null);
+ mImageStatusList.add(null);
i++;
}
}
@@ -179,18 +184,20 @@
@Override
public void drawImage(Bitmap b, Object id) {
- addDivisionImage(b, id);
+ addDivisionImage(b, id, true);
}
/**
* Add a bitmap to this view in the quadrant matching its id.
* @param b Bitmap
* @param id Id to look for that was previously set in setDivisionIds.
+ * @param resolved Indicates whether this image has been resolved
*/
- public void addDivisionImage(Bitmap b, Object id) {
+ public void addDivisionImage(Bitmap b, Object id, boolean resolved) {
final Integer pos = mDivisionMap.get(id);
if (pos != null && pos >= 0 && b != null) {
mDivisionImages.set(pos, b);
+ mImageStatusList.set(pos, resolved);
boolean complete = false;
final int width = mWidth;
final int height = mHeight;
@@ -279,6 +286,19 @@
}
}
+ public boolean hasImageFor(Object id) {
+ final Integer pos = mDivisionMap.get(id);
+ return pos != null && mDivisionImages.get(pos) != null;
+ }
+
+ public Boolean imageResolved(Object id) {
+ final Integer pos = mDivisionMap.get(id);
+ if (pos == null) {
+ return null;
+ }
+ return mImageStatusList.get(pos);
+ }
+
private void setupDividerLines() {
if (sDividerLineWidth == -1) {
Resources res = getContext().getResources();
@@ -321,6 +341,7 @@
mDivisionMap.clear();
mDivisionImages.clear();
mGeneration++;
+ mNumCachedImagesLoaded = 0;
}
@Override
@@ -364,8 +385,10 @@
* The class that will provided the canvas to which the DividedImageCanvas
* should render its contents must implement this interface.
*/
+ // TODO(pwestbro): rename this interface to match the usage
public interface InvalidateCallback {
public void invalidate();
+ public void onImagesResolved();
}
public int getDivisionCount() {
@@ -393,4 +416,11 @@
// TODO: remove me soon.
return null;
}
+
+ @Override
+ public void onCachedImageLoaded() {
+ if (++mNumCachedImagesLoaded >= mDivisionMap.size()) {
+ mCallback.onImagesResolved();
+ }
+ }
}
diff --git a/src/com/android/mail/ui/FolderItemView.java b/src/com/android/mail/ui/FolderItemView.java
index 0759c30..1d9d857 100644
--- a/src/com/android/mail/ui/FolderItemView.java
+++ b/src/com/android/mail/ui/FolderItemView.java
@@ -137,7 +137,7 @@
&& a.unreadCount == b.unreadCount));
}
- public void bind(Folder folder, DropHandler dropHandler) {
+ public void bind(final Folder folder, final DropHandler dropHandler) {
mFolder = folder;
mDropHandler = dropHandler;
mFolderTextView.setText(folder.name);
@@ -151,7 +151,7 @@
}
}
- public void bind(Account account, DropHandler dropHandler, int count) {
+ public void bind(final Account account, final DropHandler dropHandler, final int count) {
mFolder = null;
mDropHandler = dropHandler;
mFolderTextView.setText(account.name);
diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 1d65c03..c93ffab 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java
@@ -86,6 +86,8 @@
private Uri mFolderListUri;
/** True if you want a sectioned FolderList, false otherwise. */
protected boolean mIsSectioned;
+ /** True if the folder list belongs to a folder selection activity (one account only) */
+ private boolean mHideAccounts;
/** An {@link ArrayList} of {@link FolderType}s to exclude from displaying. */
private ArrayList<Integer> mExcludedFolderTypes;
/** Object that changes folders on our behalf. */
@@ -114,6 +116,8 @@
private static final String ARG_EXCLUDED_FOLDER_TYPES = "arg-excluded-folder-types";
/** Key to store {@link #mType} */
private static final String ARG_TYPE = "arg-flf-type";
+ /** Key to store {@link #mHideAccounts} */
+ private static final String ARG_HIDE_ACCOUNTS = "arg-hide-accounts";
/** Either {@link #TYPE_DRAWER} for drawers or {@link #TYPE_TREE} for hierarchy trees */
private int mType;
@@ -177,7 +181,7 @@
final FolderListFragment fragment = new FolderListFragment();
// The drawer is always sectioned
final boolean isSectioned = true;
- fragment.setArguments(getBundleFromArgs(TYPE_DRAWER, null, null, isSectioned, null));
+ fragment.setArguments(getBundleFromArgs(TYPE_DRAWER, null, null, isSectioned, null, false));
return fragment;
}
@@ -185,14 +189,14 @@
* Creates a new instance of {@link FolderListFragment}, initialized
* to display the folder and its immediate children.
* @param folder parent folder whose children are shown
- *
+ * @param hideAccounts True if accounts should be hidden, false otherwise
*/
- public static FolderListFragment ofTree(Folder folder) {
+ public static FolderListFragment ofTree(Folder folder, final boolean hideAccounts) {
final FolderListFragment fragment = new FolderListFragment();
// Trees are never sectioned.
final boolean isSectioned = false;
fragment.setArguments(getBundleFromArgs(TYPE_TREE, folder, folder.childFoldersListUri,
- isSectioned, null));
+ isSectioned, null, hideAccounts));
return fragment;
}
@@ -201,14 +205,15 @@
* to display the folder and its immediate children.
* @param folderListUri the URI which contains all the list of folders
* @param excludedFolderTypes A list of {@link FolderType}s to exclude from displaying
+ * @param hideAccounts True if accounts should be hidden, false otherwise
*/
public static FolderListFragment ofTopLevelTree(Uri folderListUri,
- final ArrayList<Integer> excludedFolderTypes) {
+ final ArrayList<Integer> excludedFolderTypes, final boolean hideAccounts) {
final FolderListFragment fragment = new FolderListFragment();
// Trees are never sectioned.
final boolean isSectioned = false;
fragment.setArguments(getBundleFromArgs(TYPE_TREE, null, folderListUri,
- isSectioned, excludedFolderTypes));
+ isSectioned, excludedFolderTypes, hideAccounts));
return fragment;
}
@@ -223,7 +228,8 @@
* excluded folder types
*/
private static Bundle getBundleFromArgs(int type, Folder parentFolder, Uri folderListUri,
- boolean isSectioned, final ArrayList<Integer> excludedFolderTypes) {
+ boolean isSectioned, final ArrayList<Integer> excludedFolderTypes,
+ final boolean hideAccounts) {
final Bundle args = new Bundle();
args.putInt(ARG_TYPE, type);
if (parentFolder != null) {
@@ -236,6 +242,7 @@
if (excludedFolderTypes != null) {
args.putIntegerArrayList(ARG_EXCLUDED_FOLDER_TYPES, excludedFolderTypes);
}
+ args.putBoolean(ARG_HIDE_ACCOUNTS, hideAccounts);
return args;
}
@@ -350,19 +357,21 @@
mIsSectioned = args.getBoolean(ARG_IS_SECTIONED);
mExcludedFolderTypes = args.getIntegerArrayList(ARG_EXCLUDED_FOLDER_TYPES);
mType = args.getInt(ARG_TYPE);
+ mHideAccounts = args.getBoolean(ARG_HIDE_ACCOUNTS, false);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedState) {
+ final Bundle args = getArguments();
+ if (args != null) {
+ mHideAccounts = args.getBoolean(ARG_HIDE_ACCOUNTS, false);
+ }
final View rootView = inflater.inflate(R.layout.folder_list, null);
mListView = (ListView) rootView.findViewById(android.R.id.list);
mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
mListView.setEmptyView(null);
- // If we're not using tablet UI, set the background correctly
- if (!Utils.useTabletUI(getResources())) {
- mListView.setBackgroundResource(R.color.list_background_color);
- }
+ mListView.setDivider(null);
if (savedState != null && savedState.containsKey(BUNDLE_LIST_STATE)) {
mListView.onRestoreInstanceState(savedState.getParcelable(BUNDLE_LIST_STATE));
}
@@ -453,16 +462,18 @@
final Account account = drawerItem.mAccount;
if (account != null && account.settings.defaultInbox.equals(mSelectedFolderUri)) {
- // We're already in the default inbox for the same account, just re-check item.
+ // We're already in the default inbox for account, just re-check item ...
final int defaultInboxPosition = position + 1;
if (mListView.getChildAt(defaultInboxPosition) != null) {
mListView.setItemChecked(defaultInboxPosition, true);
}
+ // ... and close the drawer (no new target folders/accounts)
+ mAccountChanger.closeDrawer(false /* hasNewFolderOrAccount */);
} else {
// Switching accounts takes you to the inbox, which is always a system folder.
mSelectedFolderType = DrawerItem.FOLDER_SYSTEM;
mNextAccount = account;
- mAccountChanger.closeDrawerForNewList();
+ mAccountChanger.closeDrawer(true /* hasNewFolderOrAccount */);
}
} else if (itemType == DrawerItem.VIEW_FOLDER) {
// Folder type, so change folders only.
@@ -494,7 +505,10 @@
// Go to the conversation list for this folder.
if (!folder.uri.equals(mSelectedFolderUri)) {
mNextFolder = folder;
- mAccountChanger.closeDrawerForNewList();
+ mAccountChanger.closeDrawer(true /* hasNewFolderOrAccount */);
+ } else {
+ // Clicked on same folder, just close drawer
+ mAccountChanger.closeDrawer(false /* hasNewFolderOrAccount */);
}
}
}
@@ -625,21 +639,19 @@
final DrawerItem item = (DrawerItem) getItem(position);
final View view = item.getView(position, convertView, parent);
final int type = item.mType;
- if (mListView != null) {
- final boolean isSelected =
- item.isHighlighted(mCurrentFolderForUnreadCheck, mSelectedFolderType);
- if (type == DrawerItem.VIEW_FOLDER) {
- mListView.setItemChecked(position, isSelected);
- }
- // If this is the current folder, also check to verify that the unread count
- // matches what the action bar shows.
- if (type == DrawerItem.VIEW_FOLDER
- && isSelected
- && (mCurrentFolderForUnreadCheck != null)
- && item.mFolder.unreadCount != mCurrentFolderForUnreadCheck.unreadCount) {
- ((FolderItemView) view).overrideUnreadCount(
- mCurrentFolderForUnreadCheck.unreadCount);
- }
+ final boolean isSelected =
+ item.isHighlighted(mCurrentFolderForUnreadCheck, mSelectedFolderType);
+ if (type == DrawerItem.VIEW_FOLDER) {
+ mListView.setItemChecked(position, isSelected);
+ }
+ // If this is the current folder, also check to verify that the unread count
+ // matches what the action bar shows.
+ if (type == DrawerItem.VIEW_FOLDER
+ && isSelected
+ && (mCurrentFolderForUnreadCheck != null)
+ && item.mFolder.unreadCount != mCurrentFolderForUnreadCheck.unreadCount) {
+ ((FolderItemView) view).overrideUnreadCount(
+ mCurrentFolderForUnreadCheck.unreadCount);
}
LogUtils.d(LOG_TAG, "FLF.getView(%d) returns view of item %s", position, item);
return view;
@@ -708,11 +720,15 @@
*/
private void recalculateList() {
final List<DrawerItem> newFolderList = new ArrayList<DrawerItem>();
- recalculateListAccounts(newFolderList);
+ // Don't show accounts for single-account-based folder selection (i.e. widgets)
+ if (!mHideAccounts) {
+ recalculateListAccounts(newFolderList);
+ }
recalculateListFolders(newFolderList);
mItemList = newFolderList;
// Ask the list to invalidate its views.
notifyDataSetChanged();
+
}
/**
@@ -725,16 +741,12 @@
// Add all accounts and then the current account
final Uri currentAccountUri = getCurrentAccountUri();
for (final Account account : allAccounts) {
- if (!currentAccountUri.equals(account.uri)) {
- final int unreadCount = mFolderWatcher.getUnreadCount(account);
- itemList.add(DrawerItem.ofAccount(mActivity, account, unreadCount, false));
- }
+ final int unreadCount = mFolderWatcher.getUnreadCount(account);
+ itemList.add(DrawerItem.ofAccount(
+ mActivity, account, unreadCount, currentAccountUri.equals(account.uri)));
}
if (mCurrentAccount == null) {
LogUtils.wtf(LOG_TAG, "recalculateListAccounts() with null current account.");
- } else {
- // We don't show the unread count for the current account, so set this to zero.
- itemList.add(DrawerItem.ofAccount(mActivity, mCurrentAccount, 0, true));
}
}
@@ -773,7 +785,7 @@
do {
final Folder f = mCursor.getModel();
if (!isFolderTypeExcluded(f)) {
- if (f.isProviderFolder() && f.isInbox()) {
+ if (f.isInbox()) {
inboxFolders.add(DrawerItem.ofFolder(
mActivity, f, DrawerItem.FOLDER_SYSTEM, mCursor.getPosition()));
} else {
@@ -784,7 +796,7 @@
} while (mCursor.moveToNext());
// Add all inboxes (sectioned included) before recents.
- addFolderSection(itemList, inboxFolders, NO_HEADER_RESOURCE);
+ addFolderSection(itemList, inboxFolders, R.string.inbox_folders_heading);
// Add most recently folders (in alphabetical order) next.
addRecentsToList(itemList);
@@ -1039,8 +1051,11 @@
*/
private void setSelectedFolderType(Folder folder) {
if (mSelectedFolderType == DrawerItem.UNSET) {
- mSelectedFolderType = folder.isProviderFolder() ? DrawerItem.FOLDER_SYSTEM
+ mSelectedFolderType = folder.isInbox() ? DrawerItem.FOLDER_SYSTEM
: DrawerItem.FOLDER_USER;
+ } else if (folder.isInbox()) {
+ // Handle when backing up in case we need to manually set the type
+ mSelectedFolderType = DrawerItem.FOLDER_SYSTEM;
}
}
@@ -1062,6 +1077,10 @@
manager.destroyLoader(FOLDER_LOADER_ID);
manager.restartLoader(FOLDER_LOADER_ID, Bundle.EMPTY, this);
// An updated cursor causes the entire list to refresh. No need to refresh the list.
+ // But we do need to blank out the current folder, since the account might not be
+ // synced.
+ mSelectedFolderUri = null;
+ mCurrentFolderForUnreadCheck = null;
} else if (account == null) {
// This should never happen currently, but is a safeguard against a very incorrect
// non-null account -> null account transition.
diff --git a/src/com/android/mail/ui/FolderSelectionActivity.java b/src/com/android/mail/ui/FolderSelectionActivity.java
index ce819de..71a7e40 100644
--- a/src/com/android/mail/ui/FolderSelectionActivity.java
+++ b/src/com/android/mail/ui/FolderSelectionActivity.java
@@ -133,7 +133,7 @@
* Since there is no drawer to wait for, notifyChanged to the observers.
*/
@Override
- public void closeDrawerForNewList() {
+ public void closeDrawer(final boolean hasNewFolderOrAccount) {
mDrawerObservers.notifyChanged();
}
};
@@ -178,7 +178,7 @@
}
firstButton.setOnClickListener(this);
createFolderListFragment(FolderListFragment.ofTopLevelTree(mAccount.folderListUri,
- getExcludedFolderTypes()));
+ getExcludedFolderTypes(), true));
}
/**
@@ -338,7 +338,7 @@
// Replace this fragment with a new FolderListFragment
// showing this folder's children if we are not already looking
// at the child view for this folder.
- createFolderListFragment(FolderListFragment.ofTree(folder));
+ createFolderListFragment(FolderListFragment.ofTree(folder, true));
return;
}
onFolderChanged(folder);
diff --git a/src/com/android/mail/ui/FolderSelectionDialog.java b/src/com/android/mail/ui/FolderSelectionDialog.java
index f45d867..3f5b658 100644
--- a/src/com/android/mail/ui/FolderSelectionDialog.java
+++ b/src/com/android/mail/ui/FolderSelectionDialog.java
@@ -41,18 +41,18 @@
private static boolean sDialogShown;
protected AlertDialog mDialog;
- protected ConversationUpdater mUpdater;
- protected SeparatedFolderListAdapter mAdapter;
- protected Collection<Conversation> mTarget;
- protected boolean mBatch;
- protected QueryRunner mRunner;
- protected Account mAccount;
- protected AlertDialog.Builder mBuilder;
- protected Folder mCurrentFolder;
+ protected final ConversationUpdater mUpdater;
+ protected final SeparatedFolderListAdapter mAdapter;
+ protected final Collection<Conversation> mTarget;
+ protected final boolean mBatch;
+ protected final QueryRunner mRunner;
+ protected final Account mAccount;
+ protected final AlertDialog.Builder mBuilder;
+ protected final Folder mCurrentFolder;
- public static FolderSelectionDialog getInstance(final Context context, Account account,
- final ConversationUpdater updater, Collection<Conversation> target, boolean isBatch,
- Folder currentFolder, boolean isMoveTo) {
+ public static FolderSelectionDialog getInstance(final Context context, final Account account,
+ final ConversationUpdater updater, final Collection<Conversation> target,
+ final boolean isBatch, final Folder currentFolder, final boolean isMoveTo) {
if (sDialogShown) {
return null;
}
@@ -76,20 +76,14 @@
protected abstract void onListItemClick(int position);
- protected FolderSelectionDialog(final Context context, Account account,
- final ConversationUpdater updater, Collection<Conversation> target, boolean isBatch,
- Folder currentFolder, boolean isMoveTo) {
+ protected FolderSelectionDialog(final Context context, final Account account,
+ final ConversationUpdater updater, final Collection<Conversation> target,
+ final boolean isBatch, final Folder currentFolder) {
mUpdater = updater;
mTarget = target;
mBatch = isBatch;
final AlertDialog.Builder builder = new AlertDialog.Builder(context);
- if (isMoveTo) {
- builder.setTitle(R.string.move_to_selection_dialog_title);
- } else {
- builder.setTitle(R.string.change_folders_selection_dialog_title);
- builder.setPositiveButton(R.string.ok, this);
- }
builder.setNegativeButton(R.string.cancel, this);
mAccount = account;
mBuilder = builder;
diff --git a/src/com/android/mail/ui/ImageCanvas.java b/src/com/android/mail/ui/ImageCanvas.java
index 850df2f..8f7c130 100644
--- a/src/com/android/mail/ui/ImageCanvas.java
+++ b/src/com/android/mail/ui/ImageCanvas.java
@@ -89,4 +89,9 @@
* data binding.
*/
int getGeneration();
+
+ /**
+ * Called when an image is loaded on this ImageCanvas
+ */
+ void onCachedImageLoaded();
}
diff --git a/src/com/android/mail/ui/MailActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
index f2c66be..272e129 100644
--- a/src/com/android/mail/ui/MailActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -26,6 +26,7 @@
import android.database.Cursor;
import android.net.Uri;
import android.os.AsyncTask;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -38,13 +39,13 @@
import android.widget.SearchView;
import android.widget.SearchView.OnQueryTextListener;
import android.widget.SearchView.OnSuggestionListener;
+import android.widget.TextView;
import com.android.mail.ConversationListContext;
import com.android.mail.R;
import com.android.mail.preferences.MailPrefs;
import com.android.mail.providers.Account;
import com.android.mail.providers.AccountObserver;
-import com.android.mail.providers.AllAccountObserver;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
import com.android.mail.providers.FolderObserver;
@@ -64,10 +65,8 @@
*
*/
public class MailActionBarView extends LinearLayout implements ViewMode.ModeChangeListener,
- OnQueryTextListener, OnSuggestionListener, MenuItem.OnActionExpandListener {
-
- // This is a private setting available starting JB MR1.1.
- private static final int DISPLAY_TITLE_MULTIPLE_LINES = 0x20;
+ OnQueryTextListener, OnSuggestionListener, MenuItem.OnActionExpandListener,
+ View.OnClickListener {
protected ActionBar mActionBar;
protected ControllableActivity mActivity;
@@ -95,6 +94,11 @@
private MenuItem mEmptyTrashItem;
private MenuItem mEmptySpamItem;
private View mRefreshActionView;
+ private boolean mUseLegacyTitle;
+ private View mLegacyTitleContainer;
+ private TextView mLegacyTitle;
+ private TextView mLegacySubTitle;
+
/** True if the current device is a tablet, false otherwise. */
protected final boolean mIsOnTablet;
private boolean mRefreshInProgress;
@@ -126,7 +130,7 @@
subtitleText = null;
LogUtils.wtf(LOG_TAG, "MABV.handleMessage() has a null account!");
}
- mActionBar.setSubtitle(subtitleText);
+ setSubtitle(subtitleText);
super.handleMessage(message);
}
}
@@ -179,9 +183,25 @@
UNREAD_LIMIT = r.getInteger(R.integer.maxUnreadCount);
}
- @Override
- protected void onFinishInflate() {
- super.onFinishInflate();
+ private void initializeTitleViews() {
+ mLegacyTitleContainer = findViewById(R.id.legacy_title_container);
+ if (mLegacyTitleContainer != null) {
+ // Determine if this device is running on MR1.1 or later
+ final boolean runningMR11OrLater = actionBarSupportsNewMethods(mActionBar);
+ if (runningMR11OrLater || !mController.isDrawerEnabled()) {
+ // We don't need the legacy view, just hide it
+ mLegacyTitleContainer.setVisibility(View.GONE);
+ mUseLegacyTitle = false;
+ } else {
+ mUseLegacyTitle = true;
+ // We need to show the legacy title/subtitle. Set the click listener
+ mLegacyTitleContainer.setOnClickListener(this);
+
+ mLegacyTitle = (TextView)mLegacyTitleContainer.findViewById(R.id.legacy_title);
+ mLegacySubTitle =
+ (TextView)mLegacyTitleContainer.findViewById(R.id.legacy_subtitle);
+ }
+ }
}
public void expandSearch() {
@@ -260,6 +280,8 @@
mActionBar = actionBar;
mController = callback;
mActivity = activity;
+ initializeTitleViews();
+
mFolderObserver = new FolderObserver() {
@Override
public void onChanged(Folder newFolder) {
@@ -432,15 +454,31 @@
public static void reorderMenu(final Context context, final Menu menu) {
final boolean preferDelete = MailPrefs.get(context).getPreferDelete();
+ // Do a first pass to extract necessary information on what is safe to move to the overflow
+ boolean archiveVisibleEnabled = false;
+ boolean deleteVisibleEnabled = false;
+ for (int i = 0; i < menu.size(); i++) {
+ final MenuItem menuItem = menu.getItem(i);
+ final int itemId = menuItem.getItemId();
+ final boolean visible = menuItem.isVisible();
+ final boolean enabled = menuItem.isEnabled();
+
+ if (itemId == R.id.archive || itemId == R.id.remove_folder) {
+ archiveVisibleEnabled |= (visible & enabled);
+ } else if (itemId == R.id.delete || itemId == R.id.discard_drafts) {
+ deleteVisibleEnabled |= (visible & enabled);
+ }
+ }
+
for (int i = 0; i < menu.size(); i++) {
final MenuItem menuItem = menu.getItem(i);
final int itemId = menuItem.getItemId();
- if (preferDelete) {
+ if (preferDelete && deleteVisibleEnabled) {
if (itemId == R.id.archive || itemId == R.id.remove_folder) {
menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
}
- } else {
+ } else if (!preferDelete && archiveVisibleEnabled) {
if (itemId == R.id.delete || itemId == R.id.discard_drafts) {
menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
}
@@ -452,8 +490,8 @@
* Put the ActionBar in List navigation mode.
*/
private void showNavList() {
+ setTitleModeFlags(getActionBarTitleModeFlag());
setFolderAndAccount(false);
- setTitleModeFlags(ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
}
/**
@@ -461,9 +499,34 @@
* (if user has multiple accounts)
*/
private void setFoldersMode() {
- mActionBar.setTitle(R.string.folders);
+ setTitle(R.string.folders);
+ setSubtitle(mAccount.name);
setTitleModeFlags(ActionBar.DISPLAY_SHOW_TITLE);
- mActionBar.setSubtitle(mAccount.name);
+ }
+
+ private void setSubtitle(CharSequence subtitle) {
+ mActionBar.setSubtitle(subtitle);
+ if (mLegacySubTitle != null) {
+ mLegacySubTitle.setText(subtitle);
+ }
+ }
+
+ private void setTitle(int res) {
+ mActionBar.setTitle(res);
+ if (mLegacyTitle != null) {
+ mLegacyTitle.setText(res);
+ }
+ }
+
+ private void setTitle(CharSequence title) {
+ mActionBar.setTitle(title);
+ if (mLegacyTitle != null) {
+ mLegacyTitle.setText(title);
+ }
+ }
+
+ private int getActionBarTitleModeFlag() {
+ return mUseLegacyTitle ? ActionBar.DISPLAY_SHOW_CUSTOM : ActionBar.DISPLAY_SHOW_TITLE;
}
/**
@@ -594,7 +657,7 @@
}
if (ViewMode.isWaitingForSync(mMode)) {
// Account is not synced: clear title and update the subtitle.
- mActionBar.setTitle("");
+ setTitle("");
removeUnreadCount();
return;
}
@@ -608,10 +671,10 @@
if (mFolder == null) {
// Clear the action bar title. We don't want the app name to be shown while
// waiting for the folder query to finish
- mActionBar.setTitle("");
+ setTitle("");
return;
}
- mActionBar.setTitle(mFolder.name);
+ setTitle(mFolder.name);
final int folderUnreadCount = mFolder.isUnreadCountHidden() ? 0 : mFolder.unreadCount;
// The user shouldn't see "999+ unread messages", and then a short while later: "999+
@@ -624,7 +687,7 @@
if (toDisplay == 0) {
removeUnreadCount();
} else {
- mActionBar.setSubtitle(Utils.getUnreadMessageString(
+ setSubtitle(Utils.getUnreadMessageString(
mActivity.getApplicationContext(), toDisplay));
// This is a new update, remove previous messages, if any.
mHandler.removeMessages(SubtitleHandler.EMAIL);
@@ -694,13 +757,12 @@
/**
* Sets the actionbar mode: Pass it an integer which contains each of these values, perhaps
- * OR'd together: {@link ActionBar#DISPLAY_SHOW_CUSTOM}, {@link ActionBar#DISPLAY_SHOW_TITLE},
- * and {@link #DISPLAY_TITLE_MULTIPLE_LINES}. To disable all, pass a zero.
+ * OR'd together: {@link ActionBar#DISPLAY_SHOW_CUSTOM} and
+ * {@link ActionBar#DISPLAY_SHOW_TITLE}. To disable all, pass a zero.
* @param enabledFlags
*/
private void setTitleModeFlags(int enabledFlags) {
- final int mask = ActionBar.DISPLAY_SHOW_TITLE
- | ActionBar.DISPLAY_SHOW_CUSTOM | DISPLAY_TITLE_MULTIPLE_LINES;
+ final int mask = ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM;
mActionBar.setDisplayOptions(enabledFlags, mask);
}
@@ -758,4 +820,32 @@
&& mFolder.supportsCapability(FolderCapabilities.DESTRUCTIVE_MUTE)
&& !mCurrentConversation.muted);
}
+
+ private static boolean actionBarSupportsNewMethods(ActionBar bar) {
+ // TODO(pwestbro) switch this to
+ // (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) when we switch to the
+ // latest SDK
+ if (Build.VERSION.SDK_INT > 17) {
+ return true;
+ }
+ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
+ return false;
+ }
+ boolean supportsNewApi = false;
+ try {
+ if (bar != null) {
+ supportsNewApi = (ActionBar.class.getField("DISPLAY_TITLE_MULTIPLE_LINES") != null);
+ }
+ } catch (NoSuchFieldException e) {
+ // stay false
+ }
+ return supportsNewApi;
+ }
+
+ @Override
+ public void onClick (View v) {
+ if (v.getId() == R.id.legacy_title_container) {
+ mController.onUpPressed();
+ }
+ }
}
diff --git a/src/com/android/mail/ui/MultiFoldersSelectionDialog.java b/src/com/android/mail/ui/MultiFoldersSelectionDialog.java
index aea83ca..f3e1b83 100644
--- a/src/com/android/mail/ui/MultiFoldersSelectionDialog.java
+++ b/src/com/android/mail/ui/MultiFoldersSelectionDialog.java
@@ -27,8 +27,10 @@
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
import com.android.mail.providers.UIProvider;
+import com.android.mail.providers.UIProvider.FolderType;
import com.android.mail.ui.FolderSelectorAdapter.FolderRow;
import com.android.mail.utils.Utils;
+import com.google.common.collect.ImmutableSet;
import java.util.Arrays;
import java.util.Collection;
@@ -56,13 +58,16 @@
* @param currentFolder the current folder that the
* {@link FolderListFragment} is showing
*/
- public MultiFoldersSelectionDialog(final Context context, Account account,
- final ConversationUpdater updater, Collection<Conversation> target, boolean isBatch,
- Folder currentFolder) {
- super(context, account, updater, target, isBatch, currentFolder, false);
+ public MultiFoldersSelectionDialog(final Context context, final Account account,
+ final ConversationUpdater updater, final Collection<Conversation> target,
+ final boolean isBatch, final Folder currentFolder) {
+ super(context, account, updater, target, isBatch, currentFolder);
mSingle = !account
.supportsCapability(UIProvider.AccountCapabilities.MULTIPLE_FOLDERS_PER_CONV);
mOperations = new HashMap<Uri, FolderOperation>();
+
+ mBuilder.setTitle(R.string.change_folders_selection_dialog_title);
+ mBuilder.setPositiveButton(R.string.ok, this);
}
@Override
@@ -98,7 +103,8 @@
// TODO(mindyp): we currently do not support frequently moved to
// folders, at headers[1]; need to define what that means.*/
mAdapter.addSection(new AddableFolderSelectorAdapter(context,
- AddableFolderSelectorAdapter.filterFolders(foldersCursor), checked,
+ AddableFolderSelectorAdapter.filterFolders(foldersCursor,
+ ImmutableSet.of(FolderType.INBOX_SECTION)), checked,
R.layout.multi_folders_view, null));
mBuilder.setAdapter(mAdapter, MultiFoldersSelectionDialog.this);
} finally {
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index c7e7e3b..804317b 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -225,7 +225,7 @@
mDrawerPullout = (ViewGroup) mDrawerContainer.findViewById(R.id.drawer_pullout);
mDrawerContainer.setDrawerShadow(
mContext.getResources().getDrawable(R.drawable.drawer_shadow), Gravity.LEFT);
-
+ mDrawerPullout.setBackgroundResource(R.color.list_background_color);
mDrawerToggle = new ActionBarDrawerToggle((Activity)mActivity, mDrawerContainer,
R.drawable.ic_drawer, R.string.drawer_open, R.string.drawer_close);
@@ -555,7 +555,7 @@
// showing this folder's children if we are not already
// looking at the child view for this folder.
mLastFolderListTransactionId = replaceFragmentWithBack(
- FolderListFragment.ofTree(top),
+ FolderListFragment.ofTree(top, false),
FragmentTransaction.TRANSIT_FRAGMENT_OPEN, TAG_FOLDER_LIST, R.id.content_pane);
} else {
// Otherwise, clear the selected folder and go back to whatever the
@@ -585,7 +585,7 @@
// showing this folder's children if we are not already
// looking at the child view for this folder.
mLastFolderListTransactionId = replaceFragmentWithBack(
- FolderListFragment.ofTree(folder),
+ FolderListFragment.ofTree(folder, false),
FragmentTransaction.TRANSIT_FRAGMENT_OPEN, TAG_FOLDER_LIST, R.id.content_pane);
} else {
super.onFolderSelected(folder);
@@ -804,10 +804,10 @@
/**
* The default behavior calls mDrawerObserver's notifyChanged(). So, to notify the consumer of
* the observer that the drawer is closed, we simply make a call to
- * {@link AbstractActivityController#closeDrawerForNewList()}.
+ * {@link AbstractActivityController#closeDrawer(boolean)}.
*/
public void notifyDrawerClosed() {
- super.closeDrawerForNewList();
+ super.closeDrawer(true);
}
/**
@@ -816,7 +816,13 @@
* or put in an idle state.
*/
@Override
- public void closeDrawerForNewList() {
+ public void closeDrawer(final boolean hasNewFolderOrAccount) {
+ // If there are no new folders or accounts to switch to, just close the drawer
+ if (!hasNewFolderOrAccount) {
+ mDrawerContainer.closeDrawers();
+ return;
+ }
+
final ConversationListFragment conversationList = getConversationListFragment();
if (conversationList != null) {
mListViewForAnimating = conversationList.getListView();
@@ -835,4 +841,9 @@
}
}
+ @Override
+ public boolean isDrawerEnabled() {
+ // The drawer is enabled for one pane mode
+ return true;
+ }
}
diff --git a/src/com/android/mail/ui/RecentAccountsList.java b/src/com/android/mail/ui/RecentAccountsList.java
deleted file mode 100644
index f304886..0000000
--- a/src/com/android/mail/ui/RecentAccountsList.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Copyright (c) 2013, Google Inc.
- *
- * 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.os.AsyncTask;
-import android.text.TextUtils;
-
-import com.android.mail.preferences.MailPrefs;
-import com.android.mail.providers.Account;
-import com.android.mail.utils.LogUtils;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-
-/**
- * A list for the most recently touched account uris, ordered
- * from least-recently-touched to most-recently-touched. Note, the list does
- * not limit the amount of accounts you can have ordered.
- *
- * The accounts cache returns lists of this type, and will keep them updated when observers are
- * registered on them.
- *
- */
-public final class RecentAccountsList {
- private static final String TAG = "RecentAccountsList";
- /** Storage for accounts */
- private final MailPrefs mMailPrefs;
- /** Separator for serializing the mAccountsCache into a string */
- private static final String SEPARATOR = "\n";
- /** Separator for splitting the newline-delimited string into an array */
- private static final String SEPARATOR_REGEX = "\\n";
- /** List of account URIs from least to most recently used */
- private final LinkedList<String> mAccountsCache;
-
- /**
- * Class to store the recent accounts list asynchronously.
- */
- private class StoreRecent extends AsyncTask<Void, Void, Void> {
- /** Account to store in Mail Prefs */
- private final String mAccountUris;
-
- /**
- * Create a new asynchronous task to store the recent folder list. Both the account
- * and the folder should be non-null.
- * @param accountUris list of account URIs in order
- */
- public StoreRecent(final String accountUris) {
- assert (accountUris != null);
- mAccountUris = accountUris;
- }
-
- /**
- * Commit changes to MailPrefs which will save the uri string with the
- * respective key
- */
- @Override
- protected Void doInBackground(Void... v) {
- mMailPrefs.setRecentAccountUris(mAccountUris);
- return null;
- }
- }
-
- /**
- * Create a RecentAccountsList from the given context. Saves the MailPrefs
- * in order to write and read recent accounts to preferences.
- *
- * @param context the context for the activity
- */
- public RecentAccountsList(Context context) {
- mAccountsCache = new LinkedList<String>();
- mMailPrefs = MailPrefs.get(context);
- String accountUris = mMailPrefs.getRecentAccountUris();
- // If the accountUris string is empty, there is nothing to add to the list
- if(!TextUtils.isEmpty(accountUris)) {
- populateAccountsCache(accountUris);
- }
- }
-
- /**
- * Populate the LinkedList using input account uris that are separated by newlines.
- *
- * @param accountUris list of account uris ordered by least to most recently used
- */
- private void populateAccountsCache(final String accountUris) {
- // Take apart string by the newline character as URIs do not contain them
- final String[] allUris = accountUris.split(SEPARATOR_REGEX);
-
- // For every uri saved in the prefs, add it to the linked list in order
- // since we want to add most recently used accounts at the -end-.
- for (String accountUri : allUris) {
- mAccountsCache.addLast(accountUri);
- }
- }
-
- /**
- * Marks the given account as 'accessed' by the user interface, its entry is
- * updated in the recent accounts list and pushed to the end.
- *
- * @param account the account we touched
- */
- public void touchAccount(final Account account) {
- // Invalid account, cannot proceed
- if (account == null) {
- LogUtils.w(TAG, "No account set: touchAccount(null)");
- return;
- }
-
- // Remove the accountUri touched from somewhere in the LinkedList
- // (if it exists) and add it to the end of the list
- final String accountUri = account.uri.toString();
- mAccountsCache.remove(accountUri);
- mAccountsCache.addLast(accountUri);
- commitCacheChanges();
- }
-
- /**
- * Takes in an array of unsorted Account objects and orders them from least
- * recently used to most recently used. Takes in account that there may be
- * Accounts that are not in the cache or stale URIs that are still remaining
- * in the cache.
- *
- * Do NOT call this more than necessary. It may affect performance for large
- * number of accounts.
- *
- * @param unsortedAccounts array of Accounts to be ordered
- * @return ordered array of Accounts from least to most recently used, possibly empty.
- */
- public Account[] getSorted(final Account[] unsortedAccounts) {
- if (unsortedAccounts == null || unsortedAccounts.length == 0) {
- return new Account[0];
- }
- // Create a sortedAccounts list that will collect the final order of accounts
- final LinkedList<Account> sortedAccounts = new LinkedList<Account>();
- // Map for uri -> Account object for quick lookup
- final HashMap<String, Account> accountsMap = new HashMap<String, Account>();
- int currCacheIndex = 0;
- String accountUri;
- Account currAccount;
-
- // Add unsortedAccounts to map
- for (final Account account : unsortedAccounts) {
- accountsMap.put(account.uri.toString(), account);
- }
-
- // Traverse cached list and populate sortedAccounts or fix cache if
- // the account URIs are not found in the map
- while (currCacheIndex < mAccountsCache.size()) {
- accountUri = mAccountsCache.get(currCacheIndex);
- currAccount = accountsMap.get(accountUri);
- if (currAccount != null) {
- // If account is found in the map of unsortedAccounts, add to final result
- // and remove from temp map
- sortedAccounts.addLast(currAccount);
- accountsMap.remove(accountUri);
- currCacheIndex++;
- } else {
- // Otherwise, remove from the cache and don't update the index
- mAccountsCache.remove(accountUri);
- }
- }
-
- // For any accounts that weren't in the cache, add them to the cache as
- // least recently used and the final results as well.
- for (final Account uncachedAccount : accountsMap.values()) {
- mAccountsCache.addFirst(uncachedAccount.uri.toString());
- sortedAccounts.addFirst(uncachedAccount);
- }
-
- //Return Account array based on final list
- return sortedAccounts.toArray(new Account[sortedAccounts.size()]);
- }
-
- /**
- * Writes out the account URIs to {@link MailPrefs} - used when destroying
- * object or wanting to commit {@link RecentAccountsList#mAccountsCache}
- * contents.
- */
- public void commitCacheChanges() {
- final String accountUris = TextUtils.join(SEPARATOR,
- mAccountsCache.toArray(new String[mAccountsCache.size()]));
- new StoreRecent(accountUris).executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
- }
-}
diff --git a/src/com/android/mail/ui/SingleFolderSelectionDialog.java b/src/com/android/mail/ui/SingleFolderSelectionDialog.java
index bd8f7c5..ccc89a9 100644
--- a/src/com/android/mail/ui/SingleFolderSelectionDialog.java
+++ b/src/com/android/mail/ui/SingleFolderSelectionDialog.java
@@ -31,6 +31,7 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Set;
/**
* Displays a folder selection dialog for the conversation provided. It allows
@@ -50,10 +51,12 @@
* @param currentFolder the current folder that the
* {@link FolderListFragment} is showing
*/
- public SingleFolderSelectionDialog(final Context context, Account account,
- final ConversationUpdater updater, Collection<Conversation> target, boolean isBatch,
- Folder currentFolder) {
- super(context, account, updater, target, isBatch, currentFolder, true);
+ public SingleFolderSelectionDialog(final Context context, final Account account,
+ final ConversationUpdater updater, final Collection<Conversation> target,
+ final boolean isBatch, final Folder currentFolder) {
+ super(context, account, updater, target, isBatch, currentFolder);
+
+ mBuilder.setTitle(R.string.move_to_selection_dialog_title);
}
@Override
@@ -77,7 +80,7 @@
// folders, at headers[1]; need to define what that means.*/
// TODO(pwestbro): determine if we need to call filterFolders
mAdapter.addSection(new UserFolderHierarchicalFolderSelectorAdapter(context,
- AddableFolderSelectorAdapter.filterFolders(foldersCursor),
+ AddableFolderSelectorAdapter.filterFolders(foldersCursor, null),
R.layout.single_folders_view, headers[2], mCurrentFolder));
mBuilder.setAdapter(mAdapter, SingleFolderSelectionDialog.this);
} finally {
diff --git a/src/com/android/mail/ui/SwipeableListView.java b/src/com/android/mail/ui/SwipeableListView.java
index 33da99a..517cc15 100644
--- a/src/com/android/mail/ui/SwipeableListView.java
+++ b/src/com/android/mail/ui/SwipeableListView.java
@@ -34,9 +34,11 @@
import com.android.mail.browse.ConversationCursor;
import com.android.mail.browse.ConversationItemView;
import com.android.mail.browse.SwipeableConversationItemView;
+import com.android.mail.providers.Account;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
import com.android.mail.providers.FolderList;
+import com.android.mail.providers.UIProvider.ConversationListIcon;
import com.android.mail.ui.SwipeHelper.Callback;
import com.android.mail.utils.LogTag;
import com.android.mail.utils.LogUtils;
@@ -47,13 +49,14 @@
import java.util.HashMap;
public class SwipeableListView extends ListView implements Callback, OnScrollListener {
- private SwipeHelper mSwipeHelper;
+ private final SwipeHelper mSwipeHelper;
private boolean mEnableSwipe = false;
public static final String LOG_TAG = LogTag.getLogTag();
private ConversationSelectionSet mConvSelectionSet;
private int mSwipeAction;
+ private Account mAccount;
private Folder mFolder;
private ListItemSwipedListener mSwipedListener;
private boolean mScrolling;
@@ -122,6 +125,10 @@
mConvSelectionSet = set;
}
+ public void setCurrentAccount(Account account) {
+ mAccount = account;
+ }
+
public void setCurrentFolder(Folder folder) {
mFolder = folder;
}
@@ -324,7 +331,19 @@
@Override
public boolean performItemClick(View view, int pos, long id) {
+ int previousPosition = getCheckedItemPosition();
+ boolean selectionSetEmpty = mConvSelectionSet.isEmpty();
+
+ // Superclass method modifies the selection set
boolean handled = super.performItemClick(view, pos, id);
+
+ // If we are in CAB mode with no checkboxes then a click shouldn't
+ // activate the new item, it should only add it to the selection set
+ boolean showSenderImage = mAccount != null
+ && (mAccount.settings.convListIcon == ConversationListIcon.SENDER_IMAGE);
+ if (!showSenderImage && !selectionSetEmpty && 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/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index ce493c7..67bbbd5 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -28,6 +28,7 @@
import com.android.mail.R;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
+import com.android.mail.providers.UIProvider.ConversationListIcon;
import com.android.mail.utils.LogUtils;
import com.android.mail.utils.Utils;
@@ -94,7 +95,7 @@
*/
private void createFolderTree(Folder parent) {
setHierarchyFolder(parent);
- createFolderListFragment(FolderListFragment.ofTree(parent));
+ createFolderListFragment(FolderListFragment.ofTree(parent, false));
}
private void createFolderListFragment(Fragment folderList) {
@@ -238,6 +239,28 @@
}
@Override
+ public void onSetPopulated(ConversationSelectionSet set) {
+ super.onSetPopulated(set);
+
+ boolean showSenderImage =
+ (mAccount.settings.convListIcon == ConversationListIcon.SENDER_IMAGE);
+ if (!showSenderImage && mViewMode.isListMode()) {
+ getConversationListFragment().setChoiceNone();
+ }
+ }
+
+ @Override
+ public void onSetEmpty() {
+ super.onSetEmpty();
+
+ boolean showSenderImage =
+ (mAccount.settings.convListIcon == ConversationListIcon.SENDER_IMAGE);
+ if (!showSenderImage && mViewMode.isListMode()) {
+ getConversationListFragment().revertChoiceMode();
+ }
+ }
+
+ @Override
protected void showConversation(Conversation conversation, boolean inLoaderCallbacks) {
super.showConversation(conversation, inLoaderCallbacks);
@@ -551,4 +574,10 @@
showErrorToast(folder, replaceVisibleToast);
}
+
+ @Override
+ public boolean isDrawerEnabled() {
+ // The drawer is currently not enabled for two pane mode
+ return false;
+ }
}
diff --git a/src/com/android/mail/utils/NotificationActionUtils.java b/src/com/android/mail/utils/NotificationActionUtils.java
index c57a9d4..1f5284e 100644
--- a/src/com/android/mail/utils/NotificationActionUtils.java
+++ b/src/com/android/mail/utils/NotificationActionUtils.java
@@ -43,6 +43,7 @@
import com.android.mail.providers.UIProvider;
import com.android.mail.providers.UIProvider.ConversationOperations;
import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Sets;
import java.util.ArrayList;
import java.util.Collection;
@@ -61,6 +62,13 @@
new ObservableSparseArrayCompat<NotificationAction>();
/**
+ * If a {@link Conversation} exists in this set, then the undo notification for this
+ * {@link Conversation} was tapped by the user in the notification drawer.
+ * We need to properly handle notification actions for this case.
+ */
+ public static final Set<Conversation> sUndoneConversations = Sets.newHashSet();
+
+ /**
* If an undo notification is displayed, its timestamp
* ({@link android.app.Notification.Builder#setWhen(long)}) is stored here so we can use it for
* the original notification if the action is undone.
@@ -79,13 +87,9 @@
}),
DELETE("delete", true, R.drawable.ic_menu_delete_holo_dark,
R.string.notification_action_delete),
- MARK_READ("mark_read", false, R.drawable.ic_menu_mark_read_holo_dark,
- R.string.notification_action_mark_read),
REPLY("reply", false, R.drawable.ic_reply_holo_dark, R.string.notification_action_reply),
REPLY_ALL("reply_all", false, R.drawable.ic_reply_all_holo_dark,
- R.string.notification_action_reply_all),
- FORWARD("forward", false, R.drawable.ic_forward_holo_dark,
- R.string.notification_action_forward);
+ R.string.notification_action_reply_all);
private final String mPersistedValue;
private final boolean mIsDestructive;
@@ -236,18 +240,12 @@
if (unsortedActions.contains(NotificationActionType.DELETE)) {
sortedActions.add(NotificationActionType.DELETE);
}
- if (unsortedActions.contains(NotificationActionType.MARK_READ)) {
- sortedActions.add(NotificationActionType.MARK_READ);
- }
if (unsortedActions.contains(NotificationActionType.REPLY)) {
sortedActions.add(NotificationActionType.REPLY);
}
if (unsortedActions.contains(NotificationActionType.REPLY_ALL)) {
sortedActions.add(NotificationActionType.REPLY_ALL);
}
- if (unsortedActions.contains(NotificationActionType.FORWARD)) {
- sortedActions.add(NotificationActionType.FORWARD);
- }
} else if (folder.isProviderFolder()) {
// Gmail system labels
/*
@@ -261,18 +259,12 @@
if (unsortedActions.contains(NotificationActionType.DELETE)) {
sortedActions.add(NotificationActionType.DELETE);
}
- if (unsortedActions.contains(NotificationActionType.MARK_READ)) {
- sortedActions.add(NotificationActionType.MARK_READ);
- }
if (unsortedActions.contains(NotificationActionType.REPLY)) {
sortedActions.add(NotificationActionType.REPLY);
}
if (unsortedActions.contains(NotificationActionType.REPLY_ALL)) {
sortedActions.add(NotificationActionType.REPLY_ALL);
}
- if (unsortedActions.contains(NotificationActionType.FORWARD)) {
- sortedActions.add(NotificationActionType.FORWARD);
- }
} else {
// Gmail user created labels
/*
@@ -288,18 +280,12 @@
if (unsortedActions.contains(NotificationActionType.DELETE)) {
sortedActions.add(NotificationActionType.DELETE);
}
- if (unsortedActions.contains(NotificationActionType.MARK_READ)) {
- sortedActions.add(NotificationActionType.MARK_READ);
- }
if (unsortedActions.contains(NotificationActionType.REPLY)) {
sortedActions.add(NotificationActionType.REPLY);
}
if (unsortedActions.contains(NotificationActionType.REPLY_ALL)) {
sortedActions.add(NotificationActionType.REPLY_ALL);
}
- if (unsortedActions.contains(NotificationActionType.FORWARD)) {
- sortedActions.add(NotificationActionType.FORWARD);
- }
}
return sortedActions;
@@ -354,24 +340,6 @@
return taskStackBuilder.getPendingIntent(
notificationId, PendingIntent.FLAG_UPDATE_CURRENT);
- } case FORWARD: {
- // Build a task stack that forces the conversation view on the stack before the
- // reply activity.
- final TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(context);
-
- final Intent intent = createForwardIntent(context, account, messageUri);
- intent.setPackage(context.getPackageName());
- intent.putExtra(ComposeActivity.EXTRA_NOTIFICATION_FOLDER, folder);
- // To make sure that the reply intents one notification don't clobber over
- // intents for other notification, force a data uri on the intent
- final Uri notificationUri =
- Uri.parse("mailfrom://mail/account/" + "forward/" + notificationId);
- intent.setData(notificationUri);
-
- taskStackBuilder.addNextIntent(notificationIntent).addNextIntent(intent);
-
- return taskStackBuilder.getPendingIntent(
- notificationId, PendingIntent.FLAG_UPDATE_CURRENT);
} case ARCHIVE_REMOVE_LABEL: {
final String intentAction =
NotificationActionIntentService.ACTION_ARCHIVE_REMOVE_LABEL;
@@ -393,16 +361,6 @@
return PendingIntent.getService(
context, notificationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
- } case MARK_READ: {
- final String intentAction = NotificationActionIntentService.ACTION_MARK_READ;
-
- final Intent intent = new Intent(intentAction);
- intent.setPackage(context.getPackageName());
- intent.putExtra(NotificationActionIntentService.EXTRA_NOTIFICATION_ACTION,
- notificationAction);
-
- return PendingIntent.getService(
- context, notificationId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
}
}
@@ -729,12 +687,21 @@
sNotificationTimestamps.put(notificationId, notificationAction.getWhen());
}
+ /**
+ * Called when an Undo notification has been tapped.
+ */
public static void cancelUndoNotification(final Context context,
final NotificationAction notificationAction) {
final Account account = notificationAction.getAccount();
final Folder folder = notificationAction.getFolder();
+ final Conversation conversation = notificationAction.getConversation();
final int notificationId = NotificationUtils.getNotificationId(
account.name, folder);
+
+ // Note: we must add the conversation before removing the undo notification
+ // Otherwise, the observer for sUndoNotifications gets called, which calls
+ // handleNotificationActions before the undone conversation has been added to the set.
+ sUndoneConversations.add(conversation);
removeUndoNotification(context, notificationId, false);
resendNotifications(context, account, folder);
}
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 8e70895..06697dc 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -312,8 +312,8 @@
// Only resend notifications if the notifications are from the same folder
// and same account as the undo notification that was previously displayed.
- if (!Objects.equal(accountUri, notification.account.uri) &&
- !Objects.equal(folderUri, folder.uri)) {
+ if (accountUri != null && !Objects.equal(accountUri, notification.account.uri) &&
+ folderUri != null && !Objects.equal(folderUri, folder.uri)) {
continue;
}
@@ -713,6 +713,7 @@
// The title of the notification is the new messages string
notification.setContentTitle(newMessagesString);
+ // TODO(skennedy) Can we remove this check?
if (com.android.mail.utils.Utils.isRunningJellybeanOrLater()) {
// For a new-style notification
final int maxNumDigestItems = context.getResources().getInteger(
@@ -724,6 +725,7 @@
final NotificationCompat.InboxStyle digest =
new NotificationCompat.InboxStyle(notification);
+ // TODO(skennedy) I do not believe this line is necessary
digest.setBigContentTitle(newMessagesString);
int numDigestItems = 0;
@@ -843,6 +845,7 @@
}
}
+ // TODO(skennedy) Can we remove this check?
if (Utils.isRunningJellybeanOrLater()) {
// For a new-style notification
diff --git a/src/com/android/mail/widget/WidgetService.java b/src/com/android/mail/widget/WidgetService.java
index c8ece7c..d2b9770 100644
--- a/src/com/android/mail/widget/WidgetService.java
+++ b/src/com/android/mail/widget/WidgetService.java
@@ -100,7 +100,7 @@
if (!TextUtils.isEmpty(account.name)) {
remoteViews.setTextViewText(R.id.widget_account, account.name);
}
- remoteViews.setViewVisibility(R.id.widget_unread_count, View.VISIBLE);
+ remoteViews.setViewVisibility(R.id.widget_unread_count, View.GONE);
remoteViews.setViewVisibility(R.id.widget_compose, View.VISIBLE);
remoteViews.setViewVisibility(R.id.conversation_list, View.VISIBLE);
remoteViews.setViewVisibility(R.id.empty_conversation_list, View.VISIBLE);
@@ -548,9 +548,17 @@
if (!TextUtils.isEmpty(mAccount.name)) {
remoteViews.setTextViewText(R.id.widget_account, mAccount.name);
}
- remoteViews.setViewVisibility(R.id.widget_unread_count, View.VISIBLE);
- remoteViews.setTextViewText(R.id.widget_unread_count,
- Utils.getUnreadCountString(mContext, unreadCount));
+
+ final String unreadCountString = Utils.getUnreadCountString(mContext, unreadCount);
+
+ // If there are 0 unread messages, hide the unread count text view.
+ // Otherwise, show the unread count.
+ if ("".equals(unreadCountString)) {
+ remoteViews.setViewVisibility(R.id.widget_unread_count, View.GONE);
+ } else {
+ remoteViews.setViewVisibility(R.id.widget_unread_count, View.VISIBLE);
+ remoteViews.setTextViewText(R.id.widget_unread_count, unreadCountString);
+ }
appWidgetManager.partiallyUpdateAppWidget(mAppWidgetId, remoteViews);
} else if (loader == mConversationCursorLoader) {
