Merge "Removed unused assets."
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dc388d0..4a99cb8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,7 +56,9 @@
                 android:description="@string/permission_access_provider_desc"/>
     <uses-permission android:name="com.android.email.permission.ACCESS_PROVIDER"/>
 
-    <application android:icon="@drawable/icon" android:label="@string/app_name"
+    <application
+        android:icon="@mipmap/icon"
+        android:label="@string/app_name"
         android:name="Email"
         android:theme="@android:style/Theme.Holo.Light"
         android:hardwareAccelerated="false"
@@ -145,10 +147,13 @@
 
         <activity
             android:name=".activity.AccountShortcutPicker"
-            android:label="@string/app_name"
+            android:label="@string/account_shortcut_picker_title"
             android:enabled="false"
+            android:theme="@android:style/Theme.Holo.DialogWhenLarge"
             >
-            <intent-filter>
+            <intent-filter
+                android:label="@string/account_shortcut_picker_name"
+                >
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/proguard.flags b/proguard.flags
index 85b6545..747aed2 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -23,11 +23,10 @@
 
 -keep class * extends org.apache.james.mime4j.util.TempStorage
 
-# Keep names that are used only by unit tests
-
-# Any methods whose name is '*ForTest' are preserved.
+# Keep names that are used only by unit tests or by animators
 -keep class ** {
   *** *ForTest(...);
+  *** *Anim(...);
 }
 
 -keepclasseswithmembers class com.android.email.GroupMessagingListener {
diff --git a/res/drawable-hdpi/btn_check_off_normal_holo_light.png b/res/drawable-hdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 0000000..b17c6c6
--- /dev/null
+++ b/res/drawable-hdpi/btn_check_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-hdpi/btn_check_on_normal_holo_light.png b/res/drawable-hdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 0000000..4d2280e
--- /dev/null
+++ b/res/drawable-hdpi/btn_check_on_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_check_off_normal_holo_light.png b/res/drawable-mdpi/btn_check_off_normal_holo_light.png
new file mode 100644
index 0000000..b17c6c6
--- /dev/null
+++ b/res/drawable-mdpi/btn_check_off_normal_holo_light.png
Binary files differ
diff --git a/res/drawable-mdpi/btn_check_on_normal_holo_light.png b/res/drawable-mdpi/btn_check_on_normal_holo_light.png
new file mode 100644
index 0000000..4d2280e
--- /dev/null
+++ b/res/drawable-mdpi/btn_check_on_normal_holo_light.png
Binary files differ
diff --git a/res/layout/three_pane.xml b/res/layout-land/three_pane.xml
similarity index 94%
rename from res/layout/three_pane.xml
rename to res/layout-land/three_pane.xml
index 00dfa38..596f072 100644
--- a/res/layout/three_pane.xml
+++ b/res/layout-land/three_pane.xml
@@ -17,7 +17,7 @@
 <!-- ThreePaneLayout is based on LinearLayout with the orientation always horizontal -->
 
 <!-- for landscape -->
-
+<!-- Note the width of each pane is set by code at runtime.  -->
 <com.android.email.activity.ThreePaneLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:splitMotionEvents="true"
@@ -29,20 +29,17 @@
         android:id="@+id/left_pane"
         android:layout_width="0dip"
         android:layout_height="match_parent"
-        android:layout_weight="1"
         />
     <fragment
         android:name="com.android.email.activity.MessageListFragment"
         android:id="@+id/middle_pane"
         android:layout_width="0dip"
         android:layout_height="match_parent"
-        android:layout_weight="3"
         />
     <fragment
         android:name="com.android.email.activity.MessageViewFragment"
         android:id="@+id/right_pane"
         android:layout_width="0dip"
         android:layout_height="match_parent"
-        android:layout_weight="6"
         />
 </com.android.email.activity.ThreePaneLayout>
diff --git a/res/layout-port/three_pane.xml b/res/layout-port/three_pane.xml
index 7d083eb..433e709 100644
--- a/res/layout-port/three_pane.xml
+++ b/res/layout-port/three_pane.xml
@@ -17,7 +17,7 @@
 <!-- ThreePaneLayout is based on LinearLayout with the orientation always horizontal -->
 
 <!-- for portrait -->
-
+<!-- Note the width of each pane is set by code at runtime.  -->
 <com.android.email.activity.ThreePaneLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:splitMotionEvents="true"
@@ -29,7 +29,6 @@
         android:id="@+id/left_pane"
         android:layout_width="0dip"
         android:layout_height="match_parent"
-        android:layout_weight="1"
         />
 
     <fragment
@@ -37,21 +36,11 @@
         android:id="@+id/middle_pane"
         android:layout_width="0dip"
         android:layout_height="match_parent"
-        android:layout_weight="2"
-        />
-    <!-- STOPSHIP Don't use hardcoded color -->
-    <View
-        android:id="@+id/collapser"
-        android:layout_width="30dip"
-        android:layout_height="match_parent"
-        android:layout_weight="0"
-        android:background="#ff0"
         />
     <FrameLayout
         android:id="@+id/right_pane_with_fog"
         android:layout_width="0dip"
         android:layout_height="match_parent"
-        android:layout_weight="2"
         >
         <fragment
             android:name="com.android.email.activity.MessageViewFragment"
@@ -63,7 +52,7 @@
             android:id="@+id/fogged_glass"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="#c0ffffff"
+            android:background="@color/message_view_fogged_glass_color"
             />
     </FrameLayout>
 </com.android.email.activity.ThreePaneLayout>
diff --git a/res/layout-xlarge-land/account_setup_basics.xml b/res/layout-xlarge-land/account_setup_basics.xml
index 2b2e858..70402bc 100644
--- a/res/layout-xlarge-land/account_setup_basics.xml
+++ b/res/layout-xlarge-land/account_setup_basics.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Large-screen holder - landscape - see layout/ for small-screen version -->
+<!-- Account setup - XL - landscape - see layout/ for small-screen version -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/layout-xlarge-land/account_setup_exchange.xml b/res/layout-xlarge-land/account_setup_exchange.xml
new file mode 100644
index 0000000..8f201bd
--- /dev/null
+++ b/res/layout-xlarge-land/account_setup_exchange.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Exchange Setup - XL - landscape - see layout/ for small-screen version -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="16dip"
+    android:paddingLeft="96dip"
+    android:paddingRight="96dip"
+    >
+
+    <!-- Headline and hairline divider -->
+    <TextView
+        android:id="@+id/headline"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="16dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/account_setup_exchange_headline"
+        android:textAppearance="@style/accountSetupHeadline" />
+
+    <View
+        android:id="@+id/top_divider"
+        android:layout_below="@+id/headline"
+        android:layout_marginBottom="16dip"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/account_setup_divider_color" />
+
+    <!-- Buttons on the right -->
+    <Button
+        android:id="@+id/previous"
+        android:layout_below="@+id/top_divider"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="32dip"
+        android:layout_marginRight="16dip"
+        style="@style/accountSetupButton"
+        android:text="@string/previous_action" />
+    <Button
+        android:id="@+id/next"
+        android:layout_below="@+id/previous"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="32dip"
+        android:layout_marginRight="16dip"
+        style="@style/accountSetupButton"
+        android:text="@string/next_action" />
+
+    <!-- Fragment on the left containing the setup info -->
+    <fragment
+        android:id="@+id/setup_fragment"
+        class="com.android.email.activity.setup.AccountSetupExchangeFragment"
+        android:layout_below="@+id/top_divider"
+        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@+id/next"
+        android:layout_marginRight="64dip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+</RelativeLayout>
diff --git a/res/layout-xlarge-land/account_setup_incoming.xml b/res/layout-xlarge-land/account_setup_incoming.xml
new file mode 100644
index 0000000..79e13b9
--- /dev/null
+++ b/res/layout-xlarge-land/account_setup_incoming.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Incoming setup - XL - landscape - see layout/ for small-screen version -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="16dip"
+    android:paddingLeft="96dip"
+    android:paddingRight="96dip"
+    >
+
+    <!-- Headline and hairline divider -->
+    <TextView
+        android:id="@+id/headline"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="16dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/account_setup_incoming_headline"
+        android:textAppearance="@style/accountSetupHeadline" />
+
+    <View
+        android:id="@+id/top_divider"
+        android:layout_below="@+id/headline"
+        android:layout_marginBottom="16dip"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/account_setup_divider_color" />
+
+    <!-- Buttons on the right -->
+    <Button
+        android:id="@+id/previous"
+        android:layout_below="@+id/top_divider"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="32dip"
+        android:layout_marginRight="16dip"
+        style="@style/accountSetupButton"
+        android:text="@string/previous_action" />
+    <Button
+        android:id="@+id/next"
+        android:layout_below="@+id/previous"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="32dip"
+        android:layout_marginRight="16dip"
+        style="@style/accountSetupButton"
+        android:text="@string/next_action" />
+
+    <!-- Fragment on the left containing the setup info -->
+    <fragment
+        android:id="@+id/setup_fragment"
+        class="com.android.email.activity.setup.AccountSetupIncomingFragment"
+        android:layout_below="@+id/top_divider"
+        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@+id/next"
+        android:layout_marginRight="64dip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+</RelativeLayout>
diff --git a/res/layout-xlarge-land/account_setup_names.xml b/res/layout-xlarge-land/account_setup_names.xml
index 9e3fedb..015a754 100644
--- a/res/layout-xlarge-land/account_setup_names.xml
+++ b/res/layout-xlarge-land/account_setup_names.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Large-screen format - landscape - see layout/ for small-screen version -->
+<!-- Account Names - XL - landscape - see layout/ for small-screen version -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/layout-xlarge-land/account_setup_options.xml b/res/layout-xlarge-land/account_setup_options.xml
index c93f52c..2e0cd01 100644
--- a/res/layout-xlarge-land/account_setup_options.xml
+++ b/res/layout-xlarge-land/account_setup_options.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Large-screen holder - landscape - see layout/ for small-screen version -->
+<!-- Account Options - XL - landscape - see layout/ for small-screen version -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -61,7 +61,6 @@
 
     <!-- Layout on the left containing the setup info -->
     <RelativeLayout
-        android:id="@+id/setup_basics_fragment"
         android:layout_below="@+id/top_divider"
         android:layout_alignParentLeft="true"
         android:layout_toLeftOf="@+id/next"
diff --git a/res/layout-xlarge-land/account_setup_outgoing.xml b/res/layout-xlarge-land/account_setup_outgoing.xml
new file mode 100644
index 0000000..4d0de1c
--- /dev/null
+++ b/res/layout-xlarge-land/account_setup_outgoing.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Outgoing Setup - XL - landscape - see layout/ for small-screen version -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="16dip"
+    android:paddingLeft="96dip"
+    android:paddingRight="96dip"
+    >
+
+    <!-- Headline and hairline divider -->
+    <TextView
+        android:id="@+id/headline"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="16dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/account_setup_outgoing_headline"
+        android:textAppearance="@style/accountSetupHeadline" />
+
+    <View
+        android:id="@+id/top_divider"
+        android:layout_below="@+id/headline"
+        android:layout_marginBottom="16dip"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/account_setup_divider_color" />
+
+    <!-- Buttons on the right -->
+    <Button
+        android:id="@+id/previous"
+        android:layout_below="@+id/top_divider"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="32dip"
+        android:layout_marginRight="16dip"
+        style="@style/accountSetupButton"
+        android:text="@string/previous_action" />
+    <Button
+        android:id="@+id/next"
+        android:layout_below="@+id/previous"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="32dip"
+        android:layout_marginRight="16dip"
+        style="@style/accountSetupButton"
+        android:text="@string/next_action" />
+
+    <!-- Fragment on the left containing the setup info -->
+    <fragment
+        android:id="@+id/setup_fragment"
+        class="com.android.email.activity.setup.AccountSetupOutgoingFragment"
+        android:layout_below="@+id/top_divider"
+        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@+id/next"
+        android:layout_marginRight="64dip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+</RelativeLayout>
diff --git a/res/layout-xlarge-port/account_setup_basics.xml b/res/layout-xlarge-port/account_setup_basics.xml
index 4a24051..6e85b06 100644
--- a/res/layout-xlarge-port/account_setup_basics.xml
+++ b/res/layout-xlarge-port/account_setup_basics.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Large-screen holder - portrait - see layout/ for small-screen version -->
+<!-- Account setup - XL - portrait - see layout/ for small-screen version -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -57,15 +57,15 @@
     <Button
         android:id="@+id/manual_setup"
         android:layout_below="@+id/setup_basics_fragment"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="48dip"
+        android:layout_alignParentLeft="true"
         style="@style/accountSetupButton"
         android:text="@string/account_setup_basics_manual_setup_action" />
     <Button
         android:id="@+id/next"
-        android:layout_below="@+id/manual_setup"
-        android:layout_centerHorizontal="true"
+        android:layout_below="@+id/setup_basics_fragment"
         android:layout_marginTop="48dip"
+        android:layout_alignParentRight="true"
         style="@style/accountSetupButton"
         android:text="@string/next_action" />
 
diff --git a/res/layout-xlarge-port/account_setup_exchange.xml b/res/layout-xlarge-port/account_setup_exchange.xml
new file mode 100644
index 0000000..9d833dc
--- /dev/null
+++ b/res/layout-xlarge-port/account_setup_exchange.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Exchange Setup - XL - portrait - see layout/ for small-screen version -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="16dip"
+    android:paddingLeft="96dip"
+    android:paddingRight="96dip"
+    >
+
+    <!-- Headline and hairline divider -->
+    <TextView
+        android:id="@+id/headline"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="16dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/account_setup_exchange_headline"
+        android:textAppearance="@style/accountSetupHeadline" />
+
+    <View
+        android:id="@+id/top_divider"
+        android:layout_below="@+id/headline"
+        android:layout_marginBottom="16dip"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/account_setup_divider_color" />
+
+    <!-- Fragment on the top containing the setup info -->
+    <fragment
+        android:id="@+id/setup_fragment"
+        class="com.android.email.activity.setup.AccountSetupExchangeFragment"
+        android:layout_below="@+id/top_divider"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="96dip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+
+    <!-- Buttons below -->
+    <Button
+        android:id="@+id/previous"
+        android:layout_below="@+id/setup_fragment"
+        android:layout_marginTop="48dip"
+        android:layout_alignParentLeft="true"
+        style="@style/accountSetupButton"
+        android:text="@string/previous_action" />
+    <Button
+        android:id="@+id/next"
+        android:layout_below="@+id/setup_fragment"
+        android:layout_marginTop="48dip"
+        android:layout_alignParentRight="true"
+        style="@style/accountSetupButton"
+        android:text="@string/next_action" />
+
+</RelativeLayout>
diff --git a/res/layout-xlarge-port/account_setup_incoming.xml b/res/layout-xlarge-port/account_setup_incoming.xml
new file mode 100644
index 0000000..4529b82
--- /dev/null
+++ b/res/layout-xlarge-port/account_setup_incoming.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Incoming setup - XL - portrait - see layout/ for small-screen version -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="16dip"
+    android:paddingLeft="96dip"
+    android:paddingRight="96dip"
+    >
+
+    <!-- Headline and hairline divider -->
+    <TextView
+        android:id="@+id/headline"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="16dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/account_setup_incoming_headline"
+        android:textAppearance="@style/accountSetupHeadline" />
+
+    <View
+        android:id="@+id/top_divider"
+        android:layout_below="@+id/headline"
+        android:layout_marginBottom="16dip"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/account_setup_divider_color" />
+
+    <!-- Fragment on the top containing the setup info -->
+    <fragment
+        android:id="@+id/setup_fragment"
+        class="com.android.email.activity.setup.AccountSetupIncomingFragment"
+        android:layout_below="@+id/top_divider"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="96dip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+
+    <!-- Buttons below -->
+    <Button
+        android:id="@+id/previous"
+        android:layout_below="@+id/setup_fragment"
+        android:layout_marginTop="48dip"
+        android:layout_alignParentLeft="true"
+        style="@style/accountSetupButton"
+        android:text="@string/previous_action" />
+    <Button
+        android:id="@+id/next"
+        android:layout_below="@+id/setup_fragment"
+        android:layout_marginTop="48dip"
+        android:layout_alignParentRight="true"
+        style="@style/accountSetupButton"
+        android:text="@string/next_action" />
+
+</RelativeLayout>
diff --git a/res/layout-xlarge-port/account_setup_names.xml b/res/layout-xlarge-port/account_setup_names.xml
index cea5685..0b9b2e0 100644
--- a/res/layout-xlarge-port/account_setup_names.xml
+++ b/res/layout-xlarge-port/account_setup_names.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Large-screen format - portrait - see layout/ for small-screen version -->
+<!-- Account Names - XL - portrait - see layout/ for small-screen version -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -87,8 +87,8 @@
     <Button
         android:id="@+id/next"
         android:layout_below="@+id/names_layout"
-        android:layout_centerHorizontal="true"
         android:layout_marginTop="48dip"
+        android:layout_alignParentRight="true"
         style="@style/accountSetupButton"
         android:text="@string/next_action" />
 
diff --git a/res/layout-xlarge-port/account_setup_options.xml b/res/layout-xlarge-port/account_setup_options.xml
index a64cd56..3ac5d9b 100644
--- a/res/layout-xlarge-port/account_setup_options.xml
+++ b/res/layout-xlarge-port/account_setup_options.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Large-screen holder - portrait - see layout/ for small-screen version -->
+<!-- Account Options - XL - portrait - see layout/ for small-screen version -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -43,7 +43,7 @@
 
     <!-- Layout on the top containing the setup info -->
     <RelativeLayout
-        android:id="@+id/setup_basics_fragment"
+        android:id="@+id/setup_options_section"
         android:layout_below="@+id/top_divider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -180,14 +180,14 @@
     <!-- Buttons below -->
     <Button
         android:id="@+id/previous"
-        android:layout_below="@+id/setup_basics_fragment"
+        android:layout_below="@+id/setup_options_section"
         android:layout_marginTop="48dip"
         android:layout_alignParentLeft="true"
         style="@style/accountSetupButton"
         android:text="@string/previous_action" />
     <Button
         android:id="@+id/next"
-        android:layout_below="@+id/setup_basics_fragment"
+        android:layout_below="@+id/setup_options_section"
         android:layout_marginTop="48dip"
         android:layout_alignParentRight="true"
         style="@style/accountSetupButton"
diff --git a/res/layout-xlarge-port/account_setup_outgoing.xml b/res/layout-xlarge-port/account_setup_outgoing.xml
new file mode 100644
index 0000000..1811f4c
--- /dev/null
+++ b/res/layout-xlarge-port/account_setup_outgoing.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Outgoing Setup - XL - portrait - see layout/ for small-screen version -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="16dip"
+    android:paddingLeft="96dip"
+    android:paddingRight="96dip"
+    >
+
+    <!-- Headline and hairline divider -->
+    <TextView
+        android:id="@+id/headline"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="16dip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/account_setup_outgoing_headline"
+        android:textAppearance="@style/accountSetupHeadline" />
+
+    <View
+        android:id="@+id/top_divider"
+        android:layout_below="@+id/headline"
+        android:layout_marginBottom="16dip"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/account_setup_divider_color" />
+
+    <!-- Fragment on the top containing the setup info -->
+    <fragment
+        android:id="@+id/setup_fragment"
+        class="com.android.email.activity.setup.AccountSetupOutgoingFragment"
+        android:layout_below="@+id/top_divider"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="96dip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+
+    <!-- Buttons below -->
+    <Button
+        android:id="@+id/previous"
+        android:layout_below="@+id/setup_fragment"
+        android:layout_marginTop="48dip"
+        android:layout_alignParentLeft="true"
+        style="@style/accountSetupButton"
+        android:text="@string/previous_action" />
+    <Button
+        android:id="@+id/next"
+        android:layout_below="@+id/setup_fragment"
+        android:layout_marginTop="48dip"
+        android:layout_alignParentRight="true"
+        style="@style/accountSetupButton"
+        android:text="@string/next_action" />
+
+</RelativeLayout>
diff --git a/res/layout-xlarge/account_setup_account_type.xml b/res/layout-xlarge/account_setup_account_type.xml
index 22469b7..beedb02 100644
--- a/res/layout-xlarge/account_setup_account_type.xml
+++ b/res/layout-xlarge/account_setup_account_type.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Large-screen version - see layout/ for small-screen version -->
+<!-- Account-type picker - xlarge - see layout/ for small-screen version -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
diff --git a/res/layout-xlarge/account_setup_exchange_fragment.xml b/res/layout-xlarge/account_setup_exchange_fragment.xml
new file mode 100644
index 0000000..53ccb29
--- /dev/null
+++ b/res/layout-xlarge/account_setup_exchange_fragment.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Exchange server settings - xlarge - see layout/ for phone UX variant -->
+<!-- TODO add back styles for final appearance -->
+<TableLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dip"
+    android:layout_marginLeft="16dip"
+    android:layout_marginRight="96dip"
+    android:stretchColumns="1" >
+
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_exchange_username_label" />
+        <EditText
+            android:id="@+id/account_username"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textEmailAddress"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_incoming_password_label" />
+        <EditText
+            android:id="@+id/account_password"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_exchange_server_label" />
+        <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
+        <EditText
+            android:id="@+id/account_server"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textUri"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <!-- Note, this row is not a TableRow, and it will span the entire table - no columns -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dip"
+        android:orientation="vertical" >
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/account_setup_divider_color" />
+        <CheckBox
+            android:id="@+id/account_ssl"
+            android:layout_marginTop="16dip"
+            android:layout_marginBottom="16dip"
+            android:layout_marginLeft="32dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/account_setup_exchange_ssl_label" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/account_setup_divider_color" />
+    </LinearLayout>
+    <!-- Note, this row is not a TableRow, and it will span the entire table - no columns -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+        <CheckBox
+            android:id="@+id/account_trust_certificates"
+            android:layout_marginTop="16dip"
+            android:layout_marginBottom="16dip"
+            android:layout_marginLeft="32dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/account_setup_exchange_trust_certificates_label"
+            android:visibility="gone" />
+        <View
+            android:id="@+id/account_trust_certificates_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/account_setup_divider_color"
+            android:visibility="gone" />
+    </LinearLayout>
+    <TableRow
+        android:paddingTop="32dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_exchange_device_id_label" />
+        <!-- TODO - when adding back in styles, this should be slightly different (was "medium") -->
+        <TextView
+            android:id="@+id/device_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#ffbebebe" />
+    </TableRow>
+</TableLayout>
+
diff --git a/res/layout-xlarge/account_setup_incoming_fragment.xml b/res/layout-xlarge/account_setup_incoming_fragment.xml
new file mode 100644
index 0000000..d5f0780
--- /dev/null
+++ b/res/layout-xlarge/account_setup_incoming_fragment.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Incoming server settings - xlarge - see layout/ for phone UX variant -->
+<!-- TODO add back styles for final appearance -->
+<TableLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dip"
+    android:layout_marginLeft="16dip"
+    android:layout_marginRight="96dip"
+    android:stretchColumns="1" >
+
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_incoming_username_label" />
+        <EditText
+            android:id="@+id/account_username"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textEmailAddress"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_incoming_password_label" />
+        <EditText
+            android:id="@+id/account_password"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <TableRow
+        android:paddingTop="16dip" >
+        <!-- This text may be changed in code if the server is IMAP, etc. -->
+        <TextView
+            android:id="@+id/account_server_label"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_incoming_pop_server_label" />
+        <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
+        <EditText
+            android:id="@+id/account_server"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textUri"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_incoming_security_label" />
+        <Spinner
+            android:id="@+id/account_security_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </TableRow>
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_incoming_port_label" />
+        <EditText
+            android:id="@+id/account_port"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="number"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:id="@+id/account_delete_policy_label"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_incoming_delete_policy_label" />
+        <Spinner
+            android:id="@+id/account_delete_policy"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </TableRow>
+    <TableRow
+        android:id="@+id/imap_path_prefix_section"
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_incoming_imap_path_prefix_label" />
+        <EditText
+            android:id="@+id/imap_path_prefix"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="@string/account_setup_incoming_imap_path_prefix_hint"
+            android:inputType="text"
+            android:imeOptions="actionDone" />
+    </TableRow>
+</TableLayout>
+
diff --git a/res/layout-xlarge/account_setup_outgoing_fragment.xml b/res/layout-xlarge/account_setup_outgoing_fragment.xml
new file mode 100644
index 0000000..c08e593
--- /dev/null
+++ b/res/layout-xlarge/account_setup_outgoing_fragment.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Incoming server settings - xlarge - see layout/ for phone UX variant -->
+<!-- TODO add back styles for final appearance -->
+<TableLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="16dip"
+    android:layout_marginLeft="16dip"
+    android:layout_marginRight="96dip"
+    android:stretchColumns="1" >
+
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_outgoing_smtp_server_label" />
+        <!-- Note: we use inputType=textUri as the closest approximation to a server name -->
+        <EditText
+            android:id="@+id/account_server"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textUri"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_outgoing_security_label" />
+        <Spinner
+            android:id="@+id/account_security_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+    </TableRow>
+    <TableRow
+        android:paddingTop="16dip" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_outgoing_port_label" />
+        <EditText
+            android:id="@+id/account_port"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="number"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <!-- Note, this row is not a TableRow, and it will span the entire table - no columns -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dip"
+        android:orientation="vertical" >
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/account_setup_divider_color" />
+        <CheckBox
+            android:id="@+id/account_require_login"
+            android:layout_marginTop="16dip"
+            android:layout_marginBottom="16dip"
+            android:layout_marginLeft="32dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/account_setup_outgoing_require_login_label" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/account_setup_divider_color" />
+    </LinearLayout>
+    <TableRow
+        android:id="@+id/account_require_login_settings"
+        android:paddingTop="16dip"
+        android:visibility="gone" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_outgoing_username_label" />
+        <EditText
+            android:id="@+id/account_username"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textEmailAddress"
+            android:imeOptions="actionDone" />
+    </TableRow>
+    <TableRow
+        android:id="@+id/account_require_login_settings_2"
+        android:paddingTop="16dip"
+        android:visibility="gone" >
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginRight="16dip"
+            android:text="@string/account_setup_outgoing_password_label" />
+        <EditText
+            android:id="@+id/account_password"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword"
+            android:imeOptions="actionDone" />
+    </TableRow>
+</TableLayout>
diff --git a/res/layout-xlarge/action_bar_current_mailbox.xml b/res/layout-xlarge/action_bar_current_mailbox.xml
new file mode 100644
index 0000000..3d77f2a
--- /dev/null
+++ b/res/layout-xlarge/action_bar_current_mailbox.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!--
+    Custom view set to the action bar on 2-pane.
+    Displays the current mailbox and the unread count.
+-->
+<!-- STOPSHIP not pixel perfect yet -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="fill_parent"
+    android:paddingBottom="12dip"
+    android:paddingLeft="12dip"
+    android:paddingRight="12dip"
+    android:orientation="horizontal"
+    >
+    <TextView
+        android:id="@+id/mailbox_name"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:textSize="18dip"
+        android:textColor="#000"
+        android:gravity="bottom"
+        android:singleLine="true"
+        android:ellipsize="none"
+        />
+    <TextView
+        android:id="@+id/unread_count"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="12dip"
+        android:textSize="14dip"
+        android:textColor="#000"
+        android:gravity="bottom"
+        android:singleLine="true"
+        android:ellipsize="none"
+        />
+</LinearLayout>
diff --git a/res/layout-xlarge/message_compose.xml b/res/layout-xlarge/message_compose.xml
index 077e471..57100ff 100644
--- a/res/layout-xlarge/message_compose.xml
+++ b/res/layout-xlarge/message_compose.xml
@@ -50,7 +50,6 @@
                 <TextView
                     android:id="@+id/from"
                     style="@style/message_compose_header_field_value"
-                    android:text="@string/message_compose_from_label"
                     />
             </LinearLayout>
 
@@ -65,6 +64,8 @@
                 <com.android.email.activity.AddressTextView
                     android:id="@+id/to"
                     style="@style/message_compose_header_field_value"
+                    android:inputType="textEmailAddress|textMultiLine"
+                    android:imeOptions="actionNext"
                     />
             </LinearLayout>
 
@@ -86,6 +87,8 @@
                     <com.android.email.activity.AddressTextView
                         android:id="@+id/cc"
                         style="@style/message_compose_header_field_value"
+                        android:inputType="textEmailAddress|textMultiLine"
+                        android:imeOptions="actionNext"
                         />
                 </LinearLayout>
 
@@ -100,6 +103,8 @@
                     <com.android.email.activity.AddressTextView
                         android:id="@+id/bcc"
                         style="@style/message_compose_header_field_value"
+                        android:inputType="textEmailAddress|textMultiLine"
+                        android:imeOptions="actionNext"
                         />
                 </LinearLayout>
             </LinearLayout>
@@ -115,6 +120,9 @@
                 <EditText
                     android:id="@+id/subject"
                     style="@style/message_compose_header_field_value"
+                    android:inputType
+                        ="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine"
+                    android:imeOptions="actionNext"
                     />
             </LinearLayout>
 
@@ -153,56 +161,57 @@
                 />
 
             <!--  quoted text bar -->
-            <RelativeLayout
+            <LinearLayout
                 android:id="@+id/quoted_text_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:paddingTop="4dip"
                 android:paddingBottom="4dip"
                 >
                 <View
-                    id="@+id/topDivider"
+                    android:layout_width="match_parent"
                     android:layout_alignParentTop="true"
-                    style="@style/message_compose_divider"
+                    style="@style/horizontalDivider"
                     />
+                <LinearLayout
+                    android:orientation="horizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    >
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:layout_gravity="left|center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="?android:attr/textColorSecondaryInverse"
+                        android:text="@string/message_compose_quoted_text_label"
+                        />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_gravity="right|center_vertical"
+                        android:gravity="right|center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:textColor="?android:attr/textColorSecondaryInverse"
+                        android:text="@string/message_compose_include_quoted_text_checkbox_label"
+                        />
+                    <CheckBox
+                        android:id="@+id/include_quoted_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:layout_gravity="center"
+                        />
+                </LinearLayout>
                 <View
-                    id="@+id/bottomDivider"
+                    android:layout_width="match_parent"
                     android:layout_alignParentBottom="true"
-                    style="@style/message_compose_divider"
+                    style="@style/horizontalDivider"
                     />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_below="@id/topDivider"
-                    android:layout_above="@id/bottomDivider"
-                    android:layout_centerVertical="true"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
-                    android:text="@string/message_compose_quoted_text_label"
-                    />
-                <CheckBox
-                    android:id="@+id/include_quoted_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_below="@id/topDivider"
-                    android:layout_above="@id/bottomDivider"
-                    android:layout_centerVertical="true"
-                    />
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toLeftOf="@id/include_quoted_text"
-                    android:layout_below="@id/topDivider"
-                    android:layout_above="@id/bottomDivider"
-                    android:layout_centerVertical="true"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:textColor="?android:attr/textColorSecondaryInverse"
-                    android:text="@string/message_compose_include_quoted_text_checkbox_label"
-                    />
-            </RelativeLayout>
-
+            </LinearLayout>
             <!--
                 Quoted text
                 TODO: Don't put a webview in a scroll view.
diff --git a/res/layout-xlarge/message_list_item.xml b/res/layout-xlarge/message_list_item.xml
deleted file mode 100644
index 7dcd7fb..0000000
--- a/res/layout-xlarge/message_list_item.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 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.
--->
-
-<!-- xlarge -->
-
-<!-- extends RelativeLayout  -->
-<com.android.email.activity.MessageListItem
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:background="?android:attr/activatedBackgroundIndicator"
-    >
-    <View
-        android:id="@+id/chip"
-        android:background="@drawable/appointment_indicator_leftside_1"
-        android:layout_width="4dip"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        />
-    <ImageView
-        android:id="@+id/selected"
-        android:layout_toRightOf="@id/chip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:paddingLeft="24dip"
-        android:paddingRight="24dip"
-        />
-    <ImageView
-        android:id="@+id/favorite"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:paddingLeft="24dip"
-        android:paddingRight="24dip"
-        />
-    <TextView
-        android:id="@+id/from"
-        android:layout_toRightOf="@id/selected"
-        android:layout_width="80dip"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        />
-    <TextView
-        android:id="@+id/date"
-        android:layout_toLeftOf="@id/favorite"
-        android:layout_width="80dip"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="0dip"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        />
-    <ImageView
-        android:id="@+id/icon_invite"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/date"
-        android:layout_marginLeft="4dip"
-        android:layout_marginRight="4dip"
-        android:layout_centerVertical="true"
-        android:src="@drawable/ic_calendar_event_small"
-        android:visibility="gone"
-        />
-    <ImageView
-        android:id="@+id/icon_attachment"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/icon_invite"
-        android:layout_marginLeft="4dip"
-        android:layout_marginRight="4dip"
-        android:layout_centerVertical="true"
-        android:src="@drawable/ic_mms_attachment_small"
-        android:visibility="gone"
-        />
-    <TextView
-        android:id="@+id/subject"
-        android:layout_toRightOf="@id/from"
-        android:layout_toLeftOf="@id/icon_attachment"
-        android:layout_width="80dip"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="12dip"
-        android:layout_marginTop="12dip"
-        android:layout_marginRight="24dip"
-        android:layout_marginLeft="24dip"
-        android:layout_centerVertical="true"
-        />
-</com.android.email.activity.MessageListItem>
diff --git a/res/layout-xlarge/message_view_fragment.xml b/res/layout-xlarge/message_view_fragment.xml
new file mode 100644
index 0000000..c794dbd
--- /dev/null
+++ b/res/layout-xlarge/message_view_fragment.xml
@@ -0,0 +1,372 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- xlarge -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ffffffff"
+    >
+    <!-- Subject -->
+    <TextView
+        android:id="@+id/subject"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="30dip"
+        android:layout_marginLeft="30dip"
+        android:layout_marginRight="30dip"
+        android:singleLine="false"
+        android:ellipsize="none"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textColor="?android:attr/textColorPrimary"
+        />
+
+    <!-- Horizontal line below subject -->
+    <View
+        android:id="@+id/top_divider"
+        android:layout_width="0dip"
+        android:layout_below="@id/subject"
+        android:layout_alignLeft="@id/subject"
+        android:layout_alignRight="@id/subject"
+        android:layout_marginTop="8dip"
+        android:layout_marginBottom="16dip"
+        style="@style/horizontalDivider"
+        />
+
+    <!-- Badge -->
+    <ImageView
+        android:id="@+id/badge"
+        android:layout_width="60dip"
+        android:layout_height="60dip"
+        android:layout_gravity="center_vertical"
+        android:layout_alignTop="@id/top_divider"
+        android:layout_alignLeft="@id/subject"
+        />
+
+    <!-- Presence icon -->
+    <ImageView
+        android:id="@+id/presence"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/top_divider"
+        android:layout_toRightOf="@id/badge"
+        android:layout_marginLeft="16dip"
+        android:layout_marginRight="12dip"
+        android:src="@drawable/presence_inactive"
+        android:background="@drawable/quickcontact_presence_bg"
+        />
+    <!--
+        reply, reply-all, forward, Star
+        They can all be gone; don't refer to them from other views.  Instead refer to this outer
+        layout.
+    -->
+    <LinearLayout
+        android:id="@+id/forward_reply_buttons"
+        android:layout_width="wrap_content"
+        android:layout_height="24dip"
+        android:layout_alignRight="@id/subject"
+        android:layout_below="@id/top_divider"
+        android:orientation="horizontal"
+        >
+        <ImageView
+            android:id="@+id/reply"
+            android:layout_width="32dip"
+            android:layout_height="match_parent"
+            android:layout_marginRight="16dip"
+            android:layout_marginLeft="16dip"
+            android:src="@drawable/reply"
+            android:visibility="gone"
+            />
+        <ImageView
+            android:id="@+id/reply_all"
+            android:layout_width="32dip"
+            android:layout_height="match_parent"
+            android:layout_marginRight="16dip"
+            android:layout_marginLeft="16dip"
+            android:src="@drawable/reply_all"
+            android:visibility="gone"
+            />
+        <ImageView
+            android:id="@+id/forward"
+            android:layout_width="32dip"
+            android:layout_height="match_parent"
+            android:layout_marginRight="16dip"
+            android:layout_marginLeft="16dip"
+            android:src="@drawable/forward"
+            android:visibility="gone"
+            />
+        <ImageView
+            android:id="@+id/favorite"
+            android:layout_width="32dip"
+            android:layout_height="match_parent"
+            android:layout_marginRight="16dip"
+            android:layout_marginLeft="16dip"
+            android:src="@drawable/btn_star_big_buttonless_off"
+            android:visibility="gone"
+            />
+     </LinearLayout>
+
+    <!-- Sender display name -->
+    <TextView
+        android:id="@+id/from_name"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/top_divider"
+        android:layout_toRightOf="@id/presence"
+        android:layout_toLeftOf="@id/forward_reply_buttons"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/textColorPrimary"
+        android:singleLine="true"
+        android:ellipsize="end"
+        />
+
+    <!-- From address -->
+    <TextView
+        android:id="@+id/from_address"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@id/presence"
+        android:layout_below="@id/presence"
+        android:layout_toLeftOf="@id/forward_reply_buttons"
+        android:layout_marginTop="2dip"
+        android:layout_marginBottom="8dip"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:singleLine="true"
+        android:ellipsize="end"
+        android:paddingRight="6dip"
+        />
+
+    <!-- To: and timestamp  -->
+    <TextView
+        android:id="@+id/datetime"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/from_address"
+        android:layout_alignRight="@id/subject"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:singleLine="true"
+        />
+
+    <TextView
+        android:id="@+id/to_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/datetime"
+        android:layout_alignLeft="@id/from_address"
+        android:layout_marginRight="4dip"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:singleLine="true"
+        android:text="@string/message_compose_to_label"
+        />
+
+    <TextView
+        android:id="@+id/to"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/datetime"
+        android:layout_toRightOf="@id/to_label"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:singleLine="true"
+        />
+
+    <!-- Cc -->
+    <LinearLayout
+        android:id="@+id/cc_container"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/to_label"
+        android:layout_alignLeft="@id/to_label"
+        android:layout_alignRight="@id/subject"
+        android:visibility="gone"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="4dip"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:singleLine="true"
+            android:text="@string/message_compose_cc_label"
+            />
+        <TextView
+            android:id="@+id/cc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:singleLine="true"
+            android:ellipsize="end"
+            />
+    </LinearLayout>
+
+    <!-- Bcc -->
+    <LinearLayout
+        android:id="@+id/bcc_container"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/cc_container"
+        android:layout_alignLeft="@id/to_label"
+        android:layout_alignRight="@id/subject"
+        android:visibility="gone"
+        >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="4dip"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:singleLine="true"
+            android:text="@string/message_compose_bcc_label"
+            />
+        <TextView
+            android:id="@+id/bcc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:singleLine="true"
+            android:ellipsize="end"
+            />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/below_header_divider"
+        android:layout_width="0dip"
+        android:layout_below="@id/bcc_container"
+        android:layout_alignLeft="@id/bcc_container"
+        android:layout_alignRight="@id/subject"
+        android:layout_marginTop="8dip"
+        android:layout_marginBottom="2dip"
+        style="@style/horizontalDivider"
+        />
+
+    <!--
+        The rest: tab + body + command buttons.  Use LinearLayout to easily hide part of them.
+    -->
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="0dip"
+        android:layout_below="@id/below_header_divider"
+        android:layout_alignLeft="@id/below_header_divider"
+        android:layout_alignRight="@id/below_header_divider"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical"
+        >
+        <!-- Tabs -->
+        <LinearLayout
+            android:id="@+id/message_tabs_section"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingLeft="6dip"
+            android:paddingRight="6dip"
+            android:paddingTop="6dip"
+            android:paddingBottom="6dip"
+            >
+            <Button
+                android:id="@+id/show_message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/message_view_show_message_action"
+                />
+            <Button
+                android:id="@+id/show_invite"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/message_view_show_invite_action"
+                />
+            <Button
+                android:id="@+id/show_attachments"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                />
+            <!-- filler -->
+            <View
+                android:layout_width="0dip"
+                android:layout_height="0dip"
+                android:layout_weight="1"
+                />
+            <Button
+                android:id="@+id/show_pictures"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/message_view_show_pictures_action"
+                />
+        </LinearLayout>
+
+        <!-- content area - only one of them is visible at a time -->
+        <!-- Message body -->
+        <WebView
+            android:id="@+id/message_content"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:background="#ffffffff"
+            android:visibility="gone"
+            />
+
+        <!-- Invite: Even though this section is only for MessageViewFragment,
+             Its visibility is controlled by MessageViewFragmentBase for simplicity.
+             MessageFileViewFragment shouldn't touch this. -->
+        <ScrollView
+            android:id="@+id/invite_scroll"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:visibility="gone"
+            >
+            <include layout="@layout/message_view_invitation" />
+        </ScrollView>
+
+        <!-- Attachments -->
+        <ScrollView
+            android:id="@+id/attachments_scroll"
+            android:layout_width="match_parent"
+            android:layout_height="0dip"
+            android:layout_weight="1"
+            android:visibility="gone"
+            >
+            <LinearLayout
+                android:id="@+id/attachments"
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="4dip"
+                android:background="#ffffff"
+                />
+        </ScrollView>
+
+        <!-- Buttons at the bottom.
+             Only MessageViewFragment uses these. MessageFileViewFragment doesn't. -->
+        <include
+            layout="@layout/message_command_button_view"
+            android:id="@+id/message_command_buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index 283d772..473a78d 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -41,14 +41,14 @@
         <Button
             android:id="@+id/manual_setup"
             android:layout_below="@+id/setup_basics_fragment"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="32dip"
+            android:layout_alignParentLeft="true"
+            android:layout_marginTop="16dip"
             style="@style/accountSetupButton"
             android:text="@string/account_setup_basics_manual_setup_action" />
         <Button
             android:id="@+id/next"
-            android:layout_below="@+id/manual_setup"
-            android:layout_centerHorizontal="true"
+            android:layout_below="@+id/setup_basics_fragment"
+            android:layout_alignParentRight="true"
             android:layout_marginTop="16dip"
             style="@style/accountSetupButton"
             android:text="@string/next_action" />
diff --git a/res/layout/account_setup_exchange.xml b/res/layout/account_setup_exchange.xml
index a95ecc6..33612bc 100644
--- a/res/layout/account_setup_exchange.xml
+++ b/res/layout/account_setup_exchange.xml
@@ -20,11 +20,34 @@
     android:layout_height="match_parent"
     android:fillViewport="true">
 
-    <fragment
-        android:id="@+id/setup_fragment"
-        class="com.android.email.activity.setup.AccountSetupExchangeFragment"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-    />
+        android:layout_height="wrap_content" >
+
+        <fragment
+            android:id="@+id/setup_fragment"
+            class="com.android.email.activity.setup.AccountSetupExchangeFragment"
+            android:layout_alignParentTop="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+        />
+
+        <!-- Buttons below -->
+        <!-- TODO - quick placeholder - phone UX still TBD -->
+        <Button
+            android:id="@+id/previous"
+            android:layout_below="@+id/setup_fragment"
+            android:layout_alignParentLeft="true"
+            android:layout_marginTop="16dip"
+            style="@style/accountSetupButton"
+            android:text="@string/previous_action" />
+        <Button
+            android:id="@+id/next"
+            android:layout_below="@+id/setup_fragment"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="16dip"
+            style="@style/accountSetupButton"
+            android:text="@string/next_action" />
+    </RelativeLayout>
 </ScrollView>
diff --git a/res/layout/account_setup_exchange_fragment.xml b/res/layout/account_setup_exchange_fragment.xml
index d99de91..060e6b5 100644
--- a/res/layout/account_setup_exchange_fragment.xml
+++ b/res/layout/account_setup_exchange_fragment.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 
+<!-- Exchange server settings - default - see layout-xlarge/ for XL variant -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index b8cea71..1c4fb20 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -20,11 +20,34 @@
     android:layout_height="match_parent"
     android:fillViewport="true" >
 
-    <fragment
-        android:id="@+id/setup_fragment"
-        class="com.android.email.activity.setup.AccountSetupIncomingFragment"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-    />
+        android:layout_height="wrap_content" >
+
+        <fragment
+            android:id="@+id/setup_fragment"
+            class="com.android.email.activity.setup.AccountSetupIncomingFragment"
+            android:layout_alignParentTop="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+        />
+
+        <!-- Buttons below -->
+        <!-- TODO - quick placeholder - phone UX still TBD -->
+        <Button
+            android:id="@+id/previous"
+            android:layout_below="@+id/setup_fragment"
+            android:layout_alignParentLeft="true"
+            android:layout_marginTop="16dip"
+            style="@style/accountSetupButton"
+            android:text="@string/previous_action" />
+        <Button
+            android:id="@+id/next"
+            android:layout_below="@+id/setup_fragment"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="16dip"
+            style="@style/accountSetupButton"
+            android:text="@string/next_action" />
+    </RelativeLayout>
 </ScrollView>
diff --git a/res/layout/account_setup_incoming_fragment.xml b/res/layout/account_setup_incoming_fragment.xml
index a6b09fc..7ca432c 100644
--- a/res/layout/account_setup_incoming_fragment.xml
+++ b/res/layout/account_setup_incoming_fragment.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 
+<!-- Incoming server settings - default - see layout-xlarge/ for XL variant -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/res/layout/account_setup_names.xml b/res/layout/account_setup_names.xml
index 6d84162..803c4a5 100644
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@@ -56,6 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_width="match_parent" />
 
+        <!-- TODO - quick placeholder - phone UX still TBD -->
         <Button
             android:id="@+id/next"
             android:layout_marginTop="16dip"
diff --git a/res/layout/account_setup_options.xml b/res/layout/account_setup_options.xml
index 1592db2..126c27e 100644
--- a/res/layout/account_setup_options.xml
+++ b/res/layout/account_setup_options.xml
@@ -77,6 +77,7 @@
             android:text="@string/account_setup_options_sync_email_label" />
 
         <!-- Buttons below -->
+        <!-- TODO - quick placeholder - phone UX still TBD -->
         <Button
             android:id="@+id/previous"
             android:layout_marginTop="16dip"
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index 60d8583..20e9eea 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -20,11 +20,34 @@
     android:layout_height="match_parent"
     android:fillViewport="true" >
 
-    <fragment
-        android:id="@+id/setup_fragment"
-        class="com.android.email.activity.setup.AccountSetupOutgoingFragment"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-    />
+        android:layout_height="wrap_content" >
+
+        <fragment
+            android:id="@+id/setup_fragment"
+            class="com.android.email.activity.setup.AccountSetupOutgoingFragment"
+            android:layout_alignParentTop="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+        />
+
+        <!-- Buttons below -->
+        <!-- TODO - quick placeholder - phone UX still TBD -->
+        <Button
+            android:id="@+id/previous"
+            android:layout_below="@+id/setup_fragment"
+            android:layout_alignParentLeft="true"
+            android:layout_marginTop="16dip"
+            style="@style/accountSetupButton"
+            android:text="@string/previous_action" />
+        <Button
+            android:id="@+id/next"
+            android:layout_below="@+id/setup_fragment"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="16dip"
+            style="@style/accountSetupButton"
+            android:text="@string/next_action" />
+    </RelativeLayout>
 </ScrollView>
diff --git a/res/layout/account_setup_outgoing_fragment.xml b/res/layout/account_setup_outgoing_fragment.xml
index 979d17e..22dc60f 100644
--- a/res/layout/account_setup_outgoing_fragment.xml
+++ b/res/layout/account_setup_outgoing_fragment.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 
+<!-- Outgoing server settings - default - see layout-xlarge/ for XL variant -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
diff --git a/res/layout/account_shortcut_picker.xml b/res/layout/account_shortcut_picker.xml
new file mode 100644
index 0000000..459f282
--- /dev/null
+++ b/res/layout/account_shortcut_picker.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        />
+    <!-- TODO selectableItemBackground is a placeholder for the new "cancel" style -->
+    <Button
+        android:id="@+id/cancel"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/cancel_action"
+        android:background="?android:attr/selectableItemBackground"
+        />
+</LinearLayout>
diff --git a/res/layout/account_shortcut_picker_item.xml b/res/layout/account_shortcut_picker_item.xml
new file mode 100644
index 0000000..af282c6
--- /dev/null
+++ b/res/layout/account_shortcut_picker_item.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical"
+    android:paddingRight="4dip"
+    android:paddingLeft="6dip"
+    >
+    <TextView
+        android:id="@+id/description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="?android:attr/textColorPrimary"
+        />
+    <TextView
+        android:id="@+id/email"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        />
+</LinearLayout>
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
deleted file mode 100644
index 4ef0e5f..0000000
--- a/res/layout/accounts.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
-    <LinearLayout
-        android:id="@+id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="20sp"
-            android:text="@string/accounts_welcome"
-            android:textColor="?android:attr/textColorPrimary" />
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0dip"
-            android:layout_weight="1" />
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="54dip"
-            android:background="@android:drawable/bottom_bar">
-            <Button
-                android:id="@+id/add_new_account"
-                android:layout_width="wrap_content"
-                android:minWidth="@dimen/button_minWidth"
-                android:layout_height="wrap_content"
-                android:text="@string/next_action"
-                android:drawableRight="@drawable/button_indicator_next"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true" />
-        </RelativeLayout>
-    </LinearLayout>
-</FrameLayout>
diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
deleted file mode 100644
index 1214228..0000000
--- a/res/layout/accounts_item.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:paddingRight="4dip">
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="6dip">
-        <TextView
-            android:id="@+id/description"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:attr/textColorPrimary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-        <TextView
-            android:id="@+id/email"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-    </LinearLayout>
-    <View
-        android:layout_height="match_parent"
-        android:layout_width="0dip"
-        android:layout_weight="1" />
-    <TextView
-        android:id="@+id/new_message_count"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textColor="?android:attr/textColorPrimary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@drawable/text_box_light"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:minWidth="64dip"
-        android:gravity="right" />
-</LinearLayout>
diff --git a/res/layout/mailbox_list_fragment.xml b/res/layout/mailbox_list_fragment.xml
new file mode 100644
index 0000000..6807382
--- /dev/null
+++ b/res/layout/mailbox_list_fragment.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- Wrap list_content in a frame layout to apply the top margin. -->
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="16dip"
+    >
+    <include layout="@android:layout/list_content" />
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/mailbox_list_item.xml b/res/layout/mailbox_list_item.xml
index 2aa7aa8..56e430a 100644
--- a/res/layout/mailbox_list_item.xml
+++ b/res/layout/mailbox_list_item.xml
@@ -15,12 +15,14 @@
 -->
 
 <!-- extends RelativeLayout  -->
+<!-- STOPSHIP text color pixelperfect. -->
 <com.android.email.activity.MailboxListItem
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
-    android:paddingRight="8dip"
+    android:layout_height="48dip"
     android:background="?android:attr/activatedBackgroundIndicator"
+    android:paddingLeft="@dimen/mailbox_list_padding_left"
+    android:paddingRight="@dimen/mailbox_list_padding_right"
     >
     <ImageView
         android:id="@+id/folder_icon"
@@ -28,19 +30,18 @@
         android:layout_height="32dip"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:paddingLeft="2dip"
+        android:layout_marginRight="8dip"
         />
     <TextView
         android:id="@+id/message_count"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="12dip"
         android:layout_centerVertical="true"
         android:ellipsize="end"
         android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="14dip"
+        android:textColor="#888"
         />
     <TextView
         android:id="@+id/mailbox_name"
@@ -51,7 +52,17 @@
         android:layout_centerVertical="true"
         android:ellipsize="end"
         android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="18dip"
+        android:textColor="#000"
+        />
+    <!-- Color chips are shown only for account rows on combined view. -->
+    <!-- STOPSHIP dimensions not pixelperfect. -->
+    <View
+        android:id="@+id/color_chip"
+        android:layout_width="32dip"
+        android:layout_height="8dip"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:visibility="gone"
         />
 </com.android.email.activity.MailboxListItem>
diff --git a/res/layout/message_file_view.xml b/res/layout/message_file_view.xml
index db4cdce..790f09a 100644
--- a/res/layout/message_file_view.xml
+++ b/res/layout/message_file_view.xml
@@ -14,17 +14,16 @@
      limitations under the License.
 -->
 
-<LinearLayout
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    android:background="@android:color/white"
+    >
     <fragment
         android:id="@+id/message_file_view_fragment"
         class="com.android.email.activity.MessageFileViewFragment"
         android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1"
+        android:layout_height="match_parent"
         />
-</LinearLayout>
+</FrameLayout>
diff --git a/res/layout/message_view_fragment.xml b/res/layout/message_view_fragment.xml
index a4646df..c769cf3 100644
--- a/res/layout/message_view_fragment.xml
+++ b/res/layout/message_view_fragment.xml
@@ -14,6 +14,7 @@
      limitations under the License.
 -->
 
+<!-- small -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
@@ -31,7 +32,6 @@
         android:paddingLeft="3dip"
         android:paddingRight="6dip">
         <LinearLayout
-            android:id="@+id/from_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:baselineAligned="true" >
@@ -78,13 +78,6 @@
                 android:ellipsize="end"
                 android:paddingRight="6dip"
                 />
-            <ImageView
-                android:id="@+id/attachment"
-                android:src="@drawable/ic_email_attachment_small"
-                android:layout_width="22dip"
-                android:layout_height="22dip"
-                android:baselineAlignBottom="true" />
-
             <!-- Reply/Forward buttons are default gone for MessageFileView -->
             <ImageView
                 android:id="@+id/reply"
@@ -115,7 +108,7 @@
                 />
 
             <TextView
-                android:id="@+id/date"
+                android:id="@+id/datetime"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?android:attr/textColorPrimary"
                 android:layout_width="wrap_content"
@@ -124,7 +117,6 @@
                 android:singleLine="true" />
         </LinearLayout>
         <LinearLayout
-            android:id="@+id/to_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" >
             <TextView
@@ -144,14 +136,6 @@
                 android:layout_marginLeft="4dip"
                 android:singleLine="false"
                 android:ellipsize="none" />
-            <TextView
-                android:id="@+id/time"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorPrimary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dip"
-                android:singleLine="true" />
         </LinearLayout>
         <LinearLayout
             android:id="@+id/cc_container"
diff --git a/res/drawable-hdpi/icon.png b/res/mipmap-hdpi/icon.png
similarity index 100%
rename from res/drawable-hdpi/icon.png
rename to res/mipmap-hdpi/icon.png
Binary files differ
diff --git a/res/drawable-mdpi/icon.png b/res/mipmap-mdpi/icon.png
similarity index 100%
rename from res/drawable-mdpi/icon.png
rename to res/mipmap-mdpi/icon.png
Binary files differ
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
new file mode 100644
index 0000000..08f64d5
--- /dev/null
+++ b/res/values-ar/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"جارٍ إرسال الرسائل..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"إرسال الرسائل الصادرة"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"جلب المرفق."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"جلب المرفق <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"قراءة مرفقات البريد الإلكتروني"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"للسماح لهذا التطبيق بقراءة مرفقات Email."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"الدخول إلى بيانات موفر البريد الإلكتروني"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"للسماح للتطبيق بالدخول إلى قاعدة بيانات بريدك الإلكتروني، بما في ذلك الرسائل المتلقاة، والرسائل المرسلة، وأسماء المستخدمين وكلمات المرور."</string>
+    <string name="app_name" msgid="5815426892327290362">"إرسال رسالة إلكترونية"</string>
+    <string name="compose_title" msgid="427986915662706899">"إنشاء"</string>
+    <string name="debug_title" msgid="5175710493691536719">"تصحيح الأخطاء"</string>
+    <string name="next_action" msgid="3931301986364184415">"التالي"</string>
+    <string name="okay_action" msgid="8365197396795675617">"موافق"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"إلغاء"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"إرسال"</string>
+    <string name="reply_action" msgid="4262472229221507619">"رد"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"رد على الكل"</string>
+    <string name="delete_action" msgid="8421026208288857155">"حذف"</string>
+    <string name="forward_action" msgid="669174181042344116">"إعادة توجيه"</string>
+    <string name="done_action" msgid="7497990549515580249">"تم"</string>
+    <string name="discard_action" msgid="6532206074859505968">"إلغاء"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"حفظ كمسودة"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"مقروءة/غير مقروءة"</string>
+    <string name="read_action" msgid="4701484794504781686">"وضع علامة كـ \"مقروءة\""</string>
+    <string name="unread_action" msgid="6280399049357552826">"وضع علامة كـ \"غير مقروءة\""</string>
+    <string name="favorite_action" msgid="2911296685862420689">"وضع في المُفضلة"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"إضافة نجمة"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"إزالة النجمة"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"تحديث"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"إضافة حساب"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"إلغاء تحديد الكل"</string>
+    <string name="compose_action" msgid="4045702519637388045">"إنشاء"</string>
+    <string name="search_action" msgid="6325101454876682308">"بحث"</string>
+    <string name="open_action" msgid="936766723989190816">"فتح"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"إعدادات الحساب"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"إزالة الحساب"</string>
+    <string name="folders_action" msgid="7502431531355227666">"مجلدات"</string>
+    <string name="accounts_action" msgid="901105887272231493">"الحسابات"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"وضع علامة عليها كـ \"مقروءة\""</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"تعليمها بـ \"غير مقروءة\""</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"إضافة نسخة إلى/نسخة مخفية الوجهة"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"إضافة مرفق"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"إعدادات التفريغ"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"اختيار مرفق"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"خطأ في الاتصال"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"رسالة إلكترونية جديدة"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"حدث خطأ غير متوقع أثناء تحميل نص الرسالة. ربما تكون الرسالة كبيرة جدًا بحيث لا يمكن عرضها."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> غير مقروءة (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> غير مقروءة (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> غير مقروءة (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"في عدد: <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> من الحسابات"</item>
+    <item quantity="other" msgid="2723797835410343458">"في عدد: <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> من الحسابات"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"البريد الوارد"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"البريد الصادر"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"المسودات"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"المهـملات"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"البريد المرسَل"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"البريد غير المهم"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"الإصدار: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"الحسابات"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"بريد وارد مجمّع"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"مميّزة بنجمة"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"المسودات"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"البريد الصادر"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"الرجاء الضغط لفترة طويلة على حساب لتحديثه"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"صندوق البريد"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"تحميل المزيد من الرسائل"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"إلى"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"نسخة إلى"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"نسخة مخفية الوجهة"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"الموضوع"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"إنشاء رسالة"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- الرسالة الأصلية --------"\n"الموضوع: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"من: <xliff:g id="SENDER">%2$s</xliff:g>"\n"إلى: <xliff:g id="TO">%3$s</xliff:g>"\n"نسخة إلى: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> كتَب:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"نص مقتبس"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"يلزم إضافة مستلم واحد على الأقل."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"بعض عناوين البريد الإلكتروني غير صالحة"</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"الملف كبير جدًا بحيث لا يمكن إرفاقه."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> و<xliff:g id="NUMBER">%2$d</xliff:g> أخرى"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"إلى:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"نسخة إلى:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"فتح"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"تمّ حفظ المرفق في بطاقة SD باسم <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"تعذر حفظ المرفق في بطاقة SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"إظهار الصور"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"عرض في التقويم »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"دعوة التقويم"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"هل تنوي الذهاب؟"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" نعم"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" ربما"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" لا"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"لقد قبلت هذه الدعوة"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"لقد كان ردك هو \"ربما\" على هذه الدعوة"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"لقد رفضت هذه الدعوة"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"تمّ حذف الرسالة."</item>
+    <item quantity="other" msgid="6574961322865652255">"تم حذف الرسائل."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"تمّ إلغاء الرسالة."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"تمّ حفظ الرسالة كمسودة."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"لا يمكن عرض هذا المرفق."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"إعداد البريد الإلكتروني"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"إضافة حساب Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"إضافة حساب Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"يمكنك تهيئة البريد الإلكتروني لمعظم الحسابات من خلال اتباع خطوات قليلة."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"يمكنك تهيئة حساب Exchange من خلال اتباع خطوات قليلة."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"يمكنك تهيئة حساب Exchange ActiveSync من خلال اتباع خطوات قليلة."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"إرسال الرسائل الإلكترونية من هذا الحساب افتراضيًا."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"إعداد يدوي"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"يُرجى إدخال عنوان بريد إلكتروني وكلمة مرور صالحين."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"حساب متكرر"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"تسجيل الدخول هذا قيد الاستخدام فعليًا للحساب \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"جارٍ استرداد معلومات الحساب…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"جارٍ فحص إعدادات خادم البريد الوارد…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"جارٍ فحص إعدادات خادم البريد الصادر…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"إعداد البريد الإلكتروني"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"تسمية هذا الحساب (اختياري)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"الاسم (يظهر في الرسائل الصادرة)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"إضافة حساب بريد إلكتروني جديد"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ما نوع هذا الحساب؟"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"إعدادات خادم البريد الوارد"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"اسم المستخدم"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"كلمة المرور"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"خادم POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"خادم IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"المنفذ"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"نوع الأمان"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"لا شيء"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"طبقة المقابس الآمنة (قبول جميع الشهادات)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"طبقة المقابس الآمنة"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"طبقة النقل الآمنة (قبول جميع الشهادات)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"طبقة النقل الآمنة"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"حذف البريد إلكتروني من الخادم"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"مطلقًا"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"عند الحذف من بريد الوارد"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"بادئة مسار IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"اختياري"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"إعدادات خادم البريد الصادر"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"خادم SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"المنفذ"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"نوع الأمان"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"يلزم تسجيل الدخول."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"اسم المستخدم"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"كلمة المرور"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"إعدادات الخادم"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"الخادم"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"نطاق/اسم المستخدم"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"استخدام اتصال آمن (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"قبول جميع شهادات طبقة المقابس الآمنة"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"خيارات الحساب"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"معدل الاطلاع على البريد الإلكتروني"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"مطلقًا"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"تلقائي (ضغط)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"كل 5 دقائق"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"كل 10 دقائق"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"كل 15 دقيقة"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"كل 30 دقيقة"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"كل ساعة"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"إرسال الرسائل الإلكترونية من هذا الحساب افتراضيًا."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"تنبيهي عند استلام رسالة إلكترونية."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"مزامنة جهات الاتصال من هذا الحساب."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"مزامنة التقويم من هذا الحساب أيضًا."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"تعذر إنهاء الإعداد"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"المقدار المراد مزامنته"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"يوم واحد"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"ثلاثة أيام"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"أسبوع"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"أسبوعان"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"شهر واحد"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"اسم المستخدم أو كلمة المرور غير صحيحة."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"اسم المستخدم أو كلمة المرور غير صحيحة."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"لا يمكن الاتصال بالخادم بأمان."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"لا يمكن الاتصال بالخادم بأمان."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"لا يمكن الاتصال بالخادم."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"لا يمكن الاتصال بالخادم."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"يلزم وجود TLS لكن لا يتيح الخادم استخدامه."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"لا يتيح الخادم استخدام أساليب المصادقة."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"يتعذر الاتصال بالخادم نظرًا لوقوع خطأ بالأمان."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"تعذر الاتصال بالخادم."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"التحكم عن بعد في إدارة الأمان"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"يتطلب الخادم <xliff:g id="SERVER">%s</xliff:g> أن تسمح له بالتحكم في بعض ميزات الأمان بهاتفك عن بعد. هل تريد إنهاء إعداد هذا الحساب؟"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"يتطلب هذا الخادم ميزات أمان غير معتمدة على هاتفك."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"يتطلب الحساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" تحديث إعدادات الأمان."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"تحديث إعدادات الأمان"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"أمان الجهاز"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"يتطلب الخادم <xliff:g id="SERVER">%s</xliff:g> أن تسمح له بالتحكم في بعض ميزات الأمان بهاتفك عن بعد."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"تعديل التفاصيل"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"إعدادات عامة"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"الحساب الافتراضي"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"إرسال البريد الإلكتروني من هذا الحساب افتراضيًا"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"إشعارات البريد إلكتروني"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"التنبيه في شريط الوضع عند استلام رسالة إلكترونية"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"معدل الاطلاع على البريد الإلكتروني"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"إعدادات البريد الوارد"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"إعدادات البريد الصادر"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"اسم الحساب"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"الاسم"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"التوقيع"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"إلحاق نص بالرسائل التي يتم إرسالها"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"إعدادات التنبيه"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"مزامنة جهات الاتصال"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"مزامنة التقويم من هذا الحساب أيضًا"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"مزامنة التقويم"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"مزامنة التقويم من هذا الحساب أيضًا"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"اهتزاز"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"الاهتزاز أيضًا عند استلام بريد إلكتروني"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"دومًا"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط عندما يكون صامتًا"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"مطلقًا"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"اهتزاز"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"تحديد نغمة رنين"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"إعدادات الخادم"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"إزالة الحساب"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"ستتم إزالة الحساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" من Email."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"ترقية الحسابات"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"تتعذر ترقية الحساب"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"الوصول إلى صندوق البريد غير معتمد في أنواع معينة من حسابات بريد Yahoo!. إذا كنت تواجه مشكلة في الاتصال، فالرجاء زيارة الموقع yahoo.com للحصول على المزيد من المعلومات."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"قبل إعداد حساب البريد الإلكتروني هذا، يرجى زيارة موقع ويب !Yahoo وتمكين الوصول إلى البريد الإلكتروني عبر بروتوكول POP3 لهذا الحساب."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"تتضمن بعض حسابات \"Plus\" الوصول عبر بروتوكول POP والذي يسمح لهذا البرنامج بالاتصال. إذا تعذر عليك تسجيل الدخول باستخدام عنوان البريد الإلكتروني وكلمة المرور الصحيحين، فقد تكون غير ممتلك لحساب \"Plus\" مدفوع. يُرجى تشغيل متصفح الويب لتتمكن من الدخول إلى حسابات البريد هذه."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"قبل إعداد حساب البريد الإلكتروني هذا، يُرجى زيارة موقع ويب T-Online وإنشاء كلمة مرور للوصول إلى البريد الإلكتروني عبر بروتوكول POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"الشركة"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"مقبول: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"مرفوض: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"موافقة مبدئية: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"تم الإلغاء: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"تم التحديث: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"متى: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"المكان: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"الموعد: <xliff:g id="EVENTDATE">%s</xliff:g> (متكرر)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"تم إلغاء هذا الحدث لـ: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"تم تغيير التفاصيل لهذا الحدث لـ: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"تعذر على AccountManager إنشاء الحساب؛ الرجاء المحاولة مرة أخرى."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"إرسال رسالة إلكترونية"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"لتمكين سياسات الأمان الخاصة بالخادم"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"تمت إضافة تقويم Exchange"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"جارِ البحث <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> نتيجة من <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> من النتائج من <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"أول <xliff:g id="RESULTS">%1$d</xliff:g> من النتائج من <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
new file mode 100644
index 0000000..03b33a7
--- /dev/null
+++ b/res/values-bg/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Съобщенията се изпращат"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Изпращане на изх. съобщения"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Извлича се прикачен файл."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Извлича се прикаченият файл<xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Четене на прикачени файлове в имейла"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Позволява на това приложение да чете прикачените файлове в имейла ви."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Достъп до данни на доставчика на имейл"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Дава на това приложение достъп до базата от данни на имейла ви, вкл. получени и изпратени съобщения, потребителски имена и пароли."</string>
+    <string name="app_name" msgid="5815426892327290362">"Имейл"</string>
+    <string name="compose_title" msgid="427986915662706899">"Ново съобщение"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Отстраняване на грешки"</string>
+    <string name="next_action" msgid="3931301986364184415">"Напред"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Отказ"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Изпращане"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Отговор"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Отговор до всички"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Изтриване"</string>
+    <string name="forward_action" msgid="669174181042344116">"Препращане"</string>
+    <string name="done_action" msgid="7497990549515580249">"Готово"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Отхвърляне"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Запазване като чернова"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Прочетени/Непрочетени"</string>
+    <string name="read_action" msgid="4701484794504781686">"Означаване като прочетено"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Означаване като непрочетено"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Любими"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Добавяне на звезда"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Премахване на звездата"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Опресняване"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Добавяне на профил"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Без избрани"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Ново съобщение"</string>
+    <string name="search_action" msgid="6325101454876682308">"Търсене"</string>
+    <string name="open_action" msgid="936766723989190816">"Отваряне"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Настройки на профил"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Премахване на профил"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Папки"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Профили"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Прочетено"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Непрочетено"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Добавяне на Як:/Ск:"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Добавяне на прикачен файл"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Настройки за отхвърляне"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Избор на прикачен файл"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Грешка при свързване"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Нов имейл"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Неочаквана грешка при зареждане на текст. Съобщението може да е твърде голямо за преглед."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> непрочетено (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> непрочетени (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> непрочетени (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"в <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> профила"</item>
+    <item quantity="other" msgid="2723797835410343458">"в <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> профила"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Вх. поща"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Изх. поща"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Чернови"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Кошче"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Изпратени"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Нежелана поща"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Версия: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Профили"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Комбинирана вх. поща"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Със звезда"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Чернови"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Изх. поща"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Моля, натиснете продължително профил, за да го опресните"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Пощенска кутия"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Зареждане на още съобщения"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"До"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Як"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Ск:"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Тема"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Ново съобщение"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Оригинално съобщение --------"\n"Тема: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"От: <xliff:g id="SENDER">%2$s</xliff:g>"\n"До: <xliff:g id="TO">%3$s</xliff:g>"\n"Як: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> написа:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитиран текст"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Трябва да добавите поне един получател."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Някои имейл адреси са невалидни."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файлът е твърде голям за прикачване."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> и още <xliff:g id="NUMBER">%2$d</xliff:g> други"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"До:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Як:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Отваряне"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Прикаченият файл е запазен на SD картата като <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Неуспешно запазване на прикачен файл на SD карта."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Показване на изображенията"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Преглед в Календар »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Покана в календар"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Ще присъствате ли?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Да"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Може би"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Не"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Приехте тази покана"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Отговорихте на тази покана с „Може би“"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Отклонихте тази покана"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Съобщението е изтрито."</item>
+    <item quantity="other" msgid="6574961322865652255">"Съобщенията са изтрити."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Съобщението е отхвърлено."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Съобщението е запазено като чернова."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Този прикачен файл не може да бъде показан."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройване на имейл"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавяне на нов профил от Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавяне на нов профил от Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Можете да конфигурирате имейла за повечето профили само с няколко стъпки."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Можете да конфигурирате профил от Exchange само с няколко стъпки."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Можете да конфигурирате профил от Exchange ActiveSync само с няколко стъпки."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Изпращане на имейл от този профил по подразбиране."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ръчна настройка"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Моля, въведете валиден имейл адрес и парола."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Дублиращ профил"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Тези данни за вход вече се използват за профила „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Извлича се информация за профила..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Настройките на вх. сървър се проверяват..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Настройките на изх. сървър се проверяват..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Настройване на имейл"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именуване на този профил (незадължително)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Името ви (показвано в изходящи съобщения)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Добавяне на нов имейл профил"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Какъв вид профил е това?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Настройки на вх. сървър"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Потребителско име"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Парола"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 сървър"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP сървър"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Вид защита"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Няма"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Приемане на всички сертификати)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Приемане на всички сертификати)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Изтриване на имейл от сървъра"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Никога"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"При изтриване от „Вх. поща“"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"префикс на IMAP път"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"По избор"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Настройки на изх. сървър"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP сървър"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Вид защита"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Изисква влизане в профил."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Потребителско име"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Парола"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Настройки на сървъра"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Сървър"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домейн/Потребителско име"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Използване на сигурна връзка (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Приемане на всички SSL сертификати"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Опции за профила"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Честота на проверяване за имейл"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Никога"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Автоматично („Push“)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"На всеки 5 мин"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"На всеки 10 мин"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"На всеки 15 мин"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"На всеки 30 мин"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"На всеки час"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Изпращане на имейл от този профил по подразбиране."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Известие при пристигане на имейл."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхронизиране на контактите в този профил."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхронизиране на календара в този профил."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Настройването не можа да завърши"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Количество за синхронизиране"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Един ден"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Три дни"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Една седмица"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Две седмици"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Един месец"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Неправилно потребителско име или парола."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Неправилно потребителско име или парола."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Не може да се осъществи безопасна връзка със сървъра."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Не може да се осъществи безопасна връзка със сървъра."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Не може да се осъществи връзка със сървъра."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Не може да се осъществи връзка със сървъра."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Изисква се TLS, но не се поддържа от сървъра."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Сървърът не поддържа методи за удостоверяване."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Неуспешно свързване със сървър поради грешка със сигурността."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Неуспешно свързване със сървър."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Отдалечено администриране на сигурността"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Сървърът <xliff:g id="SERVER">%s</xliff:g> изисква отдалечен контрол над някои от защитните функции на телефона ви. Искате ли да завършите настройването на този профил?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Сървърът изисква защитни функции, които телефонът ви не поддържа."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ изисква актуализация на защитните настройки."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Актуализиране на защитни настройки"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Сигурност на устройство"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Сървърът <xliff:g id="SERVER">%s</xliff:g> изисква отдалечен контрол над някои от защитните функции на телефона ви."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Редактиране на подробностите"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Общи настройки"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Основен профил"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Изпращане на имейл от този профил по подразбиране"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Известия за имейл"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Известие в лентата на състоянието при пристигане на имейл"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Честота на проверяване за имейл"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Входящи настройки"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Изходящи настройки"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Име на профила"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Името ви"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Подпис"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Прибавяне на текст към изпращаните от вас съобщения"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Настройки за известия"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Синхронизиране на контакти"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхронизиране и на контактите в този профил"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхронизиране на календар"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхронизиране и на календара в този профил"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибриране"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Да вибрира и при нов имейл"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Винаги"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само при тих режим"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никога"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибриране"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Избор на мелодия"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Настройки на сървъра"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Премахване на профил"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Профилът „<xliff:g id="ACCOUNT">%s</xliff:g>“ ще бъде премахнат от имейла."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Надстройка на профилите"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Неуспешно надстройване на профил"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Достъпът до пощенската кутия не се поддържа за някои видове профили в Yahoo!. Ако изпитвате трудности при свързване, посетете yahoo.com за повече информация."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Преди да настроите този имейл профил, моля, посетете уебсайта на Yahoo! и активирайте достъпа до имейл чрез POP3."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Само някои „Plus“ профили включват достъп чрез POP, позволявайки на тази програма да се свърже. Ако не можете да влезете с правилния си имейл адрес и парола, може да не сте платили за такъв профил. Моля, стартирайте уеб браузъра, за да получите достъп до тези пощенски профили."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Преди да настроите този имейл профил, моля, посетете уебсайта на T-Online и създайте парола за достъп до имейл чрез POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Фирмен"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Прието: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Отклонено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Колебливо: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Анулирано: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Актуализация:<xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Кога: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Къде: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Кога: <xliff:g id="EVENTDATE">%s</xliff:g> (с повторения)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Това събитие от <xliff:g id="DATE">%s</xliff:g> е анулирано"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Подробностите за това събитие са променени за: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager не можа да създаде профила. Mоля, опитайте отново."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Имейл"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Активира определени от сървъра защитни правила"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Добавен е календар от Exchange"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Търси се <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> резултат от <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> резултата от <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Първите <xliff:g id="RESULTS">%1$d</xliff:g> резултата от <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
new file mode 100644
index 0000000..5c49ff8
--- /dev/null
+++ b/res/values-ca/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"S\'estan enviant els missatges..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Envia els missatges de sortida"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"S\'està obtenint el fitxer adjunt."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"S\'està obtenint el fitxer adjunt <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Llegeix els fitxers adjunts al correu electrònic"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Permet a aquesta aplicació llegir els fitxers adjunts del correu electrònic."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Accedeix a les dades del proveïdor de correu electrònic"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Permet a aquesta aplicació accedir a la base de dades del correu electrònic, inclosos els missatges rebuts, els missatges enviats, els noms d\'usuari i les contrasenyes."</string>
+    <string name="app_name" msgid="5815426892327290362">"Correu electrònic"</string>
+    <string name="compose_title" msgid="427986915662706899">"Redacció"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Depuració"</string>
+    <string name="next_action" msgid="3931301986364184415">"Següent"</string>
+    <string name="okay_action" msgid="8365197396795675617">"D\'acord"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Cancel·la"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Envia"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Respon"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Respon a tots"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Suprimeix"</string>
+    <string name="forward_action" msgid="669174181042344116">"Reenvia"</string>
+    <string name="done_action" msgid="7497990549515580249">"Fet"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Descarta"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Anomena i desa com a esborrany"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Llegit/No llegit"</string>
+    <string name="read_action" msgid="4701484794504781686">"Marca\'l com a llegit"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Marca com a no llegit"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Preferit"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Destaca"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"No destaquis"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Actualitza"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Afegeix un compte"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Anul·la la selecció de tot"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Redacta"</string>
+    <string name="search_action" msgid="6325101454876682308">"Cerca"</string>
+    <string name="open_action" msgid="936766723989190816">"Obre"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Configuració del compte"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Elimina el compte"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Carpetes"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Comptes"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Marca com a llegit"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Marca com a no llegit"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Afegeix Cc/Cco"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Afegeix un fitxer adjunt"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Configuració d\'abocament"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Selecció d\'un fitxer adjunt"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Error de connexió"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Correu electrònic nou"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"S\'ha produït un error inesperat en carregar el text del missatge. Pot ser que el missatge sigui massa gran per visualitzar-lo."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> no llegits (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> no llegits (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> no llegits (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"a <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
+    <item quantity="other" msgid="2723797835410343458">"a <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> comptes"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Safata d\'entrada"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Bústia de sortida"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Esborranys"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Paperera"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviat"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Correu brossa"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Versió: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Comptes"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Safata d\'entrada combinada"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Destacats"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Esborranys"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Bústia de sortida"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Premeu durant una estona un compte per actualitzar-lo"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Bústia de correu"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carrega més missatges"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Per a"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cco"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Assumpte"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Redacta un missatge"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Missatge original --------"\n"Assumpte: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Per a: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha escrit:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Text citat"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Heu d\'afegir com a mínim un destinatari."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Algunes adreces electròniques no són vàlides."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"El fitxer és massa gran per adjuntar-lo."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> i <xliff:g id="NUMBER">%2$d</xliff:g> més"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Per a:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Obre"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Fitxer adjunt desat a la targeta SD com <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"No es pot desar el fitxer adjunt a la targeta SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostra les imatges"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Visualitza-ho al calendari »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Invitació al calendari"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Hi anireu?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Sí"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Potser"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" No"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Heu acceptat la invitació"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Heu respost \"potser\" a aquesta invitació"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Heu rebutjat la invitació"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Missatge suprimit."</item>
+    <item quantity="other" msgid="6574961322865652255">"Missatges suprimits."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Missatge descartat."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Missatge desat com a esborrany."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Aquest fitxer adjunt no es pot visualitzar."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuració del correu electrònic"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Afegeix un compte d\'Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Afegeix un compte d\'Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Podeu configurar el correu electrònic per a la majoria dels comptes en uns quants passos."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Podeu configurar un compte d\'Exchange en uns quants passos."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Podeu configurar un compte d\'Exchange ActiveSync en uns quants passos."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Envia correu electrònic des d\'aquest compte de manera predeterminada."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuració manual"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Escriviu una adreça electrònica i una contrasenya vàlides."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Compte duplicat"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Aquest inici de sessió ja s\'utilitza per al compte \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"S\'està recuperant la informació del compte..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"S\'està comprovant la configuració del servidor d\'entrada…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"S\'està comprovant la configuració del servidor de sortida…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuració del correu electrònic"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Assigneu un nom al compte (opcional)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"El vostre nom (visualitzat als missatges de sortida)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Afegeix un compte de correu electrònic nou"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quin tipus de compte es tracta?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuració del servidor d\'entrada"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'usuari"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contrasenya"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Servidor IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipus de seguretat"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Cap"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (accepta tots els certificats)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (accepta tots els certificats)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Suprimeix el correu electrònic del servidor"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Mai"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quan el suprimeixi de la safata d\'entrada"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefix de camí IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuració del servidor de sortida"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipus de seguretat"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requereix l\'inici de sessió."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'usuari"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contrasenya"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuració del servidor"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domini\\Nom d\'usuari"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilitza una connexió segura (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepta tots els certificats SSL"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opcions del compte"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Freqüència de comprovació de correu electrònic"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Mai"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automàtica (tramesa automàtica)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Cada 5 minuts"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Cada 10 minuts"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Cada 15 minuts"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Cada 30 minuts"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Cada hora"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Envia correu electrònic des d\'aquest compte de manera predeterminada."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notifica\'m quan arribi correu electrònic nou."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronitza els contactes d\'aquest compte."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronitza el calendari d\'aquest compte."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"La configuració no ha pogut finalitzar"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Quantitat per sincronitzar"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Un dia"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tres dies"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Una setmana"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dues setmanes"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Un mes"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nom d\'usuari o contrasenya incorrectes."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nom d\'usuari o contrasenya incorrectes."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No es pot establir una connexió segura amb el servidor."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"No es pot establir una connexió segura amb el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"No es pot establir la connexió amb el servidor."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"No es pot establir la connexió amb el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS necessari, però no compatible amb el servidor."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Els mètodes d\'autenticació no són compatibles amb el servidor."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"No es pot obrir la connexió amb el servidor a causa d\'un error de seguretat."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"No es pot obrir la connexió amb el servidor."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administració de seguretat remota"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"El servidor <xliff:g id="SERVER">%s</xliff:g> requereix que li permeteu controlar de manera remota algunes funcions de seguretat del telèfon. Voleu acabar de configurar aquest compte?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Aquest servidor requereix funcions de seguretat no compatibles amb el telèfon."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Cal actualitzar la configuració de seguretat del compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Actualització de la configuració de seguretat"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Seguretat del dispositiu"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"El servidor <xliff:g id="SERVER">%s</xliff:g> requereix que li permeteu controlar de manera remota algunes funcions de seguretat del telèfon."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edita\'n els detalls"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Configuració general"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Compte predeterminat"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Envia correu electrònic des d\'aquest compte de manera predeterminada"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificacions de correu electrònic"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Quan arribi correu electrònic, notifica-ho a la barra d\'estat"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Freqüència de comprovació del correu electrònic"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuració d\'entrada"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuració de sortida"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Nom del compte"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"El vostre nom"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatura"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Annexa text als missatges que envieu"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Configuració de notificacions"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sincronitza els contactes"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronitza també els contactes d\'aquest compte"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronitza el calendari"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronitza també el calendari d\'aquest compte"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibra"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibra també quan arribi correu electrònic"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Només quan està en silenci"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibra"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Selecció del so de trucada"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Configuració del servidor"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Elimina el compte"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"El compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" s\'eliminarà del correu electrònic."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualitza els comptes"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"No es pot actualitzar el compte"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"L\'accés a la bústia de correu no és compatible amb alguns comptes de correu de Yahoo!. Si teniu problemes per connectar-vos-hi, visiteu yahoo.com per obtenir més informació."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Abans de configurar aquest compte de correu electrònic, visiteu el lloc web de Yahoo! i activeu l\'accés al correu electrònic POP3 per a aquest compte."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Només alguns comptes \"Plus\" inclouen l\'accés POP que permet que aquest programa s\'hi connecti. Si no podeu iniciar la sessió amb l\'adreça electrònica i la contrasenya correctes, pot ser que no tingueu un compte \"Plus\" de pagament. Inicieu el navegador web per accedir a aquests comptes de correu."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Abans de configurar aquest compte de correu electrònic, visiteu el lloc web de T-Online i creeu una contrasenya per a l\'accés al correu electrònic POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Corporatiu"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Acceptada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Rebutjada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Provisional: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Cancel·lada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Actualitzada: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Quan: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"On: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Quan: <xliff:g id="EVENTDATE">%s</xliff:g> (periòdica)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Aquest esdeveniment s\'ha cancel·lat per a: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Els detalls d\'aquest esdeveniment han canviat per a: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager no ha pogut crear el compte; torneu-ho a provar."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Correu electrònic"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Activa les polítiques de seguretat especificades pel servidor"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"S\'ha afegit el calendari d\'Exchange"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"S\'està cercant <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> resultat de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultats de <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Primers <xliff:g id="RESULTS">%1$d</xliff:g> resultats de <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b631161..ebf3543 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Další"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Zrušit"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Odeslat"</string>
     <string name="reply_action" msgid="4262472229221507619">"Odpovědět"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Odpovědět všem"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Účty"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Označit jako přečtené"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Označit jako nepřečtené"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Přidat kopii/skrytou"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Přidat přílohu"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Nastavení výpisu"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + další (<xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>)"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + další (<xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>)"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"Nové: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="5620484088786656170">"Nové: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"Nové: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> <xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"Nové: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> <xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Doručená pošta"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Pošta k odeslání"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Koncepty"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Pošta k odeslání"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Účet aktualizujete stisknutím a podržením"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"E-mailová schránka"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombinované zobrazení"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Načíst další zprávy"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Počet vybraných položek: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
     <item quantity="other" msgid="7901361399231876038">"Počet vybraných položek: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Žádné zprávy"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Do"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopie"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skrytá kopie"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Předmět"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Napsat e-mail"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Původní zpráva --------"\n"Předmět: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Odesílatel: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Komu: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopie: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>napsal/a:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Text v uvozovkách"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Zahrnout text"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Je třeba přidat nejméně jednoho příjemce."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Některé e-mailové adresy jsou neplatné."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Soubor nelze připojit, protože je příliš velký."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"Uživatel <xliff:g id="NAME">%1$s</xliff:g> a další uživatelé (<xliff:g id="NUMBER">%2$d</xliff:g>)"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Komu:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kopie:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Skrytá kopie:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Zobrazit"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Načíst"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Uložit"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Příloha uložena jako <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Přílohu nelze uložit."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Poznámka: Jedna či více příloh v přeposílané zprávě bude před odesláním stažena."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Zpráva"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Pozvánka"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Příloha: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Přílohy: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Zobrazit obrázky"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Zobrazit v Kalendáři"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Pozvánka z kalendáře"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Přijali jste tuto pozvánku"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Na tuto pozvánku jste odpověděli „možná“"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Odmítli jste tuto pozvánku"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Zpráva byla smazána."</item>
     <item quantity="other" msgid="6574961322865652255">"Zprávy byly smazány."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> zpráva byla přesunuta do schránky <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"Zprávy (<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>) byly přesunuty do schránky <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Přílohu se nepodařilo přeposlat"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Nepodařilo se přeposlat jednu nebo více příloh"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Přílohu <xliff:g id="FILENAME"> %s</xliff:g> nebylo možné odeslat s odchozí poštou, protože tuto přílohu nelze stáhnout."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Přihl. selhalo: <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Dotykem změníte nastavení účtu"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Nastavit e-mail"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavit e-mail"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Přidat účet Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Přidat účet Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Většinu e-mailových účtů můžete nakonfigurovat v několika snadných krocích."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Účet Exchange můžete nakonfigurovat v několika snadných krocích."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Účet služby Exchange ActiveSync můžete nakonfigurovat v několika snadných krocích."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-mailová adresa"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Heslo"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Ve výchozím nastavení odesílat e-maily z tohoto účtu."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ruční nastavení"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Zadejte platnou e-mailovou adresu a heslo."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Načítání informací o účtu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrola nastavení serveru příchozí pošty..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrola nastavení serveru odchozí pošty..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Nastavit e-mail"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Váš účet je nastaven, e-mail je na cestě!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavit e-mail"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pojmenovat tento účet (nepovinné)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše jméno (zobrazované na odchozích zprávách)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Přidat nový e-mailový účet"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Přidat nový e-mailový účet"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"O jaký typ účtu se jedná?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Nastavení serveru příchozí pošty"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavení serveru příchozí pošty"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Uživatelské jméno"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Heslo"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Při smazání z Doručené pošty"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Předpona cesty IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Nepovinné"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Nastavení serveru odchozí pošty"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavení serveru odchozí pošty"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpečení"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Požadovat přihlášení"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Uživatelské jméno"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Heslo"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Nastavení serveru"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavení serveru"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Doména\\Uživatelské jméno"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Použít zabezpečené připojení (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Přijímat všechny certifikáty protokolu SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID mobilního zařízení"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Možnosti účtu"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Možnosti účtu"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Četnost kontroly doručené pošty"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikdy"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaticky (v případě potřeby)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Uživatelské jméno nebo heslo není správné."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nelze se bezpečně připojit k serveru."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nelze se bezpečně připojit k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Server odpověděl chybou. Zkontrolujte prosím uživatelské jméno a heslo a zkuste to znovu."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nelze se připojit k serveru."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nelze se připojit k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Služba TLS je požadována, ale není podporována na serveru."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Vzdálená správa zabezpečení"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Server <xliff:g id="SERVER">%s</xliff:g> žádá o povolení, aby mohl vzdáleně ovládat některé funkce zabezpečení vašeho telefonu. Chcete dokončit nastavení tohoto účtu?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Tento server vyžaduje funkce zabezpečení, které váš telefon nepodporuje."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"UPOZORNĚNÍ: Deaktivujete-li oprávnění aplikace E-mail spravovat toto zařízení, budou smazány všechny účty aplikace E-mail, které toto oprávnění vyžadují. Společně s těmito účty budou smazány i všechny jejich e-maily, kontakty, události v kalendářích a další údaje."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> požaduje aktualizaci nastavení zabezpečení."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Aktualizace nastavení zabezpečení"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Zabezpečení zařízení"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 9902d28..5af0084 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Næste"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Annuller"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Send"</string>
     <string name="reply_action" msgid="4262472229221507619">"Svar"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Svar alle"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Konti"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marker som læst"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marker som ulæst"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Tilføj Cc/Bcc"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Tilføj vedhæftet fil"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Kassér indstillinger"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> flere"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> flere"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Indbakke"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Udbakke"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Kladder"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Udbakke"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Hold trykket på en konto for at opdatere"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postkasse"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombineret visning"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Indlæs flere beskeder"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> markeret"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> markerede"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Ingen beskeder"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Til"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Emne"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv mail"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oprindelig meddelelse --------"\n"Emne: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Fra: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Til: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citeret tekst"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Medtag tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du skal tilføje mindst en modtager."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Nogle e-mail-adresser er ugyldige."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen er for stor til at vedhæfte."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> og <xliff:g id="NUMBER">%2$d</xliff:g> andre"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Til:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Bcc:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Vis"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Indlæs"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Gem"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Vedhæftelse gemmes som <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Vedhæftet fil kunne ej gemmes."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Bemærk: En eller flere vedhæftede filer i din videresendte besked downloades før afsendelse."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Besked"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Inviter"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Vedhæftning <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Vedhæftede filer <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Vis billeder"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Vis i Kalender"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalenderinvitation"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Du har accepteret denne invitation"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Du har svaret \"måske\" til denne invitation"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Du har afvist denne invitation"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Beskeden er slettet."</item>
     <item quantity="other" msgid="6574961322865652255">"Beskederne er slettet."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> beskeder er flyttet til <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> beskeder er flyttet til <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"En vedhæftet fil kunne ikke videresendes"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"En eller flere vedhæftede filer kunne ikke videresendes"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Den vedhæftede fil <xliff:g id="FILENAME"> %s</xliff:g> kunne ikke sendes sammen med din udgående e-mail, fordi den ikke kunne downloades."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> ikke logget ind"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Tryk for at ændre kontoindstillingerne"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gb"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Gb"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Opsæt e-mail"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Opsæt e-mail"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tilføj en Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tilføj en Exchange ActiveSync-konto"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Du kan konfigurere e-mail til de fleste konti med blot nogle få trin."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Du kan konfigurere en Exchange-konto i nogle få trin."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Du kan konfigurere en Exchange ActiveSync-konto i nogle få trin."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-mail-adresse"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Adgangskode"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Send e-mail fra denne konto som standard."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel opsætning"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Indtast en gyldig e-mail-adresse og adgangskode."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontooplysninger ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerer indstillinger for indgående server ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerer indstillinger for udgående server ..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Opsæt e-mail"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Din konto er opsat, og der er e-mail på vej!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Opsæt e-mail"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Giv kontoen et navn (valgfrit)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vist på udgående beskeder)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Tilføj ny e-mail-konto"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Tilføj ny e-mail-konto"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hvilken slags konto er dette?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Indstillinger for indgående server"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Indstillinger for indgående server"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brugernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Adgangskode"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter fra Indbakke"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Præfiks for IMAP-sti"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valgfrit"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Indstillinger for udgående server"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Indstillinger for udgående server"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhedstype"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kræver login"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brugernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Adgangskode"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Serverindstillinger"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Serverindstillinger"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domæne\\brugernavn"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Brug sikker forbindelse (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepter alle SSL-certifikater"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Id for mobilenhed"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Kontovalgmuligheder"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontovalgmuligheder"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Kontrolfrekvens for indbakke"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldrig"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatisk (Push)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Brugernavn eller adgangskode er forkert."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Der kan ikke oprettes en sikker forbindelse til serveren."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Der kan ikke oprettes en sikker forbindelse til serveren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serveren angiver en fejl. Kontroller dit brugernavn og din adgangskode, og prøv igen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Der kan ikke oprettes forbindelse til serveren."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Der kan ikke oprettes forbindelse til serveren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS er påkrævet, men understøttes ikke af serveren."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Ekstern sikkerhedsadministration"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serveren <xliff:g id="SERVER">%s</xliff:g> kræver, at du giver den tilladelse til eksternt at kontrollere nogle af telefonens sikkerhedsfunktioner. Vil du afslutte opsætning af denne konto?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Denne server kræver sikkerhedsfunktioner, som telefonen ikke understøtter."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"ADVARSEL: Hvis du deaktiverer programmet E-mails tilladelse til at administrere din enhed, slettes alle konti i E-mail, der kræver dette, sammen med alle e-mails, kontaktpersoner, kalenderbegivenheder og andre data på disse konti."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontoen \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kræver opdatering af sikkerhedsindstillingerne."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Opdater sikkerhedsindstillinger"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Enhedssikkerhed"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 6d0b08c..71a12f8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Weiter"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Abbrechen"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Senden"</string>
     <string name="reply_action" msgid="4262472229221507619">"Antworten"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Allen antworten"</string>
@@ -49,13 +51,15 @@
     <string name="deselect_all_action" msgid="253663239459688238">"Auswahl aufheben"</string>
     <string name="compose_action" msgid="4045702519637388045">"Schreiben"</string>
     <string name="search_action" msgid="6325101454876682308">"Suche"</string>
-    <string name="open_action" msgid="936766723989190816">"Offen"</string>
+    <string name="open_action" msgid="936766723989190816">"Öffnen"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"Kontoeinstellungen"</string>
     <string name="remove_account_action" msgid="3789169090601376209">"Konto entfernen"</string>
     <string name="folders_action" msgid="7502431531355227666">"Ordner"</string>
     <string name="accounts_action" msgid="901105887272231493">"Konten"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Als gelesen markieren"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Als ungelesen markieren"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"\"Cc\"/\"Bcc\" hinzufügen"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Anhang hinzufügen"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Einstellungen für Speicherauszug"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> weitere"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> weitere"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> neue"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> neue"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> neue<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> neue<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Posteingang"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Postausgang"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Entwürfe"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Postausgang"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Konto zum Aktualisieren lange drücken"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postfach"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombinierte Ansicht"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Weitere Nachrichten laden"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> ausgewählt"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> ausgewählt"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Keine Nachrichten"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"An"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Betreff"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"E-Mail schreiben"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Originalnachricht --------"\n"Betreff: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Von: <xliff:g id="SENDER">%2$s</xliff:g>"\n"An: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> schrieb:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Zitierter Text"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Text einfügen"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Sie müssen mindestens einen Empfänger hinzufügen."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Einige E-Mail-Adressen sind ungültig."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Dateianhang zu groß"</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> und <xliff:g id="NUMBER">%2$d</xliff:g> weitere"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"An:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Bcc:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Anzeigen"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Laden"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Speichern"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Anhang als <xliff:g id="FILENAME">%s</xliff:g> gespeichert."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Anhang nicht gespeichert"</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Hinweis: Mindestens ein Anhang in Ihrer weitergeleiteten Nachricht wird vor dem Senden heruntergeladen."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Nachricht"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Einladen"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Anhang: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Anhänge: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Bilder anzeigen"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Im Kalender anzeigen"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalendereinladung"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Sie haben die Einladung angenommen."</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Sie haben auf diese Einladung mit \"Vielleicht\" geantwortet."</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Sie haben die Einladung abgelehnt."</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Nachricht gelöscht"</item>
     <item quantity="other" msgid="6574961322865652255">"Nachrichten gelöscht"</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> Nachricht verschoben in: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> Nachrichten verschoben in: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Ein Anhang konnte nicht weitergeleitet werden."</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Mindestens ein Anhang wurde nicht weitergeleitet."</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Der Anhang <xliff:g id="FILENAME"> %s</xliff:g> konnte nicht mit Ihrer ausgehenden E-Mail gesendet werden, da er nicht heruntergeladen werden konnte."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> - Anmeldefehler"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Berühren Sie diesen Bereich, um die Kontoeinstellungen zu ändern."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"E-Mail einrichten"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-Mail einrichten"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange-Konto hinzufügen"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync-Konto hinzufügen"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Bei den meisten Konten können Sie die E-Mail-Adresse in nur wenigen Schritten konfigurieren."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Sie können ein Exchange-Konto in nur wenigen Schritten konfigurieren."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Sie können ein Exchange ActiveSync-Konto in nur wenigen Schritten konfigurieren."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-Mail-Adresse"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Passwort"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-Mails standardmäßig von diesem Konto senden"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuelle Einrichtung"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Geben Sie eine gültige E-Mail-Adresse und ein gültiges Passwort ein."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Kontoinformationen werden abgerufen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Einstellungen des Eingangsservers werden überprüft..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Einstellungen des Ausgangsservers werden überprüft..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"E-Mail einrichten"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Ihr Konto ist nun eingerichtet."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-Mail einrichten"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Konto benennen (optional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ihr Name (wird für ausgehende Nachrichten angezeigt)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Neues E-Mail-Konto hinzufügen"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Neues E-Mail-Konto hinzufügen"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Um welchen Kontotyp handelt es sich hierbei?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Einstellungen für Eingangsserver"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Einstellungen für Eingangsserver"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nutzername"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passwort"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-Server"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Wenn ich sie aus dem Posteingang lösche"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-Pfadpräfix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optional"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Einstellungen für Postausgangsserver"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Einstellungen für Postausgangsserver"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-Server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sicherheitstyp"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Anmeldung erforderlich"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nutzername"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passwort"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Servereinstellungen"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Servereinstellungen"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain-/Benutzername"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Sichere Verbindung (SSL) verwenden"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Alle SSL-Zertifikate akzeptieren"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilgerät-ID"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Kontooptionen"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontooptionen"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Häufigkeit des E-Mail-Abrufs"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nie"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatisch (Push)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nutzername/Password falsch"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Keine sichere Verbindung zu Server möglich"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Keine sichere Verbindung zum Server möglich"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Der Server hat einen Fehler zurückgegeben. Überprüfen Sie Ihren Nutzernamen und Ihr Passwort und versuchen Sie es erneut."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Keine Verbindung zu Server möglich"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Keine Verbindung zum Server möglich"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS erforderlich aber nicht von Server unterstützt"</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Remote-Sicherheitsverwaltung"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Der Server <xliff:g id="SERVER">%s</xliff:g> erfordert die Erlaubnis zur Remote-Steuerung einiger Sicherheitsfunktionen auf Ihrem Telefon. Möchten Sie die Einrichtung dieses Kontos abschließen?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Für diesen Server sind Sicherheitsfunktionen erforderlich, die von Ihrem Telefon nicht unterstützt werden."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"Warnung: Wenn Sie die Berechtigung der E-Mail-Anwendung zur Verwaltung Ihres Geräts deaktivieren, werden alle E-Mail-Konten, die diese Berechtigung benötigen, mit allen zugehörigen E-Mail-Nachrichten, Kontakten, Terminen und anderen Daten gelöscht."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Das Konto \"<xliff:g id="ACCOUNT">%s</xliff:g>\" erfordert eine Aktualisierung der Sicherheitseinstellungen."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Sicherheitseinstellungen aktualisieren"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Gerätesicherheit"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e3c1e13..5c48634 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Επόμενο"</string>
     <string name="okay_action" msgid="8365197396795675617">"ΟΚ"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Ακύρωση"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Αποστολή"</string>
     <string name="reply_action" msgid="4262472229221507619">"Απάντηση"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Απάντηση σε όλους"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Λογαριασμοί"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Επισήμανση ως αναγνωσμένο"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Επισήμανση ως μη αναγνωσμένα"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Προσθήκη Κοιν./Κρυφής κοιν."</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Προσθήκη επισύναψης"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Ρυθμίσεις αρχείου ένδειξης σφαλμάτων"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> περισσότερα"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> περισσότερα"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> νέα"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> νέα"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> νέα<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> νέα<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Εισερχόμενα"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Εξερχόμενα"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Πρόχειρα"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Εξερχόμενα"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Πατήστε παρατεταμένα έναν λογαριασμό για να τον ανανεώσετε"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Θυρίδες αλληλογραφίας"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Συνδυασμένη προβολή"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Φόρτωση περισσότερων μηνυμάτων"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Επιλέχθηκαν <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
     <item quantity="other" msgid="7901361399231876038">"Επιλέχθηκαν <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Δεν υπάρχουν μηνύματα"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Προς"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Κοιν."</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Κρυφή κοιν."</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Θέμα"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Σύνθεση μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Αρχικό μήνυμα --------"\n"Θέμα: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Από: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Προς: <xliff:g id="TO">%3$s</xliff:g>"\n"Κοιν.: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Ο χρήστης <xliff:g id="SENDER">%s</xliff:g> έγραψε:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Αναφερόμενο κείμενο"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Συμπερίληψη κειμένου"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Πρέπει να προσθέσετε τουλάχιστον έναν παραλήπτη."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Ορισμένες διευθύνσεις ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρες."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Πολύ μεγάλο αρχείο για επισύναψη."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> και <xliff:g id="NUMBER">%2$d</xliff:g> ακόμα"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Προς:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Κοιν.:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Κρυφή κοιν.:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Προβολή"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Φόρτωση"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Αποθήκευση"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Αποθήκευση επισύναψης ως <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Αδυναμία αποθήκ. επισύναψης."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Σημείωση: Μία ή περισσότερες επισυνάψεις στο προωθημένο μήνυμά σας θα ληφθούν πριν την αποστολή."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Μήνυμα"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Πρόσκληση"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Συνημμένο<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Συνημμένα <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Εμφάνιση εικόνων"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Προβολή στο Ημερολόγιο"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Πρόσκληση Ημερολογίου"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Αποδεχτήκατε την πρόσκληση"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Έχετε απαντήσει \"ίσως\" σε αυτή την πρόσκληση"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Απορρίψατε την πρόσκληση"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Το μήνυμα διαγράφηκε."</item>
     <item quantity="other" msgid="6574961322865652255">"Τα μηνύματα διαγράφηκαν."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> μήνυμα μετακινήθηκε σε <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> μηνύματα μετακινήθηκαν σε <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Δεν ήταν δυνατή η προώθηση μιας επισύναψης"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Δεν ήταν δυνατή η προώθηση μίας ή περισσότερων επισυνάψεων"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Δεν ήταν δυνατή η αποστολή της επισύναψης <xliff:g id="FILENAME"> %s</xliff:g> με την εξερχόμενη αλληλογραφία σας διότι δεν ήταν δυνατή η λήψη της."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Αποτ. σύνδεσης <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Αγγίξτε για να αλλάξετε τις ρυθμίσεις λογαριασμού"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Ρύθμιση ηλεκτρονικού ταχυδρομείου"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Ρύθμιση ηλεκτρονικού ταχυδρομείου"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Προσθήκη λογαριασμού Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Προσθήκη λογαριασμού Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Μπορείτε να ολοκληρώσετε τη διαμόρφωση ηλεκτρονικού ταχυδρομείου για τους περισσότερους λογαριασμούς σε λίγα μόλις βήματα."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Μπορείτε να διαμορφώσετε έναν λογαριασμό Exchange σε λίγα μόλις βήματα."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Μπορείτε να διαμορφώσετε ένα λογαριασμό Exchange ActiveSync σε λίγα μόλις βήματα."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Διεύθυνση ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Κωδικός πρόσβασης"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό από προεπιλογή."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Μη αυτόματη ρύθμιση"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Πληκτρολογήστε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου και έναν έγκυρο κωδικό πρόσβασης."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Ανάκτηση στοιχείων λογαριασμού..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Έλεγχος ρυθμίσεων διακομιστή εισερχομένων..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Έλεγχος ρυθμίσεων διακομιστή εξερχομένων..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Ρύθμιση ηλεκτρονικού ταχυδρομείου"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Ο λογαριασμός σας ρυθμίστηκε και γίνεται λήψη μηνυμάτων ηλεκτρονικού ταχυδρομείου!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Ρύθμιση ηλεκτρονικού ταχυδρομείου"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Δώστε σε αυτόν τον λογαριασμό ένα όνομα (προαιρετικό)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Το όνομά σας (προβάλλεται στα εξερχόμενα μηνύματα)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Προσθήκη νέου λογαριασμού ηλεκτρονικού ταχυδρομείου"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Προσθήκη νέου λογαριασμού ηλεκτρονικού ταχυδρομείου"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Τι τύπος λογαριασμού είναι αυτός;"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Ρυθμίσεις διακομιστή εισερχομένων"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ρυθμίσεις διακομιστή εισερχομένων"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Όνομα χρήστη"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Κωδικός πρόσβασης"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Διακομιστής POP3"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Όταν διαγράφω από τα Εισερχόμενα"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Πρόθεμα διαδρομής IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Προαιρετικό"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Ρυθμίσεις διακομιστή εξερχομένων"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ρυθμίσεις διακομιστή εξερχομένων"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Διακομιστής SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Θύρα"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Τύπος ασφάλειας"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Να απαιτείται σύνδεση."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Όνομα χρήστη"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Κωδικός πρόσβασης"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Ρυθμίσεις διακομιστή"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Ρυθμίσεις διακομιστή"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Διακομιστής"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Τομέας διαδικτύου\\Όνομα χρήστη"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Χρήση ασφαλούς σύνδεσης (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Αποδοχή όλων των πιστοποιητικών SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Αναγνωριστικό κινητής συσκευής"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Επιλογές λογαριασμού"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Επιλογές λογαριασμού"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Συχνότητα ελέγχου εισερχομένων"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Ποτέ"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Αυτόματο (Ώθηση)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Λάθος όνομα χρήστη ή κωδικός πρόσβασης."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Δεν είναι δυνατή η ασφαλής σύνδεση με τον διακομιστή."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Δεν είναι δυνατή η ασφαλής σύνδεση με τον διακομιστή."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Ο διακομιστής απάντησε με σφάλμα. Ελέγξτε το όνομα χρήστη και τον κωδικό πρόσβασης και δοκιμάστε ξανά."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Δεν είναι δυνατή η σύνδεση με τον διακομιστή."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Δεν είναι δυνατή η σύνδεση με τον διακομιστή."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Το TLS απαιτείται αλλά δεν υποστηρίζεται από τον διακομιστή."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Απομακρυσμένη διαχείριση ασφαλείας"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Από το διακομιστή <xliff:g id="SERVER">%s</xliff:g> απαιτείται να του επιτρέπεται ο απομακρυσμένος έλεγχος ορισμένων λειτουργιών ασφαλείας του τηλεφώνου σας. Θέλετε να ολοκληρωθεί η ρύθμιση αυτού του λογαριασμού;"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Για αυτόν τον διακομιστή απαιτούνται λειτουργίες ασφαλείας που δεν υποστηρίζονται από το τηλέφωνό σας."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η απενεργοποίηση της αρμοδιότητας της εφαρμογής Μήνυμα ηλεκτρονικού ταχυδρομείου για διαχείριση της συσκευής σας θα διαγράψει όλους τους λογαριασμούς ηλεκτρονικού ταχυδρομείου που το απαιτούν, καθώς και τα μηνύματα ηλεκτρονικού ταχυδρομείου, τις επαφές, τα συμβάντα ημερολογίου και άλλα δεδομένα."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Από το λογαριασμό \"<xliff:g id="ACCOUNT">%s</xliff:g>\" απαιτείται ενημέρωση ρυθμίσεων ασφαλείας."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Ενημέρωση ρυθμίσεων ασφαλείας"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Ασφάλεια συσκευής"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..af69f7e
--- /dev/null
+++ b/res/values-en-rGB/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Sending messages…"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Send outgoing messages"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Fetching attachment."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Fetching attachment <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Read Email attachments"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Allows this application to read your email attachments."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Access Email provider data"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Allows this application to access your Email database, including received messages, sent messages, usernames and passwords."</string>
+    <string name="app_name" msgid="5815426892327290362">"Email"</string>
+    <string name="compose_title" msgid="427986915662706899">"Compose"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
+    <string name="next_action" msgid="3931301986364184415">"Next"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Cancel"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Send"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Reply"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Reply all"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Delete"</string>
+    <string name="forward_action" msgid="669174181042344116">"Forward"</string>
+    <string name="done_action" msgid="7497990549515580249">"Done"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Discard"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Save as draft"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Read/Unread"</string>
+    <string name="read_action" msgid="4701484794504781686">"Mark read"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Mark unread"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Favourite"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Add star"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Remove star"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Refresh"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Add account"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Deselect all"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Compose"</string>
+    <string name="search_action" msgid="6325101454876682308">"Search"</string>
+    <string name="open_action" msgid="936766723989190816">"Open"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Account settings"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Remove account"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Folders"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Accounts"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Mark as read"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Mark as unread"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Add Cc/Bcc"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Add attachment"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Dump settings"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Choose attachment"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Connection error"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"New email"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Unexpected error while loading message text. Message may be too large to view."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> unread (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> unread (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> unread (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
+    <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> accounts"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Inbox"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Outbox"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Drafts"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Recycle Bin"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Sent"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Junk"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Accounts"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Combined Inbox"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Starred"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Drafts"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Outbox"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Please long-press an account to refresh it"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Mailbox"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Load more messages"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"To"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Subject"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Compose Mail"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Quoted text"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"You must add at least one recipient."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Some email addresses are invalid."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"File too large to attach."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> and <xliff:g id="NUMBER">%2$d</xliff:g> others"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"To:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Open"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Attachment saved to SD card as <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Unable to save attachment to SD card."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Show pictures"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"View in Calendar »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Calendar Invite"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Going?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Yes"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Maybe"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" No"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"You have accepted the invitation"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"You have replied \"maybe\" to this invitation"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"You have declined this invitation"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Message deleted."</item>
+    <item quantity="other" msgid="6574961322865652255">"Messages deleted."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Message discarded."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Message saved as draft."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"This attachment cannot be displayed."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Set up email"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Add an Exchange account"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Add an Exchange ActiveSync account"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"You can configure Email for most accounts in just a few steps."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"You can configure an Exchange account in just a few steps."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"You can configure an Exchange ActiveSync account in just a few steps."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Send email from this account by default."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manual setup"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Please type a valid email address and password."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Duplicate Account"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"This login is already in use for the account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Retrieving account information…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Checking incoming server settings…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Checking outgoing server settings…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Set up email"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Give this account a name (optional)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Your name (displayed on outgoing messages)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Add new email account"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"What type of account is this?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Incoming server settings"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Username"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 server"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP server"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Security type"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"None"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Accept all certificates)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Accept all certificates)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Delete email from server"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Never"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"When I delete from Inbox"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP path prefix"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optional"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Outgoing server settings"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP server"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Security type"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Require sign-in."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Username"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Server settings"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Username"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Use secure connection (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accept all SSL certificates"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Account options"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Email checking frequency"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Never"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatic (Push)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Every 5 minutes"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Every 10 minutes"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Every 15 minutes"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Every 30 minutes"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Every hour"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Send email from this account by default."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Notify me when email arrives."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sync contacts from this account."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sync calendar from this account."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Setup could not finish"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Amount to synchronise"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"One day"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Three days"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"one week"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Two weeks"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"One month"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Username or password incorrect."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Username or password incorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Cannot safely connect to server."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Cannot safely connect to server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Cannot connect to server."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Cannot connect to server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS required but not supported by server."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Authentication methods are not supported by server."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Unable to open connection to server due to security error."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Unable to open connection to server."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Remote security administration"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"The server <xliff:g id="SERVER">%s</xliff:g> requires that you allow it to control some security features of your phone remotely. Do you wish to finish setting up this account?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"This server requires security features that your phone does not support."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requires security settings update."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Update Security Settings"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Device Security"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"The server <xliff:g id="SERVER">%s</xliff:g> requires that you allow it to control some security features of your phone remotely."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edit details"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"General settings"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Default account"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Send email from this account by default"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Email notifications"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Notify in status bar when email arrives"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Email check frequency"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Incoming settings"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Outgoing settings"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Account name"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Your name"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Signature"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Append text to messages that you send"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Notification settings"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sync contacts"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Also sync contacts from this account"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sync calendar"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Also sync calendar from this account"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrate"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Also vibrate when email arrives"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Always"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Only when silent"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Never"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrate"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Select ring tone"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Server settings"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Remove account"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"The account \"<xliff:g id="ACCOUNT">%s</xliff:g>\" will be removed from email."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Upgrade accounts"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Unable to upgrade account"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Mailbox access is not supported for some types of Yahoo! mail accounts. If you have trouble connecting, visit yahoo.co.uk for more information."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Before setting up this email account, please visit the Yahoo! website and enable POP3 email access for this account."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Only some \"Plus\" accounts include POP access allowing this programme to connect. If you are not able to sign in with your correct email address and password, you may not have a paid \"Plus\" account. Please launch the web browser to gain access to these mail accounts."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Before setting up this email account, please visit the T-Online website and create a password for POP3 email access."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Corporate"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Accepted: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Declined: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Tentative: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Cancelled: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Updated: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"When: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Where: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"When: <xliff:g id="EVENTDATE">%s</xliff:g> (recurring)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"This event has been cancelled for: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"The details of this event have been changed for: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"The Account Manager could not create the Account. Please try again."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Email"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Enables server-specified security policies"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange calendar added"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Searching <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> result from <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> results from <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"First <xliff:g id="RESULTS">%1$d</xliff:g> results from <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ef4eaee..35d86f1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Siguiente"</string>
     <string name="okay_action" msgid="8365197396795675617">"Aceptar"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Cancelar"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Enviar"</string>
     <string name="reply_action" msgid="4262472229221507619">"Responder"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Responder a todos"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Cuentas"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marcar como leído"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leídos"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Agregar CC/CCO"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Agregar archivo adjunto"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Configuración de descarga"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> más"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> más"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuevo"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuevo"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuevo<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuevo<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Bandeja de entrada"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Bandeja de salida"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Borradores"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Bandeja de salida"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mantenga presionada una cuenta para actualizarla"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Casilla de correo"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vista combinada"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Cargar más mensajes"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionados"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionados"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"No hay mensajes."</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Para"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"CC"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"CCO"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Asunto"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Redactar mensaje de correo"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensaje original --------"\n"Asunto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escribió:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto citado"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Debes agregar al menos un destinatario."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Algunas direcciones de correo electrónico no son válidas."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"El archivo es demasiado grande para adjuntarlo."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> y <xliff:g id="NUMBER">%2$d</xliff:g> otros"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Para:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"CC:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"CCO:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Ver"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Cargar"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Guardar"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Archivo adj guardado como <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"No se pudo guardar el arch adj"</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota: Se descargarán uno o más archivos adjuntos de tu mensaje reenviado antes de enviar."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensaje"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invitar"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Archivo adjunto<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Adjuntos <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imágenes"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Ver en Calendar"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invitación de Calendar"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Has aceptado esta invitación."</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Respondiste \"quizás\" a esta invitación."</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Has rechazado esta invitación."</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Mensaje eliminado"</item>
     <item quantity="other" msgid="6574961322865652255">"Mensaje eliminado"</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensaje trasladado a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensajes trasladados a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"No se pudo reenviar un archivo adjunto"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"No se pudieron enviar uno o más adjuntos."</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"El archivo adjunto <xliff:g id="FILENAME"> %s</xliff:g> no pudo enviarse con tu correo de salida porque no pudo descargarse."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Falló inic. sesión <xliff:g id="ACCOUNT_NAME">%s </xliff:g>."</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Tocar para cambiar la configuración de la cuenta"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurar correo electrónico"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar correo electrónico"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agregar una cuenta de Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agregar una cuenta de Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Puedes configurar el correo electrónico de la mayoría de las cuentas en sólo algunos pasos."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puedes configurar una cuenta de intercambio en sólo algunos pasos."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Puedes configurar una cuenta de Exchange ActiveSync en sólo algunos pasos."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Dirección de correo elec."</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Contraseña"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar mensaje de correo electrónico desde esta cuenta de forma predeterminada."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuración manual"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Escribe una dirección de correo electrónico y contraseña válida."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando información de la cuenta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando configuración entrante de servidor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando configuración saliente de servidor…"</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Configurar correo electrónico"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Se ha configurado tu cuenta, ¡y el correo electrónico está en camino!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurar correo electrónico"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Coloca un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (mostrado en mensajes salientes)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Agregar nueva cuenta de correo electrónico"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Agregar nueva cuenta de correo electrónico"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Configuración entrante de servidor"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuración entrante de servidor"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuándo suprimo desde la bandeja de entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configuración saliente de servidor"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuración saliente de servidor"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Puerto"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de seguridad"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requiere inicio de sesión."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Configuración del servidor"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configuración del servidor"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio\\Nombre de usuario"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar conexión segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceptar todos los certificados SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositivo móvil"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Opciones de cuenta"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opciones de cuenta"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecuencia de verificación de la bandeja de entrada"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automático (Empujar)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nombre de usuario o contraseña incorrecta."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No se puede conectar de forma segura al servidor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"No se puede conectar de forma segura al servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"El servidor respondió con un mensaje de error; verifica tu nombre de usuario y contraseña, y haz el intento de nuevo."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"No se puede conectar al servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"No se puede conectar al servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Se requiere TLS pero el servidor no la admite."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administración de seguridad remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"El servidor <xliff:g id="SERVER">%s</xliff:g> requiere tu permiso para controlar de forma remota algunas funciones de seguridad en tu teléfono. ¿Deseas finalizar la configuración de esta cuenta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Este servidor requiere funciones de seguridad que no son compatibles con tu teléfono."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"Advertencia: La desactivación de la autorización de la aplicación de correo electrónico para administrar el dispositivo eliminará todas las cuentas de correo electrónico que la requieran junto a los correos electrónicos, contactos y eventos de calendario, entre otros datos de éstas."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"La cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requiere que se actualice la configuración de seguridad."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Actualizar la configuración de seguridad"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Dispositivo de seguridad"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f0e220f..d52f29a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -24,12 +24,14 @@
     <string name="read_attachment_desc" msgid="7594746717616308643">"Permite que esta aplicación lea los archivos adjuntos del correo electrónico."</string>
     <string name="permission_access_provider_label" msgid="4274353114641168675">"Acceder a los datos del proveedor de servicios de correo"</string>
     <string name="permission_access_provider_desc" msgid="1513898266889541617">"Permite que la aplicación acceda a la base de datos de tu correo electrónico, incluidos los mensajes recibidos, los mensajes enviados, los nombre de usuario y las contraseñas."</string>
-    <string name="app_name" msgid="5815426892327290362">"Enviar correo electrónico"</string>
+    <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Redactar"</string>
     <string name="debug_title" msgid="5175710493691536719">"Depurar"</string>
     <string name="next_action" msgid="3931301986364184415">"Siguiente"</string>
     <string name="okay_action" msgid="8365197396795675617">"Aceptar"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Cancelar"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Enviar"</string>
     <string name="reply_action" msgid="4262472229221507619">"Responder"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Responder a todos"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Cuentas"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marcar como leída"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leído"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Añadir Cc/CCO"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Añadir adjunto"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Ajustes de volcado"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> más"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> más"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> mensajes nuevos"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> mensajes nuevos"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> mensajes nuevos <xliff:g id="SEPARATOR"> </xliff:g> para <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> mensajes nuevos <xliff:g id="SEPARATOR"> </xliff:g> para <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Recibidos"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Enviados"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Borradores"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Enviados"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mantén pulsada una cuenta para actualizarla."</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Buzón de correo"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vista combinada"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Cargar más mensajes"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionados"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionados"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"No hay ningún mensaje."</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Al"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"CCO"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Asunto"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Redactar"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto entre comillas"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Debes especificar, al menos, un destinatario."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Algunas direcciones de correo electrónico no son válidas."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"El archivo es demasiado grande para adjuntarlo."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> y <xliff:g id="NUMBER">%2$d</xliff:g> más"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Para:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"CCO:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Ver"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Cargar"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Guardar"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Adjunto guardado como <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"No se puede guardar el adjunto"</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota: uno o varios de los archivos adjuntos del mensaje reenviado se descargarán antes de enviarse."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensaje"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invitación"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> adjunto"</item>
+    <item quantity="other" msgid="974463163535515223">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> adjuntos"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imágenes"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Ver en calendario"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invitación de calendario"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Has aceptado esta invitación."</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Has respondido \"quizás\" a esta invitación."</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Has rechazado esta invitación."</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Mensaje eliminado"</item>
     <item quantity="other" msgid="6574961322865652255">"Mensajes eliminados"</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"Se ha movido <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensaje a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>."</item>
     <item quantity="other" msgid="2286739630865943494">"Se han movido <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensajes a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>."</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"No se ha podido reenviar un archivo adjunto."</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Error al enviar uno o varios archivos adjuntos"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"El archivo adjunto <xliff:g id="FILENAME"> %s</xliff:g> no se puede enviar con tu mensaje saliente porque no se puede descargar."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Error al acceder a <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Toca para modificar la configuración de la cuenta."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurar correo electrónico"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar correo electrónico"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Añadir una cuenta de Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Añadir una cuenta de Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Puedes configurar el correo electrónico para la mayoría de las cuentas en pocos pasos."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puedes configurar una cuenta de Exchange en pocos pasos."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Puedes configurar una cuenta de Exchange ActiveSync en pocos pasos."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Dirección de correo electrónico"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Contraseña"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuración manual"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Introduce una dirección de correo electrónico y una contraseña válidas."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando la información de la cuenta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Comprobando la configuración del servidor de entrada..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Comprobando la configuración del servidor de salida..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Configurar correo electrónico"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Tu cuenta ya está configurada y en breve verás tu correo."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurar correo electrónico"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asignar un nombre a esta cuenta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tu nombre (aparece en los mensajes salientes)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Añadir una cuenta de correo electrónico nueva"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Añadir una cuenta de correo electrónico nueva"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"¿Qué tipo de cuenta es ésta?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Ajustes del servidor de entrada"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ajustes del servidor de entrada"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nombre de usuario"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Contraseña"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cuando suprimo algún mensaje de \"Bandeja de entrada\""</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefijo de ruta IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Ajustes del servidor de salida"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ajustes del servidor de salida"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Puerto"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de seguridad"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Acceso obligatorio"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nombre de usuario"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Contraseña"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Ajustes del servidor"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Ajustes del servidor"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio\\nombre de usuario"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar conexión segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceptar todos los certificados SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID de dispositivo móvil"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Opciones de cuenta"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opciones de cuenta"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecuencia comprobación de inbox"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Comprobación automática"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nombre de usuario o contraseña incorrecta"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"No se puede establecer una conexión de forma segura con el servidor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"No se puede establecer una conexión de forma segura con el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"El servidor ha devuelto un error. Comprueba tu nombre de usuario y tu contraseña e inténtalo de nuevo."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"No se puede establecer una conexión con el servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"No se puede establecer una conexión con el servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"El protocolo TLS es obligatorio, pero el servidor no lo admite."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administración de seguridad remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Es necesario que permitas que el servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota algunas funciones de seguridad del teléfono. ¿Deseas terminar de configurar esta cuenta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Este servidor necesita funciones de seguridad que no son compatibles con el teléfono."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"ADVERTENCIA: si desactivas la potestad de la aplicación Email para administrar tu dispositivo, se eliminarán todas las cuentas de esta aplicación que requieran su uso, así como las direcciones de correo electrónico, los contactos, los eventos de calendario y otro tipo de datos."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Es necesario actualizar la configuración de seguridad de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Actualizar configuración de seguridad"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Seguridad del dispositivo"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
new file mode 100644
index 0000000..11f0ece
--- /dev/null
+++ b/res/values-fa/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"در حال ارسال پیام ها..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"ارسال پیام های خروجی"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"واکشی پیوست."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"واکشی پیوست <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"خواندن پیوست های ایمیل"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"به این برنامه کاربردی اجازه می دهد پیوست های ایمیل شما را بخواند."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"دسترسی به داده های ارائه دهنده ایمیل"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"به این برنامه کاربردی اجازه می دهد به پایگاه داده ایمیل شما از جمله پیام های دریافتی، ارسالی و رمزهای ورود و نام های کاربری دسترسی پیدا کند."</string>
+    <string name="app_name" msgid="5815426892327290362">"ایمیل"</string>
+    <string name="compose_title" msgid="427986915662706899">"نگاشتن"</string>
+    <string name="debug_title" msgid="5175710493691536719">"رفع خطا"</string>
+    <string name="next_action" msgid="3931301986364184415">"بعدی"</string>
+    <string name="okay_action" msgid="8365197396795675617">"تأیید"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"لغو"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"ارسال"</string>
+    <string name="reply_action" msgid="4262472229221507619">"پاسخ"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"پاسخ به همه"</string>
+    <string name="delete_action" msgid="8421026208288857155">"حذف"</string>
+    <string name="forward_action" msgid="669174181042344116">"هدایت"</string>
+    <string name="done_action" msgid="7497990549515580249">"انجام شد"</string>
+    <string name="discard_action" msgid="6532206074859505968">"صرفنظر"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"ذخیره بعنوان پیش نویس"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"خوانده شده/خوانده نشده"</string>
+    <string name="read_action" msgid="4701484794504781686">"علامت گذاری بعنوان خوانده شده"</string>
+    <string name="unread_action" msgid="6280399049357552826">"علامت گذاری بعنوان خوانده نشده"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"مورد دلخواه"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"افزودن ستاره"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"حذف ستاره"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"تازه کردن"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"افزودن حساب"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"لغو انتخاب همه"</string>
+    <string name="compose_action" msgid="4045702519637388045">"نگاشتن"</string>
+    <string name="search_action" msgid="6325101454876682308">"جستجو"</string>
+    <string name="open_action" msgid="936766723989190816">"باز کردن"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"تنظیمات حساب"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"حذف حساب"</string>
+    <string name="folders_action" msgid="7502431531355227666">"پوشه ها"</string>
+    <string name="accounts_action" msgid="901105887272231493">"حساب ها"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"علامت گذاری بعنوان خوانده شده"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"علامت گذاری بعنوان خوانده نشده"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"افزودن گیرنده کپی/گیرنده کپی مخفی"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"افزودن پیوست"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"تنظیمات نسخه برداری"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"انتخاب پیوست"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"خطای اتصال"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"ایمیل جدید"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"خطای پیش بینی نشده در حین بارگیری متن پیام. پیام ممکن است خیلی بزرگ باشد و نشان داده نشود."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> خوانده نشده (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> خوانده نشده <xliff:g id="ACCOUNT">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> خوانده نشده <xliff:g id="ACCOUNT">%2$s</xliff:g>"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"در <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> حساب"</item>
+    <item quantity="other" msgid="2723797835410343458">"در <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> حساب"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"صندوق ورودی"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"صندوق خروجی"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"پیش نویس ها"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"سطل زباله"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"ارسال شد"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"ناخواسته"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"نسخه: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"حساب ها"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"صندوق ورودی ترکیبی"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"ستاره دار"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"پیش نویس ها"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"صندوق خروجی"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"لطفاً یک حساب را برای تازه کردن به صورت طولانی فشار دهید."</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"صندوق پستی"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"بارگیری پیام های بیشتر"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"گیرنده"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"گیرنده کپی"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"گیرنده کپی مخفی"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"موضوع"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"نگاشتن نامه"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- پیام اصلی --------"\n"موضوع: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"فرستنده: <xliff:g id="SENDER">%2$s</xliff:g>"\n"گیرنده: <xliff:g id="TO">%3$s</xliff:g>"\n"گیرنده کپی: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> نوشت:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"متن نقل قول شده"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"باید حداقل یک گیرنده اضافه کنید."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"برخی از آدرس های ایمیل نامعتبر هستند."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"فایل خیلی بزرگ است و پیوست نمی شود"</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> و <xliff:g id="NUMBER">%2$d</xliff:g> دیگر"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"گیرنده:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"گیرنده کپی:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"باز کردن"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"پیوست در کارت SD به عنوان <xliff:g id="FILENAME">%s</xliff:g> ذخیره شد."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"ذخیره پیوست در کارت SD امکان پذیر نیست."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"نمایش تصاویر"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"مشاهده در تقویم »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"دعوت تقویم"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"می روید؟"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" بله"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" شاید"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" خیر"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"شما این دعوتنامه را پذیرفته اید"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"شما پاسخ \"شاید\" به این دعوت نامه داده اید"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"شما این دعوتنامه را رد کرده اید"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"پیام حذف شد."</item>
+    <item quantity="other" msgid="6574961322865652255">"پیام ها حذف شدند."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"پیام رد شد."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"پیام به عنوان پیش نویس ذخیره شد."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"این پیوست نمایش داده نمی شود."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"تنظیم ایمیل"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"افزودن یک حساب Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"افزودن یک حساب Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"شما می توانید ایمیل را برای اکثر حساب ها فقط در چند مرحله پیکربندی کنید."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"شما می توانید یک حساب Exchange را فقط در چند مرحله پیکربندی کنید."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"شما می توانید حساب Exchange ActiveSync را فقط در چند مرحله پیکربندی کنید."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"ارسال ایمیل از این حساب به صورت پیش فرض."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"تنظیم دستی"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"یک آدرس ایمیل و رمز ورود معتبر تایپ کنید."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"حساب تکراری"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"این ورود به سیستم در حال حاضر برای حساب \"<xliff:g id="DUPLICATE">%s</xliff:g>\" استفاده می شود."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"در حال بازیابی اطلاعات حساب..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"در حال بررسی تنظیمات سرور ورودی..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"در حال بررسی تنظیمات سرور خروجی..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"تنظیم ایمیل"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"نامی به این حساب اختصاص دهید (اختیاری)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"نام شما (در پیام های خروجی نمایش داده می شود)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"افزودن حساب ایمیل جدید"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"این چه نوع حسابی است؟"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"تنظیمات سرور ورودی"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"نام کاربری"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"رمز ورود"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"سرور POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"سرور IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"درگاه"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"نوع امنیت"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"هیچکدام"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (پذیرش همه گواهی ها)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (پذیرش همه گواهی ها)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"حذف ایمیل از سرور"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"هرگز"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"هنگامی که من از صندوق ورودی حذف می کنم"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"پیشوند مسیر IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"اختیاری"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"تنظیمات سرور خروجی"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"سرور SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"درگاه"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"نوع امنیت"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"باید به سیستم وارد شوید."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"نام کاربری"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"رمز ورود"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"تنظیمات سرور"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"سرور"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"دامنه/نام کاربری"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"از اتصال امن (SSL) استفاده شود"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"پذیرش همه گواهی های SSL"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"گزینه های حساب"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"دفعات بررسی ایمیل"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"هرگز"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"خودکار (پیام سرویس)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"هر 5 دقیقه"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"هر 10 دقیقه"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"هر 15 دقیقه"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"هر 30 دقیقه"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"هر ساعت"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"ارسال ایمیل از این حساب به صورت پیش فرض."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"ورود ایمیل به من اعلان شود."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"همگام سازی مخاطبین از این حساب."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"همگام سازی تقویم از این حساب."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"تنظیم پایان نیافت"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"مقدار همگام سازی"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"یک روز"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"سه روز"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"یک هفته"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"دو هفته"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"یک ماه"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"نام کاربری یا رمز ورود نادرست است."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"نام کاربری یا رمز ورود نادرست است. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"اتصال امن به سرور امکان پذیر نیست."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"اتصال امن به سرور امکان پذیر نیست. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"اتصال به سرور امکان پذیر نیست."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"اتصال به سرور امکان پذیر نیست. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS لازم است اما توسط سرور پشتیبانی نمی شود."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"روش های تأیید اعتبار توسط سرور پشتیبانی نمی شوند."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"به دلیل خطای امنیتی، اتصال به سرور باز نمی شود."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"اتصال به سرور باز نمی شود."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"مدیریت امنیت راه دور"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"سرور <xliff:g id="SERVER">%s</xliff:g> از شما می خواهد که به آن اجازه دهید برخی از ویژگی های امنیتی گوشی شما را به صورت خودکار کنترل کند. آیا می خواهید تنظیم این حساب را به پایان برسانید؟"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"این سرور به ویژگی های امنیتی نیاز دارد که گوشی شما پشتیبانی نمی کند."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"تنظیمات امنیتی حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" باید به روزرسانی شود."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"به روزرسانی تنظیمات امنیتی"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"امنیت دستگاه"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"سرور <xliff:g id="SERVER">%s</xliff:g> از شما می خواهد که به آن اجازه دهید برخی از ویژگی های امنیتی گوشی شما را به صورت خودکار کنترل کند."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"ویرایش جزئیات"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"تنظیمات عمومی"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"حساب پیش فرض"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"ارسال ایمیل از این حساب به صورت پیش فرض"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"اعلان های ایمیل"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"ورود ایمیل در نوار وضعیت اعلان شود"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"دفعات بررسی ایمیل"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"تنظیمات ورودی"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"تنظیمات خروجی"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"نام حساب"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"نام شما"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"امضا"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"افزودن متن به پیام هایی که ارسال می کنید"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"تنظیمات اعلان"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"همگام سازی مخاطبین"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"همچنین همگام سازی مخاطبین از این حساب"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"همگام سازی تقویم"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"همچنین همگام سازی تقویم از این حساب"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"لرزش"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"همچنین لرزش هنگام دریافت ایمیل"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"همیشه"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط هنگام ساکت بودن"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"هرگز"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"لرزش"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"انتخاب آهنگ زنگ"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"تنظیمات سرور"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"حذف حساب"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" از ایمیل حذف می شود."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"ارتقا حساب ها"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"ارتقا حساب امکان پذیر نیست"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"دسترسی به صندوق پستی در برخی از انواع حساب های پستی Yahoo! پشتیبانی نمی شود. در صورتی که در اتصال با مشکل روبرو هستید، برای کسب اطلاعات بیشتر به yahoo.com رجوع کنید."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"قبل از تنظیم این حساب ایمیل، لطفاً از وب سایت Yahoo! بازدید کرده و دسترسی ایمیل POP3 را برای این حساب فعال کنید."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"فقط برخی از حساب های \"Plus\" از جمله دسترسی POP به این برنامه اجازه می دهند متصل شود. اگر شما نمی توانید با رمز ورود و آدرس ایمیل درست خود به سیستم وارد شوید، ممکن است فاقد یک حساب \"Plus\" پولی باشید. لطفاً مرورگر وب را برای دسترسی به این حساب های ایمیل راه اندازی کنید."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"قبل از تنظیم این حساب ایمیل، لطفاً از وب سایت T-Online بازدید کرده و یک رمز ورود برای دسترسی ایمیل POP3 ایجاد کنید."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"شرکت"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"پذیرفته شده: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"پذیرفته نشد: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"احتمالی: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"لغو شد: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"به روزرسانی شد: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"زمان: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"مکان: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"زمان: <xliff:g id="EVENTDATE">%s</xliff:g> (تکرار)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"این رویداد لغو شده است به مدت: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"جزئیات این رویداد تغییر کرده اند به مدت: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager نتوانست حساب را ایجاد کند؛ لطفاً دوباره امتحان کنید."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"ایمیل"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"خط مشی های امنیتی تعیین شده توسط سرور را فعال می کند"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"تقویم Exchange اضافه شد"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"در حال جستجو <xliff:g id="DOMAIN">%s</xliff:g>..."</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> نتیجه از <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> نتیجه از <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="RESULTS">%1$d</xliff:g> نتیجه اول از <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
new file mode 100644
index 0000000..d45b9b8
--- /dev/null
+++ b/res/values-fi/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Lähetetään viestejä…"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Lähetä lähtevät viestit"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Liitetiedostoa noudetaan."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Noudetaan liitetiedostoa <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Sähköpostin liitteiden luku"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Sallii sovelluksen lukea sähköpostin liitteitä."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Sähköpostipalveluntarjoajan tietojen käyttö"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Sallii sovelluksen käyttää sähköpostitietokantaa sekä sen saapuneita ja lähetettyjä viestejä, käyttäjänimiä ja salasanoja."</string>
+    <string name="app_name" msgid="5815426892327290362">"Sähköposti"</string>
+    <string name="compose_title" msgid="427986915662706899">"Viestin kirjoitus"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Virheenjäljitys"</string>
+    <string name="next_action" msgid="3931301986364184415">"Seuraava"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Peruuta"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Lähetä"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Vastaa"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Vastaa kaikille"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Poista"</string>
+    <string name="forward_action" msgid="669174181042344116">"Seuraava"</string>
+    <string name="done_action" msgid="7497990549515580249">"Valmis"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Hylkää"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Tallenna luonnokseksi"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Luettu/lukematon"</string>
+    <string name="read_action" msgid="4701484794504781686">"Merkitse luetuksi"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Merkitse lukemattomaksi"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Lisää suosikkeihin"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Lisää tähti"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Poista tähti"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Päivitä"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Lisää tili"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Poista kaikki valinnat"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Viestin kirjoitus"</string>
+    <string name="search_action" msgid="6325101454876682308">"Haku"</string>
+    <string name="open_action" msgid="936766723989190816">"Avaa"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Tilin asetukset"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Poista tili"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Kansiot"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Tilit"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Merkitse luetuksi"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Merkitse lukemattomaksi"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Lisää (piilo)kopio"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Lisää liitetiedosto"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Vedosasetukset"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Valitse liite"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Yhteysvirhe"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Uutta sähköpostia"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Viestin tekstiä ladattaessa tapahtui odottamaton virhe. Viesti voi olla liian suuri näytettäväksi."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> lukematon (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> lukematonta (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> lukematonta (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tilissä"</item>
+    <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tilissä"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Postilaatikko"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Lähtevät"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Luonnokset"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Roskakori"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Lähetetyt"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Roskaposti"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Versio: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Tilit"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Yhdistetty postilaatikko"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Tähdelliset"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Luonnokset"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Lähtevät"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Voit päivittää tilin painamalla sitä pitkään"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Postilaatikot"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Lataa lisää viestejä"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Vastaanottaja"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopio"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Piilokopio"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Aihe"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Kirjoita viesti"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Alkuperäinen viesti --------"\n"Aihe: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Lähettäjä: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Vastaanottaja: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopio: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> kirjoitti:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Lainattu teksti"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Vähintään yksi vastaanottaja on lisättävä."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Kaikki sähköpostiosoitteet eivät kelpaa."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Tiedosto on liian suuri liitettäväksi."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> ja <xliff:g id="NUMBER">%2$d</xliff:g> muuta"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Vastaanottaja:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Kopio:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Avaa"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Liite tallennettu SD-muistikortille nimellä <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Liitetiedostoa ei voi tallentaa SD-muistikortille."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Näytä kuvat"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Näytä kalenterissa »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Kalenterikutsu"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Osallistutko?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Kyllä"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Ehkä"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Ei"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Hyväksyit tämän kutsun"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Olet vastannut tähän kutsuun \"ehkä\""</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Hylkäsit tämän kutsun"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Viesti poistettiin."</item>
+    <item quantity="other" msgid="6574961322865652255">"Viestit poistettu."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Viesti hylätty."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Viesti tallennettiin luonnokseksi."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Tätä liitetiedostoa ei voi näyttää."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Sähköpostin määrittäminen"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lisää Exchange-tili"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Lisää Exchange ActiveSync -tili"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Voit määrittää useimpien sähköpostitilien asetukset helposti."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Voit määrittää Exchange-tilin asetukset helposti."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Voit määrittää Exchange ActiveSync -tilin asetukset helposti."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Lähetä sähköposti oletuksena tältä tililtä."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuaalinen määritys"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Anna kelvollinen sähköpostiosoite ja salasana."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Päällekkäiset tilit"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Nämä kirjautumistiedot ovat jo käytössä tilillä \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Noudetaan tilin tietoja…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Tarkistetaan saapuvan postin palvelimen asetuksia…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Tarkistetaan lähtevän postin palvelimen asetuksia…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Sähköpostin määrittäminen"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Anna tilille nimi (valinnainen)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Oma nimi (näytetään lähtevissä viesteissä)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Lisää uusi sähköpostitili"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Millainen tili tämä on?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Saapuvan postin palvelimen asetukset"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Käyttäjänimi"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Salasana"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-palvelin"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-palvelin"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Portti"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Suojaustyyppi"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ei mitään"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Hyväksy kaikki varmenteet)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Hyväksy kaikki varmenteet)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Poista viestit palvelimelta"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Ei koskaan"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kun poistan viestin postilaatikosta"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-polun etuliite"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valinnainen"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Lähtevän postin palvelimen asetukset"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-palvelin"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Portti"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Suojaustyyppi"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Edellytä kirjautumista."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Käyttäjänimi"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Salasana"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Palvelinasetukset"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Palvelin"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Toimialue\\käyttäjänimi"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Käytä suojattua yhteyttä (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Hyväksy kaikki SSL-varmenteet"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Tiliasetukset"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Sähköpostin tarkistustiheys"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Ei koskaan"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaattinen (Push)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"5 minuutin välein"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"10 minuutin välein"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15 minuutin välein"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30 minuutin välein"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Tunnin välein"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Lähetä sähköposti oletuksena tältä tililtä."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Ilmoita saapuvasta sähköpostista."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synkronoi tämän tilin yhteystiedot."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synkronoi tämän tilin kalenteri."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Määrityksiä ei voitu suorittaa loppuun"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Synkronoitava määrä"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Yksi päivä"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Kolme päivää"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Yksi viikko"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Kaksi viikkoa"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Yksi kuukausi"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Virheellinen käyttäjänimi tai salasana."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Virheellinen käyttäjänimi tai salasana."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Palvelimeen ei voi muodostaa suojattua yhteyttä."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Palvelimeen ei voi muodostaa suojattua yhteyttä."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Palvelimeen ei voi muodostaa yhteyttä."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Palvelimeen ei voi muodostaa yhteyttä."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS vaaditaan, mutta palvelin ei tue sitä."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Palvelin ei tue todennustapoja."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Palvelimeen ei voi muodostaa yhteyttä suojausvirheen takia."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Palvelinyhteyttä ei voi muodostaa."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Suojauksen etähallinta"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Palvelin <xliff:g id="SERVER">%s</xliff:g> vaatii, että sen sallitaan hallita joitakin puhelimen suojaustoiminnoista. Haluatko määrittää tämän tilin loppuun?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Palvelin vaatii suojausominaisuuksia, joita puhelimesi ei tue."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Tili \"<xliff:g id="ACCOUNT">%s</xliff:g>\" edellyttää, että suojausasetukset päivitetään."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Päivitä suojausasetukset"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Laitteen suojaus"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Palvelin <xliff:g id="SERVER">%s</xliff:g> vaatii, että sen sallitaan hallita joitakin puhelimen suojaustoiminnoista."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Muokkaa tietoja"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Yleiset asetukset"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Oletustili"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Lähetä sähköposti oletuksena tältä tililtä"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Sähköposti-ilmoitukset"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Ilmoita tilarivillä saapuneesta sähköpostista"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Sähköpostin tarkistustiheys"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Saapuvan postin asetukset"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Lähtevän postin asetukset"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Tilin nimi"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Oma nimi"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Allekirjoitus"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Liitä lähettämiisi viesteihin teksti"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Ilmoitusasetukset"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Synkronoi yhteystiedot"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synkronoi myös tämän tilin yhteystiedot"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synkronoi kalenteri"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synkronoi myös tämän tilin kalenteri"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Värinä"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Käytä värinää, kun sähköpostiviesti saapuu"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Aina"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Vain äänettömässä tilassa"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ei koskaan"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Värinä"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Valitse soittoääni"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Palvelinasetukset"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Poista tili"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Tili \"<xliff:g id="ACCOUNT">%s</xliff:g>\" poistetaan sähköpostista."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Tilien päivitys"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Tilin päivitys epäonnistui"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Postilaatikon käyttöä ei tueta kaikissa Yahoo!-postitileissä. Jos yhteyden muodostamisessa on ongelmia, saat lisätietoja osoitteesta yahoo.com."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Käy ennen tämän tilin luomista Yahoo!-sivustossa ja ota käyttöön sähköpostin POP3-käyttö tälle tilille."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Vain joihinkin Plus-tileihin sisältyy POP-käyttö, joka sallii tämän ohjelman muodostaa yhteyden. Jos et pysty kirjautumaan tiliisi sähköpostiosoitteellasi ja salasanallasi, sinulla ei ehkä ole maksullista Plus-tiliä. Pääset käyttämään näitä sähköpostitilejä käynnistämällä verkkoselaimen."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Käy ennen tämän sähköpostitilin luomista T-Onlinen sivustossa ja luo salasana sähköpostin POP3-käyttöä varten."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Yritys"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Hyväksytty: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Hylätty: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Alustava: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Peruutettu: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Päivitetty: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Milloin: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Missä: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Milloin: <xliff:g id="EVENTDATE">%s</xliff:g> (toistuva)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Poikkeus toistuvassa tapahtumassa, peruutettu <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Poikkeus toistuvassa tapahtumassa, muutettu <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"Tilienhallinta ei voinut luoda tiliä. Yritä uudelleen."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Sähköposti"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Ottaa käyttöön palvelinten määrittämät suojauskäytännöt"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-kalenteri lisätty"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Etsitään <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> tulos osoitteella <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> tulosta osoitteella <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Ensimmäiset <xliff:g id="RESULTS">%1$d</xliff:g> tulosta osoitteella <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 64c140c..f7d221e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Suivant"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Annuler"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Envoyer"</string>
     <string name="reply_action" msgid="4262472229221507619">"Répondre"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Répondre à tous"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Comptes"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marquer comme lu"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marquer comme non lu"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Ajouter Cc/CCi"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Ajouter une pièce jointe"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Paramètres d\'image mémoire"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> autres"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> autres"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nouveau(x)"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nouveau(x)"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nouveau(x)<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nouveau(x)<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Boîte de réception"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Boîte d\'envoi"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Brouillons"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Boîte d\'envoi"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Appuyez de manière prolongée sur un compte pour l\'actualiser."</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Boîtes aux lettres"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vue combinée"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Charger plus de messages"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> sélectionné(s)"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> sélectionné(s)"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Aucun message"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Langue cible"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cci"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Objet"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Nouveau message"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Message original --------"\n"Objet : <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De : <xliff:g id="SENDER">%2$s</xliff:g>"\n"À : <xliff:g id="TO">%3$s</xliff:g>"\n"Cc : <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a écrit :"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texte du message précédent"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Inclure le texte"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Vous devez ajouter au moins un destinataire."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Certaines adresses e-mail sont incorrectes."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Impossible de joindre le fichier, car il est trop volumineux."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> et <xliff:g id="NUMBER">%2$d</xliff:g> autres"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Langue cible:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc :"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Cci :"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Afficher"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Charger"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Enreg."</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"PJ enregistrée sous <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Impossible d\'enregistrer la pièce jointe."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Remarque : Une ou plusieurs pièces jointes du message que vous transférez vont être téléchargées avant l\'envoi."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Message"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Inviter"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Pièce jointe <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Pièces jointes <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Afficher les images"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Afficher dans l\'agenda"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invitation d\'agenda"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Vous avez accepté cette invitation."</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Vous avez répondu \"Peut-être\" à cette invitation."</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Vous avez refusé cette invitation."</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Message supprimé"</item>
     <item quantity="other" msgid="6574961322865652255">"Messages supprimés"</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> message déplacé vers <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> messages déplacés vers <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Impossible de transférer l\'une des pièces jointes."</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Impossible de transférer une ou plusieurs pièces jointes."</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Impossible d\'envoyer la pièce jointe <xliff:g id="FILENAME"> %s</xliff:g> avec votre message sortant, celle-ci n\'a pas pu être téléchargée."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Échec connexion <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Appuyez ici pour modifier les paramètres du compte."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Go"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> Go"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configuration de votre messagerie"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuration de votre messagerie"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Ajouter un compte Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Ajouter un compte Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Configurez des e-mails pour la plupart des comptes en à peine quelques minutes."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Configurez un compte Exchange en un clin d\'œil."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Configurez un compte Exchange ActiveSync en un clin d\'œil."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Adresse e-mail"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Mot de passe"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Par défaut, envoyer les e-mails avec ce compte"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuration manuelle"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Veuillez saisir une adresse e-mail et un mot de passe corrects."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Récupération des informations sur le compte…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Vérification des paramètres de serveur entrant…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Vérification des paramètres de serveur sortant…"</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Configuration de votre messagerie"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Votre compte est configuré et votre messagerie a été activée !"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuration de votre messagerie"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nom du compte (facultatif)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Votre nom (affiché sur les messages sortants)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Ajouter un compte de messagerie"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Ajouter un compte de messagerie"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De quel type de compte s\'agit-il ?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Paramètres de serveur entrant"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Paramètres de serveur entrant"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nom d\'utilisateur"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mot de passe"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Serveur POP3"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Si messages suppr. de boîte de récep."</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Préfixe du chemin IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facultatif"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Paramètres de serveur sortant"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Paramètres de serveur sortant"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Serveur SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Type de sécurité"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Connexion obligatoire."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nom d\'utilisateur"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mot de passe"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Paramètres du serveur"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Paramètres du serveur"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serveur"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domaine\\Nom d\'utilisateur"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utiliser une connexion sécurisée (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accepter tous les certificats SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Numéro de périphérique mobile :"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Options de compte"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Options de compte"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Fréquence de consultation de la boîte de réception"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Jamais"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatique (Push)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nom d\'utilisateur ou mot de passe incorrect."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Impossible d\'établir une connexion sécurisée avec le serveur."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Impossible d\'établir une connexion sécurisée avec le serveur."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Erreur du serveur. Veuillez vérifier votre nom d\'utilisateur et votre mot de passe, puis réessayez."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Impossible d\'établir une connexion avec le serveur."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Impossible d\'établir une connexion avec le serveur."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Protocole TLS requis mais non pris en charge par le serveur."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administration de la sécurité à distance"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Vous devez autoriser le serveur <xliff:g id="SERVER">%s</xliff:g> à contrôler à distance certaines fonctionnalités de sécurité de votre téléphone. Voulez-vous terminer la configuration de ce compte ?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Ce serveur nécessite des fonctionnalités de sécurité que votre téléphone ne prend pas en charge."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"AVERTISSEMENT : Si vous désactivez la gestion de votre appareil par l\'application de messagerie électronique, tous les comptes de messagerie électronique qui y sont associés seront supprimés, de même que leurs données (e-mails, contacts, événements d\'agenda, etc.)."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Le compte \"<xliff:g id="ACCOUNT">%s</xliff:g>\" nécessite une mise à jour de ses paramètres de sécurité."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Mettre à jour les paramètres de sécurité"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Sécurité du périphérique"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
new file mode 100644
index 0000000..e012e02
--- /dev/null
+++ b/res/values-he/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"שולח הודעות…"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"שלח הודעות יוצאות"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"משיג קובץ מצורף."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"מוריד את הקובץ המצורף <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"קרא קבצים מצורפים לדוא\"ל"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"מאפשר ליישום זה לקרוא קבצים המצורפים להודעות דוא\"ל."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"גש לנתוני ספק הדוא\"ל"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"מאפשר ליישום זה לגשת למסד נתוני הדוא\"ל שלך, כולל הודעות שהתקבלו, הודעות שנשלחו, שמות משתמש וסיסמאות."</string>
+    <string name="app_name" msgid="5815426892327290362">"דוא\"ל"</string>
+    <string name="compose_title" msgid="427986915662706899">"חבר"</string>
+    <string name="debug_title" msgid="5175710493691536719">"ניקוי באגים"</string>
+    <string name="next_action" msgid="3931301986364184415">"הבא"</string>
+    <string name="okay_action" msgid="8365197396795675617">"אישור"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"ביטול"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"שלח"</string>
+    <string name="reply_action" msgid="4262472229221507619">"השב"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"השב לכולם"</string>
+    <string name="delete_action" msgid="8421026208288857155">"מחק"</string>
+    <string name="forward_action" msgid="669174181042344116">"העבר"</string>
+    <string name="done_action" msgid="7497990549515580249">"בוצע"</string>
+    <string name="discard_action" msgid="6532206074859505968">"מחק"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"שמור כטיוטה"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"נקראה/לא נקראה"</string>
+    <string name="read_action" msgid="4701484794504781686">"סמן כנקרא"</string>
+    <string name="unread_action" msgid="6280399049357552826">"סמן כלא נקרא"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"מועדף"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"הוסף כוכב"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"הסר כוכב"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"רענן"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"הוסף חשבון"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"בטל בחירת הכל"</string>
+    <string name="compose_action" msgid="4045702519637388045">"חבר"</string>
+    <string name="search_action" msgid="6325101454876682308">"חיפוש"</string>
+    <string name="open_action" msgid="936766723989190816">"פתח"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"הגדרות חשבון"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"הסרת חשבון"</string>
+    <string name="folders_action" msgid="7502431531355227666">"תיקיות"</string>
+    <string name="accounts_action" msgid="901105887272231493">"חשבונות"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"סמן כפריט שנקרא"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"סמן כלא נקרא"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"הוסף עותק/עותק מוסתר"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"הוסף קובץ מצורף"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"הגדרות קובץ Dump"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"בחר קובץ מצורף"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"שגיאת התחברות"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"דוא\"ל חדש"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"שגיאה לא צפויה במהלך הורדה של הודעת טקסט. ייתכן שההודעה גדולה מדי לתצוגה."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> שלא נקראו (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> הודעות שלא נקראו (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> הודעות שלא נקראו (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"ב-<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> חשבונות"</item>
+    <item quantity="other" msgid="2723797835410343458">"ב-<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> חשבונות"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"תיבת דואר נכנס"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"תיבת דואר יוצא"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"טיוטות"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"פח אשפה"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"נשלח"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"דואר זבל"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"גרסה: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"חשבונות"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"תיבת דואר נכנס משולבת"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"מסומן בכוכב"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"טיוטות"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"תיבת דואר יוצא"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"לחץ לחיצה ארוכה על חשבון כדי לרענן אותו"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"תיבת דואר"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"טען הודעות נוספות"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"אל"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"עותק"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"עותק מוסתר"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"נושא"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"חבר דוא\"ל"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- הודעה מקורית --------"\n"נושא: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"מאת: <xliff:g id="SENDER">%2$s</xliff:g>"\n"אל: <xliff:g id="TO">%3$s</xliff:g>"\n"עותקים: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> כתב:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"טקסט מצוטט"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"עליך להוסיף נמען אחד לפחות."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"חלק מכתובות הדוא\"ל אינן חוקיות."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"הקובץ גדול מדי לצירוף."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> ו-<xliff:g id="NUMBER">%2$d</xliff:g> אחרים"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"אל:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"עותק:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"פתח"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"הקובץ המצורף נשמר בכרטיס SD בשם <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"אין אפשרות לשמור קובץ מצורף בכרטיס SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"הצג תמונות"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"הצג בלוח השנה »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"הזמנה של לוח שנה"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"משתתף?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" כן"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" אולי"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" לא"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"אישרת הזמנה זו"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"השבת \"אולי\" להזמנה זו"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"דחית הזמנה זו"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"ההודעה נמחקה."</item>
+    <item quantity="other" msgid="6574961322865652255">"ההודעות נמחקו."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"ההודעה נמחקה."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"ההודעה נשמרה כטיוטה."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"לא ניתן להציג קובץ מצורף זה."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"הגדר דוא\"ל"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"הוספת חשבון Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"הוסף חשבון Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"תוכל להגדיר דוא\"ל לרוב החשבונות באמצעות פעולות ספורות בלבד."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"ניתן להגדיר חשבון Exchange באמצעות מספר פעולות."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"ניתן להגדיר חשבון Exchange ActiveSync באמצעות מספר פעולות."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"שלח דוא\"ל מחשבון זה כברירת מחדל."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"הגדרה ידנית"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"הקלד כתובת דוא\"ל וסיסמה חוקיות."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"שכפל חשבון"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"התחברות זו כבר נמצאת בשימוש בחשבון \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"מאחזר פרטי חשבון..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"בודק הגדרות שרת דואר נכנס..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"בודק הגדרות שרת דואר יוצא..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"הגדרת דוא\"ל"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"תן שם לחשבון זה (אופציונלי)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"שמך (מוצג בהודעות יוצאות)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"הוספת חשבון דוא\"ל חדש"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"איזה סוג חשבון זה?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"הגדרות שרת דואר נכנס"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"שם משתמש"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"סיסמה"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"שרת POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"שרת IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"יציאה"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"סוג אבטחה"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ללא"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (קבל את כל האישורים)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (קבל את כל האישורים)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"מחיקת דוא\"ל מהשרת"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"אף פעם"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"בעת מחיקה מדואר נכנס"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"קידומת נתיב IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"אופציונלי"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"הגדרות שרת דואר יוצא"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"שרת SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"יציאה"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"סוג אבטחה"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"דרוש כניסה."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"שם משתמש"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"סיסמה"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"הגדרות שרת"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"שרת"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"דומיין/שם משתמש"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"השתמש בחיבור מאובטח (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"קבל את כל אישורי SSL"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"אפשרויות חשבון"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"תדירות בדיקת דוא\"ל"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"אף פעם"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"אוטומטית (דחיפה)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"כל 5 דקות"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"כל 10 דקות"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"כל 15 דקות"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"כל 30 דקות"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"כל שעה"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"שלח דוא\"ל מחשבון זה כברירת מחדל."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"הודע לי כשמגיע דוא\"ל."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"סנכרן אנשי קשר מחשבון זה."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"סנכרן את לוח השנה מחשבון זה."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"ההתקנה לא הסתיימה כראוי"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"כמות לסנכרון"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"יום אחד"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"שלושה ימים"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"שבוע אחד"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"שבועיים"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"חודש אחד"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"שם המשתמש או הסיסמה שגויים."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"שם המשתמש או הסיסמה שגויים."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"אין אפשרות להתחבר לשרת באופן בטוח."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"אי אפשר להתחבר לשרת באופן בטוח."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"אין אפשרות להתחבר לשרת."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"אין אפשרות להתחבר לשרת."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS נדרש אך אין לו תמיכה בשרת."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"השרת אינו תומך בשיטות האימות."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"אין אפשרות לפתוח חיבור לשרת בשל שגיאת אבטחה."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"אין אפשרות לפתוח חיבור לשרת."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"ניהול אבטחה מרחוק"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"השרת <xliff:g id="SERVER">%s</xliff:g> דורש שתאפשר לו שליטה מרחוק על תכונות אבטחה מסוימות בטלפון שלך. האם ברצונך לסיים הגדרת חשבון זה?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"שרת זה דורש תכונות אבטחה שהטלפון שלך לא תומך בהן."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"החשבון \"<xliff:g id="ACCOUNT">%s</xliff:g>\" דורש עדכון של הגדרות אבטחה."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"עדכן הגדרות אבטחה"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"אבטחת המכשיר"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"השרת <xliff:g id="SERVER">%s</xliff:g> דורש שתאפשר לו שליטה מרחוק על תכונות אבטחה מסוימות בטלפון שלך."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"ערוך פרטים"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"הגדרות כלליות"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"חשבון ברירת מחדל"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"שלח דוא\"ל מחשבון זה כברירת מחדל"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"התראות דוא\"ל"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"הצג הודעה בשורת המצב כאשר מגיע דוא\"ל"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"תדירות בדיקת דוא\"ל"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"הגדרות דואר נכנס"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"הגדרות דואר יוצא"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"שם חשבון"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"השם שלך"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"חתימה"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"הוסף טקסט להודעות שאתה שולח"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"הגדרות התראה"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"סנכרן אנשי קשר"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"סנכרן גם אנשי קשר מחשבון זה"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"סנכרן לוח שנה"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"סנכרן גם את לוח השנה מחשבון זה"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"רטט"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"הוסף גם רטט כשמגיע דוא\"ל"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"תמיד"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"רק במצב שקט"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"אף פעם"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"רטט"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"בחר צלצול"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"הגדרות שרת"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"הסרת חשבון"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"החשבון \"<xliff:g id="ACCOUNT">%s</xliff:g>\" יוסר מ\'דוא\"ל\'."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"שדרוג חשבונות"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"אין אפשרות לשדרג את החשבון"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"הגישה לתיבת הדואר אינה נתמכת עבור חלק מהסוגים של חשבונות דואר ב-Yahoo!‎. אם אתה נתקל בבעיות בהתחברות, בקר באתר yahoo.com לקבלת מידע נוסף."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"לפני הגדרת חשבון דוא\"ל זה, בקר באתר האינטרנט של Yahoo!‎ והפוך את גישת דוא\"ל מסוג POP3 לפעילה בחשבון זה."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"רק מספר חשבונות Plus כוללים גישה ל-POP המאפשרת לתוכנית זו להתחבר. אם אינך יכול להיכנס עם כתובת הדוא\"ל והסיסמה הנכונות שלך, ייתכן שאין לך חשבון Plus בתשלום. הפעל את דפדפן האינטרנט כדי לקבל גישה לחשבונות דואר אלה."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"לפני הגדרת חשבון דוא\"ל זה, בקר באתר האינטרנט T-Online וצור סיסמה לגישת דוא\"ל מסוג POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"תאגיד"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"התקבלה: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"נדחה: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"טנטטיבי: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"בוטל: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"עודכן: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"מתי: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"היכן: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"מתי: <xliff:g id="EVENTDATE">%s</xliff:g> (אירוע חוזר)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"אירוע זה בוטל לתאריך: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"הפרטים של אירוע זה השתנו עבור: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"למנהל החשבון לא הייתה אפשרות ליצור את החשבון. נסה שוב."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"דוא\"ל"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"אפשר מדיניות אבטחה המצוינת על ידי שרת"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"נוסף לוח שנה של Exchange"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"מחפש את <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> תוצאה מ-<xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> תוצאות של <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="RESULTS">%1$d</xliff:g> התוצאות הראשונות מ-<xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
new file mode 100644
index 0000000..6fdb4a4
--- /dev/null
+++ b/res/values-hr/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Slanje poruka……"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Slanje izlaznih poruka"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Dohvaćanje privitka."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Dohvaćanje privitka <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Pročitaj privitke e-pošte"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Omogućuje ovoj aplikaciji čitanje vaših privitaka e-pošte."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Pristup podacima davatelja usluge e-pošte"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Omogućuje ovoj aplikaciji pristup bazi podataka vaše e-pošte, uključujući primljene poruke, poslane poruke, korisnička imena i zaporke."</string>
+    <string name="app_name" msgid="5815426892327290362">"E-pošta"</string>
+    <string name="compose_title" msgid="427986915662706899">"Stvori novu poruku"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Otklanjanje pogrešaka"</string>
+    <string name="next_action" msgid="3931301986364184415">"Dalje"</string>
+    <string name="okay_action" msgid="8365197396795675617">"U redu"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Odustani"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Pošalji"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Odgovor"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Odgovori svima"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Izbriši"</string>
+    <string name="forward_action" msgid="669174181042344116">"Proslijedi"</string>
+    <string name="done_action" msgid="7497990549515580249">"Gotovo"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Odbaci"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Spremi kao skicu"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Pročitano/Nepročitano"</string>
+    <string name="read_action" msgid="4701484794504781686">"Označi kao pročitano"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Označi kao nepročitano"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Favorit"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Dodaj zvjezdicu"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Ukloni zvjezdicu"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Osvježi"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Dodavanje računa"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Poništi odabir svih"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Stvori novu poruku"</string>
+    <string name="search_action" msgid="6325101454876682308">"Pretraži"</string>
+    <string name="open_action" msgid="936766723989190816">"Otvori"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Postavke računa"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Ukloni račun"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Mape"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Računi"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Označi kao pročitano"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kao nepročitano"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Dodaj kopiju/skrivenu kopiju"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Dodaj privitak"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Postavke odlaganja"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Odaberite privitak"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Pogreška veze"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Nova e-pošta"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Neočekivana pogreška tijekom učitavanja teksta poruke. Poruka je možda prevelika za prikazivanje."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> nepročitanih (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> nepročitanih (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> nepročitanih (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"u <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računa"</item>
+    <item quantity="other" msgid="2723797835410343458">"u <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računa"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Pristigla pošta"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Izlazna pošta"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Skice"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Otpad"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Poslano"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Smeće"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Verzija: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Računi"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Kombinirana pristigla pošta"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Sa zvjezdicom"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Skice"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Izlazna pošta"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Dulje pritisnite račun kako biste ga osvježili"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Poštanski sandučić"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Učitaj više poruka"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Prima:"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopija"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skrivena kopija"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Predmet"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Stvori novu poruku"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Izvorna poruka --------"\n"Predmet: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Šalje: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Prima: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopija: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> je napisao:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citirani tekst"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Morate dodati barem jednog primatelja."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Neke adrese e-pošte nisu važeće."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Datoteka je prevelika za privitak."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> i <xliff:g id="NUMBER">%2$d</xliff:g> ostalih"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Prima:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Kopija:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Otvori"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Privitak je spremljen na SD karticu kao <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Spremanje privitka na SD karticu nije moguće."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Prikaži slike"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Prikaži u kalendaru »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Pozivnica kalendara"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Dolazite?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Da"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Možda"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Ne"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Prihvatili ste ovu pozivnicu"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Na ovu ste pozivnicu odgovorili s \"možda\""</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Odbili ste ovu pozivnicu"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Poruka je izbrisana."</item>
+    <item quantity="other" msgid="6574961322865652255">"Poruke su izbrisane."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Poruka je odbačena."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Poruka je spremljena kao skica."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Ovaj se privitak ne može prikazati."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Postavljanje e-pošte"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj Exchange račun"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj Exchange ActiveSync račun"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"E-poštu možete konfigurirati za većinu računa u samo nekoliko koraka."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Exchange račun možete konfigurirati u samo nekoliko koraka."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Račun Exchange ActiveSync možete konfigurirati u samo nekoliko koraka."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Šalji e-poštu s ovog računa prema zadanim postavkama."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ručno postavljanje"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Upišite važeću adresu e-pošte i zaporku."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Dupliciraj račun"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Ovi podaci za prijavu već se koriste za račun \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Učitavanje podataka o računu..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Provjeravanje postavki dolaznog poslužitelja..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Provjeravanje postavki izlaznog poslužitelja..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Postavljanje e-pošte"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dodijelite ovom računu naziv (opcionalno)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše ime (prikazano u izlaznim porukama)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Dodaj novi račun e-pošte"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Koja je ovo vrsta računa?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Postavke dolaznog poslužitelja"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Korisničko ime"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Zaporka"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 poslužitelj"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP poslužitelj"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Vrsta sigurnosti"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ništa"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Prihvati sve certifikate)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Prihvati sve certifikate)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Izbriši e-poštu s poslužitelja"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nikad"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kad izbrišem iz Pristigle pošte"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefiks IMAP putanje"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Izborno"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Postavke izlaznog poslužitelja"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP poslužitelj"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Vrsta sigurnosti"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Zahtijevajte prijavu."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Korisničko ime"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Zaporka"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Postavke poslužitelja"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"poslužitelj"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena\\Korisničko ime"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Koristi sigurnu vezu (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Prihvati sve SSL certifikate"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Mogućnosti računa"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Učestalost provjeravanja e-pošte"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikad"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatski (Push)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Svakih 5 minuta"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Svakih 10 minuta"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Svakih 15 minuta"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Svakih 30 minuta"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Svaki sati"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Šalji e-poštu s ovog računa prema zadanim postavkama."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Obavijesti me kad stigne e-pošta."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkroniziraj i kontakte s ovog računa."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkroniziraj kalendar s ovog računa"</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Postavljanje se ne može dovršiti"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Količina za sinkronizaciju"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jedan dan"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tri dana"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Jedan tjedan"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva tjedna"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jedan mjesec"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Korisničko ime ili zaporka nisu točni."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Korisničko ime ili zaporka nisu točni."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Sigurno povezivanje s poslužiteljem nije moguće."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Sigurno povezivanje s poslužiteljem nije moguće."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Povezivanje s poslužiteljem nije moguće."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Povezivanje s poslužiteljem nije moguće."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS je obavezan, ali ga poslužitelj ne podržava."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Poslužitelj ne podržava načine provjere autentičnosti."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Otvaranje veze s poslužiteljem nije moguće zbog pogreške sigurnosti."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nije moguće otvoriti vezu s poslužiteljem."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Sigurnosna administracija na daljinu"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Poslužitelj <xliff:g id="SERVER">%s</xliff:g> zahtijeva da mu omogućite daljinsko upravljanje nekim sigurnosnim značajkama vašeg telefona.. Želite li dovršiti postavljanje ovog računa?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Ovaj poslužitelj zahtijeva sigurnosne značajke koje vaš telefon ne podržava."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Račun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" zahtijeva ažuriranje sigurnosnih postavki."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Ažuriranje sigurnosnih postavki"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Sigurnost uređaja"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Poslužitelj <xliff:g id="SERVER">%s</xliff:g> zahtijeva da mu omogućite daljinsko upravljanje nekim sigurnosnim značajkama vašeg telefona."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Uredi pojedinosti"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Opće postavke"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Zadani račun"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Šalji e-poštu s ovog računa prema zadanim postavkama"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Obavijesti e-pošte"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Obavijesti na traci stanja kad stigne e-pošta"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Učestalost provjeravanja e-pošte"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Dolazne postavke"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Odlazne postavke"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Naziv računa"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše ime"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Potpis"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Dodajte tekst porukama koje šaljete"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Postavke obavijesti"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinkroniziraj kontakte"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinkroniziraj i kontakte s ovog računa"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinkroniziraj kalendar"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinkroniziraj i kalendar s ovog računa"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibracija"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibracija i kad stigne e-pošta"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Uvijek"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo ako je bešumno"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikad"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibracija"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Odaberite zvuk zvona"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Postavke poslužitelja"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Ukloni račun"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Račun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" bit će uklonjen iz e-pošte."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Nadogradnja računa"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Nadogradnja računa nije moguća"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Neke vrste Yahoo! računa e-pošte ne podržavaju pristup poštanskom sandučiću. Ako imate problema s povezivanje, posjetite yahoo.com za više informacija."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Prije postavljanja ovog računa e-pošte posjetite web-lokaciju Yahoo! i omogućite POP3 pristup e-pošti za ovaj račun."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Samo neki \"Plus\" računi uključuju POP pristup koji ovom programu omogućuje povezivanje. Ako se ne možete prijaviti sa svojom ispravnom adresom e-pošte i zaporkom, možda niste platili \"Plus\" račun. Pokrenite web-preglednik kako biste dobili pristup ovim računima e-pošte."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Prije postavljanja ovog računa e-pošte posjetite web-lokaciju T-Online i izradite zaporku za POP3 pristup e-pošti."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Korporacijski"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Prihvaćeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Odbijeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Probno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Otkazano: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Ažurirano: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Kad: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Gdje: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Kada: <xliff:g id="EVENTDATE">%s</xliff:g> (ponavljanje)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Ovaj je događaj otkazan za: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Pojedinosti ovog događaja promijenjene su za: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager ne može izraditi Račun. Pokušajte ponovo."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-pošta"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Omogućuje sigurnosna pravila određena poslužiteljem"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Dodan je Exchange kalendar"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Pretraživanje <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultata iz domene <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultata sa <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Prvih <xliff:g id="RESULTS">%1$d</xliff:g> rezultata iz domene <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
new file mode 100644
index 0000000..0fd4682
--- /dev/null
+++ b/res/values-hu/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Üzenetek küldése..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Kimenő üzenetek küldése"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Melléklet letöltése folyamatban."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Melléklet letöltése folyamatban.<xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"E-mail mellékletek olvasása"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Lehetővé teszi az alkalmazás számára az e-mail mellékletek olvasását."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Hozzáférés az e-mail szolgáltató adataihoz"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Lehetővé teszi az alkalmazás számára, hogy hozzáférjen az e-mail adatbázishoz, köztük a beérkezett és elküldött levelekhez, a felhasználónevekhez és a jelszavakhoz."</string>
+    <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
+    <string name="compose_title" msgid="427986915662706899">"Levélírás"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Hibakeresés"</string>
+    <string name="next_action" msgid="3931301986364184415">"Tovább"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Mégse"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Küldés"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Válasz"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Válasz mindenkinek"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Törlés"</string>
+    <string name="forward_action" msgid="669174181042344116">"Továbbítás"</string>
+    <string name="done_action" msgid="7497990549515580249">"Kész"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Elvetés"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Mentés piszkozatként"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Olvasott/olvasatlan"</string>
+    <string name="read_action" msgid="4701484794504781686">"Megjelölés olvasottként"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Megjelölés olvasatlanként"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Kedvenc"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Csillagozás"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Csillag eltávolítása"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Frissítés"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Fiók hozzáadása"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Az összes kijelölés törlése"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Levélírás"</string>
+    <string name="search_action" msgid="6325101454876682308">"Keresés"</string>
+    <string name="open_action" msgid="936766723989190816">"Megnyitás"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Fiókbeállítások"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Fiók eltávolítása"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Mappák"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Fiókok"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Megjelölés olvasottként"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Megjelölés olvasatlanként"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Másolatot kap és Titkos másolat mezők hozzáadása"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Melléklet hozzáadása"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Kiírási beállítások"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Melléklet kiválasztása"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Kapcsolathiba"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Új e-mail"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Nem várt hiba történt az üzenet szövegének betöltése során. Lehet, hogy az üzenet túl nagy ahhoz, hogy meg lehessen nézni."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> olvasatlan (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> olvasatlan (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> olvasatlan (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> fiókban"</item>
+    <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> fiókban"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Beérkezett üzenetek"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Kimenő levelek"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Piszkozatok"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Kuka"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Elküldve"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Spam"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Verzió: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Fiókok"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Összevont beérkező levelek"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Csillaggal megjelölt"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Piszkozatok"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Kimenő levelek"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Nyomja meg hosszan a fiók frissítéséhez"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Postaláda"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"További üzenetek betöltése"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Címzett"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Másolatot kap"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Titkos másolat"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Tárgy"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Levélírás"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Eredeti üzenet --------"\n"Tárgy: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Feladó: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Címzett: <xliff:g id="TO">%3$s</xliff:g>"\n"Másolatot kap: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a következőt írta:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Idézett szöveg"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Legalább egy résztvevőt hozzá kell adnia."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Egyes e-mail címek érvénytelenek."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"A csatolni kívánt fájl túl nagy."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> és még <xliff:g id="NUMBER">%2$d</xliff:g> címzett..."</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Címzett:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Másolatot kap:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Megnyitás"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"A melléklet a következő néven került mentésre az SD-kártyán: <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"A mellékleteket nem sikerült az SD-kártyára menteni."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Képek megjelenítése"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Megtekintés a Naptárban »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Meghívás a naptárban"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Részt vesz?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Igen"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Lehet"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Nem"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Ön elfogadta ezt a meghívást"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"\"Lehet\" választ adott erre a meghívásra"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Ön elutasította ezt a meghívást"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Üzenet törölve."</item>
+    <item quantity="other" msgid="6574961322865652255">"Az üzenetek törölve."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Üzenet elvetve."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Az üzenet mentve piszkozatként."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"A mellékletet nem lehet megjeleníteni."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-mail beállítása"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange-fiók hozzáadása"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync-fiók hozzáadása"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Néhány lépésben beállíthatja e-mailjeit a legtöbb fiókhoz."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Mindössze néhány lépésben beállíthat egy Exchange-fiókot."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Mindössze néhány lépésben beállíthat egy Exchange ActiveSync-fiókot."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-mailek küldése ebből a fiókból alapértelmezés szerint."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuális beállítás"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Adjon meg egy érvényes e-mail címet és jelszót."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Már létező fiók"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Ez a bejelentkezési adat már használatban van a következő fióknál: \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Fiókadatok beolvasása..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Bejövő üzeneteket kezelő szerver beállításainak ellenőrzése..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kimenő üzeneteket kezelő szerver beállításainak ellenőrzése..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-mail beállítása"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Fiók elnevezése (opcionális)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Az Ön neve (a kimenő üzenetekben való megjelenítéshez)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Új e-mail fiók hozzáadása"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Milyen típusú ez a fiók?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Bejövő üzeneteket kezelő szerver beállításai"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Felhasználónév"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Jelszó"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-szerver"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP-szerver"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Biztonság típusa"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nincs"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (minden tanúsítvány elfogadása)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (minden tanúsítvány elfogadása)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"E-mail törlése a szerverről"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Soha"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"A Beérkező levelek mappából való törléskor"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-alapú elérési út előtagja"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcionális"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kimenő üzenetek szerverének beállításai"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-szerver"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Biztonság típusa"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Bejelentkezés szükséges."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Felhasználónév"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Jelszó"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Szerverbeállítások"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Szerver"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\felhasználónév"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Biztonságos kapcsolat (SSL) használata"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Minden SSL-tanúsítvány elfogadása"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Fiókbeállítások"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"E-mailek ellenőrzésének gyakorisága"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Soha"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatikus (push)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"5 percenként"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"10 percenként"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15 percenként"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30 percenként"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Óránként"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"E-mail küldése ebből a fiókból alapértelmezés szerint"</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Értesítés megjelenítése e-mail érkezésekor"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Névjegyek szinkronizálása ebben a fiókban."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Naptár szinkronizálása ebben a fiókban."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"A telepítés nem fejeződött be."</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Szinkronizálás gyakorisága"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Egy nap"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Három nap"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Egy hét"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Két hét"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Egy hónap"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Helytelen felhasználónév vagy jelszó."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Helytelen felhasználónév vagy jelszó."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nem lehet biztonságos kapcsolatot létesíteni a szerverrel."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nem lehet biztonságos kapcsolatot létesíteni a szerverrel."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nem lehet kapcsolatot létesíteni a szerverrel."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nem lehet kapcsolódni a szerverhez."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS szükséges, de a szerver nem támogatja."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"A szerver nem támogatja a hitelesítési módokat."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Biztonsági hiba miatt nem lehet megnyitni a kapcsolatot a szerverhez."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nem lehet megnyitni a kapcsolatot a szerverhez."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Távoli biztonságkezelés"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"A(z) <xliff:g id="SERVER">%s</xliff:g> szerver engedélyt kér arra, hogy távolról vezérelhesse a telefon egyes biztonsági funkcióit. Befejezi a fiók konfigurálását?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"A szerver olyan biztonsági funkciókat követel meg, amelyeket a telefon nem támogat."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Frissíteni kell a(z) \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fiók biztonsági beállításait."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Biztonsági beállítások frissítése"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Eszközbiztonság"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"A(z) <xliff:g id="SERVER">%s</xliff:g> szerver engedélyt kér arra, hogy távolról vezérelhesse a telefon egyes biztonsági funkcióit."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Részletek szerkesztése"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Általános beállítások"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Alapértelmezett fiók"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"E-mail küldése ebből a fiókból alapértelmezés szerint"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail értesítések"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Értesítés megjelenítése az állapotjelzőn e-mailek érkezése esetén"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"E-mailek ellenőrzésének gyakorisága"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Bejövő üzenetek beállításai"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Kimenő üzenetek beállításai"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Fióknév"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Az Ön neve"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Aláírás"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Szöveg hozzáfűzése az elküldendő üzenetekhez"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Értesítési beállítások"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Névjegyek szinkronizálása"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Névjegyek szinkronizálása ebben a fiókban"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Naptár szinkronizálása"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Naptár szinkronizálása ebben a fiókban is"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rezgés"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Rezgés e-mail érkezésekor is"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Mindig"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Csak néma üzemmódban"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Soha"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rezgés"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Csengőhang kiválasztása"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Szerverbeállítások"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Fiók eltávolítása"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"A(z) \"<xliff:g id="ACCOUNT">%s</xliff:g>\" fiók el lesz távolítva az e-mail szolgáltatásból."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Fiókok frissítése"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"A fiókot nem lehet frissíteni"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"A postaláda elérése bizonyos típusú Yahoo!-postafiókok esetén nem támogatott. Ha probléma merül fel a csatlakozás során, további információért keresse fel a yahoo.com webhelyet."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Kérjük, az e-mail fiók beállítása előtt látogasson el a Yahoo! webhelyére, és engedélyezze a POP3-alapú hozzáférést a fiókhoz."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Csak bizonyos \"Plus\" típusú fiókok rendelkeznek olyan POP-hozzáféréssel, amely lehetővé teszi a program számára a kapcsolódást. Ha nem tud bejelentkezni a megfelelő e-mail címmel és jelszóval, valószínűleg nem fizetett elő \"Plus\" típusú fiókra. Kérjük, indítsa el a webböngészőt az ilyen e-mail fiókok eléréséhez."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Kérjük, az e-mail fiók beállítása előtt keresse fel a T-Online webhelyét, és hozzon létre jelszót a POP3-alapú hozzáféréshez."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Vállalati"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Elfogadva: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Elutasítva: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Feltételes: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Lemondva: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Frissítve: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Időpont: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Helyszín: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Időpont: <xliff:g id="EVENTDATE">%s</xliff:g> (ismétlődő)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Ezt az eseményt törölték: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Az esemény részletei a következőre módosultak: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"A Fiókkezelő nem tudta létrehozni a fiókot; kérjük, próbálja meg újra."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Engedélyezi a szerverspecifikus biztonsági irányelveket"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange-naptár hozzáadva"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Keresés itt: <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> találat a(z) <xliff:g id="DOMAIN">%2$s</xliff:g> domainből"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> találat a(z) <xliff:g id="DOMAIN">%2$s</xliff:g> domainből"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Az első <xliff:g id="RESULTS">%1$d</xliff:g> találat a(z) <xliff:g id="DOMAIN">%2$s</xliff:g> domainből"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
new file mode 100644
index 0000000..72372ad
--- /dev/null
+++ b/res/values-id/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Mengirim pesan…"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Kirim pesan keluar"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Mengambil lampiran."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Mengambil lampiran <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Baca lampiran Email"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Mengizinkan aplikasi ini membaca lampiran Email Anda."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Akses data penyedia Email"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Mengizinkan aplikasi ini untuk mengakses database Email, termasuk di antaranya pesan yang diterima, pesan terkirim, nama pengguna, dan sandi."</string>
+    <string name="app_name" msgid="5815426892327290362">"Email"</string>
+    <string name="compose_title" msgid="427986915662706899">"Tulis"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
+    <string name="next_action" msgid="3931301986364184415">"Berikutnya"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Batal"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Kirimkan"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Balas"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Balas ke semua"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Hapus"</string>
+    <string name="forward_action" msgid="669174181042344116">"Teruskan"</string>
+    <string name="done_action" msgid="7497990549515580249">"Selesai"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Buang"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Simpan sebagai draf"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Telah Dibaca/Belum Dibaca"</string>
+    <string name="read_action" msgid="4701484794504781686">"Tandai sudah dibaca"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Tandai belum dibaca"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Favorit"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Kilaukan bintang"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Redupkan bintang"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Segarkan"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Tambahkan akun"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Batalkan semua pilihan"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Tulis"</string>
+    <string name="search_action" msgid="6325101454876682308">"Telusuri"</string>
+    <string name="open_action" msgid="936766723989190816">"Buka"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Setelan akun"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Hapus akun"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Map"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Akun"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Tandai sudah dibaca"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Tandai belum dibaca"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Tambahkan Cc/Bcc"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Tambahkan lampiran"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Buang setelan"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Pilih lampiran"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Galat sambungan"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Email baru"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Galat tak terduga saat memuat teks pesan. Pesan mungkin terlalu besar untuk ditampilkan."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> yang belum dibaca (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> yang belum dibaca (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> yang belum dibaca (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"dalam <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> akun"</item>
+    <item quantity="other" msgid="2723797835410343458">"dalam <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> akun"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Kotak Masuk"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Kotak Keluar"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Konsep"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Sampah"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Terkirim"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Junk"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Versi: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Akun"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Kotak Masuk Terpadu"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Yang berkilau bintangnya"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Konsep"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Kotak Keluar"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Tekan lama pada akun untuk menyegarkannya"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Kotak surat"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Muat pesan lainnya"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Kepada"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Hal"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Tulis Surat"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pesan Asli --------"\n"Subjek: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Dari: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kepada: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n" <xliff:g id="SENDER">%s</xliff:g> menulis:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Kutipan teks"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Anda harus menambahkan setidaknya satu penerima."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Beberapa alamat email tidak valid."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Berkas terlalu besar untuk dilampirkan."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> dan <xliff:g id="NUMBER">%2$d</xliff:g> lainnya"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Kepada:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Buka"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Lampiran disimpan ke kartu SD sebagai <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Tidak dapat menyimpan lampiran ke kartu SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Tampilkan gambar"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Tampilkan di Kalender »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Undangan Kalender"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Gabung?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Ya"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Mungkin hadir"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Tidak"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Anda telah menerima undangan ini"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Anda telah menjawab \"mungkin\" pada undangan ini"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Anda telah menolak undangan ini"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Pesan yang dihapus."</item>
+    <item quantity="other" msgid="6574961322865652255">"Pesan yang dihapus."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Pesan dibuang."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Pesan disimpan sebagai draf."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Lampiran ini tidak dapat ditampilkan."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Siapkan email"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tambah akun Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tambahkan akun Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Anda dapat mengonfigurasi Email untuk kebanyakan akun hanya dalam beberapa langkah."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Anda dapat mengonfigurasi akun Exchange hanya dalam beberapa langkah."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Anda dapat mengonfigurasi akun Exchange Activesync hanya dalam beberapa langkah."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Kirim email dari akun ini secara bawaan."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Penyiapan manual"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Ketik alamat email dan sandi yang valid."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Gandakan Akun"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Info masuk ini sudah digunakan untuk akun \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Mengambil informasi akun..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Memeriksa setelan server masuk…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Memeriksa setelan server keluar…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Siapkan email"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Beri nama akun ini (opsional)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Nama (yang ditampilkan pada pesan keluar)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Tambah akun email baru"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jenis akun apakah ini?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Setelan server masuk"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nama Pengguna"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Sandi"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Jenis keamanan"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Tak Satu Pun"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Terima semua sertifikat)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Terima semua sertifikat)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Hapus email dari server"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Tidak pernah"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Jika saya hapus dari Kotak Masuk"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Awalan jalur IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opsional"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Setelan server keluar"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Jenis keamanan"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Harus masuk"</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nama Pengguna"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Sandi"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Setelan server"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Nama Pengguna"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gunakan sambungan aman (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Terima semua sertifikat SSL"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opsi akun"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekuensi pemeriksaan email"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Tidak pernah"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Otomatis (Tekan)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Setiap 5 menit"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Setiap 10 menit"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Setiap 15 menit"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Setiap 30 menit"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Setiap jam"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Kirim email dari akun ini secara bawaan."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Beri tahu saya ketika email tiba."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinkronkan kenalan dari akun ini."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinkronkan kalender dari akun ini."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Penyiapan tidak dapat diselesaikan"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Jumlah untuk disinkronkan"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Satu hari"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tiga hari"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Satu minggu"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dua minggu"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Satu bulan"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nama pengguna atau sandi salah."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nama pengguna atau sandi salah."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Tidak dapat terhubung ke server dengan aman."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Tidak dapat terhubung ke server dengan aman."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Tidak dapat terhubung ke server."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Tidak dapat terhubung ke server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS diperlukan, tetapi tidak didukung oleh server."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Metode autentikasi tidak didukung oleh server."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Tidak dapat membuka sambungan ke server karena galat keamanan."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Tidak dapat membuka sambungan ke server."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administrasi keamanan jarak jauh"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Server <xliff:g id="SERVER">%s</xliff:g> meminta Anda mengizinkannya mengontrol beberapa fitur keamanan ponsel dari jarak jauh. Apakah Anda ingin menyelesaikan penyiapan akun ini?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Server ini memerlukan fitur keamanan yang tidak didukung ponsel Anda."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" memerlukan pembaruan setelan keamanan."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Perbarui Keamanan Setelan"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Keamanan Perangkat"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"<xliff:g id="SERVER">%s</xliff:g> server meminta Anda mengizinkannya mengendalikan beberapa fitur keamanan ponsel dari jarak jauh."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edit detail"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Setelan umum"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Akun bawaan"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Kirim email dari akun ini secara bawaan"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Pemberitahuan email"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Beri tahu di bilah status ketika email tiba"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frekuensi pemeriksaan email"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Setelan masuk"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Setelan keluar"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Nama akun"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Nama Anda"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Tanda tangan"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Menambahkan teks ke pesan yang Anda kirim"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Setelan pemberitahuan"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinkronkan kenalan"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Juga sinkronkan kenalan dari akun ini"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinkronkan kalender"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Juga sinkronkan kalender dari akun ini"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar ketika email tiba"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Selalu"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Hanya saat senyap"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Tidak pernah"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Getar"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Pilih nada dering"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Setelan server"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Hapus akun"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" akan dihapus dari Email."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Meningkatkan versi akun"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Tidak dapat meningkatkan versi akun"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Akses kotak surat tidak didukung untuk beberapa jenis akun Yahoo! Mail. Jika mengalami masalah sambungan, kunjungi yahoo.com untuk informasi lebih lanjut."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Sebelum menyiapkan akun email ini, kunjungi situs web Yahoo! dan aktifkan akses email POP3 untuk akun ini."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Hanya beberapa akun \"Plus\" termasuk akses POP yang memungkinkan program ini terhubung. Jika tidak dapat masuk dengan alamat dan sandi email yang benar, Anda mungkin tidak memiliki akun \"Plus\" berbayar. Buka peramban Web untuk mendapat akses ke akun surat ini."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Sebelum menyiapkan akun email ini, kunjungi Situs web T-Online dan buat sandi untuk akses email POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Perusahaan"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Diterima: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Ditolak: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Tentatif: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Dibatalkan: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Diperbarui: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Kapan: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Di mana: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Waktu: <xliff:g id="EVENTDATE">%s</xliff:g> (terjadi berulang)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Acara ini telah dibatalkan untuk: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Detail acara ini telah diubah untuk: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager tidak dapat membuat Akun; harap coba lagi."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Email"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Mengaktifkan kebijakan keamanan yang ditentukan server"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Tukar kalender yang ditambahkan"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Menelusuri <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> hasil dari <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> hasil dari <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="RESULTS">%1$d</xliff:g> hasil pertama dari <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4d63836..3e3348d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Avanti"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Annulla"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Invia"</string>
     <string name="reply_action" msgid="4262472229221507619">"Rispondi"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Rispondi a tutti"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Account"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Segna come Già letto"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Segna come da leggere"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Aggiungi Cc/Ccn"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Aggiungi allegato"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Scarica impostazioni"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + altri <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + altri <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuovi"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuovi"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuovi<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nuovi<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Posta in arrivo"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Posta in uscita"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Bozze"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Posta in uscita"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Tieni premuto a lungo su un account per aggiornarlo"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Casella di posta"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Visualizzazione combinata"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carica ulteriori messaggi"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selezionato"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selezionato"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Nessun messaggio"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"In"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Ccn"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Oggetto"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Scrivi email"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Messaggio originale --------"\n"Oggetto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Da: <xliff:g id="SENDER">%2$s</xliff:g>"\n"A: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha scritto:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Testo tra virgolette"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Includi testo"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Devi aggiungere almeno un destinatario."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alcuni indirizzi email non sono validi."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"File troppo grande. Impossibile allegarlo."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e <xliff:g id="NUMBER">%2$d</xliff:g> altri"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"In:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Ccn:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Visualizza"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Carica"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Salva"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Allegato salvato come <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Impossibile salvare l\'allegato"</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota. Prima dell\'invio verranno scaricati uno o più allegati del messaggio inoltrato."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Messaggio"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invito"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Allegato <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Allegati <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostra immagini"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Visualizza in Calendario"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invito Calendario"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Hai accettato questo invito"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Hai risposto \"forse\" a questo invito"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Hai rifiutato questo invito"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Messaggio eliminato."</item>
     <item quantity="other" msgid="6574961322865652255">"Messaggi eliminati."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> messaggio spostato in <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> messaggi spostati in <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Impossibile inoltrare un allegato"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Impossibile inoltrare uno o più allegati"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Non è stato possibile inviare l\'allegato <xliff:g id="FILENAME"> %s</xliff:g> con la posta in uscita perché non è stato scaricato."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g>: accesso fallito"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Tocca per cambiare le impostazioni dell\'account"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Imposta email"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Imposta email"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Aggiungi un account Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Aggiungi un account Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Puoi configurare la posta per la maggior parte degli account con pochi passaggi."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puoi configurare un account Exchange con pochi passaggi."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Puoi configurare un account Exchange ActiveSync con pochi passaggi."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Indirizzo email"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Password"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Invia email da questo account per impostazione predefinita."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configurazione manuale"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Digita un indirizzo email e una password validi."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recupero informazioni sull\'account in corso…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verifica delle impostazioni del server della posta in arrivo in corso…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verifica impostazioni server posta in uscita…"</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Imposta email"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Il tuo account è stato impostato e l\'email sarà presto disponibile."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Imposta email"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Assegna un nome all\'account (facoltativo)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Il tuo nome (visualizzato nei messaggi in uscita)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Aggiungi un nuovo account email"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Aggiungi un nuovo account email"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Di quale tipo di account si tratta?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Impostazioni server della Posta in arrivo"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Impostazioni server della Posta in arrivo"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome utente"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando elimino da Posta in arrivo"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefisso percorso IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facoltativo"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Impostazioni server posta in uscita"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Impostazioni server posta in uscita"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo di protezione"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Richiedi accesso"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome utente"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Impostazioni server"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Impostazioni server"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Dominio/nome utente"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizza connessione sicura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Accetta tutti i certificati SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dispositivo mobile"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Opzioni account"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opzioni account"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequenza di controllo Posta in arrivo"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Mai"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatico (push)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome utente o password errata."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Impossibile connettersi correttamente al server."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Impossibile connettersi correttamente al server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Il server ha risposto con un errore. Controlla nome utente e password e riprova."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Impossibile connettersi al server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Impossibile connettersi al server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS richiesto ma non supportato dal server."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Amministrazione protezione da remoto"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Il server <xliff:g id="SERVER">%s</xliff:g> richiede che tu consenta il controllo remoto di alcune funzionalità di protezione del tuo telefono. Completare la configurazione dell\'account?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Per questo server sono richieste funzionalità di protezione non supportate dal tuo telefono."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"AVVISO. La disattivazione dell\'autorità dell\'applicazione Email per l\'amministrazione del dispositivo comporterà l\'eliminazione di tutti gli account Email che la richiedono, compresi i relativi messaggi email, contatti, eventi di calendario e altri dati."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"È richiesto l\'aggiornamento delle impostazioni di protezione per l\'account \"<xliff:g id="ACCOUNT">%s</xliff:g>\"."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Aggiorna impostazioni di protezione"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Protezione dispositivo"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bcc52480..8301608 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"次へ"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"キャンセル"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"送信"</string>
     <string name="reply_action" msgid="4262472229221507619">"返信"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"全員に返信"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"アカウント"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"既読にする"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"未読にする"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Cc/Bccを追加"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"添付ファイルを追加"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"ダンプ設定"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>と他<xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>件"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>と他<xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>件"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"新規: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="5620484088786656170">"新規: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"新規: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"新規: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"受信トレイ"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"送信トレイ"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"下書き"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"送信トレイ"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"更新するにはアカウントを長押ししてください"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"メールボックス"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"統合ビュー"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"さらにメールを読み込む"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>件を選択済み"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>件を選択済み"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"メッセージなし"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"To"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"件名"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"メッセージを作成"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 元のメッセージ --------"\n"件名: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>: "\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"元のメッセージ"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"元のメッセージを入れる"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"宛先を入力してください。"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"無効なメールアドレスがあります。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"添付ファイルが大きすぎます。"</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g>他<xliff:g id="NUMBER">%2$d</xliff:g>件"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"To:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Bcc:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"表示"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"読み込み"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"保存"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"添付ファイル<xliff:g id="FILENAME">%s</xliff:g>を保存しました。"</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"添付ファイルを保存できません。"</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"注: 送信前に転送メッセージの添付ファイルがダウンロードされます。"</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"メッセージ"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"招待"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"添付ファイル: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"添付ファイル: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"画像を表示"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"カレンダーで表示"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"カレンダーへの招待"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"この招待を承諾しました"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"この案内を仮承諾しました"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"この招待を辞退しました"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"メッセージを削除しました。"</item>
     <item quantity="other" msgid="6574961322865652255">"メッセージを削除しました。"</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>件のメッセージを<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>に移動しました"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>件のメッセージを<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>に移動しました"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"添付ファイルを転送できませんでした"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"1つ以上の添付ファイルを転送できませんでした"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"添付ファイル「<xliff:g id="FILENAME"> %s</xliff:g>」をダウンロードできなかったため、送信メールに添付できませんでした。"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g>でログインできません"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"タップしてアカウントの設定を変更します"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"メールアカウントの登録"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"メールアカウントの登録"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchangeアカウントを追加"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSyncアカウントを追加"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"ほとんどのメールアカウントを簡単な操作で設定できます。"</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Exchangeアカウントのメール設定は簡単な操作で完了します。"</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Exchange ActiveSyncアカウントの設定は簡単な操作で完了します。"</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"メールアドレス"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"パスワード"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"いつもこのアカウントでメールを送信"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手動セットアップ"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"有効なメールアドレスとパスワードを入力してください。"</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"アカウント情報を取得中..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"受信サーバーの設定を確認中..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"送信サーバーの設定を確認中..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"メールアカウントの登録"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"アカウントの登録が完了しました"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"メールアカウントの登録"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"このアカウントに名前を付ける (省略可):"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"あなたの名前(送信メールに表示されます)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"新しいメールアカウントを追加"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"新しいメールアカウントを追加"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"このアカウントのタイプ"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"受信サーバーの設定"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"受信サーバーの設定"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ユーザー名"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"パスワード"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3サーバー"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"受信トレイから削除したとき"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAPパスのプレフィックス"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"省略可"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"送信サーバーの設定"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"送信サーバーの設定"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTPサーバー"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"ポート"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"セキュリティの種類"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"ログインが必要"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ユーザー名"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"パスワード"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"サーバー設定"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"サーバー設定"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"サーバー"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"ドメイン\\ユーザー名"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"安全な接続(SSL)を使用する"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"すべてのSSL証明書を承認"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"携帯端末ID"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"アカウントのオプション"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"アカウントのオプション"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"受信トレイを確認する頻度"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"自動確認しない"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"自動(プッシュ)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ユーザー名かパスワードが間違っています。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"サーバーへの安全な接続を確立できません。"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"サーバーへの安全な接続を確立できません。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"サーバーからエラーが返されました。ユーザー名とパスワードを確認してもう一度お試しください。"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"サーバーに接続できません。"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"サーバーに接続できません。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLSが必要ですがサーバーが対応していません。"</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"セキュリティのリモート管理"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"携帯電話のセキュリティ機能の一部に対するリモートコントロールをサーバー<xliff:g id="SERVER">%s</xliff:g>に許可する必要があります。アカウントのセットアップを終了しますか?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"このサーバーにはお使いの携帯電話でサポートされていないセキュリティ機能が必要です。"</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"警告: メールアプリケーションの端末管理権限を無効にすると、権限を必要とするすべてのメールアカウントが削除されます。また、そのアカウントのメール、連絡先、カレンダーの予定などのデータも削除されます。"</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"アカウント「<xliff:g id="ACCOUNT">%s</xliff:g>」でセキュリティ設定の更新が必要です。"</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"セキュリティ設定を更新"</string>
     <string name="account_security_title" msgid="4441470647344315196">"携帯電話のセキュリティ"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5cb2b86..776c574 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"다음"</string>
     <string name="okay_action" msgid="8365197396795675617">"확인"</string>
     <string name="cancel_action" msgid="6967435583794021865">"취소"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"전송"</string>
     <string name="reply_action" msgid="4262472229221507619">"답장"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"전체답장"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"계정"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"읽음으로 표시"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"읽지않음으로 표시"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"참조/숨은참조 추가"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"첨부파일 추가"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"덤프 설정"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>님의 메일 + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>개"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g>님의 메일 + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>개"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"새 메일 <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>개"</item>
+    <item quantity="other" msgid="5620484088786656170">"새 메일 <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>개"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"새 메일 <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>개<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"새 메일 <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>개<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"받은편지함"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"보낼편지함"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"임시보관함"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"보낼편지함"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"새로고침하려면 계정을 길게 누르세요."</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"편지함"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"모든 받은편지함 보기"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"더 많은 메시지 로드"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>개 선택됨"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>개 선택됨"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"메일이 없습니다."</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"받는사람"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"참조"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"숨은 참조"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"제목"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"편지쓰기"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 원본 메시지 --------"\n"제목: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"보낸사람: <xliff:g id="SENDER">%2$s</xliff:g>"\n"받는사람: <xliff:g id="TO">%3$s</xliff:g>"\n"참조: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>님이 작성:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"받은메일"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"받은메일 포함"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"받는 사람을 한 명 이상 추가해야 합니다."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"일부 이메일 주소가 올바르지 않습니다."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"파일이 너무 커서 첨부할 수 없습니다."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> 외 <xliff:g id="NUMBER">%2$d</xliff:g>명"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"받는사람:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"참조:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"숨은 참조:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"보기"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"로드"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"저장"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"첨부파일을 <xliff:g id="FILENAME">%s</xliff:g>(으)로 저장했습니다."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"첨부파일을 저장할 수 없습니다."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"참고: 전달된 메시지에서 하나 이상의 첨부파일을 보내기 전에 다운로드합니다."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"메일"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"초대"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"첨부파일 <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>개"</item>
+    <item quantity="other" msgid="974463163535515223">"첨부파일 <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>개"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"사진 표시"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"캘린더에서 보기"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"캘린더 초대"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"초대를 수락했습니다."</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"이 초대에 \'미정\'으로 응답했습니다."</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"초대를 거절했습니다."</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"메시지를 삭제했습니다."</item>
     <item quantity="other" msgid="6574961322865652255">"메시지를 삭제했습니다."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"메일 <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>개가 <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>(으)로 이동됨"</item>
     <item quantity="other" msgid="2286739630865943494">"메일 <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>개가 <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>(으)로 이동됨"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"첨부파일을 전달할 수 없음"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"하나 이상의 첨부파일을 전달하지 못했습니다."</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"첨부파일(<xliff:g id="FILENAME"> %s</xliff:g>)을 다운로드할 수 없으므로 발신 메일과 함께 보내지 못했습니다."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> 로그인 실패"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"계정 설정을 변경하려면 터치합니다."</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"이메일 설정"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"이메일 설정"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange 계정 추가"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync 계정 추가"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"간단한 몇 가지 설정만으로 이메일 계정을 등록할 수 있습니다."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"간단한 몇 가지 설정만으로 Exchange 계정을 등록할 수 있습니다."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"간단한 몇 가지 설정만으로 Exchange ActiveSync 계정을 등록할 수 있습니다."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"이메일 주소"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"비밀번호"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"이 계정에서 이메일 보냄(기본값)"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"수동 설정"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"올바른 이메일 주소와 비밀번호를 입력하세요."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"계정 정보 검색 중..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"받는 서버 설정 확인 중..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"발신 서버 설정 확인 중..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"이메일 설정"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"계정이 성공적으로 등록되어 이메일을 사용할 수 있습니다."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"이메일 설정"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"계정 이름 지정(선택사항)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"이름(발신 메시지에 표시)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"새 이메일 계정 추가"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"새 이메일 계정 추가"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"계정 유형이 무엇입니까?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"수신 서버 설정"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"수신 서버 설정"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"사용자 이름"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"비밀번호"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 서버"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"받은편지함에서 삭제할 때"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 경로 접두어"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"선택사항"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"발신 서버 설정"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"발신 서버 설정"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 서버"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"포트"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"보안 유형"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"로그인 필요"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"사용자 이름"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"비밀번호"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"서버 설정"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"서버 설정"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"서버"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"도메인\\사용자 이름"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"보안 연결(SSL) 사용"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"모든 SSL 인증서 수락"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"휴대기기 ID"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"계정 옵션"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"계정 옵션"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"받은편지함 확인 빈도"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"안함"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"자동(푸시)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"사용자 이름 또는 비밀번호가 잘못되었습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"서버에 안전하게 연결할 수 없습니다."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"서버에 안전하게 연결할 수 없습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"서버에서 오류를 발견했습니다. 사용자 이름과 비밀번호를 확인한 다음 다시 시도해 주세요."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"서버에 연결할 수 없습니다."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"서버에 연결할 수 없습니다."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS가 필요하지만 서버에서 지원하지 않습니다."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"원격 보안 관리"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"<xliff:g id="SERVER">%s</xliff:g> 서버가 휴대전화의 몇 가지 보안 기능을 원격으로 제어할 수 있도록 해야 합니다. 이 계정 설정을 완료하시겠습니까?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"서버에 필요한 보안 기능 중, 휴대전화에서 지원하지 않는 것이 있습니다."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"경고: 이메일 애플리케이션의 기기 관리 권한을 비활성화하면 관련된 모든 이메일 계정이 해당 이메일, 주소록, 캘린더 일정 및 기타 데이터와 함께 삭제됩니다."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"\'<xliff:g id="ACCOUNT">%s</xliff:g>\' 계정을 사용하려면 보안 설정을 업데이트해야 합니다."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"보안 설정 업데이트"</string>
     <string name="account_security_title" msgid="4441470647344315196">"기기 보안"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
new file mode 100644
index 0000000..e827ce2
--- /dev/null
+++ b/res/values-land/dimensions.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- landscape -->
+<resources>
+    <dimen name="mailbox_list_padding_left">8dip</dimen>
+    <dimen name="mailbox_list_padding_right">32dip</dimen>
+</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
new file mode 100644
index 0000000..9ee3435
--- /dev/null
+++ b/res/values-lt/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Siunčiami pranešimai..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Siųsti siunčiamus pranešimus"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Pateikiamas priedas."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Pateikiamas priedas <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Skaityti el. pašto priedus"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Leidžia šiai programai skaityti jūsų el. pašto priedus."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Pasiekti el. pašto paslaugų teikėjo duomenis"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Leidžia šiai programai pasiekti jūsų el. pašto duomenis, įskaitant gautus pranešimus, išsiųstus pranešimus, naudotojų vardus ir slaptažodžius."</string>
+    <string name="app_name" msgid="5815426892327290362">"El. paštas"</string>
+    <string name="compose_title" msgid="427986915662706899">"Sukurti"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Derinti"</string>
+    <string name="next_action" msgid="3931301986364184415">"Kitas"</string>
+    <string name="okay_action" msgid="8365197396795675617">"Gerai"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Atšaukti"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Siųsti"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Atsakyti"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Atsakyti į visus"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Ištrinti"</string>
+    <string name="forward_action" msgid="669174181042344116">"Persiųsti"</string>
+    <string name="done_action" msgid="7497990549515580249">"Atlikta"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Atmesti"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Išsaugoti kaip juodraštį"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Skaityti / neskaityti"</string>
+    <string name="read_action" msgid="4701484794504781686">"Žymėti raudonai"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Pažymėti kaip neperskaitytą"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Įtraukti į adresyną"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Pridėti žvaigždutę"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Pašalinti žvaigždutę"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Atnaujinti"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Pridėti paskyrą"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Panaikinti visus žymėjimus"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Sukurti"</string>
+    <string name="search_action" msgid="6325101454876682308">"Ieškoti"</string>
+    <string name="open_action" msgid="936766723989190816">"Atidaryti"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Paskyros nustatymai"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Pašalinti paskyrą"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Aplankai"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Paskyros"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Pažymėti kaip skaitytą"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Pažymėti kaip neskaitytą"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Pridėti Cc (kopiją) ir Bcc (nematomąją kopiją)"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Pridėti priedą"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Iškelties nustatymai"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Pasirinkti priedą"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Ryšio klaida"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Naujas el. laiškas"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Įkeliant pranešimo tekstą įvyko netikėta klaida. Galbūt pranešimas per ilgas, kad galėtumėte jį žiūrėti."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> neperskaityti (-ų) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> neperskaityti (-ų) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> neperskaityti (-ų) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> paskyrose (-ų)"</item>
+    <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> paskyrose (-ų)"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Gautų laiškų aplankas"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Išsiųstieji"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Juodraščiai"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Šiukšliadėžė"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Išsiųsta"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Šlamštas"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Versija: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Paskyros"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Sujungtas gaunamų laiškų aplankas"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Pažymėta žvaigždute"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Juodraščiai"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Išsiųstieji"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Paspauskite ir laikykite nuspaudę paskyrą, jei norite ją atnaujinti"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Pašto dėžutė"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Įkelti daugiau pranešimų"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Kam"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc (kopija)"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc (nematomoji kopija):"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Tema"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Sukurti laišką"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pirminis pranešimas --------"\n"Tema: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Nuo: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kam: <xliff:g id="TO">%3$s</xliff:g>"\n"CC (kopija): <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> rašė:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Cituojamas tekstas"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Turite pridėti bent vieną gavėją."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Kai kurie el. pašto adresai neteisingi."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Failas per didelis, kad būtų pridėtas."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> ir <xliff:g id="NUMBER">%2$d</xliff:g> kiti (-ų)"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Kam:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc (kopija):"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Atidaryti"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Priedas išsaugotas SD kortelėje kaip <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Neįmanoma išsaugoti priedo SD kortelėje."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Rodyti paveikslėlius"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Žiūrėti Kalendoriuje »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Kalendoriaus kvietimas"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Dalyvausite?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Taip"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Gal"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Ne"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Priėmėte šį kvietimą"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Į šį kvietimą atsakėte „galbūt“"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Atmetėte šį kvietimą"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Pranešimas ištrintas."</item>
+    <item quantity="other" msgid="6574961322865652255">"Pranešimai ištrinti."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Pranešimas atmestas."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Pranešimas išsaugotas kaip juodraštis."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Šio priedo pateikti negalima."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nustatyti el. paštą"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Pridėti „Exchange“ paskyrą"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pridėti „Exchange ActiveSync“ paskyrą"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Daugelyje paskyrų galite konfigūruoti el. paštą, atlikę vos kelis veiksmus."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Galite konfigūruoti „Exchange“ paskyrą atlikę vos kelis veiksmus."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Galite konfigūruoti „Exchange ActiveSync“ paskyrą atlikę vos kelis veiksmus."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Nustatymas rankiniu būdu"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Įveskite galiojantį el. pašto adresą ir slaptažodį."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Kopijuoti paskyrą"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Šis prisijungimo vardas jau naudojamas paskyrai „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Nuskaitoma paskyros informacija..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Tikrinami gaunamų laiškų serverio nustatymai..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Tikrinami siunčiamo serverio nustatymai..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Nustatyti el. paštą"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Suteikti šiai paskyrai pavadinimą (pasirenkama)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jūsų vardas ir pavardė (pateikiami siunčiamuose pranešimuose)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Pridėti naują el. pašto paskyrą"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Kokio tipo tai paskyra?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Gaunamų laiškų serverio nustatymai"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Naudotojo vardas"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Slaptažodis"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 serveris"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP serveris"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Prievadas"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Saugos tipas"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nėra"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (priimti visus sertifikatus)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (priimti visus sertifikatus)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Ištrinti el. laišką iš serverio"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Niekada"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kai ištrinu iš gautų laiškų aplanko"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP prieigos kelio kodas"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Pasirenkama"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Siunčiamų laiškų serverio nustatymai"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP serveris"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Prievadas"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Saugos tipas"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Reikalauti prisijungti."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Naudotojo vardas"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Slaptažodis"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Serverio nustatymai"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serveris"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domenas / naudotojo vardas"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Naudoti saugų ryšį (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Priimti visus SSL sertifikatus"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Paskyros parinktys"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"El. pašto tikrinimo dažnumas"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Niekada"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatinis (spausti)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Kas 5 min."</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Kas 10 min."</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Kas 15 min."</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Kas 30 min."</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Kas valandą"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Pranešti man, kai gausiu el. laišką."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinchronizuoti šios paskyros adresatus."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinchronizuoti šios paskyros kalendorių."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Nepavyko pabaigti sąrankos"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Sinchronizuojamas kiekis"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Vieną dieną"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tris dienas"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Viena savaitė"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dvi savaitės"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Vienas mėnuo"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Neteisingas naudotojo vardas ar slaptažodis."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Neteisingas naudotojo vardas ar slaptažodis."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Negalima saugiai prisijungti prie serverio."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nepavyksta saugiai prisijungti prie serverio."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Negali prisijungti prie serverio."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Negalima prisijungti prie serverio."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Reikalingas TLS, bet jo nepalaiko serveris."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Serveris nepalaiko tapatybės nustatymo būdų."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Neįmanoma užmegzti ryšio su serveriu dėl saugos klaidos."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Neįmanoma užmegzti ryšio su serveriu."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Nuotolinis saugos administravimas"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serveris <xliff:g id="SERVER">%s</xliff:g> reikalauja leisti jam per atstumą valdyti kai kurias jūsų telefono saugos funkcijas. Ar norite užbaigti šios paskyros nustatymą?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Šis serveris reikalauja saugos funkcijų, kurių jūsų telefonas nepalaiko."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Reikalingas paskyros „<xliff:g id="ACCOUNT">%s</xliff:g>“ saugos nustatymų atnaujinimas."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Atnaujinti saugos nustatymus"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Įrenginio sauga"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Serveris <xliff:g id="SERVER">%s</xliff:g> reikalauja leisti jam per atstumą valdyti kai kurias jūsų telefono saugos funkcijas."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Redaguoti išsamią informaciją"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Bendri nustatymai"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Numatytoji paskyra"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"El. pašto pranešimai"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Būsenos juostoje pranešti, kai gaunamas el. laiškas"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"El. pašto tikrinimo dažnumas"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Gaunamų laiškų nustatymai"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Siunčiamų laiškų nustatymai"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Paskyros pavadinimas"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Jūsų vardas ir pavardė"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Parašas"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Priskirti tekstą prie siunčiamų pranešimų"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Įspėjimų nustatymai"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinchronizuoti adresatus"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Taip pat sinchronizuoti šios paskyros adresatus"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinchronizuoti kalendorių"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Iš šios paskyros sinchronizuoti ir kalendorių"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibruoti"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Taip pat vibruoti, kai gaunamas el. laiškas"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Visada"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tik kai veikia tyliai"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niekada"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibruoti"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Pasirinkti skambėjimo toną"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Serverio nustatymai"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Pašalinti paskyrą"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Paskyra „<xliff:g id="ACCOUNT">%s</xliff:g>“ bus pašalinta iš el. pašto."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Naujovinti paskyras"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Neįmanoma naujovinti paskyros"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Kai kurių „Yahoo!“ pašto paskyrų tipų pašto dėžučių prieiga nepalaikoma. Jei iškyla sunkumų prisijungiant, apsilankykite yahoo.com ir gaukite daugiau informacijos."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Prieš nustatydami šią el. pašto paskyrą, apsilankykite „Yahoo!“ svetainėje ir šiai paskyrai įgalinkite prieigą prie POP3 el. pašto."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Tik kai kuriose „Plus“ paskyrose yra POP prieiga, leidžianti prisijungti šiai programai. Jei negalite prisijungti su teisingu el. pašto adresu ir slaptažodžiu, galbūt neapmokėjote „Plus“ paskyros. Paleiskite žiniatinklio naršyklę, kad gautumėte prieigą prie šių pašto paskyrų."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Prieš nustatydami šią el. pašto paskyrą, apsilankykite „T-Online“ svetainėje ir sukurkite POP3 el. pašto prieigos slaptažodį."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Įmonės"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Priimta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Atmesta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Neapsispręsta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Atšaukta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Atnaujinta: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Kada: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Kur: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Kada: <xliff:g id="EVENTDATE">%s</xliff:g> (pasikartojantis)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Šis įvykis atšauktas: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Išsami šio įvykio informacija buvo pakeista: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"„AccountManager“ nepavyko sukurti paskyros; bandykite dar kartą."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"El. paštas"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Įgalina serverio apibrėžtą saugos politiką"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Pridėtas „Exchange“ kalendorius"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Ieškoma <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultatas iš <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultatai (-ų) iš <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Pirmieji <xliff:g id="RESULTS">%1$d</xliff:g> rezultatai (-ų) iš <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
new file mode 100644
index 0000000..70fd41c
--- /dev/null
+++ b/res/values-lv/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Notiek ziņojumu sūtīšana..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Sūtīt izejošos ziņojumus"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Pielikuma ienese."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Notiek pielikuma <xliff:g id="FILENAME">%s</xliff:g> ienese"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Lasīt e-pasta ziņojumu pielikumus"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Ļauj šai lietojumprogrammai lasīt e-pasta ziņojumu pielikumus."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Piekļūt e-pasta sniedzēja datiem"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Ļauj šai lietojumprogrammai piekļūt jūsu e-pasta datu bāzei, tostarp saņemtajiem ziņojumiem, nosūtītajiem ziņojumiem, lietotājvārdiem un parolēm."</string>
+    <string name="app_name" msgid="5815426892327290362">"E-pasts"</string>
+    <string name="compose_title" msgid="427986915662706899">"E-pasta ziņojuma rakstīšana"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Atkļūdot"</string>
+    <string name="next_action" msgid="3931301986364184415">"Tālāk"</string>
+    <string name="okay_action" msgid="8365197396795675617">"Labi"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Atcelt"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Sūtīt"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Atbildēt"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Atbildēt visiem"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Dzēst"</string>
+    <string name="forward_action" msgid="669174181042344116">"Pārsūtīt"</string>
+    <string name="done_action" msgid="7497990549515580249">"Gatavs"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Atmest"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Saglabāt kā melnrakstu"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Izlasīts/nelasīts"</string>
+    <string name="read_action" msgid="4701484794504781686">"Atzīmēt kā izlasītu"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Atzīmēt kā nelasītu"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Izlase"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Atzīmēt ar zvaigznīti"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Noņemt zvaigznīti"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Atsvaidzināt"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Pievienot kontu"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Noņemt visas atzīmes"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Rakstīt"</string>
+    <string name="search_action" msgid="6325101454876682308">"Meklēt"</string>
+    <string name="open_action" msgid="936766723989190816">"Atvērt"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Konta iestatījumi"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Noņemt kontu"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Mapes"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Konti"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Atzīmēt kā izlasītu"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Atzīmēt kā nelasītu"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Pievienot kopiju/diskrēto kopiju"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Pievienot pielikumu"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Izmetes iestatījumi"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Pielikuma izvēle"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Savienojuma kļūda"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Jauns e-pasta ziņojums"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Ielādējot ziņojuma tekstu, radās neparedzēta kļūda. Iespējams, ziņojumu nevar skatīt, jo tas ir pārāk garš."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> nelasīts(-i) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> nelasīts(-i) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> nelasīts(-i) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontā(-os)"</item>
+    <item quantity="other" msgid="2723797835410343458">"<xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> kontā(-os)"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Iesūtne"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Izsūtne"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Melnraksti"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Miskaste"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Nosūtītie"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Nevēlamie"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Versija: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Konti"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Apvienotā iesūtne"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Atzīmēti ar zvaigznīti"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Melnraksti"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Izsūtne"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Lai atsvaidzinātu kontu, lūdzu, nospiediet konta nosaukumu un turiet to."</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Pastkaste"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Ielādēt vairāk ziņojumu"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Kam"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopija"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Diskrētā kopija"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Temats"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Rakstīt vēstuli"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Sākotnējais ziņojums --------"\n"Temats: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"No: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kam: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopija: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> rakstīja:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citēts teksts"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Jāpievieno vismaz viens adresāts."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Dažas e-pasta adreses nav derīgas."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Failu nevar pievienot, jo tas ir pārāk liels."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> un citas personas (<xliff:g id="NUMBER">%2$d</xliff:g>)"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Kam:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Kopija:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Atvērt"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Pielikums saglabāts SD kartē kā <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Nevar saglabāt pielikumu SD kartē."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Rādīt attēlus"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Skatīt kalendārā »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Kalendāra ielūgums"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Vai apmeklēsiet?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Jā"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Varbūt"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Nē"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Jūs esat apstiprinājis ielūgumu."</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Jūs uz šo ielūgumu esat atbildējis \"Varbūt”"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Jūs esat noraidījis šo ielūgumu."</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Ziņojums ir dzēsts."</item>
+    <item quantity="other" msgid="6574961322865652255">"Ziņojumi ir dzēsti."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Ziņojums ir atmests."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Ziņojums ir saglabāts kā melnraksts."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Šo pielikumu nevar attēlot."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-pasta iestatīšana"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange konta pievienošana"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pievienot Exchange ActiveSync kontu"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Vairumā kontu e-pastu var konfigurēt, veicot tikai dažas darbības."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Varat konfigurēt Exchange kontu, veicot tikai dažas darbības."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Varat konfigurēt Exchange ActiveSync kontu, veicot tikai dažas darbības."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Pēc noklusējuma sūtīt e-pastu no šī konta."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuāla iestatīšana"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Lūdzu, ievadiet derīgu e-pasta adresi un paroli."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Dublēts konts"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Šis pieteikumvārds jau tiek izmantots kontam “<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Notiek konta informācijas izgūšana..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Notiek servera ienākošo datu iestatījumu pārbaude..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Notiek servera izejošo datu iestatījumu pārbaude…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-pasta iestatīšana"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ievadiet konta nosaukumu (neobligāti)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Jūsu vārds (attēlots izejošajos ziņojumos)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Jauna e-pasta konta pievienošana"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Kāds ir šī konta veids?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Servera ienākošo datu iestatījumi"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Lietotājvārds"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parole"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 serveris"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP serveris"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Ports"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Drošības veids"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Nav"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (pieņemt visus sertifikātus)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"Standarts SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (pieņemt visus sertifikātus)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Dzēst e-pasta ziņojumu no servera"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nekad"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kad es dzēšu no iesūtnes"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP ceļa prefikss"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Neobligāti"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Servera izejošo datu iestatījumi"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP serveris"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Ports"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Drošības veids"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Pieprasīt pierakstīšanos."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Lietotājvārds"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parole"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Servera iestatījumi"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serveris"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domēns\\lietotājvārds"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Lietot drošu savienojumu (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Pieņemt visus SSL sertifikātus"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Konta opcijas"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"E-pasta pārbaudes biežums"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nekad"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automātiski (piespiediet)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Ik pēc 5 minūtēm"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Ik pēc 10 minūtēm"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Ik pēc 15 minūtēm"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Ik pēc 30 minūtēm"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Ik pēc stundas"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Pēc noklusējuma sūtīt e-pastu no šī konta."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Paziņot man, kad tiek saņemts jauns e-pasta ziņojums."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinhronizēt kontaktpersonas no šī konta."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinhronizēt šī konta kalendāru."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Iestatīšanu nevarēja pabeigt."</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Sinhronizējamais apjoms"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Viena diena"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Trīs dienas"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Viena nedēļa"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Divas nedēļas"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Viens mēnesis"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Lietotājvārds vai parole nav pareiza."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Lietotājvārds vai parole nav pareiza."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nevar izveidot drošu savienojumu ar serveri."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nevar izveidot drošu savienojumu ar serveri."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nevar izveidot savienojumu ar serveri."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nevar izveidot savienojumu ar serveri."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Protokols TLS ir obligāts, taču serveris to neatbalsta."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Serveris neatbalsta autentifikācijas metodes."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Nevar izveidot savienojumu ar serveri drošības kļūdas dēļ."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nevar izveidot savienojumu ar serveri."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Attālināta drošības administrācija"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serveris <xliff:g id="SERVER">%s</xliff:g> pieprasa, lai jūs tam atļautu attālināti vadīt dažas tālruņa drošības funkcijas. Vai vēlaties pabeigt konta iestatīšanu?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Šis serveris pieprasa drošības funkcijas, ko jūsu tālrunis neatbalsta."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontā “<xliff:g id="ACCOUNT">%s</xliff:g>” nepieciešams atjaunināt drošības iestatījumus."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Drošības iestatījumu atjaunināšana"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Ierīces drošība"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Serveris <xliff:g id="SERVER">%s</xliff:g> pieprasa, lai jūs tam atļautu attālināti vadīt dažas tālruņa drošības funkcijas."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Rediģēt datus"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Vispārīgi iestatījumi"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Noklusējuma konts"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Pēc noklusējuma sūtīt e-pasta ziņojumus no šī konta"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-pasta paziņojumi"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Rādīt paziņojumu statusa joslā, kad tiek saņemts e-pasta ziņojums"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"E-pasta pārbaudes biežums"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Ienākošo datu iestatījumi"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Izejošo datu iestatījumi"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Konta nosaukums"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Jūsu vārds"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Paraksts"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Pievienot tekstu nosūtītajiem ziņojumiem"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Paziņojumu iestatījumi"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinhronizēt kontaktpersonas"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinhronizēt šī konta kontaktpersonas"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinhronizēt kalendāru"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinhronizēt šī konta kalendāru"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrozvans"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Izmantot vibrozvanu, kad tiek saņemts e-pasta ziņojums"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vienmēr"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tikai klusuma režīmā"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nekad"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrozvans"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Atlasīt zvana signālu"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Servera iestatījumi"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Konta noņemšana"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Konts “<xliff:g id="ACCOUNT">%s</xliff:g>” tiks noņemts no e-pasta."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Kontu jaunināšana"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Nevar jaunināt kontu"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Dažos Yahoo! pasta kontos piekļuve pastkastei netiek atbalstīta. Ja nevarat izveidot savienojumu, apmeklējiet yahoo.com, lai iegūtu plašāku informāciju."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Pirms šī e-pasta konta iestatīšanas, lūdzu, apmeklējiet Yahoo! vietni un iespējojiet POP3 e-pasta piekļuvi šim kontam."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Tikai dažiem “Plus” kontiem ir POP piekļuve, kas ļauj šai programmai izveidot savienojumu. Ja nevarat pierakstīties, izmantojot pareizu e-pasta adresi un paroli, iespējams, jums nav apmaksāta “Plus” konta. Lūdzu, palaidiet tīmekļa pārlūkprogrammu, lai piekļūtu šiem pasta kontiem."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Pirms šī e-pasta konta iestatīšana, lūdzu, apmeklējiet T-Online vietni un izveidojiet POP3 e-pasta piekļuvei paredzētu paroli."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Korporatīvs"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Pieņemts: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Noraidīts: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Pagaidu: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Atcelts: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Atjaunināts: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Kad: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Kur: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Kad: <xliff:g id="EVENTDATE">%s</xliff:g> (tiek atkārtots)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Pasākums šajā datumā ir atcelts: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Šī pasākuma dati šādā datumā ir mainīti: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager nevarēja izveidot kontu, lūdzu, mēģiniet vēlreiz."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-pasts"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Iespējo servera noteiktas drošības politikas"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Exchange kalendārs ir pievienots"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Notiek domēna <xliff:g id="DOMAIN">%s</xliff:g> meklēšana…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultāts no domēna <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultāti no domēna <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Pirmie <xliff:g id="RESULTS">%1$d</xliff:g> rezultāti no domēna <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7a5c9d7..23f11ad 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Neste"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Avbryt"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Send"</string>
     <string name="reply_action" msgid="4262472229221507619">"Svar"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Svar alle"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Kontoer"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Merk som lest"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merk som ulest"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Legg til kopi/blindkopi"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Legg til vedlegg"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Dump innstillinger"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> flere"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> flere"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nye<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Innboks"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Utboks"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Utkast"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Utboks"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Trykk på og hold inne en konto for å oppdatere den"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Postboks"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombinert visning"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Hent flere meldinger"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> valgt"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> valgt"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Ingen meldinger"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Til"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopi"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Blindkopi"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Emne"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv e-post"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Sitert tekst"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Inkluder tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du må legge til minst én mottager."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Noen e-postadresser er ugyldige."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen er for stor til å bli lagt ved."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> og <xliff:g id="NUMBER">%2$d</xliff:g> andre"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Til:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kopi:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Blindkopi:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Vis"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Laste inn"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Lagre"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Vedlegget lagret som <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Kan ikke lagre vedlegget."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Merk: Ett eller flere vedlegg i den videresendte meldingen lastes ned før sending."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Melding"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Inviter"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Vedlegg<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Vedlegg <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Vis bilder"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Vis i kalender"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalenderinvitasjon"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Du har godtatt invitasjonen"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Du har svart «kanskje» på denne invitasjonen"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Du har avslått invitasjonen"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Meldingen er slettet."</item>
     <item quantity="other" msgid="6574961322865652255">"Meldingene er slettet."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> melding flyttet til <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> meldinger flyttet til <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Kan ikke videresende vedlegget"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Kunne ikke videresende ett eller flere vedlegg"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Vedlegget <xliff:g id="FILENAME"> %s</xliff:g> kan ikke lastes ned, og kan derfor ikke sendes med den utgående e-postmeldingen."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> pålogging feilet"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Berør for å endre kontoinnstillinger"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Sett opp e-post"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Sett opp e-post"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Legg til en Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Legg til en Exchange ActiveSync-konto"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"De mest populære e-postkontoene kan stilles inn i få trinn."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Du kan sette opp en Exchange-konto med bare noen få enkle steg."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Du kan konfigurere en Exchange ActiveSync-konto ved kun å følge noen få trinn."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-postadresse"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Passord"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Bruk denne kontoen som standard for utgående e-post."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuelt oppsett"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Skriv inn en gyldig e-postadresse og passord."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontoinformasjon…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sjekker tjenerinnstillinger for inngående e-post…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sjekker tjenerinnstillinger for utgående e-post…"</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Sett opp e-post"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Kontoen er satt opp, og e-post er på vei!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Sett opp e-post"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Gi denne kontoen et navn (valgfritt)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Navnet ditt (vises i utgående meldinger)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Legg til ny e-postkonto"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Legg til ny e-postkonto"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hva slags konto er dette?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Tjenerinnstillinger for inngående e-post"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Tjenerinnstillinger for inngående e-post"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brukernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passord"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-tjener"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter den fra innboksen"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-stiprefiks"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valgfritt"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Tjenerinnstillinger for utgående e-post"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Tjenerinnstillinger for utgående e-post"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-tjener"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhetstype"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Krev pålogging."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brukernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passord"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Innstillinger for tjener"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Innstillinger for tjener"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Tjener"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domene\\brukernavn"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Bruk sikker tilkobling (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Godkjenn alle SSL-sertifikater"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobilenhets-ID"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Kontoinnstillinger"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoinnstillinger"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frekvens for kontroll av innboks"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldri"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatisk (push)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Feil brukernavn eller passord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan ikke åpne en sikker tilkobling til tjeneren."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Kan ikke åpne en sikker tilkobling til tjeneren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Tjeneren svarte med en feil. Kontroller brukernavn og passord og prøv igjen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Kan ikke koble til tjeneren."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Kan ikke koble til tjeneren."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS påkrevd, men tjeneren støtter det ikke."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Fjernadministrasjon av sikkerhet"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Tjeneren <xliff:g id="SERVER">%s</xliff:g> krever at den kan kontrollere noen av sikkerhetsfunksjonene på telefonen utenfra. Vil du fullføre oppsettet av kontoen?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Tjeneren krever sikkerhetsfunksjoner som denne telefonen ikke håndterer."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"ADVARSEL: Hvis du deaktiverer e-postprogrammets rett til å administrere enheten, vil alle e-postkontoene som krever programmet bli slettet, sammen med e-poster, kontakter, kalenderaktiviteter og andre data."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontoen «<xliff:g id="ACCOUNT">%s</xliff:g>» krever oppdatering av sikkerhetsinnstillingene."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Oppdater sikkerhetsinnstilinger"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Enhetssikkerhet"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index a6f66e4..5d97457 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Volgende"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Annuleren"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Verzenden"</string>
     <string name="reply_action" msgid="4262472229221507619">"Reageren"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Allen antwoord"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Accounts"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Markeren als gelezen"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markeren als ongelezen"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Cc/Bcc toevoegen"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Bijlage toevoegen"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Dumpinstellingen"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> meer"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> meer"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nieuw"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nieuw"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nieuw<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nieuw<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Postvak IN"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Postvak UIT"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Concepten"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Postvak UIT"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Druk lang op een account om het te vernieuwen"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Mailbox"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Gecombineerde weergave"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Meer berichten laden"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> geselecteerd"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> geselecteerd"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Geen berichten"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Naar"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Onderwerp"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Nieuw bericht"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Oorspronkelijk bericht --------"\n"Onderwerp: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Van: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Aan: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>schreef:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Geciteerde tekst"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Tekst opnemen"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"U moet minstens één ontvanger toevoegen."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Sommige e-mailadressen zijn ongeldig."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Bestand is te groot om bij te voegen."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> en <xliff:g id="NUMBER">%2$d</xliff:g> anderen"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Aan:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Bcc:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Weergeven"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Laden"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Opslaan"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Bijlage opgeslagen als <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Kan bijlage niet opslaan."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Opmerking: een of meer bijlagen in uw doorgestuurde bericht worden gedownload voordat het bericht wordt verzonden."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Bericht"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Uitnodigen"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Bijlage <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Bijlagen <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Afbeeldingen weergeven"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Weergeven in Agenda"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Agenda-uitnodiging"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"U heeft deze uitnodiging geaccepteerd"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"U heeft \'misschien\' geantwoord op deze uitnodiging"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"U heeft deze uitnodiging afgewezen"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Bericht verwijderd."</item>
     <item quantity="other" msgid="6574961322865652255">"Berichten verwijderd."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> bericht verplaatst naar <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> berichten verplaatst naar <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Een bijlage kan niet worden doorgestuurd"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Kan een of meer bijlagen niet doorsturen"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"De bijlage <xliff:g id="FILENAME"> %s</xliff:g> kan niet worden verzonden met uw uitgaande e-mail omdat de bijlage niet kan worden gedownload."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g>: aanmelden misl."</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Raak aan om accountinstellingen te wijzigen"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"E-mail instellen"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-mail instellen"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Een Exchange-account toevoegen"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Een Exchange ActiveSync-account toevoegen"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"U kunt E-mail voor de meeste accounts in enkele stappen configureren."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"U kunt een Exchange-account in enkele stappen configureren."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"U kunt een Exchange ActiveSync-account in enkele stappen configureren."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-mailadres"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Wachtwoord"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-mail standaard vanaf dit account verzenden"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Handmatig instellen"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Typ een geldig e-mailadres en wachtwoord"</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Accountinformatie ophalen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Serverinstellingen inkomende e-mail controleren..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Serverinstellingen uitgaande e-mail controleren..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"E-mail instellen"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Uw account is ingesteld en er is e-mail onderweg."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-mail instellen"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Geef dit account een naam (optioneel)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Uw naam (wordt weergegeven in uitgaande berichten)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Nieuw e-mailaccount toevoegen"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Nieuw e-mailaccount toevoegen"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Welk type account is dit?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Serverinstellingen inkomende e-mail"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Serverinstellingen inkomende e-mail"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Gebruikersnaam"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Wachtwoord"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Als ik verwijder uit mijn Postvak IN"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Voorvoegsel IMAP-pad"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Optioneel"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Serverinstellingen uitgaande e-mail"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Serverinstellingen uitgaande e-mail"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Poort"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Beveiligingstype"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Aanmelden vereist"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Gebruikersnaam"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Wachtwoord"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Serverinstellingen"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Serverinstellingen"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domein/gebruikersnaam"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Beveiligde verbinding (SSL) gebruiken"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Alle SSL-certificaten accepteren"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobiele apparaat-id"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Accountopties"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Accountopties"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Controlefrequentie inbox"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nooit"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatisch (push)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Gebruikersnaam of wachtwoord is onjuist."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Kan geen veilige verbinding met de server tot stand brengen."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Kan geen veilige verbinding met de server tot stand brengen."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"De server heeft een fout geretourneerd. Controleer uw gebruikersnaam en wachtwoord en probeer het opnieuw."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Kan geen verbinding maken met de server."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Kan geen verbinding maken met de server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS is vereist maar wordt niet ondersteund door de server."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Extern beveiligingsbeheer"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"De server <xliff:g id="SERVER">%s</xliff:g> vereist dat u de server toestemming geeft bepaalde beveiligingsfuncties van uw telefoon extern te bedienen. Wilt u het instellen van dit account voltooien?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Voor deze server zijn beveiligingsfuncties nodig die uw telefoon niet ondersteunt."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"WAARSCHUWING: als u de rechten van de e-mailtoepassing voor het beheren van uw apparaat uitschakelt, worden alle e-mailaccounts verwijderd waarvoor deze rechten vereist zijn, samen met de bijbehorende e-mails, contacten, agenda-afspraken en andere gegevens."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Account \'<xliff:g id="ACCOUNT">%s</xliff:g>\' vereist een update van de beveiligingsinstellingen."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Beveiligingsinstellingen bijwerken"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Apparaatbeveiliging"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index bae2c9d..40da8ea 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Dalej"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Anuluj"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Wyślij"</string>
     <string name="reply_action" msgid="4262472229221507619">"Odpowiedz"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Odpowiedz wszystkim"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Konta"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Oznacz jako przeczytane"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Oznacz jako nieprzeczyt."</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Dodaj DW/UDW"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Dodaj załącznik"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Zrzut ustawień"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> więcej"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> więcej"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"Nowe: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="5620484088786656170">"Nowe: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"Nowe: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"Nowe: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Odebrane"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Do wysłania"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Kopie robocze"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Do wysłania"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Naciśnij i przytrzymaj konto, aby je odświeżyć"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Skrzynka pocztowa"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Widok łączony"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Załaduj więcej wiadomości"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Wybrano: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
     <item quantity="other" msgid="7901361399231876038">"Wybrano: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Brak wiadomości"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Do"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"DW"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"UDW"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Temat"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Utwórz wiadomość"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Wiadomość oryginalna --------"\n"Temat: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Od: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Do: <xliff:g id="TO">%3$s</xliff:g>"\n"DW: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Użytkownik <xliff:g id="SENDER">%s</xliff:g> napisał:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Cytowany tekst"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Dołącz tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Musisz dodać co najmniej jednego adresata."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Niektóre adresy e-mail są nieprawidłowe."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Plik jest zbyt duży do załączenia."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> i inni (<xliff:g id="NUMBER">%2$d</xliff:g>)"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Do:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"DW:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"UDW:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Wyświetl"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Wczytaj"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Zapisz"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Załącznik zapisany jako <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Nie można zapisać załącznika."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Uwaga: co najmniej jeden załącznik w przekazywanej wiadomości zostanie pobrany przed wysłaniem."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Wiadomość"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Zaproś"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Załącznik (<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>)"</item>
+    <item quantity="other" msgid="974463163535515223">"Załączniki (<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>)"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Pokaż obrazy"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Wyświetl w kalendarzu"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Zaproszenie z kalendarza"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Zaakceptowano to zaproszenie"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Nie udzielono konkretnej odpowiedzi na to zaproszenie"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Odrzucono to zaproszenie"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Usunięto wiadomość."</item>
     <item quantity="other" msgid="6574961322865652255">"Usunięto wiadomości."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"Przeniesiono <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> wiadomość do <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"Przeniesiono <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> wiadomości do <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Nie można przekazać załącznika"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Co najmniej jednego załącznika nie można przekazać dalej"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Nie udało się wysłać załącznika <xliff:g id="FILENAME"> %s</xliff:g> z pocztą wychodzącą, ponieważ nie można go pobrać."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Błąd logowania (<xliff:g id="ACCOUNT_NAME">%s </xliff:g>)"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Dotknij, aby zmienić ustawienia konta"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Skonfiguruj konto e-mail"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Skonfiguruj konto e-mail"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj konto Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj konto Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Możesz tu skonfigurować większość kont pocztowych, wykonując zaledwie kilka czynności."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Możesz skonfigurować konto Exchange, wykonując zaledwie kilka czynności."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Możesz skonfigurować konto Exchange ActiveSync, wykonując zaledwie kilka czynności."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Adres e-mail"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Hasło"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Konfiguracja ręczna"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Podaj prawidłowy adres e-mail i hasło."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Pobieranie informacji o koncie…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sprawdzanie ustawień serwera poczty przychodzącej…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sprawdzanie ustawień serwera poczty wychodzącej…"</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Konfiguracja konta e-mail"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Konto zostało skonfigurowane, a wiadomości e-mail są w drodze!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Konfiguracja konta e-mail"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nazwa konta (opcjonalnie)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Twoja nazwa (wyświetlana w wiadomościach wychodzących)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Dodaj nowe konto e-mail"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Dodaj nowe konto e-mail"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Jakiego typu jest to konto?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Ustawienia serwera poczty przychodzącej"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Ustawienia serwera poczty przychodzącej"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nazwa użytkownika"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Hasło"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Serwer POP3"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Po usunięciu z folderu Odebrane"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefiks ścieżki IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcjonalnie"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Ustawienia serwera poczty wychodzącej"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Ustawienia serwera poczty wychodzącej"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Serwer SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpieczeń"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Wymagaj zalogowania się."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nazwa użytkownika"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Hasło"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Ustawienia serwera"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Ustawienia serwera"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Serwer"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena\\nazwa użytkownika"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Użyj bezpiecznego połączenia (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Akceptuj wszystkie certyfikaty SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Identyfikator telefonu komórkowego"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Opcje konta"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opcje konta"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Częstotliwość sprawdzania skrzynki odbiorczej"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nigdy"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatycznie (tryb Push)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nieprawidłowa nazwa użytkownika lub hasło."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nie można nawiązać bezpiecznego połączenia z serwerem."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nie można nawiązać bezpiecznego połączenia z serwerem."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Serwer zgłosił błąd. Sprawdź nazwę użytkownika i hasło, a następnie spróbuj ponownie."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nie można nawiązać połączenia z serwerem."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nie można nawiązać połączenia z serwerem."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Wymagane połączenie TLS nie jest obsługiwane przez serwer."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Zdalne administrowanie zabezpieczeniami"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serwer <xliff:g id="SERVER">%s</xliff:g> wymaga udzielenia zezwolenia na zdalną kontrolę niektórych funkcji zabezpieczeń telefonu. Chcesz zakończyć konfigurowanie tego konta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Ten serwer wymaga funkcji zabezpieczeń, których Twój telefon nie obsługuje."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"OSTRZEŻENIE: cofnięcie uprawnienia aplikacji pocztowej do administrowania urządzeniem spowoduje usunięcie wszystkich kont e-mail, które wymagają tego uprawnienia, wraz z wiadomościami, kontaktami, wydarzeniami w kalendarzu i innymi danymi."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Konto „<xliff:g id="ACCOUNT">%s</xliff:g>” wymaga aktualizacji ustawień zabezpieczeń."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Aktualizuj ustawienia zabezpieczeń"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Zabezpieczenia urządzenia"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-port/dimensions.xml b/res/values-port/dimensions.xml
new file mode 100644
index 0000000..f8a5959
--- /dev/null
+++ b/res/values-port/dimensions.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<!-- portrait -->
+<resources>
+    <dimen name="mailbox_list_padding_left">16dip</dimen>
+    <dimen name="mailbox_list_padding_right">32dip</dimen>
+</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a9c5b36..d59be16 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Seguinte"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Cancelar"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Enviar"</string>
     <string name="reply_action" msgid="4262472229221507619">"Responder"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Responder a todas"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Contas"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marcar como lida"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Adicionar Cc/Bcc"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Adicionar anexo"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Definições de imagem de erro"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + mais <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + mais <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">" <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novas"</item>
+    <item quantity="other" msgid="5620484088786656170">" <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novas"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">" <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novas<xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">" <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novas<xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Caixa de entrada"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Caixa de saída"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Rascunhos"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Caixa de saída"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Prima prolongadamente uma conta para a actualizar"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Caixa de correio"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vista combinada"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carregar mais mensagens"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionada(s)"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seleccionada(s)"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Não tem mensagens"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Para"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Assunto"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Redigir correio"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensagem original --------"\n"Assunto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escreveu:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto entre aspas"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Tem de adicionar pelo menos um destinatário."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alguns endereços de e-mail são inválidos."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Ficheiro demasiado grande para anexar."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e outros <xliff:g id="NUMBER">%2$d</xliff:g>"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Para:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Bcc:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Ver"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Carregar"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Guardar"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Anexo guardado como <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Não é possível guardar anexo."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Nota: um ou mais anexos da mensagem que encaminhou serão transferidos antes do envio."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensagem"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Convidar"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Anexo<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Anexos <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imagens"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Ver na Agenda"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Convite da agenda"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Aceitou o convite"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Respondeu \"talvez\" ao convite"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Recusou o convite"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Mensagem eliminada."</item>
     <item quantity="other" msgid="6574961322865652255">"Mensagens eliminadas."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensagem movida para <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensagens movidas para <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Não foi possível encaminhar um anexo"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Não foi possível encaminhar um ou mais anexos"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"O anexo <xliff:g id="FILENAME"> %s</xliff:g> não pôde ser enviado juntamente com o correio porque não pôde ser transferido."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g>: in. s. falhou"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Tocar para alterar as definições da conta"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurar e-mail"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar e-mail"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Pode configurar o e-mail para a maioria das contas em apenas alguns passos."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Pode configurar uma conta do Exchange em apenas alguns passos."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Pode configurar uma conta do Exchange ActiveSync em apenas alguns passos."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Endereço de e-mail"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Palavra-passe"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar e-mail a partir desta conta por predefinição."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Escreva um endereço de e-mail e uma palavra-passe válidos."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"A obter informações da conta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"A verificar definições do servidor de recepção..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"A verificar definições do servidor de envio..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Configurar e-mail"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"A sua conta está configurada e o e-mail vai a caminho!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurar e-mail"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar um nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"O seu nome (apresentado nas mensagens enviadas)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Adicionar nova conta de e-mail"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Adicionar nova conta de e-mail"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é este?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Definições do servidor de recepção"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Definições do servidor de recepção"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de utilizador"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Palavra-passe"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando elimino da pasta A Receber"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixo de caminho IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Definições de servidor de envio"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Definições de servidor de envio"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de segurança"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Solicitar início de sessão."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de utilizador"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Palavra-passe"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Definições do servidor"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Definições do servidor"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domínio/Nome de utilizador"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizar ligação segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceitar todos os certificados SLL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID do dispositivo móvel"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Opções da conta"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opções da conta"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequência de verificação de caixa de entrada"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automático (Envio)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome de utilizador ou palavra-passe incorrectos."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Não é possível ligar ao servidor em segurança."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Não é possível ligar ao servidor em segurança."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"O servidor respondeu com um erro; verifique o nome de utilizador e palavra-passe e tente de novo."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Não é possível efectuar a ligação ao servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Não é possível efectuar a ligação ao servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS necessário mas não suportado pelo servidor."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administração de segurança remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer permissão para controlar remotamente algumas das funcionalidades de segurança do telefone. Pretende concluir a configuração desta conta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Este servidor do requer funcionalidades de segurança que não são suportadas pelo telefone."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"AVISO: desactivar a autorização da aplicação de e-mail para administrar o dispositivo vai eliminar todas as contas de e-mail que necessitam desta, juntamente com o respectivo e-mail, contactos, eventos de calendário e outros dados."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requer a actualização das definições de segurança."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Actualizar definições de segurança"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Segurança do dispositivo"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c4b45eb..2da4296 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Próxima"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Cancelar"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Enviar"</string>
     <string name="reply_action" msgid="4262472229221507619">"Responder"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Resp p/ todos"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Contas"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marcar como lidas"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Adicionar Cc/Cco"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Adicionar anexo"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Despejar configurações"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> mais"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> mais"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novos"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novos"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novos<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> novos<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Caixa de entrada"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Caixa de saída"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Rascunhos"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Caixa de saída"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mantenha pressionada uma conta para atualizá-la"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Caixa de correio"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Visualização combinada"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Carregar mais mensagens"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selecionada(s)"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selecionada(s)"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Nenhuma mensagem"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Para"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cco"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Assunto"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Escrever e-mail"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensagem Original --------"\n"Assunto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escreveu:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto das mensagens anteriores"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Você deve adicionar pelo menos um destinatário."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Alguns endereços de e-mail são inválidos."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Arquivo muito grande para ser anexado."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e outras <xliff:g id="NUMBER">%2$d</xliff:g> pessoas"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Para:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Cco:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Visualizar"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Carregar"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Salvar"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Anexo salvo como <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Não foi possível salvar anexo."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Obs.: um ou mais anexos de sua mensagem encaminhada serão carregados antes do envio."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Mensagem"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Convidar"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Anexo <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> anexos"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mostrar imagens"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Ver na Agenda"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Convite do Google Agenda"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Você aceitou este convite"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Você respondeu \"talvez\" para esse convite."</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Você recusou este convite"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Mensagem excluída."</item>
     <item quantity="other" msgid="6574961322865652255">"Mensagens excluídas."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensagens movidas para <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensagens movidas para <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Um anexo não pôde ser encaminhado"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Não foi possível encaminhar todos os anexos"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Não foi possível fazer o download do anexo <xliff:g id="FILENAME"> %s</xliff:g>, por isso, não foi possível carregá-lo nem enviá-lo com seu e-mail."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Falha no login de <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Toque para alterar as configurações da conta"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> b"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurar e-mail"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar e-mail"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Você pode configurar o E-mail para a maioria das contas em apenas algumas etapas."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Você pode configurar uma conta do Exchange em apenas algumas etapas."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Você pode configurar uma conta do Exchange ActiveSync em apenas algumas etapas."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Endereço de e-mail"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Senha"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar e-mail desta conta por padrão."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Digite um endereço de e-mail e senha válidos."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando informações sobre a conta"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verificando as configurações de entrada do servidor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verificando as configurações de saída do servidor..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Configurar e-mail"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Sua conta está configurada e o e-mail está a caminho!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurar e-mail"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar nome a esta conta (opcional)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Seu nome (exibido nas mensagens enviadas)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Adicionar nova conta de e-mail"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Adicionar nova conta de e-mail"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Que tipo de conta é esta?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Configurações de entrada do servidor"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configurações de entrada do servidor"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nome de usuário"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Senha"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Servidor POP3"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Quando eu excluir da Caixa de entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixo do caminho IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Configurações de servidor enviadas"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configurações de servidor enviadas"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Servidor SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Porta"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipo de segurança"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Requer login."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nome de usuário"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Senha"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Configurações do servidor"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Configurações do servidor"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Servidor"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domínio\\Nome de usuário"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Usar conexão segura (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Aceitar todos os certificados SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID do aparelho celular"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Opções da conta"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opções da conta"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequência de verificação da caixa de entrada"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nunca"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automático (envio)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nome de usuário ou senha incorretos. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Não é possível se conectar ao servidor com segurança."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Não é possível se conectar ao servidor com segurança."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"O servidor respondeu com um erro. Verifique seu nome de usuário e senha e tente novamente."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Não é possível se conectar ao servidor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Não é possível se conectar ao servidor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS solicitado, mas não suportado pelo servidor."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administração de segurança remota"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"O servidor <xliff:g id="SERVER">%s</xliff:g> requer a permissão de controle remoto de alguns recursos de segurança do seu telefone. Deseja concluir a configuração desta conta?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Este servidor precisa de recursos de segurança que não são compatíveis com o seu telefone."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"AVISO: ao desativar a autoridade de aplicativo de e-mail para administrar seu dispositivo, todas as contas de e-mail vinculadas, além de e-mail, contatos, eventos da agenda e outros dados serão excluídos."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" requer a atualização das configurações de segurança."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Atualizar as configurações de segurança"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Segurança do aparelho"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index aa7efc6..3d4fb15 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Vinavant"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Interrumper"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Trametter"</string>
     <string name="reply_action" msgid="4262472229221507619">"Respunder"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Respunder a tuts"</string>
@@ -56,14 +58,15 @@
     <string name="accounts_action" msgid="901105887272231493">"Contos"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Marcar sco legì"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar sco nunlegì"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Agiuntar «Cc»/«Bcc»"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Agiuntar ina agiunta"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Parameters per in maletg da memoria (dump)"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Tscherner ina agiunta"</string>
     <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
     <skip />
-    <!-- no translation found for status_loading_messages (6552307237621292344) -->
-    <skip />
+    <string name="status_loading_messages" msgid="6552307237621292344">"Ils messadis vegnan chargiads…"</string>
     <string name="status_network_error" msgid="6045933332005067021">"Errur da connexiun"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Nov e-mail"</string>
     <string name="error_loading_message_body" msgid="2265140604109272914">"Ina errur nunspetgada è cumparida cun chargiar il text dal messadi. Eventualmain è il text memia lung per vegnir mussà."</string>
@@ -84,6 +87,8 @@
     <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
     <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
     <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Posta entrada"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Posta sortida"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Sbozs"</string>
@@ -96,20 +101,31 @@
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Cun staila"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Sbozs"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Posta sortida"</string>
-    <!-- no translation found for account_folder_list_refresh_toast (8158352329765828902) -->
-    <skip />
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Smatgar ditg sin in conto per l\'actualisar"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Chascha da brevs"</string>
     <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
     <skip />
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Chargiar ulteriurs messadis"</string>
-    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
-    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+  <plurals name="message_view_selected_message_count">
+    <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> selected"</item>
+    <item quantity="other" msgid="7901361399231876038">"Tschernì <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
+  </plurals>
     <!-- no translation found for message_list_no_messages (7846910091922523867) -->
     <skip />
     <string name="message_compose_to_hint" msgid="2891895306418177013">"A"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Object"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Nov messadi"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Messadi original --------"\n"Object: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Da: <xliff:g id="SENDER">%2$s</xliff:g>"\n"A: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha scrit:"\n\n</string>
@@ -122,17 +138,14 @@
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> e <xliff:g id="NUMBER">%2$d</xliff:g> auters"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"A:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
-    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Avrir"</string>
-    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
-    <skip />
-    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
-    <skip />
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Bcc:"</string>
+    <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Far ir"</string>
+    <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Chargiar"</string>
+    <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Memorisar"</string>
+    <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Fermar"</string>
     <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Agiunta memorisada sin la carta SD sut il num <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Impussibel da memorisar l\'agiunta sin la carta SD."</string>
-    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
-    <skip />
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"Remartga: Ina u pliras agiuntas en Voss messadi renvià vegn(an) telechargiada(s) avant la spediziun."</string>
     <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
     <skip />
     <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
@@ -140,7 +153,7 @@
     <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
     <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Mussar ils maletgs"</string>
-    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Mussar en il chalender »"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Mussar en il chalender"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Invitaziun da chalender"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Participar?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Gea"</string>
@@ -149,6 +162,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Vus avais acceptà questa invitaziun."</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Vus avais respundì «Forsa» a questa invitaziun."</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Vus avais refusà questa invitaziun."</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Messadi stizzà"</item>
     <item quantity="other" msgid="6574961322865652255">"Stizzà ils messadis"</item>
@@ -156,38 +173,50 @@
     <string name="message_discarded_toast" msgid="3891461729325584026">"Stizzà il messadi"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Memorisà il messadi sco sboz."</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Impussibel da mussar questa agiunta."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
-    <skip />
-    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
-    <skip />
+    <string name="message_view_load_attachment_failed_toast" msgid="342798484092215350">"Impussibel da chargiar l\'agiunta <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Avrir il messadi..."</string>
     <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
     <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
-    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
-    <skip />
-    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
-    <skip />
+    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Ina agiunta n\'ha betg pudì vegnir renviada"</string>
+    <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Impussibel da trametter l\'agiunta <xliff:g id="FILENAME"> %s</xliff:g> cun Voss e-mails sortints perquai ch\'ella n\'ha betg pudì vegnir telechargiada."</string>
     <!-- no translation found for login_failed_ticker (7452091306512654139) -->
     <skip />
     <!-- no translation found for login_failed_notification (2405086379065472222) -->
     <skip />
-    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
-    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
-    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
-    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
-    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
-    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
-    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
-    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+  <plurals name="message_view_attachment_bytes">
+    <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+    <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
+  </plurals>
+  <plurals name="message_view_attachment_kilobytes">
+    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_megabytes">
+    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB"</item>
+  </plurals>
+  <plurals name="message_view_attachment_gigabytes">
+    <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+    <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
+  </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <!-- no translation found for message_list_snippet (6077583739966798162) -->
     <skip />
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Configurar l\'e-mail"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configurar l\'e-mail"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Agiuntar in conto Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Agiuntar in conto Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Vus pudais configurar il sistem dad e-mail da la gronda part dals contos cun paucs pass."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Vus pudais configurar in conto Exchange cun be paucs pass."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Vus pudais configurar in conto Exchange ActiveSync cun be paucs pass."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Adressa dad e-mail"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Pled-clav"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Trametter ils e-mails tenor standard cun quest conto"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuraziun manuala"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Endatai ina adressa dad e-mail valida ed il pled-clav correct."</string>
@@ -196,13 +225,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperar las infurmaziuns davart il conto…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verificaziun dals parameters dal server d\'entrada…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Ils parameters dil server da sortida vegnan controllads…"</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Configuraziun da Voss e-mail"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Voss conto è ussa installà."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuraziun da Voss e-mail"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar in num al conto (facultativ)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Voss num (vegn mussà en messadis che sortan)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Agiuntar in nov conto dad e-mail"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Agiuntar in nov conto dad e-mail"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Da tge tip da conto sa tracti?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Parameters dal server d\'entrada"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Parameters dal server d\'entrada"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Num d\'utilisader"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Pled-clav"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
@@ -219,21 +253,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Sche jau stiz els da la posta entrada"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefix da la via d\'access IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Facultativ"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Parameters dal server da sortida"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Parameters dal server da sortida"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tip da segirezza"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Annunzia obligatorica"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Num d\'utilisader"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Pled-clav"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Parameters dal server"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Parameters dal server"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena/num d\'utilisader"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilisar ina connexiun segira (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptar tut ils certificats SSL"</string>
-    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"ID dad apparats mobils"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opziuns da conto"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
     <skip />
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Opziuns da conto"</string>
     <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frequenza da controlla dals e-mails"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Mai"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaticamain (push)"</string>
@@ -246,8 +285,7 @@
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Mussar in avis cura ch\'in e-mail arriva"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sincronisar ils contacts da quest conto"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronisar il chalender da quest conto"</string>
-    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
-    <skip />
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"Sincronisar ils e-mails da quest conto."</string>
     <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Impussibel da terminar l\'installaziun"</string>
     <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Quantitad da sincronisar"</string>
     <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"In di"</string>
@@ -285,8 +323,7 @@
     <string name="account_settings_default_label" msgid="3575963379680943640">"Conto predefinì"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Trametter ils e-mails tenor standard cun quest conto"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Avis ad e-mails"</string>
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
+    <string name="account_settings_summary" msgid="8403582255413830007">"\"Frequenza da sincronisaziun, avis, etc.\""</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Avisar l\'arriv dad in e-mail en la trav da status"</string>
     <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frequenza da controlla"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Messadis che entran"</string>
@@ -296,14 +333,12 @@
     <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatura"</string>
     <string name="account_settings_signature_hint" msgid="7262183168962779403">"Agiuntar in text als messadis che sortan"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Parameters dad avis"</string>
-    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sincronisar ils contacts"</string>
-    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Era sincronisar ils contacts da quest conto"</string>
-    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronisar il chalender"</string>
-    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Era sincronisar il chalender da quest conto"</string>
-    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
+    <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sincronisar ils contacts"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincronisar ils contacts per quest conto"</string>
+    <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronisar il chalender"</string>
+    <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sincronisar il chalender per quest conto"</string>
+    <string name="account_settings_sync_email_enable" msgid="4305222662654506074">"Sincronisaziun dad e-mail"</string>
+    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronisar ils e-mails per quest conto"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Era vibrar sch\'in e-mail arriva"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Adina"</string>
@@ -314,10 +349,8 @@
     <string name="account_settings_servers" msgid="4925493817981624242">"Parameters dal server"</string>
     <string name="account_delete_dlg_title" msgid="6806087520856396608">"Stizzar il conto"</string>
     <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Il conto «<xliff:g id="ACCOUNT">%s</xliff:g>» vegn stizzà da Voss e-mail."</string>
-    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
-    <skip />
-    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
-    <skip />
+    <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Stizzar il conto"</string>
+    <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Stizzar il conto"</string>
     <string name="upgrade_accounts_title" msgid="5444140226380754014">"Actualisar ils contos"</string>
     <string name="upgrade_accounts_error" msgid="7241661832029255715">"Impussibel dad actualisar il conto"</string>
     <string name="provider_note_yahoo" msgid="8762024183024261236">"L\'access a la chascha da brevs da tscherts contos da Yahoo na vegn betg sustegnì. Visitai la pagina d\'internet da Yahoo en cas da problems da connexiun per ulteriuras infurmaziuns."</string>
@@ -346,10 +379,8 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultats da <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Ils emprims <xliff:g id="RESULTS">%1$d</xliff:g> resultats da <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
-    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
-    <skip />
-    <!-- no translation found for category_general_preferences (6810399722493971651) -->
-    <skip />
+    <string name="header_label_general_preferences" msgid="7548527595339881066">"Preferenzas dad e-mail"</string>
+    <string name="category_general_preferences" msgid="6810399722493971651">"Preferenzas dad applicaziun"</string>
     <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
     <skip />
     <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
@@ -381,4 +412,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
new file mode 100644
index 0000000..3677fe0
--- /dev/null
+++ b/res/values-ro/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Se trimit mesajele..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Trimiteţi mesajele de trimitere"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Se preia ataşamentul."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Se preia ataşamentul <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Citiţi ataşamentele mesajului de e-mail"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Permite aplicaţiei citirea fişierelor ataşate mesajelor de e-mail."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Accesaţi datele de la furnizorul de e-mail"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Permite acestei aplicaţii accesul la baza de date a adresei de e-mail, incluzând mesajele primite, mesajele trimise, numele de utilizatori şi parolele."</string>
+    <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
+    <string name="compose_title" msgid="427986915662706899">"Scrieţi"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Remediaţi erorile"</string>
+    <string name="next_action" msgid="3931301986364184415">"Înainte"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Anulaţi"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Trimiteţi"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Răspundeţi"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Răspundeţi tuturor"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Ştergeţi"</string>
+    <string name="forward_action" msgid="669174181042344116">"Redirecţionaţi"</string>
+    <string name="done_action" msgid="7497990549515580249">"Terminat"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Renunţaţi"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Salvaţi ca mesaj nefinalizat"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Citit/Necitit"</string>
+    <string name="read_action" msgid="4701484794504781686">"Marcaţi ca citit"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Marcaţi drept necitit"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Preferate"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Marcaţi cu stea"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Eliminaţi steaua"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Actualizaţi"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Adăugaţi un cont"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Deselectaţi-le pe toate"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Scrieţi"</string>
+    <string name="search_action" msgid="6325101454876682308">"Căutaţi"</string>
+    <string name="open_action" msgid="936766723989190816">"Deschideţi"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Setările contului"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Eliminaţi contul"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Dosare"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Conturi"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Marcaţi conversaţia ca citită"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Marcaţi drept necitit"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Adăugaţi Cc/Bcc"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Adăugaţi un ataşament"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Setări pentru imaginea de memorie"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Alegeţi fişierul de ataşat"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Eroare de conexiune"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"E-mail nou"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"A apărut o eroare neaşteptată în timpul încărcării mesajului text. Este posibil ca mesajul să fie prea lung pentru a fi vizualizat."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> necitit(e) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> necitit(e) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> necitit(e) (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"în <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (de) conturi"</item>
+    <item quantity="other" msgid="2723797835410343458">"în <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (de) conturi"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Mesaje primite"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Mesaje de trimis"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Mesaje nefinalizate"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Coş de gunoi"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Trimis"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Mesaje nedorite"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Versiunea: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Conturi"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Mesaje primite combinate"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Cu stea"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Mesaje nefinalizate"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Mesaje de trimis"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Apăsaţi lung pe un cont pentru a-l actualiza"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Căsuţă de e-mail"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Încărcaţi mai multe mesaje"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Pentru"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Subiect"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Scrieţi un mesaj"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mesajul original --------"\n"Subiect: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De la: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Către: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a scris:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Mesaj citat"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Trebuie să adăugaţi cel puţin un destinatar."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Unele adrese de e-mail sunt nevalide."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Fişierul este prea mare pentru a fi ataşat."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> şi încă <xliff:g id="NUMBER">%2$d</xliff:g>"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Către:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Deschideţi"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Ataşamentul a fost salvat pe cardul SD ca <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Imposibil de salvat ataşamentul pe cardul SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Afişaţi fotografiile"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Vizualizaţi în Calendar »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Invitaţie în Calendar"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Participaţi?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Da"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Poate"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Nu"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Aţi acceptat această invitaţie"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Aţi răspuns cu „poate” acestei invitaţii"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Aţi refuzat această invitaţie"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Mesaj şters."</item>
+    <item quantity="other" msgid="6574961322865652255">"Mesaje şterse."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Mesaj refuzat."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Mesaj salvat ca mesaj nefinalizat."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Acest ataşament nu poate fi afişat."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuraţi un cont de e-mail"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adăugaţi un cont Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adăugaţi un cont Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Puteţi configura adresa de e-mail pentru cele mai multe conturi, urmând doar câţiva paşi."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Puteţi configura un cont de Exchange ActiveSync urmând doar câţiva paşi."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Puteţi configura un cont Exchange ActiveSync urmând doar câţiva paşi."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Trimiteţi e-mailuri din acest cont în mod prestabilit."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configurare manuală"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Introduceţi o adresă de e-mail şi o parolă valide."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Cont dublură"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Date de conectare deja existente pentru acest cont „<xliff:g id="DUPLICATE">%s</xliff:g>”."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Se preiau informaţiile despre cont..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Se verifică setările pentru serverul mesajelor de intrare..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Se verifică setările serverului de mesaje de ieşire..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuraţi un cont de e-mail"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Daţi un nume acestui cont (opţional)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Numele dvs. (afişat în mesajele de trimitere)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Adăugaţi un cont de e-mail nou"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Ce tip de cont este acesta?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Setări pentru serverul de mesaje de intrare"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Nume de utilizator"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Parolă"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Tipul de securitate"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Niciunul"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Acceptaţi toate certificatele)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Acceptaţi toate certificatele)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Ştergeţi mesajul de e-mail de pe server"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Niciodată"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Când şterg un mesaj din Mesaje primite"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixul de cale pentru accesul IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opţional"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Setările serverului de ieşire"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Tipul de securitate"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Solicitaţi conectarea."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Nume de utilizator"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Parolă"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Setări server"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domeniu\\Nume de utilizator"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Utilizaţi o conexiune securizată (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptaţi toate certificatele SSL"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Opţiunile contului"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Frecvenţa de verificare a mesajelor de e-mail"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Niciodată"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automat (Push)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"La fiecare 5 minute"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"La fiecare 10 minute"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"La fiecare 15 minute"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"La fiecare 30 de minute"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"La fiecare oră"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Trimiteţi e-mailuri din acest cont"</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Doresc să primesc notificare la primirea de e-mailuri."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Doresc sincronizarea agendei acestui cont."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sincronizaţi calendarul acestui cont."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Configurarea nu poate fi terminată"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Volumul de date de sincronizat"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"O zi"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Trei zile"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"O săptămână"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Două săptămâni"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"O lună"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nume de utilizator sau parolă incorectă."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nume de utilizator sau parolă incorectă."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nu este posibilă conectarea în siguranţă la server."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nu este posibilă conectarea în siguranţă la server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nu se poate conecta la server."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nu se poate conecta la server. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS solicitat, dar neacceptat de către server."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Metodele de autentificare nu sunt acceptate de server."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Nu poate fi deschisă conexiunea la server din cauza unei erori de securitate."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nu poate fi deschisă conexiunea la server."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administrarea securităţii de la distanţă"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Serverul <xliff:g id="SERVER">%s</xliff:g> vă solicită permisiunea de a controla de la distanţă unele funcţii de securitate ale telefonului dvs. Doriţi să finalizaţi configurarea acestui cont?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Pentru acest server sunt necesare funcţii de securitate pe care telefonul dvs. nu le acceptă."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” necesită actualizarea setărilor de securitate."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Actualizaţi setările de securitate"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Securitatea dispozitivului"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Serverul <xliff:g id="SERVER">%s</xliff:g> vă solicită permisiunea de a controla de la distanţă unele caracteristici de securitate ale telefonului dvs."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Modificaţi detaliile"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Setări generale"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Cont prestabilit"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Trimiteţi e-mailuri de pe acest cont în mod prestabilit"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificările de e-mail"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Doresc notificare în bara de stare la primirea de e-mailuri"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frecvenţa de verificare a e-mailului"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Setări pentru mesajele primite"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Setări pentru mesajele de trimitere"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Numele contului"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Numele dvs."</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Semnătura"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Adăugaţi text la mesajele trimise"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Setări pentru notificări"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sincronizaţi persoanele din agendă"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Doresc şi sincronizarea agendei din acest cont"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sincronizaţi calendarul"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Doresc şi sincronizarea calendarului din acest cont"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrare"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrare şi la sosirea mesajelor de e-mail"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Întotdeauna"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Numai când profilul este Silenţios"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niciodată"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrare"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Selectaţi tonul de apel"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Setări server"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminaţi contul"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Contul „<xliff:g id="ACCOUNT">%s</xliff:g>” va fi eliminat din e-mail."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Treceţi conturile la o versiune superioară"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Contul nu poate fi trecut la o versiune superioară"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Pentru unele conturi de e-mail Yahoo! accesul la căsuţa de e-mail nu este acceptat. Dacă aveţi probleme de conectare, vizitaţi site-ul yahoo.com, pentru a afla mai multe detalii."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Înainte de configurarea acestui cont de e-mail, accesaţi site-ul web Yahoo! şi activaţi accesul la serviciile de e-mail POP3 pentru acest cont."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Numai unele conturi de tip „Plus” includ accesul de tip POP, permiţând conectarea acestui program. Dacă nu reuşiţi să vă conectaţi cu adresa de e-mail şi parola corecte, este posibil să nu aveţi un cont de tip „Plus” plătit. Lansaţi browserul web pentru a obţine accesul la aceste conturi de e-mail."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Înainte de configurarea acestui cont de e-mail, vizitaţi T-Online pe web şi creaţi-vă o parolă pentru accesul la serviciile de e-mail POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Corporaţie"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Acceptat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Refuzat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Tentativă: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Anulat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Actualizat: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Când: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Unde: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Când: <xliff:g id="EVENTDATE">%s</xliff:g> (recurent)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Acest eveniment a fost anulat pentru: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Detaliile acestui eveniment au fost modificate pentru: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"Managerul de conturi nu a putut crea contul. Încercaţi din nou."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Activează politicile de securitate specificate pentru server"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Calendar Exchange adăugat"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Se caută <xliff:g id="DOMAIN">%s</xliff:g>..."</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultat de la <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> (de) rezultate din <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Primele <xliff:g id="RESULTS">%1$d</xliff:g> (de) rezultate din <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index b3925d3..d80d9de 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Далее"</string>
     <string name="okay_action" msgid="8365197396795675617">"ОК"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Отмена"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Отправить"</string>
     <string name="reply_action" msgid="4262472229221507619">"Ответить"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Ответить всем"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Аккаунты"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Отметить как прочитанные"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Отметить как непрочитанное"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Добавить копию или скрытую копию"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Добавить приложение"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Настройки дампа"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> и еще <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> и еще <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"Новых: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="5620484088786656170">"Новых: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g>"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"Новых: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"Новых: <xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g><xliff:g id="SEPARATOR"> </xliff:g><xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Входящие"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Исходящие"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Черновики"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Исходящие"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Нажмите и удерживайте название аккаунта, чтобы обновить его"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Почтовый ящик"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Комбинированный режим просмотра"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Загрузить еще сообщения"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"Выбрано: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
     <item quantity="other" msgid="7901361399231876038">"Выбрано: <xliff:g id="MESSAGE_COUNT">%d</xliff:g>"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Нет сообщений"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Получатели"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Копия"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Скрытая копия"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Тема"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Текст сообщения"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Исходное сообщение --------"\n"Тема: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"От: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Кому: <xliff:g id="TO">%3$s</xliff:g>"\n"Копия: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Пользователь <xliff:g id="SENDER">%s</xliff:g> писал:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитируемый текст"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Включить исходный текст в ответ"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Добавьте хотя бы одного получателя."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Некоторые адреса электронной почты являются недопустимыми."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файл имеет слишком большой размер и не может быть приложен."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> и ещё <xliff:g id="NUMBER">%2$d</xliff:g>"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"На:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Копия:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Скрытая копия:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Просмотр"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Загрузить"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Сохранить"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Вложение сохранено как <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Не удается сохранить вложение."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Примечание. Несколько прикрепленных файлов в переадресованном сообщении будут загружены перед отправкой."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Сообщение"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Пригласить"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Прикреп. файлов: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Прикреп. файлов: <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Показать картинки"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Посмотреть в Календаре"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Приглашение в Календаре"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Вы приняли это приглашение"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Вы ответили \"может быть\" на это приглашение"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Вы отклонили это приглашение"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Сообщение удалено."</item>
     <item quantity="other" msgid="6574961322865652255">"Сообщения удалены."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"Сообщение (<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>) перемещено в папку <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"Сообщения (<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>) перемещены в папку <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Приложение нельзя переслать"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Сбой при пересылке прикрепленных файлов"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Прикрепленный файл <xliff:g id="FILENAME"> %s</xliff:g> не удалось загрузить, поэтому он не был отправлен вместе с исходящим сообщением."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"Ошибка авторизации <xliff:g id="ACCOUNT_NAME">%s </xliff:g>"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Нажмите, чтобы изменить настройки аккаунта"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> Б"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> ГБ"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Настройка электронной почты"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Настройка электронной почты"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавить аккаунт Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавить аккаунт Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Программу Email можно легко настроить для большинства популярных почтовых служб."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Аккаунт Exchange легко настроить в несколько шагов."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Настроить аккаунт Exchange ActiveSync очень просто."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"Адрес электронной почты"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Пароль"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Сделать аккаунтом электронной почты по умолчанию для отправки сообщений."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Настройка вручную"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Введите действительный адрес электронной почты и пароль."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Получение информации аккаунта..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Проверка настроек сервера входящих сообщений..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Проверка настроек сервера исходящих сообщений..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Настройка электронной почты"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Ваш аккаунт настроен, ждите сообщений!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Настройка электронной почты"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Присвойте этому аккаунту название (по желанию)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше имя (показывается в исходящих сообщениях)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Добавить новый аккаунт электронной почты"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Добавить новый аккаунт электронной почты"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Что это за аккаунт?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Настройки сервера входящих сообщений"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Настройки сервера входящих сообщений"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Имя пользователя"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Сервер POP3"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"При удалении из входящих"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Префикс пути IMAP"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"По желанию"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Настройки сервера исходящих сообщений"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Настройки сервера исходящих сообщений"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безопасности"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Требовать входа в аккаунт."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Имя пользователя"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Настройки сервера"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Настройки сервера"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Сервер"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен\\Имя пользователя"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Использовать защищенное соединение (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Принимать все сертификаты SSL"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Идентификатор мобильного устройства"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Параметры аккаунта"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Параметры аккаунта"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Частота проверки папки \"Входящие\""</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Никогда"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Автоматически (принудительно)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Неверное имя пользователя или пароль."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Не удается установить защищенное подключение к серверу."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Не удается установить защищенное подключение к серверу."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Ошибка сервера; проверьте имя пользователя и пароль и повторите попытку."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Не удается подключиться к серверу."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Не удается подключиться к серверу."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS не поддерживается сервером."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Удаленное управление безопасностью"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Серверу <xliff:g id="SERVER">%s</xliff:g> требуется разрешение на удаленное управление некоторыми функциями безопасности телефона. Завершить настройку этого аккаунта?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Безопасность этого сервера обеспечивается с помощью средств, не поддерживаемых вашим телефоном."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"ВНИМАНИЕ! Отключение прав по администрированию вашего устройства для приложения электронной почты приведет к удалению всех аккаунтов электронной почты, которые используют эти права. Кроме того, будут удалены все письма, контакты, календари и другие данные, связанные с этими аккаунтами."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Аккаунт \"<xliff:g id="ACCOUNT">%s</xliff:g>\" требует обновления настроек безопасности."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Обновление настроек безопасности"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Безопасность устройства"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
new file mode 100644
index 0000000..8961509
--- /dev/null
+++ b/res/values-sk/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Prebieha odosielanie správ…"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Odoslať odchádzajúce správy"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Prebieha načítanie prílohy."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Prebieha načítanie prílohy <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Čítať prílohy e-mailov"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Umožňuje tejto aplikácii čítať vaše e-mailové prílohy."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Prístup k údajom poskytovateľa e-mailu"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Povoľuje tejto aplikácii prístup do databázy e-mailu, vrátane prijatých a odoslaných správ, používateľských mien a hesiel."</string>
+    <string name="app_name" msgid="5815426892327290362">"Poslať e-mail"</string>
+    <string name="compose_title" msgid="427986915662706899">"Napísať správu"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Ladiť"</string>
+    <string name="next_action" msgid="3931301986364184415">"Ďalej"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Zrušiť"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Odoslať"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Odpovedať"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Odpovedať všetkým"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Odstrániť"</string>
+    <string name="forward_action" msgid="669174181042344116">"Poslať ďalej"</string>
+    <string name="done_action" msgid="7497990549515580249">"Hotovo"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Zahodiť"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Uložiť ako koncept"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Prečítané/neprečítané"</string>
+    <string name="read_action" msgid="4701484794504781686">"Označiť ako prečítané"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Označiť ako neprečítané"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Zaradiť medzi obľúbené"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Pridať hviezdičku"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Odstrániť hviezdičku"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Obnoviť"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Pridať účet"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Zrušiť výber všetkých konverzácií"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Napísať správu"</string>
+    <string name="search_action" msgid="6325101454876682308">"Hľadať"</string>
+    <string name="open_action" msgid="936766723989190816">"Otvoriť"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Nastavenia účtu"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Odstrániť účet"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Priečinky"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Účty"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Označiť ako prečítané"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Označiť ako neprečítané"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Pridať kópiu/skrytú kópiu"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Pridať prílohu"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Nastavenia výpisu"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Vyberte prílohu"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Chyba pripojenia"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Nový e-mail"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Počas načítavania textu správy sa vyskytla neočakávaná chyba. Správa je možno príliš veľká a preto ju nie je možné zobraziť."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"Neprečítané správy: <xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g>(<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"Neprečítané správy: <xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g>(<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"Neprečítané správy: <xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g>(<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtoch"</item>
+    <item quantity="other" msgid="2723797835410343458">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> účtoch"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Doručená pošta"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Pošta na odoslanie"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Koncepty"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Kôš"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Odoslané"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Nevyžiadaná pošta"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Verzia: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Účty"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Všetky priečinky Doručenej pošty"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Označené hviezdičkou"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Koncepty"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Pošta na odoslanie"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Účet aktualizujete stlačením a podržaním"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"E-mailová schránka"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Načítať ďalšie správy"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Komu"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kópia"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skrytá kópia"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Predmet"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Napísať správu"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pôvodná správa --------"\n"Predmet: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Odosielateľ: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Komu: <xliff:g id="TO">%3$s</xliff:g>"\n"Kópia: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>napísal/a:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citovaný text"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Musíte pridať aspoň jedného príjemcu."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Niektoré e-mailové adresy sú neplatné."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Súbor nie je možné priložiť, pretože je príliš veľký."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> a ešte <xliff:g id="NUMBER">%2$d</xliff:g> ďalších"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Komu:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Kópia:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Otvoriť"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Príloha bola uložená na SD kartu ako <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Nie je možné uložiť prílohu na SD kartu."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Zobraziť obrázky"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Zobraziť v Kalendári »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Pozvánka z kalendára"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Zúčastníte sa?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Áno"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Možno"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Nie"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Prijali ste túto pozvánku"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Na túto pozvánku ste odpovedali „možno“"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Odmietli ste túto pozvánku"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Správa bola odstránená."</item>
+    <item quantity="other" msgid="6574961322865652255">"Správy boli odstránené."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Správa bola zahodená."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Správa bola uložená ako koncept."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Tuto prílohu nie je možné zobraziť."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastaviť e-mail"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Pridať účet Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pridať účet Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Väčšinu e-mailových účtov môžete nakonfigurovať v niekoľkých jednoduchých krokoch."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Účet Exchange môžete nakonfigurovať v niekoľkých jednoduchých krokoch."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Účet služby Exchange ActiveSync môžete nakonfigurovať v niekoľkých jednoduchých krokoch."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"V predvolenom nastavení odosielať e-maily z tohto účtu."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ručné nastavenie"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Zadajte platnú e-mailovú adresu a heslo."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Duplikovať účet"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Tieto prihlasovacie údaje už používa účet <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Načítavajú sa informácie o účte…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrola nastavení servera prichádzajúcej pošty…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrola nastavení servera odchádzajúcej pošty…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastaviť e-mail"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pomenovať tento účet (nepovinné)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše meno (zobrazované na odchádzajúcich správach)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Pridať nový e-mailový účet"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"O aký typ účtu ide?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavenia servera prichádzajúcej pošty"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Používateľské meno"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Heslo"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Server POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Server IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Typ zabezpečenia"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Žiadne"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Prijímať všetky certifikáty)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Prijímať všetky certifikáty)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Odstraňovať e-maily zo servera"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nikdy"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Pri odstránení z Doručenej pošty"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Predpona cesty IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Voliteľné"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavenia servera odchádzajúcej pošty"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Server SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Typ zabezpečenia"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Požadovať prihlásenie"</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Používateľské meno"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Heslo"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavenia servera"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Doména\\Používateľské meno"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Použiť zabezpečené pripojenie (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Prijímať všetky certifikáty protokolu SSL"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Možnosti účtu"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Četnost kontrol e-mailů"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikdy"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automaticky (v prípade potreby)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Každých 5 minút"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Každých 10 minút"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Každých 15 minút"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Každých 30 minút"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Každú hodinu"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"V predvolenom nastavení odosielať e-maily z tohto účtu."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Upozorniť ma na príchod e-mailu"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Synchronizovať kontakty z tohto účtu."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Synchronizovať kalendár z tohto účtu."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Nastavenie nie je možné dokončiť"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Množstvo na synchronizovanie"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Jeden deň"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tri dni"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Týždeň"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva týdny"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Jeden mesiac"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Používateľské meno alebo heslo nie je správne."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Používateľské meno alebo heslo nie je správne."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Nepodarilo sa bezpečne pripojiť k serveru."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Nepodarilo sa bezpečne pripojiť k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Nepodarilo sa pripojiť k serveru."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Nepodarilo sa pripojiť k serveru."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Vyžaduje sa služba TLS, ale server ju nepodporuje."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Metódy overovania nie sú na tomto serveri podporované."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Pripojenie k serveru sa nepodarilo otvoriť kvôli chybe zabezpečenia."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Nepodarilo sa otvoriť pripojenie k serveru."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Vzdialená správa zabezpečenia"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Server <xliff:g id="SERVER">%s</xliff:g> žiada o povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho telefónu. Chcete dokončiť nastavenia tohto účtu?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Tento server vyžaduje funkcie zabezpečenia, ktoré váš telefón nepodporuje."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> požaduje aktualizáciu nastavení zabezpečenia."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Aktualizácia nastavení zabezpečenia"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Zabezpečenie zariadenia"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Server <xliff:g id="SERVER">%s</xliff:g> žiada o povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho telefónu."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Upraviť podrobnosti"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Všeobecné nastavenia"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Predvolený účet"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"V predvolenom nastavení odosielať e-maily z tohto účtu"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailové upozornenia"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Zobraziť upozornenie na príchod e-mailu v stavovom riadku"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Frekvencia kontroly e-mailov"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavenia prichádzajúcej pošty"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavenia odchádzajúcej pošty"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Názov účtu"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše meno"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Podpis"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Text pripojiť k odosielaným správam"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavenia upozornení"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Synchronizovať kontakty"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synchronizovať kontakty aj z tohto účtu"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Synchronizovať kalendár"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Synchronizovať kalendár aj z tohto účtu"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrovať aj pri príchode e-mailu"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Iba v tichom režime"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrovať"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Vybrať vyzváňací tón"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Nastavenia servera"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrániť účet"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> bude odstránený z aplikácie E-mail."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Inovovať účty"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Účet nie je možné inovovať"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Prístup do schránky pre niektoré účty Yahoo! nie je podporovaný. Ak máte problémy s pripojením, ďalšie informácie nájdete na webovej stránke yahoo.com."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Pred nastavením tohto e-mailového účtu prejdite na web Yahoo! a povoľte e-mailový prístup POP3 pre tento účet."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Prístup prostredníctvom protokolu POP, umožňujúci pripojenie tohto programu, obsahujú iba niektoré účty Plus. Ak sa nemôžete prihlásiť so správnou e-mailovou adresou a heslom, pravdepodobne nemáte platený účet Plus. Ak chcete pristupovať k týmto poštovým účtom, vykonajte to prostredníctvom webového prehliadača."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Pred nastavením tohto e-mailového účtu navštívte webové stránky T-Online a vytvorte heslo pre e-mailový prístup POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Firemný"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Potvrdené: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Odmietnuté: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Možno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Zrušené: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Aktualizované: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Kedy: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Kde: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Kedy: <xliff:g id="EVENTDATE">%s</xliff:g> (pravidelne)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Táto udalosť bola zrušená pre termín: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Došlo k zmene podrobností tejto udalosti pre termín: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"Správcovi účtov sa nepodarilo vytvoriť účet. Skúste to prosím znova."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Poslať e-mail"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Povoľuje pravidlá zabezpečenia určené serverom"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Kalendár Exchange bol pridaný"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Prebieha vyhľadávanie <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"Počet výsledkov z webu <xliff:g id="DOMAIN">%2$s</xliff:g>: <xliff:g id="RESULTS">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"Počet výsledkov z webu <xliff:g id="DOMAIN">%2$s</xliff:g>: <xliff:g id="RESULTS">%1$d</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Prvých <xliff:g id="RESULTS">%1$d</xliff:g> výsledkov z webu <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
new file mode 100644
index 0000000..ff24002
--- /dev/null
+++ b/res/values-sl/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Pošiljanje sporočil ..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Pošlji odhodna sporočila"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Pridobivanje priloge."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Pridobivanje priloge <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Preberi e-poštne priloge"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Omogoča tej aplikaciji, da bere e-poštne priloge."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Dostop do podatkov e-poštnega ponudnika"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Tej aplikaciji omogoči dostop do vaše e-poštne podatkovne zbirke, vključno s prejetimi in poslanimi sporočili, uporabniškimi imeni in gesli."</string>
+    <string name="app_name" msgid="5815426892327290362">"E-pošta"</string>
+    <string name="compose_title" msgid="427986915662706899">"Novo"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Odpravljanje napak"</string>
+    <string name="next_action" msgid="3931301986364184415">"Naslednji"</string>
+    <string name="okay_action" msgid="8365197396795675617">"V redu"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Prekliči"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Pošlji"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Odgovori"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Odgovori vsem"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Izbriši"</string>
+    <string name="forward_action" msgid="669174181042344116">"Posreduj"</string>
+    <string name="done_action" msgid="7497990549515580249">"Dokončano"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Zavrzi"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Shrani kot osnutek"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Prebrano/neprebrano"</string>
+    <string name="read_action" msgid="4701484794504781686">"Označi kot prebrano"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Označi kot neprebrano"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Priljubljen"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Dodaj zvezdico"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Odstrani zvezdico"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Osveži"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Dodaj račun"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Prekliči celoten izbor"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Novo sporočilo"</string>
+    <string name="search_action" msgid="6325101454876682308">"Iskanje"</string>
+    <string name="open_action" msgid="936766723989190816">"Odpri"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Nastavitve računa"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Odstrani račun"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Mape"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Računi"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Označi kot prebrano"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kot neprebrano"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Dodaj »Kp«/»Skp«"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Dodaj prilogo"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Nastavitve izvoza ob zrušitvi"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Izberite prilogo"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Napaka povezave"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Nova e-pošta"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Nepričakovana napaka pri nalaganju sporočila. Sporočilo je morda predolgo za prikaz."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> neprebranih (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> neprebranih (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> neprebranih (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računih"</item>
+    <item quantity="other" msgid="2723797835410343458">"v <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> računih"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Prejeto"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Odpošlji"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Osnutki"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Smetnjak"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Poslano"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Vsiljena pošta"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Različica: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Računi"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Kombiniran nabiralnik"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Z zvezdico"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Osnutki"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Odpošlji"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Za osvežitev pritisnite in pridržite račun"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Nabiralnik"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Naloži več sporočil"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Za"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kp"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Skp"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Zadeva"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Novo sporočilo"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Izvirno sporočilo --------"\n"Zadeva: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Od: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Za: <xliff:g id="TO">%3$s</xliff:g>"\n"Kp: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> je napisal:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citirano besedilo"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Dodati morate vsaj enega prejemnika."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Nekateri e-poštni naslovi niso veljavni."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Datoteke ni mogoče pripeti, ker je prevelika."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> in <xliff:g id="NUMBER">%2$d</xliff:g> drugih"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Za:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Kp:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Odpri"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Priloga shranjena na kartico SD kot <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Priloge ni bilo mogoče shraniti na kartico SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Pokaži slike"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Prikaži v koledarju »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Povabilo koledarja"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Ali se boste udeležili?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Da"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Morda"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Ne"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Sprejeli ste povabilo"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Na to povabilo ste odgovorili z »morda«"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Zavrnili ste povabilo"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Sporočilo izbrisano."</item>
+    <item quantity="other" msgid="6574961322865652255">"Sporočila izbrisana."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Sporočilo zavrženo."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Sporočilo shranjeno kot osnutek."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Te priloge ni mogoče prikazati."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Nastavitev e-pošte"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Dodaj račun Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Dodaj račun Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"E-pošto lahko za večino računov nastavite le v nekaj korakih."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Račun Exchange lahko nastavite v nekaj korakih."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Račun Exchange ActiveSync lahko nastavite v nekaj korakih."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Privzeto pošiljaj e-pošto iz tega računa"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ročna nastavitev"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Vnesite veljaven e-poštni naslov in geslo."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Podvojeni račun"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Podatki za prijavo so že v uporabi za račun »<xliff:g id="DUPLICATE">%s</xliff:g>«."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Pridobivanje podatkov o računu..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Preverjanje nastavitev strežnika za dohodno pošto..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Preverjanje nastavitev strežnika za odhodno pošto..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavitev e-pošte"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Poimenujte račun (neobvezno)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Vaše ime (prikazano v odhodnih sporočilih)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Dodaj nov e-poštni račun"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Katera vrsta računa je to?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Nastavitve strežnika za dohodno pošto"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Uporabniško ime"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Geslo"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Strežnik POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Strežnik IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Vrata"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Vrsta varnosti"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Brez"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (sprejmi vsa potrdila)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (sprejmi vsa potrdila)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Izbriši e-pošto iz strežnika"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nikoli"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Ko sporočilo izbrišem iz nabiralnika"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Predpona poti IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Neobvezno"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Nastavitve strežnika za odhodno pošto"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Strežnik SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Vrata"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Vrsta varnosti"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Potrebna je prijava."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Uporabniško ime"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Geslo"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Nastavitve strežnika"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Strežnik"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domena/uporabniško ime"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Uporabi varno povezavo (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Sprejmi vsa potrdila SSL"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Možnosti računa"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Pogostost preverjanja e-pošte"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Nikoli"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Samodejno (potisno)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Vsakih 5 minut"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Vsakih 10 minut"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Vsakih 15 minut"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Vsakih 30 minut"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Vsako uro"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Privzeto pošiljaj e-pošto iz tega računa"</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Obvesti me, ko prispe e-pošta"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Sinhroniziraj stike iz tega računa."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Sinhroniziraj koledar iz tega računa"</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Namestitve ni bilo mogoče končati"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Količina za sihnroniziranje"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"En dan"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tri dni"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"En teden"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dva tedna"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En mesec"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Nepravilno uporabniško ime ali geslo."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Nepravilno uporabniško ime ali geslo."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Ni se mogoče varno povezati s strežnikom."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Ni se mogoče varno povezati s strežnikom."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Ni se mogoče povezati s strežnikom."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Ni se mogoče povezati s strežnikom."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Zahtevan je bil TLS, vendar ga strežnik ne podpira."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Strežnik ne podpira načinov preverjanja pristnosti."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Zaradi varnostne napake ni bilo mogoče vzpostaviti povezave s strežnikom."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Povezave s strežnikom ni bilo mogoče vzpostaviti."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Varnostno skrbništvo na daljavo"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Strežniku <xliff:g id="SERVER">%s</xliff:g> morate omogočiti, da na daljavo nadzira nekatere varnostne funkcije vašega telefona. Ali želite dokončati nastavitev tega računa?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Ta strežnik zahteva varnostne funkcije, ki jih vaš telefon ne podpira."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Varnostne nastavitve računa »<xliff:g id="ACCOUNT">%s</xliff:g>« je treba posodobiti."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Posodobitev varnostnih nastavitev"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Varnost naprave"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Strežniku <xliff:g id="SERVER">%s</xliff:g> morate omogočiti, da na daljavo nadzira nekatere varnostne funkcije vašega telefona."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Urejanje podrobnosti"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Splošne nastavitve"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Privzeti račun"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Privzeto pošiljaj e-pošto iz tega računa"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-poštna obvestila"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Obvestilo v vrstici stanja, ko prispe e-pošta"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Pogostost preverjanja e-pošte"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Nastavitve dohodne pošte"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Nastavitve odhodne pošte"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Ime računa"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Vaše ime"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Podpis"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Pripni besedilo k poslanim sporočilom"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavitve obvestil"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Sinhroniziranje stikov"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinhroniziraj tudi stike iz tega računa"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Sinhroniziraj koledar"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Sinhroniziraj tudi koledar tega računa"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibriranje"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibriraj tudi, ko prejmem e-pošto"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vedno"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo v tihem načinu"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikoli"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibriranje"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Izbira zvonjenja"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Nastavitve strežnika"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrani račun"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Račun »<xliff:g id="ACCOUNT">%s</xliff:g>« bo odstranjen iz e-pošte."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Nadgradi račune"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Računa ni mogoče nadgraditi"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Dostop do nabiralnika ni podprt za nekatere vrste e-poštnih računov Yahoo!. Če imate težave s povezavo, obiščite yahoo.com, kjer je na voljo več informacij."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Preden nastavite e-poštni račun, obiščite spletno mesto Yahoo! in omogočite e-poštni dostop POP3 za ta račun."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Samo nekateri računi »Plus« vsebujejo tudi dostop do strežnika POP, da se ta program lahko poveže. Če ste pravilno vnesli svoj e-poštni naslov in geslo in se ne morete prijaviti, morda nimate plačljivega računa »Plus«. Zaženite brskalnik, če želite dostopati do teh e-poštnih računov."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Preden nastavite ta e-poštni račun, obiščite spletno mesto T-Online in ustvarite geslo za e-poštni dostop POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Podjetje"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Sprejeto: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Zavrnjeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Pogojno sprejeto: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Preklicano: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Posodobljeno: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Kdaj: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Kje: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Kdaj: <xliff:g id="EVENTDATE">%s</xliff:g> (se ponavlja)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Ta dogodek je bil preklican za: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Podrobnosti tega dogodka so bile spremenjene: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager ni mogel ustvariti računa. Poskusite znova."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"E-pošta"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Omogoči varnostne pravilnike, ki jih določi strežnik"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Dodan koledar računa Exchange"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Iskanje <xliff:g id="DOMAIN">%s</xliff:g>..."</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultat z <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> rezultatov iz <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Prvih <xliff:g id="RESULTS">%1$d</xliff:g> rezultatov z <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
new file mode 100644
index 0000000..8d1c604
--- /dev/null
+++ b/res/values-sr/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Слање порука је у току…"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Пошаљи одлазне поруке"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"У току је преузимање прилога."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"У току је преузимање прилога <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Читање прилога из е-порука"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Омогућава овој апликацији да чита ваше прилоге е-порукама."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Приступ подацима о добављачу е-поште"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Омогућава овој апликацији да приступи бази података е-поште, укључујући примљене поруке и послате поруке, корисничка имена и лозинке."</string>
+    <string name="app_name" msgid="5815426892327290362">"Пошаљи е-поштом"</string>
+    <string name="compose_title" msgid="427986915662706899">"Нова порука"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Отклањање грешака"</string>
+    <string name="next_action" msgid="3931301986364184415">"Следеће"</string>
+    <string name="okay_action" msgid="8365197396795675617">"Потврди"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Откажи"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Пошаљи"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Одговори"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Одговори свима"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Избриши"</string>
+    <string name="forward_action" msgid="669174181042344116">"Проследи"</string>
+    <string name="done_action" msgid="7497990549515580249">"Готово"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Одбаци"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Сачувај као недовршену поруку"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Прочитано/непрочитано"</string>
+    <string name="read_action" msgid="4701484794504781686">"Означи као прочитано"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Означи као непрочитано"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Омиљено"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Додај звездицу"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Уклони звездицу"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Освежи"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Додај налог"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Опозови све изборе"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Нова порука"</string>
+    <string name="search_action" msgid="6325101454876682308">"Претрага"</string>
+    <string name="open_action" msgid="936766723989190816">"Отвори"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Подешавања налога"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Уклони налог"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Директоријуми"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Налози"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Означи као прочитано"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Означи као непрочитано"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Додај Cc/Bcc"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Додај прилог"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Подешавања отклањања грешака"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Одаберите прилог"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Грешка при повезивању"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Нова порука е-поште"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Дошло је до неочекиване грешке при учитавању текста поруке. Порука је можда превелика да би могла да се прикаже."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"Непрочитане поруке: <xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"Непрочитане поруке: <xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"Непрочитане поруке: <xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"на <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> налога"</item>
+    <item quantity="other" msgid="2723797835410343458">"на <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> налога"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Примљене"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"За слање"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Недовршене"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Отпад"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Послате"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Безвредне"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Верзија: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Налози"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Комбиновано пријемно сандуче"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Са звездицом"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Недовршене"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"За слање"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Притисните налог и сачекајте да се освежи"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Поштанско сандуче"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Учитај још порука"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Коме"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Копија"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Скривена копија"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Наслов"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Нова порука е-поште"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Изворна порука --------"\n"Наслов: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Од: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Коме: <xliff:g id="TO">%3$s</xliff:g>"\n"Копија: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> је написао/ла:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Наведени текст"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Потребно је да додате бар једног примаоца."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Поједине адресе е-поште су неважеће."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Датотека је превелика за прилог."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> и још <xliff:g id="NUMBER">%2$d</xliff:g> других"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Коме:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Копија:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Отвори"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Прилог је сачуван на SD картицу под називом <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Није могуће сачувати прилог на SD картици."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Прикажи слике"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Прикажи у календару »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Позив у оквиру календара"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Идете ли?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Да"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Можда"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Не"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Прихватили сте овај позив"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"На ову позивницу сте одговорили са „можда“"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Одбили сте овај позив"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Порука је избрисана."</item>
+    <item quantity="other" msgid="6574961322865652255">"Поруке су избрисане."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Порука је одбачена."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Порука је сачувана као недовршена."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Није могуће приказати овај прилог."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Конфигурисање е-поште"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Додавање Exchange налога"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Додајте Exchange ActiveSync налог"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"За већину налога е-пошту можете да конфигуришете у само неколико корака."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Exchange налог можете да конфигуришете у свега неколико корака."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Exchange ActiveSync налог можете да конфигуришете у свега неколико корака."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Подразумевано шаљи поруке е-поште са овог налога."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Ручно подешавање"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Унесите важећу адресу е-поште и лозинку."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Дуплирани налог"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Ови подаци за пријављивање се већ користе за налог „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Преузимање информација о налогу је у току…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"У току је провера подешавања сервера за долазну пошту…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"У току је провера подешавања одлазног сервера…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Конфигурисање е-поште"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именујте овај налог (опционално)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше име (приказано у одлазним порукама)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Додај нови налог е-поште"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Који је ово тип налога?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Подешавања сервера за долазну пошту"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Корисничко име"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Лозинка"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 сервер"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP сервер"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тип безбедности"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ништа"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (прихвати све сертификате)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (прихвати све сертификате)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Бриши поруке е-поште са сервера"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Никад"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Када избришем из пријемног сандучета"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"префикс IMAP путање"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Опционално"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Подешавања одлазног сервера"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP сервер"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безбедности"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Захтева пријављивање."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Корисничко име"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Лозинка"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Подешавања сервера"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Сервер"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен/корисничко име"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Користите безбедну везу (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Прихвати све SSL сертификате"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Опције налога"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Учесталост провере е-поште"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Никад"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Аутоматски (Push)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Сваких 5 минута"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Сваких 10 минута"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Сваких 15 минута"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Сваких 30 минута"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"На сваких сат времена"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Подразумевано шаљи поруке е-поште са овог налога."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Обавести ме о пријему поруке е-поште."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхронизуј контакте са овог налога."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхронизуј календар са овог налога."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Није било могуће довршити поступак подешавања"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Налог за синхронизацију"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Један дан"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Три дана"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Недељу дана"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Две недеље"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Месец дана"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Корисничко име или лозинка нису тачни."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Корисничко име или лозинка нису тачни."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Безбедно повезивање са сервером није могуће."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Безбедно повезивање са сервером није могуће."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Повезивање са сервером није могуће."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Повезивање са сервером није могуће."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS је захтеван, али га сервер не подржава."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Сервер не подржава методе потврде идентитета."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Услед безбедносне грешке није могуће успоставити везу са сервером."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Није било могуће успоставити везу са сервером."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Удаљено безбедносно администрирање"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Сервер <xliff:g id="SERVER">%s</xliff:g> захтева да му омогућите удаљену контролу појединих безбедносних функција телефона. Желите ли да завршите поступак конфигурације овог налога?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Овај сервер захтева безбедносне функције које ваш телефон не подржава."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Потребно је ажурирати безбедносна подешавања за налог „<xliff:g id="ACCOUNT">%s</xliff:g>“."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Безбедносна подешавања ажурирања"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Безбедност уређаја"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Сервер <xliff:g id="SERVER">%s</xliff:g> захтева да му омогућите удаљену контролу појединих безбедносних функција телефона."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Измени детаље"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Општа подешавања"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Подразумевани налог"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Подразумевано шаљи поруке е-поште са овог налога"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Обавештења е-поштом"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Обавести ме у статусној траци када стигне порука е-поште"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Учесталост провере е-поште"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Подешавања долазећих"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Подешавања одлазних"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Име налога"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Ваше име"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Потпис"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Додајте текст порукама које шаљете"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Подешавања обавештења"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Синхронизација контаката"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхронизуј и контакте са овог налога"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхронизација календара"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхронизуј и календар са овог налога"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибрација"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Вибрирај и када стигне порука е-поште"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Увек"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само у нечујном режиму"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никад"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибрација"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Изабери звук звона"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Подешавања сервера"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Уклони налог"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Налог „<xliff:g id="ACCOUNT">%s</xliff:g>“ биће уклоњен из е-поште."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Надоградња налога"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Није могуће надоградити налог."</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Приступ поштанском сандучету није подржан за поједине типове Yahoo! налога е-поште. Ако имате потешкоћа са повезивањем, додатне информације потражите на адреси yahoo.com."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Пре него што конфигуришете овај налог е-поште, посетите Yahoo! веб сајт и омогућите приступ е-пошти преко POP3 протокола за овај налог."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Само неки „Плус“ налози подржавају приступ преко POP протокола, што омогућава повезивање овог програма. Ако не можете да се пријавите користећи тачну адресу е-поште и лозинку, можда немате плаћени „Плус“ налог. Покрените веб прегледач да бисте приступили овим налозима е-поште."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Пре него што конфигуришете овај налог е-поште, посетите T-Online веб сајт и одредите лозинку за приступ е-пошти преко POP3 протокола."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Corporate"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Прихваћено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Одбијен: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Проба: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Отказано: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Ажурирано: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Када: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Где: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Када: <xliff:g id="EVENTDATE">%s</xliff:g> (редовно)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Овај догађај је отказан за: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Детаљи овог догађаја су промењени за: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"Менаџер налога није успео да направи налог; покушајте поново."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Пошаљи е-поштом"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Омогућава безбедносне смернице за одређене сервере"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Додат је Exchange календар"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Претражује се <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> резултата од <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> резултата са домена <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Првих <xliff:g id="RESULTS">%1$d</xliff:g> резултата од <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ca06928..ed0c0fa 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"Nästa"</string>
     <string name="okay_action" msgid="8365197396795675617">"OK"</string>
     <string name="cancel_action" msgid="6967435583794021865">"Avbryt"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Skicka"</string>
     <string name="reply_action" msgid="4262472229221507619">"Svara"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Svara alla"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Konton"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Markera som läst"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Markera som oläst"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Lägg till kopia/hemlig kopia"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Lägg till bilaga"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Inställningar för dumpar"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> till"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> till"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nya"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nya"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nya<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> nya<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Inkorgen"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Utkorgen"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Utkast"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Utkorgen"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Tryck länge på ett konto om du vill uppdatera det"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"E-postkonto"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombinerad vy"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Hämta fler meddelanden"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> markerad"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> markerade"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"Inga meddelanden"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Till"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopia"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Hemlig kopia"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Ämne"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Skriv e-post"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Ursprungligt meddelande --------"\n"Ämne: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Från: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Till: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopia: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citerad text"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Inkludera text"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du måste lägga till minst en mottagare."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Några av e-postadresserna är ogiltiga."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen är för stor för att bifogas."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> och <xliff:g id="NUMBER">%2$d</xliff:g> andra"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Till:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Kopia:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Hemlig kopia:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Visa"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Läs in"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Spara"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Bilagan har sparats som <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Bilagan kunde inte sparas."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Obs! En eller flera bilagor i det vidarebefordrade meddelandet hämtas innan de skickas."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"Meddelande"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Bjud in"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"Bilaga <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="974463163535515223">"Bilagor <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Visa bilder"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Visa i Kalender"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Kalenderinbjudan"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Du har accepterat inbjudan"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Du har svarat Kanske på den här inbjudan"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Du har tackat nej till inbjudan"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"Meddelandet tas bort."</item>
     <item quantity="other" msgid="6574961322865652255">"Meddelandena har tagits bort."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> meddelandet har flyttats till <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> meddelanden har flyttats till <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"En bilaga gick inte att vidarebefordra"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Det gick inte att vidarebefordra en eller flera bifogade filer"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"Det gick inte att skicka bilagan <xliff:g id="FILENAME"> %s</xliff:g> med utgående e-post eftersom den inte kunde hämtas."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> ej inloggad"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Tryck här om du vill ändra kontoinställningarna"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> – <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"Skapa e-postkonto"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Skapa e-postkonto"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Lägg till ett Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Lägg till ett Exchange ActiveSync-konto"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"Du kan konfigurera e-post för de flesta konton med några få steg."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Du kan konfigurera ett Exchange-konto med några få steg."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Du kan konfigurera ett Exchange ActiveSync-konto med några få steg."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-postadress"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Lösenord"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Skicka e-post från det här kontot som standard"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuell inställning"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Ange en giltig e-postadress och lösenord."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hämtar kontoinformation…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerar inkommande serverinställningar…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerar utgående serverinställningar…"</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"Skapa e-postkonto"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Ditt konto är färdigt och snart kan du skicka och ta emot e-postmeddelanden!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Skapa e-postkonto"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ge kontot ett namn (valfritt)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ditt namn (visas för utgående meddelanden)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Lägg till nytt konto"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Lägg till nytt konto"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Vilken typ av konto är det här?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Inkommande serverinställningar"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Inkommande serverinställningar"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Användarnamn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Lösenord"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3-server"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"När jag tar bort något från min Inkorg"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-sökvägsprefix"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valfritt"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Utgående serverinställningar"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Utgående serverinställningar"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Säkerhetstyp"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kräv inloggning"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Användarnamn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Lösenord"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Serverinställningar"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Serverinställningar"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domän\\Användarnamn"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Använd säker anslutning (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptera alla SSL-certifikat"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Den mobila enhetens ID"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Kontoalternativ"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoalternativ"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Intervall för e-postkontroll"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldrig"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatiskt (push)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Fel användarnamn eller lösenord."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Det går inte att upprätta en säker anslutning till servern."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Det går inte att upprätta en säker anslutning till servern."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Servern svarade med ett fel. Kontrollera ditt användarnamn och lösenord och försök igen."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Det går inte att ansluta till servern."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Det går inte att ansluta till servern."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS krävs men stöds inte av servern."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Fjärradministrera säkerhet"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Servern <xliff:g id="SERVER">%s</xliff:g> måste kunna fjärrkontrollera vissa säkerhetsfunktioner i telefonen. Vill du slutföra registreringen av kontot?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Den här servern kräver säkerhetsfunktioner som din telefon inte stöder."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"VARNING! Om du inaktiverar e-postprogrammets behörighet att administrera enheten, raderas alla e-postkonton som behöver behörigheten tillsammans med e-post, kontakter, kalenderhändelser och andra data."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Kontot \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kräver att säkerhetsinställningarna uppdateras."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Uppdatera säkerhetsinställningar"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Säkerhet för enhet"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
new file mode 100644
index 0000000..84306e6
--- /dev/null
+++ b/res/values-th/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"กำลังส่งข้อความ..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"ส่งข้อความออก"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"กำลังเรียกไฟล์แนบ"</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"กำลังเรียกไฟล์แนบ <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"อ่านไฟล์แนบของอีเมล"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"อนุญาตให้แอปพลิเคชันนี้อ่านไฟล์แนบอีเมลของคุณ"</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"เข้าถึงข้อมูลผู้ให้บริการอีเมล"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"อนุญาตให้แอปพลิเคชันนี้เข้าถึงฐานข้อมูลอีเมลของคุณ รวมถึงข้อความที่ได้รับ ข้อความที่ส่ง ชื่อผู้ใช้และรหัสผ่าน"</string>
+    <string name="app_name" msgid="5815426892327290362">"อีเมล"</string>
+    <string name="compose_title" msgid="427986915662706899">"เขียน"</string>
+    <string name="debug_title" msgid="5175710493691536719">"ดีบัก"</string>
+    <string name="next_action" msgid="3931301986364184415">"ถัดไป"</string>
+    <string name="okay_action" msgid="8365197396795675617">"ตกลง"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"ยกเลิก"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"ส่ง"</string>
+    <string name="reply_action" msgid="4262472229221507619">"ตอบกลับ"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"ตอบกลับทั้งหมด"</string>
+    <string name="delete_action" msgid="8421026208288857155">"ลบ"</string>
+    <string name="forward_action" msgid="669174181042344116">"ส่งต่อ"</string>
+    <string name="done_action" msgid="7497990549515580249">"เสร็จสิ้น"</string>
+    <string name="discard_action" msgid="6532206074859505968">"ยกเลิก"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"บันทึกเป็นร่างจดหมาย"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"อ่านแล้ว/ยังไม่อ่าน"</string>
+    <string name="read_action" msgid="4701484794504781686">"ทำเครื่องหมายว่าอ่านแล้ว"</string>
+    <string name="unread_action" msgid="6280399049357552826">"ทำเครื่องหมายว่ายังไม่ได้อ่าน"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"รายการโปรด"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"เพิ่มดาว"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"ลบดาว"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"รีเฟรช"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"เพิ่มบัญชี"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"ยกเลิกการเลือกทั้งหมด"</string>
+    <string name="compose_action" msgid="4045702519637388045">"เขียน"</string>
+    <string name="search_action" msgid="6325101454876682308">"ค้นหา"</string>
+    <string name="open_action" msgid="936766723989190816">"เปิด"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"การตั้งค่าบัญชี"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"ลบบัญชี"</string>
+    <string name="folders_action" msgid="7502431531355227666">"โฟลเดอร์"</string>
+    <string name="accounts_action" msgid="901105887272231493">"บัญชี"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"ทำเครื่องหมายว่าอ่านแล้ว"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"ทำเครื่องหมายว่ายังไม่ได้อ่าน"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"เพิ่ม สำเนา/สำเนาลับ"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"เพิ่มไฟล์แนบ"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"การตั้งค่าดัมพ์"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"เลือกไฟล์แนบ"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"ข้อผิดพลาดของการเชื่อมต่อ"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"อีเมลใหม่"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"พบข้อผิดพลาดที่ไม่คาดคิดระหว่างโหลดข้อความตัวอักษร ข้อความอาจใหญ่เกินไปสำหรับการดู"</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ฉบับที่ยังไม่ได้อ่าน (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ยังไม่ได้อ่าน (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ยังไม่ได้อ่าน (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"ในบัญชี <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> บัญชี"</item>
+    <item quantity="other" msgid="2723797835410343458">"ในบัญชี <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> บัญชี"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"กล่องจดหมาย"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"กล่องจดหมายออก"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"ร่างจดหมาย"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"ถังขยะ"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"ส่งแล้ว"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"ขยะ"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"รุ่น: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"บัญชี"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"กล่องจดหมายรวม"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"ที่ติดดาว"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"ร่างจดหมาย"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"กล่องจดหมายออก"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"กดบัญชีค้างไว้เพื่อรีเฟรช"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"กล่องจดหมาย"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"โหลดข้อความเพิ่มเติม"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"ถึง"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"สำเนา"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"สำเนาลับ"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"เรื่อง"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"เขียนจดหมาย"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- ข้อความต้นฉบับ --------"\n"เรื่อง: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"จาก: <xliff:g id="SENDER">%2$s</xliff:g>"\n"ถึง: <xliff:g id="TO">%3$s</xliff:g>"\n"สำเนา: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> เขียนว่า:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"ข้อความที่ยกมา"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"คุณต้องเพิ่มผู้รับอย่างน้อยหนึ่งราย"</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"ที่อยู่อีเมลบางที่อยู่ไม่ถูกต้อง"</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"ไฟล์ใหญ่เกินไปที่จะแนบ"</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> และอื่นๆ อีก <xliff:g id="NUMBER">%2$d</xliff:g> ราย"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"ถึง:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"สำเนา:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"เปิด"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"บันทึกไฟล์แนบลงการ์ด SD ในชื่อ <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"ไม่สามารถบันทึกไฟล์แนบในการ์ด SD"</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"แสดงรูปภาพ"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"ดูในปฏิทิน »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"ข้อความเชิญในปฏิทิน"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"เข้าร่วมหรือไม่"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" ใช่"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" อาจจะ"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" ไม่"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"คุณได้ตอบรับข้อความเชิญนี้"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"คุณได้ตอบข้อความเชิญนี้ว่า \"อาจจะ\""</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"คุณได้ปฏิเสธข้อความเชิญนี้"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"ลบข้อความแล้ว"</item>
+    <item quantity="other" msgid="6574961322865652255">"ข้อความถูกลบแล้ว"</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"ยกเลิกข้อความแล้ว"</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"บันทึกข้อความเป็นร่างจดหมาย"</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"ไม่สามารถแสดงไฟล์แนบนี้"</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"ตั้งค่าอีเมล"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"เพิ่มบัญชี Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"เพิ่มบัญชี Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"คุณสามารถกำหนดค่าอีเมลสำหรับบัญชีส่วนใหญ่ได้ในไม่กี่ขั้นตอน"</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"คุณสามารถกำหนดค่าบัญชี Exchange ได้ในไม่กี่ขั้นตอน"</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"คุณสามารถกำหนดค่าบัญชี Exchange ActiveSync ได้ในไม่กี่ขั้นตอน"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"ตั้งค่าด้วยตนเอง"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"โปรดพิมพ์ที่อยู่อีเมลและรหัสผ่านที่ถูกต้อง"</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"บัญชีซ้ำ"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"ข้อมูลการลงชื่อเข้าใช้นี้ถูกใช้กับบัญชี \"<xliff:g id="DUPLICATE">%s</xliff:g>\" แล้ว"</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"กำลังเรียกข้อมูลบัญชี..."</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์ขาเข้า..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์ขาออก..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"ตั้งค่าอีเมล"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"ตั้งชื่อให้กับบัญชีนี้ (เป็นตัวเลือก)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"ชื่อของคุณ (แสดงในข้อความขาออก)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"เพิ่มบัญชีอีเมลใหม่"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"บัญชีนี้เป็นบัญชีประเภทใด"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"การตั้งค่าเซิร์ฟเวอร์ขาเข้า"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"ชื่อผู้ใช้"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"รหัสผ่าน"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"เซิร์ฟเวอร์ POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"เซิร์ฟเวอร์ IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"พอร์ต"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"ประเภทการรักษาความปลอดภัย"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ไม่มี"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (ยอมรับใบรับรองทั้งหมด)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (ยอมรับใบรับรองทั้งหมด)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"ลบอีเมลจากเซิร์ฟเวอร์"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"ไม่เคย"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"เมื่อฉันลบจากกล่องจดหมาย"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"ส่วนนำของพาธ IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"เป็นตัวเลือก"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"การตั้งค่าเซิร์ฟเวอร์ขาออก"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"เซิร์ฟเวอร์ SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"พอร์ต"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"ประเภทการรักษาความปลอดภัย"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"ต้องลงชื่อเข้าใช้"</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"ชื่อผู้ใช้"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"รหัสผ่าน"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"การตั้งค่าเซิร์ฟเวอร์"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"เซิร์ฟเวอร์"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"โดเมน\\ชื่อผู้ใช้"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"ใช้การเชื่อมต่อที่ปลอดภัย (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"ยอมรับใบรับรอง SSL ทั้งหมด"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"ตัวเลือกของบัญชี"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"ความถี่ในการเช็คอีเมล"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"ไม่เคย"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"อัตโนมัติ (Push)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"ทุก 5 นาที"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"ทุก 10 นาที"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"ทุก 15 นาที"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"ทุก 30 นาที"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"ทุกชั่วโมง"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"แจ้งให้ฉันทราบเมื่อมีอีเมลเข้า"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"ซิงค์รายชื่อจากบัญชีนี้"</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"ซิงค์ปฏิทินจากบัญชีนี้"</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"การตั้งค่าไม่สมบูรณ์"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"จำนวนที่จะซิงค์"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"หนึ่งวัน"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"3 วัน"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1 สัปดาห์"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"สองสัปดาห์"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"1 เดือน"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้อย่างปลอดภัย"</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ได้อย่างปลอดภัย"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์"</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"ต้องใช้ TLS แต่เซิร์ฟเวอร์ไม่สนับสนุน"</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"เซิร์ฟเวอร์ไม่สนับสนุนวิธีการตรวจสอบความถูกต้อง"</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"ไม่สามารถเปิดการเชื่อมต่อไปยังเซิร์ฟเวอร์ เนื่องจากข้อผิดพลาดด้านความปลอดภัย"</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"ไม่สามารถเปิดการเชื่อมต่อไปยังเซิร์ฟเวอร์"</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"การจัดการด้านความปลอดภัยจากระยะไกล"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"เซิร์ฟเวอร์ <xliff:g id="SERVER">%s</xliff:g> ต้องการให้คุณอนุญาตให้ควบคุมคุณลักษณะด้านความปลอดภัยบางอย่างของโทรศัพท์คุณได้จากระยะไกล คุณต้องการตั้งค่าบัญชีนี้ให้เสร็จหรือไม่"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"เซิร์ฟเวอร์นี้ต้องการคุณลักษณะด้านความปลอดภัยที่โทรศัพท์คุณไม่สนับสนุน"</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"บัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ต้องการการอัปเดตการตั้งค่าความปลอดภัย"</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"อัปเดตการตั้งค่าความปลอดภัย"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"ความปลอดภัยอุปกรณ์"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"เซิร์ฟเวอร์ <xliff:g id="SERVER">%s</xliff:g> ต้องการให้คุณอนุญาตให้ควบคุมคุณลักษณะด้านความปลอดภัยบางอย่างของโทรศัพท์คุณได้จากระยะไกล"</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"แก้ไขรายละเอียด"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"การตั้งค่าทั่วไป"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"บัญชีเริ่มต้น"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"การแจ้งเตือนทางอีเมล"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"แจ้งในแถบสถานะเมื่อมีอีเมลเข้า"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"ความถี่ในการเช็คอีเมล"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"การตั้งค่าข้อความขาเข้า"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"การตั้งค่าข้อความขาออก"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"ชื่อบัญชี"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"ชื่อของคุณ"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"ลายเซ็น"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"เพิ่มข้อความต่อท้ายจดหมายที่คุณส่ง"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"การตั้งค่าการแจ้งเตือน"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"ซิงค์รายชื่อในสมุดโทรศัพท์"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ซิงค์รายชื่อในสมุดโทรศัพท์จากบัญชีนี้"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"ซิงค์ปฏิทิน"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"ซิงค์ปฏิทินจากบัญชีนี้"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"สั่น"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"สั่นเมื่อมีอีเมลเข้า"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ทุกครั้ง"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"เฉพาะเมื่อปิดเสียง"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"ไม่เคย"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"สั่น"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"เลือกเสียงเรียกเข้า"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"การตั้งค่าเซิร์ฟเวอร์"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"ลบบัญชี"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"บัญชี \"<xliff:g id="ACCOUNT">%s</xliff:g>\" จะถูกลบจากอีเมล"</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"อัปเกรดบัญชี"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"อัปเกรดบัญชีไม่ได้"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"ไม่สนับสนุนการเข้าถึงกล่องจดหมายสำหรับบัญชีจดหมาย Yahoo! บางประเภท หากคุณประสบปัญหาในการเชื่อมต่อ โปรดเข้าสู่ yahoo.com เพื่อดูข้อมูลเพิ่มเติม"</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"ก่อนที่จะตั้งค่าบัญชีอีเมลนี้ โปรดเข้าสู่เว็บไซต์ Yahoo! และเปิดใช้การเข้าถึงอีเมลแบบ POP3 สำหรับบัญชีนี้"</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"มีเพียงบัญชีแบบ \"Plus\" บางประเภทเท่านั้นที่มีการเข้าถึงแบบ POP ที่โปรแกรมสามารถเชื่อมต่อได้ ถ้าคุณไม่สามารถลงชื่อเข้าใช้ด้วยที่อยู่อีเมลและรหัสผ่านที่ถูกต้อง อาจเป็นเพราะคุณไม่มีบัญชี \"Plus\" แบบมีค่าใช้จ่าย โปรดเปิดเว็บเบราว์เซอร์เพื่อเข้าถึงบัญชีอีเมลเหล่านี้"</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"ก่อนที่จะตั้งค่าบัญชีอีเมลนี้ โปรดเข้าสู่เว็บไซต์ T-Online และสร้างรหัสผ่านสำหรับการเข้าถึงอีเมลแบบ POP3"</string>
+    <string name="exchange_name" msgid="1190783774800310346">"องค์กร"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"ตกลงเข้าร่วม: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"ปฏิเสธ: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"ชั่วคราว: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"ยกเลิกแล้ว: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"อัปเดต: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"เวลา: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"สถานที่: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"เวลา: <xliff:g id="EVENTDATE">%s</xliff:g> (เกิดซ้ำ)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"กิจกรรมถูกยกเลิกแล้วในวันที่: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"วันที่ของกิจกรรมนี้ถูกเปลี่ยนเป็น: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager ไม่สามารถสร้างบัญชี โปรดลองใหม่อีกครั้ง"</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"อีเมล"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"เปิดการใช้งานนโยบายความปลอดภัยที่ระบุโดยเซิร์ฟเวอร์"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"เพิ่มปฏิทิน Exchange แล้ว"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"กำลังค้นหา <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"ผลลัพธ์ <xliff:g id="RESULTS">%1$d</xliff:g> รายการจาก <xliff:g id="DOMAIN">%2$s</xliff:g> รายการ"</item>
+    <item quantity="other" msgid="7816121892960632123">"ผลลัพธ์ <xliff:g id="RESULTS">%1$d</xliff:g> รายการจาก <xliff:g id="DOMAIN">%2$s</xliff:g> รายการ"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"ผลลัพธ์ <xliff:g id="RESULTS">%1$d</xliff:g> รายการแรกจาก <xliff:g id="DOMAIN">%2$s</xliff:g> รายการ"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
new file mode 100644
index 0000000..6cae0ee
--- /dev/null
+++ b/res/values-tl/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Nagpapadala ng mga mensahe…"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Magpadala ng mga papalabas na mensahe"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Kinukuha ang attachment."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Kinukuha ang attachment <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Basahin ang mga attachment ng Email"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Pinapayagan ang application na ito na basahin ang mga attachment ng iyong Email."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"I-access ang data ng Email provider"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Pinapayagan ang application na ito upang ma-access ang database ng iyong Email, kabilang ang mga natanggap na mensahe, ipinadalang mensahe, username at password."</string>
+    <string name="app_name" msgid="5815426892327290362">"Email"</string>
+    <string name="compose_title" msgid="427986915662706899">"Bumuo"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
+    <string name="next_action" msgid="3931301986364184415">"Susunod"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Kanselahin"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Ipadala"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Tumugon"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Tumugon sa lahat"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Tanggalin"</string>
+    <string name="forward_action" msgid="669174181042344116">"Ipasa"</string>
+    <string name="done_action" msgid="7497990549515580249">"Tapos na"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Itapon"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"I-save bilang draft"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Nabasa na/Hindi pa nababasa"</string>
+    <string name="read_action" msgid="4701484794504781686">"Markahan ng nabasa na"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Markahan bilang hindi pa nabasa"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Paborito"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Magdagdag ng star"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Alisin ang bituin"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"I-refresh"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Magdagdag ng account"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Alisin sa pagkakapili ang lahat"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Bumuo"</string>
+    <string name="search_action" msgid="6325101454876682308">"Paghahanap"</string>
+    <string name="open_action" msgid="936766723989190816">"Buksan"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Mga setting ng account"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Alisin ang account"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Mga Folder"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Mga Account"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Markahan bilang nabasa na"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Markahan bilang hindi pa nababasa"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Magdagdag ng Cc/Bcc"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Magdagdag ng attachment"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Mga setting sa pagtapon"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Pumili ng attachment"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Error sa koneksyon"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Bagong email"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Hindi inaasahang error habang naglo-load ng teksto ng mensahe. Maaaring masyadong malaki ang mensahe upang tingnan."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> (na) hindi pa nababasa (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> (na) hindi pa nababasa (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> (na) hindi pa nababasa (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"sa <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (na) account"</item>
+    <item quantity="other" msgid="2723797835410343458">"sa <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> (na) account"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Inbox"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Outbox"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Mga Draft"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Basurahan"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Ipinadala"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Basura"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Bersyon: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Mga Account"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Pinagsamang Inbox"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Naka-star"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Mga Draft"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Outbox"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Mangyaring pindutin nang matagal ang account upang i-refresh ito"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Mailbox"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Mag-load nang marami pang mensahe"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Para kay"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Paksa"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Bumuo ng Mail"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Orihinal na Mensahe --------"\n"Paksa: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Mula kay: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para kay: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">"Si "\n\n"<xliff:g id="SENDER">%s</xliff:g> ay sumulat:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Naka-quote na teksto"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Dapat kang magdagdag ng hindi bababa sa isang recipient."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Di-wasto ang ilang email address."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Masyadong malaki ang file upang i-attach."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> at <xliff:g id="NUMBER">%2$d</xliff:g> iba pa"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Para kay:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Buksan"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Na-save ang attachment sa SD card bilang <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Hindi magawang mag-save ng attachment sa SD card."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Ipakita ang mga larawan"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Tingnan sa Kalendaryo »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Imbitasyon sa Kalendaryo"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Pupunta?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Oo"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Maaari"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Hindi"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Tinanggap mo ang imbitasyong ito"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Tumugon ka ng \"maaari\" sa imbitasyong ito"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Tinanggihan mo ang imbitasyong ito"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Tinanggal ang mensahe."</item>
+    <item quantity="other" msgid="6574961322865652255">"Tinanggal ang mga mensahe."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Itinapon ang mensahe."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Na-save ang mensahe bilang draft."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Hindi maipapakita ang attachment na ito."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"I-set up ang email"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Magdagdag ng Exchange account"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Magdagdag ng Exchange ActiveSync account"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Maaari kang mag-configure ng Email para sa karamihang account sa ilang hakbang lang."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Maaari kang mag-configure ng Exchange account sa ilang hakbang lang."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Maaari kang mag-configure ng Exchange ActiveSync account sa ilang hakbang lang."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Magpadala ng email mula sa account na ito bilang default."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manu-manong pag-setup"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Mangyaring mag-type ng wastong email address at password."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Duplicate na Account"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Ginagamit na ang pag-login na ito para sa account na \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Binabawi ang impormasyon ng account…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sinusuri ang mga setting ng papasok na server…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sinusuri ang mga setting ng papalabas na server…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"I-set up ang email"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Bigyan ng pangalan ang account na ito (opsyonal)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Iyong pangalan (na ipinapakita sa mga papalabas na mensahe)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Magdagdag ng bagong email account"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Anong uri ng account ito?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Mga setting ng papasok na server"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Username"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Password"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 server"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"IMAP server"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Uri ng seguridad"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Wala"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Tanggapin ang lahat ng mga certificate)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Tanggapin ang lahat ng mga certificate)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Tanggalin ang email mula sa server"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Hindi kailanman"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kapag nagtanggal ako mula sa Inbox"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefix ng path ng IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opsyonal"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Mga setting ng papalabas na server"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP server"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Uri ng seguridad"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Nangangailangan ng pag-sign-in."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Username"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Password"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Mga setting ng server"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domain\\Username"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Gumamit ng secure na koneksyon (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Tanggapin ang lahat ng mga SSL certificate"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Mga pagpipilian sa account"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Dalas ng pagsusuri ng email"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Hindi kailanman"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Awtomatiko (Itulak)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Tuwing 5 minuto"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Tuwing 10 minuto"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Tuwing 15 minuto"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Tuwing 30 minuto"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Oras-oras"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Magpadala ng email mula sa account na ito bilang default."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"I-notify ako kapag dumating ang email."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"I-sync ang mga contact mula sa account na ito."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"I-sync ang kalendaryo mula sa account na ito"</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Hindi matapos ang pag-setup"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Halagang isi-synchronize"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Isang araw"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tatlong araw"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Isang linggo"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Dalawang linggo"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Isang buwan"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Mali ang username o password."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Mali ang username o password."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Hindi ligtas na makakonekta sa server."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Hindi ligtas na makakonekta sa server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Hindi makakontekta sa server."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Hindi makakonekta sa server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Kinakailangan ang TLS ngunit hindi suportado ng server."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Hindi suportado ng server ng mga pamamaraan sa pagpapatotoo."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Hindi magawang buksan ang koneksyon sa server dahil sa error sa seguridad."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Hindi magawang buksan ang koneksyon sa server."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Pangangasiwa ng remote na seguridad"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Kinakailangan ng server na <xliff:g id="SERVER">%s</xliff:g> na payagan mo itong kontrolin ang ilang tampok sa seguridad ng iyong telepono. Nais mo bang tapusin ang pag-set up ng account na ito?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Nangangailangan ang server na ito ng mga tampok sa seguridad na hindi sinusuportahan ng iyong telepono."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Nangangailangan ang account na \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ng pag-update ng mga setting ng seguridad."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"I-update ang Mga Setting ng Seguridad"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Seguridad ng Device"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Kinakailangan ng server na <xliff:g id="SERVER">%s</xliff:g> na payagan mo itong kontrolin ang ilang tampok sa seguridad ng iyong telepono."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"I-edit ang mga detalye"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Mga pangkalahatang setting"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Default na account"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Magpadala ng email mula sa account na ito bilang default"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Mga notification sa email"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"I-notify sa status bar kapag dumating ang email"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Dalas ng pagsusuri ng email"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Mga setting ng papasok"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Mga setting ng papalabas"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Pangalan ng account"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Iyong pangalan"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Lagda"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Magsama ng teksto sa mga mensaheng iyong ipinapadala"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Mga setting ng notification"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"I-sync ang mga contact"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"I-sync rin ang mga contact mula sa account na ito"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"I-sync ang kalendaryo"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Mag-sync rin ng kalendaryo mula sa account na ito"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"I-vibrate"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"I-vibrate rin kapag dumating ang email"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Palagi"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kapag tahimik lang"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hindi kailanman"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"I-vibrate"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Pumili ng ringtone"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Mga setting ng server"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Alisin ang account"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Aalisin ang account na \"<xliff:g id="ACCOUNT">%s</xliff:g>\" mula sa Email."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"I-upgrade ang mga account"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Hindi magawang mag-upgrade ng account"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Ang access sa mailbox ay hindi suportado para sa ilang uri ng mga Yahoo! mail account. Kung mayroon kang problema sa pagkonekta, bisitahin ang yahoo.com para sa higit pang impormasyon."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Bago ang pag-set up ng email account na ito, pakibisita ang Yahoo! web site at pagahanin ang access sa POP3 email para sa account na ito."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Ang ilan lang na \"Plus\" account ang kinabibilangan ng access sa POP at nagbibigay-daan sa programang ito na makakonekta. Kung hindi mo magawang mag-sign in gamit ang iyong tamang email address at password, maaaring wala kang bayad na \"Plus\" account. Pakilunsad ang Web browser upang makakuha ng access sa mga mail account na ito."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Bago ang pag-set up ng email account na ito, pakibisita ang T-Online Web site at lumikha ng password para sa access sa POP3 email."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Corporate"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Tinanggap: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Tinanggihan: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Pansamantala: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Kinansela: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Na-update: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Kailan: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Saan: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Kailan: <xliff:g id="EVENTDATE">%s</xliff:g> (paulit-ulit)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Kinansela ang kaganapang ito para sa: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Ang mga detalye ng kaganapang ito ay binago para sa: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"Hindi malikha ng AccountManager ang Account; pakisubukang muli."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Email"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Pinapagana ang mga patakaran sa seguridad na partikular sa server"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Idinagdag ang kalendaryong Exchange"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Naghahanap <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> resulta mula sa <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> (na) resulta mula sa <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Unang <xliff:g id="RESULTS">%1$d</xliff:g> (na) resulta mula sa <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 6b63979..95b9c8b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"İleri"</string>
     <string name="okay_action" msgid="8365197396795675617">"Tamam"</string>
     <string name="cancel_action" msgid="6967435583794021865">"İptal"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"Gönder"</string>
     <string name="reply_action" msgid="4262472229221507619">"Yanıtla"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"Tümünü yanıtla"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"Hesaplar"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"Okundu olarak işaretle"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Okunmadı olarak işaretle"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Cc/Bcc Ekle"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Ek ekle"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"Döküm ayarları"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> kişi daha"</item>
     <item quantity="other" msgid="4440886271354944083">"<xliff:g id="SENDER_NAME">%1$s</xliff:g> + <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> kişi daha"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> yeni"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> yeni"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> yeni<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> yeni<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Gelen Kutusu"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Giden Kutusu"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Taslaklar"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Giden Kutusu"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Lütfen bir hesabı yenilemek için hesaba uzun basın"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"Posta kutusu"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Birleşik görünüm"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Daha fazla ileti yükle"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seçildi"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> seçildi"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"İleti yok"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"Şu dile:"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"Konu"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"Posta Oluştur"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Orijinal İleti --------"\n"Konu: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Gönderen: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Alıcı:<xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> şunu yazdı:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Alıntılanan metin"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Metni ekle"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"En az bir alıcı eklemelisiniz."</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Bazı e-posta adresleri geçersiz."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Dosya eklenemeyecek kadar büyük."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> ve <xliff:g id="NUMBER">%2$d</xliff:g> kişi daha"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"Alıcı:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"Bcc:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Görüntüle"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Yükle"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Kaydet"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Ek <xliff:g id="FILENAME">%s</xliff:g> olarak kaydedildi."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Ek kaydedilemedi."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Not: Yönlendirilen iletinizdeki bir veya daha fazla ek, gönderme işleminden önce indirilecek."</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"İleti"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"Davet Et"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> ek"</item>
+    <item quantity="other" msgid="974463163535515223">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> ek"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Resimleri göster"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"Takvim\'de Görüntüle"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"Takvim Daveti"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Bu daveti kabul ettiniz"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Bu davete \"belki\" yanıtı verdiniz"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Bu daveti reddettiniz"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"İleti silindi."</item>
     <item quantity="other" msgid="6574961322865652255">"İletiler silindi."</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ileti <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> posta kutusuna taşındı"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ileti <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> posta kutusuna taşındı"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"Bir ek yönlendirilemedi"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"Bir veya birden fazla ek yönlendirilemedi"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"<xliff:g id="FILENAME"> %s</xliff:g> eki, indirilemediği için giden postanızla gönderilemedi."</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> oturm açılamadı"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"Hesap ayarlarını değiştirmek için dokunun"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"E-posta ayarla"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"E-posta ayarla"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Bir Exchange hesabı ekleyin"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Bir Exchange ActiveSync hesabı ekleyin"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"E-postayı çoğu hesap için yalnızca birkaç adımda yapılandırabilirsiniz."</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Yalnızca birkaç adımda bir Exchange hesabı yapılandırabilirsiniz."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Exchange ActiveSync hesabını yalnızca birkaç adımda yapılandırabilirsiniz."</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-posta adresi"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"Şifre"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"E-postayı varsayılan olarak bu hesaptan gönder."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuel kurulum"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Lütfen geçerli bir e-posta adresi ve şifre girin."</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hesap bilgileri alınıyor..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Gelen sunucu ayarları denetleniyor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Giden sunucu ayarları denetleniyor..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"E-posta ayarla"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"Hesabınız ayarlandı ve e-posta yolda!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"E-posta ayarla"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Bu hesaba bir ad ver (isteğe bağlı)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Adınız (giden iletilerde görüntülenir)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"Yeni e-posta hesabı ekle"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Yeni e-posta hesabı ekle"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Bu hesabın türü nedir?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"Gelen sunucu ayarları"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Gelen sunucu ayarları"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Kullanıcı adı"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Şifre"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 sunucusu"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Gelen Kutusundan sildiğimde"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP yolu öneki"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"İsteğe bağlı"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"Giden sunucu ayarları"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Giden sunucu ayarları"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP sunucusu"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Bağlantı Noktası"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Güvenlik türü"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Oturum açılmasını gerektiriyor."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Kullanıcı adı"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Şifre"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"Sunucu ayarları"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Sunucu ayarları"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Sunucu"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Alan adı/Kullanıcı adı"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Güvenli bağlantıyı kullan (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Tüm SSL sertifikalarını kabul et"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Mobil Cihaz Kimliği"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"Hesap seçenekleri"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Hesap seçenekleri"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Gelen kutusunu denetleme sıklığı"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Hiçbir zaman"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Otomatik (Push)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Kullanıcı adı veya şifre hatalı."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Sunucuya güvenli biçimde bağlanılamıyor."</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Sunucuya güvenli biçimde bağlanılamıyor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"Sunucu hata gönderdi. Lütfen kullanıcı adınızı ve şifrenizi kontrol ettikten sonra yeniden deneyin."</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Sunucuya bağlanılamıyor."</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Sunucuya bağlanılamıyor."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS gerekli ancak sunucu tarafından desteklenmiyor."</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Uzaktan güvenlik yönetimi"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"<xliff:g id="SERVER">%s</xliff:g> sunucusu, telefonunuzun bazı özelliklerini uzaktan kontrol etmesi için izin vermenizi gerektiriyor. Bu hesabı ayarlamayı tamamlamak istiyor musunuz?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Bu sunucu, telefonunuzun desteklemediği güvenlik özellikleri gerektiriyor."</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"UYARI: E-posta uygulamasının, cihazınızı yönetme yetkisinin devre dışı bırakılması, bunu gerektiren tüm e-posta hesaplarını e-postaları, kişileri, takvim olayları ve diğer verileri ile birlikte siler."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı, güvenlik ayarları güncellemesi gerektiriyor."</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"Güvenlik Ayarlarını Güncelle"</string>
     <string name="account_security_title" msgid="4441470647344315196">"Cihaz Güvenliği"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
new file mode 100644
index 0000000..a546922
--- /dev/null
+++ b/res/values-uk/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Надсил-ня листів…"</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Надісл. вихідні повідомл."</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Отримання вклад. файлу."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Отримання вклад. файлу <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Читати вклад. файли пошти"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Дозволяє цій програмі читати вкладені файли вашої пошти."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Доступ до даних провайд. пошти"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Дозволяє програмі отримувати доступ до бази даних пошти, зокрема отриманих і надісланих повід., імен користувачів і паролів."</string>
+    <string name="app_name" msgid="5815426892327290362">"Ел.пошта"</string>
+    <string name="compose_title" msgid="427986915662706899">"Написати"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Налагодж."</string>
+    <string name="next_action" msgid="3931301986364184415">"Далі"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Скасувати"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Надісл."</string>
+    <string name="reply_action" msgid="4262472229221507619">"Відпов."</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Відпов. всім"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Видалити"</string>
+    <string name="forward_action" msgid="669174181042344116">"Переслати"</string>
+    <string name="done_action" msgid="7497990549515580249">"Готово"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Відхилити"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Збер. як чернетку"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Прочит./непроч."</string>
+    <string name="read_action" msgid="4701484794504781686">"Позн. як проч."</string>
+    <string name="unread_action" msgid="6280399049357552826">"Позн. як непроч."</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Вибране"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Додати зір."</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Видал. зірочку"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Оновити"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Дод. обл.запис"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Відмінити всі"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Написати"</string>
+    <string name="search_action" msgid="6325101454876682308">"Пошук"</string>
+    <string name="open_action" msgid="936766723989190816">"Відкр."</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Налашт-ня обл. зап."</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Видал. обл. зап."</string>
+    <string name="folders_action" msgid="7502431531355227666">"Папки"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Обл. записи"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Позн. як прочит."</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Позн. як непрочит."</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Дод. копію/прих.копію"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Дод. вклад. файл"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Налашт-ня дампу"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Виберіть вклад. файл"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Помилка з\'єднання"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Новий лист"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Неочік. помилка під час завант. тексту повід. Воно може бути завелике для перегл."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> непрочит. (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> непрочит. (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> непрочит. (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"у <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> обл. записах"</item>
+    <item quantity="other" msgid="2723797835410343458">"у <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> обл. записах"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Вхідні"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Вихідні"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Чернетки"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Кошик"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Надісл."</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Спам"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Версія: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Обл. записи"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Об\'єднані вхідні"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Із зіроч."</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Чернетки"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Вихідні"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Натисн. і утрим. обл. запис, щоб його онов."</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Пошт. скр."</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Завант. інші повід."</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Кому"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Копія"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Прих. копія"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Тема"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Напишіть лист"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Оригінал. повід. --------"\n"Тема: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Від: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Кому: <xliff:g id="TO">%3$s</xliff:g>"\n"Копія: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> напис.:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитований текст"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Потрібно додати принаймні 1 отримувача."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Деякі електронні адреси недійсні."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Файл завеликий для вклад."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> і ще <xliff:g id="NUMBER">%2$d</xliff:g>"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Кому:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Копія:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Відкр."</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Вклад. файл збереж. на карту SD як <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Немож. зберегти вклад. файл на карті SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Показати зображ."</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Див. в Календарі »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Запрош. календаря"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Підете?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Так"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Можливо"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Ні"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Ви прийняли це запрошення"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Ваша відповідь на це запрошення: \"Можливо\""</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Ви відхилили це запрошення"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Повідом. видалено."</item>
+    <item quantity="other" msgid="6574961322865652255">"Повідомл. видалено."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Повідомл. відхилено."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Лист збереж. як чернетку."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Цей вкладений файл неможливо показати."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Налашт. ел.адр."</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Додати обл. запис Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Додати обл. запис Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Можна налашт. пошту для більшості обл. зап. через ряд дій."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Можна налашт-ти облік. запис Exchange за допом. ряду дій."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Можна налашт-ти облік. запис Exchange ActiveSync за допом. ряду дій."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Надс. ел.листи з цього обл. зап. за умовч."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Налашт-ня вручну"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Введіть дійсну електронну адресу та пароль."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Копія облік. запису"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Ці реєстрац. дані вже викор. для облік. запису \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Отримання інфо про облік. запис…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Перевірка налашт-нь вихід. сервера…"</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Перевірка налашт-нь вихід. сервера…"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Налашт. ел.адр."</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Назвіть цей обл. запис. (додатково)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ваше ім\'я (відображено у вихідних повідомл.)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Дод. нов. обл. зап. пошти"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Тип облікового запису?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Налашт. сервера вхід. повід."</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Ім\'я корист."</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Пароль"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Cервер POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Сервер IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Порт"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Тип безпеки"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Немає"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Прийняти всі сертифікати)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Прийняти всі сертифікати)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Видалити ел.лист із сервера"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Ніколи"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Коли видалено з вхідних"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Префікс шляху IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Додатково"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Налашт. сервера вихід. пов."</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Сервер SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Порт"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Тип безпеки"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Необхідно ввійти."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Ім\'я корист."</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Пароль"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Налашт-ня сервера"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Сервер"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Домен\\ім\'я корист."</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Викор. безпеч. з\'єднання (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Прийняти всі сертифікати SSL"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Парам. облік. зап."</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Частота перевірки ел. пошти"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Ніколи"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Автомат. (опер-р)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Кожні 5 хвилин"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Кожні 10 хвилин"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Кожні 15 хвилин"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Кожні 30 хвилин"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Щогодини"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Надс. ел.листи з цього обл. зап. за умовч."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Сповіщ. мене, коли надійде лист"</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Синхрон. контакти з цього обл. зап."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Синхроніз. календ. з обл. запису."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Налаштування не заверш."</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"К-сть для синхронізації"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Один день"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Три дні"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"1 тиждень"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"2 тижні"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Один місяць"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Ім\'я кор. або пароль неправильн."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Ім\'я корист. чи пароль неправильн."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Неможл. безпечно підкл. до сервера."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Неможл. безпечно підключ. до серв."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Неможл. підключ. до сервера."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Неможл. підключ. до сервера."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS обов\'язк., але не підтрм. цим сервером."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Методи автентифікації не підтримуються сервером."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Неможл. відкрити підключ. до сервера через помилку безпеки."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Неможл. відкрити підключ. до сервера."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Віддалене керування безпекою"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Сервер <xliff:g id="SERVER">%s</xliff:g> потребує вашого дозволу віддалено контролювати деякі функції безпеки вашого телефону. Завершити налаштування цього облікового запису?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Цей сервер потребує функцій захисту, які не підтрим. вашим телефоном."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Облік. запис \"<xliff:g id="ACCOUNT">%s</xliff:g>\" потреб. оновл. налашт-нь безпеки"</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Оновл. налашт-нь безпеки"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Безпека пристрою"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Сервер <xliff:g id="SERVER">%s</xliff:g> потребує вашого дозволу віддалено контролювати деякі функції безпеки вашого телефону."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Редаг. деталі"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Загальні налашт-ня"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Обл. зап. за умовч."</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Надіс. ел.листи з цього обл. зап. за умовч."</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Сповіщення ел. пошти"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Сповіщ. в рядку стану, коли надійде лист"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Частота перевірки пошти"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Налашт. вхід. повід."</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Налашт-ня вихідних"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Назва обл. зап."</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Ваше ім\'я"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Підпис"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Додав. текст у надісл. повідомл."</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Налаштування сповіщень"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Синхрон. контакти"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Також синхроніз. контакти з обл. запису"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхрон. календ."</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Також синхроніз. календ. з обл. запису"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вібросигнал"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Також вібрув., коли надійде лист"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Завжди"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Лише в беззвуч. реж."</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ніколи"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вібросигнал"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Вибрати мелодію"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Налашт-ня сервера"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Видал. обл. зап."</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Обліковий запис \"<xliff:g id="ACCOUNT">%s</xliff:g>\" буде видалено з Пошти."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Онов. облік. записи"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Неможл. оновити облік. запис"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Деякі типи обл. записів пошти Yahoo! не підтрим. доступ до пошт. скриньки. Якщо виник. пробл. із з\'єдн., завіт. на yahoo.com, щоб дізн. більше."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Перед налашт. цього обл. зап. пошти завіт. на сайт Yahoo! й увімк. доступ до пошт. сервера POP3 для цього обл. запису."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Лише деякі обл. записи класу \"Plus\" уключ. доступ до серв. POP, що дозвол. цій прогр. підключ. Якщо ви не можете ввійти за доп. правильної ел.адр. і пароля, можливо, у вас немає платн. обл. запису \"Plus\". Запуст. переглядач, щоб мати доступ до цих обл. записів пошти."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Перед налашт. цього обл. запису пошти завітайте на сайт T-Online і створіть пароль для доступу до пошт. сервера POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Корпоратив"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Прийнято: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Відхилено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Попередньо: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Скасовано: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Оновлено: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Коли: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Де: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Коли: <xliff:g id="EVENTDATE">%s</xliff:g> (повтор.)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Цю подію було скасовано для: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Деталі цієї події змінено на: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"AccountManager не вдалося створити обліковий запис. Спробуйте ще."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Ел.пошта"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Активує правила безпеки, указані сервером"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Додано календар Exchange"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Пошук на <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"Результатів з <xliff:g id="DOMAIN">%2$s</xliff:g>: <xliff:g id="RESULTS">%1$d</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"Результатів з <xliff:g id="DOMAIN">%2$s</xliff:g>: <xliff:g id="RESULTS">%1$d</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"Перші <xliff:g id="RESULTS">%1$d</xliff:g> результ. з <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
new file mode 100644
index 0000000..1465ceb
--- /dev/null
+++ b/res/values-vi/strings.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2008 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="status_sending_messages" msgid="3971880826111264523">"Đang gửi tin nhắn..."</string>
+    <!-- outdated translation 9100624762133992435 -->     <string name="message_list_send_pending_messages_action" msgid="6350878794250526493">"Gửi tin nhắn đi"</string>
+    <string name="message_view_fetching_attachment_toast" msgid="8812363375155391184">"Đang tìm nạp tệp đính kèm."</string>
+    <string name="message_view_fetching_attachment_progress" msgid="8238550182655758164">"Đang tìm nạp tệp đính kèm <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"Đọc tệp đính kèm trong Email"</string>
+    <string name="read_attachment_desc" msgid="7594746717616308643">"Cho phép ứng dụng này đọc tệp đính kèm trong Email của bạn."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"Truy cập dữ liệu của nhà cung cấp Email"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Cho phép ứng dụng này truy cập cơ sở dữ liệu Email của bạn, bao gồm tin nhắn đã nhận, tin nhắn đã gửi, tên người dùng và mật khẩu."</string>
+    <string name="app_name" msgid="5815426892327290362">"Email"</string>
+    <string name="compose_title" msgid="427986915662706899">"Soạn"</string>
+    <string name="debug_title" msgid="5175710493691536719">"Gỡ lỗi"</string>
+    <string name="next_action" msgid="3931301986364184415">"Tiếp theo"</string>
+    <string name="okay_action" msgid="8365197396795675617">"OK"</string>
+    <string name="cancel_action" msgid="6967435583794021865">"Huỷ"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
+    <string name="send_action" msgid="1729766205562446418">"Gửi"</string>
+    <string name="reply_action" msgid="4262472229221507619">"Trả lời"</string>
+    <string name="reply_all_action" msgid="6192179825726332152">"Trả lời tất cả"</string>
+    <string name="delete_action" msgid="8421026208288857155">"Xoá"</string>
+    <string name="forward_action" msgid="669174181042344116">"Chuyển tiếp"</string>
+    <string name="done_action" msgid="7497990549515580249">"Xong"</string>
+    <string name="discard_action" msgid="6532206074859505968">"Huỷ"</string>
+    <!-- outdated translation 812855865552028622 -->     <string name="save_draft_action" msgid="6413714270991417223">"Lưu dưới dạng tin nháp"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Đã đọc/Chưa đọc"</string>
+    <string name="read_action" msgid="4701484794504781686">"Đánh dấu là đã đọc"</string>
+    <string name="unread_action" msgid="6280399049357552826">"Đánh dấu là chưa đọc"</string>
+    <string name="favorite_action" msgid="2911296685862420689">"Ưa thích"</string>
+    <string name="set_star_action" msgid="4660317166196258160">"Thêm dấu sao"</string>
+    <string name="remove_star_action" msgid="6689770999647007163">"Xoá dấu sao"</string>
+    <string name="refresh_action" msgid="5951383001436708175">"Làm mới"</string>
+    <string name="add_account_action" msgid="8835736309476033727">"Thêm tài khoản"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Bỏ chọn tất cả"</string>
+    <string name="compose_action" msgid="4045702519637388045">"Soạn"</string>
+    <string name="search_action" msgid="6325101454876682308">"Tìm kiếm"</string>
+    <string name="open_action" msgid="936766723989190816">"Mở"</string>
+    <string name="account_settings_action" msgid="4494079183315085171">"Cài đặt tài khoản"</string>
+    <string name="remove_account_action" msgid="3789169090601376209">"Xoá tài khoản"</string>
+    <string name="folders_action" msgid="7502431531355227666">"Thư mục"</string>
+    <string name="accounts_action" msgid="901105887272231493">"Tài khoản"</string>
+    <string name="mark_as_read_action" msgid="5031651846998842419">"Đánh dấu là đã đọc"</string>
+    <string name="mark_as_unread_action" msgid="3766298115778767554">"Đánh dấu là chưa đọc"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
+    <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"Thêm Cc/Bcc"</string>
+    <string name="add_attachment_action" msgid="2696013743130573897">"Thêm tệp đính kèm"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Cài đặt kết xuất"</string>
+    <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Chọn tệp đính kèm"</string>
+    <!-- no translation found for move_to_folder_dialog_title (2614318192482193898) -->
+    <skip />
+    <!-- no translation found for status_loading_messages (6552307237621292344) -->
+    <skip />
+    <string name="status_network_error" msgid="6045933332005067021">"Lỗi kết nối"</string>
+    <string name="notification_new_title" msgid="2200257910380529139">"Email mới"</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Lỗi không mong muốn khi tải nội dung tin nhắn. Tin nhắn có thể quá lớn để có thể xem."</string>
+    <!-- no translation found for move_messages:one (1891601902988083907) -->
+    <!-- no translation found for move_messages:other (8792313600381332865) -->
+  <plurals name="notification_new_one_account_fmt">
+    <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> chưa đọc (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> chưa đọc (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+    <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> chưa đọc (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
+  </plurals>
+  <plurals name="notification_new_multi_account_fmt">
+    <item quantity="few" msgid="1991747245324120305">"trong <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tài khoản"</item>
+    <item quantity="other" msgid="2723797835410343458">"trong <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> tài khoản"</item>
+  </plurals>
+    <!-- no translation found for notification_sender_name_multi_messages:one (3212542153806717105) -->
+    <!-- no translation found for notification_sender_name_multi_messages:other (4440886271354944083) -->
+    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
+    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
+    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
+    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Hộp thư đến"</string>
+    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Hộp thư đi"</string>
+    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Tin nháp"</string>
+    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Thùng rác"</string>
+    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Đã gửi"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Thư rác"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Phiên bản: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Tài khoản"</string>
+    <!-- outdated translation 5790553737870057607 -->     <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Hộp thư đến Kết hợp"</string>
+    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Được gắn dấu sao"</string>
+    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Tin nháp"</string>
+    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Hộp thư đi"</string>
+    <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"Vui lòng nhấn và giữ tài khoản để làm mới tài khoản"</string>
+    <string name="mailbox_list_title" msgid="8299608543467211089">"Hộp thư"</string>
+    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
+    <skip />
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Tải tin nhắn khác"</string>
+    <!-- no translation found for message_view_selected_message_count:one (5064657358375178519) -->
+    <!-- no translation found for message_view_selected_message_count:other (7901361399231876038) -->
+    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
+    <skip />
+    <string name="message_compose_to_hint" msgid="2891895306418177013">"Tới"</string>
+    <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
+    <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Bcc"</string>
+    <string name="message_compose_subject_hint" msgid="6993487234024160782">"Chủ đề"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
+    <string name="message_compose_body_hint" msgid="7575406246484103697">"Soạn Thư"</string>
+    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Tin nhắn gốc --------"\n"Chủ đề: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Từ: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Tới: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
+    <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> đã viết:"\n\n</string>
+    <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Văn bản được trích dẫn"</string>
+    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
+    <skip />
+    <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Bạn phải thêm ít nhất một người nhận."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Một số địa chỉ email không hợp lệ."</string>
+    <string name="message_compose_attachment_size" msgid="4401081828287333647">"Tệp quá lớn để có thể đính kèm."</string>
+    <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> và <xliff:g id="NUMBER">%2$d</xliff:g> người khác"</string>
+    <string name="message_view_to_label" msgid="6485191743265527381">"Tới:"</string>
+    <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+    <!-- no translation found for message_view_bcc_label (7577479221285310198) -->
+    <skip />
+    <!-- outdated translation 5353550848340829134 -->     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Mở"</string>
+    <!-- no translation found for message_view_attachment_load_action (8645178445048233745) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_save_action (4704436274670997903) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_cancel_action (316700885943712101) -->
+    <skip />
+    <!-- outdated translation 2802843795251453632 -->     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Tệp đính kèm được lưu vào thẻ SD dưới dạng <xliff:g id="FILENAME">%s</xliff:g>."</string>
+    <!-- outdated translation 5039599647697750874 -->     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"Không thể lưu tệp đính kèm vào thẻ SD."</string>
+    <!-- no translation found for message_view_attachment_background_load (756797444835526487) -->
+    <skip />
+    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
+    <skip />
+    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
+    <skip />
+    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
+    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Hiển thị ảnh"</string>
+    <!-- outdated translation 6256018854688891069 -->     <string name="message_view_invite_view" msgid="5521032519960111675">"Xem trong Lịch »"</string>
+    <string name="message_view_invite_title" msgid="5024473745902772299">"Thư mời Lịch"</string>
+    <string name="message_view_invite_text" msgid="1212799906603873708">"Bạn có tham gia không?"</string>
+    <string name="message_view_invite_accept" msgid="744546668021679819">" Có"</string>
+    <string name="message_view_invite_maybe" msgid="7555189462441562318">" Có thể"</string>
+    <string name="message_view_invite_decline" msgid="6119797303297149463">" Không"</string>
+    <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"Bạn đã chấp nhận thư mời này"</string>
+    <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"Bạn đã trả lời \"có thể\" cho thư mời này"</string>
+    <string name="message_view_invite_toast_no" msgid="7511491076936887064">"Bạn đã từ chối thư mời này"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
+  <plurals name="message_deleted_toast">
+    <item quantity="one" msgid="710742672464447084">"Tin nhắn đã bị xoá."</item>
+    <item quantity="other" msgid="6574961322865652255">"Tin nhắn đã bị xoá."</item>
+  </plurals>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"Tin nhắn đã bị huỷ."</string>
+    <string name="message_saved_toast" msgid="8443125659172627665">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
+    <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Không thể hiển thị tệp đính kèm này."</string>
+    <!-- no translation found for message_view_load_attachment_failed_toast (342798484092215350) -->
+    <skip />
+    <!-- no translation found for message_view_parse_message_toast (8830378966553031281) -->
+    <skip />
+    <!-- no translation found for message_moved_toast:one (3098493230185412871) -->
+    <!-- no translation found for message_moved_toast:other (2286739630865943494) -->
+    <!-- no translation found for forward_download_failed_ticker (328380505427633405) -->
+    <skip />
+    <!-- no translation found for forward_download_failed_notification (3122309797954781752) -->
+    <skip />
+    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
+    <skip />
+    <!-- no translation found for login_failed_notification (2405086379065472222) -->
+    <skip />
+    <!-- no translation found for message_view_attachment_bytes:one (8914124732074848509) -->
+    <!-- no translation found for message_view_attachment_bytes:other (4613385949384337840) -->
+    <!-- no translation found for message_view_attachment_kilobytes:one (869981846437074463) -->
+    <!-- no translation found for message_view_attachment_kilobytes:other (8869993299924901593) -->
+    <!-- no translation found for message_view_attachment_megabytes:one (7527095670565758434) -->
+    <!-- no translation found for message_view_attachment_megabytes:other (4365876866570165282) -->
+    <!-- no translation found for message_view_attachment_gigabytes:one (6261986598249539093) -->
+    <!-- no translation found for message_view_attachment_gigabytes:other (1041353825053598633) -->
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
+    <!-- no translation found for message_list_snippet (6077583739966798162) -->
+    <skip />
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"Thiết lập email"</string>
+    <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Thêm tài khoản Exchange"</string>
+    <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Thêm tài khoản Exchange ActiveSync"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
+    <string name="accounts_welcome" msgid="5901437782383439370">"Bạn có thể định cấu hình Email cho hầu hết các tài khoản chỉ trong vài bước."</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Bạn có thể định cấu hình tài khoản Exchange chỉ trong vài bước."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"Bạn có thể định cấu hình tài khoản Exchange ActiveSync chỉ trong vài bước."</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Gửi email từ tài khoản này theo mặc định."</string>
+    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Thiết lập thủ công"</string>
+    <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Vui lòng nhập địa chỉ email và mật khẩu hợp lệ."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Tài khoản Trùng lặp"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Thông tin đăng nhập này đã được sử dụng cho tài khoản \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Đang truy xuất thông tin tài khoản…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Đang kiểm tra cài đặt máy chủ thư đến..."</string>
+    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Đang kiểm tra cài đặt máy chủ thư đi..."</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"Thiết lập email"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
+    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Đặt tên cho tài khoản này (tuỳ chọn)"</string>
+    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Tên bạn (được hiển thị trong tin nhắn đi)"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"Thêm tài khoản email mới"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
+    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Đây loại tài khoản gì?"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"Cài đặt máy chủ thư đến"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
+    <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Tên người dùng"</string>
+    <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Mật khẩu"</string>
+    <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"Máy chủ POP3"</string>
+    <string name="account_setup_incoming_imap_server_label" msgid="8685076830847734322">"Máy chủ IMAP"</string>
+    <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Cổng"</string>
+    <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Loại bảo mật"</string>
+    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Không"</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (Chấp nhận tất cả chứng chỉ)"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (Chấp nhận tất cả chứng chỉ)"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Xoá email khỏi máy chủ"</string>
+    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Chưa bao giờ"</string>
+    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Khi tôi xoá khỏi Hộp thư đến"</string>
+    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Tiền tố đường dẫn IMAP"</string>
+    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Tuỳ chọn"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Cài đặt máy chủ thư đi"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
+    <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"Máy chủ SMTP"</string>
+    <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Cổng"</string>
+    <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Loại bảo mật"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Yêu cầu đăng nhập."</string>
+    <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Tên người dùng"</string>
+    <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Mật khẩu"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"Cài đặt máy chủ"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
+    <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Máy chủ"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Tên miền\\Tên người dùng"</string>
+    <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Sử dụng kết nối bảo mật (SSL)"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Chấp nhận tất cả chứng chỉ SSL"</string>
+    <!-- no translation found for account_setup_exchange_device_id_label (1646827333223157658) -->
+    <skip />
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"Tuỳ chọn tài khoản"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
+    <!-- outdated translation 4598023962234986194 -->     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Tần suất kiểm tra email"</string>
+    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Chưa bao giờ"</string>
+    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Tự động (Đẩy)"</string>
+    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"5 phút một lần"</string>
+    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"10 phút một lần"</string>
+    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15 phút một lần"</string>
+    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30 phút một lần"</string>
+    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Hàng giờ"</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"Gửi email từ tài khoản này theo mặc định."</string>
+    <string name="account_setup_options_notify_label" msgid="1247525794828820038">"Thông báo cho tôi khi email đến."</string>
+    <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"Đồng bộ hoá danh bạ từ tài khoản này."</string>
+    <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"Đồng bộ hoá lịch từ tài khoản này."</string>
+    <!-- no translation found for account_setup_options_sync_email_label (3930927721878987383) -->
+    <skip />
+    <string name="account_setup_failed_dlg_title" msgid="7827583313117521383">"Không thể hoàn tất thiết lập"</string>
+    <string name="account_setup_options_mail_window_label" msgid="8764417340954006086">"Số lượng sẽ đồng bộ hoá"</string>
+    <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"Một ngày"</string>
+    <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Ba ngày"</string>
+    <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"Một tuần"</string>
+    <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Hai tuần"</string>
+    <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"Một tháng"</string>
+    <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Tên người dùng hoặc mật khẩu không chính xác."</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Tên người dùng hoặc mật khẩu không chính xác."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"Không thể kết nối an toàn với máy chủ."</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"Không thể kết nối an toàn với máy chủ."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
+    <skip />
+    <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"Không thể kết nối với máy chủ."</string>
+    <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"Không thể kết nối với máy chủ."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
+    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS được yêu cầu nhưng không được máy chủ hỗ trợ."</string>
+    <string name="account_setup_failed_auth_required" msgid="1676242821459638150">"Phương thức xác thực không được máy chủ hỗ trợ."</string>
+    <string name="account_setup_failed_security" msgid="6142264248671379943">"Không thể mở kết nối tới máy chủ do lỗi bảo mật."</string>
+    <string name="account_setup_failed_ioerror" msgid="7391458717708933095">"Không thể mở kết nối tới máy chủ."</string>
+    <!-- no translation found for account_setup_failed_protocol_unsupported (5476633232659376833) -->
+    <skip />
+    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Quản lý bảo mật từ xa"</string>
+    <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"Máy chủ <xliff:g id="SERVER">%s</xliff:g> yêu cầu bạn cho phép kiểm soát từ xa một số tính năng bảo mật của điện thoại của bạn. Bạn có muốn hoàn tất việc thiết lập tài khoản này không?"</string>
+    <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"Máy chủ này yêu cầu tính năng bảo mật mà điện thoại của bạn không hỗ trợ."</string>
+    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
+    <skip />
+    <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" yêu cầu cập nhật cài đặt bảo mật."</string>
+    <string name="security_notification_content_title" msgid="8096231937552848281">"Cập nhật Cài đặt Bảo mật"</string>
+    <string name="account_security_title" msgid="4441470647344315196">"Bảo mật của Thiết bị"</string>
+    <string name="account_security_policy_explanation_fmt" msgid="5153981166755002718">"Máy chủ <xliff:g id="SERVER">%s</xliff:g> yêu cầu bạn cho phép kiểm soát từ xa một số tính năng bảo mật của điện thoại của bạn."</string>
+    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Chỉnh sửa chi tiết"</string>
+    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
+    <skip />
+    <string name="account_settings_title_fmt" msgid="1702058877284382340">"Cài đặt chung"</string>
+    <string name="account_settings_default_label" msgid="3575963379680943640">"Tài khoản mặc định"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"Gửi email từ tài khoản này theo mặc định"</string>
+    <string name="account_settings_notify_label" msgid="1630001017303007974">"Thông báo qua email"</string>
+    <!-- no translation found for account_settings_summary (8403582255413830007) -->
+    <skip />
+    <string name="account_settings_notify_summary" msgid="6609224590300639887">"Thông báo trên thanh trạng thái khi email đến"</string>
+    <!-- outdated translation 2067835530563849675 -->     <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Tần suất kiểm tra email"</string>
+    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Cài đặt thư đến"</string>
+    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Cài đặt thư đi"</string>
+    <string name="account_settings_description_label" msgid="8894815221204511715">"Tên tài khoản"</string>
+    <string name="account_settings_name_label" msgid="8186406122590008449">"Tên bạn"</string>
+    <string name="account_settings_signature_label" msgid="4091969938785803201">"Chữ ký"</string>
+    <string name="account_settings_signature_hint" msgid="7262183168962779403">"Thêm văn bản vào tin nhắn bạn gửi"</string>
+    <string name="account_settings_notifications" msgid="1042620094281375043">"Cài đặt thông báo"</string>
+    <!-- outdated translation 1369272986009573218 -->     <string name="account_settings_sync_contacts_enable" msgid="7338813435392098842">"Đồng bộ hoá danh bạ"</string>
+    <!-- outdated translation 8901452720940015928 -->     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Cũng đồng bộ hoá danh bạ từ tài khoản này"</string>
+    <!-- outdated translation 6855333393468628003 -->     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Đồng bộ hoá lịch"</string>
+    <!-- outdated translation 2456010694443333450 -->     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Cũng đồng bộ hoá lịch từ tài khoản này"</string>
+    <!-- no translation found for account_settings_sync_email_enable (4305222662654506074) -->
+    <skip />
+    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
+    <skip />
+    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rung"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Cũng rung khi email đến"</string>
+    <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Luôn luôn"</string>
+    <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Chỉ khi ở chế độ im lặng"</string>
+    <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Chưa bao giờ"</string>
+    <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rung"</string>
+    <string name="account_settings_ringtone" msgid="7922187231467500404">"Chọn nhạc chuông"</string>
+    <string name="account_settings_servers" msgid="4925493817981624242">"Cài đặt máy chủ"</string>
+    <string name="account_delete_dlg_title" msgid="6806087520856396608">"Xoá tài khoản"</string>
+    <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Tài khoản \"<xliff:g id="ACCOUNT">%s</xliff:g>\" sẽ bị xoá khỏi Email."</string>
+    <!-- no translation found for account_settings_category_delete_account (5128545184407925226) -->
+    <skip />
+    <!-- no translation found for account_settings_delete_account_label (4889158717472601718) -->
+    <skip />
+    <string name="upgrade_accounts_title" msgid="5444140226380754014">"Nâng cấp tài khoản"</string>
+    <string name="upgrade_accounts_error" msgid="7241661832029255715">"Không thể nâng cấp tài khoản"</string>
+    <string name="provider_note_yahoo" msgid="8762024183024261236">"Truy cập hộp thư không được hỗ trợ đối với một số loại tài khoản thư của Yahoo!. Nếu bạn gặp sự cố khi kết nối, hãy truy cập yahoo.com để biết thêm thông tin."</string>
+    <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Trước khi thiết lập tài khoản email này, vui lòng truy cập trang web Yahoo! và cho phép quyền truy cập vào email POP3 đối với tài khoản này."</string>
+    <string name="provider_note_live" msgid="3584841823811425060">"Chỉ một số tài khoản \"Plus\" mới có quyền truy cập POP nhằm cho phép chương trình này kết nối. Nếu bạn không thể đăng nhập bằng địa chỉ email và mật khẩu chính xác của mình, bạn có thể không có tài khoản \"Plus\" trả tiền. Vui lòng khởi chạy trình duyệt Web để yêu cầu quyền truy cập vào các tài khoản thư này."</string>
+    <string name="provider_note_t_online" msgid="1973701903400232774">"Trước khi thiết lập tài khoản email này, vui lòng truy cập trang Web T-Online và tạo mật khẩu để truy cập email POP3."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Doanh nghiệp"</string>
+    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
+    <string name="meeting_accepted" msgid="8796609373330400268">"Được chấp nhận: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_declined" msgid="6707617183246608552">"Đã từ chối: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_tentative" msgid="8250995722130443785">"Dự kiến: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_canceled" msgid="3949893881872084244">"Đã huỷ: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_updated" msgid="8529675857361702860">"Đã cập nhật: <xliff:g id="SUBJECT">%s</xliff:g>"</string>
+    <string name="meeting_when" msgid="2765696159697448656">"Thời gian: <xliff:g id="WHEN">%s</xliff:g>"</string>
+    <string name="meeting_where" msgid="5992367535856553079">"Địa điểm: <xliff:g id="WHERE">%s</xliff:g>"</string>
+    <string name="meeting_recurring" msgid="3134262212606714023">"Thời gian: <xliff:g id="EVENTDATE">%s</xliff:g> (lặp lại)"</string>
+    <string name="exception_cancel" msgid="6160117429428313805">"Sự kiện này đã bị huỷ cho: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="exception_updated" msgid="3397583105901142050">"Chi tiết về sự kiện này đã được thay đổi cho: <xliff:g id="DATE">%s</xliff:g>"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"Trình quản lý Tài khoản không thể tạo Tài khoản; vui lòng thử lại."</string>
+    <string name="device_admin_label" msgid="8680224994637869414">"Email"</string>
+    <string name="device_admin_description" msgid="426727923791430306">"Cho phép chính sách bảo mật được máy chủ chỉ định"</string>
+    <string name="notification_exchange_calendar_added" msgid="6823659622379350159">"Đã thêm lịch Exchange"</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Đang tìm kiếm <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
+  <plurals name="gal_completed_fmt">
+    <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> kết quả từ <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> kết quả từ <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
+  </plurals>
+    <string name="gal_completed_limited_fmt" msgid="2343791690766047585">"<xliff:g id="RESULTS">%1$d</xliff:g> kết quả đầu tiên từ <xliff:g id="DOMAIN">%2$s</xliff:g>"</string>
+    <!-- no translation found for header_label_general_preferences (7548527595339881066) -->
+    <skip />
+    <!-- no translation found for category_general_preferences (6810399722493971651) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_label (213945004511666631) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_summary (4540091103768602710) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_dialog_title (5405052109452503909) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_newer (1336720027570509885) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_older (8273143493185128646) -->
+    <skip />
+    <!-- no translation found for general_preference_auto_advance_message_list (7834069275897767359) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_label (4021955890499565713) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_summary_array:0 (1728778773460367725) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:1 (8239633518447359057) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:2 (55959821477704302) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:3 (446236334663020508) -->
+    <!-- no translation found for general_preference_text_zoom_summary_array:4 (235926149071179467) -->
+    <!-- no translation found for general_preference_text_zoom_dialog_title (7446841758331151643) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_tiny (2948174583663330937) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_small (6618520238223144876) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_normal (1765540147950855479) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_large (6874323663381586918) -->
+    <skip />
+    <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
+    <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
+</resources>
diff --git a/res/values-xlarge-land/dimensions.xml b/res/values-xlarge-land/dimensions.xml
index aa01083..cd25e73 100644
--- a/res/values-xlarge-land/dimensions.xml
+++ b/res/values-xlarge-land/dimensions.xml
@@ -19,4 +19,11 @@
     <!-- message compose STOPSHIP not final -->
     <dimen name="message_compose_paper_width">800dip</dimen>
     <dimen name="message_compose_field_label_width">120dip</dimen>
+
+    <!-- XL activity dimensions -->
+
+    <!-- width of mailbox list -->
+    <dimen name="mailbox_list_width">312dip</dimen>
+    <!-- width of the message list, on the message list + message view mode. -->
+    <dimen name="message_list_width">466dip</dimen>
 </resources>
diff --git a/res/values-xlarge-port/dimensions.xml b/res/values-xlarge-port/dimensions.xml
index 44b426a..5ad0211 100644
--- a/res/values-xlarge-port/dimensions.xml
+++ b/res/values-xlarge-port/dimensions.xml
@@ -19,4 +19,14 @@
     <!-- message compose STOPSHIP not final -->
     <dimen name="message_compose_paper_width">700dip</dimen>
     <dimen name="message_compose_field_label_width">120dip</dimen>
+
+    <!-- XL activity dimensions -->
+
+    <!-- width of mailbox list -->
+    <dimen name="mailbox_list_width">216dip</dimen>
+    <!--
+        width of the message list, on the message list + message view mode.
+        (i.e. on portrait, it's the "expanded" message list.)
+    -->
+    <dimen name="message_list_width">440dip</dimen>
 </resources>
diff --git a/res/values-xlarge/colors.xml b/res/values-xlarge/colors.xml
index 83c85f8..b0826a1 100644
--- a/res/values-xlarge/colors.xml
+++ b/res/values-xlarge/colors.xml
@@ -20,4 +20,6 @@
     <!-- Account setup screens -->
     <color name="account_setup_title_color">#FFA6C839</color>
     <color name="account_setup_divider_color">#b6d650</color>
+
+    <color name="message_view_fogged_glass_color">#00000000</color>
 </resources>
diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml
index e40c8ff..9a49d1a 100644
--- a/res/values-xlarge/styles.xml
+++ b/res/values-xlarge/styles.xml
@@ -78,10 +78,4 @@
         <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
-    <style name="message_compose_divider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dip</item>
-        <!-- STOPSHIP Use same color as EditText tray? -->
-        <item name="android:background">#ff808080</item>
-    </style>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 28019ba..53cf239 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"下一步"</string>
     <string name="okay_action" msgid="8365197396795675617">"确定"</string>
     <string name="cancel_action" msgid="6967435583794021865">"取消"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"发送"</string>
     <string name="reply_action" msgid="4262472229221507619">"回复"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"全部回复"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"帐户"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"标记为已读"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"标记为未读"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"添加抄送/密送地址"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"添加附件"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"转储设置"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"发件人:<xliff:g id="SENDER_NAME">%1$s</xliff:g>,还有 <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> 封"</item>
     <item quantity="other" msgid="4440886271354944083">"发件人:<xliff:g id="SENDER_NAME">%1$s</xliff:g>,还有 <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> 封"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新邮件"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新邮件"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新邮件<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新邮件<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"收件箱"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"发件箱"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"草稿"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"发件箱"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"请长按帐户,将其刷新"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"邮箱"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"合并的视图"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"载入更多邮件"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"已选定 <xliff:g id="MESSAGE_COUNT">%d</xliff:g> 封"</item>
     <item quantity="other" msgid="7901361399231876038">"已选定 <xliff:g id="MESSAGE_COUNT">%d</xliff:g> 封"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"无邮件"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"收件人"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"抄送"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"密送"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"主题"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"撰写邮件"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 原始邮件 --------"\n"主题:<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"发件人:<xliff:g id="SENDER">%2$s</xliff:g>"\n"收件人:<xliff:g id="TO">%3$s</xliff:g>"\n"抄送:<xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>编写:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"引用文字"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"包含原文"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"必须至少添加一个收件人。"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"某些电子邮件地址无效。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"文件太大,无法附加。"</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g>以及其他 <xliff:g id="NUMBER">%2$d</xliff:g> 人"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"收件人:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"抄送:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"密送:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"查看"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"载入"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"保存"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"附件已另存为“<xliff:g id="FILENAME">%s</xliff:g>”。"</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"无法保存附件。"</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"注意:您的转发邮件中有一个或多个附件会先下载再发送。"</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"邮件"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"邀请"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> 个附件"</item>
+    <item quantity="other" msgid="974463163535515223">"<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g> 个附件"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"显示图片"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"在日历中查看"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"日历邀请"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"您已接受此邀请"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"您已对此邀请回复了“不确定”"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"您已拒绝此邀请"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"已删除消息。"</item>
     <item quantity="other" msgid="6574961322865652255">"已删除消息。"</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"已将 <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> 封邮件移至<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"已将 <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> 封邮件移至<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"有一个附件无法转发"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"一个或多个附件无法转发"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"附件“<xliff:g id="FILENAME"> %s</xliff:g>”下载失败,无法随外发电子邮件发送。"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> 登录失败"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"触摸以更改帐户设置"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"设置电子邮件"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"设置电子邮件"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"添加 Exchange 帐户"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"添加 Exchange ActiveSync 帐户"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"您只需执行几个步骤,即可为大多数帐户配置电子邮件。"</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"您只需执行几个步骤,即可配置 Exchange 帐户。"</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"您只需执行几个步骤,即可配置 Exchange ActiveSync 帐户。"</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"电子邮件地址"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"密码"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"默认情况下从此帐户发送电子邮件。"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手动设置"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"请输入有效的电子邮件地址和密码。"</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在检索帐户信息..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在检查接收服务器设置..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在检查外发服务器设置..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"设置电子邮件"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"您的帐户已设置,可以使用电子邮件了!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"设置电子邮件"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"为此帐户创建名称(可选)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名(显示在外发邮件上)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"添加新电子邮件帐户"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"添加新电子邮件帐户"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"这是什么类型的帐户?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"接收服务器设置"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"接收服务器设置"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"用户名"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密码"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 服务器"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"当从收件箱中删除时"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路径前缀"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"可选"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"外发服务器设置"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"外发服务器设置"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 服务器"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"端口"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全类型"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"需要登录。"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"用户名"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密码"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"服务器设置"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"服务器设置"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"服务器"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"域名\\用户名"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"采用安全连接 (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有 SSL 证书"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"移动设备 ID"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"帐户选项"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"帐户选项"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"收件箱检查频率"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"一律不"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"自动(推送)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"用户名或密码不正确。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"无法安全地连接到服务器。"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"无法安全地连接到服务器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"服务器返回了包含错误讯息的响应,请检查您的用户名和密码,然后重试。"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"无法连接到服务器。"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"无法连接到服务器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"需要 TLS,但服务器不支持 TLS。"</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"远程安全管理"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"<xliff:g id="SERVER">%s</xliff:g> 服务器要求您允许其远程控制手机中的某些安全功能。您希望完成此帐户的设置吗?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"您的手机不支持此服务器要求使用的安全功能。"</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"警告:撤消电子邮件应用程序管理您设备的权限会删除所有需要此权限的电子邮件帐户,以及这些帐户的电子邮件、联系人、日历活动和其他数据。"</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"帐户“<xliff:g id="ACCOUNT">%s</xliff:g>”要求更新安全设置。"</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"更新安全设置"</string>
     <string name="account_security_title" msgid="4441470647344315196">"设备安全性"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1bb4eec..cb1c56e 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -30,6 +30,8 @@
     <string name="next_action" msgid="3931301986364184415">"下一步"</string>
     <string name="okay_action" msgid="8365197396795675617">"確定"</string>
     <string name="cancel_action" msgid="6967435583794021865">"取消"</string>
+    <!-- no translation found for previous_action (5181616311579820981) -->
+    <skip />
     <string name="send_action" msgid="1729766205562446418">"傳送"</string>
     <string name="reply_action" msgid="4262472229221507619">"回覆"</string>
     <string name="reply_all_action" msgid="6192179825726332152">"全部回覆"</string>
@@ -56,6 +58,8 @@
     <string name="accounts_action" msgid="901105887272231493">"帳戶"</string>
     <string name="mark_as_read_action" msgid="5031651846998842419">"標示為已讀取"</string>
     <string name="mark_as_unread_action" msgid="3766298115778767554">"標示為未讀取"</string>
+    <!-- no translation found for move_action (3059189775933985898) -->
+    <skip />
     <!-- outdated translation 5569074812077509737 -->     <string name="add_cc_bcc_action" msgid="413546910281713891">"新增副本/密件副本"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"新增附件"</string>
     <string name="dump_settings_action" msgid="4478192525236169829">"傾印設定"</string>
@@ -80,10 +84,16 @@
     <item quantity="one" msgid="3212542153806717105">"寄件者:<xliff:g id="SENDER_NAME">%1$s</xliff:g>,還有 <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> 封"</item>
     <item quantity="other" msgid="4440886271354944083">"寄件者:<xliff:g id="SENDER_NAME">%1$s</xliff:g>,還有 <xliff:g id="NUM_MORE_MAILS">%2$d</xliff:g> 封"</item>
   </plurals>
-    <!-- no translation found for notification_num_new_messages_single_account:one (1186049567068059726) -->
-    <!-- no translation found for notification_num_new_messages_single_account:other (5620484088786656170) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:one (958868322080140627) -->
-    <!-- no translation found for notification_num_new_messages_multi_account:other (3254100178329220009) -->
+  <plurals name="notification_num_new_messages_single_account">
+    <item quantity="one" msgid="1186049567068059726">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新郵件"</item>
+    <item quantity="other" msgid="5620484088786656170">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新郵件"</item>
+  </plurals>
+  <plurals name="notification_num_new_messages_multi_account">
+    <item quantity="one" msgid="958868322080140627">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新郵件<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+    <item quantity="other" msgid="3254100178329220009">"<xliff:g id="NUM_NEW_MESSAGE">%1$d</xliff:g> 封新郵件<xliff:g id="SEPARATOR"> </xliff:g> <xliff:g id="ACCOUNT_NAME">%2$s</xliff:g>"</item>
+  </plurals>
+    <!-- no translation found for number_of_accounts:one (6343953132237244947) -->
+    <!-- no translation found for number_of_accounts:other (8548760449976444566) -->
     <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"收件匣"</string>
     <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"寄件匣"</string>
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"草稿"</string>
@@ -98,31 +108,39 @@
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"寄件匣"</string>
     <string name="account_folder_list_refresh_toast" msgid="8158352329765828902">"請按住您要重新整理的帳戶"</string>
     <string name="mailbox_list_title" msgid="8299608543467211089">"信箱"</string>
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
+    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"合併檢視"</string>
     <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"載入更多郵件"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"已選取 <xliff:g id="MESSAGE_COUNT">%d</xliff:g> 封郵件"</item>
     <item quantity="other" msgid="7901361399231876038">"已選取 <xliff:g id="MESSAGE_COUNT">%d</xliff:g> 封郵件"</item>
   </plurals>
-    <!-- no translation found for message_list_no_messages (7846910091922523867) -->
-    <skip />
+    <string name="message_list_no_messages" msgid="7846910091922523867">"沒有郵件"</string>
     <string name="message_compose_to_hint" msgid="2891895306418177013">"收件者"</string>
     <string name="message_compose_cc_hint" msgid="8481884461031434144">"副本"</string>
     <string name="message_compose_bcc_hint" msgid="9177337492358841680">"密件副本"</string>
     <string name="message_compose_subject_hint" msgid="6993487234024160782">"主旨"</string>
+    <!-- no translation found for message_compose_from_label (4084843296548498041) -->
+    <skip />
+    <!-- no translation found for message_compose_to_label (6806045787441348009) -->
+    <skip />
+    <!-- no translation found for message_compose_cc_label (5608567337432359209) -->
+    <skip />
+    <!-- no translation found for message_compose_bcc_label (8619598628773345338) -->
+    <skip />
+    <!-- no translation found for message_compose_subject_label (1592314202889683309) -->
+    <skip />
     <string name="message_compose_body_hint" msgid="7575406246484103697">"撰寫郵件"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"--------原始郵件 --------"\n"主旨:<xliff:g id="SUBJECT">%1$s</xliff:g>"\n"寄件者:<xliff:g id="SENDER">%2$s</xliff:g>"\n"收件者:<xliff:g id="TO">%3$s</xliff:g>"\n"副本:<xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>提到:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"引用的文字"</string>
-    <!-- no translation found for message_compose_include_quoted_text_checkbox_label (8165567368956050390) -->
-    <skip />
+    <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"包含文字"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"您必須新增至少一位收件者。"</string>
     <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"部分電子郵件地址無效。"</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"檔案過大,超過附件大小限制。"</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g>以及其他 <xliff:g id="NUMBER">%2$d</xliff:g> 位"</string>
     <string name="message_view_to_label" msgid="6485191743265527381">"收件者:"</string>
     <string name="message_view_cc_label" msgid="6322992216371163122">"副本:"</string>
+    <string name="message_view_bcc_label" msgid="7577479221285310198">"密件副本:"</string>
     <string name="message_view_attachment_view_action" msgid="4408093860407096078">"檢視"</string>
     <string name="message_view_attachment_load_action" msgid="8645178445048233745">"載入"</string>
     <string name="message_view_attachment_save_action" msgid="4704436274670997903">"儲存"</string>
@@ -130,12 +148,12 @@
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"已將附件另存為 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
     <string name="message_view_status_attachment_not_saved" msgid="2253752149762341579">"無法儲存附件。"</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"請注意:在傳送轉寄的郵件之前,系統會先下載郵件中一或多個附件。"</string>
-    <!-- no translation found for message_view_show_message_action (5134222901019191436) -->
-    <skip />
-    <!-- no translation found for message_view_show_invite_action (8862797393776226777) -->
-    <skip />
-    <!-- no translation found for message_view_show_attachments_action:one (7594476368958824007) -->
-    <!-- no translation found for message_view_show_attachments_action:other (974463163535515223) -->
+    <string name="message_view_show_message_action" msgid="5134222901019191436">"郵件"</string>
+    <string name="message_view_show_invite_action" msgid="8862797393776226777">"邀請"</string>
+  <plurals name="message_view_show_attachments_action">
+    <item quantity="one" msgid="7594476368958824007">"附件 (<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>)"</item>
+    <item quantity="other" msgid="974463163535515223">"附件 (<xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>)"</item>
+  </plurals>
     <string name="message_view_show_pictures_action" msgid="5059936981743072545">"顯示圖片"</string>
     <string name="message_view_invite_view" msgid="5521032519960111675">"於日曆中查看"</string>
     <string name="message_view_invite_title" msgid="5024473745902772299">"日曆邀請"</string>
@@ -146,6 +164,10 @@
     <string name="message_view_invite_toast_yes" msgid="1900593767157209498">"您已接受此邀請"</string>
     <string name="message_view_invite_toast_maybe" msgid="8324044318669610540">"您已回覆「不確定」是否接受邀請"</string>
     <string name="message_view_invite_toast_no" msgid="7511491076936887064">"您已拒絕此邀請"</string>
+    <!-- no translation found for message_delete_dialog_title (7189172554183139772) -->
+    <skip />
+    <!-- no translation found for message_delete_confirm:one (8452608582303152000) -->
+    <!-- no translation found for message_delete_confirm:other (5071164417794016228) -->
   <plurals name="message_deleted_toast">
     <item quantity="one" msgid="710742672464447084">"已刪除訊息。"</item>
     <item quantity="other" msgid="6574961322865652255">"已刪除訊息。"</item>
@@ -159,12 +181,10 @@
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> 封郵件已移至<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> 封郵件已移至<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
   </plurals>
-    <!-- outdated translation 6654377128589312623 -->     <string name="forward_download_failed_ticker" msgid="328380505427633405">"有一個附件無法轉寄"</string>
+    <string name="forward_download_failed_ticker" msgid="328380505427633405">"無法轉寄一或多個附件"</string>
     <!-- outdated translation 3239753701377399676 -->     <string name="forward_download_failed_notification" msgid="3122309797954781752">"附件「<xliff:g id="FILENAME"> %s</xliff:g>」無法下載,因此無法使用您的外寄郵件傳送該附件。"</string>
-    <!-- no translation found for login_failed_ticker (7452091306512654139) -->
-    <skip />
-    <!-- no translation found for login_failed_notification (2405086379065472222) -->
-    <skip />
+    <string name="login_failed_ticker" msgid="7452091306512654139">"<xliff:g id="ACCOUNT_NAME">%s </xliff:g> 登入失敗"</string>
+    <string name="login_failed_notification" msgid="2405086379065472222">"輕觸即可變更帳戶設定"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B"</item>
@@ -181,15 +201,23 @@
     <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
     <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB"</item>
   </plurals>
+    <!-- no translation found for message_view_move_to_newer (2190862552581773765) -->
+    <skip />
+    <!-- no translation found for message_view_move_to_older (4993043091356700890) -->
+    <skip />
     <string name="message_list_snippet" msgid="6077583739966798162">"<xliff:g id="SUBJECT"> %1$s</xliff:g> - <xliff:g id="TEXT">%2$s</xliff:g>"</string>
-    <string name="account_setup_basics_title" msgid="3969856368228940980">"設定電子郵件"</string>
+    <!-- outdated translation 3969856368228940980 -->     <string name="account_setup_basics_title" msgid="3578333196594678422">"設定電子郵件"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"新增 Exchange 帳戶"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"新增 Exchange ActiveSync 帳戶"</string>
+    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
+    <skip />
     <string name="accounts_welcome" msgid="5901437782383439370">"只要幾個步驟,就可以為絕大多數的帳戶設定好電子郵件。"</string>
     <string name="accounts_welcome_exchange" msgid="4414121583987233733">"只要幾個步驟,就可以設定 Exchange 帳戶。"</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1324339567986452000">"只要幾個步驟,就可以設定 Exchange ActiveSync 帳戶。"</string>
-    <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"電子郵件地址"</string>
-    <string name="account_setup_basics_password_hint" msgid="410210049040536870">"密碼"</string>
+    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
+    <skip />
+    <!-- no translation found for account_setup_basics_password_label (9133549799291519298) -->
+    <skip />
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"預設使用這個帳戶傳送電子郵件。"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"手動設定"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"請輸入有效的電子郵件地址和密碼。"</string>
@@ -198,13 +226,18 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在擷取帳戶資訊..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在檢查收信伺服器設定..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在檢查外寄伺服器設定..."</string>
-    <string name="account_setup_names_title" msgid="8875040521875381849">"設定電子郵件"</string>
-    <string name="account_setup_names_instructions" msgid="2880279273965835007">"帳戶已設定完成,您可以開始收發電子郵件了!"</string>
+    <!-- outdated translation 8875040521875381849 -->     <string name="account_setup_names_title" msgid="8483517350241119291">"設定電子郵件"</string>
+    <!-- no translation found for account_setup_names_headline (2413440250372658881) -->
+    <skip />
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"設定帳戶名稱 (選擇性)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"您的姓名 (顯示於外寄郵件)"</string>
-    <string name="account_setup_account_type_title" msgid="6645576356752495504">"新增電子郵件帳戶"</string>
+    <!-- outdated translation 6645576356752495504 -->     <string name="account_setup_account_type_title" msgid="7156551693961182124">"新增電子郵件帳戶"</string>
+    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
+    <skip />
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"帳戶類型為何?"</string>
-    <string name="account_setup_incoming_title" msgid="6862032674547580337">"收信伺服器設定"</string>
+    <!-- outdated translation 6862032674547580337 -->     <string name="account_setup_incoming_title" msgid="6796626791039136005">"收信伺服器設定"</string>
+    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
+    <skip />
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"使用者名稱"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"密碼"</string>
     <string name="account_setup_incoming_pop_server_label" msgid="4917504440057879152">"POP3 伺服器"</string>
@@ -221,20 +254,26 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"當我從收件匣刪除時"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP 路徑字首"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"選用"</string>
-    <string name="account_setup_outgoing_title" msgid="7437215562885986394">"外寄伺服器設定"</string>
+    <!-- outdated translation 7437215562885986394 -->     <string name="account_setup_outgoing_title" msgid="7208495965665711539">"外寄伺服器設定"</string>
+    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
+    <skip />
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP 伺服器"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"通訊埠"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"安全性類型"</string>
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"必須登入。"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"使用者名稱"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"密碼"</string>
-    <string name="account_setup_exchange_title" msgid="2492853474738063453">"伺服器設定"</string>
+    <!-- outdated translation 2492853474738063453 -->     <string name="account_setup_exchange_title" msgid="396004732514751781">"伺服器設定"</string>
+    <!-- no translation found for account_setup_exchange_headline (6099049671599242131) -->
+    <skip />
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"伺服器"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"網域\\使用者名稱"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"使用安全連線 (SSL)"</string>
     <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"接受所有安全資料傳輸層 (SSL) 憑證"</string>
     <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"行動裝置 ID"</string>
-    <string name="account_setup_options_title" msgid="8995162193118880993">"帳戶選項"</string>
+    <!-- outdated translation 8995162193118880993 -->     <string name="account_setup_options_title" msgid="9016600767888846051">"帳戶選項"</string>
+    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
+    <skip />
     <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"查看收件匣頻率"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"不要檢查"</string>
     <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"自動 (預先載入)"</string>
@@ -259,8 +298,7 @@
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"使用者名稱或密碼不正確。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="961843413600482906">"無法安全地連線至伺服器。"</string>
     <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2609150986774736900">"無法安全地連線至伺服器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_check_credentials_message (1364052504743821082) -->
-    <skip />
+    <string name="account_setup_failed_check_credentials_message" msgid="1364052504743821082">"伺服器傳回錯誤,請檢查您的使用者名稱和密碼,然後再試一次。"</string>
     <string name="account_setup_failed_dlg_server_message" msgid="1828270369532779265">"無法連線至伺服器。"</string>
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="5956976504788732779">"無法連線至伺服器。"\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"必須使用 TLS,但此伺服器不支援。"</string>
@@ -271,8 +309,7 @@
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"遠端安全性管理"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="8146309611870795951">"此伺服器 <xliff:g id="SERVER">%s</xliff:g> 要求您同意以遠端控制您手機的某些安全性功能,您是否要結束設定這個帳戶?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="4093832822988053758">"您的手機不支援這個伺服器所需的安全性功能。"</string>
-    <!-- no translation found for disable_admin_warning (4940147098039352135) -->
-    <skip />
+    <string name="disable_admin_warning" msgid="4940147098039352135">"警告:如果停用「電子郵件」應用程式的裝置管理權限,系統將刪除所有需要使用這項權限的「電子郵件」帳戶,以及帳戶中的所有電子郵件、聯絡人、日曆活動和其他資料。"</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"「<xliff:g id="ACCOUNT">%s</xliff:g>」帳戶必須進行安全性設定更新。"</string>
     <string name="security_notification_content_title" msgid="8096231937552848281">"更新安全性設定"</string>
     <string name="account_security_title" msgid="4441470647344315196">"裝置安全性"</string>
@@ -366,4 +403,6 @@
     <skip />
     <!-- no translation found for general_preference_text_zoom_huge (4270503132355963031) -->
     <skip />
+    <!-- no translation found for position_of_count (7989353140376877792) -->
+    <skip />
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 4df819e..c675b04 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -177,4 +177,13 @@
         <!-- TYPE_JUNK = 7 -->
         <item>@drawable/ic_list_spam</item>
     </array>
+
+    <!-- Account color chips on combined view -->
+    <array name="combined_view_account_colors" translatable="false">
+        <item>@color/combined_view_account_color_1</item>
+        <item>@color/combined_view_account_color_2</item>
+        <item>@color/combined_view_account_color_3</item>
+        <item>@color/combined_view_account_color_4</item>
+        <item>@color/combined_view_account_color_5</item>
+    </array>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 55f7cd6..f82d7c0 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -4,9 +4,9 @@
      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.
@@ -26,4 +26,15 @@
     <color name="message_list_item_background_read">#000000</color>
     <color name="account_folder_list_item_separator">#303030</color>
     <color name="connection_error_banner">#fffff1a8</color>
+
+    <!-- STOPSHIP Use same color as EditText tray? -->
+    <color name="divider_color">#ff808080</color>
+
+    <!-- Account color chips on combined view -->
+    <!-- STOPSHIP Replace with final colors -->
+    <color name="combined_view_account_color_1">#ff0080ff</color>
+    <color name="combined_view_account_color_2">#ff800040</color>
+    <color name="combined_view_account_color_3">#ff009b8b</color>
+    <color name="combined_view_account_color_4">#fff4fd04</color>
+    <color name="combined_view_account_color_5">#ffe65020</color>
 </resources>
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 5951409..cd1a120 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -4,9 +4,9 @@
      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.
@@ -16,4 +16,18 @@
 
 <resources>
     <dimen name="button_minWidth">100sp</dimen>
+    <dimen name="message_list_item_text_size">16dip</dimen>
+    <dimen name="message_list_item_checkbox_hit_width">60dip</dimen>
+    <dimen name="message_list_item_favorite_hit_width">50dip</dimen>
+    <dimen name="message_list_item_padding_medium">6dip</dimen>
+    <dimen name="message_list_item_padding_small">4dip</dimen>
+    <dimen name="message_list_item_padding_very_small">2dip</dimen>
+    <dimen name="message_list_item_minimum_date_width">64dip</dimen>
+    <dimen name="message_list_item_height_wide">64dip</dimen>
+    <dimen name="message_list_item_height_narrow">72dip</dimen>
+    <dimen name="message_list_item_minimum_width_wide_mode">720dip</dimen>
+    <dimen name="message_list_item_color_tip_width">35dip</dimen>
+    <dimen name="message_list_item_color_tip_height">8dip</dimen>
+    <dimen name="message_list_item_color_tip_right_margin_on_narrow">32dip</dimen>
+    <dimen name="message_list_item_color_tip_right_margin_on_wide">65dip</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index abf1a24..5255d32 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -32,6 +32,10 @@
     <string name="account_setup_check_settings_canceling_msg" translatable="false"></string>
     <!-- Do Not Translate.  Unused string. -->
     <string name="message_view_show_pictures_instructions" translatable="false"></string>
+    <!-- Do Not Translate.  Unused string. -->
+    <string name="provider_note_yahoo"></string>
+    <!-- Do Not Translate.  Unused string. -->
+    <string name="provider_note_yahoo_uk"></string>
 
     <!-- Messages that are not currently used, but will probably reused in the near future -->
     <!-- STOPSHIP Remove them if they're not used after all -->
@@ -465,12 +469,12 @@
     <string name="message_list_snippet"><xliff:g id="subject" example="Re: Foo">
         %1$s</xliff:g> - <xliff:g id="text" example="Hi, John. Blah...">%2$s</xliff:g></string>
 
-    <!-- Title of screen when setting up new email account -->
+    <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
     <string name="account_setup_basics_title">Account setup</string>
-    <!-- Title of the screen when adding exchange account -->
+    <!-- Title of the screen when adding exchange account [CHAR LIMIT=45] -->
     <string name="account_setup_basics_exchange_title">
         Add an Exchange account</string>
-    <!-- Title of the screen when adding exchange account -->
+    <!-- Title of the screen when adding exchange account [CHAR LIMIT=45] -->
     <string name="account_setup_basics_exchange_title_alternate">
         Add an Exchange ActiveSync account</string>
     <!-- Headline of screen when setting up new email account (large text over divider)
@@ -517,7 +521,7 @@
     <string name="account_setup_check_settings_check_outgoing_msg">
     Checking outgoing server settings\u2026</string>
 
-    <!-- Title of "Set up email" screen after success -->
+    <!-- Title of "Set up email" screen after success [CHAR LIMIT=45] -->
     <string name="account_setup_names_title">Account setup</string>
     <!-- Text that appears on "Set up email" screen after successfully setting up an account
         [CHAR LIMIT=none] -->
@@ -530,10 +534,9 @@
     <string name="account_setup_names_user_name_label">
         Your name (displayed on outgoing messages)</string>
 
-    <!-- Activity Title for the first screen in manual setup (where you select IMAP or POP3) -->
+    <!-- Activity Title for the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=45] -->
     <string name="account_setup_account_type_title">Account setup</string>
-    <!-- Headline for the first screen in manual setup (where you select IMAP or POP3)
-        [CHAR LIMIT=none] -->
+    <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
     <string name="account_setup_account_type_headline">Account type</string>
     <!-- "Add new email account" screen, text that appears on screen -->
     <string name="account_setup_account_type_instructions">What type of account is this?</string>
@@ -552,8 +555,10 @@
     <string name="account_setup_account_type_exchange_action_alternate"
          translatable="false">Microsoft Exchange ActiveSync</string>
 
-    <!-- "Incoming server settings" screen, label for text field -->
-    <string name="account_setup_incoming_title">Incoming server settings</string>
+    <!-- "Incoming server settings" screen, title [CHAR LIMIT=45] -->
+    <string name="account_setup_incoming_title">Account setup</string>
+    <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+    <string name="account_setup_incoming_headline">Incoming server settings</string>
     <!-- "Incoming server settings" screen, label for text field -->
     <string name="account_setup_incoming_username_label">Username</string>
     <!-- "Incoming server settings" screen, label for text field -->
@@ -569,11 +574,13 @@
     <!-- "Incoming server settings" screen, options for "Security type" pop-up menu -->
     <string name="account_setup_incoming_security_none_label">None</string>
     <!-- "Incoming server settings" screen, options for "Security type" pop-up menu -->
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label">SSL (Accept all certificates)</string>
+    <string name="account_setup_incoming_security_ssl_trust_certificates_label">
+        SSL (Accept all certificates)</string>
     <!-- "Incoming server settings" screen, options for "Security type" pop-up menu -->
     <string name="account_setup_incoming_security_ssl_label">SSL</string>
     <!-- "Incoming server settings" screen, options for "Security type" pop-up menu -->
-    <string name="account_setup_incoming_security_tls_trust_certificates_label">TLS (Accept all certificates)</string>
+    <string name="account_setup_incoming_security_tls_trust_certificates_label">
+        TLS (Accept all certificates)</string>
     <!-- "Incoming server settings" screen, options for "Security type" pop-up menu -->
     <string name="account_setup_incoming_security_tls_label">TLS</string>
     <!-- "Incoming server settings" screen, label for pop-up menu -->
@@ -582,14 +589,17 @@
     <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
     <string name="account_setup_incoming_delete_policy_never_label">Never</string>
     <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
-    <string name="account_setup_incoming_delete_policy_delete_label">When I delete from Inbox</string>
-
+    <string name="account_setup_incoming_delete_policy_delete_label">
+        When I delete from Inbox</string>
     <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
     <string name="account_setup_incoming_imap_path_prefix_label">IMAP path prefix</string>
     <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
     <string name="account_setup_incoming_imap_path_prefix_hint">Optional</string>
-    <!-- Title of "Outgoing server settings" screen -->
-    <string name="account_setup_outgoing_title">Outgoing server settings</string>
+
+    <!-- "Outgoing server settings" screen, title [CHAR LIMIT=45] -->
+    <string name="account_setup_outgoing_title">Account setup</string>
+    <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+    <string name="account_setup_outgoing_headline">Outgoing server settings</string>
     <!-- On "Outgoing server settings" screen, label for text field -->
     <string name="account_setup_outgoing_smtp_server_label">SMTP server</string>
     <!-- On "Outgoing server settings" screen, label for text field -->
@@ -603,8 +613,10 @@
     <!-- On "Outgoing server settings" screen, label for text field -->
     <string name="account_setup_outgoing_password_label">Password</string>
 
-    <!-- Title of "Exchange server settings" screen -->
-    <string name="account_setup_exchange_title">Server settings</string>
+    <!-- Title of "Exchange server settings" screen [CHAR LIMIT=45] -->
+    <string name="account_setup_exchange_title">Account setup</string>
+    <!-- Headline of "Exchange server settings" screen (text over divider) [CHAR LIMIT=none] -->
+    <string name="account_setup_exchange_headline">Server settings</string>
     <!-- On "Exchange" setup screen, the name of the server -->
     <string name="account_setup_exchange_server_label">Server</string>
     <!-- On "Exchange" setup screen, the domain\\username -->
@@ -616,7 +628,7 @@
     <!-- On "Exchange" setup screen, the exchange device-id label [CHAR LIMIT=30] -->
     <string name="account_setup_exchange_device_id_label">Mobile Device ID</string>
 
-    <!-- In Account setup options screen, Activity title -->
+    <!-- In Account setup options screen, Activity title [CHAR LIMIT=45] -->
     <string name="account_setup_options_title">Account settings</string>
     <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
     <string name="account_setup_options_headline">Account options</string>
@@ -811,17 +823,17 @@
     <!-- On Settings screen, settings option for delete account [CHAR LIMIT=none] -->
     <string name="account_settings_delete_account_label">Remove account</string>
 
+    <!-- Strings used for account shortcut picker -->
+    <!-- String displayed in launcher [CHAR_LIMIT=10] -->
+    <string name="account_shortcut_picker_name">Email account</string>
+    <!-- Title of activity/dialog containing shortcut picker (list of accounts) [CHAR_LIMIT=20] -->
+    <string name="account_shortcut_picker_title">Select an account</string>
+
     <!-- Title of Upgrade Accounts activity -->
     <string name="upgrade_accounts_title">Upgrade accounts</string>
+    <!-- Error shown when Upgrade Accounts fails (shown below name of that account) -->
     <string name="upgrade_accounts_error">Unable to upgrade account</string>
 
-    <!-- Message that appears when user adds a Yahoo mail account. This alert has no title. -->
-    <string name="provider_note_yahoo">Mailbox access is not supported for some types of
-        Yahoo! mail accounts.  If you have trouble connecting, visit yahoo.com for more
-        information.</string>
-    <!-- Message that appears when user adds a Yahoo UK mail account. -->
-    <string name="provider_note_yahoo_uk">Before setting up this email account, please visit the
-        Yahoo! web site and enable POP3 email access for this account.</string>
     <!-- Message that appears when adding a Windows Live Hotmail Plus account -->
     <string name="provider_note_live">Only some \"Plus\" accounts include POP access
         allowing this program to connect. If you are not able to sign in with
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3625f02..84adeb5 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,4 +53,9 @@
     <style name="PlainEditText" parent="android:Widget.EditText">
         <item name="android:background">#ffffff</item>
     </style>
+
+    <style name="horizontalDivider">
+        <item name="android:layout_height">1dip</item>
+        <item name="android:background">@color/divider_color</item>
+    </style>
 </resources>
diff --git a/res/xml/pop_imap_authenticator.xml b/res/xml/pop_imap_authenticator.xml
index 2a6749b..8fa79e8 100644
--- a/res/xml/pop_imap_authenticator.xml
+++ b/res/xml/pop_imap_authenticator.xml
@@ -22,7 +22,7 @@
 
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="com.android.email"
-    android:icon="@drawable/icon"
+    android:icon="@mipmap/icon"
     android:smallIcon="@drawable/stat_notify_email_generic"
     android:label="@string/app_name"
     android:accountPreferences="@xml/account_preferences"
diff --git a/res/xml/providers.xml b/res/xml/providers.xml
index aa0a9da..c15dff0 100644
--- a/res/xml/providers.xml
+++ b/res/xml/providers.xml
@@ -118,7 +118,10 @@
         <outgoing uri="smtp+ssl+://smtp.gmail.com" username="$email" />
     </provider>
 
+    <!-- USA -->
+
     <!-- AOL and variants -->
+    <!-- Note, AOL appears to support SSL on both sides, as well -->
     <provider id="aim" label="AIM" domain="aim.com">
         <incoming uri="imap+ssl+://imap.aim.com" label="IMAP" username="$email" />
         <outgoing uri="smtp+ssl+://smtp.aim.com" username="$email" />
@@ -171,23 +174,58 @@
         <outgoing uri="smtp+tls+://smtp.live.com" username="$email" />
     </provider>
 
-    <!-- Yahoo! and variants -->
-    <provider id="yahoo" label="Yahoo Plus" domain="yahoo.com" note="@string/provider_note_yahoo">
-        <incoming uri="pop3+ssl+://plus.pop.mail.yahoo.com" username="$email" />
-        <outgoing uri="smtp+ssl+://plus.smtp.mail.yahoo.com" username="$email" />
+    <!-- Yahoo! Mail variants -->
+    <provider id="yahoo" label="Yahoo!" domain="yahoo.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
     </provider>
-    <provider id="ymail" label="Ymail" domain="ymail.com" note="@string/provider_note_yahoo">
-        <incoming uri="pop3+ssl+://plus.pop.mail.yahoo.com" username="$email" />
-        <outgoing uri="smtp+ssl+://plus.smtp.mail.yahoo.com" username="$email" />
+    <provider id="rocketmail" label="Yahoo! RocketMail" domain="rocketmail.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
     </provider>
-    <provider id="rocketmail" label="RocketMail" domain="rocketmail.com"
-            note="@string/provider_note_yahoo">
-        <incoming uri="pop3+ssl+://plus.pop.mail.yahoo.com" username="$email" />
-        <outgoing uri="smtp+ssl+://plus.smtp.mail.yahoo.com" username="$email" />
+    <provider id="ymail" label="Yahoo!" domain="ymail.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
     </provider>
-    <provider id="sbcglobal" label="SBC Global" domain="sbcglobal.net">
-        <incoming uri="pop3+ssl+trustallcerts://pop.sbcglobal.yahoo.com" username="$email" />
-        <outgoing uri="smtp+ssl+trustallcerts://smtp.sbcglobal.yahoo.com" username="$email" />
+    <provider id="bellsouth" label="AT&amp;T Bell South" domain="bellsouth.net">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="att" label="AT&amp;T" domain="att.net">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="pacbell" label="AT&amp;T Pacific Bell" domain="pacbell.net">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="sbcglobal" label="AT&amp;T SBC Global" domain="sbcglobal.net">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="swbell" label="AT&amp;T Southwest Bell" domain="swbell.net">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="btinternet" label="BT Internet" domain="btinternet.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="btopenworld" label="BT Open World" domain="btopenworld.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="talk21" label="BT Talk 21" domain="talk21.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="rogers" label="Rogers" domain="rogers.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="rogers-nl" label="Rogers" domain="nl.rogers.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
     </provider>
 
     <!-- USA (other)-->
@@ -232,14 +270,6 @@
         <incoming uri="imap+ssl+://imap.uk.aol.com" label="IMAP" username="$user" />
         <outgoing uri="smtp+ssl+://smtp.uk.aol.com" username="$user" />
     </provider>
-    <provider id="bt" label="BT Internet" domain="btinternet.com">
-        <incoming uri="pop3://mail.btinternet.com" username="$email" />
-        <outgoing uri="smtp://mail.btinternet.com" username="" />
-    </provider>
-    <provider id="yahoo-uk" label="Yahoo" domain="yahoo.co.uk" note="@string/provider_note_yahoo_uk">
-        <incoming uri="pop3+ssl+://pop.mail.yahoo.co.uk" username="$user" />
-        <outgoing uri="smtp+ssl+://smtp.mail.yahoo.co.uk" username="$user" />
-    </provider>
     
     <!-- Germany -->
     <provider id="freenet" label="Freenet" domain="freenet.de">
@@ -321,4 +351,215 @@
         <outgoing uri="smtp+ssl+://smtp.paran.com" username="$email" />
     </provider>
 
+    <!-- Yahoo! country-specific email domains -->
+    <provider id="yahoo-ar" label="Yahoo! Argentina" domain="yahoo.com.ar">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-y7" label="Yahoo!7" domain="y7mail.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-au" label="Yahoo! Australia" domain="yahoo.com.au">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-bg" label="Yahoo! Bulgaria" domain="yahoo.bg">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-br" label="Yahoo! Brazil" domain="yahoo.com.br">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ca" label="Yahoo! Canada" domain="yahoo.ca">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-cl" label="Yahoo! Cote d'Ivoire" domain="yahoo.cl">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-com-cn" label="Yahoo! China" domain="yahoo.com.cn">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-cn" label="Yahoo! China" domain="yahoo.cn">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-co" label="Yahoo! Colombia" domain="yahoo.com.co">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-cz" label="Yahoo! Czech Republic" domain="yahoo.cz">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-de" label="Yahoo! Germany" domain="yahoo.de">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-dk" label="Yahoo! Denmark" domain="yahoo.dk">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ec" label="Yahoo! Ecuador" domain="yahoo.com.ec">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ee" label="Yahoo! Estonia" domain="yahoo.ee">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-es" label="Yahoo! Spain" domain="yahoo.es">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-fr" label="Yahoo! France" domain="yahoo.fr">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-gr" label="Yahoo! Greece" domain="yahoo.gr">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-hk" label="Yahoo! Hong Kong" domain="yahoo.com.hk">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-hu" label="Yahoo! Hungary" domain="yahoo.hu">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-id" label="Yahoo! Indonesia" domain="yahoo.co.id">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ie" label="Yahoo! Ireland" domain="yahoo.ie">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-in" label="Yahoo! India" domain="yahoo.in">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-it" label="Yahoo! Italy" domain="yahoo.it">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <!-- Note: Yahoo! Japan's ne.jp and co.jp domains do not yet support open IMAP -->
+    <provider id="yahoo-jp-ybb" label="Yahoo! Japan" domain="ybb.ne.jp">
+        <incoming uri="pop3+ssl+://android.ybbpop.mail.yahoo.co.jp" username="$email" />
+        <outgoing uri="smtp+ssl+://android.ybbsmtp.mail.yahoo.co.jp" username="$email" />
+    </provider>
+    <!-- Note: Yahoo! Japan's co.jp domain requires $user rather than the usual $email -->
+    <provider id="yahoo-jp" label="Yahoo! Japan" domain="yahoo.co.jp">
+        <incoming uri="pop3+ssl+://android.pop.mail.yahoo.co.jp" username="$user" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.co.jp" username="$user" />
+    </provider>
+    <provider id="yahoo-kr" label="Yahoo! Republic of Korea" domain="yahoo.co.kr">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-lt" label="Yahoo! Lithuania" domain="yahoo.lt">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-lv" label="Yahoo! Latvia" domain="yahoo.lv">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-mx" label="Yahoo! Mexico" domain="yahoo.com.mx">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-my" label="Yahoo! Malaysia" domain="yahoo.com.my">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ng" label="Yahoo! Nigeria" domain="yahoo.com.ng">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-no" label="Yahoo! Norway" domain="yahoo.no">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-nz" label="Yahoo! New Zealand" domain="yahoo.co.nz">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-pe" label="Yahoo! Peru" domain="yahoo.com.pe">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ph" label="Yahoo! Philippines" domain="yahoo.com.ph">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-pk" label="Yahoo! Pakistan" domain="yahoo.com.pk">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-pl" label="Yahoo! Poland" domain="yahoo.pl">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ru" label="Yahoo! Russia" domain="yahoo.ru">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ro" label="Yahoo! Romania" domain="yahoo.ro">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-se" label="Yahoo! Sweden" domain="yahoo.se">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-sg" label="Yahoo! Singapore" domain="yahoo.com.sg">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-th" label="Yahoo! Thailand" domain="yahoo.co.th">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-tr" label="Yahoo! Turkey" domain="yahoo.com.tr">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="kimo" label="Yahoo! Taiwan" domain="kimo.com">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-tw" label="Yahoo! Taiwan" domain="yahoo.com.tw">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ua" label="Yahoo! Ukraine" domain="yahoo.ua">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-uk" label="Yahoo! UK" domain="yahoo.co.uk">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-ve" label="Yahoo! Venezuela" domain="yahoo.com.ve">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-vn" label="Yahoo! Vietnam" domain="yahoo.com.vn">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="yahoo-za" label="Yahoo! South Africa" domain="yahoo.co.za">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
+    <provider id="xtra" label="Yahoo! Xtra" domain="xtra.co.nz">
+        <incoming uri="imap+ssl+://android.imap.mail.yahoo.com" username="$email" />
+        <outgoing uri="smtp+ssl+://android.smtp.mail.yahoo.com" username="$email" />
+    </provider>
 </providers>
diff --git a/src/com/android/email/Controller.java b/src/com/android/email/Controller.java
index 4d49df4..0f97b88 100644
--- a/src/com/android/email/Controller.java
+++ b/src/com/android/email/Controller.java
@@ -17,9 +17,9 @@
 package com.android.email;
 
 import com.android.email.mail.AuthenticationFailedException;
+import com.android.email.mail.Folder.MessageRetrievalListener;
 import com.android.email.mail.MessagingException;
 import com.android.email.mail.Store;
-import com.android.email.mail.Folder.MessageRetrievalListener;
 import com.android.email.mail.store.Pop3Store.Pop3Message;
 import com.android.email.provider.AttachmentProvider;
 import com.android.email.provider.EmailContent;
@@ -1607,6 +1607,9 @@
 
             public void moveMessage(long messageId, long mailboxId) throws RemoteException {
             }
+
+            public void deleteAccountPIMData(long accountId) throws RemoteException {
+            }
         };
 
         @Override
diff --git a/src/com/android/email/Email.java b/src/com/android/email/Email.java
index 02b9b67..3bc12ae 100644
--- a/src/com/android/email/Email.java
+++ b/src/com/android/email/Email.java
@@ -162,49 +162,10 @@
     public static final String EXCHANGE_ACCOUNT_MANAGER_TYPE = "com.android.exchange";
     public static final String POP_IMAP_ACCOUNT_MANAGER_TYPE = "com.android.email";
 
-    // The color chip resources and the RGB color values in the array below must be kept in sync
-    private static final int[] ACCOUNT_COLOR_CHIP_RES_IDS = new int[] {
-        R.drawable.appointment_indicator_leftside_1,
-        R.drawable.appointment_indicator_leftside_2,
-        R.drawable.appointment_indicator_leftside_3,
-        R.drawable.appointment_indicator_leftside_4,
-        R.drawable.appointment_indicator_leftside_5,
-        R.drawable.appointment_indicator_leftside_6,
-        R.drawable.appointment_indicator_leftside_7,
-        R.drawable.appointment_indicator_leftside_8,
-        R.drawable.appointment_indicator_leftside_9,
-    };
-
-    private static final int[] ACCOUNT_COLOR_CHIP_RGBS = new int[] {
-        0x71aea7,
-        0x621919,
-        0x18462f,
-        0xbf8e52,
-        0x001f79,
-        0xa8afc2,
-        0x6b64c4,
-        0x738359,
-        0x9d50a4,
-    };
-
     private static File sTempDirectory;
 
     private static Thread sUiThread;
 
-    /* package for testing */ static int getColorIndexFromAccountId(long accountId) {
-        // Account id is 1-based, so - 1.
-        // Use abs so that it won't possibly return negative.
-        return Math.abs((int) (accountId - 1) % ACCOUNT_COLOR_CHIP_RES_IDS.length);
-    }
-
-    public static int getAccountColorResourceId(long accountId) {
-        return ACCOUNT_COLOR_CHIP_RES_IDS[getColorIndexFromAccountId(accountId)];
-    }
-
-    public static int getAccountColor(long accountId) {
-        return ACCOUNT_COLOR_CHIP_RGBS[getColorIndexFromAccountId(accountId)];
-    }
-
     public static void setTempDirectory(Context context) {
         sTempDirectory = context.getCacheDir();
     }
diff --git a/src/com/android/email/ExchangeUtils.java b/src/com/android/email/ExchangeUtils.java
index 17c1c8c..a7fad58 100644
--- a/src/com/android/email/ExchangeUtils.java
+++ b/src/com/android/email/ExchangeUtils.java
@@ -135,6 +135,9 @@
         public void moveMessage(long messageId, long mailboxId) throws RemoteException {
         }
 
+        public void deleteAccountPIMData(long accountId) throws RemoteException {
+        }
+
         public IBinder asBinder() {
             return null;
         }
diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 5bb2ca9..0a120a3 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -31,7 +31,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.text.TextUtils;
@@ -131,19 +130,6 @@
         return ContactStatusLoader.load(mContext, email).mPhoto;
     }
 
-    private Bitmap[] getNotificationBitmaps(Bitmap senderPhoto) {
-        // TODO Should we cache these objects?  (bitmaps and arrays)
-        // They don't have to be on this process's memory once we post a notification request to
-        // the system, and decodeResource() seems to be reasonably fast.  We don't want them to
-        // take up memory when not necessary.
-        Bitmap appIcon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon);
-        if (senderPhoto == null) {
-            return new Bitmap[] {appIcon};
-        } else {
-            return new Bitmap[] {senderPhoto, appIcon};
-        }
-    }
-
     /**
      * Create a notification
      *
@@ -193,16 +179,16 @@
                     unseenMessageCount, account.mDisplayName);
         }
 
-        Notification notification = new Notification(R.drawable.stat_notify_email_generic,
-                mContext.getString(R.string.notification_new_title), System.currentTimeMillis());
-        notification.setLatestEventInfo(mContext, notificationTitle, subject, contentIntent);
+        Notification.Builder builder = new Notification.Builder(mContext)
+                .setSmallIcon(R.drawable.stat_notify_email_generic)
+                .setWhen(System.currentTimeMillis())
+                .setTicker(mContext.getString(R.string.notification_new_title))
+                .setLargeIcon(senderPhoto)
+                .setContentTitle(notificationTitle)
+                .setContentText(subject + "\n" + numNewMessages)
+                .setContentIntent(contentIntent);
 
-        notification.tickerTitle = notificationTitle;
-        // STOPSHIPO numNewMessages should be the 3rd line on expanded notification.  But it's not
-        // clear how to do that yet.
-        // For now we just append it to subject.
-        notification.tickerSubtitle = subject + "  " + numNewMessages;
-        notification.tickerIcons = getNotificationBitmaps(senderPhoto);
+        Notification notification = builder.getNotification();
 
         setupNotificationSoundAndVibrationFromAccount(notification, account);
         return notification;
diff --git a/src/com/android/email/ResourceHelper.java b/src/com/android/email/ResourceHelper.java
new file mode 100644
index 0000000..b286ba2
--- /dev/null
+++ b/src/com/android/email/ResourceHelper.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.email;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Paint;
+
+/**
+ * Helper class to load resources.
+ */
+public class ResourceHelper {
+    private static ResourceHelper sInstance;
+    private final Context mContext;
+    private final Resources mResources;
+
+    private final int[] mAccountColors;
+    private final Paint[] mAccountColorPaints;
+
+    private ResourceHelper(Context context) {
+        mContext = context;
+        mResources = mContext.getResources();
+
+        mAccountColors = mResources.getIntArray(R.array.combined_view_account_colors);
+        mAccountColorPaints = new Paint[mAccountColors.length];
+        for (int i = 0; i < mAccountColors.length; i++) {
+            Paint p = new Paint();
+            p.setColor(mAccountColors[i]);
+            mAccountColorPaints[i] = p;
+        }
+    }
+
+    public static synchronized ResourceHelper getInstance(Context context) {
+        if (sInstance == null) {
+            sInstance = new ResourceHelper(context);
+        }
+        return sInstance;
+    }
+
+    /* package */ int getAccountColorIndex(long accountId) {
+        // The account ID is 1-based, so -1.
+        // Use abs so that it'd work for -1 as well.
+        return Math.abs((int) ((accountId - 1) % mAccountColors.length));
+    }
+
+    /**
+     * @return color for an account.
+     */
+    public int getAccountColor(long accountId) {
+        return mAccountColors[getAccountColorIndex(accountId)];
+    }
+
+    /**
+     * @return {@link Paint} equivalent to {@link #getAccountColor}.
+     */
+    public Paint getAccountColorPaint(long accountId) {
+        return mAccountColorPaints[getAccountColorIndex(accountId)];
+    }
+}
diff --git a/src/com/android/email/activity/AccountSelectorAdapter.java b/src/com/android/email/activity/AccountSelectorAdapter.java
index 93fc32c..a2ebc0d 100644
--- a/src/com/android/email/activity/AccountSelectorAdapter.java
+++ b/src/com/android/email/activity/AccountSelectorAdapter.java
@@ -154,7 +154,7 @@
      * - # of unread messages in inbox
      * - The "Combined view" row if there's more than one account.
      */
-    private static class AccountsLoader extends ThrottlingCursorLoader {
+    /* package */ static class AccountsLoader extends ThrottlingCursorLoader {
         private final Context mContext;
 
         public AccountsLoader(Context context) {
@@ -192,7 +192,7 @@
             }
             // Add "combined view"
             final int countAccounts = resultCursor.getCount();
-            if (countAccounts > 0) {
+            if (countAccounts > 1) {
                 RowBuilder rb = resultCursor.newRow();
 
                 // Add ID, display name, # of accounts, total unread count.
diff --git a/src/com/android/email/activity/AccountShortcutPicker.java b/src/com/android/email/activity/AccountShortcutPicker.java
index 82706da..99afe99 100644
--- a/src/com/android/email/activity/AccountShortcutPicker.java
+++ b/src/com/android/email/activity/AccountShortcutPicker.java
@@ -17,33 +17,33 @@
 package com.android.email.activity;
 
 import com.android.email.R;
+import com.android.email.Utility;
 import com.android.email.provider.EmailContent;
 import com.android.email.provider.EmailContent.Account;
 
 import android.app.ListActivity;
-import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
-import android.widget.TextView;
 
 /**
- *
  * This class implements a launcher shortcut for directly accessing a single account.
  *
- * This is simply a lightweight version of Accounts, and should almost certainly be merged with it
- * (or, one could be a base class of the other).
- *
  * TODO Handle upgraded shortcuts for the phone UI release.  Shortcuts used to launch MessageList
  * directly.  We need to detect this and redirect to Welcome.
  */
-public class AccountShortcutPicker extends ListActivity implements OnItemClickListener {
+public class AccountShortcutPicker extends ListActivity
+        implements OnClickListener, OnItemClickListener {
+
+    private AccountTask mAccountTask;
 
     /**
      * Support for list adapter
@@ -51,12 +51,10 @@
     private final static String[] FROM_COLUMNS = new String[] {
             EmailContent.AccountColumns.DISPLAY_NAME,
             EmailContent.AccountColumns.EMAIL_ADDRESS,
-            EmailContent.RECORD_ID
     };
     private final static int[] TO_IDS = new int[] {
             R.id.description,
             R.id.email,
-            R.id.new_message_count
     };
 
     @Override
@@ -69,27 +67,40 @@
             return;
         }
 
-        // finish() immediately if no accounts are configured
-        // TODO: lightweight projection with only those columns needed for this display
-        // TODO: query outside of UI thread
-        Cursor c = this.managedQuery(
-                EmailContent.Account.CONTENT_URI,
-                EmailContent.Account.CONTENT_PROJECTION,
-                null, null, null);
-        if (c.getCount() == 0) {
-            finish();
-            return;
-        }
+        setContentView(R.layout.account_shortcut_picker);
+        findViewById(R.id.cancel).setOnClickListener(this);
 
-        setContentView(R.layout.accounts);
         ListView listView = getListView();
         listView.setOnItemClickListener(this);
         listView.setItemsCanFocus(false);
-        listView.setEmptyView(findViewById(R.id.empty));
 
-        AccountsAdapter a = new AccountsAdapter(this,
-                R.layout.accounts_item, c, FROM_COLUMNS, TO_IDS);
-        listView.setAdapter(a);
+        mAccountTask = new AccountTask();
+        mAccountTask.execute();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        // Cleanup running async task (if any)
+        Utility.cancelTaskInterrupt(mAccountTask);
+        mAccountTask = null;
+        // Cleanup accounts cursor (if any)
+        SimpleCursorAdapter adapter = (SimpleCursorAdapter) getListAdapter();
+        if (adapter != null) {
+            adapter.changeCursor(null);
+        }
+    }
+
+    /**
+     * Implements View.OnClickListener
+     */
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.cancel:
+                finish();
+                break;
+        }
     }
 
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -99,33 +110,40 @@
         finish();
     }
 
-    private static class AccountsAdapter extends SimpleCursorAdapter {
+    /**
+     * Load the accounts and create the adapter.
+     */
+    private class AccountTask extends AsyncTask<Void, Void, Cursor> {
 
-        public AccountsAdapter(Context context, int layout, Cursor c, String[] from, int[] to) {
-            super(context, layout, c, from, to);
-            setViewBinder(new MyViewBinder());
+        @Override
+        protected Cursor doInBackground(Void... params) {
+            Cursor cursor = AccountShortcutPicker.this.getContentResolver().query(
+                    EmailContent.Account.CONTENT_URI,
+                    EmailContent.Account.CONTENT_PROJECTION,
+                    null, null, null);
+            if (isCancelled()) {
+                cursor.close();
+                cursor = null;
+            }
+            return cursor;
         }
 
-        /**
-         * This is only used for the unread messages count.  Most of the views are handled
-         * normally by SimpleCursorAdapter.
-         */
-        private static class MyViewBinder implements SimpleCursorAdapter.ViewBinder {
-
-            public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
-                if (view.getId() == R.id.new_message_count) {
-
-                    int unreadMessageCount = 0;     // TODO get unread count from Account
-                    if (unreadMessageCount <= 0) {
-                        view.setVisibility(View.GONE);
-                    } else {
-                        ((TextView)view).setText(String.valueOf(unreadMessageCount));
-                    }
-                    return true;
-                }
-
-                return false;
+        @Override
+        protected void onPostExecute(Cursor cursor) {
+            // If canceled, get out immediately
+            if (cursor == null) {
+                return;
             }
+            // If there are no accounts, we should never have been here - exit the activity
+            if (cursor.getCount() == 0) {
+                finish();
+                return;
+            }
+            // Create an adapter and connect to the ListView
+            AccountShortcutPicker activity = AccountShortcutPicker.this;
+            SimpleCursorAdapter adapter = new SimpleCursorAdapter(activity,
+                    R.layout.account_shortcut_picker_item, cursor, FROM_COLUMNS, TO_IDS);
+            activity.getListView().setAdapter(adapter);
         }
     }
 
@@ -164,7 +182,7 @@
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, account.getDisplayName());
-        Parcelable iconResource = Intent.ShortcutIconResource.fromContext(this, R.drawable.icon);
+        Parcelable iconResource = Intent.ShortcutIconResource.fromContext(this, R.mipmap.icon);
         intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
 
         // Now, return the result to the launcher
diff --git a/src/com/android/email/activity/AccountsAdapter.java b/src/com/android/email/activity/AccountsAdapter.java
index 9692bd1..056bd98 100644
--- a/src/com/android/email/activity/AccountsAdapter.java
+++ b/src/com/android/email/activity/AccountsAdapter.java
@@ -218,9 +218,9 @@
         itemView.mAccountId = cursor.getLong(Account.CONTENT_ID_COLUMN);
 
         long accountId = cursor.getLong(Account.CONTENT_ID_COLUMN);
-        View chipView = view.findViewById(R.id.chip);
-        chipView.setBackgroundResource(Email.getAccountColorResourceId(accountId));
-        chipView.setVisibility(View.VISIBLE);
+
+        // No color chip for now.  TODO Revisit for phone UI
+        view.findViewById(R.id.chip).setVisibility(View.GONE);
 
         String text = cursor.getString(Account.CONTENT_DISPLAY_NAME_COLUMN);
         if (text != null) {
diff --git a/src/com/android/email/activity/MailboxList.java b/src/com/android/email/activity/MailboxList.java
index 0c364e2..f94e2b7 100644
--- a/src/com/android/email/activity/MailboxList.java
+++ b/src/com/android/email/activity/MailboxList.java
@@ -217,6 +217,13 @@
     }
 
     /**
+     * Implements MailboxFragment.Callback
+     */
+    @Override
+    public void onCurrentMailboxUpdated(long mailboxId, String mailboxName, int unreadCount) {
+    }
+
+    /**
      * Refresh the mailbox list
      */
     private void onRefresh() {
diff --git a/src/com/android/email/activity/MailboxListFragment.java b/src/com/android/email/activity/MailboxListFragment.java
index aad89c9..26f0eca 100644
--- a/src/com/android/email/activity/MailboxListFragment.java
+++ b/src/com/android/email/activity/MailboxListFragment.java
@@ -18,6 +18,7 @@
 
 import com.android.email.Controller;
 import com.android.email.Email;
+import com.android.email.R;
 import com.android.email.RefreshManager;
 import com.android.email.Utility;
 import com.android.email.provider.EmailProvider;
@@ -35,8 +36,10 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.DragEvent;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnDragListener;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -121,12 +124,23 @@
 
         /** Called when an account is selected on the combined view. */
         public void onAccountSelected(long accountId);
+
+        /**
+         * Called when the list updates to propagate the current mailbox name and the unread count
+         * for it.
+         *
+         * Note the reason why it's separated from onMailboxSelected is because this needs to be
+         * reported when the unread count changes without changing the current mailbox.
+         */
+        public void onCurrentMailboxUpdated(long mailboxId, String mailboxName, int unreadCount);
     }
 
     private static class EmptyCallback implements Callback {
         public static final Callback INSTANCE = new EmptyCallback();
         @Override public void onMailboxSelected(long accountId, long mailboxId) { }
         @Override public void onAccountSelected(long accountId) { }
+        @Override public void onCurrentMailboxUpdated(long mailboxId, String mailboxName,
+                int unreadCount) { }
     }
 
     /**
@@ -150,6 +164,12 @@
     }
 
     @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.mailbox_list_fragment, container, false);
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
             Log.d(Email.LOG_TAG, "MailboxListFragment onActivityCreated");
@@ -382,23 +402,27 @@
      * Highlight the selected mailbox.
      */
     private void highlightSelectedMailbox(boolean ensureSelectionVisible) {
+        String mailboxName = "";
+        int unreadCount = 0;
         if (mSelectedMailboxId == -1) {
             // No mailbox selected
             mListView.clearChoices();
-            return;
-        }
-        final int count = mListView.getCount();
-        for (int i = 0; i < count; i++) {
-            if (mListAdapter.getId(i) != mSelectedMailboxId) {
-                continue;
+        } else {
+            final int count = mListView.getCount();
+            for (int i = 0; i < count; i++) {
+                if (mListAdapter.getId(i) != mSelectedMailboxId) {
+                    continue;
+                }
+                mListView.setItemChecked(i, true);
+                if (ensureSelectionVisible) {
+                    Utility.listViewSmoothScrollToPosition(getActivity(), mListView, i);
+                }
+                mailboxName = mListAdapter.getDisplayName(i);
+                unreadCount = mListAdapter.getUnreadCount(i);
+                break;
             }
-            mListView.setItemChecked(i, true);
-            if (ensureSelectionVisible) {
-                Log.w(Email.LOG_TAG, "MailboxListFragment -- ensure visible");
-                Utility.listViewSmoothScrollToPosition(getActivity(), mListView, i);
-            }
-            break;
         }
+        mCallback.onCurrentMailboxUpdated(mSelectedMailboxId, mailboxName, unreadCount);
     }
 
     // Drag & Drop handling
diff --git a/src/com/android/email/activity/MailboxesAdapter.java b/src/com/android/email/activity/MailboxesAdapter.java
index 1908ef9..a022c6c 100644
--- a/src/com/android/email/activity/MailboxesAdapter.java
+++ b/src/com/android/email/activity/MailboxesAdapter.java
@@ -18,6 +18,7 @@
 
 import com.android.email.Email;
 import com.android.email.R;
+import com.android.email.ResourceHelper;
 import com.android.email.Utility;
 import com.android.email.data.ThrottlingCursorLoader;
 import com.android.email.provider.EmailContent;
@@ -31,9 +32,8 @@
 import android.content.Loader;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.database.MergeCursor;
 import android.database.MatrixCursor.RowBuilder;
-import android.graphics.Typeface;
+import android.database.MergeCursor;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -42,16 +42,12 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import java.security.InvalidParameterException;
-
 /**
  * The adapter for displaying mailboxes.
  *
  * Do not use {@link #getItemId(int)} -- It's only for ListView.  Use {@link #getMailboxId}
  * instead.  (See the comment below)
  *
- * TODO New UI will probably not distinguish unread counts from # of messages.
- *      i.e. we won't need two different viewes for them.
  * TODO Show "Starred" per account
  * TODO Unit test, when UI is settled.
  */
@@ -69,6 +65,13 @@
     private static final int ROW_TYPE_MAILBOX = 0;
     private static final int ROW_TYPE_ACCOUNT = 1;
 
+    /**
+     * Return value from {@link #getCountType}.
+     */
+    public static final int COUNT_TYPE_UNREAD = 0;
+    public static final int COUNT_TYPE_TOTAL = 1;
+    public static final int COUNT_TYPE_NO_COUNT = 2;
+
     /*
      * Note here we have two ID columns.  The first one is for ListView, which doesn't like ID
      * values to be negative.  The second one is the actual mailbox ID, which we use in the rest
@@ -107,7 +110,9 @@
             " ELSE 10 END" +
             " ," + MailboxColumns.DISPLAY_NAME;
 
+    private final Context mContext;
     private final LayoutInflater mInflater;
+    private final ResourceHelper mResourceHelper;
 
     private final int mMode;
     private static boolean sEnableUpdate = true;
@@ -115,9 +120,11 @@
 
     public MailboxesAdapter(Context context, int mode, Callback callback) {
         super(context, null, 0 /* no auto-requery */);
+        mContext = context;
         mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mMode = mode;
         mCallback = callback;
+        mResourceHelper = ResourceHelper.getInstance(mContext);
     }
 
     /**
@@ -136,11 +143,65 @@
     }
 
     /**
+     * @return true if the current row is of an account in the combined view.
+     */
+    private static boolean isAccountRow(Cursor c) {
+        return c.getInt(COLUMN_ROW_TYPE) == ROW_TYPE_ACCOUNT;
+    }
+
+    /**
      * @return true if the specified row is of an account in the combined view.
      */
     public boolean isAccountRow(int position) {
+        return isAccountRow((Cursor) getItem(position));
+    }
+
+    /**
+     * @return which type of count should be used for the current row.
+     * Possible return values are COUNT_TYPE_*.
+     */
+    private static int getCountTypeForMailboxType(Cursor c) {
+        if (isAccountRow(c)) {
+            return COUNT_TYPE_UNREAD; // Use the unread count for account rows.
+        }
+        switch (c.getInt(COLUMN_TYPE)) {
+            case Mailbox.TYPE_DRAFTS:
+            case Mailbox.TYPE_OUTBOX:
+                return COUNT_TYPE_TOTAL;
+            case Mailbox.TYPE_SENT:
+            case Mailbox.TYPE_TRASH:
+                return COUNT_TYPE_NO_COUNT;
+        }
+        return COUNT_TYPE_UNREAD;
+    }
+
+    /**
+     * @return count type for the specified row.  See {@link #getCountTypeForMailboxType}
+     */
+    private int getCountType(int position) {
+        if (isAccountRow(position)) {
+            return COUNT_TYPE_UNREAD;
+        }
+        return getCountTypeForMailboxType((Cursor) getItem(position));
+    }
+
+    /**
+     * @return count type for the specified row.
+     */
+    public int getUnreadCount(int position) {
+        if (getCountType(position) != COUNT_TYPE_UNREAD) {
+            return 0; // Don't have a unread count.
+        }
         Cursor c = (Cursor) getItem(position);
-        return c.getInt(COLUMN_ROW_TYPE) == ROW_TYPE_ACCOUNT;
+        return c.getInt(COLUMN_UNREAD_COUNT);
+    }
+
+    /**
+     * @return display name for the specified row.
+     */
+    public String getDisplayName(int position) {
+        Cursor c = (Cursor) getItem(position);
+        return getDisplayName(mContext, c);
     }
 
     /**
@@ -202,12 +263,13 @@
     }
 
     private void bindViewNormalMode(View view, Context context, Cursor cursor) {
+        final boolean isAccount = isAccountRow(cursor);
         final int type = cursor.getInt(COLUMN_TYPE);
-        final long mailboxId = cursor.getLong(COLUMN_ID);
+        final long id = cursor.getLong(COLUMN_ID);
 
         MailboxListItem listItem = (MailboxListItem)view;
         listItem.mMailboxType = type;
-        listItem.mMailboxId = mailboxId;
+        listItem.mMailboxId = id;
         listItem.mAdapter = this;
 
         // Set the background depending on whether we're in drag mode, the mailbox is a valid
@@ -219,22 +281,18 @@
         nameView.setText(getDisplayName(context, cursor));
 
         // Set count
-        boolean showCount = true;
-        boolean useTotalCount = false;
-        switch (type) {
-            case Mailbox.TYPE_DRAFTS:
-            case Mailbox.TYPE_OUTBOX:
-                useTotalCount = true;
+        final int count;
+        switch (getCountTypeForMailboxType(cursor)) {
+            case COUNT_TYPE_UNREAD:
+                count = cursor.getInt(COLUMN_UNREAD_COUNT);
                 break;
-            case Mailbox.TYPE_SENT:
-            case Mailbox.TYPE_TRASH:
-                showCount = false; // Don't show count.
+            case COUNT_TYPE_TOTAL:
+                count = cursor.getInt(COLUMN_MESSAGE_COUNT);
                 break;
-
+            default: // no count
+                count = 0;
+                break;
         }
-        final int count =
-            showCount ? cursor.getInt(useTotalCount ? COLUMN_MESSAGE_COUNT : COLUMN_UNREAD_COUNT)
-                    : 0;
         final TextView countView = (TextView) view.findViewById(R.id.message_count);
 
         // If the unread count is zero, not to show countView.
@@ -247,7 +305,15 @@
 
         // Set folder icon
         ((ImageView) view.findViewById(R.id.folder_icon)).setImageDrawable(
-                Utility.FolderProperties.getInstance(context).getIcon(type, mailboxId));
+                Utility.FolderProperties.getInstance(context).getIcon(type, id));
+
+        final View chipView = view.findViewById(R.id.color_chip);
+        if (isAccount) {
+            chipView.setVisibility(View.VISIBLE);
+            chipView.setBackgroundColor(mResourceHelper.getAccountColor(id));
+        } else {
+            chipView.setVisibility(View.GONE);
+        }
     }
 
     private View newViewNormalMode(Context context, Cursor cursor, ViewGroup parent) {
@@ -364,7 +430,8 @@
                     row.add(accountId);
                     row.add(accounts.getString(COLUMN_ACCOUNT_DISPLAY_NAME));
                     row.add(-1); // No mailbox type.  Shouldn't really be used.
-                    final int unreadCount = 0; // TODO get inbox's unread count
+                    final int unreadCount = Mailbox.getUnreadCountByAccountAndMailboxType(
+                            mContext, accountId, Mailbox.TYPE_INBOX);
                     row.add(unreadCount);
                     row.add(unreadCount);
                     row.add(ROW_TYPE_ACCOUNT);
@@ -405,7 +472,7 @@
     private static void addSummaryMailboxRow(Context context, MatrixCursor cursor,
             long id, int type, int count, boolean showAlways) {
         if (id >= 0) {
-            throw new InvalidParameterException(); // Must be QUERY_ALL_*, which are all negative.
+            throw new IllegalArgumentException(); // Must be QUERY_ALL_*, which are all negative.
         }
         if (showAlways || (count > 0)) {
             RowBuilder row = cursor.newRow();
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index ae50a79..afe7a0e 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -95,6 +95,9 @@
 
     private static final String EXTRA_ACCOUNT_ID = "account_id";
     private static final String EXTRA_MESSAGE_ID = "message_id";
+    /** If the intent is sent from the email app itself, it should have this boolean extra. */
+    private static final String EXTRA_FROM_WITHIN_APP = "from_within_app";
+
     private static final String STATE_KEY_CC_SHOWN =
         "com.android.email.activity.MessageCompose.ccShown";
     private static final String STATE_KEY_QUOTED_TEXT_SHOWN =
@@ -168,6 +171,12 @@
     /** Whether the save command should be enabled. */
     private boolean mSaveEnabled;
 
+    private static Intent getBaseIntent(Context context) {
+        Intent i = new Intent(context, MessageCompose.class);
+        i.putExtra(EXTRA_FROM_WITHIN_APP, true);
+        return i;
+    }
+
     /**
      * Compose a new message using the given account. If account is -1 the default account
      * will be used.
@@ -176,7 +185,7 @@
      */
     public static void actionCompose(Context context, long accountId) {
        try {
-           Intent i = new Intent(context, MessageCompose.class);
+           Intent i = getBaseIntent(context);
            i.putExtra(EXTRA_ACCOUNT_ID, accountId);
            context.startActivity(i);
        } catch (ActivityNotFoundException anfe) {
@@ -196,7 +205,7 @@
      */
     public static boolean actionCompose(Context context, String uriString, long accountId) {
         try {
-            Intent i = new Intent(context, MessageCompose.class);
+            Intent i = getBaseIntent(context);
             i.setAction(Intent.ACTION_SEND);
             i.setData(Uri.parse(uriString));
             i.putExtra(EXTRA_ACCOUNT_ID, accountId);
@@ -243,7 +252,7 @@
     }
 
     private static void startActivityWithMessage(Context context, String action, long messageId) {
-        Intent i = new Intent(context, MessageCompose.class);
+        Intent i = getBaseIntent(context);
         i.putExtra(EXTRA_MESSAGE_ID, messageId);
         i.setAction(action);
         context.startActivity(i);
@@ -292,6 +301,10 @@
             draftId = savedInstanceState.getLong(STATE_KEY_DRAFT_ID, -1);
         }
 
+        // Show the back arrow on the action bar.
+        getActionBar().setDisplayOptions(
+                ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+
         Intent intent = getIntent();
         mAction = intent.getAction();
 
@@ -425,6 +438,14 @@
         setDraftNeedsSaving(false);
     }
 
+    /**
+     * @return true if the activity was opened by the email app itself.
+     */
+    private boolean isOpenedFromWithinApp() {
+        Intent i = getIntent();
+        return (i != null && i.getBooleanExtra(EXTRA_FROM_WITHIN_APP, false));
+    }
+
     private void setDraftNeedsSaving(boolean needsSaving) {
         mDraftNeedsSaving = needsSaving;
         mSaveEnabled = needsSaving;
@@ -1210,6 +1231,9 @@
 
     private boolean handleCommand(int viewId) {
         switch (viewId) {
+        case android.R.id.home:
+            onActionBarHomePressed();
+            return true;
         case R.id.send:
             onSend();
             return true;
@@ -1232,6 +1256,16 @@
         return false;
     }
 
+    private void onActionBarHomePressed() {
+        finish();
+        if (isOpenedFromWithinApp()) {
+            // If opend from within the app, we just close it.
+        } else {
+            // Otherwise, need to open the main screen.  Let Welcome do that.
+            Welcome.actionStart(this);
+        }
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
diff --git a/src/com/android/email/activity/MessageFileView.java b/src/com/android/email/activity/MessageFileView.java
index a70f151..e7e1009 100644
--- a/src/com/android/email/activity/MessageFileView.java
+++ b/src/com/android/email/activity/MessageFileView.java
@@ -53,7 +53,8 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        mFragment = (MessageFileViewFragment) findFragmentById(R.id.message_file_view_fragment);
+        mFragment = (MessageFileViewFragment) getFragmentManager().findFragmentById(
+                R.id.message_file_view_fragment);
         mFragment.setCallback(this);
 
         Intent intent = getIntent();
@@ -65,14 +66,14 @@
         }
 
         // TODO set title here: "Viewing XXX.eml".
+
+        // Load message.
+        getFragment().openMessage(mFileEmailUri);
     }
 
     @Override
     public void onResume() {
         super.onResume();
-        // Note: We don't have to close the activity even if an account has been deleted,
-        // unlike MessageView.
-        getFragment().openMessage(mFileEmailUri);
     }
 
     /** @return always -1, as no accounts are associated with EML files. */
diff --git a/src/com/android/email/activity/MessageFileViewFragment.java b/src/com/android/email/activity/MessageFileViewFragment.java
index 305061e..b4f8b0e 100644
--- a/src/com/android/email/activity/MessageFileViewFragment.java
+++ b/src/com/android/email/activity/MessageFileViewFragment.java
@@ -16,6 +16,7 @@
 
 package com.android.email.activity;
 
+import com.android.email.Email;
 import com.android.email.R;
 import com.android.email.Utility;
 import com.android.email.provider.EmailContent.Message;
@@ -23,9 +24,7 @@
 import android.app.Activity;
 import android.net.Uri;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
+import android.util.Log;
 
 import java.security.InvalidParameterException;
 
@@ -55,20 +54,6 @@
         sFragmentCount++;
     }
 
-    /**
-     * Loads the layout.
-     *
-     * This class uses the same layout as {@link MessageViewFragment}, but hides the star.
-     */
-    @Override
-    public View onCreateView(
-            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = super.onCreateView(inflater, container, savedInstanceState);
-
-        view.findViewById(R.id.favorite).setVisibility(View.GONE);
-        return view;
-    }
-
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -82,13 +67,16 @@
 
     /** Called by activities with a URI to an EML file. */
     public void openMessage(Uri fileEmailUri) {
+        if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
+            Log.d(Email.LOG_TAG, "MessageFileViewFragment openMessage");
+        }
         if (fileEmailUri == null) {
             throw new InvalidParameterException();
         }
         synchronized (mLock) {
             mFileEmailUri = fileEmailUri;
         }
-        openMessageIfStarted();
+        loadMessageIfResumed();
     }
 
     @Override
@@ -110,9 +98,11 @@
      * NOTE See the comment on the super method.  It's called on a worker thread.
      */
     @Override
-    protected Message openMessageSync() {
+    protected Message openMessageSync(Activity activity) {
         synchronized (mLock) {
-            final Activity activity = getActivity();
+            if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
+                Log.d(Email.LOG_TAG, "MessageFileViewFragment openMessageSync");
+            }
             Uri messageUri = mFileEmailUri;
             if (messageUri == null) {
                 return null; // Called after clearContent().
diff --git a/src/com/android/email/activity/MessageListFragment.java b/src/com/android/email/activity/MessageListFragment.java
index 2c82f01..176162f 100644
--- a/src/com/android/email/activity/MessageListFragment.java
+++ b/src/com/android/email/activity/MessageListFragment.java
@@ -121,6 +121,7 @@
     private Mailbox mMailbox;
     private boolean mIsEasAccount;
     private boolean mIsRefreshable;
+    private int mCountTotalAccounts;
 
     // Controller access
     private Controller mController;
@@ -1033,6 +1034,7 @@
             mMailbox = result.mMailbox;
             mIsEasAccount = result.mIsEasAccount;
             mIsRefreshable = result.mIsRefreshable;
+            mCountTotalAccounts = result.mCountTotalAccounts;
             getLoaderManager().initLoader(LOADER_ID_MESSAGES_LOADER, null,
                     new MessagesLoaderCallback(mMailboxChanging));
 
@@ -1089,6 +1091,8 @@
 
             // Update the list
             mListAdapter.changeCursor(cursor);
+            // Show chips if combined view.
+            mListAdapter.setShowColorChips(mMailboxId < 0 && mCountTotalAccounts > 1);
             setListAdapter(mListAdapter);
             setListShown(true);
 
diff --git a/src/com/android/email/activity/MessageListItem.java b/src/com/android/email/activity/MessageListItem.java
index 7ae7a70..fc882b7 100644
--- a/src/com/android/email/activity/MessageListItem.java
+++ b/src/com/android/email/activity/MessageListItem.java
@@ -19,47 +19,369 @@
 import com.android.email.R;
 
 import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Paint.Align;
+import android.graphics.Paint.FontMetricsInt;
+import android.graphics.Typeface;
+import android.text.Layout.Alignment;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.TextUtils.TruncateAt;
+import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
-import android.widget.RelativeLayout;
+import android.view.View;
 
 /**
  * This custom View is the list item for the MessageList activity, and serves two purposes:
  * 1.  It's a container to store message metadata (e.g. the ids of the message, mailbox, & account)
  * 2.  It handles internal clicks such as the checkbox or the favorite star
  */
-public class MessageListItem extends RelativeLayout {
+public class MessageListItem extends View {
     // Note: messagesAdapter directly fiddles with these fields.
     /* package */ long mMessageId;
     /* package */ long mMailboxId;
     /* package */ long mAccountId;
-    /* package */ boolean mRead;
-    /* package */ boolean mFavorite;
 
     private MessagesAdapter mAdapter;
 
     private boolean mDownEvent;
-    private boolean mCachedViewPositions;
-    private int mCheckRight;
-    private int mStarLeft;
-
-    // Padding to increase clickable areas on left & right of each list item
-    private final static float CHECKMARK_PAD = 20.0F;
-    private final static float STAR_PAD = 20.0F;
 
     public static final String MESSAGE_LIST_ITEMS_CLIP_LABEL =
         "com.android.email.MESSAGE_LIST_ITEMS";
 
     public MessageListItem(Context context) {
         super(context);
+        init(context);
     }
 
     public MessageListItem(Context context, AttributeSet attrs) {
         super(context, attrs);
+        init(context);
     }
 
     public MessageListItem(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
+        init(context);
+    }
+
+    // We always show two lines of subject/snippet
+    private static final int MAX_SUBJECT_SNIPPET_LINES = 2;
+    // Narrow mode shows sender/snippet and time/favorite stacked to save real estate; due to this,
+    // it is also somewhat taller
+    private static final int MODE_NARROW = 1;
+    // Wide mode shows sender, snippet, time, and favorite spread out across the screen
+    private static final int MODE_WIDE = 2;
+    // Sentinel indicating that the view needs layout
+    public static final int NEEDS_LAYOUT = -1;
+
+    private static boolean sInit = false;
+    private static final TextPaint sDefaultPaint = new TextPaint();
+    private static final TextPaint sBoldPaint = new TextPaint();
+    private static final TextPaint sDatePaint = new TextPaint();
+    private static Bitmap sAttachmentIcon;
+    private static Bitmap sInviteIcon;
+    private static Bitmap sFavoriteIconOff;
+    private static Bitmap sFavoriteIconOn;
+    private static int sFavoriteIconLeft;
+    private static Bitmap sSelectedIconOn;
+    private static Bitmap sSelectedIconOff;
+
+    public String mSender;
+    public String mSnippet;
+    public boolean mRead;
+    public long mTimestamp;
+    public boolean mHasAttachment = false;
+    public boolean mHasInvite = true;
+    public boolean mIsFavorite = false;
+    /** {@link Paint} for account color chips.  null if no chips should be drawn.  */
+    public Paint mColorChipPaint;
+
+    private int mMode = -1;
+
+    private int mViewWidth = 0;
+    private int mViewHeight = 0;
+    private int mSenderSnippetWidth;
+    private int mSnippetWidth;
+    private int mDateFaveWidth;
+
+    private static int sCheckboxHitWidth;
+    private static int sMinimumDateWidth;
+    private static int sFavoriteHitWidth;
+    private static int sPaddingVerySmall;
+    private static int sPaddingSmall;
+    private static int sPaddingMedium;
+    private static int sTextSize;
+    private static int sItemHeightWide;
+    private static int sItemHeightNarrow;
+    private static int sMinimumWidthWideMode;
+    private static int sColorTipWidth;
+    private static int sColorTipHeight;
+    private static int sColorTipRightMarginOnNarrow;
+    private static int sColorTipRightMarginOnWide;
+
+    public int mSnippetLineCount = NEEDS_LAYOUT;
+    private final CharSequence[] mSnippetLines = new CharSequence[MAX_SUBJECT_SNIPPET_LINES];
+    private CharSequence mFormattedSender;
+    private CharSequence mFormattedDate;
+
+    private void init(Context context) {
+        if (!sInit) {
+            Resources r = context.getResources();
+
+            sCheckboxHitWidth =
+                r.getDimensionPixelSize(R.dimen.message_list_item_checkbox_hit_width);
+            sFavoriteHitWidth =
+                r.getDimensionPixelSize(R.dimen.message_list_item_favorite_hit_width);
+            sMinimumDateWidth =
+                r.getDimensionPixelSize(R.dimen.message_list_item_minimum_date_width);
+            sPaddingMedium =
+                r.getDimensionPixelSize(R.dimen.message_list_item_padding_medium);
+            sPaddingSmall =
+                r.getDimensionPixelSize(R.dimen.message_list_item_padding_small);
+            sPaddingVerySmall =
+                r.getDimensionPixelSize(R.dimen.message_list_item_padding_very_small);
+            sTextSize =
+                r.getDimensionPixelSize(R.dimen.message_list_item_text_size);
+            sItemHeightWide =
+                r.getDimensionPixelSize(R.dimen.message_list_item_height_wide);
+            sItemHeightNarrow =
+                r.getDimensionPixelSize(R.dimen.message_list_item_height_narrow);
+            sMinimumWidthWideMode =
+                r.getDimensionPixelSize(R.dimen.message_list_item_minimum_width_wide_mode);
+            sColorTipWidth =
+                r.getDimensionPixelSize(R.dimen.message_list_item_color_tip_width);
+            sColorTipHeight =
+                r.getDimensionPixelSize(R.dimen.message_list_item_color_tip_height);
+            sColorTipRightMarginOnNarrow =
+                r.getDimensionPixelSize(R.dimen.message_list_item_color_tip_right_margin_on_narrow);
+            sColorTipRightMarginOnWide =
+                r.getDimensionPixelSize(R.dimen.message_list_item_color_tip_right_margin_on_wide);
+
+            sDefaultPaint.setTypeface(Typeface.DEFAULT);
+            sDefaultPaint.setTextSize(sTextSize);
+            sDefaultPaint.setAntiAlias(true);
+            sDatePaint.setTypeface(Typeface.DEFAULT);
+            sDatePaint.setTextSize(sTextSize - 1);
+            sDatePaint.setAntiAlias(true);
+            sDatePaint.setTextAlign(Align.RIGHT);
+            sBoldPaint.setTypeface(Typeface.DEFAULT_BOLD);
+            sBoldPaint.setTextSize(sTextSize);
+            sBoldPaint.setAntiAlias(true);
+            sAttachmentIcon = BitmapFactory.decodeResource(r, R.drawable.ic_mms_attachment_small);
+            sInviteIcon = BitmapFactory.decodeResource(r, R.drawable.ic_calendar_event_small);
+            sFavoriteIconOff =
+                BitmapFactory.decodeResource(r, R.drawable.btn_star_big_buttonless_dark_off);
+            sFavoriteIconOn =
+                BitmapFactory.decodeResource(r, R.drawable.btn_star_big_buttonless_dark_on);
+            sSelectedIconOff =
+                BitmapFactory.decodeResource(r, R.drawable.btn_check_off_normal_holo_light);
+            sSelectedIconOn =
+                BitmapFactory.decodeResource(r, R.drawable.btn_check_on_normal_holo_light);
+
+            sFavoriteIconLeft =
+                sFavoriteHitWidth - ((sFavoriteHitWidth - sFavoriteIconOff.getWidth()) / 2);
+            sInit = true;
+        }
+    }
+
+    /**
+     * Determine the mode of this view (WIDE or NORMAL)
+     *
+     * @param width The width of the view
+     * @return The mode of the view
+     */
+    private int getViewMode(int width) {
+        int mode = MODE_NARROW;
+        if (width > sMinimumWidthWideMode) {
+            mode = MODE_WIDE;
+        }
+        return mode;
+    }
+
+    private void calculateDrawingData() {
+        if (mMode == MODE_WIDE) {
+            mDateFaveWidth = sFavoriteHitWidth + sMinimumDateWidth;
+        } else {
+            mDateFaveWidth = sMinimumDateWidth;
+        }
+        mSenderSnippetWidth = mViewWidth - mDateFaveWidth - sCheckboxHitWidth;
+
+        // In wide mode, we use 3/4 for snippet and 1/4 for sender
+        mSnippetWidth = mSenderSnippetWidth;
+        if (mMode == MODE_WIDE) {
+            mSnippetWidth = mSenderSnippetWidth * 3 / 4;
+        }
+        if (mHasAttachment) {
+            mSnippetWidth -= (sAttachmentIcon.getWidth() + sPaddingSmall);
+        }
+        if (mHasInvite) {
+            mSnippetWidth -= (sInviteIcon.getWidth() + sPaddingSmall);
+        }
+
+        // First, we create a StaticLayout with our snippet to get the line breaks
+        StaticLayout layout = new StaticLayout(mSnippet, 0, mSnippet.length(), sDefaultPaint,
+                mSnippetWidth, Alignment.ALIGN_NORMAL, 1, 0, true);
+        // Get the number of lines needed to render the whole snippet
+        mSnippetLineCount = layout.getLineCount();
+        // Go through our maximum number of lines, and save away what we'll end up displaying
+        // for those lines
+        for (int i = 0; i < MAX_SUBJECT_SNIPPET_LINES; i++) {
+            int start = layout.getLineStart(i);
+            if (i == MAX_SUBJECT_SNIPPET_LINES - 1) {
+                // For the final line, ellipsize the text to our width
+                mSnippetLines[i] = TextUtils.ellipsize(mSnippet.substring(start), sDefaultPaint,
+                        mSnippetWidth, TruncateAt.END);
+            } else {
+                // Just extract from start to end
+                mSnippetLines[i] = mSnippet.substring(start, layout.getLineEnd(i));
+            }
+        }
+
+        // Now, format the sender for its width
+        TextPaint senderPaint = mRead ? sDefaultPaint : sBoldPaint;
+        // In wide mode, we use 1/4 of the width, otherwise, the whole width
+        int senderWidth = (mMode == MODE_WIDE) ? mSenderSnippetWidth / 4 : mSenderSnippetWidth;
+        // And get the ellipsized string for the calculated width
+        mFormattedSender = TextUtils.ellipsize(mSender, senderPaint, senderWidth - sPaddingMedium,
+                TruncateAt.END);
+        // Get a nicely formatted date string (relative to today)
+        String date = DateUtils.getRelativeTimeSpanString(getContext(), mTimestamp).toString();
+        // And make it fit to our size
+        mFormattedDate = TextUtils.ellipsize(date, sDatePaint, sMinimumDateWidth, TruncateAt.END);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (widthMeasureSpec != 0 || mViewWidth == 0) {
+            mViewWidth = MeasureSpec.getSize(widthMeasureSpec);
+            int mode = getViewMode(mViewWidth);
+            if (mode != mMode) {
+                // If the mode has changed, set the snippet line count to indicate layout required
+                mMode = mode;
+                mSnippetLineCount = NEEDS_LAYOUT;
+            }
+            mViewHeight = measureHeight(heightMeasureSpec, mMode);
+        }
+        setMeasuredDimension(mViewWidth, mViewHeight);
+    }
+
+    /**
+     * Determine the height of this view
+     *
+     * @param measureSpec A measureSpec packed into an int
+     * @param mode The current mode of this view
+     * @return The height of the view, honoring constraints from measureSpec
+     */
+    private int measureHeight(int measureSpec, int mode) {
+        int result = 0;
+        int specMode = MeasureSpec.getMode(measureSpec);
+        int specSize = MeasureSpec.getSize(measureSpec);
+
+        if (specMode == MeasureSpec.EXACTLY) {
+            // We were told how big to be
+            result = specSize;
+        } else {
+            // Measure the text
+            if (mMode == MODE_WIDE) {
+                result = sItemHeightWide;
+            } else {
+                result = sItemHeightNarrow;
+            }
+            if (specMode == MeasureSpec.AT_MOST) {
+                // Respect AT_MOST value if that was what is called for by
+                // measureSpec
+                result = Math.min(result, specSize);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (mSnippetLineCount == NEEDS_LAYOUT) {
+            calculateDrawingData();
+        }
+        // Snippet starts at right of checkbox
+        int snippetX = sCheckboxHitWidth;
+        int snippetY;
+        int lineHeight = (int)sDefaultPaint.getFontSpacing() + sPaddingVerySmall;
+        FontMetricsInt fontMetrics = sDefaultPaint.getFontMetricsInt();
+        int ascent = fontMetrics.ascent;
+        int descent = fontMetrics.descent;
+        int senderY;
+
+        if (mMode == MODE_WIDE) {
+            // In wide mode, we'll use 1/4 for sender and 3/4 for snippet
+            snippetX += mSenderSnippetWidth / 4;
+            // And center the sender and snippet
+            senderY = (mViewHeight - descent - ascent) / 2;
+            snippetY = ((mViewHeight - (2 * lineHeight)) / 2) - ascent;
+        } else {
+            senderY = 20;  // TODO Remove magic number
+            snippetY = senderY + lineHeight + sPaddingVerySmall;
+        }
+
+        // Draw the color chip
+        if (mColorChipPaint != null) {
+            final int rightMargin = (mMode == MODE_WIDE)
+                    ? sColorTipRightMarginOnWide : sColorTipRightMarginOnNarrow;
+            final int x = mViewWidth - rightMargin - sColorTipWidth;
+            canvas.drawRect(x, 0, x + sColorTipWidth, sColorTipHeight, mColorChipPaint);
+        }
+
+        // Draw the checkbox
+        int checkboxLeft = (sCheckboxHitWidth - sSelectedIconOff.getWidth()) / 2;
+        int checkboxTop = (mViewHeight - sSelectedIconOff.getHeight()) / 2;
+        canvas.drawBitmap(mAdapter.isSelected(this) ? sSelectedIconOn : sSelectedIconOff,
+                checkboxLeft, checkboxTop, sDefaultPaint);
+
+        // Draw the sender name
+        canvas.drawText(mFormattedSender, 0, mFormattedSender.length(), sCheckboxHitWidth, senderY,
+                mRead ? sDefaultPaint : sBoldPaint);
+
+        // Draw each of the snippet lines
+        for (int i = 0; i < MAX_SUBJECT_SNIPPET_LINES; i++) {
+            CharSequence line = mSnippetLines[i];
+            if (line != null) {
+                canvas.drawText(line, 0, line.length(), snippetX, snippetY, sDefaultPaint);
+                snippetY += lineHeight;
+            }
+        }
+
+        // Draw the attachment and invite icons, if necessary
+        int left = mSenderSnippetWidth + sCheckboxHitWidth;
+        if (mHasAttachment) {
+            left -= sAttachmentIcon.getWidth() + sPaddingSmall;
+            int iconTop = (mViewHeight - sAttachmentIcon.getHeight()) / 2;
+            canvas.drawBitmap(sAttachmentIcon, left, iconTop, sDefaultPaint);
+        }
+        if (mHasInvite) {
+            left -= sInviteIcon.getWidth() + sPaddingSmall;
+            int iconTop = (mViewHeight - sInviteIcon.getHeight()) / 2;
+            canvas.drawBitmap(sInviteIcon, left, iconTop, sDefaultPaint);
+        }
+
+        // Draw the date
+        int dateRight = mViewWidth - sPaddingMedium;
+        if (mMode == MODE_WIDE) {
+            dateRight -= sFavoriteHitWidth;
+        }
+        canvas.drawText(mFormattedDate, 0, mFormattedDate.length(), dateRight, senderY, sDatePaint);
+
+        // Draw the favorite icon
+        int faveLeft = mViewWidth - sFavoriteIconLeft;
+        int faveTop = (mViewHeight - sFavoriteIconOff.getHeight()) / 2;
+        if (mMode == MODE_NARROW) {
+            faveTop += sPaddingMedium;
+        }
+        canvas.drawBitmap(mIsFavorite ? sFavoriteIconOn : sFavoriteIconOff, faveLeft, faveTop,
+                sDefaultPaint);
     }
 
     /**
@@ -69,7 +391,6 @@
      */
     public void bindViewInit(MessagesAdapter adapter) {
         mAdapter = adapter;
-        mCachedViewPositions = false;
     }
 
     /**
@@ -80,21 +401,14 @@
     public boolean onTouchEvent(MotionEvent event) {
         boolean handled = false;
         int touchX = (int) event.getX();
-
-        if (!mCachedViewPositions) {
-            final float paddingScale = getContext().getResources().getDisplayMetrics().density;
-            final int checkPadding = (int) ((CHECKMARK_PAD * paddingScale) + 0.5);
-            final int starPadding = (int) ((STAR_PAD * paddingScale) + 0.5);
-            mCheckRight = findViewById(R.id.selected).getRight() + checkPadding;
-            mStarLeft = findViewById(R.id.favorite).getLeft() - starPadding;
-            mCachedViewPositions = true;
-        }
+        int checkRight = sCheckboxHitWidth;
+        int starLeft = mViewWidth - sFavoriteHitWidth;
 
         switch (event.getAction()) {
             case MotionEvent.ACTION_DOWN:
-                if (touchX < mCheckRight) {
+                if (touchX < checkRight || touchX > starLeft) {
                     mDownEvent = true;
-                    if ((touchX < mCheckRight) || (touchX > mStarLeft)) {
+                    if ((touchX < checkRight) || (touchX > starLeft)) {
                         handled = true;
                     }
                 }
@@ -106,12 +420,12 @@
 
             case MotionEvent.ACTION_UP:
                 if (mDownEvent) {
-                    if (touchX < mCheckRight) {
+                    if (touchX < checkRight) {
                         mAdapter.toggleSelected(this);
                         handled = true;
-                    } else if (touchX > mStarLeft) {
-                        mFavorite = !mFavorite;
-                        mAdapter.updateFavorite(this, mFavorite);
+                    } else if (touchX > starLeft) {
+                        mIsFavorite = !mIsFavorite;
+                        mAdapter.updateFavorite(this, mIsFavorite);
                         handled = true;
                     }
                 }
@@ -119,7 +433,7 @@
         }
 
         if (handled) {
-            postInvalidate();
+            invalidate();
         } else {
             handled = super.onTouchEvent(event);
         }
diff --git a/src/com/android/email/activity/MessageListXL.java b/src/com/android/email/activity/MessageListXL.java
index 180f7bb..2879e58 100644
--- a/src/com/android/email/activity/MessageListXL.java
+++ b/src/com/android/email/activity/MessageListXL.java
@@ -37,8 +37,10 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.Window;
 
 import java.security.InvalidParameterException;
 
@@ -111,10 +113,13 @@
         if (Email.DEBUG_LIFECYCLE && Email.DEBUG) Log.d(Email.LOG_TAG, "MessageListXL onCreate");
         super.onCreate(savedInstanceState);
         ActivityHelper.debugSetWindowFlags(this);
+        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setContentView(R.layout.message_list_xl);
-        mFragmentManager.onActivityViewReady();
 
-        final boolean isRestoring = (savedInstanceState != null);
+        ActionBar ab = getActionBar();
+        ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_HOME);
+
+        mFragmentManager.onActivityViewReady();
 
         mContext = getApplicationContext();
         mRefreshManager = RefreshManager.getInstance(this);
@@ -126,15 +131,16 @@
 
         mAccountsSelectorAdapter = new AccountSelectorAdapter(this, null);
 
-        if (isRestoring) {
+        if (savedInstanceState != null) {
             mFragmentManager.loadState(savedInstanceState);
         } else {
             initFromIntent();
         }
         loadAccounts();
 
-        ActionBar ab = getActionBar();
-        ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_HOME);
+        // Halt the progress indicator (we'll display it later when needed)
+        setProgressBarIndeterminate(true);
+        setProgressBarIndeterminateVisibility(false);
     }
 
     private void initFromIntent() {
@@ -174,6 +180,7 @@
     protected void onResume() {
         if (Email.DEBUG_LIFECYCLE && Email.DEBUG) Log.d(Email.LOG_TAG, "MessageListXL onResume");
         super.onResume();
+        mFragmentManager.onResume();
 
         // On MessageList.onResume, we go back to Welcome if an account has been added/removed.
         // We don't need to do that here, because when the activity resumes, the account list loader
@@ -212,11 +219,25 @@
         if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
             Log.d(Email.LOG_TAG, "MessageListXL onBackPressed");
         }
+        onBackPressed(true);
+    }
+
+    /**
+     * Performs the back action.
+     *
+     * @param mayCloseActivity if true, the activity will close if it's already on top of the
+     * internal back state stack.
+     */
+    private boolean onBackPressed(boolean mayCloseActivity) {
         if (mFragmentManager.onBackPressed()) {
-            return;
+            return true;
         }
-        // Perform the default behavior.
-        super.onBackPressed();
+        if (mayCloseActivity) {
+            // Perform the default behavior.
+            super.onBackPressed();
+            return true;
+        }
+        return false;
     }
 
     private void onCurrentMessageGone() {
@@ -342,6 +363,11 @@
             mFragmentManager.selectAccount(accountId, -1, true);
             loadAccounts(); // This will update the account spinner, and select the account.
         }
+
+        @Override
+        public void onCurrentMailboxUpdated(long mailboxId, String mailboxName, int unreadCount) {
+            mFragmentManager.setCurrentMailboxName(mailboxName, unreadCount);
+        }
     }
 
     private class MessageListFragmentCallback implements MessageListFragment.Callback {
@@ -566,9 +592,7 @@
      * If we're refreshing the current mailbox, animate the "mailbox refreshing" progress icon.
      */
     private void updateProgressIcon() {
-        // TODO See the comment on onPrepareOptionsMenu -- change this when we get a better progress
-        // bar support.
-        invalidateOptionsMenu();
+        setProgressBarIndeterminateVisibility(isProgressActive());
     }
 
     private boolean isProgressActive() {
@@ -583,25 +607,13 @@
         return true;
     }
 
-    // STOPSHIP - this is a placeholder if/until there's support for progress in actionbar
-    // Remove it, or replace with a better icon
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        MenuItem item = menu.findItem(R.id.refresh);
-        if (isProgressActive()) {
-            item.setIcon(android.R.drawable.progress_indeterminate_horizontal);
-        } else {
-            item.setIcon(R.drawable.ic_menu_refresh);
-        }
-        return super.onPrepareOptionsMenu(menu);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
                 // Comes from the action bar when the app icon on the left is pressed.
-                return mFragmentManager.onBackPressed();
+                // It works like a back press, but it won't close the activity.
+                return onBackPressed(false);
             case R.id.compose:
                 return onCompose();
             case R.id.refresh:
diff --git a/src/com/android/email/activity/MessageListXLFragmentManager.java b/src/com/android/email/activity/MessageListXLFragmentManager.java
index 77630c5..efe2966 100644
--- a/src/com/android/email/activity/MessageListXLFragmentManager.java
+++ b/src/com/android/email/activity/MessageListXLFragmentManager.java
@@ -22,12 +22,13 @@
 import com.android.email.provider.EmailContent.Mailbox;
 
 import android.app.ActionBar;
-import android.app.Fragment;
 import android.app.FragmentManager;
 import android.content.Context;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.TextView;
 
 import java.security.InvalidParameterException;
 
@@ -60,7 +61,11 @@
     /** Current message id. (-1 = not selected) */
     private long mMessageId = -1;
 
+    private ActionBar mActionBar;
     private ThreePaneLayout mThreePane;
+    private View mActionBarMailboxNameView;
+    private TextView mActionBarMailboxName;
+    private TextView mActionBarUnreadCount;
 
     private MailboxListFragment mMailboxListFragment;
     private MessageListFragment mMessageListFragment;
@@ -125,7 +130,18 @@
         mMessageViewFragment = (MessageViewFragment) fm.findFragmentById(
                 mThreePane.getRightPaneId());
 
-        updateActionBar();
+        mActionBar = mTargetActivity.getActionBar();
+
+        // Set a view for the current mailbox to the action bar.
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        mActionBarMailboxNameView = inflater.inflate(R.layout.action_bar_current_mailbox, null);
+        mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM, ActionBar.DISPLAY_SHOW_CUSTOM);
+        mActionBar.setCustomView(mActionBarMailboxNameView);
+
+        mActionBarMailboxName =
+                (TextView) mActionBarMailboxNameView.findViewById(R.id.mailbox_name);
+        mActionBarUnreadCount =
+                (TextView) mActionBarMailboxNameView.findViewById(R.id.unread_count);
     }
 
     /** Set callback for fragment. */
@@ -197,6 +213,8 @@
             return;
         }
         mIsActivityResumed = true;
+
+        updateActionBar();
     }
 
     /**
@@ -265,12 +283,24 @@
     }
 
     private void updateActionBar() {
-        // Shwo the "back" arrow next to the app icon if back is enabled.
+        // If the left pane (mailbox list pane) is hidden, the back action on action bar will be
+        // enabled, and we also show the current mailbox name.
         final int visiblePanes = mThreePane.getVisiblePanes();
-        final boolean backable = ((visiblePanes & ThreePaneLayout.PANE_LEFT) == 0);
-        final ActionBar ab = mTargetActivity.getActionBar();
-        ab.setDisplayOptions(backable ? ActionBar.DISPLAY_HOME_AS_UP : 0,
+        final boolean leftPaneHidden = ((visiblePanes & ThreePaneLayout.PANE_LEFT) == 0);
+        mActionBar.setDisplayOptions(leftPaneHidden ? ActionBar.DISPLAY_HOME_AS_UP : 0,
                 ActionBar.DISPLAY_HOME_AS_UP);
+        mActionBarMailboxNameView.setVisibility(leftPaneHidden ? View.VISIBLE : View.GONE);
+    }
+
+    public void setCurrentMailboxName(String mailboxName, int unreadCount) {
+        mActionBarMailboxName.setText(mailboxName);
+        if (unreadCount == 0) {
+            // No unread messages, or it's the mailbox doesn't have the idea of "unread".
+            // (e.g. outbox)
+            mActionBarUnreadCount.setText("");
+        } else {
+            mActionBarUnreadCount.setText(Integer.toString(unreadCount));
+        }
     }
 
     /**
@@ -303,7 +333,7 @@
         // Open mailbox list, clear message list / message view
         mMailboxListFragment.openMailboxes(mAccountId);
         mMessageListFragment.clearContent();
-        hideMessageView();
+        mThreePane.showLeftPane(); // Show mailbox list
 
         if ((accountId == Account.ACCOUNT_ID_COMBINED_VIEW) && (mailboxId == -1)) {
             // When opening the Combined view, the right pane will be "combined inbox".
@@ -321,12 +351,7 @@
      * @return true "back" is handled.
      */
     public boolean onBackPressed() {
-        if (isMessageSelected()) {
-            // Go back to the message list.
-            goBackToMailbox();
-            return true;
-        }
-        return false; // Not handled.
+        return mThreePane.onBackPressed();
     }
 
     /**
@@ -334,7 +359,6 @@
      */
     public void goBackToMailbox() {
         if (isMessageSelected()) {
-            hideMessageView();
             selectMailbox(getMailboxId(), false);
         }
     }
@@ -374,7 +398,7 @@
 
         mMailboxListFragment.setSelectedMailbox(mMailboxId);
         mTargetActivity.onMailboxChanged(mAccountId, mMailboxId);
-        hideMessageView();
+        mThreePane.showLeftPane(); // Show mailbox list
     }
 
     /**
@@ -402,16 +426,17 @@
         // Open message
         mMessageListFragment.setSelectedMessage(mMessageId);
         mMessageViewFragment.openMessage(mMessageId);
-        hideMessageBoxList();
+        mThreePane.showRightPane(); // Show message view
     }
 
-    private void hideMessageBoxList() {
-        mThreePane.showRightPane(true);
-    }
-
-    private void hideMessageView() {
+    /**
+     * Unselect the currently viewed message, if any, and release the resoruce grabbed by the
+     * message view.
+     *
+     * This must be called when the three pane reports that the message view pane gets hidden.
+     */
+    private void onMessageViewClosed() {
         mMessageId = -1;
-        mThreePane.showRightPane(false);
         mMessageListFragment.setSelectedMessage(-1);
         mMessageViewFragment.clearContent();
     }
@@ -469,8 +494,14 @@
 
     private class ThreePaneLayoutCallback implements ThreePaneLayout.Callback {
         @Override
-        public void onVisiblePanesChanged() {
+        public void onVisiblePanesChanged(int previousVisiblePanes) {
             updateActionBar();
+            final int visiblePanes = mThreePane.getVisiblePanes();
+            if (((visiblePanes & ThreePaneLayout.PANE_RIGHT) == 0) &&
+                    ((previousVisiblePanes & ThreePaneLayout.PANE_RIGHT) != 0)) {
+                // Message view just got hidden
+                onMessageViewClosed();
+            }
         }
     }
 }
diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
index 158c9a4..0e4e5de 100644
--- a/src/com/android/email/activity/MessageViewFragment.java
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -25,6 +25,7 @@
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.service.EmailServiceConstants;
 
+import android.app.Activity;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -166,6 +167,9 @@
         mMeetingMaybe = (TextView) view.findViewById(R.id.maybe);
         mMeetingNo = (TextView) view.findViewById(R.id.decline);
 
+        // Star is only visible on this fragment (as opposed to MessageFileViewFragment.)
+        view.findViewById(R.id.favorite).setVisibility(View.VISIBLE);
+
         mFavoriteIcon.setOnClickListener(this);
         mReplyButton.setOnClickListener(this);
         mReplyAllButton.setOnClickListener(this);
@@ -220,7 +224,7 @@
         synchronized (mLock) {
             mMessageIdToOpen = messageId;
         }
-        openMessageIfStarted();
+        loadMessageIfResumed();
     }
 
     @Override
@@ -254,13 +258,13 @@
      * NOTE See the comment on the super method.  It's called on a worker thread.
      */
     @Override
-    protected Message openMessageSync() {
+    protected Message openMessageSync(Activity activity) {
         synchronized (mLock) {
             long messageId = mMessageIdToOpen;
             if (messageId < 0) {
                 return null; // Called after clearContent().
             }
-            return Message.restoreMessageWithId(getActivity(), messageId);
+            return Message.restoreMessageWithId(activity, messageId);
         }
     }
 
diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index 757ceef..dea2a68 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -36,6 +36,7 @@
 
 import org.apache.commons.io.IOUtils;
 
+import android.app.Activity;
 import android.app.Fragment;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.content.ActivityNotFoundException;
@@ -69,7 +70,6 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
-import android.widget.QuickContactBadge;
 import android.widget.TextView;
 
 import java.io.File;
@@ -105,8 +105,7 @@
     private TextView mSubjectView;
     private TextView mFromNameView;
     private TextView mFromAddressView;
-    private TextView mDateView;
-    private TextView mTimeView;
+    private TextView mDateTimeView;
     private TextView mToView;
     private TextView mCcView;
     private View mCcContainerView;
@@ -114,7 +113,6 @@
     private View mBccContainerView;
     private WebView mMessageContentView;
     private LinearLayout mAttachments;
-    private ImageView mAttachmentIcon;
     private View mTabSection;
     private ImageView mFromBadge;
     private ImageView mSenderPresenceView;
@@ -150,7 +148,8 @@
     // contains the HTML content as set in WebView.
     private String mHtmlTextWebView;
 
-    private boolean mStarted;
+    private boolean mResumed;
+    private boolean mLoadWhenResumed;
 
     private boolean mIsMessageLoadedForTest;
 
@@ -300,11 +299,9 @@
         mCcContainerView = view.findViewById(R.id.cc_container);
         mBccView = (TextView) view.findViewById(R.id.bcc);
         mBccContainerView = view.findViewById(R.id.bcc_container);
-        mDateView = (TextView) view.findViewById(R.id.date);
-        mTimeView = (TextView) view.findViewById(R.id.time);
+        mDateTimeView = (TextView) view.findViewById(R.id.datetime);
         mMessageContentView = (WebView) view.findViewById(R.id.message_content);
         mAttachments = (LinearLayout) view.findViewById(R.id.attachments);
-        mAttachmentIcon = (ImageView) view.findViewById(R.id.attachment);
         mTabSection = view.findViewById(R.id.message_tabs_section);
         mFromBadge = (ImageView) view.findViewById(R.id.badge);
         mSenderPresenceView = (ImageView) view.findViewById(R.id.presence);
@@ -352,10 +349,6 @@
             Log.d(Email.LOG_TAG, "MessageViewFragment onStart");
         }
         super.onStart();
-        mStarted = true;
-        if (isMessageSpecified()) {
-            openMessageIfStarted();
-        }
     }
 
     @Override
@@ -365,17 +358,17 @@
         }
         super.onResume();
 
-        // Dynamic configuration of WebView
-        WebSettings.TextSize textZoom;
-        switch (Preferences.getPreferences(mContext).getTextZoom()) {
-            case Preferences.TEXT_ZOOM_TINY:    textZoom = WebSettings.TextSize.SMALLEST; break;
-            case Preferences.TEXT_ZOOM_SMALL:   textZoom = WebSettings.TextSize.SMALLER; break;
-            case Preferences.TEXT_ZOOM_NORMAL:  textZoom = WebSettings.TextSize.NORMAL; break;
-            case Preferences.TEXT_ZOOM_LARGE:   textZoom = WebSettings.TextSize.LARGER; break;
-            case Preferences.TEXT_ZOOM_HUGE:    textZoom = WebSettings.TextSize.LARGEST; break;
-            default:                            textZoom = WebSettings.TextSize.NORMAL; break;
+        mResumed = true;
+        if (isMessageSpecified()) {
+            if (mLoadWhenResumed) {
+                loadMessageIfResumed();
+            } else {
+                // This means, the user comes back from other (full-screen) activities.
+                // In this case we've already loaded the content, so don't load it again,
+                // which results in resetting all view state, including WebView zoom/pan
+                // and the current tab.
+            }
         }
-        mMessageContentView.getSettings().setTextSize(textZoom);
     }
 
     @Override
@@ -383,6 +376,7 @@
         if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
             Log.d(Email.LOG_TAG, "MessageViewFragment onPause");
         }
+        mResumed = false;
         super.onPause();
     }
 
@@ -391,7 +385,6 @@
         if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
             Log.d(Email.LOG_TAG, "MessageViewFragment onStop");
         }
-        mStarted = false;
         super.onStop();
     }
 
@@ -402,7 +395,7 @@
         }
         mCallback.onMessageViewGone();
         mController.removeResultCallback(mControllerCallback);
-        cancelAllTasks();
+        clearContent();
         mMessageContentView.destroy();
         mMessageContentView = null;
         super.onDestroy();
@@ -469,10 +462,12 @@
         resetView();
     }
 
-    protected final void openMessageIfStarted() {
-        if (!mStarted) {
+    protected final void loadMessageIfResumed() {
+        if (!mResumed) {
+            mLoadWhenResumed = true;
             return;
         }
+        mLoadWhenResumed = false;
         cancelAllTasks();
         resetView();
         mLoadMessageTask = new LoadMessageTask(true);
@@ -486,12 +481,23 @@
             mMessageContentView.getSettings().setBlockNetworkLoads(true);
             mMessageContentView.scrollTo(0, 0);
             mMessageContentView.loadUrl("file:///android_asset/empty.html");
+
+            // Dynamic configuration of WebView
+            WebSettings.TextSize textZoom;
+            switch (Preferences.getPreferences(mContext).getTextZoom()) {
+                case Preferences.TEXT_ZOOM_TINY:    textZoom = WebSettings.TextSize.SMALLEST; break;
+                case Preferences.TEXT_ZOOM_SMALL:   textZoom = WebSettings.TextSize.SMALLER; break;
+                case Preferences.TEXT_ZOOM_NORMAL:  textZoom = WebSettings.TextSize.NORMAL; break;
+                case Preferences.TEXT_ZOOM_LARGE:   textZoom = WebSettings.TextSize.LARGER; break;
+                case Preferences.TEXT_ZOOM_HUGE:    textZoom = WebSettings.TextSize.LARGEST; break;
+                default:                            textZoom = WebSettings.TextSize.NORMAL; break;
+            }
+            mMessageContentView.getSettings().setTextSize(textZoom);
         }
         mAttachmentsScroll.scrollTo(0, 0);
         mInviteScroll.scrollTo(0, 0);
         mAttachments.removeAllViews();
         mAttachments.setVisibility(View.GONE);
-        mAttachmentIcon.setVisibility(View.GONE);
         initContactStatusViews();
     }
 
@@ -832,8 +838,10 @@
      * NOTE This method is called on a worker thread!  Implementations must properly synchronize
      * when accessing members.  This method may be called after or even at the same time as
      * {@link #clearContent()}.
+     *
+     * @param activity the parent activity.  Subclass use it as a context, and to show a toast.
      */
-    protected abstract Message openMessageSync();
+    protected abstract Message openMessageSync(Activity activity);
 
     /**
      * Async task for loading a single message outside of the UI thread
@@ -852,7 +860,11 @@
 
         @Override
         protected Message doInBackground(Void... params) {
-            Message message = openMessageSync();
+            Activity activity = getActivity();
+            Message message = null;
+            if (activity != null) {
+                message = openMessageSync(activity);
+            }
             if (message != null) {
                 mMailboxType = Mailbox.getMailboxType(mContext, message.mMailboxKey);
                 if (mMailboxType == -1) {
@@ -888,7 +900,12 @@
             if (!isMessageSpecified()) { // just in case
                 return null;
             }
-            return openMessageSync();
+            Activity activity = getActivity();
+            if (activity == null) {
+                return null;
+            } else {
+                return openMessageSync(activity);
+            }
         }
 
         @Override
@@ -1172,18 +1189,22 @@
     protected void updateHeaderView(Message message) {
         mSubjectView.setText(message.mSubject);
         final Address from = Address.unpackFirst(message.mFrom);
+
+        // Set sender address/display name
+        // Note we set " " for empty field, so TextView's won't get squashed.
+        // Otherwise their height will be 0, which breaks the layout.
         if (from != null) {
             final String fromFriendly = from.toFriendly();
             final String fromAddress = from.getAddress();
             mFromNameView.setText(fromFriendly);
-            mFromAddressView.setText(fromFriendly.equals(fromAddress) ? "" : fromAddress);
+            mFromAddressView.setText(fromFriendly.equals(fromAddress) ? " " : fromAddress);
         } else {
-            mFromNameView.setText("");
-            mFromAddressView.setText("");
+            mFromNameView.setText(" ");
+            mFromAddressView.setText(" ");
         }
         Date date = new Date(message.mTimeStamp);
-        mTimeView.setText(mTimeFormat.format(date));
-        mDateView.setText(Utility.isDateToday(date) ? null : mDateFormat.format(date));
+        // STOPSHIP Use the same format as MessageListItem uses
+        mDateTimeView.setText(mTimeFormat.format(date));
         mToView.setText(Address.toFriendly(Address.unpack(message.mTo)));
         String friendlyCc = Address.toFriendly(Address.unpack(message.mCc));
         mCcView.setText(friendlyCc);
@@ -1191,7 +1212,6 @@
         String friendlyBcc = Address.toFriendly(Address.unpack(message.mBcc));
         mBccView.setText(friendlyBcc);
         mBccContainerView.setVisibility((friendlyBcc != null) ? View.VISIBLE : View.GONE);
-        mAttachmentIcon.setVisibility(message.mAttachments != null ? View.VISIBLE : View.GONE);
     }
 
     /**
diff --git a/src/com/android/email/activity/MessagesAdapter.java b/src/com/android/email/activity/MessagesAdapter.java
index 611e533..d97fad9 100644
--- a/src/com/android/email/activity/MessagesAdapter.java
+++ b/src/com/android/email/activity/MessagesAdapter.java
@@ -18,6 +18,7 @@
 
 import com.android.email.Email;
 import com.android.email.R;
+import com.android.email.ResourceHelper;
 import com.android.email.Utility;
 import com.android.email.data.ThrottlingCursorLoader;
 import com.android.email.provider.EmailContent;
@@ -26,24 +27,14 @@
 
 import android.content.Context;
 import android.content.Loader;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.content.res.Resources.Theme;
-import android.content.res.TypedArray;
 import android.database.Cursor;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CursorAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
 
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -74,17 +65,10 @@
     public static final int COLUMN_FLAGS = 9;
     public static final int COLUMN_SNIPPET = 10;
 
-    private final LayoutInflater mInflater;
-    private final Drawable mFavoriteIconOn;
-    private final Drawable mFavoriteIconOff;
-    private final Drawable mSelectedIconOn;
-    private final Drawable mSelectedIconOff;
+    private final ResourceHelper mResourceHelper;
 
-    private final ColorStateList mTextColorPrimary;
-    private final ColorStateList mTextColorSecondary;
-
-    private final java.text.DateFormat mDateFormat;
-    private final java.text.DateFormat mTimeFormat;
+    /** If true, show color chips. */
+    private boolean mShowColorChips;
 
     /**
      * Set of seleced message IDs.
@@ -106,24 +90,8 @@
 
     public MessagesAdapter(Context context, Callback callback) {
         super(context.getApplicationContext(), null, 0 /* no auto requery */);
+        mResourceHelper = ResourceHelper.getInstance(context);
         mCallback = callback;
-        mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        Resources resources = context.getResources();
-        mFavoriteIconOn = resources.getDrawable(R.drawable.btn_star_big_buttonless_dark_on);
-        mFavoriteIconOff = resources.getDrawable(R.drawable.btn_star_big_buttonless_dark_off);
-        mSelectedIconOn = resources.getDrawable(R.drawable.btn_check_buttonless_dark_on);
-        mSelectedIconOff = resources.getDrawable(R.drawable.btn_check_buttonless_dark_off);
-
-        Theme theme = context.getTheme();
-        TypedArray array;
-        array = theme.obtainStyledAttributes(new int[] { android.R.attr.textColorPrimary });
-        mTextColorPrimary = resources.getColorStateList(array.getResourceId(0, 0));
-        array = theme.obtainStyledAttributes(new int[] { android.R.attr.textColorSecondary });
-        mTextColorSecondary = resources.getColorStateList(array.getResourceId(0, 0));
-
-        mDateFormat = android.text.format.DateFormat.getDateFormat(context);    // short date
-        mTimeFormat = android.text.format.DateFormat.getTimeFormat(context);    // 12/24 time
     }
 
     public void onSaveInstanceState(Bundle outState) {
@@ -144,6 +112,13 @@
         }
     }
 
+    /**
+     * Set true for combined mailboxes.
+     */
+    public void setShowColorChips(boolean show) {
+        mShowColorChips = show;
+    }
+
     public Set<Long> getSelectedSet() {
         return mSelectedSet;
     }
@@ -161,25 +136,21 @@
         // Load the public fields in the view (for later use)
         itemView.mMessageId = cursor.getLong(COLUMN_ID);
         itemView.mMailboxId = cursor.getLong(COLUMN_MAILBOX_KEY);
-        itemView.mAccountId = cursor.getLong(COLUMN_ACCOUNT_KEY);
+        final long accountId = cursor.getLong(COLUMN_ACCOUNT_KEY);
+        itemView.mAccountId = accountId;
         itemView.mRead = cursor.getInt(COLUMN_READ) != 0;
-        itemView.mFavorite = cursor.getInt(COLUMN_FAVORITE) != 0;
+        itemView.mIsFavorite = cursor.getInt(COLUMN_FAVORITE) != 0;
+        itemView.mHasInvite =
+            (cursor.getInt(COLUMN_FLAGS) & Message.FLAG_INCOMING_MEETING_INVITE) != 0;
+        itemView.mHasAttachment = cursor.getInt(COLUMN_ATTACHMENTS) != 0;
+        itemView.mTimestamp = cursor.getLong(COLUMN_DATE);
+        itemView.mSender = cursor.getString(COLUMN_DISPLAY_NAME);
+        itemView.mSnippet = cursor.getString(COLUMN_SNIPPET);
+        itemView.mSnippetLineCount = MessageListItem.NEEDS_LAYOUT;
+        itemView.mColorChipPaint =
+                mShowColorChips ? mResourceHelper.getAccountColorPaint(accountId) : null;
 
-        // Load the UI
-        View chipView = view.findViewById(R.id.chip);
-        chipView.setBackgroundResource(Email.getAccountColorResourceId(itemView.mAccountId));
-
-        TextView fromView = (TextView) view.findViewById(R.id.from);
-        String text = cursor.getString(COLUMN_DISPLAY_NAME);
-        fromView.setText(text);
-
-        TextView subjectView = (TextView) view.findViewById(R.id.subject);
-        text = cursor.getString(COLUMN_SUBJECT);
-        // Add in the snippet if we have one
-        // TODO Should this be spanned text?
-        // The mocks show, for new messages, only the real subject in bold...
-        // Would it be easier to simply use a 2nd TextView? This would also allow ellipsizing an
-        // overly-long subject, to let the beautiful snippet shine through.
+        String text = cursor.getString(COLUMN_SUBJECT);
         String snippet = cursor.getString(COLUMN_SNIPPET);
         if (!TextUtils.isEmpty(snippet)) {
             if (TextUtils.isEmpty(text)) {
@@ -188,52 +159,15 @@
                 text = context.getString(R.string.message_list_snippet, text, snippet);
             }
         }
-        subjectView.setText(text);
-
-        final boolean hasInvitation =
-                    (cursor.getInt(COLUMN_FLAGS) & Message.FLAG_INCOMING_MEETING_INVITE) != 0;
-        makeVisible(view.findViewById(R.id.icon_invite), hasInvitation);
-        final boolean hasAttachments = cursor.getInt(COLUMN_ATTACHMENTS) != 0;
-        makeVisible(view.findViewById(R.id.icon_attachment), hasAttachments);
-
-        // TODO ui spec suggests "time", "day", "date" - implement "day"
-        TextView dateView = (TextView) view.findViewById(R.id.date);
-        long timestamp = cursor.getLong(COLUMN_DATE);
-        Date date = new Date(timestamp);
-        if (Utility.isDateToday(date)) {
-            text = mTimeFormat.format(date);
-        } else {
-            text = mDateFormat.format(date);
-        }
-        dateView.setText(text);
-
-        if (itemView.mRead) {
-            subjectView.setTypeface(Typeface.DEFAULT);
-            fromView.setTypeface(Typeface.DEFAULT);
-            fromView.setTextColor(mTextColorSecondary);
-        } else {
-            subjectView.setTypeface(Typeface.DEFAULT_BOLD);
-            fromView.setTypeface(Typeface.DEFAULT_BOLD);
-            fromView.setTextColor(mTextColorPrimary);
-        }
-
-        updateCheckBox(itemView);
-        changeFavoriteIcon(itemView, itemView.mFavorite);
-        updateBackgroundColor(itemView);
-    }
-
-    private static void makeVisible(View v, boolean visible) {
-        v.setVisibility(visible ? View.VISIBLE : View.GONE);
+        itemView.mSnippet = text;
     }
 
     @Override
     public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return mInflater.inflate(R.layout.message_list_item, parent, false);
-    }
-
-    private void updateCheckBox(MessageListItem itemView) {
-        ImageView selectedView = (ImageView) itemView.findViewById(R.id.selected);
-        selectedView.setImageDrawable(isSelected(itemView) ? mSelectedIconOn : mSelectedIconOff);
+        //return mInflater.inflate(R.layout.message_list_item, parent, false);
+        MessageListItem item = new MessageListItem(context);
+        item.setVisibility(View.VISIBLE);
+        return item;
     }
 
     public void toggleSelected(MessageListItem itemView) {
@@ -254,8 +188,6 @@
         } else {
             mSelectedSet.remove(itemView.mMessageId);
         }
-        updateCheckBox(itemView);
-        updateBackgroundColor(itemView);
         if (mCallback != null) {
             mCallback.onAdapterSelectedChanged(itemView, newSelected, mSelectedSet.size());
         }
@@ -277,30 +209,22 @@
     }
 
     private void changeFavoriteIcon(MessageListItem view, boolean isFavorite) {
-        ((ImageView) view.findViewById(R.id.favorite)).setImageDrawable(
-                isFavorite ? mFavoriteIconOn : mFavoriteIconOff);
-    }
-
-    /**
-     * Update the background color according to the selection state.
-     */
-    public void updateBackgroundColor(MessageListItem itemView) {
-        // TODO Visual for selected items is not decided.
+        view.invalidate();
     }
 
     public static Loader<Cursor> createLoader(Context context, long mailboxId) {
         if (Email.DEBUG_LIFECYCLE && Email.DEBUG) {
             Log.d(Email.LOG_TAG, "MessagesAdapter createLoader mailboxId=" + mailboxId);
         }
-        return new MessagesCursor(context, mailboxId);
+        return new MessagesCursorLoader(context, mailboxId);
 
     }
 
-    private static class MessagesCursor extends ThrottlingCursorLoader {
+    private static class MessagesCursorLoader extends ThrottlingCursorLoader {
         private final Context mContext;
         private final long mMailboxId;
 
-        public MessagesCursor(Context context, long mailboxId) {
+        public MessagesCursorLoader(Context context, long mailboxId) {
             // Initialize with no where clause.  We'll set it later.
             super(context, EmailContent.Message.CONTENT_URI,
                     MESSAGE_PROJECTION, null, null,
diff --git a/src/com/android/email/activity/ThreePaneLayout.java b/src/com/android/email/activity/ThreePaneLayout.java
index b2f7f88..98e2963 100644
--- a/src/com/android/email/activity/ThreePaneLayout.java
+++ b/src/com/android/email/activity/ThreePaneLayout.java
@@ -16,30 +16,40 @@
 
 package com.android.email.activity;
 
+import com.android.email.Email;
 import com.android.email.R;
 
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
+import android.animation.PropertyValuesHolder;
+import android.animation.TimeInterpolator;
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.DecelerateInterpolator;
 import android.widget.LinearLayout;
 
-// TODO Collapsing the middle pane should cancel the selection mode on message list
-// TODO Implement animation
-// TODO On STATE_PORTRAIT_MIDDLE_EXPANDED state, right pane should be pushed out, rather than
-// squished.
-// TODO Test SavedState too.
-
 /**
  * The "three pane" layout used on tablet.
  *
  * It'll encapsulate the behavioral differences between portrait mode and landscape mode.
+ *
+ * TODO Unit tests, when UX is settled.
  */
 public class ThreePaneLayout extends LinearLayout implements View.OnClickListener {
+    private static final boolean ANIMATION_DEBUG = false; // DON'T SUBMIT WITH true
+
+    // STOPSHIP Make sure we're using the same parameters as gmail does
+    private static final int ANIMATION_DURATION = ANIMATION_DEBUG ? 1000 : 80;
+    private static final TimeInterpolator INTERPOLATOR = new DecelerateInterpolator(1.5f);
 
     /** Uninitialized state -- {@link #changePaneState} hasn't been called yet. */
-    private static final int STATE_LEFT_UNINITIALIZED = 0;
+    private static final int STATE_UNINITIALIZED = 0;
 
     /** Mailbox list + message list */
     private static final int STATE_LEFT_VISIBLE = 1;
@@ -50,32 +60,63 @@
     /** Portrait mode only: message view + expanded message list */
     private static final int STATE_PORTRAIT_MIDDLE_EXPANDED = 3;
 
-    public static final int PANE_LEFT = 1 << 0;
+    // Flags for getVisiblePanes()
+    public static final int PANE_LEFT = 1 << 2;
     public static final int PANE_MIDDLE = 1 << 1;
-    public static final int PANE_RIGHT = 1 << 2;
+    public static final int PANE_RIGHT = 1 << 0;
 
-    private int mPaneState = STATE_LEFT_UNINITIALIZED;
+    /** Current pane state.  See {@link #changePaneState} */
+    private int mPaneState = STATE_UNINITIALIZED;
+
+    /** See {@link #changePaneState} and {@link #onFirstSizeChanged} */
+    private int mInitialPaneState = STATE_UNINITIALIZED;
 
     private View mLeftPane;
     private View mMiddlePane;
     private View mRightPane;
 
     // Views used only on portrait
-    private View mCollapser;
     private View mFoggedGlass;
-    private View mRightWithFog;
+
+    private boolean mFirstSizeChangedDone;
+
+    /** Mailbox list width.  Comes from resources. */
+    private int mMailboxListWidth;
+    /**
+     * Message list width, on:
+     * - the message list + message view mode, on landscape.
+     * - the message view + expanded message list mode, on portrait.
+     * Comes from resources.
+     */
+    private int mMessageListWidth;
+
+    /** Hold last animator to cancel. */
+    private Animator mLastAnimator;
+
+    /**
+     * Hold last animator listener to cancel.  See {@link #startLayoutAnimation} for why
+     * we need both {@link #mLastAnimator} and {@link #mLastAnimatorListener}
+     */
+    private AnimatorListener mLastAnimatorListener;
+
+    // Arrays used in {@link #changePaneState}
+    private View[] mViewsLeft;
+    private View[] mViewsRight;
+    private View[] mViewsLeftMiddle;
+    private View[] mViewsMiddleRightFogged;
+    private View[] mViewsLeftMiddleFogged;
 
     private Callback mCallback = EmptyCallback.INSTANCE;
 
     public interface Callback {
         /** Called when {@link ThreePaneLayout#getVisiblePanes()} has changed. */
-        public void onVisiblePanesChanged();
+        public void onVisiblePanesChanged(int previousVisiblePanes);
     }
 
     private static final class EmptyCallback implements Callback {
         public static final Callback INSTANCE = new EmptyCallback();
 
-        @Override public void onVisiblePanesChanged() {}
+        @Override public void onVisiblePanesChanged(int previousVisiblePanes) {}
     }
 
     public ThreePaneLayout(Context context, AttributeSet attrs, int defStyle) {
@@ -102,37 +143,37 @@
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        getViews();
+        mLeftPane = findViewById(R.id.left_pane);
+        mMiddlePane = findViewById(R.id.middle_pane);
 
-        if (!isLandscape()) {
+        mFoggedGlass = findViewById(R.id.fogged_glass);
+        if (mFoggedGlass != null) { // If it's around, it's portrait.
+            mRightPane = findViewById(R.id.right_pane_with_fog);
             mFoggedGlass.setOnClickListener(this);
-            mCollapser.setOnClickListener(this);
+        } else { // landscape
+            mRightPane = findViewById(R.id.right_pane);
         }
+        mViewsLeft = new View[] {mLeftPane};
+        mViewsRight = new View[] {mRightPane};
+        mViewsLeftMiddle = new View[] {mLeftPane, mMiddlePane};
+        mViewsMiddleRightFogged = new View[] {mMiddlePane, mRightPane, mFoggedGlass};
+        mViewsLeftMiddleFogged = new View[] {mLeftPane, mMiddlePane, mFoggedGlass};
 
-        changePaneState(STATE_LEFT_VISIBLE, false);
+        mInitialPaneState = STATE_LEFT_VISIBLE;
+
+        final Resources resources = getResources();
+        mMailboxListWidth = getResources().getDimensionPixelSize(
+                R.dimen.mailbox_list_width);
+        mMessageListWidth = getResources().getDimensionPixelSize(R.dimen.message_list_width);
     }
 
+
     public void setCallback(Callback callback) {
         mCallback = (callback == null) ? EmptyCallback.INSTANCE : callback;
     }
 
-    /**
-     * Look for views and set to members.  {@link #isLandscape} can be used after this method.
-     */
-    private void getViews() {
-        mLeftPane = findViewById(R.id.left_pane);
-        mMiddlePane = findViewById(R.id.middle_pane);
-        mRightPane = findViewById(R.id.right_pane);
-
-        mCollapser = findViewById(R.id.collapser);
-        if (mCollapser != null) { // If it's there, it's portrait.
-            mFoggedGlass = findViewById(R.id.fogged_glass);
-            mRightWithFog = findViewById(R.id.right_pane_with_fog);
-        }
-    }
-
     private boolean isLandscape() {
-        return mCollapser == null;
+        return mFoggedGlass == null;
     }
 
     @Override
@@ -147,7 +188,16 @@
         // Called after onFinishInflate()
         SavedState ss = (SavedState) state;
         super.onRestoreInstanceState(ss.getSuperState());
-        changePaneState(ss.mPaneState, false);
+        mInitialPaneState = ss.mPaneState;
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        if (!mFirstSizeChangedDone) {
+            mFirstSizeChangedDone = true;
+            onFirstSizeChanged();
+        }
     }
 
     /**
@@ -162,62 +212,156 @@
         return ret;
     }
 
+    public boolean onBackPressed() {
+        if (isLandscape()) {
+            switch (mPaneState) {
+            case STATE_RIGHT_VISIBLE:
+                changePaneState(STATE_LEFT_VISIBLE, true); // Close the right pane
+                return true;
+            }
+        } else {
+            switch (mPaneState) {
+                case STATE_RIGHT_VISIBLE:
+                    changePaneState(STATE_PORTRAIT_MIDDLE_EXPANDED, true);
+                    return true;
+                case STATE_PORTRAIT_MIDDLE_EXPANDED:
+                    changePaneState(STATE_LEFT_VISIBLE, true);
+                    return true;
+                }
+        }
+        return false;
+    }
+
     /**
-     * Show/hide the right most pane.  (i.e. message view)
+     * Show the left most pane.  (i.e. mailbox list)
      */
-    public void showRightPane(boolean show) {
-        changePaneState(show ? STATE_RIGHT_VISIBLE : STATE_LEFT_VISIBLE, true);
+    public void showLeftPane() {
+        changePaneState(STATE_LEFT_VISIBLE, true);
+    }
+
+    /**
+     * Before the first call to {@link #onSizeChanged}, we don't know the width of the view, so we
+     * can't layout properly.  We just remember all the requests to {@link #changePaneState}
+     * until the first {@link #onSizeChanged}, at which point we actually change to the last
+     * requested state.
+     */
+    private void onFirstSizeChanged() {
+        if (mInitialPaneState != STATE_UNINITIALIZED) {
+            changePaneState(mInitialPaneState, false);
+            mInitialPaneState = STATE_UNINITIALIZED;
+        }
+    }
+
+    /**
+     * Show the right most pane.  (i.e. message view)
+     */
+    public void showRightPane() {
+        changePaneState(STATE_RIGHT_VISIBLE, true);
     }
 
     private void changePaneState(int newState, boolean animate) {
         if (isLandscape() && (newState == STATE_PORTRAIT_MIDDLE_EXPANDED)) {
             newState = STATE_RIGHT_VISIBLE;
         }
+        if (!mFirstSizeChangedDone) {
+            // Before first onSizeChanged(), we don't know the width of the view, so we can't
+            // layout properly.
+            // Just remember the new state and return.
+            mInitialPaneState = newState;
+            return;
+        }
         if (newState == mPaneState) {
             return;
         }
-        mPaneState = newState;
-        switch (mPaneState) {
-            case STATE_LEFT_VISIBLE:
-                mLeftPane.setVisibility(View.VISIBLE);
-
-                if (isLandscape()) {
-                    mMiddlePane.setVisibility(View.VISIBLE);
-                    mRightPane.setVisibility(View.GONE);
-                } else { // Portrait
-                    mMiddlePane.setVisibility(View.VISIBLE);
-                    mCollapser.setVisibility(View.GONE);
-
-                    mRightWithFog.setVisibility(View.GONE);
-                }
-                break;
-            case STATE_RIGHT_VISIBLE:
-                mLeftPane.setVisibility(View.GONE);
-
-                if (isLandscape()) {
-                    mMiddlePane.setVisibility(View.VISIBLE);
-                    mRightPane.setVisibility(View.VISIBLE);
-                } else { // Portrait
-                    mMiddlePane.setVisibility(View.GONE);
-                    mCollapser.setVisibility(View.VISIBLE);
-
-                    mRightWithFog.setVisibility(View.VISIBLE);
-                    mRightPane.setVisibility(View.VISIBLE);
-                    mFoggedGlass.setVisibility(View.GONE);
-                }
-                break;
-            case STATE_PORTRAIT_MIDDLE_EXPANDED:
-                mLeftPane.setVisibility(View.GONE);
-
-                mMiddlePane.setVisibility(View.VISIBLE);
-                mCollapser.setVisibility(View.VISIBLE);
-
-                mRightWithFog.setVisibility(View.VISIBLE);
-                mRightPane.setVisibility(View.VISIBLE);
-                mFoggedGlass.setVisibility(View.VISIBLE);
-                break;
+        // Just make sure the first transition doesn't animate.
+        if (mPaneState == STATE_UNINITIALIZED) {
+            animate = false;
         }
-        mCallback.onVisiblePanesChanged();
+
+        final int previousVisiblePanes = getVisiblePanes();
+        mPaneState = newState;
+
+        // Animate to the new state.
+        // (We still use animator even if animate == false; we just use 0 duration.)
+        final int totalWidth = getMeasuredWidth();
+
+        final int expectedMailboxLeft;
+        final int expectedMessageListWidth;
+
+        final String animatorLabel; // for debug purpose
+
+        final View[] viewsToShow;
+        final View[] viewsToHide;
+
+        if (isLandscape()) { // Landscape
+            setViewWidth(mLeftPane, mMailboxListWidth);
+            setViewWidth(mRightPane, totalWidth - mMessageListWidth);
+
+            switch (mPaneState) {
+                case STATE_LEFT_VISIBLE:
+                    // mailbox + message list
+                    animatorLabel = "moving to [mailbox list + message list]";
+                    expectedMailboxLeft = 0;
+                    expectedMessageListWidth = totalWidth - mMailboxListWidth;
+                    viewsToShow = mViewsLeft;
+                    viewsToHide = mViewsRight;
+                    break;
+                case STATE_RIGHT_VISIBLE:
+                    // message list + message view
+                    animatorLabel = "moving to [message list + message view]";
+                    expectedMailboxLeft = -mMailboxListWidth;
+                    expectedMessageListWidth = mMessageListWidth;
+                    viewsToShow = mViewsRight;
+                    viewsToHide = mViewsLeft;
+                    break;
+                default:
+                    throw new IllegalStateException();
+            }
+
+        } else { // Portrait
+            setViewWidth(mLeftPane, mMailboxListWidth);
+            setViewWidth(mRightPane, totalWidth);
+
+            switch (mPaneState) {
+                case STATE_LEFT_VISIBLE:
+                    // message list + Message view -> mailbox + message list
+                    animatorLabel = "moving to [mailbox list + message list]";
+                    expectedMailboxLeft = 0;
+                    expectedMessageListWidth = totalWidth - mMailboxListWidth;
+                    viewsToShow = mViewsLeftMiddle;
+                    viewsToHide = mViewsRight;
+                    break;
+                case STATE_PORTRAIT_MIDDLE_EXPANDED:
+                    // mailbox + message list -> message list + message view
+                    animatorLabel = "moving to [message list + message view]";
+                    expectedMailboxLeft = -mMailboxListWidth;
+                    expectedMessageListWidth = mMessageListWidth;
+                    viewsToShow = mViewsMiddleRightFogged;
+                    viewsToHide = mViewsLeft;
+                    break;
+                case STATE_RIGHT_VISIBLE:
+                    // message view only
+                    animatorLabel = "moving to [message view]";
+                    expectedMailboxLeft = -(mMailboxListWidth + mMessageListWidth);
+                    expectedMessageListWidth = mMessageListWidth;
+                    viewsToShow = mViewsRight;
+                    viewsToHide = mViewsLeftMiddleFogged;
+                    break;
+                default:
+                    throw new IllegalStateException();
+            }
+        }
+
+        final AnimatorListener listener = new AnimatorListener(animatorLabel, viewsToShow,
+                viewsToHide, previousVisiblePanes) ;
+
+        // Animation properties -- mailbox list left and message list width, at the same time.
+        startLayoutAnimation(animate ? ANIMATION_DURATION : 0, listener,
+                PropertyValuesHolder.ofInt(PROP_MAILBOX_LIST_LEFT,
+                        getCurrentMailboxLeft(), expectedMailboxLeft),
+                PropertyValuesHolder.ofInt(PROP_MESSAGE_LIST_WIDTH,
+                        getCurrentMessageListWidth(), expectedMessageListWidth)
+                );
     }
 
     /**
@@ -244,14 +388,6 @@
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.collapser:
-                if (isLandscape()) {
-                    return; // Shouldn't happen
-                }
-                changePaneState((mPaneState == STATE_RIGHT_VISIBLE)
-                        ? STATE_PORTRAIT_MIDDLE_EXPANDED
-                        : STATE_RIGHT_VISIBLE, true);
-                break;
             case R.id.fogged_glass:
                 if (isLandscape()) {
                     return; // Shouldn't happen
@@ -261,6 +397,130 @@
         }
     }
 
+    private void setViewWidth(View v, int value) {
+        v.getLayoutParams().width = value;
+        requestLayout();
+    }
+
+    private static final String PROP_MAILBOX_LIST_LEFT = "mailboxListLeftAnim";
+    private static final String PROP_MESSAGE_LIST_WIDTH = "messageListWidthAnim";
+
+    @SuppressWarnings("unused")
+    public void setMailboxListLeftAnim(int value) {
+        ((ViewGroup.MarginLayoutParams) mLeftPane.getLayoutParams()).leftMargin = value;
+        requestLayout();
+    }
+
+    @SuppressWarnings("unused")
+    public void setMessageListWidthAnim(int value) {
+        setViewWidth(mMiddlePane, value);
+    }
+
+    private int getCurrentMailboxLeft() {
+        return ((ViewGroup.MarginLayoutParams) mLeftPane.getLayoutParams()).leftMargin;
+    }
+
+    private int getCurrentMessageListWidth() {
+        return mMiddlePane.getLayoutParams().width;
+    }
+
+    /**
+     * Helper method to start animation.
+     */
+    private void startLayoutAnimation(int duration, AnimatorListener listener,
+            PropertyValuesHolder... values) {
+        if (mLastAnimator != null) {
+            mLastAnimator.cancel();
+        }
+        if (mLastAnimatorListener != null) {
+            if (ANIMATION_DEBUG) {
+                Log.w(Email.LOG_TAG, "Anim: Cancelling last animation: " + mLastAnimator);
+            }
+            // Animator.cancel() doesn't call listener.cancel() immediately, so sometimes
+            // we end up cancelling the previous one *after* starting the next one.
+            // Directly tell the listener it's cancelled to avoid that.
+            mLastAnimatorListener.cancel();
+        }
+
+        final ObjectAnimator animator = ObjectAnimator.ofPropertyValuesHolder(
+                this, values).setDuration(duration);
+        animator.setInterpolator(INTERPOLATOR);
+        if (listener != null) {
+            animator.addListener(listener);
+        }
+        mLastAnimator = animator;
+        mLastAnimatorListener = listener;
+        animator.start();
+    }
+
+    /**
+     * Animation listener.
+     *
+     * Update the visibility of each pane before/after an animation.
+     */
+    private class AnimatorListener implements Animator.AnimatorListener {
+        private final String mLogLabel;
+        private final View[] mViewsToShow;
+        private final View[] mViewsToHide;
+        private final int mPreviousVisiblePanes;
+
+        private boolean mCancelled;
+
+        public AnimatorListener(String logLabel, View[] viewsToShow, View[] viewsToHide,
+                int previousVisiblePanes) {
+            mLogLabel = logLabel;
+            mViewsToShow = viewsToShow;
+            mViewsToHide = viewsToHide;
+            mPreviousVisiblePanes = previousVisiblePanes;
+        }
+
+        private void log(String message) {
+            if (ANIMATION_DEBUG) {
+                Log.w(Email.LOG_TAG, "Anim: " + mLogLabel + "[" + this + "] " + message);
+            }
+        }
+
+        public void cancel() {
+            log("cancel");
+            mCancelled = true;
+        }
+
+        /**
+         * Show the about-to-become-visible panes before an animation.
+         */
+        @Override
+        public void onAnimationStart(Animator animation) {
+            log("start");
+            for (View v : mViewsToShow) {
+                v.setVisibility(View.VISIBLE);
+            }
+            mCallback.onVisiblePanesChanged(mPreviousVisiblePanes);
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+        }
+
+        /**
+         * Hide the about-to-become-hidden panes after an animation.
+         */
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            if (mCancelled) {
+                return; // But they shouldn't be hidden when cancelled.
+            }
+            log("end");
+            for (View v : mViewsToHide) {
+                v.setVisibility(View.INVISIBLE);
+            }
+            mCallback.onVisiblePanesChanged(mPreviousVisiblePanes);
+        }
+    }
+
     private static class SavedState extends BaseSavedState {
         int mPaneState;
 
diff --git a/src/com/android/email/activity/setup/AccountServerBaseFragment.java b/src/com/android/email/activity/setup/AccountServerBaseFragment.java
index 662d73b..aca38a8 100644
--- a/src/com/android/email/activity/setup/AccountServerBaseFragment.java
+++ b/src/com/android/email/activity/setup/AccountServerBaseFragment.java
@@ -41,6 +41,8 @@
     protected Context mContext;
     protected Callback mCallback = EmptyCallback.INSTANCE;
     protected boolean mNextButtonEnabled;
+    // STOPSHIP - this is a temp UI for "next" in AccountSettings.  Disabled during Account Setup.
+    public boolean mNextButtonDisplayed = true;
 
     /**
      * Callback interface that owning activities must provide
@@ -103,23 +105,30 @@
     }
 
     // Add a "Next" button when this fragment is displayed
+    // TODO remove this and replace with a button during Account Settings
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        inflater.inflate(R.menu.account_setup_next_option, menu);
+        if (mNextButtonDisplayed) {
+            inflater.inflate(R.menu.account_setup_next_option, menu);
+        }
     }
 
     /**
      * Enable/disable "next" button
+     * TODO remove this and replace with a button during Account Settings
      */
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
-        MenuItem item = menu.findItem(R.id.next);
-        item.setEnabled(mNextButtonEnabled);
+        if (mNextButtonDisplayed) {
+            MenuItem item = menu.findItem(R.id.next);
+            item.setEnabled(mNextButtonEnabled);
+        }
     }
 
     /**
      * Respond to clicks in the "Next" button
+     * TODO remove this and replace with a button during Account Settings
      */
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
diff --git a/src/com/android/email/activity/setup/AccountSetupExchange.java b/src/com/android/email/activity/setup/AccountSetupExchange.java
index 8a63997..2b871c6 100644
--- a/src/com/android/email/activity/setup/AccountSetupExchange.java
+++ b/src/com/android/email/activity/setup/AccountSetupExchange.java
@@ -25,6 +25,9 @@
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 
 /**
  * Provides generic setup for Exchange accounts.  The following fields are supported:
@@ -61,7 +64,7 @@
  *       finish() (removes self from back stack)
  */
 public class AccountSetupExchange extends AccountSetupActivity
-        implements AccountSetupExchangeFragment.Callback {
+        implements AccountSetupExchangeFragment.Callback, OnClickListener {
 
     // Keys for savedInstanceState
     private final static String STATE_STARTED_AUTODISCOVERY =
@@ -69,6 +72,7 @@
 
     boolean mStartedAutoDiscovery;
     /* package */ AccountSetupExchangeFragment mFragment;
+    private Button mNextButton;
     /* package */ boolean mNextButtonEnabled;
 
     public static void actionIncomingSettings(Activity fromActivity, int mode, Account account) {
@@ -86,6 +90,13 @@
         mFragment = (AccountSetupExchangeFragment)
                 getFragmentManager().findFragmentById(R.id.setup_fragment);
         mFragment.setCallback(this);
+        // TODO temp code to inhibit the options menu - still needed for AccountSettings
+        mFragment.mNextButtonDisplayed = false;
+        invalidateOptionsMenu();
+
+        mNextButton = (Button) findViewById(R.id.next);
+        mNextButton.setOnClickListener(this);
+        findViewById(R.id.previous).setOnClickListener(this);
 
         // One-shot to launch autodiscovery at the entry to this activity (but not if it restarts)
         mStartedAutoDiscovery = false;
@@ -97,6 +108,21 @@
         }
     }
 
+    /**
+     * Implements View.OnClickListener
+     */
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.next:
+                mFragment.onNext();
+                break;
+            case R.id.previous:
+                onBackPressed();
+                break;
+        }
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -168,13 +194,9 @@
     /**
      * Implements AccountServerBaseFragment.Callback
      */
-    public void onEnableProceedButtons(boolean enabled) {
-        boolean wasEnabled = mNextButtonEnabled;
-        mNextButtonEnabled = enabled;
-
-        if (enabled != wasEnabled) {
-            invalidateOptionsMenu();
-        }
+    public void onEnableProceedButtons(boolean enable) {
+        mNextButtonEnabled = enable;
+        mNextButton.setEnabled(enable);
     }
 
     /**
diff --git a/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java b/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
index b9aa409..414f2e0 100644
--- a/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupExchangeFragment.java
@@ -54,14 +54,15 @@
 public class AccountSetupExchangeFragment extends AccountServerBaseFragment
         implements OnCheckedChangeListener {
 
-    private final static String STATE_KEY_CREDENTIAL =
-        "AccountSetupExchangeFragment.loginCredential";
+    private final static String STATE_KEY_CREDENTIAL = "AccountSetupExchangeFragment.credential";
+    private final static String STATE_KEY_LOADED = "AccountSetupExchangeFragment.loaded";
 
     private EditText mUsernameView;
     private EditText mPasswordView;
     private EditText mServerView;
     private CheckBox mSslSecurityView;
     private CheckBox mTrustCertificatesView;
+    private View mTrustCertificatesDivider;
 
     // Support for lifecycle
     private boolean mStarted;
@@ -81,6 +82,7 @@
 
         if (savedInstanceState != null) {
             mCacheLoginCredential = savedInstanceState.getString(STATE_KEY_CREDENTIAL);
+            mLoaded = savedInstanceState.getBoolean(STATE_KEY_LOADED, false);
         }
     }
 
@@ -99,6 +101,7 @@
         mSslSecurityView = (CheckBox) view.findViewById(R.id.account_ssl);
         mSslSecurityView.setOnCheckedChangeListener(this);
         mTrustCertificatesView = (CheckBox) view.findViewById(R.id.account_trust_certificates);
+        mTrustCertificatesDivider = view.findViewById(R.id.account_trust_certificates_divider);
 
         // Calls validateFields() which enables or disables the Next button
         // based on the fields' validity.
@@ -145,9 +148,7 @@
         }
         super.onStart();
         mStarted = true;
-        if (!mLoaded) {
-            loadSettings(SetupData.getAccount());
-        }
+        loadSettings(SetupData.getAccount());
     }
 
     /**
@@ -201,6 +202,7 @@
         super.onSaveInstanceState(outState);
 
         outState.putString(STATE_KEY_CREDENTIAL, mCacheLoginCredential);
+        outState.putBoolean(STATE_KEY_LOADED, mLoaded);
     }
 
     /**
@@ -209,7 +211,7 @@
     @Override
     public void setCallback(Callback callback) {
         super.setCallback(callback);
-        if (mStarted && !mLoaded) {
+        if (mStarted) {
             loadSettings(SetupData.getAccount());
         }
     }
@@ -220,6 +222,8 @@
      * @return true if the loaded values pass validation
      */
     /* package */ boolean loadSettings(Account account) {
+        if (mLoaded) return validateFields();
+
         HostAuth hostAuth = account.mHostAuthRecv;
 
         String userName = hostAuth.mLogin;
@@ -249,8 +253,9 @@
         boolean trustCertificates = 0 != (hostAuth.mFlags & HostAuth.FLAG_TRUST_ALL_CERTIFICATES);
         mSslSecurityView.setChecked(ssl);
         mTrustCertificatesView.setChecked(trustCertificates);
-        mTrustCertificatesView.setVisibility(ssl ? View.VISIBLE : View.GONE);
+        showTrustCertificates(ssl);
 
+        mLoaded = true;
         return validateFields();
     }
 
@@ -264,6 +269,7 @@
      * @return true if all fields are valid, false if any fields are incomplete
      */
     private boolean validateFields() {
+        if (!mLoaded) return false;
         boolean enabled = usernameFieldValid(mUsernameView)
                 && Utility.isTextViewNotEmpty(mPasswordView)
                 && Utility.isTextViewNotEmpty(mServerView);
@@ -280,9 +286,19 @@
 
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         if (buttonView.getId() == R.id.account_ssl) {
-            mTrustCertificatesView.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+            showTrustCertificates(isChecked);
         }
     }
+
+    public void showTrustCertificates(boolean visible) {
+        int mode = visible ? View.VISIBLE : View.GONE;
+        mTrustCertificatesView.setVisibility(mode);
+        // Divider is optional (only on XL layouts)
+        if (mTrustCertificatesDivider != null) {
+            mTrustCertificatesDivider.setVisibility(mode);
+        }
+    }
+
     /**
      * Entry point from Activity after editing settings and verifying them.  Must be FLOW_MODE_EDIT.
      *
diff --git a/src/com/android/email/activity/setup/AccountSetupIncoming.java b/src/com/android/email/activity/setup/AccountSetupIncoming.java
index de5a9a6..826b5ec 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncoming.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncoming.java
@@ -24,6 +24,9 @@
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 
 /**
  * Provides setup flow for IMAP/POP accounts.
@@ -32,9 +35,10 @@
  * the settings as entered.  If the account is OK, proceeds to AccountSetupOutgoing.
  */
 public class AccountSetupIncoming extends AccountSetupActivity
-        implements AccountSetupIncomingFragment.Callback {
+        implements AccountSetupIncomingFragment.Callback, OnClickListener {
 
     /* package */ AccountSetupIncomingFragment mFragment;
+    private Button mNextButton;
     /* package */ boolean mNextButtonEnabled;
 
     public static void actionIncomingSettings(Activity fromActivity, int mode, Account account) {
@@ -54,9 +58,31 @@
 
         // Configure fragment
         mFragment.setCallback(this);
+        // TODO temp code to inhibit the options menu - still needed for AccountSettings
+        mFragment.mNextButtonDisplayed = false;
+        invalidateOptionsMenu();
+
+        mNextButton = (Button) findViewById(R.id.next);
+        mNextButton.setOnClickListener(this);
+        findViewById(R.id.previous).setOnClickListener(this);
    }
 
     /**
+     * Implements View.OnClickListener
+     */
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.next:
+                mFragment.onNext();
+                break;
+            case R.id.previous:
+                onBackPressed();
+                break;
+        }
+    }
+
+    /**
      * Implements AccountServerBaseFragment.Callback
      *
      * Launches the account checker.  Positive results are reported to onCheckSettingsOk().
@@ -74,12 +100,8 @@
      * Implements AccountServerBaseFragment.Callback
      */
     public void onEnableProceedButtons(boolean enable) {
-        boolean wasEnabled = mNextButtonEnabled;
         mNextButtonEnabled = enable;
-
-        if (enable != wasEnabled) {
-            invalidateOptionsMenu();
-        }
+        mNextButton.setEnabled(enable);
     }
 
     /**
diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
index 358be35..10b3dcd 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
@@ -50,8 +50,8 @@
  */
 public class AccountSetupIncomingFragment extends AccountServerBaseFragment {
 
-    private final static String STATE_KEY_CREDENTIAL =
-            "AccountSetupIncomingFragment.loginCredential";
+    private final static String STATE_KEY_CREDENTIAL = "AccountSetupIncomingFragment.credential";
+    private final static String STATE_KEY_LOADED = "AccountSetupIncomingFragment.loaded";
 
     private static final int POP_PORTS[] = {
             110, 995, 995, 110, 110
@@ -81,6 +81,7 @@
 
     // Support for lifecycle
     private boolean mStarted;
+    private boolean mConfigured;
     private boolean mLoaded;
     private String mCacheLoginCredential;
 
@@ -97,6 +98,7 @@
 
         if (savedInstanceState != null) {
             mCacheLoginCredential = savedInstanceState.getString(STATE_KEY_CREDENTIAL);
+            mLoaded = savedInstanceState.getBoolean(STATE_KEY_LOADED, false);
         }
     }
 
@@ -202,9 +204,8 @@
         }
         super.onStart();
         mStarted = true;
-        if (!mLoaded) {
-            loadSettings();
-        }
+        configureEditor();
+        loadSettings();
     }
 
     /**
@@ -258,6 +259,7 @@
         super.onSaveInstanceState(outState);
 
         outState.putString(STATE_KEY_CREDENTIAL, mCacheLoginCredential);
+        outState.putBoolean(STATE_KEY_LOADED, mLoaded);
     }
 
     /**
@@ -266,15 +268,41 @@
     @Override
     public void setCallback(Callback callback) {
         super.setCallback(callback);
-        if (mStarted && !mLoaded) {
+        if (mStarted) {
+            configureEditor();
             loadSettings();
         }
     }
 
     /**
+     * Configure the editor for the account type
+     */
+    private void configureEditor() {
+        if (mConfigured) return;
+        Account account = SetupData.getAccount();
+        String protocol = account.mHostAuthRecv.mProtocol;
+        if (protocol.startsWith("pop3")) {
+            mServerLabelView.setText(R.string.account_setup_incoming_pop_server_label);
+            mAccountPorts = POP_PORTS;
+            mAccountSchemes = POP_SCHEMES;
+            mImapPathPrefixSectionView.setVisibility(View.GONE);
+        } else if (protocol.startsWith("imap")) {
+            mServerLabelView.setText(R.string.account_setup_incoming_imap_server_label);
+            mAccountPorts = IMAP_PORTS;
+            mAccountSchemes = IMAP_SCHEMES;
+            mDeletePolicyLabelView.setVisibility(View.GONE);
+            mDeletePolicyView.setVisibility(View.GONE);
+        } else {
+            throw new Error("Unknown account type: " + account);
+        }
+        mConfigured = true;
+    }
+
+    /**
      * Load the current settings into the UI
      */
     private void loadSettings() {
+        if (mLoaded) return;
         try {
             // TODO this should be accessed directly via the HostAuth structure
             EmailContent.Account account = SetupData.getAccount();
@@ -298,18 +326,8 @@
             }
 
             if (uri.getScheme().startsWith("pop3")) {
-                mServerLabelView.setText(R.string.account_setup_incoming_pop_server_label);
-                mAccountPorts = POP_PORTS;
-                mAccountSchemes = POP_SCHEMES;
-
-                mImapPathPrefixSectionView.setVisibility(View.GONE);
+                SpinnerOption.setSpinnerOptionValue(mDeletePolicyView, account.getDeletePolicy());
             } else if (uri.getScheme().startsWith("imap")) {
-                mServerLabelView.setText(R.string.account_setup_incoming_imap_server_label);
-                mAccountPorts = IMAP_PORTS;
-                mAccountSchemes = IMAP_SCHEMES;
-
-                mDeletePolicyLabelView.setVisibility(View.GONE);
-                mDeletePolicyView.setVisibility(View.GONE);
                 if (uri.getPath() != null && uri.getPath().length() > 0) {
                     mImapPathPrefixView.setText(uri.getPath().substring(1));
                 }
@@ -323,8 +341,6 @@
                 }
             }
 
-            SpinnerOption.setSpinnerOptionValue(mDeletePolicyView, account.getDeletePolicy());
-
             if (uri.getHost() != null) {
                 mServerView.setText(uri.getHost());
             }
@@ -340,7 +356,7 @@
              */
             throw new Error(use);
         }
-
+        mLoaded = true;
         validateFields();
     }
 
@@ -348,6 +364,7 @@
      * Check the values in the fields and decide if it makes sense to enable the "next" button
      */
     private void validateFields() {
+        if (!mConfigured || !mLoaded) return;
         boolean enabled = Utility.isTextViewNotEmpty(mUsernameView)
                 && Utility.isTextViewNotEmpty(mPasswordView)
                 && Utility.isTextViewNotEmpty(mServerView)
diff --git a/src/com/android/email/activity/setup/AccountSetupOutgoing.java b/src/com/android/email/activity/setup/AccountSetupOutgoing.java
index 057af40..4a5e2e5 100644
--- a/src/com/android/email/activity/setup/AccountSetupOutgoing.java
+++ b/src/com/android/email/activity/setup/AccountSetupOutgoing.java
@@ -24,6 +24,9 @@
 import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 
 /**
  * Provides setup flow for SMTP (for IMAP/POP accounts).
@@ -32,9 +35,10 @@
  * the settings as entered.  If the account is OK, proceeds to AccountSetupOptions.
  */
 public class AccountSetupOutgoing extends Activity
-        implements AccountSetupOutgoingFragment.Callback {
+        implements AccountSetupOutgoingFragment.Callback, OnClickListener {
 
     /* package */ AccountSetupOutgoingFragment mFragment;
+    private Button mNextButton;
     /* package */ boolean mNextButtonEnabled;
 
     public static void actionOutgoingSettings(Activity fromActivity, int mode, Account account) {
@@ -54,6 +58,28 @@
 
         // Configure fragment
         mFragment.setCallback(this);
+        // TODO temp code to inhibit the options menu - still needed for AccountSettings
+        mFragment.mNextButtonDisplayed = false;
+        invalidateOptionsMenu();
+
+        mNextButton = (Button) findViewById(R.id.next);
+        mNextButton.setOnClickListener(this);
+        findViewById(R.id.previous).setOnClickListener(this);
+    }
+
+    /**
+     * Implements View.OnClickListener
+     */
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.next:
+                mFragment.onNext();
+                break;
+            case R.id.previous:
+                onBackPressed();
+                break;
+        }
     }
 
     /**
@@ -74,12 +100,8 @@
      * Implements AccountServerBaseFragment.Callback
      */
     public void onEnableProceedButtons(boolean enable) {
-        boolean wasEnabled = mNextButtonEnabled;
         mNextButtonEnabled = enable;
-
-        if (enable != wasEnabled) {
-            invalidateOptionsMenu();
-        }
+        mNextButton.setEnabled(enable);
     }
 
     /**
diff --git a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
index 603ec47..a81bfc3 100644
--- a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
@@ -52,6 +52,9 @@
  */
 public class AccountSetupOutgoingFragment extends AccountServerBaseFragment
         implements OnCheckedChangeListener {
+
+    private final static String STATE_KEY_LOADED = "AccountSetupOutgoingFragment.loaded";
+
     private static final int SMTP_PORTS[] = {
             587, 465, 465, 587, 587
     };
@@ -65,7 +68,8 @@
     private EditText mServerView;
     private EditText mPortView;
     private CheckBox mRequireLoginView;
-    private ViewGroup mRequireLoginSettingsView;
+    private View mRequireLoginSettingsView;
+    private View mRequireLoginSettingsView2;
     private Spinner mSecurityTypeView;
 
     // Support for lifecycle
@@ -82,6 +86,10 @@
             Log.d(Email.LOG_TAG, "AccountSetupOutgoingFragment onCreate");
         }
         super.onCreate(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            mLoaded = savedInstanceState.getBoolean(STATE_KEY_LOADED, false);
+        }
     }
 
     @Override
@@ -98,8 +106,8 @@
         mServerView = (EditText) view.findViewById(R.id.account_server);
         mPortView = (EditText) view.findViewById(R.id.account_port);
         mRequireLoginView = (CheckBox) view.findViewById(R.id.account_require_login);
-        mRequireLoginSettingsView =
-                (ViewGroup) view.findViewById(R.id.account_require_login_settings);
+        mRequireLoginSettingsView = view.findViewById(R.id.account_require_login_settings);
+        mRequireLoginSettingsView2 = view.findViewById(R.id.account_require_login_settings_2);
         mSecurityTypeView = (Spinner) view.findViewById(R.id.account_security_type);
         mRequireLoginView.setOnCheckedChangeListener(this);
 
@@ -171,9 +179,7 @@
         }
         super.onStart();
         mStarted = true;
-        if (!mLoaded) {
-            loadSettings();
-        }
+        loadSettings();
     }
 
     /**
@@ -225,6 +231,8 @@
             Log.d(Email.LOG_TAG, "AccountSetupOutgoingFragment onSaveInstanceState");
         }
         super.onSaveInstanceState(outState);
+
+        outState.putBoolean(STATE_KEY_LOADED, mLoaded);
     }
 
     /**
@@ -233,7 +241,7 @@
     @Override
     public void setCallback(Callback callback) {
         super.setCallback(callback);
-        if (mStarted && !mLoaded) {
+        if (mStarted) {
             loadSettings();
         }
     }
@@ -242,6 +250,7 @@
      * Load the current settings into the UI
      */
     private void loadSettings() {
+        if (mLoaded) return;
         try {
             // TODO this should be accessed directly via the HostAuth structure
             URI uri = new URI(SetupData.getAccount().getSenderUri(mContext));
@@ -285,7 +294,7 @@
              */
             throw new Error(use);
         }
-
+        mLoaded = true;
         validateFields();
     }
 
@@ -293,6 +302,7 @@
      * Preflight the values in the fields and decide if it makes sense to enable the "next" button
      */
     private void validateFields() {
+        if (!mLoaded) return;
         boolean enabled =
             Utility.isTextViewNotEmpty(mServerView) && Utility.isPortFieldValid(mPortView);
 
@@ -317,6 +327,9 @@
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         mRequireLoginSettingsView.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+        if (mRequireLoginSettingsView2 != null) {
+            mRequireLoginSettingsView2.setVisibility(isChecked ? View.VISIBLE : View.GONE);
+        }
         validateFields();
     }
 
diff --git a/src/com/android/email/data/MailboxAccountLoader.java b/src/com/android/email/data/MailboxAccountLoader.java
index 645b801..e91921e 100644
--- a/src/com/android/email/data/MailboxAccountLoader.java
+++ b/src/com/android/email/data/MailboxAccountLoader.java
@@ -16,6 +16,7 @@
 
 package com.android.email.data;
 
+import com.android.email.provider.EmailContent;
 import com.android.email.provider.EmailContent.Account;
 import com.android.email.provider.EmailContent.Mailbox;
 
@@ -35,14 +36,16 @@
         public final Mailbox mMailbox;
         public final boolean mIsEasAccount;
         public final boolean mIsRefreshable;
+        public final int mCountTotalAccounts;
 
         private Result(boolean found, Account account, Mailbox mailbox, boolean isEasAccount,
-                boolean isRefreshable) {
+                boolean isRefreshable, int countTotalAccounts) {
             mIsFound = found;
             mAccount = account;
             mMailbox = mailbox;
             mIsEasAccount = isEasAccount;
             mIsRefreshable = isRefreshable;
+            mCountTotalAccounts = countTotalAccounts;
         }
     }
 
@@ -82,7 +85,9 @@
                 }
             }
         }
-        Result result = new Result(found, account, mailbox, isEasAccount, isRefreshable);
+        final int countAccounts = EmailContent.count(mContext, Account.CONTENT_URI);
+        Result result = new Result(found, account, mailbox, isEasAccount, isRefreshable,
+                countAccounts);
         return result;
     }
 
diff --git a/src/com/android/email/provider/ContentCache.java b/src/com/android/email/provider/ContentCache.java
index 28e3bdf..6a89d5b 100644
--- a/src/com/android/email/provider/ContentCache.java
+++ b/src/com/android/email/provider/ContentCache.java
@@ -15,6 +15,7 @@
  */
 
 package com.android.email.provider;
+
 import com.android.email.Email;
 
 import android.content.ContentValues;
@@ -29,6 +30,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * An LRU cache for EmailContent (Account, HostAuth, Mailbox, and Message, thus far).  The intended
@@ -66,9 +68,12 @@
 public final class ContentCache extends LinkedHashMap<String, Cursor> {
     private static final long serialVersionUID = 1L;
 
-    private static final boolean DEBUG_CACHE = false;
-    private static final boolean DEBUG_TOKENS = false;
-    private static final boolean DEBUG_NOT_CACHEABLE = false;
+    private static final boolean DEBUG_CACHE = false;  // DO NOT CHECK IN TRUE
+    private static final boolean DEBUG_TOKENS = false;  // DO NOT CHECK IN TRUE
+    private static final boolean DEBUG_NOT_CACHEABLE = false;  // DO NOT CHECK IN TRUE
+
+    // If false, reads will not use the cache; this is intended for debugging only
+    private static final boolean READ_CACHE_ENABLED = true;  // DO NOT CHECK IN FALSE
 
     // Count of non-cacheable queries (debug only)
     private static int sNotCacheable = 0;
@@ -99,56 +104,59 @@
     private final Statistics mStats;
 
     /**
-     * A synchronized map used as a counter for arbitrary objects (e.g. a reference count)
+     * A synchronized reference counter for arbitrary objects
      */
-    /*package*/ static class CounterMap<T> extends HashMap<T, Integer> {
+    /*package*/ static class CounterMap<T> {
         private static final long serialVersionUID = 1L;
+        private HashMap<T, Integer> mMap;
 
         /*package*/ CounterMap(int maxSize) {
-            super(maxSize);
+            mMap = new HashMap<T, Integer>(maxSize);
         }
 
         /*package*/ CounterMap() {
-            super();
+            mMap = new HashMap<T, Integer>();
         }
 
-        /*package*/ void remove(T object) {
-            synchronized(this) {
-                Integer refCount = get(object);
-                if (refCount == null || refCount.intValue() == 0) {
-                    throw new IllegalStateException();
-                }
-                if (refCount > 1) {
-                    put(object, refCount - 1);
-                } else {
-                    super.remove(object);
-                }
+        /*package*/ synchronized void subtract(T object) {
+            Integer refCount = mMap.get(object);
+            if (refCount == null || refCount.intValue() == 0) {
+                throw new IllegalStateException();
+            }
+            if (refCount > 1) {
+                mMap.put(object, refCount - 1);
+            } else {
+                mMap.remove(object);
             }
         }
 
-        /*package*/ void add(T object) {
-            synchronized(this) {
-                Integer refCount = get(object);
-                if (refCount == null) {
-                    put(object, 1);
-                } else {
-                    put(object, refCount + 1);
-                }
+        /*package*/ synchronized void add(T object) {
+            Integer refCount = mMap.get(object);
+            if (refCount == null) {
+                mMap.put(object, 1);
+            } else {
+                mMap.put(object, refCount + 1);
             }
         }
 
-        /*package*/ boolean contains(T object) {
-            synchronized(this) {
-                Integer refCount = get(object);
-                return (refCount != null && refCount.intValue() > 0);
-            }
+        /*package*/ synchronized boolean contains(T object) {
+            return mMap.containsKey(object);
         }
 
-        /*package*/ int getCount(T object) {
-            synchronized(this) {
-                Integer refCount = get(object);
-                return (refCount == null) ? 0 : refCount.intValue();
-            }
+        /*package*/ synchronized int getCount(T object) {
+            Integer refCount = mMap.get(object);
+            return (refCount == null) ? 0 : refCount.intValue();
+        }
+
+        synchronized int size() {
+            return mMap.size();
+        }
+
+        /**
+         * For Debugging Only - not efficient
+         */
+        synchronized Set<HashMap.Entry<T, Integer>> entrySet() {
+            return mMap.entrySet();
         }
     }
 
@@ -222,7 +230,7 @@
     public static final class CacheToken {
         private static final long serialVersionUID = 1L;
         private final String mId;
-        private boolean mIsValid = true;
+        private boolean mIsValid = READ_CACHE_ENABLED;
 
         /*package*/ CacheToken(String id) {
             mId = id;
@@ -269,8 +277,6 @@
 
         public CachedCursor(Cursor cursor, ContentCache cache, String name) {
             super(cursor);
-            // The underlying cursor must always be at position 0
-            cursor.moveToPosition(0);
             mCursor = cursor;
             mCache = cache;
             // Add this to our set of active cursors
@@ -286,7 +292,7 @@
             if (!mCache.containsValue(mCursor)) {
                 super.close();
             }
-            sActiveCursors.remove(mCursor);
+            sActiveCursors.subtract(mCursor);
             isClosed = true;
         }
 
@@ -437,7 +443,15 @@
      * @param projection the projection represented by the cursor
      * @return whether or not the cursor was cached
      */
-    public synchronized Cursor putCursor(Cursor c, String id, String[] projection,
+    public Cursor putCursor(Cursor c, String id, String[] projection, CacheToken token) {
+        // Make sure the underlying cursor is at the first row, and do this without synchronizing,
+        // to prevent deadlock with a writing thread (which might, for example, be calling into
+        // CachedCursor.invalidate)
+        c.moveToPosition(0);
+        return putCursorImpl(c, id, projection, token);
+    }
+
+    public synchronized Cursor putCursorImpl(Cursor c, String id, String[] projection,
             CacheToken token) {
         try {
             if (!token.isValid()) {
@@ -457,7 +471,6 @@
                    unlockImpl(id, null, false);
                 }
                 put(id, c);
-                c.moveToFirst();
                 return new CachedCursor(c, this, id);
             }
             return c;
@@ -611,7 +624,7 @@
             }
         }
         if (wasLocked) {
-            mLockMap.remove(id);
+            mLockMap.subtract(id);
         }
     }
 
@@ -707,6 +720,13 @@
         }
     }
 
+    // For use with unit tests
+    public static void invalidateAllCachesForTest() {
+        for (ContentCache cache: sContentCaches) {
+            cache.invalidate();
+        }
+    }
+
     static class Statistics {
         private final ContentCache mCache;
         private final String mName;
diff --git a/src/com/android/email/service/EmailServiceProxy.java b/src/com/android/email/service/EmailServiceProxy.java
index 0d520fb..266be40 100644
--- a/src/com/android/email/service/EmailServiceProxy.java
+++ b/src/com/android/email/service/EmailServiceProxy.java
@@ -328,6 +328,17 @@
         });
     }
 
+    public void deleteAccountPIMData(final long accountId) throws RemoteException {
+        setTask(new Runnable () {
+            public void run() {
+                try {
+                    mService.deleteAccountPIMData(accountId);
+                } catch (RemoteException e) {
+                }
+            }
+        });
+    }
+
     public IBinder asBinder() {
         return null;
     }
diff --git a/src/com/android/email/service/IEmailService.aidl b/src/com/android/email/service/IEmailService.aidl
index a6618d9..663b346 100644
--- a/src/com/android/email/service/IEmailService.aidl
+++ b/src/com/android/email/service/IEmailService.aidl
@@ -46,4 +46,6 @@
     void sendMeetingResponse(long messageId, int response);
 
     void moveMessage(long messageId, long mailboxId);
+
+    void deleteAccountPIMData(long accountId);
 }
\ No newline at end of file
diff --git a/src/com/android/exchange/ContactsSyncAdapterService.java b/src/com/android/exchange/ContactsSyncAdapterService.java
index 9741e42..311dd4f 100644
--- a/src/com/android/exchange/ContactsSyncAdapterService.java
+++ b/src/com/android/exchange/ContactsSyncAdapterService.java
@@ -17,7 +17,6 @@
 package com.android.exchange;
 
 import com.android.email.Email;
-import com.android.email.provider.EmailContent;
 import com.android.email.provider.EmailContent.AccountColumns;
 import com.android.email.provider.EmailContent.Mailbox;
 import com.android.email.provider.EmailContent.MailboxColumns;
@@ -35,6 +34,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.provider.ContactsContract.Groups;
 import android.provider.ContactsContract.RawContacts;
 import android.util.Log;
 
@@ -43,7 +43,7 @@
     private static SyncAdapterImpl sSyncAdapter = null;
     private static final Object sSyncAdapterLock = new Object();
 
-    private static final String[] ID_PROJECTION = new String[] {EmailContent.RECORD_ID};
+    private static final String[] ID_PROJECTION = new String[] {"_id"};
     private static final String ACCOUNT_AND_TYPE_CONTACTS =
         MailboxColumns.ACCOUNT_KEY + "=? AND " + MailboxColumns.TYPE + '=' + Mailbox.TYPE_CONTACTS;
 
@@ -85,6 +85,15 @@
         return sSyncAdapter.getSyncAdapterBinder();
     }
 
+    private static boolean hasDirtyRows(ContentResolver resolver, Uri uri, String dirtyColumn) {
+        Cursor c = resolver.query(uri, ID_PROJECTION, dirtyColumn + "=1", null, null);
+        try {
+            return c.getCount() > 0;
+        } finally {
+            c.close();
+        }
+    }
+
     /**
      * Partial integration with system SyncManager; we tell our EAS ExchangeService to start a
      * contacts sync when we get the signal from SyncManager.
@@ -95,21 +104,29 @@
             String authority, ContentProviderClient provider, SyncResult syncResult)
             throws OperationCanceledException {
         ContentResolver cr = context.getContentResolver();
-        Log.i(TAG, "performSync");
+        if (Email.DEBUG) {
+            Log.d(TAG, "performSync");
+        }
+
+        // If we've been asked to do an upload, make sure we've got work to do
         if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_UPLOAD)) {
             Uri uri = RawContacts.CONTENT_URI.buildUpon()
                 .appendQueryParameter(RawContacts.ACCOUNT_NAME, account.name)
                 .appendQueryParameter(RawContacts.ACCOUNT_TYPE, Email.EXCHANGE_ACCOUNT_MANAGER_TYPE)
                 .build();
-            Cursor c = cr.query(uri,
-                    new String[] {RawContacts._ID}, RawContacts.DIRTY + "=1", null, null);
-            try {
-                if (!c.moveToFirst()) {
-                    Log.i(TAG, "Upload sync; no changes");
-                    return;
-                }
-            } finally {
-                c.close();
+            // See if we've got dirty contacts or dirty groups containing our contacts
+            boolean changed = hasDirtyRows(cr, uri, RawContacts.DIRTY);
+            if (!changed) {
+                uri = Groups.CONTENT_URI.buildUpon()
+                    .appendQueryParameter(RawContacts.ACCOUNT_NAME, account.name)
+                    .appendQueryParameter(RawContacts.ACCOUNT_TYPE,
+                            Email.EXCHANGE_ACCOUNT_MANAGER_TYPE)
+                    .build();
+                changed = hasDirtyRows(cr, uri, Groups.DIRTY);
+            }
+            if (!changed) {
+                Log.i(TAG, "Upload sync; no changes");
+                return;
             }
         }
 
diff --git a/src/com/android/exchange/EasSyncService.java b/src/com/android/exchange/EasSyncService.java
index 3f40d44..6a388be 100644
--- a/src/com/android/exchange/EasSyncService.java
+++ b/src/com/android/exchange/EasSyncService.java
@@ -18,8 +18,8 @@
 package com.android.exchange;
 
 import com.android.email.SecurityPolicy;
-import com.android.email.Utility;
 import com.android.email.SecurityPolicy.PolicySet;
+import com.android.email.Utility;
 import com.android.email.mail.Address;
 import com.android.email.mail.MeetingInfo;
 import com.android.email.mail.MessagingException;
@@ -46,11 +46,11 @@
 import com.android.exchange.adapter.GalParser;
 import com.android.exchange.adapter.MeetingResponseParser;
 import com.android.exchange.adapter.MoveItemsParser;
+import com.android.exchange.adapter.Parser.EasParserException;
 import com.android.exchange.adapter.PingParser;
 import com.android.exchange.adapter.ProvisionParser;
 import com.android.exchange.adapter.Serializer;
 import com.android.exchange.adapter.Tags;
-import com.android.exchange.adapter.Parser.EasParserException;
 import com.android.exchange.provider.GalResult;
 import com.android.exchange.utility.CalendarUtilities;
 
@@ -412,73 +412,80 @@
             // Any string will do, but we'll go for "validate"
             svc.mDeviceId = "validate";
             HttpResponse resp = svc.sendHttpClientOptions();
-            int code = resp.getStatusLine().getStatusCode();
-            userLog("Validation (OPTIONS) response: " + code);
-            if (code == HttpStatus.SC_OK) {
-                // No exception means successful validation
-                Header commands = resp.getFirstHeader("MS-ASProtocolCommands");
-                Header versions = resp.getFirstHeader("ms-asprotocolversions");
-                // Make sure we've got the right protocol version set up
-                try {
-                    if (commands == null || versions == null) {
-                        userLog("OPTIONS response without commands or versions");
-                        // We'll treat this as a protocol exception
-                        throw new MessagingException(0);
+            HttpEntity entity = resp.getEntity();
+            try {
+                int code = resp.getStatusLine().getStatusCode();
+                userLog("Validation (OPTIONS) response: " + code);
+                if (code == HttpStatus.SC_OK) {
+                    // No exception means successful validation
+                    Header commands = resp.getFirstHeader("MS-ASProtocolCommands");
+                    Header versions = resp.getFirstHeader("ms-asprotocolversions");
+                    // Make sure we've got the right protocol version set up
+                    try {
+                        if (commands == null || versions == null) {
+                            userLog("OPTIONS response without commands or versions");
+                            // We'll treat this as a protocol exception
+                            throw new MessagingException(0);
+                        }
+                        setupProtocolVersion(svc, versions);
+                    } catch (MessagingException e) {
+                        bundle.putInt(EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE,
+                                MessagingException.PROTOCOL_VERSION_UNSUPPORTED);
+                        return bundle;
                     }
-                    setupProtocolVersion(svc, versions);
-                } catch (MessagingException e) {
-                    bundle.putInt(EmailServiceProxy.VALIDATE_BUNDLE_RESULT_CODE,
-                            MessagingException.PROTOCOL_VERSION_UNSUPPORTED);
-                    return bundle;
-                }
 
-                // Run second test here for provisioning failures using FolderSync
-                userLog("Try folder sync");
-                // Send "0" as the sync key for new accounts; otherwise we'll use the current key
-                String syncKey = "0";
-                Account existingAccount =
-                    Utility.findExistingAccount(context, -1L, hostAddress, userName);
-                if (existingAccount != null && existingAccount.mSyncKey != null) {
-                    syncKey = existingAccount.mSyncKey;
-                }
-                Serializer s = new Serializer();
-                s.start(Tags.FOLDER_FOLDER_SYNC).start(Tags.FOLDER_SYNC_KEY).text(syncKey)
-                    .end().end().done();
-                resp = svc.sendHttpClientPost("FolderSync", s.toByteArray());
-                code = resp.getStatusLine().getStatusCode();
-                // We'll get one of the following responses if policies are required by the server
-                if (code == HttpStatus.SC_FORBIDDEN || code == HTTP_NEED_PROVISIONING) {
-                    // Get the policies and see if we are able to support them
-                    ProvisionParser pp = svc.canProvision();
-                    if (pp != null) {
-                        // If so, set the proper result code and save the PolicySet in our Bundle
-                        resultCode = MessagingException.SECURITY_POLICIES_REQUIRED;
-                        bundle.putParcelable(EmailServiceProxy.VALIDATE_BUNDLE_POLICY_SET,
-                                pp.getPolicySet());
-                    } else
-                        // If not, set the proper code (the account will not be created)
-                        resultCode = MessagingException.SECURITY_POLICIES_UNSUPPORTED;
-                } else if (code == HttpStatus.SC_NOT_FOUND) {
-                    // We get a 404 from OWA addresses (which are NOT EAS addresses)
-                    resultCode = MessagingException.PROTOCOL_VERSION_UNSUPPORTED;
-                } else if (code != HttpStatus.SC_OK) {
-                    // Fail generically with anything other than success
-                    userLog("Unexpected response for FolderSync: ", code);
-                    resultCode = MessagingException.UNSPECIFIED_EXCEPTION;
+                    // Run second test here for provisioning failures using FolderSync
+                    userLog("Try folder sync");
+                    // Send "0" as the sync key for new accounts; otherwise, use the current key
+                    String syncKey = "0";
+                    Account existingAccount =
+                        Utility.findExistingAccount(context, -1L, hostAddress, userName);
+                    if (existingAccount != null && existingAccount.mSyncKey != null) {
+                        syncKey = existingAccount.mSyncKey;
+                    }
+                    Serializer s = new Serializer();
+                    s.start(Tags.FOLDER_FOLDER_SYNC).start(Tags.FOLDER_SYNC_KEY).text(syncKey)
+                        .end().end().done();
+                    resp = svc.sendHttpClientPost("FolderSync", s.toByteArray());
+                    code = resp.getStatusLine().getStatusCode();
+                    // We'll get one of the following responses if policies are required
+                    if (code == HttpStatus.SC_FORBIDDEN || code == HTTP_NEED_PROVISIONING) {
+                        // Get the policies and see if we are able to support them
+                        ProvisionParser pp = svc.canProvision();
+                        if (pp != null) {
+                            // Set the proper result code and save the PolicySet in our Bundle
+                            resultCode = MessagingException.SECURITY_POLICIES_REQUIRED;
+                            bundle.putParcelable(EmailServiceProxy.VALIDATE_BUNDLE_POLICY_SET,
+                                    pp.getPolicySet());
+                        } else
+                            // If not, set the proper code (the account will not be created)
+                            resultCode = MessagingException.SECURITY_POLICIES_UNSUPPORTED;
+                    } else if (code == HttpStatus.SC_NOT_FOUND) {
+                        // We get a 404 from OWA addresses (which are NOT EAS addresses)
+                        resultCode = MessagingException.PROTOCOL_VERSION_UNSUPPORTED;
+                    } else if (code != HttpStatus.SC_OK) {
+                        // Fail generically with anything other than success
+                        userLog("Unexpected response for FolderSync: ", code);
+                        resultCode = MessagingException.UNSPECIFIED_EXCEPTION;
+                    } else {
+                        userLog("Validation successful");
+                    }
+                } else if (isAuthError(code)) {
+                    userLog("Authentication failed");
+                    resultCode = MessagingException.AUTHENTICATION_FAILED;
+                } else if (code == INTERNAL_SERVER_ERROR_CODE) {
+                    // For Exchange 2003, this could mean an authentication failure OR server error
+                    userLog("Internal server error");
+                    resultCode = MessagingException.AUTHENTICATION_FAILED_OR_SERVER_ERROR;
                 } else {
-                    userLog("Validation successful");
+                    // TODO Need to catch other kinds of errors (e.g. policy) For now, report code.
+                    userLog("Validation failed, reporting I/O error: ", code);
+                    resultCode = MessagingException.IOERROR;
                 }
-            } else if (isAuthError(code)) {
-                userLog("Authentication failed");
-                resultCode = MessagingException.AUTHENTICATION_FAILED;
-            } else if (code == INTERNAL_SERVER_ERROR_CODE) {
-                // For Exchange 2003, this could mean an authenticiation failure OR a server error
-                userLog("Internal server error");
-                resultCode = MessagingException.AUTHENTICATION_FAILED_OR_SERVER_ERROR;
-            } else {
-                // TODO Need to catch other kinds of errors (e.g. policy) For now, report the code.
-                userLog("Validation failed, reporting I/O error: ", code);
-                resultCode = MessagingException.IOERROR;
+            } finally {
+                if (entity != null) {
+                    entity.consumeContent();
+                }
             }
         } catch (IOException e) {
             Throwable cause = e.getCause();
@@ -631,15 +638,14 @@
                 resp = postAutodiscover(client, post, true /*canRetry*/);
             }
 
-            // Get the "final" code; if it's not 200, just return null
-            int code = resp.getStatusLine().getStatusCode();
-            userLog("Code: " + code);
-            if (code != HttpStatus.SC_OK) return null;
-
-            // At this point, we have a 200 response (SC_OK)
-            HttpEntity e = resp.getEntity();
-            InputStream is = e.getContent();
+            HttpEntity entity = resp.getEntity();
             try {
+                // Get the "final" code; if it's not 200, just return null
+                int code = resp.getStatusLine().getStatusCode();
+                userLog("Code: " + code);
+                if (code != HttpStatus.SC_OK) return null;
+
+                InputStream is = entity.getContent();
                 // The response to Autodiscover is regular XML (not WBXML)
                 // If we ever get an error in this process, we'll just punt and return null
                 XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
@@ -676,6 +682,10 @@
             } catch (XmlPullParserException e1) {
                 // This would indicate an I/O error of some sort
                 // We will simply return null and user can configure manually
+            } finally {
+               if (entity != null) {
+                   entity.consumeContent();
+               }
             }
         // There's no reason at all for exceptions to be thrown, and it's ok if so.
         // We just won't do auto-discover; user can configure manually
@@ -853,18 +863,29 @@
                 s.end().end().end().done();
                 if (DEBUG_GAL_SERVICE) svc.userLog("GAL lookup starting for " + ha.mAddress);
                 HttpResponse resp = svc.sendHttpClientPost("Search", s.toByteArray());
-                int code = resp.getStatusLine().getStatusCode();
-                if (code == HttpStatus.SC_OK) {
-                    InputStream is = resp.getEntity().getContent();
-                    GalParser gp = new GalParser(is, svc);
-                    if (gp.parse()) {
-                        if (DEBUG_GAL_SERVICE) svc.userLog("GAL lookup OK for " + ha.mAddress);
-                        return gp.getGalResult();
+                HttpEntity entity = resp.getEntity();
+                try {
+                    int code = resp.getStatusLine().getStatusCode();
+                    if (code == HttpStatus.SC_OK) {
+                        InputStream is = entity.getContent();
+                        try {
+                            GalParser gp = new GalParser(is, svc);
+                            if (gp.parse()) {
+                                if (DEBUG_GAL_SERVICE) svc.userLog("GAL lookup OK: " + ha.mAddress);
+                                return gp.getGalResult();
+                            } else {
+                                if (DEBUG_GAL_SERVICE) svc.userLog("GAL lookup: no matches");
+                            }
+                        } finally {
+                            is.close();
+                        }
                     } else {
-                        if (DEBUG_GAL_SERVICE) svc.userLog("GAL lookup returned no matches");
+                        svc.userLog("GAL lookup returned " + code);
                     }
-                } else {
-                    svc.userLog("GAL lookup returned " + code);
+                } finally {
+                    if (entity != null) {
+                        entity.consumeContent();
+                    }
                 }
             } catch (IOException e) {
                 // GAL is non-critical; we'll just go on
@@ -935,80 +956,85 @@
 
         String cmd = "GetAttachment&AttachmentName=" + att.mLocation;
         HttpResponse res = sendHttpClientPost(cmd, null, COMMAND_TIMEOUT);
+        HttpEntity entity = res.getEntity();
 
-        int status = res.getStatusLine().getStatusCode();
-        if (status == HttpStatus.SC_OK) {
-            HttpEntity e = res.getEntity();
-            int len = (int)e.getContentLength();
-            InputStream is = res.getEntity().getContent();
-            File f = (req.mDestination != null)
-                    ? new File(req.mDestination)
-                    : createUniqueFileInternal(req.mDestination, att.mFileName);
-            if (f != null) {
-                // Ensure that the target directory exists
-                File destDir = f.getParentFile();
-                if (!destDir.exists()) {
-                    destDir.mkdirs();
-                }
-                FileOutputStream os = new FileOutputStream(f);
-                // len > 0 means that Content-Length was set in the headers
-                // len < 0 means "chunked" transfer-encoding
-                if (len != 0) {
-                    try {
-                        mPendingRequest = req;
-                        byte[] bytes = new byte[CHUNK_SIZE];
-                        int length = len;
-                        // Loop terminates 1) when EOF is reached or 2) if an IOException occurs
-                        // One of these is guaranteed to occur
-                        int totalRead = 0;
-                        userLog("Attachment content-length: ", len);
-                        while (true) {
-                            int read = is.read(bytes, 0, CHUNK_SIZE);
+        try {
+            int status = res.getStatusLine().getStatusCode();
+            if (status == HttpStatus.SC_OK) {
+                int len = (int)entity.getContentLength();
+                InputStream is = entity.getContent();
+                File f = (req.mDestination != null) ? new File(req.mDestination) :
+                    createUniqueFileInternal(req.mDestination, att.mFileName);
+                if (f != null) {
+                    // Ensure that the target directory exists
+                    File destDir = f.getParentFile();
+                    if (!destDir.exists()) {
+                        destDir.mkdirs();
+                    }
+                    FileOutputStream os = new FileOutputStream(f);
+                    // len > 0 means that Content-Length was set in the headers
+                    // len < 0 means "chunked" transfer-encoding
+                    if (len != 0) {
+                        try {
+                            mPendingRequest = req;
+                            byte[] bytes = new byte[CHUNK_SIZE];
+                            int length = len;
+                            // Loop terminates 1) when EOF is reached or 2) IOException occurs
+                            // One of these is guaranteed to occur
+                            int totalRead = 0;
+                            userLog("Attachment content-length: ", len);
+                            while (true) {
+                                int read = is.read(bytes, 0, CHUNK_SIZE);
 
-                            // read < 0 means that EOF was reached
-                            if (read < 0) {
-                                userLog("Attachment load reached EOF, totalRead: ", totalRead);
-                                break;
-                            }
-
-                            // Keep track of how much we've read for progress callback
-                            totalRead += read;
-
-                            // Write these bytes out
-                            os.write(bytes, 0, read);
-
-                            // We can't report percentages if this is chunked; by definition, the
-                            // length of incoming data is unknown
-                            if (length > 0) {
-                                // Belt and suspenders check to prevent runaway reading
-                                if (totalRead > length) {
-                                    errorLog("totalRead is greater than attachment length?");
+                                // read < 0 means that EOF was reached
+                                if (read < 0) {
+                                    userLog("Attachment load reached EOF, totalRead: ", totalRead);
                                     break;
                                 }
-                                int pct = (totalRead * 100) / length;
-                                doProgressCallback(msg.mId, att.mId, pct);
+
+                                // Keep track of how much we've read for progress callback
+                                totalRead += read;
+
+                                // Write these bytes out
+                                os.write(bytes, 0, read);
+
+                                // We can't report percentages if this is chunked; the
+                                // length of incoming data is unknown
+                                if (length > 0) {
+                                    // Belt and suspenders check to prevent runaway reading
+                                    if (totalRead > length) {
+                                        errorLog("totalRead is greater than attachment length?");
+                                        break;
+                                    }
+                                    int pct = (totalRead * 100) / length;
+                                    doProgressCallback(msg.mId, att.mId, pct);
+                                }
                             }
-                       }
-                    } finally {
-                        mPendingRequest = null;
+                        } finally {
+                            mPendingRequest = null;
+                        }
+                    }
+                    os.flush();
+                    os.close();
+
+                    // EmailProvider will throw an exception if update an unsaved attachment
+                    if (att.isSaved()) {
+                        String contentUriString = (req.mContentUriString != null) ?
+                            req.mContentUriString :
+                            "file://" + f.getAbsolutePath();
+                        ContentValues cv = new ContentValues();
+                        cv.put(AttachmentColumns.CONTENT_URI, contentUriString);
+                        att.update(mContext, cv);
+                        doStatusCallback(msg.mId, att.mId, EmailServiceStatus.SUCCESS);
                     }
                 }
-                os.flush();
-                os.close();
-
-                // EmailProvider will throw an exception if we try to update an unsaved attachment
-                if (att.isSaved()) {
-                    String contentUriString = (req.mContentUriString != null)
-                            ? req.mContentUriString
-                            : "file://" + f.getAbsolutePath();
-                    ContentValues cv = new ContentValues();
-                    cv.put(AttachmentColumns.CONTENT_URI, contentUriString);
-                    att.update(mContext, cv);
-                    doStatusCallback(msg.mId, att.mId, EmailServiceStatus.SUCCESS);
-                }
+            } else {
+                doStatusCallback(msg.mId, att.mId, EmailServiceStatus.MESSAGE_NOT_FOUND);
             }
-        } else {
-            doStatusCallback(msg.mId, att.mId, EmailServiceStatus.MESSAGE_NOT_FOUND);
+        } finally {
+            if (entity != null) {
+                entity.consumeContent();
+            }
         }
     }
 
@@ -1115,44 +1141,52 @@
         s.data(Tags.MOVE_DSTFLDID, dstMailbox.mServerId);
         s.end().end().done();
         HttpResponse res = sendHttpClientPost("MoveItems", s.toByteArray());
-        int status = res.getStatusLine().getStatusCode();
-        if (status == HttpStatus.SC_OK) {
-            HttpEntity e = res.getEntity();
-            int len = (int)e.getContentLength();
-            InputStream is = res.getEntity().getContent();
-            if (len != 0) {
-                MoveItemsParser p = new MoveItemsParser(is, this);
-                p.parse();
-                int statusCode = p.getStatusCode();
-                ContentValues cv = new ContentValues();
-                if (statusCode == MoveItemsParser.STATUS_CODE_REVERT) {
-                    // Restore the old mailbox id
-                    cv.put(MessageColumns.MAILBOX_KEY, srcMailbox.mServerId);
-                    mContentResolver.update(ContentUris.withAppendedId(
-                            Message.CONTENT_URI, req.mMessageId), cv, null, null);
-                } else if (statusCode == MoveItemsParser.STATUS_CODE_SUCCESS) {
-                    // Update with the new server id
-                    cv.put(SyncColumns.SERVER_ID, p.getNewServerId());
-                    cv.put(Message.FLAGS, msg.mFlags | MESSAGE_FLAG_MOVED_MESSAGE);
-                    mContentResolver.update(ContentUris.withAppendedId(
-                            Message.CONTENT_URI, req.mMessageId), cv, null, null);
-                }
-                if (statusCode == MoveItemsParser.STATUS_CODE_SUCCESS ||
-                        statusCode == MoveItemsParser.STATUS_CODE_REVERT) {
-                    // If we revert or if we succeeded, we no longer need the update information
-                    // OR the now-duplicate email (the new copy will eventually be synced down)
-                    mContentResolver.delete(ContentUris.withAppendedId(
-                            Message.UPDATED_CONTENT_URI, req.mMessageId), null, null);
-                } else {
-                    // In this case, we're retrying, so do nothing.  The request will be handled
-                    // next sync
-                }
+        HttpEntity entity = res.getEntity();
+        try {
+            int status = res.getStatusLine().getStatusCode();
+            if (status == HttpStatus.SC_OK) {
+                    int len = (int) entity.getContentLength();
+                    InputStream is = res.getEntity().getContent();
+                    if (len != 0) {
+                        MoveItemsParser p = new MoveItemsParser(is, this);
+                        p.parse();
+                        int statusCode = p.getStatusCode();
+                        ContentValues cv = new ContentValues();
+                        if (statusCode == MoveItemsParser.STATUS_CODE_REVERT) {
+                            // Restore the old mailbox id
+                            cv.put(MessageColumns.MAILBOX_KEY, srcMailbox.mServerId);
+                            mContentResolver.update(
+                                    ContentUris.withAppendedId(Message.CONTENT_URI, req.mMessageId),
+                                    cv, null, null);
+                        } else if (statusCode == MoveItemsParser.STATUS_CODE_SUCCESS) {
+                            // Update with the new server id
+                            cv.put(SyncColumns.SERVER_ID, p.getNewServerId());
+                            cv.put(Message.FLAGS, msg.mFlags | MESSAGE_FLAG_MOVED_MESSAGE);
+                            mContentResolver.update(
+                                    ContentUris.withAppendedId(Message.CONTENT_URI, req.mMessageId),
+                                    cv, null, null);
+                        }
+                        if (statusCode == MoveItemsParser.STATUS_CODE_SUCCESS
+                                || statusCode == MoveItemsParser.STATUS_CODE_REVERT) {
+                            // If we revert or succeed, we no longer need the update information
+                            // OR the now-duplicate email (the new copy will be synced down)
+                            mContentResolver.delete(ContentUris.withAppendedId(
+                                    Message.UPDATED_CONTENT_URI, req.mMessageId), null, null);
+                        } else {
+                            // In this case, we're retrying, so do nothing.  The request will be
+                            // handled next sync
+                        }
+                    }
+            } else if (isAuthError(status)) {
+                throw new EasAuthenticationException();
+            } else {
+                userLog("Move items request failed, code: " + status);
+                throw new IOException();
             }
-        } else if (isAuthError(status)) {
-            throw new EasAuthenticationException();
-        } else {
-            userLog("Move items request failed, code: " + status);
-            throw new IOException();
+        } finally {
+            if (entity != null) {
+                entity.consumeContent();
+            }
         }
     }
 
@@ -1175,30 +1209,36 @@
         s.data(Tags.MREQ_REQ_ID, msg.mServerId);
         s.end().end().done();
         HttpResponse res = sendHttpClientPost("MeetingResponse", s.toByteArray());
-        int status = res.getStatusLine().getStatusCode();
-        if (status == HttpStatus.SC_OK) {
-            HttpEntity e = res.getEntity();
-            int len = (int)e.getContentLength();
-            InputStream is = res.getEntity().getContent();
-            if (len != 0) {
-                new MeetingResponseParser(is, this).parse();
-                String meetingInfo = msg.mMeetingInfo;
-                if (meetingInfo != null) {
-                    String responseRequested =
-                        new PackedString(meetingInfo).get(MeetingInfo.MEETING_RESPONSE_REQUESTED);
-                    // If there's no tag, or a non-zero tag, we send the response mail
-                    if ("0".equals(responseRequested)) {
-                        return;
+        HttpEntity entity = res.getEntity();
+        try {
+            int status = res.getStatusLine().getStatusCode();
+            if (status == HttpStatus.SC_OK) {
+                int len = (int)entity.getContentLength();
+                if (len != 0) {
+                    InputStream is = res.getEntity().getContent();
+                    new MeetingResponseParser(is, this).parse();
+                    String meetingInfo = msg.mMeetingInfo;
+                    if (meetingInfo != null) {
+                        String responseRequested = new PackedString(meetingInfo).get(
+                                MeetingInfo.MEETING_RESPONSE_REQUESTED);
+                        // If there's no tag, or a non-zero tag, we send the response mail
+                        if ("0".equals(responseRequested)) {
+                            return;
+                        }
                     }
+                    sendMeetingResponseMail(msg, req.mResponse);
                 }
-                sendMeetingResponseMail(msg, req.mResponse);
+            } else if (isAuthError(status)) {
+                throw new EasAuthenticationException();
+            } else {
+                userLog("Meeting response request failed, code: " + status);
+                throw new IOException();
             }
-        } else if (isAuthError(status)) {
-            throw new EasAuthenticationException();
-        } else {
-            userLog("Meeting response request failed, code: " + status);
-            throw new IOException();
-        }
+        } finally {
+            if (entity != null) {
+                entity.consumeContent();
+            }
+       }
     }
 
     /**
@@ -1462,27 +1502,34 @@
         s.start(Tags.PROVISION_POLICY).data(Tags.PROVISION_POLICY_TYPE, getPolicyType())
             .end().end().end().done();
         HttpResponse resp = sendHttpClientPost("Provision", s.toByteArray());
-        int code = resp.getStatusLine().getStatusCode();
-        if (code == HttpStatus.SC_OK) {
-            InputStream is = resp.getEntity().getContent();
-            ProvisionParser pp = new ProvisionParser(is, this);
-            if (pp.parse()) {
-                // The PolicySet in the ProvisionParser will have the requirements for all KNOWN
-                // policies.  If others are required, hasSupportablePolicySet will be false
-                if (pp.hasSupportablePolicySet()) {
-                    // If the policies are supportable (in this context, meaning that there are no
-                    // completely unimplemented policies required), just return the parser itself
-                    return pp;
-                } else {
-                    // Try to acknowledge using the "partial" status (i.e. we can partially
-                    // accommodate the required policies).  The server will agree to this if the
-                    // "allow non-provisionable devices" setting is enabled on the server
-                    String policyKey = acknowledgeProvision(pp.getPolicyKey(),
-                            PROVISION_STATUS_PARTIAL);
-                    // Return either the parser (success) or null (failure)
-                    return (policyKey != null) ? pp : null;
+        HttpEntity entity = resp.getEntity();
+        try {
+            int code = resp.getStatusLine().getStatusCode();
+            if (code == HttpStatus.SC_OK) {
+                InputStream is = entity.getContent();
+                ProvisionParser pp = new ProvisionParser(is, this);
+                if (pp.parse()) {
+                    // The PolicySet in the ProvisionParser will have the requirements for all KNOWN
+                    // policies.  If others are required, hasSupportablePolicySet will be false
+                    if (pp.hasSupportablePolicySet()) {
+                        // If the policies are supportable (in this context, meaning there are no
+                        // completely unimplemented policies required), return the parser itself
+                        return pp;
+                    } else {
+                        // Try to acknowledge using the "partial" status (i.e. we can partially
+                        // accommodate the required policies).  The server will agree to this if the
+                        // "allow non-provisionable devices" setting is enabled on the server
+                        String policyKey = acknowledgeProvision(pp.getPolicyKey(),
+                                PROVISION_STATUS_PARTIAL);
+                        // Return either the parser (success) or null (failure)
+                        return (policyKey != null) ? pp : null;
+                    }
                 }
             }
+        } finally {
+            if (entity != null) {
+                entity.consumeContent();
+            }
         }
         // On failures, simply return null
         return null;
@@ -1522,13 +1569,20 @@
         }
         s.end().done(); // PROVISION_PROVISION
         HttpResponse resp = sendHttpClientPost("Provision", s.toByteArray());
-        int code = resp.getStatusLine().getStatusCode();
-        if (code == HttpStatus.SC_OK) {
-            InputStream is = resp.getEntity().getContent();
-            ProvisionParser pp = new ProvisionParser(is, this);
-            if (pp.parse()) {
-                // Return the final policy key from the ProvisionParser
-                return pp.getPolicyKey();
+        HttpEntity entity = resp.getEntity();
+        try {
+            int code = resp.getStatusLine().getStatusCode();
+            if (code == HttpStatus.SC_OK) {
+                InputStream is = entity.getContent();
+                ProvisionParser pp = new ProvisionParser(is, this);
+                if (pp.parse()) {
+                    // Return the final policy key from the ProvisionParser
+                    return pp.getPolicyKey();
+                }
+            }
+        } finally {
+            if (entity != null) {
+                entity.consumeContent();
             }
         }
         // On failures, return null
@@ -1636,38 +1690,44 @@
                 s.start(Tags.FOLDER_FOLDER_SYNC).start(Tags.FOLDER_SYNC_KEY)
                     .text(mAccount.mSyncKey).end().end().done();
                 HttpResponse resp = sendHttpClientPost("FolderSync", s.toByteArray());
-                if (mStop) break;
-                int code = resp.getStatusLine().getStatusCode();
-                if (code == HttpStatus.SC_OK) {
-                    HttpEntity entity = resp.getEntity();
-                    int len = (int)entity.getContentLength();
-                    if (len != 0) {
-                        InputStream is = entity.getContent();
-                        // Returns true if we need to sync again
-                        if (new FolderSyncParser(is, new AccountSyncAdapter(mMailbox, this))
-                                .parse()) {
+                HttpEntity entity = resp.getEntity();
+                try {
+                    if (mStop) break;
+                    int code = resp.getStatusLine().getStatusCode();
+                    if (code == HttpStatus.SC_OK) {
+                            int len = (int)entity.getContentLength();
+                            if (len != 0) {
+                                InputStream is = entity.getContent();
+                                // Returns true if we need to sync again
+                                if (new FolderSyncParser(is, new AccountSyncAdapter(this))
+                                        .parse()) {
+                                    continue;
+                                }
+                            }
+                    } else if (isProvisionError(code)) {
+                        // If the sync error is a provisioning failure (perhaps policies changed),
+                        // let's try the provisioning procedure
+                        // Provisioning must only be attempted for the account mailbox - trying to
+                        // provision any other mailbox may result in race conditions and the
+                        // creation of multiple policy keys.
+                        if (!tryProvision()) {
+                            // Set the appropriate failure status
+                            mExitStatus = EXIT_SECURITY_FAILURE;
+                            return;
+                        } else {
+                            // If we succeeded, try again...
                             continue;
                         }
-                    }
-                } else if (isProvisionError(code)) {
-                    // If the sync error is a provisioning failure (perhaps the policies changed),
-                    // let's try the provisioning procedure
-                    // Provisioning must only be attempted for the account mailbox - trying to
-                    // provision any other mailbox may result in race conditions and the creation
-                    // of multiple policy keys.
-                    if (!tryProvision()) {
-                        // Set the appropriate failure status
-                        mExitStatus = EXIT_SECURITY_FAILURE;
+                    } else if (isAuthError(code)) {
+                        mExitStatus = EXIT_LOGIN_FAILURE;
                         return;
                     } else {
-                        // If we succeeded, try again...
-                        continue;
+                        userLog("FolderSync response error: ", code);
                     }
-                } else if (isAuthError(code)) {
-                    mExitStatus = EXIT_LOGIN_FAILURE;
-                    return;
-                } else {
-                    userLog("FolderSync response error: ", code);
+                } finally {
+                    if (entity != null) {
+                        entity.consumeContent();
+                    }
                 }
 
                 // Change all push/hold boxes to push
@@ -1907,48 +1967,55 @@
                     }
                     HttpResponse res =
                         sendPing(s.toByteArray(), forcePing ? mPingForceHeartbeat : pingHeartbeat);
+                    HttpEntity entity = res.getEntity();
 
-                    int code = res.getStatusLine().getStatusCode();
-                    userLog("Ping response: ", code);
+                    try {
+                        int code = res.getStatusLine().getStatusCode();
+                        userLog("Ping response: ", code);
 
-                    // Return immediately if we've been asked to stop during the ping
-                    if (mStop) {
-                        userLog("Stopping pingLoop");
-                        return;
-                    }
+                        // Return immediately if we've been asked to stop during the ping
+                        if (mStop) {
+                            userLog("Stopping pingLoop");
+                            return;
+                        }
 
-                    if (code == HttpStatus.SC_OK) {
-                        // Make sure to clear out any pending sync errors
-                        ExchangeService.removeFromSyncErrorMap(mMailboxId);
-                        HttpEntity e = res.getEntity();
-                        int len = (int)e.getContentLength();
-                        InputStream is = res.getEntity().getContent();
-                        if (len != 0) {
-                            int pingResult = parsePingResult(is, mContentResolver, pingErrorMap);
-                            // If our ping completed (status = 1), and we weren't forced and we're
-                            // not at the maximum, try increasing timeout by two minutes
-                            if (pingResult == PROTOCOL_PING_STATUS_COMPLETED && !forcePing) {
-                                if (pingHeartbeat > mPingHighWaterMark) {
-                                    mPingHighWaterMark = pingHeartbeat;
-                                    userLog("Setting high water mark at: ", mPingHighWaterMark);
-                                }
-                                if ((pingHeartbeat < mPingMaxHeartbeat) &&
-                                        !mPingHeartbeatDropped) {
-                                    pingHeartbeat += PING_HEARTBEAT_INCREMENT;
-                                    if (pingHeartbeat > mPingMaxHeartbeat) {
-                                        pingHeartbeat = mPingMaxHeartbeat;
+                        if (code == HttpStatus.SC_OK) {
+                            // Make sure to clear out any pending sync errors
+                            ExchangeService.removeFromSyncErrorMap(mMailboxId);
+                            int len = (int)entity.getContentLength();
+                            InputStream is = entity.getContent();
+                            if (len != 0) {
+                                int pingResult = parsePingResult(is, mContentResolver,
+                                        pingErrorMap);
+                                // If our ping completed (status = 1), and wasn't forced and we're
+                                // not at the maximum, try increasing timeout by two minutes
+                                if (pingResult == PROTOCOL_PING_STATUS_COMPLETED && !forcePing) {
+                                    if (pingHeartbeat > mPingHighWaterMark) {
+                                        mPingHighWaterMark = pingHeartbeat;
+                                        userLog("Setting high water mark at: ", mPingHighWaterMark);
                                     }
-                                    userLog("Increasing ping heartbeat to ", pingHeartbeat, "s");
+                                    if ((pingHeartbeat < mPingMaxHeartbeat) &&
+                                            !mPingHeartbeatDropped) {
+                                        pingHeartbeat += PING_HEARTBEAT_INCREMENT;
+                                        if (pingHeartbeat > mPingMaxHeartbeat) {
+                                            pingHeartbeat = mPingMaxHeartbeat;
+                                        }
+                                        userLog("Increase ping heartbeat to ", pingHeartbeat, "s");
+                                    }
                                 }
+                            } else {
+                                userLog("Ping returned empty result; throwing IOException");
+                                throw new IOException();
                             }
-                        } else {
-                            userLog("Ping returned empty result; throwing IOException");
+                        } else if (isAuthError(code)) {
+                            mExitStatus = EXIT_LOGIN_FAILURE;
+                            userLog("Authorization error during Ping: ", code);
                             throw new IOException();
                         }
-                    } else if (isAuthError(code)) {
-                        mExitStatus = EXIT_LOGIN_FAILURE;
-                        userLog("Authorization error during Ping: ", code);
-                        throw new IOException();
+                    } finally {
+                        if (entity != null) {
+                            entity.consumeContent();
+                        }
                     }
                 } catch (IOException e) {
                     String message = e.getMessage();
@@ -2193,59 +2260,66 @@
             s.end().end().end().done();
             HttpResponse resp = sendHttpClientPost("Sync", new ByteArrayEntity(s.toByteArray()),
                     timeout);
-            int code = resp.getStatusLine().getStatusCode();
-            if (code == HttpStatus.SC_OK) {
-                // In EAS 12.1, we can get "empty" sync responses, which indicate that there are
-                // no changes in the mailbox; handle that case here
-                Header header = resp.getFirstHeader("content-length");
-                if (header != null && header.getValue().equals("0")) {
-                    // If this happens, exit cleanly, and change the interval from push to ping
-                    // if necessary
-                    userLog("Empty sync response; finishing");
-                    if (mMailbox.mSyncInterval == Mailbox.CHECK_INTERVAL_PUSH) {
-                        userLog("Changing mailbox from push to ping");
-                        ContentValues cv = new ContentValues();
-                        cv.put(Mailbox.SYNC_INTERVAL, Mailbox.CHECK_INTERVAL_PING);
-                        mContentResolver.update(
-                                ContentUris.withAppendedId(Mailbox.CONTENT_URI, mMailbox.mId), cv,
-                                null, null);
-                    }
-                    if (mRequestQueue.isEmpty()) {
-                        mExitStatus = EXIT_DONE;
-                        return;
-                    } else {
-                        continue;
-                    }
-                }
-                InputStream is = resp.getEntity().getContent();
-                if (is != null) {
-                    moreAvailable = target.parse(is);
-                    if (target.isLooping()) {
-                        loopingCount++;
-                        userLog("** Looping: " + loopingCount);
-                        // After the maximum number of loops, we'll set moreAvailable to false and
-                        // allow the sync loop to terminate
-                        if (moreAvailable && (loopingCount > MAX_LOOPING_COUNT)) {
-                            userLog("** Looping force stopped");
-                            moreAvailable = false;
+            HttpEntity entity = resp.getEntity();
+            try {
+                int code = resp.getStatusLine().getStatusCode();
+                if (code == HttpStatus.SC_OK) {
+                    // In EAS 12.1, we can get "empty" sync responses, which indicate that there are
+                    // no changes in the mailbox; handle that case here
+                    Header header = resp.getFirstHeader("content-length");
+                    if (header != null && header.getValue().equals("0")) {
+                        // If this happens, exit cleanly, and change the interval from push to ping
+                        // if necessary
+                        userLog("Empty sync response; finishing");
+                        if (mMailbox.mSyncInterval == Mailbox.CHECK_INTERVAL_PUSH) {
+                            userLog("Changing mailbox from push to ping");
+                            ContentValues cv = new ContentValues();
+                            cv.put(Mailbox.SYNC_INTERVAL, Mailbox.CHECK_INTERVAL_PING);
+                            mContentResolver.update(
+                                    ContentUris.withAppendedId(Mailbox.CONTENT_URI, mMailbox.mId),
+                                    cv, null, null);
                         }
-                    } else {
-                        loopingCount = 0;
+                        if (mRequestQueue.isEmpty()) {
+                            mExitStatus = EXIT_DONE;
+                            return;
+                        } else {
+                            continue;
+                        }
                     }
-                    target.cleanup();
+                    InputStream is = entity.getContent();
+                    if (is != null) {
+                        moreAvailable = target.parse(is);
+                        if (target.isLooping()) {
+                            loopingCount++;
+                            userLog("** Looping: " + loopingCount);
+                            // After the maximum number of loops, we'll set moreAvailable to false
+                            // and allow the sync loop to terminate
+                            if (moreAvailable && (loopingCount > MAX_LOOPING_COUNT)) {
+                                userLog("** Looping force stopped");
+                                moreAvailable = false;
+                            }
+                        } else {
+                            loopingCount = 0;
+                        }
+                        target.cleanup();
+                    } else {
+                        userLog("Empty input stream in sync command response");
+                    }
                 } else {
-                    userLog("Empty input stream in sync command response");
+                    userLog("Sync response error: ", code);
+                    if (isProvisionError(code)) {
+                        mExitStatus = EXIT_SECURITY_FAILURE;
+                    } else if (isAuthError(code)) {
+                        mExitStatus = EXIT_LOGIN_FAILURE;
+                    } else {
+                        mExitStatus = EXIT_IO_ERROR;
+                    }
+                    return;
                 }
-            } else {
-                userLog("Sync response error: ", code);
-                if (isProvisionError(code)) {
-                    mExitStatus = EXIT_SECURITY_FAILURE;
-                } else if (isAuthError(code)) {
-                    mExitStatus = EXIT_LOGIN_FAILURE;
-                } else {
-                    mExitStatus = EXIT_IO_ERROR;
+            } finally {
+                if (entity != null) {
+                    entity.consumeContent();
                 }
-                return;
             }
         }
         mExitStatus = EXIT_DONE;
@@ -2303,11 +2377,11 @@
             } else {
                 AbstractSyncAdapter target;
                 if (mMailbox.mType == Mailbox.TYPE_CONTACTS) {
-                    target = new ContactsSyncAdapter(mMailbox, this);
+                    target = new ContactsSyncAdapter( this);
                 } else if (mMailbox.mType == Mailbox.TYPE_CALENDAR) {
-                    target = new CalendarSyncAdapter(mMailbox, this);
+                    target = new CalendarSyncAdapter(this);
                 } else {
-                    target = new EmailSyncAdapter(mMailbox, this);
+                    target = new EmailSyncAdapter(this);
                 }
                 // We loop here because someone might have put a request in while we were syncing
                 // and we've missed that opportunity...
diff --git a/src/com/android/exchange/ExchangeService.java b/src/com/android/exchange/ExchangeService.java
index aece41e..47894a2 100644
--- a/src/com/android/exchange/ExchangeService.java
+++ b/src/com/android/exchange/ExchangeService.java
@@ -36,6 +36,7 @@
 import com.android.email.service.IEmailServiceCallback;
 import com.android.email.service.MailService;
 import com.android.exchange.adapter.CalendarSyncAdapter;
+import com.android.exchange.adapter.ContactsSyncAdapter;
 import com.android.exchange.utility.FileLogger;
 
 import org.apache.http.conn.ClientConnectionManager;
@@ -66,21 +67,21 @@
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.Uri;
 import android.net.NetworkInfo.State;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Debug;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
 import android.os.Process;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
-import android.os.PowerManager.WakeLock;
 import android.provider.Calendar;
-import android.provider.ContactsContract;
 import android.provider.Calendar.Calendars;
 import android.provider.Calendar.Events;
+import android.provider.ContactsContract;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -202,7 +203,6 @@
     private AccountObserver mAccountObserver;
     private MailboxObserver mMailboxObserver;
     private SyncedMessageObserver mSyncedMessageObserver;
-    private MessageObserver mMessageObserver;
     private EasSyncStatusObserver mSyncStatusObserver;
     private Object mStatusChangeListener;
     private EasAccountsUpdatedListener mAccountsUpdatedListener;
@@ -448,6 +448,31 @@
         public void moveMessage(long messageId, long mailboxId) throws RemoteException {
             sendMessageRequest(new MessageMoveRequest(messageId, mailboxId));
         }
+
+        /**
+         * Delete PIM (calendar, contacts) data for the specified account
+         *
+         * @param accountId the account whose data should be deleted
+         * @throws RemoteException
+         */
+        public void deleteAccountPIMData(long accountId) throws RemoteException {
+            ExchangeService exchangeService = INSTANCE;
+            if (exchangeService == null) return;
+            Mailbox mailbox =
+                Mailbox.restoreMailboxOfType(exchangeService, accountId, Mailbox.TYPE_CONTACTS);
+            if (mailbox != null) {
+                EasSyncService service = new EasSyncService(exchangeService, mailbox);
+                ContactsSyncAdapter adapter = new ContactsSyncAdapter(service);
+                adapter.wipe();
+            }
+            mailbox =
+                Mailbox.restoreMailboxOfType(exchangeService, accountId, Mailbox.TYPE_CALENDAR);
+            if (mailbox != null) {
+                EasSyncService service = new EasSyncService(exchangeService, mailbox);
+                CalendarSyncAdapter adapter = new CalendarSyncAdapter(service);
+                adapter.wipe();
+            }
+        }
     };
 
     static class AccountList extends ArrayList<Account> {
@@ -796,7 +821,7 @@
                                         EasSyncService service =
                                             new EasSyncService(INSTANCE, mailbox);
                                         CalendarSyncAdapter adapter =
-                                            new CalendarSyncAdapter(mailbox, service);
+                                            new CalendarSyncAdapter(service);
                                         try {
                                             adapter.setSyncKey("0", false);
                                         } catch (IOException e) {
@@ -866,22 +891,6 @@
         }
     }
 
-    private class MessageObserver extends ContentObserver {
-
-        public MessageObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            // A rather blunt instrument here.  But we don't have information about the URI that
-            // triggered this, though it must have been an insert
-            if (!selfChange) {
-                kick(null);
-            }
-        }
-    }
-
     static public IEmailServiceCallback callback() {
         return sCallbackProxy;
     }
@@ -1850,8 +1859,6 @@
                 mSyncedMessageObserver = new SyncedMessageObserver(mHandler);
                 mResolver.registerContentObserver(Message.SYNCED_CONTENT_URI, true,
                         mSyncedMessageObserver);
-                mMessageObserver = new MessageObserver(mHandler);
-                mResolver.registerContentObserver(Message.CONTENT_URI, true, mMessageObserver);
                 mSyncStatusObserver = new EasSyncStatusObserver();
                 mStatusChangeListener =
                     ContentResolver.addStatusChangeListener(
@@ -1948,10 +1955,6 @@
                     resolver.unregisterContentObserver(mSyncedMessageObserver);
                     mSyncedMessageObserver = null;
                 }
-                if (mMessageObserver != null) {
-                    resolver.unregisterContentObserver(mMessageObserver);
-                    mMessageObserver = null;
-                }
                 if (mAccountObserver != null) {
                     resolver.unregisterContentObserver(mAccountObserver);
                     mAccountObserver = null;
diff --git a/src/com/android/exchange/adapter/AbstractSyncAdapter.java b/src/com/android/exchange/adapter/AbstractSyncAdapter.java
index 41b2281..14cca36 100644
--- a/src/com/android/exchange/adapter/AbstractSyncAdapter.java
+++ b/src/com/android/exchange/adapter/AbstractSyncAdapter.java
@@ -23,6 +23,7 @@
 import com.android.exchange.Eas;
 import com.android.exchange.EasSyncService;
 
+import android.content.ContentResolver;
 import android.content.Context;
 
 import java.io.IOException;
@@ -46,6 +47,7 @@
     public EasSyncService mService;
     public Context mContext;
     public Account mAccount;
+    public final ContentResolver mContentResolver;
     public final android.accounts.Account mAccountManagerAccount;
 
     // Create the data for local changes that need to be sent up to the server
@@ -62,18 +64,23 @@
     // Add sync options (filter, body type - html vs plain, and truncation)
     public abstract void sendSyncOptions(Double protocolVersion, Serializer s)
         throws IOException;
+    /**
+     * Delete all records of this class in this account
+     */
+    public abstract void wipe();
 
     public boolean isLooping() {
         return false;
     }
 
-    public AbstractSyncAdapter(Mailbox mailbox, EasSyncService service) {
-        mMailbox = mailbox;
+    public AbstractSyncAdapter(EasSyncService service) {
         mService = service;
+        mMailbox = service.mMailbox;
         mContext = service.mContext;
         mAccount = service.mAccount;
         mAccountManagerAccount = new android.accounts.Account(mAccount.mEmailAddress,
                 Email.EXCHANGE_ACCOUNT_MANAGER_TYPE);
+        mContentResolver = mContext.getContentResolver();
     }
 
     public void userLog(String ...strings) {
diff --git a/src/com/android/exchange/adapter/AbstractSyncParser.java b/src/com/android/exchange/adapter/AbstractSyncParser.java
index b2b17f0..250767b 100644
--- a/src/com/android/exchange/adapter/AbstractSyncParser.java
+++ b/src/com/android/exchange/adapter/AbstractSyncParser.java
@@ -75,11 +75,6 @@
      */
     public abstract void commit() throws IOException;
 
-    /**
-     * Delete all records of this class in this account
-     */
-    public abstract void wipe();
-
     public boolean isLooping() {
         return mLooping;
     }
@@ -121,7 +116,7 @@
                         // TODO Make frequency conditional on user settings!
                         mMailbox.mSyncInterval = Mailbox.CHECK_INTERVAL_PUSH;
                         mService.errorLog("Bad sync key; RESET and delete data");
-                        wipe();
+                        mAdapter.wipe();
                         // Indicate there's more so that we'll start syncing again
                         moreAvailable = true;
                     } else if (status == 8) {
diff --git a/src/com/android/exchange/adapter/AccountSyncAdapter.java b/src/com/android/exchange/adapter/AccountSyncAdapter.java
index 25b8ad6..cf54ed5 100644
--- a/src/com/android/exchange/adapter/AccountSyncAdapter.java
+++ b/src/com/android/exchange/adapter/AccountSyncAdapter.java
@@ -1,6 +1,5 @@
 package com.android.exchange.adapter;
 
-import com.android.email.provider.EmailContent.Mailbox;
 import com.android.exchange.EasSyncService;
 
 import java.io.IOException;
@@ -8,8 +7,8 @@
 
 public class AccountSyncAdapter extends AbstractSyncAdapter {
 
-    public AccountSyncAdapter(Mailbox mailbox, EasSyncService service) {
-        super(mailbox, service);
+    public AccountSyncAdapter(EasSyncService service) {
+        super(service);
      }
 
     @Override
@@ -17,6 +16,10 @@
     }
 
     @Override
+    public void wipe() {
+    }
+
+    @Override
     public String getCollectionName() {
         return null;
     }
diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
index 503585a..197cdcf 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -20,7 +20,6 @@
 import com.android.email.Email;
 import com.android.email.Utility;
 import com.android.email.provider.EmailContent;
-import com.android.email.provider.EmailContent.Mailbox;
 import com.android.email.provider.EmailContent.Message;
 import com.android.exchange.Eas;
 import com.android.exchange.EasOutboxService;
@@ -35,14 +34,13 @@
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Entity;
+import android.content.Entity.NamedContentValues;
 import android.content.EntityIterator;
 import android.content.OperationApplicationException;
-import android.content.Entity.NamedContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.RemoteException;
 import android.provider.Calendar;
-import android.provider.SyncStateContract;
 import android.provider.Calendar.Attendees;
 import android.provider.Calendar.Calendars;
 import android.provider.Calendar.Events;
@@ -51,6 +49,7 @@
 import android.provider.Calendar.Reminders;
 import android.provider.Calendar.SyncState;
 import android.provider.ContactsContract.RawContacts;
+import android.provider.SyncStateContract;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -59,10 +58,10 @@
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.GregorianCalendar;
+import java.util.Map.Entry;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
 import java.util.UUID;
-import java.util.Map.Entry;
 
 /**
  * Sync adapter class for EAS calendars
@@ -161,8 +160,8 @@
     private ArrayList<Long> mSendCancelIdList = new ArrayList<Long>();
     private ArrayList<Message> mOutgoingMailList = new ArrayList<Message>();
 
-    public CalendarSyncAdapter(Mailbox mailbox, EasSyncService service) {
-        super(mailbox, service);
+    public CalendarSyncAdapter(EasSyncService service) {
+        super(service);
         mEmailAddress = mAccount.mEmailAddress;
         Cursor c = mService.mContentResolver.query(Calendars.CONTENT_URI,
                 new String[] {Calendars._ID}, CALENDAR_SELECTION,
@@ -191,6 +190,13 @@
     }
 
     @Override
+    public void wipe() {
+        // Delete the calendar associated with this account
+        mContentResolver.delete(Calendars.CONTENT_URI, CALENDAR_SELECTION,
+                new String[] {mEmailAddress, Email.EXCHANGE_ACCOUNT_MANAGER_TYPE});
+    }
+
+    @Override
     public void sendSyncOptions(Double protocolVersion, Serializer s) throws IOException  {
         setPimSyncOptions(protocolVersion, Eas.FILTER_2_WEEKS, s);
     }
@@ -284,14 +290,6 @@
             mAccountUri = Events.CONTENT_URI;
         }
 
-        @Override
-        public void wipe() {
-            // Delete the calendar associated with this account
-            // TODO Make sure the Events, etc. are also deleted
-            mContentResolver.delete(Calendars.CONTENT_URI, CALENDAR_SELECTION,
-                    new String[] {mEmailAddress, Email.EXCHANGE_ACCOUNT_MANAGER_TYPE});
-        }
-
         private void addOrganizerToAttendees(CalendarOperations ops, long eventId,
                 String organizerName, String organizerEmail) {
             // Handle the organizer (who IS an attendee on device, but NOT in EAS)
diff --git a/src/com/android/exchange/adapter/ContactsSyncAdapter.java b/src/com/android/exchange/adapter/ContactsSyncAdapter.java
index 4aea090..cc65a26 100644
--- a/src/com/android/exchange/adapter/ContactsSyncAdapter.java
+++ b/src/com/android/exchange/adapter/ContactsSyncAdapter.java
@@ -17,32 +17,24 @@
 
 package com.android.exchange.adapter;
 
-import com.android.email.provider.EmailContent.Mailbox;
 import com.android.exchange.Eas;
 import com.android.exchange.EasSyncService;
 
 import android.content.ContentProviderClient;
 import android.content.ContentProviderOperation;
+import android.content.ContentProviderOperation.Builder;
 import android.content.ContentProviderResult;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Entity;
+import android.content.Entity.NamedContentValues;
 import android.content.EntityIterator;
 import android.content.OperationApplicationException;
-import android.content.ContentProviderOperation.Builder;
-import android.content.Entity.NamedContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.RemoteException;
 import android.provider.ContactsContract;
-import android.provider.SyncStateContract;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.Groups;
-import android.provider.ContactsContract.RawContacts;
-import android.provider.ContactsContract.RawContactsEntity;
-import android.provider.ContactsContract.Settings;
-import android.provider.ContactsContract.SyncState;
 import android.provider.ContactsContract.CommonDataKinds.Email;
 import android.provider.ContactsContract.CommonDataKinds.Event;
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
@@ -56,6 +48,13 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
 import android.provider.ContactsContract.CommonDataKinds.Website;
+import android.provider.ContactsContract.Data;
+import android.provider.ContactsContract.Groups;
+import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.RawContactsEntity;
+import android.provider.ContactsContract.Settings;
+import android.provider.ContactsContract.SyncState;
+import android.provider.SyncStateContract;
 import android.text.TextUtils;
 import android.text.util.Rfc822Token;
 import android.text.util.Rfc822Tokenizer;
@@ -76,7 +75,10 @@
     private static final String SERVER_ID_SELECTION = RawContacts.SOURCE_ID + "=?";
     private static final String CLIENT_ID_SELECTION = RawContacts.SYNC1 + "=?";
     private static final String[] ID_PROJECTION = new String[] {RawContacts._ID};
-    private static final String[] GROUP_PROJECTION = new String[] {Groups.SOURCE_ID};
+    private static final String[] GROUP_TITLE_PROJECTION = new String[] {Groups.TITLE};
+    private static final String MIMETYPE_GROUP_MEMBERSHIP_AND_ID_EQUALS = Data.MIMETYPE + "='" +
+        GroupMembership.CONTENT_ITEM_TYPE + "' AND " + GroupMembership.GROUP_ROW_ID + "=?";
+    private static final String[] GROUPS_ID_PROJECTION = new String[] {Groups._ID};
 
     private static final ArrayList<NamedContentValues> EMPTY_ARRAY_NAMEDCONTENTVALUES
         = new ArrayList<NamedContentValues>();
@@ -124,10 +126,14 @@
     ArrayList<Long> mDeletedIdList = new ArrayList<Long>();
     ArrayList<Long> mUpdatedIdList = new ArrayList<Long>();
 
+    private final Uri mAccountUri;
+    private final ContentResolver mContentResolver;
     private boolean mGroupsUsed = false;
 
-    public ContactsSyncAdapter(Mailbox mailbox, EasSyncService service) {
-        super(mailbox, service);
+    public ContactsSyncAdapter(EasSyncService service) {
+        super(service);
+        mAccountUri = uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI);
+        mContentResolver = mContext.getContentResolver();
     }
 
     static Uri addCallerIsSyncAdapterParameter(Uri uri) {
@@ -153,6 +159,12 @@
         return p.parse();
     }
 
+
+    @Override
+    public void wipe() {
+        mContentResolver.delete(mAccountUri, null, null);
+    }
+
     interface UntypedRow {
         public void addValues(RowBuilder builder);
         public boolean isSameAs(int type, String value);
@@ -331,18 +343,11 @@
 
         String[] mBindArgument = new String[1];
         String mMailboxIdAsString;
-        Uri mAccountUri;
         ContactOperations ops = new ContactOperations();
 
         public EasContactsSyncParser(InputStream in, ContactsSyncAdapter adapter)
                 throws IOException {
             super(in, adapter);
-            mAccountUri = uriWithAccountAndIsSyncAdapter(RawContacts.CONTENT_URI);
-        }
-
-        @Override
-        public void wipe() {
-            mContentResolver.delete(mAccountUri, null, null);
         }
 
         public void addData(String serverId, ContactOperations ops, Entity entity)
@@ -1740,17 +1745,47 @@
         }
     }
 
+    private void dirtyContactsWithinDirtyGroups() {
+        ContentResolver cr = mService.mContentResolver;
+        Cursor c = cr.query(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI),
+                GROUPS_ID_PROJECTION, Groups.DIRTY + "=1", null, null);
+        try {
+            if (c.getCount() > 0) {
+                String[] updateArgs = new String[1];
+                ContentValues updateValues = new ContentValues();
+                while (c.moveToNext()) {
+                    // For each, "touch" all data rows with this group id; this will mark contacts
+                    // in this group as dirty (per ContactsContract).  We will then know to upload
+                    // them to the server with the modified group information
+                    long id = c.getLong(0);
+                    updateValues.put(GroupMembership.GROUP_ROW_ID, id);
+                    updateArgs[0] = Long.toString(id);
+                    cr.update(Data.CONTENT_URI, updateValues,
+                            MIMETYPE_GROUP_MEMBERSHIP_AND_ID_EQUALS, updateArgs);
+                }
+                // Really delete groups that are marked deleted
+                cr.delete(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI), Groups.DELETED + "=1",
+                        null);
+                // Clear the dirty flag for all of our groups
+                updateValues.clear();
+                updateValues.put(Groups.DIRTY, 0);
+                cr.update(uriWithAccountAndIsSyncAdapter(Groups.CONTENT_URI), updateValues, null,
+                        null);
+            }
+        } finally {
+            c.close();
+        }
+    }
+
     @Override
     public boolean sendLocalChanges(Serializer s) throws IOException {
-        // First, let's find Contacts that have changed.
         ContentResolver cr = mService.mContentResolver;
-        Uri uri = RawContactsEntity.CONTENT_URI.buildUpon()
-                .appendQueryParameter(RawContacts.ACCOUNT_NAME, mAccount.mEmailAddress)
-                .appendQueryParameter(RawContacts.ACCOUNT_TYPE,
-                        com.android.email.Email.EXCHANGE_ACCOUNT_MANAGER_TYPE)
-                .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
-                .build();
 
+        // Find any groups of ours that are dirty and dirty those groups' members
+        dirtyContactsWithinDirtyGroups();
+
+        // First, let's find Contacts that have changed.
+        Uri uri = uriWithAccountAndIsSyncAdapter(RawContactsEntity.CONTENT_URI);
         if (getSyncKey().equals("0")) {
             return false;
         }
@@ -1861,7 +1896,7 @@
                     for (int id: groupIds) {
                         // Since we get id's from the provider, we need to find their names
                         Cursor c = cr.query(ContentUris.withAppendedId(Groups.CONTENT_URI, id),
-                                GROUP_PROJECTION, null, null, null);
+                                GROUP_TITLE_PROJECTION, null, null, null);
                         try {
                             // Presumably, this should always succeed, but ...
                             if (c.moveToFirst()) {
diff --git a/src/com/android/exchange/adapter/EmailSyncAdapter.java b/src/com/android/exchange/adapter/EmailSyncAdapter.java
index de312a3..5635af2 100644
--- a/src/com/android/exchange/adapter/EmailSyncAdapter.java
+++ b/src/com/android/exchange/adapter/EmailSyncAdapter.java
@@ -28,7 +28,6 @@
 import com.android.email.mail.internet.MimeUtility;
 import com.android.email.provider.AttachmentProvider;
 import com.android.email.provider.EmailContent;
-import com.android.email.provider.EmailProvider;
 import com.android.email.provider.EmailContent.Account;
 import com.android.email.provider.EmailContent.AccountColumns;
 import com.android.email.provider.EmailContent.Attachment;
@@ -37,6 +36,7 @@
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.provider.EmailContent.MessageColumns;
 import com.android.email.provider.EmailContent.SyncColumns;
+import com.android.email.provider.EmailProvider;
 import com.android.email.service.MailService;
 import com.android.exchange.Eas;
 import com.android.exchange.EasSyncService;
@@ -102,8 +102,18 @@
     // Holds the parser's value for isLooping()
     boolean mIsLooping = false;
 
-    public EmailSyncAdapter(Mailbox mailbox, EasSyncService service) {
-        super(mailbox, service);
+    public EmailSyncAdapter(EasSyncService service) {
+        super(service);
+    }
+
+    @Override
+    public void wipe() {
+        mContentResolver.delete(Message.CONTENT_URI,
+                Message.MAILBOX_KEY + "=" + mMailbox.mId, null);
+        mContentResolver.delete(Message.DELETED_CONTENT_URI,
+                Message.MAILBOX_KEY + "=" + mMailbox.mId, null);
+        mContentResolver.delete(Message.UPDATED_CONTENT_URI,
+                Message.MAILBOX_KEY + "=" + mMailbox.mId, null);
     }
 
     private String getEmailFilter() {
@@ -238,16 +248,6 @@
             mMailboxIdAsString = Long.toString(mMailbox.mId);
         }
 
-        @Override
-        public void wipe() {
-            mContentResolver.delete(Message.CONTENT_URI,
-                    Message.MAILBOX_KEY + "=" + mMailbox.mId, null);
-            mContentResolver.delete(Message.DELETED_CONTENT_URI,
-                    Message.MAILBOX_KEY + "=" + mMailbox.mId, null);
-            mContentResolver.delete(Message.UPDATED_CONTENT_URI,
-                    Message.MAILBOX_KEY + "=" + mMailbox.mId, null);
-        }
-
         public void addData (Message msg) throws IOException {
             ArrayList<Attachment> atts = new ArrayList<Attachment>();
             boolean truncated = false;
diff --git a/src/com/android/exchange/adapter/FolderSyncParser.java b/src/com/android/exchange/adapter/FolderSyncParser.java
index 7e4863c..7a675d5 100644
--- a/src/com/android/exchange/adapter/FolderSyncParser.java
+++ b/src/com/android/exchange/adapter/FolderSyncParser.java
@@ -20,10 +20,10 @@
 import com.android.email.Utility;
 import com.android.email.provider.AttachmentProvider;
 import com.android.email.provider.EmailContent;
-import com.android.email.provider.EmailProvider;
 import com.android.email.provider.EmailContent.AccountColumns;
 import com.android.email.provider.EmailContent.Mailbox;
 import com.android.email.provider.EmailContent.MailboxColumns;
+import com.android.email.provider.EmailProvider;
 import com.android.exchange.Eas;
 import com.android.exchange.ExchangeService;
 import com.android.exchange.MockParserStream;
@@ -465,10 +465,6 @@
     }
 
     @Override
-    public void wipe() {
-    }
-
-    @Override
     public void responsesParser() throws IOException {
     }
 
diff --git a/src/com/android/exchange/adapter/ProvisionParser.java b/src/com/android/exchange/adapter/ProvisionParser.java
index 5ba43e4..dfd255d 100644
--- a/src/com/android/exchange/adapter/ProvisionParser.java
+++ b/src/com/android/exchange/adapter/ProvisionParser.java
@@ -96,10 +96,6 @@
                     break;
                 case Tags.PROVISION_DEVICE_PASSWORD_EXPIRATION:
                     passwordExpiration = getValueInt();
-                    // We don't yet support this
-                    if (passwordExpiration > 0) {
-                        tagIsSupported = false;
-                    }
                     break;
                 case Tags.PROVISION_DEVICE_PASSWORD_HISTORY:
                     passwordHistory = getValueInt();
diff --git a/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java
index 03a0a6d..e1879f6 100644
--- a/src/com/android/exchange/utility/CalendarUtilities.java
+++ b/src/com/android/exchange/utility/CalendarUtilities.java
@@ -18,6 +18,7 @@
 
 import com.android.email.Email;
 import com.android.email.R;
+import com.android.email.ResourceHelper;
 import com.android.email.Utility;
 import com.android.email.mail.Address;
 import com.android.email.provider.EmailContent;
@@ -1215,7 +1216,8 @@
 
         // TODO Coordinate account colors w/ Calendar, if possible
         // Make Email account color opaque
-        cv.put(Calendars.COLOR, 0xFF000000 | Email.getAccountColor(account.mId));
+        int color = ResourceHelper.getInstance(service.mContext).getAccountColor(account.mId);
+        cv.put(Calendars.COLOR, color);
         cv.put(Calendars.TIMEZONE, Time.getCurrentTimezone());
         cv.put(Calendars.ACCESS_LEVEL, Calendars.OWNER_ACCESS);
         cv.put(Calendars.OWNER_ACCOUNT, account.mEmailAddress);
diff --git a/tests/src/com/android/email/EmailTest.java b/tests/src/com/android/email/EmailTest.java
deleted file mode 100644
index 69e4178..0000000
--- a/tests/src/com/android/email/EmailTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.email;
-
-import junit.framework.TestCase;
-
-public class EmailTest extends TestCase {
-    public void testGetColorIndexFromAccountId() {
-        // First account (id=1) gets index 0.
-        assertEquals(0, Email.getColorIndexFromAccountId(1));
-        assertEquals(1, Email.getColorIndexFromAccountId(2));
-
-        // Never return negative.
-        assertTrue(Email.getColorIndexFromAccountId(-5) >= 0);
-
-        // Shouldn't throw ArrayIndexOutOfRange or anything.
-        for (int i = -100; i < 100; i++) {
-            Email.getAccountColorResourceId(i);
-            Email.getAccountColor(i);
-        }
-    }
-}
diff --git a/tests/src/com/android/email/ResourceHelperTest.java b/tests/src/com/android/email/ResourceHelperTest.java
new file mode 100644
index 0000000..2900dc5
--- /dev/null
+++ b/tests/src/com/android/email/ResourceHelperTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.email;
+
+import android.graphics.Paint;
+import android.test.AndroidTestCase;
+
+public class ResourceHelperTest extends AndroidTestCase {
+    private ResourceHelper mResourceHelper;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResourceHelper = ResourceHelper.getInstance(getContext());
+    }
+
+    public void testGetAccountColor() {
+        Integer lastColor = null;
+        Paint lastPaint = null;
+
+        for (long accountId = -1; accountId < 100; accountId++) {
+            // Shouldn't throw any exception (such as IndexOutOfRange)
+            Integer color = mResourceHelper.getAccountColor(accountId);
+            Paint paint = mResourceHelper.getAccountColorPaint(accountId);
+
+            // Should be different from the previous one
+            assertNotNull(color);
+            assertNotNull(paint);
+            assertFalse(color.equals(lastColor));
+            assertFalse(paint.equals(lastPaint));
+
+            lastColor = color;
+            lastPaint = paint;
+        }
+    }
+}
diff --git a/tests/src/com/android/email/activity/AccountSelectorAdapterAccountsLoaderTest.java b/tests/src/com/android/email/activity/AccountSelectorAdapterAccountsLoaderTest.java
new file mode 100644
index 0000000..81deacb
--- /dev/null
+++ b/tests/src/com/android/email/activity/AccountSelectorAdapterAccountsLoaderTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.email.activity;
+
+import com.android.email.DBTestHelper;
+import com.android.email.provider.EmailContent.Account;
+import com.android.email.provider.EmailProvider;
+import com.android.email.provider.ProviderTestUtils;
+
+import android.content.Context;
+import android.content.Loader;
+import android.database.Cursor;
+import android.test.LoaderTestCase;
+
+/**
+ * Tests for {@link AccountSelectorAdapter.AccountsLoader}.
+ *
+ * TODO add more tests.
+ */
+public class AccountSelectorAdapterAccountsLoaderTest extends LoaderTestCase {
+    private Context mProviderContext;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mProviderContext = DBTestHelper.ProviderContextSetupHelper.getProviderContext(
+                mContext, EmailProvider.class);
+    }
+
+    /**
+     * Confirm that AccountsLoader adds the combined view row, iif there is more than 1 account.
+     */
+    public void testCombinedViewRow() {
+        final Account a1 = ProviderTestUtils.setupAccount("a1", true, mProviderContext);
+        {
+            // Only 1 account -- no combined view row.
+            Loader<Cursor> l = new AccountSelectorAdapter.AccountsLoader(mProviderContext);
+            Cursor result = getLoaderResultSynchronously(l);
+            assertEquals(1, result.getCount());
+        }
+
+        final Account a2 = ProviderTestUtils.setupAccount("a2", true, mProviderContext);
+        {
+            // 2 accounts -- with combined view row, so returns 3 rows.
+            Loader<Cursor> l = new AccountSelectorAdapter.AccountsLoader(mProviderContext);
+            Cursor result = getLoaderResultSynchronously(l);
+            assertEquals(3, result.getCount());
+        }
+    }
+}
diff --git a/tests/src/com/android/email/provider/ContentCacheTests.java b/tests/src/com/android/email/provider/ContentCacheTests.java
index 666b92b..2360246 100644
--- a/tests/src/com/android/email/provider/ContentCacheTests.java
+++ b/tests/src/com/android/email/provider/ContentCacheTests.java
@@ -65,17 +65,17 @@
         map.add("2");
         map.add("2");
         // Make sure we can remove once for each add
-        map.remove("2");
+        map.subtract("2");
         assertTrue(map.contains("2"));
-        map.remove("2");
+        map.subtract("2");
         // Make sure that over-removing throws an exception
         try {
-            map.remove("2");
+            map.subtract("2");
             fail("Removing a third time should throw an exception");
         } catch (IllegalStateException e) {
         }
         try {
-            map.remove("3");
+            map.subtract("3");
             fail("Removing object never added should throw an exception");
         } catch (IllegalStateException e) {
         }
@@ -152,9 +152,8 @@
         Cursor activeCursor = cachedCursor.getWrappedCursor();
 
         // The cursor should be in active cursors
-        Integer activeCount = ContentCache.sActiveCursors.get(activeCursor);
-        assertNotNull(activeCount);
-        assertEquals(1, activeCount.intValue());
+        int activeCount = ContentCache.sActiveCursors.getCount(activeCursor);
+        assertEquals(1, activeCount);
 
         // Some basic functionality that shouldn't throw exceptions and should otherwise act as the
         // underlying cursor would
@@ -184,17 +183,19 @@
         // that in testContentCache)
         assertFalse(activeCursor.isClosed());
         // Our cursor should no longer be in the active cursors map
-        activeCount = ContentCache.sActiveCursors.get(activeCursor);
-        assertNull(activeCount);
+        assertFalse(ContentCache.sActiveCursors.contains(activeCursor));
 
-        // Make sure that we won't accept cursors with multiple rows
-        cursor = resolver.query(Mailbox.CONTENT_URI, Mailbox.CONTENT_PROJECTION, null, null, null);
-        try {
-            cursor = new CachedCursor(cursor, null, "Foo");
-            fail("Mustn't accept cursor with more than one row");
-        } catch (IllegalArgumentException e) {
-            // Correct
-        }
+        // TODO - change the code or the test to enforce the assertion that a cached cursor
+        // should have only zero or one rows.  We cannot test this in the constructor, however,
+        // due to potential for deadlock.
+//        // Make sure that we won't accept cursors with multiple rows
+//        cursor = resolver.query(Mailbox.CONTENT_URI, Mailbox.CONTENT_PROJECTION, null, null, null);
+//        try {
+//            cursor = new CachedCursor(cursor, null, "Foo");
+//            fail("Mustn't accept cursor with more than one row");
+//        } catch (IllegalArgumentException e) {
+//            // Correct
+//        }
     }
 
     private static final String[] SIMPLE_PROJECTION = new String[] {"Foo"};
diff --git a/tests/src/com/android/email/provider/ProviderTests.java b/tests/src/com/android/email/provider/ProviderTests.java
index f186366..65677be 100644
--- a/tests/src/com/android/email/provider/ProviderTests.java
+++ b/tests/src/com/android/email/provider/ProviderTests.java
@@ -73,6 +73,8 @@
     public void setUp() throws Exception {
         super.setUp();
         mMockContext = getMockContext();
+        // Invalidate all caches, since we reset the database for each test
+        ContentCache.invalidateAllCachesForTest();
     }
 
     @Override
diff --git a/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java b/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
index 7a4ea1b..e64b951 100644
--- a/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
+++ b/tests/src/com/android/exchange/adapter/EmailSyncAdapterTests.java
@@ -17,12 +17,12 @@
 package com.android.exchange.adapter;
 
 import com.android.email.provider.EmailContent;
-import com.android.email.provider.ProviderTestUtils;
 import com.android.email.provider.EmailContent.Account;
 import com.android.email.provider.EmailContent.Body;
 import com.android.email.provider.EmailContent.Mailbox;
 import com.android.email.provider.EmailContent.Message;
 import com.android.email.provider.EmailContent.SyncColumns;
+import com.android.email.provider.ProviderTestUtils;
 import com.android.exchange.EasSyncService;
 import com.android.exchange.adapter.EmailSyncAdapter.EasEmailSyncParser;
 import com.android.exchange.adapter.EmailSyncAdapter.EasEmailSyncParser.ServerChange;
@@ -48,7 +48,7 @@
      */
     public void testGetMimeTypeFromFileName() throws IOException {
         EasSyncService service = getTestService();
-        EmailSyncAdapter adapter = new EmailSyncAdapter(service.mMailbox, service);
+        EmailSyncAdapter adapter = new EmailSyncAdapter(service);
         EasEmailSyncParser p = adapter.new EasEmailSyncParser(getTestInputStream(), adapter);
         // Test a few known types
         String mimeType = p.getMimeTypeFromFileName("foo.jpg");
@@ -87,7 +87,7 @@
 
     public void testSendDeletedItems() throws IOException {
         EasSyncService service = getTestService();
-        EmailSyncAdapter adapter = new EmailSyncAdapter(service.mMailbox, service);
+        EmailSyncAdapter adapter = new EmailSyncAdapter(service);
         Serializer s = new Serializer();
         ArrayList<Long> ids = new ArrayList<Long>();
         ArrayList<Long> deletedIds = new ArrayList<Long>();
@@ -150,7 +150,7 @@
 
     void setupSyncParserAndAdapter(Account account, Mailbox mailbox) throws IOException {
         EasSyncService service = getTestService(account, mailbox);
-        mSyncAdapter = new EmailSyncAdapter(mailbox, service);
+        mSyncAdapter = new EmailSyncAdapter(service);
         mSyncParser = mSyncAdapter.new EasEmailSyncParser(getTestInputStream(), mSyncAdapter);
     }
 
diff --git a/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java b/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
index 9de9b8f..3122913 100644
--- a/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
+++ b/tests/src/com/android/exchange/adapter/FolderSyncParserTests.java
@@ -16,9 +16,9 @@
 
 package com.android.exchange.adapter;
 
-import com.android.email.provider.ProviderTestUtils;
 import com.android.email.provider.EmailContent.Account;
 import com.android.email.provider.EmailContent.Mailbox;
+import com.android.email.provider.ProviderTestUtils;
 import com.android.exchange.EasSyncService;
 
 import java.io.IOException;
@@ -37,7 +37,7 @@
 
     public void testIsValidMailFolder() throws IOException {
         EasSyncService service = getTestService();
-        EmailSyncAdapter adapter = new EmailSyncAdapter(service.mMailbox, service);
+        EmailSyncAdapter adapter = new EmailSyncAdapter(service);
         FolderSyncParser parser = new FolderSyncParser(getTestInputStream(), adapter);
         HashMap<String, Mailbox> mailboxMap = new HashMap<String, Mailbox>();
         Account acct = ProviderTestUtils.setupAccount("account", true, mMockContext);